grogv3 / grog-cubi

Go to a project
Toggle navigation Toggle navigation pinning
JR Utily
7b3e29f7 1 parent 880af9ef

fix issue with pom => remove jee specs from unnecessary poms

Inline Side-by-side
Showing 6 changed files with 47 additions and 31 deletions
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
15 <packaging>jar</packaging> 15 <packaging>jar</packaging>
16 16
17 <dependencies> 17 <dependencies>
18 +
18 <dependency> 19 <dependency>
19 <groupId>org.springframework.boot</groupId> 20 <groupId>org.springframework.boot</groupId>
20 <artifactId>spring-boot-starter-data-jpa</artifactId> 21 <artifactId>spring-boot-starter-data-jpa</artifactId>
...@@ -40,7 +41,7 @@ ...@@ -40,7 +41,7 @@
40 <artifactId>h2</artifactId> 41 <artifactId>h2</artifactId>
41 <scope>test</scope> 42 <scope>test</scope>
42 </dependency> 43 </dependency>
43 - 44 +
44 <dependency> 45 <dependency>
45 <groupId>org.legrog</groupId> 46 <groupId>org.legrog</groupId>
46 <artifactId>grog-entities</artifactId> 47 <artifactId>grog-entities</artifactId>
...@@ -64,5 +65,5 @@ ...@@ -64,5 +65,5 @@
64 </plugin> 65 </plugin>
65 </plugins> 66 </plugins>
66 </build> 67 </build>
67 - 68 +
68 </project> 69 </project>
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
21 <solr.version>6.3.0</solr.version> 21 <solr.version>6.3.0</solr.version>
22 </properties> 22 </properties>
23 23
24 - 24 +
25 <dependencies> 25 <dependencies>
26 26
27 <dependency> 27 <dependency>
...@@ -29,8 +29,12 @@ ...@@ -29,8 +29,12 @@
29 <artifactId>solr-solrj</artifactId> 29 <artifactId>solr-solrj</artifactId>
30 <version>${solr.version}</version> 30 <version>${solr.version}</version>
31 </dependency> 31 </dependency>
32 - 32 +
33 - 33 + <dependency>
34 + <groupId>org.apache.tomee</groupId>
35 + <artifactId>javaee-api</artifactId>
36 + </dependency>
37 +
34 <!-- **** TOOLS : LOGS + UTILS **** --> 38 <!-- **** TOOLS : LOGS + UTILS **** -->
35 39
36 <dependency> 40 <dependency>
...@@ -43,7 +47,7 @@ ...@@ -43,7 +47,7 @@
43 <artifactId>logback-classic</artifactId> 47 <artifactId>logback-classic</artifactId>
44 </dependency> 48 </dependency>
45 49
46 - 50 +
47 <dependency> 51 <dependency>
48 <groupId>org.springframework.data</groupId> 52 <groupId>org.springframework.data</groupId>
49 <artifactId>spring-data-jpa</artifactId> 53 <artifactId>spring-data-jpa</artifactId>
......
...@@ -51,11 +51,6 @@ ...@@ -51,11 +51,6 @@
51 <plugin> 51 <plugin>
52 <groupId>org.springframework.boot</groupId> 52 <groupId>org.springframework.boot</groupId>
53 <artifactId>spring-boot-maven-plugin</artifactId> 53 <artifactId>spring-boot-maven-plugin</artifactId>
54 - <version>1.5.2.RELEASE</version>
55 - <configuration>
56 - <mainClass>org.legrog.recommendation.postprocess.PostprocessingApplication</mainClass>
57 - <layout>ZIP</layout>
58 - </configuration>
59 <executions> 54 <executions>
60 <execution> 55 <execution>
61 <goals> 56 <goals>
......
...@@ -7,7 +7,10 @@ import org.slf4j.LoggerFactory; ...@@ -7,7 +7,10 @@ import org.slf4j.LoggerFactory;
7 import org.springframework.beans.factory.annotation.Value; 7 import org.springframework.beans.factory.annotation.Value;
8 import org.springframework.boot.CommandLineRunner; 8 import org.springframework.boot.CommandLineRunner;
9 import org.springframework.boot.SpringApplication; 9 import org.springframework.boot.SpringApplication;
10 +import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
10 import org.springframework.boot.autoconfigure.SpringBootApplication; 11 import org.springframework.boot.autoconfigure.SpringBootApplication;
12 +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
13 +import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
11 import org.springframework.context.annotation.Bean; 14 import org.springframework.context.annotation.Bean;
12 15
13 import java.io.*; 16 import java.io.*;
...@@ -33,6 +36,9 @@ public class PostprocessingApplication { ...@@ -33,6 +36,9 @@ public class PostprocessingApplication {
33 Properties properties; 36 Properties properties;
34 Set<Long> sampleItemIds; 37 Set<Long> sampleItemIds;
35 Set<Long> sampleUserIds; 38 Set<Long> sampleUserIds;
39 +
40 + //fixme ne jamais utiliser de classes concretes comme type de variables
41 + // ce que tu veux ici c'est Map<Long, Set<Long>>
36 HashMap<Long, Set<Long>> sampleItemUserIds; 42 HashMap<Long, Set<Long>> sampleItemUserIds;
37 43
38 public static void main(String[] args) { 44 public static void main(String[] args) {
...@@ -88,6 +94,7 @@ public class PostprocessingApplication { ...@@ -88,6 +94,7 @@ public class PostprocessingApplication {
88 logger.trace("Nombre de couples item-user dans l'échantillon {}", sampleCoupleCount); 94 logger.trace("Nombre de couples item-user dans l'échantillon {}", sampleCoupleCount);
89 95
90 } catch (IOException e) { 96 } catch (IOException e) {
97 + //fixme use logger instead of e.printStackTrace() !!!
91 e.printStackTrace(); 98 e.printStackTrace();
92 } 99 }
93 100
...@@ -110,6 +117,8 @@ public class PostprocessingApplication { ...@@ -110,6 +117,8 @@ public class PostprocessingApplication {
110 117
111 void loadParametersProperties() { 118 void loadParametersProperties() {
112 119
120 + //fixme use logger instead of e.printStackTrace() !!!
121 +
113 Properties properties = new Properties(); 122 Properties properties = new Properties();
114 InputStream in = null; 123 InputStream in = null;
115 try { 124 try {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 2 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 3 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4 <modelVersion>4.0.0</modelVersion> 4 <modelVersion>4.0.0</modelVersion>
5 - 5 +
6 <name>Web-application of GROG</name> 6 <name>Web-application of GROG</name>
7 <url>http://legrog.org</url> 7 <url>http://legrog.org</url>
8 <description> 8 <description>
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
19 <artifactId>grog-webapp</artifactId> 19 <artifactId>grog-webapp</artifactId>
20 <version>3.0-SNAPSHOT</version> 20 <version>3.0-SNAPSHOT</version>
21 <packaging>war</packaging> 21 <packaging>war</packaging>
22 - 22 +
23 - 23 +
24 <properties> 24 <properties>
25 <!-- dependencies version --> 25 <!-- dependencies version -->
26 <omnifaces.version>2.5.1</omnifaces.version> 26 <omnifaces.version>2.5.1</omnifaces.version>
...@@ -32,8 +32,8 @@ ...@@ -32,8 +32,8 @@
32 <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>
33 33
34 <!-- misc --> 34 <!-- misc -->
35 - <debug.jvm.args /> 35 + <debug.jvm.args/>
36 - <tomee.autoreload /> 36 + <tomee.autoreload/>
37 37
38 </properties> 38 </properties>
39 39
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
60 </profile> 60 </profile>
61 </profiles> 61 </profiles>
62 62
63 - 63 +
64 <dependencies> 64 <dependencies>
65 65
66 <dependency> 66 <dependency>
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
68 <artifactId>grog-entities</artifactId> 68 <artifactId>grog-entities</artifactId>
69 <version>3.0-SNAPSHOT</version> 69 <version>3.0-SNAPSHOT</version>
70 </dependency> 70 </dependency>
71 - 71 +
72 <dependency> 72 <dependency>
73 <groupId>org.legrog</groupId> 73 <groupId>org.legrog</groupId>
74 <artifactId>grog-entities</artifactId> 74 <artifactId>grog-entities</artifactId>
...@@ -77,6 +77,12 @@ ...@@ -77,6 +77,12 @@
77 <scope>test</scope> 77 <scope>test</scope>
78 </dependency> 78 </dependency>
79 79
80 +
81 + <dependency>
82 + <groupId>org.apache.tomee</groupId>
83 + <artifactId>javaee-api</artifactId>
84 + </dependency>
85 +
80 <!-- https://mvnrepository.com/artifact/org.omnifaces/omnifaces --> 86 <!-- https://mvnrepository.com/artifact/org.omnifaces/omnifaces -->
81 <dependency> 87 <dependency>
82 <groupId>org.omnifaces</groupId> 88 <groupId>org.omnifaces</groupId>
...@@ -124,7 +130,7 @@ ...@@ -124,7 +130,7 @@
124 <version>${rewrite.version}</version> 130 <version>${rewrite.version}</version>
125 </dependency> 131 </dependency>
126 132
127 - 133 +
128 <!-- **** TOOLS : LOGS + UTILS **** --> 134 <!-- **** TOOLS : LOGS + UTILS **** -->
129 135
130 <dependency> 136 <dependency>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
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.
15 Cette version CUBI est la 3e mouture du site. 15 Cette version CUBI est la 3e mouture du site.
16 </description> 16 </description>
17 - 17 +
18 <modules> 18 <modules>
19 <module>grog-entities</module> 19 <module>grog-entities</module>
20 <module>grog-webapp</module> 20 <module>grog-webapp</module>
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
28 <tomee.javaee-api.version>7.0</tomee.javaee-api.version> 28 <tomee.javaee-api.version>7.0</tomee.javaee-api.version>
29 29
30 <solr.version>6.3.0</solr.version> 30 <solr.version>6.3.0</solr.version>
31 - 31 +
32 <!-- TEST --> 32 <!-- TEST -->
33 <junit.platform.version>1.0.0-M3</junit.platform.version> 33 <junit.platform.version>1.0.0-M3</junit.platform.version>
34 <junit.jupiter.version>5.0.0-M3</junit.jupiter.version> 34 <junit.jupiter.version>5.0.0-M3</junit.jupiter.version>
...@@ -47,6 +47,15 @@ ...@@ -47,6 +47,15 @@
47 <artifactId>solr-solrj</artifactId> 47 <artifactId>solr-solrj</artifactId>
48 <version>${solr.version}</version> 48 <version>${solr.version}</version>
49 </dependency> 49 </dependency>
50 +
51 + <!-- SPECS JEE -->
52 + <dependency>
53 + <groupId>org.apache.tomee</groupId>
54 + <artifactId>javaee-api</artifactId>
55 + <version>${tomee.javaee-api.version}</version>
56 + <scope>provided</scope>
57 + </dependency>
58 +
50 <dependency> 59 <dependency>
51 <groupId>io.spring.platform</groupId> 60 <groupId>io.spring.platform</groupId>
52 <artifactId>platform-bom</artifactId> 61 <artifactId>platform-bom</artifactId>
...@@ -59,14 +68,6 @@ ...@@ -59,14 +68,6 @@
59 68
60 <dependencies> 69 <dependencies>
61 70
62 - <!-- SPECS JEE -->
63 - <dependency>
64 - <groupId>org.apache.tomee</groupId>
65 - <artifactId>javaee-api</artifactId>
66 - <version>${tomee.javaee-api.version}</version>
67 - <scope>provided</scope>
68 - </dependency>
69 -
70 71
71 <!-- **** TEST SCOPE **** --> 72 <!-- **** TEST SCOPE **** -->
72 <dependency> 73 <dependency>
...@@ -85,7 +86,7 @@ ...@@ -85,7 +86,7 @@
85 86
86 <dependency> 87 <dependency>
87 <groupId>org.junit.platform</groupId> 88 <groupId>org.junit.platform</groupId>
88 - <artifactId> junit-platform-console</artifactId> 89 + <artifactId>junit-platform-console</artifactId>
89 <version>${junit.platform.version}</version> 90 <version>${junit.platform.version}</version>
90 <scope>test</scope> 91 <scope>test</scope>
91 </dependency> 92 </dependency>
...@@ -163,7 +164,7 @@ ...@@ -163,7 +164,7 @@
163 <trimStackTrace>false</trimStackTrace> 164 <trimStackTrace>false</trimStackTrace>
164 </configuration> 165 </configuration>
165 </plugin> 166 </plugin>
166 - 167 +
167 <plugin> 168 <plugin>
168 <groupId>org.jacoco</groupId> 169 <groupId>org.jacoco</groupId>
169 <artifactId>jacoco-maven-plugin</artifactId> 170 <artifactId>jacoco-maven-plugin</artifactId>
......