Toggle navigation
Toggle navigation
This project
Loading...
Sign in
grogv3
/
grog-cubi
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
JR Utily
2017-03-28 01:08:14 +0200
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
d189a98a47d753be3248cdd54d22722c7c0761de
d189a98a
1 parent
19ded7b0
fix wrong dependency of SolRJ (due to Spring Bom)
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
35 additions
and
24 deletions
grog-entities/pom.xml
pom.xml
webapp/pom.xml
grog-entities/pom.xml
View file @
d189a98
...
...
@@ -12,6 +12,7 @@
<version>
3.0-SNAPSHOT
</version>
</parent>
<artifactId>
grog-entities
</artifactId>
<version>
${parent.version}
</version>
<packaging>
jar
</packaging>
<properties>
...
...
@@ -93,5 +94,21 @@
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-jar-plugin
</artifactId>
<version>
2.5
</version>
<executions>
<execution>
<goals>
<goal>
test-jar
</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
...
...
pom.xml
View file @
d189a98
...
...
@@ -8,7 +8,7 @@
<version>
3.0-SNAPSHOT
</version>
<packaging>
pom
</packaging>
<name>
Web-application of GROG
</name>
<name>
GROG root
</name>
<url>
http://legrog.org
</url>
<description>
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 @@
</description>
<modules>
<module>
grog-entities
</module>
<module>
webapp
</module>
<module>
migration/db-generator
</module>
<module>
grog-entities
</module>
</modules>
<properties>
...
...
@@ -26,6 +26,8 @@
<spring.platform-bom.version>
Athens-SR1
</spring.platform-bom.version>
<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>
...
...
@@ -40,6 +42,11 @@
<dependencyManagement>
<dependencies>
<dependency>
<groupId>
org.apache.solr
</groupId>
<artifactId>
solr-solrj
</artifactId>
<version>
${solr.version}
</version>
</dependency>
<dependency>
<groupId>
io.spring.platform
</groupId>
<artifactId>
platform-bom
</artifactId>
<version>
${spring.platform-bom.version}
</version>
...
...
webapp/pom.xml
View file @
d189a98
...
...
@@ -17,26 +17,16 @@
<version>
3.0-SNAPSHOT
</version>
</parent>
<artifactId>
grog-webapp
</artifactId>
<version>
${parent.version}
</version>
<packaging>
war
</packaging>
<properties>
<!-- dependencies version -->
<spring.platform-bom.version>
Athens-SR1
</spring.platform-bom.version>
<omnifaces.version>
2.5.1
</omnifaces.version>
<primefaces.version>
6.0
</primefaces.version>
<myfaces.version>
2.2.10
</myfaces.version>
<tomee.javaee-api.version>
7.0
</tomee.javaee-api.version>
<assertj-core.version>
1.6.1
</assertj-core.version>
<openjpa.version>
2.4.1
</openjpa.version>
<rewrite.version>
3.4.1.Final
</rewrite.version>
<hibernate-commons-annotations.version>
5.0.1.Final
</hibernate-commons-annotations.version>
<hibernate-jpa-2.1-api.version>
1.0.0.Final
</hibernate-jpa-2.1-api.version>
<junit.platform.version>
1.0.0-M3
</junit.platform.version>
<junit.jupiter.version>
5.0.0-M3
</junit.jupiter.version>
<mockito-core.version>
2.2.16
</mockito-core.version>
<spring-data-solr.version>
3.0.0.M1
</spring-data-solr.version>
<solr.version>
6.3.0
</solr.version>
<!-- paths -->
<custom.web.dir>
src/main/java/org/legrog/web
</custom.web.dir>
...
...
@@ -44,10 +34,6 @@
<!-- misc -->
<debug.jvm.args
/>
<tomee.autoreload
/>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
<maven.compiler.source>
1.8
</maven.compiler.source>
<maven.compiler.target>
1.8
</maven.compiler.target>
</properties>
...
...
@@ -82,14 +68,15 @@
<artifactId>
grog-entities
</artifactId>
<version>
3.0-SNAPSHOT
</version>
</dependency>
<dependency>
<groupId>
org.apache.solr
</groupId>
<artifactId>
solr-solrj
</artifactId>
<version>
${solr.version}
</version>
<groupId>
org.legrog
</groupId>
<artifactId>
grog-entities
</artifactId>
<version>
3.0-SNAPSHOT
</version>
<type>
test-jar
</type>
<scope>
test
</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.omnifaces/omnifaces -->
<dependency>
<groupId>
org.omnifaces
</groupId>
...
...
Please
register
or
login
to post a comment