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 @@
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
......@@ -40,7 +41,7 @@
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.legrog</groupId>
<artifactId>grog-entities</artifactId>
......@@ -64,5 +65,5 @@
</plugin>
</plugins>
</build>
</project>
......
......@@ -21,7 +21,7 @@
<solr.version>6.3.0</solr.version>
</properties>
<dependencies>
<dependency>
......@@ -29,8 +29,12 @@
<artifactId>solr-solrj</artifactId>
<version>${solr.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>javaee-api</artifactId>
</dependency>
<!-- **** TOOLS : LOGS + UTILS **** -->
<dependency>
......@@ -43,7 +47,7 @@
<artifactId>logback-classic</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-jpa</artifactId>
......
......@@ -51,11 +51,6 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>1.5.2.RELEASE</version>
<configuration>
<mainClass>org.legrog.recommendation.postprocess.PostprocessingApplication</mainClass>
<layout>ZIP</layout>
</configuration>
<executions>
<execution>
<goals>
......
......@@ -7,7 +7,10 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
import org.springframework.context.annotation.Bean;
import java.io.*;
......@@ -33,6 +36,9 @@ public class PostprocessingApplication {
Properties properties;
Set<Long> sampleItemIds;
Set<Long> sampleUserIds;
//fixme ne jamais utiliser de classes concretes comme type de variables
// ce que tu veux ici c'est Map<Long, Set<Long>>
HashMap<Long, Set<Long>> sampleItemUserIds;
public static void main(String[] args) {
......@@ -88,6 +94,7 @@ public class PostprocessingApplication {
logger.trace("Nombre de couples item-user dans l'échantillon {}", sampleCoupleCount);
} catch (IOException e) {
//fixme use logger instead of e.printStackTrace() !!!
e.printStackTrace();
}
......@@ -110,6 +117,8 @@ public class PostprocessingApplication {
void loadParametersProperties() {
//fixme use logger instead of e.printStackTrace() !!!
Properties properties = new Properties();
InputStream in = null;
try {
......
......@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>Web-application of GROG</name>
<url>http://legrog.org</url>
<description>
......@@ -19,8 +19,8 @@
<artifactId>grog-webapp</artifactId>
<version>3.0-SNAPSHOT</version>
<packaging>war</packaging>
<properties>
<!-- dependencies version -->
<omnifaces.version>2.5.1</omnifaces.version>
......@@ -32,8 +32,8 @@
<custom.web.dir>src/main/java/org/legrog/web</custom.web.dir>
<!-- misc -->
<debug.jvm.args />
<tomee.autoreload />
<debug.jvm.args/>
<tomee.autoreload/>
</properties>
......@@ -60,7 +60,7 @@
</profile>
</profiles>
<dependencies>
<dependency>
......@@ -68,7 +68,7 @@
<artifactId>grog-entities</artifactId>
<version>3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.legrog</groupId>
<artifactId>grog-entities</artifactId>
......@@ -77,6 +77,12 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>javaee-api</artifactId>
</dependency>
<!-- https://mvnrepository.com/artifact/org.omnifaces/omnifaces -->
<dependency>
<groupId>org.omnifaces</groupId>
......@@ -124,7 +130,7 @@
<version>${rewrite.version}</version>
</dependency>
<!-- **** TOOLS : LOGS + UTILS **** -->
<dependency>
......
......@@ -14,7 +14,7 @@
Le Guide du Roliste Galactique (GROG) est une encyclopedie en ligne référençant tous les jeux de rôles connus.
Cette version CUBI est la 3e mouture du site.
</description>
<modules>
<module>grog-entities</module>
<module>grog-webapp</module>
......@@ -28,7 +28,7 @@
<tomee.javaee-api.version>7.0</tomee.javaee-api.version>
<solr.version>6.3.0</solr.version>
<!-- TEST -->
<junit.platform.version>1.0.0-M3</junit.platform.version>
<junit.jupiter.version>5.0.0-M3</junit.jupiter.version>
......@@ -47,6 +47,15 @@
<artifactId>solr-solrj</artifactId>
<version>${solr.version}</version>
</dependency>
<!-- SPECS JEE -->
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>javaee-api</artifactId>
<version>${tomee.javaee-api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.spring.platform</groupId>
<artifactId>platform-bom</artifactId>
......@@ -59,14 +68,6 @@
<dependencies>
<!-- SPECS JEE -->
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>javaee-api</artifactId>
<version>${tomee.javaee-api.version}</version>
<scope>provided</scope>
</dependency>
<!-- **** TEST SCOPE **** -->
<dependency>
......@@ -85,7 +86,7 @@
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId> junit-platform-console</artifactId>
<artifactId>junit-platform-console</artifactId>
<version>${junit.platform.version}</version>
<scope>test</scope>
</dependency>
......@@ -163,7 +164,7 @@
<trimStackTrace>false</trimStackTrace>
</configuration>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
......