grogv3 / grog-cubi

Go to a project
Toggle navigation Toggle navigation pinning
JR Utily
d189a98a 1 parent 19ded7b0

fix wrong dependency of SolRJ (due to Spring Bom)

Inline Side-by-side
Showing 3 changed files with 35 additions and 24 deletions
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
12 <version>3.0-SNAPSHOT</version> 12 <version>3.0-SNAPSHOT</version>
13 </parent> 13 </parent>
14 <artifactId>grog-entities</artifactId> 14 <artifactId>grog-entities</artifactId>
15 + <version>${parent.version}</version>
15 <packaging>jar</packaging> 16 <packaging>jar</packaging>
16 17
17 <properties> 18 <properties>
...@@ -93,5 +94,21 @@ ...@@ -93,5 +94,21 @@
93 </dependency> 94 </dependency>
94 95
95 </dependencies> 96 </dependencies>
96 - 97 +
98 + <build>
99 + <plugins>
100 + <plugin>
101 + <groupId>org.apache.maven.plugins</groupId>
102 + <artifactId>maven-jar-plugin</artifactId>
103 + <version>2.5</version>
104 + <executions>
105 + <execution>
106 + <goals>
107 + <goal>test-jar</goal>
108 + </goals>
109 + </execution>
110 + </executions>
111 + </plugin>
112 + </plugins>
113 + </build>
97 </project> 114 </project>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 <version>3.0-SNAPSHOT</version> 8 <version>3.0-SNAPSHOT</version>
9 <packaging>pom</packaging> 9 <packaging>pom</packaging>
10 10
11 - <name>Web-application of GROG</name> 11 + <name>GROG root</name>
12 <url>http://legrog.org</url> 12 <url>http://legrog.org</url>
13 <description> 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. 14 Le Guide du Roliste Galactique (GROG) est une encyclopedie en ligne référençant tous les jeux de rôles connus.
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
16 </description> 16 </description>
17 17
18 <modules> 18 <modules>
19 + <module>grog-entities</module>
19 <module>webapp</module> 20 <module>webapp</module>
20 <module>migration/db-generator</module> 21 <module>migration/db-generator</module>
21 - <module>grog-entities</module>
22 </modules> 22 </modules>
23 23
24 <properties> 24 <properties>
...@@ -26,6 +26,8 @@ ...@@ -26,6 +26,8 @@
26 <spring.platform-bom.version>Athens-SR1</spring.platform-bom.version> 26 <spring.platform-bom.version>Athens-SR1</spring.platform-bom.version>
27 <tomee.javaee-api.version>7.0</tomee.javaee-api.version> 27 <tomee.javaee-api.version>7.0</tomee.javaee-api.version>
28 28
29 + <solr.version>6.3.0</solr.version>
30 +
29 <!-- TEST --> 31 <!-- TEST -->
30 <junit.platform.version>1.0.0-M3</junit.platform.version> 32 <junit.platform.version>1.0.0-M3</junit.platform.version>
31 <junit.jupiter.version>5.0.0-M3</junit.jupiter.version> 33 <junit.jupiter.version>5.0.0-M3</junit.jupiter.version>
...@@ -40,6 +42,11 @@ ...@@ -40,6 +42,11 @@
40 <dependencyManagement> 42 <dependencyManagement>
41 <dependencies> 43 <dependencies>
42 <dependency> 44 <dependency>
45 + <groupId>org.apache.solr</groupId>
46 + <artifactId>solr-solrj</artifactId>
47 + <version>${solr.version}</version>
48 + </dependency>
49 + <dependency>
43 <groupId>io.spring.platform</groupId> 50 <groupId>io.spring.platform</groupId>
44 <artifactId>platform-bom</artifactId> 51 <artifactId>platform-bom</artifactId>
45 <version>${spring.platform-bom.version}</version> 52 <version>${spring.platform-bom.version}</version>
......
...@@ -17,26 +17,16 @@ ...@@ -17,26 +17,16 @@
17 <version>3.0-SNAPSHOT</version> 17 <version>3.0-SNAPSHOT</version>
18 </parent> 18 </parent>
19 <artifactId>grog-webapp</artifactId> 19 <artifactId>grog-webapp</artifactId>
20 + <version>${parent.version}</version>
20 <packaging>war</packaging> 21 <packaging>war</packaging>
21 22
22 23
23 <properties> 24 <properties>
24 <!-- dependencies version --> 25 <!-- dependencies version -->
25 - <spring.platform-bom.version>Athens-SR1</spring.platform-bom.version>
26 <omnifaces.version>2.5.1</omnifaces.version> 26 <omnifaces.version>2.5.1</omnifaces.version>
27 <primefaces.version>6.0</primefaces.version> 27 <primefaces.version>6.0</primefaces.version>
28 <myfaces.version>2.2.10</myfaces.version> 28 <myfaces.version>2.2.10</myfaces.version>
29 - <tomee.javaee-api.version>7.0</tomee.javaee-api.version>
30 - <assertj-core.version>1.6.1</assertj-core.version>
31 - <openjpa.version>2.4.1</openjpa.version>
32 <rewrite.version>3.4.1.Final</rewrite.version> 29 <rewrite.version>3.4.1.Final</rewrite.version>
33 - <hibernate-commons-annotations.version>5.0.1.Final</hibernate-commons-annotations.version>
34 - <hibernate-jpa-2.1-api.version>1.0.0.Final</hibernate-jpa-2.1-api.version>
35 - <junit.platform.version>1.0.0-M3</junit.platform.version>
36 - <junit.jupiter.version>5.0.0-M3</junit.jupiter.version>
37 - <mockito-core.version>2.2.16</mockito-core.version>
38 - <spring-data-solr.version>3.0.0.M1</spring-data-solr.version>
39 - <solr.version>6.3.0</solr.version>
40 30
41 <!-- paths --> 31 <!-- paths -->
42 <custom.web.dir>src/main/java/org/legrog/web</custom.web.dir> 32 <custom.web.dir>src/main/java/org/legrog/web</custom.web.dir>
...@@ -44,10 +34,6 @@ ...@@ -44,10 +34,6 @@
44 <!-- misc --> 34 <!-- misc -->
45 <debug.jvm.args /> 35 <debug.jvm.args />
46 <tomee.autoreload /> 36 <tomee.autoreload />
47 - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
48 - <maven.compiler.source>1.8</maven.compiler.source>
49 - <maven.compiler.target>1.8</maven.compiler.target>
50 -
51 37
52 </properties> 38 </properties>
53 39
...@@ -82,14 +68,15 @@ ...@@ -82,14 +68,15 @@
82 <artifactId>grog-entities</artifactId> 68 <artifactId>grog-entities</artifactId>
83 <version>3.0-SNAPSHOT</version> 69 <version>3.0-SNAPSHOT</version>
84 </dependency> 70 </dependency>
85 - 71 +
86 <dependency> 72 <dependency>
87 - <groupId>org.apache.solr</groupId> 73 + <groupId>org.legrog</groupId>
88 - <artifactId>solr-solrj</artifactId> 74 + <artifactId>grog-entities</artifactId>
89 - <version>${solr.version}</version> 75 + <version>3.0-SNAPSHOT</version>
76 + <type>test-jar</type>
77 + <scope>test</scope>
90 </dependency> 78 </dependency>
91 - 79 +
92 -
93 <!-- https://mvnrepository.com/artifact/org.omnifaces/omnifaces --> 80 <!-- https://mvnrepository.com/artifact/org.omnifaces/omnifaces -->
94 <dependency> 81 <dependency>
95 <groupId>org.omnifaces</groupId> 82 <groupId>org.omnifaces</groupId>
......