Showing
1 changed file
with
53 additions
and
33 deletions
... | @@ -5,10 +5,16 @@ | ... | @@ -5,10 +5,16 @@ |
5 | 5 | ||
6 | <groupId>org.legrog</groupId> | 6 | <groupId>org.legrog</groupId> |
7 | <artifactId>grog-cubi</artifactId> | 7 | <artifactId>grog-cubi</artifactId> |
8 | - <version>1.0-SNAPSHOT</version> | 8 | + <version>3.0-SNAPSHOT</version> |
9 | <packaging>war</packaging> | 9 | <packaging>war</packaging> |
10 | - <name>GRoG Cubi Webapp (TomEE dev)</name> | 10 | + |
11 | - <url>http://tomee.apache.org</url> | 11 | + <name>Web-application of GROG</name> |
12 | + <url>http://legrog.org</url> | ||
13 | + <description> | ||
14 | + Le Guide du Roliste Galactique (GROG) est une encyclopedie en ligne référençant tous les jeux de rôles connus. | ||
15 | + Cette version CUBI est la 3e mouture du site. | ||
16 | + </description> | ||
17 | + | ||
12 | 18 | ||
13 | <properties> | 19 | <properties> |
14 | <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | 20 | <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> |
... | @@ -19,6 +25,9 @@ | ... | @@ -19,6 +25,9 @@ |
19 | <tomee.javaee-api.version>7.0</tomee.javaee-api.version> | 25 | <tomee.javaee-api.version>7.0</tomee.javaee-api.version> |
20 | <assertj-core.version>1.6.1</assertj-core.version> | 26 | <assertj-core.version>1.6.1</assertj-core.version> |
21 | <openjpa.version>2.4.1</openjpa.version> | 27 | <openjpa.version>2.4.1</openjpa.version> |
28 | + <rewrite.version>3.4.1.Final</rewrite.version> | ||
29 | + <hibernate-commons-annotations.version>5.0.1.Final</hibernate-commons-annotations.version> | ||
30 | + <hibernate-jpa-2.1-api.version>1.0.0.Final</hibernate-jpa-2.1-api.version> | ||
22 | </properties> | 31 | </properties> |
23 | 32 | ||
24 | <dependencyManagement> | 33 | <dependencyManagement> |
... | @@ -26,7 +35,6 @@ | ... | @@ -26,7 +35,6 @@ |
26 | <dependency> | 35 | <dependency> |
27 | <groupId>io.spring.platform</groupId> | 36 | <groupId>io.spring.platform</groupId> |
28 | <artifactId>platform-bom</artifactId> | 37 | <artifactId>platform-bom</artifactId> |
29 | - <!-- Nécessaire à la compilation --> | ||
30 | <version>${spring.platform-bom.version}</version> | 38 | <version>${spring.platform-bom.version}</version> |
31 | <type>pom</type> | 39 | <type>pom</type> |
32 | <scope>import</scope> | 40 | <scope>import</scope> |
... | @@ -35,12 +43,21 @@ | ... | @@ -35,12 +43,21 @@ |
35 | </dependencyManagement> | 43 | </dependencyManagement> |
36 | 44 | ||
37 | <dependencies> | 45 | <dependencies> |
38 | - <!-- **** PREREQUIS MIGRATION **** --> | 46 | + |
47 | + | ||
48 | + <!-- **** FRAMEWORK : JSF + CDI **** --> | ||
49 | + | ||
50 | + <dependency> | ||
51 | + <groupId>org.apache.tomee</groupId> | ||
52 | + <artifactId>javaee-api</artifactId> | ||
53 | + <version>${tomee.javaee-api.version}</version> | ||
54 | + <scope>provided</scope> | ||
55 | + </dependency> | ||
56 | + | ||
39 | <!-- https://mvnrepository.com/artifact/org.omnifaces/omnifaces --> | 57 | <!-- https://mvnrepository.com/artifact/org.omnifaces/omnifaces --> |
40 | <dependency> | 58 | <dependency> |
41 | <groupId>org.omnifaces</groupId> | 59 | <groupId>org.omnifaces</groupId> |
42 | <artifactId>omnifaces</artifactId> | 60 | <artifactId>omnifaces</artifactId> |
43 | - <!-- Nécessaire à la compilation --> | ||
44 | <version>${omnifaces.version}</version> | 61 | <version>${omnifaces.version}</version> |
45 | </dependency> | 62 | </dependency> |
46 | 63 | ||
... | @@ -48,34 +65,35 @@ | ... | @@ -48,34 +65,35 @@ |
48 | <dependency> | 65 | <dependency> |
49 | <groupId>org.primefaces</groupId> | 66 | <groupId>org.primefaces</groupId> |
50 | <artifactId>primefaces</artifactId> | 67 | <artifactId>primefaces</artifactId> |
51 | - <!-- Nécessaire à la compilation --> | ||
52 | <version>${primefaces.version}</version> | 68 | <version>${primefaces.version}</version> |
53 | </dependency> | 69 | </dependency> |
54 | 70 | ||
55 | <dependency> | 71 | <dependency> |
56 | <groupId>org.apache.myfaces.core</groupId> | 72 | <groupId>org.apache.myfaces.core</groupId> |
57 | <artifactId>myfaces-api</artifactId> | 73 | <artifactId>myfaces-api</artifactId> |
58 | - <!-- Nécessaire à la compilation --> | ||
59 | <version>${myfaces.version}</version> | 74 | <version>${myfaces.version}</version> |
60 | </dependency> | 75 | </dependency> |
61 | <dependency> | 76 | <dependency> |
62 | <groupId>org.apache.myfaces.core</groupId> | 77 | <groupId>org.apache.myfaces.core</groupId> |
63 | <artifactId>myfaces-impl</artifactId> | 78 | <artifactId>myfaces-impl</artifactId> |
64 | - <!-- Nécessaire à l'exécution --> | ||
65 | <version>${myfaces.version}</version> | 79 | <version>${myfaces.version}</version> |
80 | + <scope>runtime</scope> | ||
66 | </dependency> | 81 | </dependency> |
67 | - <!-- **** FRAMEWORK : JSF + CDI **** --> | ||
68 | 82 | ||
69 | - <dependency> | ||
70 | - <groupId>org.apache.tomee</groupId> | ||
71 | - <artifactId>javaee-api</artifactId> | ||
72 | - <!-- Nécessaire à la compilation --> | ||
73 | - <version>${tomee.javaee-api.version}</version> | ||
74 | - <scope>provided</scope> | ||
75 | - </dependency> | ||
76 | 83 | ||
77 | 84 | ||
78 | - <!-- **** TOOLS : LOGS + UTILS **** --> | 85 | + |
86 | + <!-- Rewriting tool --> | ||
87 | + | ||
88 | + <!--<dependency>--> | ||
89 | + <!--<groupId>com.ocpsoft</groupId>--> | ||
90 | + <!--<artifactId>prettyfaces-jsf2</artifactId>--> | ||
91 | + <!--<version>3.3.3</version>--> | ||
92 | + <!--</dependency>--> | ||
93 | + <!-- --> | ||
94 | + | ||
95 | +<!-- **** TOOLS : LOGS + UTILS **** --> | ||
96 | + | ||
79 | <dependency> | 97 | <dependency> |
80 | <groupId>org.slf4j</groupId> | 98 | <groupId>org.slf4j</groupId> |
81 | <artifactId>slf4j-api</artifactId> | 99 | <artifactId>slf4j-api</artifactId> |
... | @@ -121,14 +139,14 @@ | ... | @@ -121,14 +139,14 @@ |
121 | <version>${assertj-core.version}</version> | 139 | <version>${assertj-core.version}</version> |
122 | <scope>test</scope> | 140 | <scope>test</scope> |
123 | </dependency> | 141 | </dependency> |
124 | -<!-- | 142 | + <!-- |
125 | <dependency> | 143 | <dependency> |
126 | <groupId>org.apache.openjpa</groupId> | 144 | <groupId>org.apache.openjpa</groupId> |
127 | <artifactId>openjpa</artifactId> | 145 | <artifactId>openjpa</artifactId> |
128 | <version>${openjpa.version}</version> | 146 | <version>${openjpa.version}</version> |
129 | <scope>test</scope> | 147 | <scope>test</scope> |
130 | </dependency> | 148 | </dependency> |
131 | ---> | 149 | + --> |
132 | <!-- to test with TomEE and Arquillian | 150 | <!-- to test with TomEE and Arquillian |
133 | <dependency> | 151 | <dependency> |
134 | <groupId>org.apache.tomee</groupId> | 152 | <groupId>org.apache.tomee</groupId> |
... | @@ -174,55 +192,44 @@ | ... | @@ -174,55 +192,44 @@ |
174 | <dependency> | 192 | <dependency> |
175 | <groupId>antlr</groupId> | 193 | <groupId>antlr</groupId> |
176 | <artifactId>antlr</artifactId> | 194 | <artifactId>antlr</artifactId> |
177 | -<!-- <version>2.7.7</version>--> | ||
178 | </dependency> | 195 | </dependency> |
179 | <dependency> | 196 | <dependency> |
180 | <groupId>dom4j</groupId> | 197 | <groupId>dom4j</groupId> |
181 | <artifactId>dom4j</artifactId> | 198 | <artifactId>dom4j</artifactId> |
182 | -<!-- <version>1.6.1</version>--> | ||
183 | </dependency> | 199 | </dependency> |
184 | <dependency> | 200 | <dependency> |
185 | <groupId>org.hibernate.common</groupId> | 201 | <groupId>org.hibernate.common</groupId> |
186 | <artifactId>hibernate-commons-annotations</artifactId> | 202 | <artifactId>hibernate-commons-annotations</artifactId> |
187 | - <!-- Nécessaire --> | 203 | + <version>${hibernate-commons-annotations.version}</version> |
188 | - <version>5.0.1.Final</version> | ||
189 | </dependency> | 204 | </dependency> |
190 | <dependency> | 205 | <dependency> |
191 | <groupId>org.hibernate.javax.persistence</groupId> | 206 | <groupId>org.hibernate.javax.persistence</groupId> |
192 | <artifactId>hibernate-jpa-2.1-api</artifactId> | 207 | <artifactId>hibernate-jpa-2.1-api</artifactId> |
193 | - <!-- Nécessaire --> | 208 | + <version>${hibernate-jpa-2.1-api.version}</version> |
194 | - <version>1.0.0.Final</version> | ||
195 | - <scope>compile</scope> | ||
196 | </dependency> | 209 | </dependency> |
197 | <dependency> | 210 | <dependency> |
198 | <groupId>org.hibernate</groupId> | 211 | <groupId>org.hibernate</groupId> |
199 | <artifactId>hibernate-core</artifactId> | 212 | <artifactId>hibernate-core</artifactId> |
200 | -<!-- <version>5.2.3.Final</version>--> | ||
201 | </dependency> | 213 | </dependency> |
202 | <dependency> | 214 | <dependency> |
203 | <groupId>org.hibernate</groupId> | 215 | <groupId>org.hibernate</groupId> |
204 | <artifactId>hibernate-ehcache</artifactId> | 216 | <artifactId>hibernate-ehcache</artifactId> |
205 | -<!-- <version>5.2.3.Final</version>--> | ||
206 | </dependency> | 217 | </dependency> |
207 | <dependency> | 218 | <dependency> |
208 | <groupId>org.hibernate</groupId> | 219 | <groupId>org.hibernate</groupId> |
209 | <artifactId>hibernate-entitymanager</artifactId> | 220 | <artifactId>hibernate-entitymanager</artifactId> |
210 | -<!-- <version>5.2.3.Final</version>--> | ||
211 | </dependency> | 221 | </dependency> |
212 | <dependency> | 222 | <dependency> |
213 | <groupId>org.hibernate</groupId> | 223 | <groupId>org.hibernate</groupId> |
214 | <artifactId>hibernate-validator</artifactId> | 224 | <artifactId>hibernate-validator</artifactId> |
215 | -<!-- <version>5.2.3.Final</version>--> | ||
216 | </dependency> | 225 | </dependency> |
217 | <dependency> | 226 | <dependency> |
218 | <groupId>org.jboss.logging</groupId> | 227 | <groupId>org.jboss.logging</groupId> |
219 | <artifactId>jboss-logging</artifactId> | 228 | <artifactId>jboss-logging</artifactId> |
220 | -<!-- <version>3.3.0.Final</version>--> | ||
221 | </dependency> | 229 | </dependency> |
222 | <dependency> | 230 | <dependency> |
223 | <groupId>org.javassist</groupId> | 231 | <groupId>org.javassist</groupId> |
224 | <artifactId>javassist</artifactId> | 232 | <artifactId>javassist</artifactId> |
225 | -<!-- <version>3.20.0-GA</version>--> | ||
226 | </dependency> | 233 | </dependency> |
227 | </dependencies> | 234 | </dependencies> |
228 | 235 | ||
... | @@ -244,6 +251,17 @@ | ... | @@ -244,6 +251,17 @@ |
244 | <version>2.6</version> | 251 | <version>2.6</version> |
245 | <configuration> | 252 | <configuration> |
246 | <failOnMissingWebXml>false</failOnMissingWebXml> | 253 | <failOnMissingWebXml>false</failOnMissingWebXml> |
254 | + <webResources> | ||
255 | + <resource> | ||
256 | + <!-- this is relative to the pom.xml directory --> | ||
257 | + <directory>src/main/java/org/legrog/web</directory> | ||
258 | + <excludes> | ||
259 | + <exclude>**/*.java</exclude> | ||
260 | + </excludes> | ||
261 | + | ||
262 | + </resource> | ||
263 | + </webResources> | ||
264 | + | ||
247 | </configuration> | 265 | </configuration> |
248 | </plugin> | 266 | </plugin> |
249 | <plugin> | 267 | <plugin> |
... | @@ -252,6 +270,8 @@ | ... | @@ -252,6 +270,8 @@ |
252 | <version>7.0.1</version> | 270 | <version>7.0.1</version> |
253 | <configuration> | 271 | <configuration> |
254 | <context>ROOT</context> | 272 | <context>ROOT</context> |
273 | + | ||
274 | + | ||
255 | </configuration> | 275 | </configuration> |
256 | </plugin> | 276 | </plugin> |
257 | <!-- | 277 | <!-- | ... | ... |
-
Please register or login to post a comment