Skip to content

Commit

Permalink
Release 2.0 (PR #272)
Browse files Browse the repository at this point in the history
  • Loading branch information
@axlbonnet
axlbonnet authored Dec 14, 2020
2 parents 82b9942 + 04df98c commit 6016063
Show file tree
Hide file tree
Showing 301 changed files with 10,190 additions and 9,867 deletions.
94 changes: 84 additions & 10 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ knowledge of the CeCILL-B license and that you accept its terms.
<properties>
<!-- project version. Only to change it here (and in CoreConstants.java
Follow this practice : https://maven.apache.org/maven-ci-friendly.html-->
<revision>1.28</revision>
<changelist></changelist>
<revision>2.0</revision>
<changelist/>
<sha1/>

<!-- other maven config -->
Expand All @@ -53,9 +53,10 @@ knowledge of the CeCILL-B license and that you accept its terms.
<maven.compiler.source>1.8</maven.compiler.source>

<!-- dependencies version -->
<springmvc.version>4.3.1.RELEASE</springmvc.version>
<springsecurity.version>4.1.1.RELEASE</springsecurity.version>
<jackson.version>2.9.10.1</jackson.version>
<junit.version>5.6.2</junit.version>
<spring-framework.version>5.2.6.RELEASE</spring-framework.version>
<springsecurity.version>5.3.2.RELEASE</springsecurity.version>
<jackson.version>2.11.0</jackson.version>
</properties>

<description>VIP</description>
Expand All @@ -77,13 +78,15 @@ knowledge of the CeCILL-B license and that you accept its terms.
<module>vip-core</module>
<module>vip-docs</module>
<module>vip-application</module>
<module>vip-publication</module>
<module>vip-datamanagement</module>
<module>vip-gatelab</module>
<module>vip-portal</module>
<module>vip-application-importer</module>
<module>vip-social</module>
<module>vip-api</module>
<module>vip-visualization</module>
<module>vip-local</module>
</modules>

<dependencyManagement>
Expand Down Expand Up @@ -115,11 +118,6 @@ knowledge of the CeCILL-B license and that you accept its terms.
</dependency>

<!-- logging libs -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.30</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Expand All @@ -133,6 +131,64 @@ knowledge of the CeCILL-B license and that you accept its terms.
</dependencies>
</dependencyManagement>

<!-- Test dependencies -->

<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>${spring-framework.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>1.4.200</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.h-thurow</groupId>
<artifactId>simple-jndi</artifactId>
<version>0.23.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.3.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-test</artifactId>
<version>${springsecurity.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<version>2.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
<version>2.2.0</version>
<scope>test</scope>
</dependency>
</dependencies>

<repositories>

<repository>
Expand Down Expand Up @@ -204,6 +260,24 @@ knowledge of the CeCILL-B license and that you accept its terms.
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0-M5</version>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
51 changes: 0 additions & 51 deletions vip-api/nb-configuration.xml
View file

This file was deleted.

53 changes: 18 additions & 35 deletions vip-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ knowledge of the CeCILL-B license and that you accept its terms.

<properties>
<skip.itests>true</skip.itests>
<test.version.hamcrest>2.2</test.version.hamcrest>
<test.version.mockito>3.3.3</test.version.mockito>
</properties>

<dependencies>
Expand All @@ -69,7 +71,7 @@ knowledge of the CeCILL-B license and that you accept its terms.
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${springmvc.version}</version>
<version>${spring-framework.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
Expand All @@ -88,38 +90,30 @@ knowledge of the CeCILL-B license and that you accept its terms.
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>${jackson.version}</version>
</dependency>

<!-- Validation implementation -->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>4.3.2.Final</version>
<version>6.1.5.Final</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.el</artifactId>
<version>3.0.3</version>
</dependency>

<!-- Test dependencies -->

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.stefanbirkner</groupId>
<artifactId>system-rules</artifactId>
<version>1.16.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.10.19</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-test</artifactId>
<version>4.1.1.RELEASE</version>
<version>${springsecurity.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -130,14 +124,8 @@ knowledge of the CeCILL-B license and that you accept its terms.
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
<version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.3.1.RELEASE</version>
<artifactId>hamcrest</artifactId>
<version>${test.version.hamcrest}</version>
<scope>test</scope>
</dependency>
<!-- End test dependencies -->
Expand All @@ -159,16 +147,11 @@ knowledge of the CeCILL-B license and that you accept its terms.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M4</version>
<configuration>
<systemPropertyVariables>
<log4j.configuration>log4j.properties</log4j.configuration>
</systemPropertyVariables>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.19.1</version>
<version>3.0.0-M4</version>
<executions>
<execution>
<goals>
Expand Down
Loading

0 comments on commit 6016063

Please sign in to comment.