Introduce Reactor Californium and Spring Session 2.1
* Introduce convergence plugin to avoid conflicting library versions * Introduce Spring Session 2.1 and Reactor Californium for profiles using Spring Framework 5.1/Spring Security 5.1.
This commit is contained in:
Greg Turnquist
16
circle.yml
16
circle.yml
@@ -9,7 +9,7 @@ jobs:
|
||||
name: Java 8 - Test current version
|
||||
command: mvn clean dependency:list test -P${PROFILE} -Dsort
|
||||
environment:
|
||||
PROFILE: non-existent
|
||||
PROFILE: non-existent,convergence
|
||||
|
||||
j8_spring_next:
|
||||
docker:
|
||||
@@ -20,7 +20,7 @@ jobs:
|
||||
name: Java 8 - Test Spring.NEXT
|
||||
command: mvn clean dependency:list test -P${PROFILE} -Dsort
|
||||
environment:
|
||||
PROFILE: spring5-next
|
||||
PROFILE: spring5-next,convergence
|
||||
|
||||
j8_spring51_next:
|
||||
docker:
|
||||
@@ -31,7 +31,7 @@ jobs:
|
||||
name: Java 8 - Test Spring.NEXT 5.1
|
||||
command: mvn clean dependency:list test -P${PROFILE} -Dsort
|
||||
environment:
|
||||
PROFILE: spring51-next
|
||||
PROFILE: spring51-next,convergence
|
||||
|
||||
j8_springdata_next:
|
||||
docker:
|
||||
@@ -42,7 +42,7 @@ jobs:
|
||||
name: Java 8 - Test Spring Data.NEXT
|
||||
command: mvn clean dependency:list test -P${PROFILE} -Dsort
|
||||
environment:
|
||||
PROFILE: springdata-next
|
||||
PROFILE: springdata-next,convergence
|
||||
|
||||
j10_current:
|
||||
docker:
|
||||
@@ -53,7 +53,7 @@ jobs:
|
||||
name: Java 10 - Test current version
|
||||
command: mvn clean dependency:list test -P${PROFILE} -Dsort
|
||||
environment:
|
||||
PROFILE: non-existent
|
||||
PROFILE: non-existent,java10,convergence
|
||||
|
||||
j10_spring_next:
|
||||
docker:
|
||||
@@ -64,7 +64,7 @@ jobs:
|
||||
name: Java 10 - Test Spring.NEXT
|
||||
command: mvn clean dependency:list test -P${PROFILE} -Dsort
|
||||
environment:
|
||||
PROFILE: spring5-next
|
||||
PROFILE: spring5-next,java10,convergence
|
||||
|
||||
j10_spring51_next:
|
||||
docker:
|
||||
@@ -75,7 +75,7 @@ jobs:
|
||||
name: Java 10 - Test Spring.NEXT 5.1
|
||||
command: mvn clean dependency:list test -P${PROFILE} -Dsort
|
||||
environment:
|
||||
PROFILE: spring51-next
|
||||
PROFILE: spring51-next,java10,convergence
|
||||
|
||||
j10_springdata_next:
|
||||
docker:
|
||||
@@ -86,7 +86,7 @@ jobs:
|
||||
name: Java 10 - Test Spring Data.NEXT
|
||||
command: mvn clean dependency:list test -P${PROFILE} -Dsort
|
||||
environment:
|
||||
PROFILE: springdata-next
|
||||
PROFILE: springdata-next,java10,convergence
|
||||
|
||||
deploy:
|
||||
docker:
|
||||
|
||||
90
pom.xml
90
pom.xml
@@ -7,7 +7,7 @@
|
||||
<version>2.0.3.BUILD-SNAPSHOT</version>
|
||||
|
||||
<name>Spring Session MongoDB</name>
|
||||
<url>https://github.com/spring-projects/spring-session-data-mongodb</url>
|
||||
<url>http://spring.io/projects/spring-session-data-mongodb</url>
|
||||
<description>
|
||||
Persist session data in MongoDB
|
||||
</description>
|
||||
@@ -77,11 +77,11 @@
|
||||
<mockito.version>2.18.3</mockito.version>
|
||||
<mongo.version>3.5.0</mongo.version>
|
||||
<mongo-reactivestreams.version>1.6.0</mongo-reactivestreams.version>
|
||||
<reactor.version>Bismuth-SR9</reactor.version>
|
||||
<spring.version>5.0.6.RELEASE</spring.version>
|
||||
<spring-data.version>Kay-SR7</spring-data.version>
|
||||
<spring-security.version>5.0.5.RELEASE</spring-security.version>
|
||||
<spring-session.version>2.0.3.RELEASE</spring-session.version>
|
||||
<reactor.version>Bismuth-SR10</reactor.version>
|
||||
<spring.version>5.0.8.RELEASE</spring.version>
|
||||
<spring-data.version>Kay-SR9</spring-data.version>
|
||||
<spring-security.version>5.0.7.RELEASE</spring-security.version>
|
||||
<spring-session.version>2.0.4.RELEASE</spring-session.version>
|
||||
</properties>
|
||||
|
||||
<profiles>
|
||||
@@ -90,10 +90,10 @@
|
||||
<id>spring5-next</id>
|
||||
<properties>
|
||||
<reactor.version>Bismuth-BUILD-SNAPSHOT</reactor.version>
|
||||
<spring.version>5.0.7.BUILD-SNAPSHOT</spring.version>
|
||||
<spring.version>5.0.9.BUILD-SNAPSHOT</spring.version>
|
||||
<spring-data.version>Kay-BUILD-SNAPSHOT</spring-data.version>
|
||||
<spring-security.version>5.0.6.BUILD-SNAPSHOT</spring-security.version>
|
||||
<spring-session.version>2.0.4.BUILD-SNAPSHOT</spring-session.version>
|
||||
<spring-security.version>5.0.8.BUILD-SNAPSHOT</spring-security.version>
|
||||
<spring-session.version>2.0.5.BUILD-SNAPSHOT</spring-session.version>
|
||||
</properties>
|
||||
<repositories>
|
||||
<repository>
|
||||
@@ -106,11 +106,13 @@
|
||||
<profile>
|
||||
<id>spring51-next</id>
|
||||
<properties>
|
||||
<reactor.version>Bismuth-BUILD-SNAPSHOT</reactor.version>
|
||||
<spring.version>5.1.0.BUILD-SNAPSHOT</spring.version>
|
||||
<spring-data.version>Kay-BUILD-SNAPSHOT</spring-data.version>
|
||||
<spring-security.version>5.0.6.BUILD-SNAPSHOT</spring-security.version>
|
||||
<spring-session.version>2.0.4.BUILD-SNAPSHOT</spring-session.version>
|
||||
<reactor.version>Californium-M1</reactor.version>
|
||||
<mongo.version>3.8.0</mongo.version>
|
||||
<mongo-reactivestreams.version>1.9.0</mongo-reactivestreams.version>
|
||||
<spring.version>5.1.0.RC1</spring.version>
|
||||
<spring-data.version>Lovelace-RC1</spring-data.version>
|
||||
<spring-security.version>5.1.0.M2</spring-security.version>
|
||||
<spring-session.version>2.1.0.BUILD-SNAPSHOT</spring-session.version>
|
||||
</properties>
|
||||
<repositories>
|
||||
<repository>
|
||||
@@ -123,13 +125,13 @@
|
||||
<profile>
|
||||
<id>springdata-next</id>
|
||||
<properties>
|
||||
<reactor.version>Bismuth-BUILD-SNAPSHOT</reactor.version>
|
||||
<mongo.version>3.8.0-beta2</mongo.version>
|
||||
<mongo-reactivestreams.version>1.9.0-beta1</mongo-reactivestreams.version>
|
||||
<spring.version>5.0.7.BUILD-SNAPSHOT</spring.version>
|
||||
<reactor.version>Californium-M1</reactor.version>
|
||||
<mongo.version>3.8.0</mongo.version>
|
||||
<mongo-reactivestreams.version>1.9.0</mongo-reactivestreams.version>
|
||||
<spring.version>5.1.0.RC1</spring.version>
|
||||
<spring-data.version>Lovelace-BUILD-SNAPSHOT</spring-data.version>
|
||||
<spring-security.version>5.0.5.RELEASE</spring-security.version>
|
||||
<spring-session.version>2.0.4.BUILD-SNAPSHOT</spring-session.version>
|
||||
<spring-security.version>5.1.0.M2</spring-security.version>
|
||||
<spring-session.version>2.1.0.BUILD-SNAPSHOT</spring-session.version>
|
||||
</properties>
|
||||
<repositories>
|
||||
<repository>
|
||||
@@ -139,6 +141,41 @@
|
||||
</repositories>
|
||||
</profile>
|
||||
|
||||
<profile>
|
||||
<id>convergence</id>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-enforcer-plugin</artifactId>
|
||||
<version>3.0.0-M2</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>default-cli</id>
|
||||
<goals>
|
||||
<goal>enforce</goal>
|
||||
</goals>
|
||||
<phase>validate</phase>
|
||||
<configuration>
|
||||
<rules>
|
||||
<bannedDependencies>
|
||||
<excludes>
|
||||
<exclude>commons-logging:*:*</exclude>
|
||||
</excludes>
|
||||
<searchTransitive>true</searchTransitive>
|
||||
</bannedDependencies>
|
||||
<dependencyConvergence />
|
||||
</rules>
|
||||
<fail>true</fail>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
|
||||
<profile>
|
||||
<id>distribute</id>
|
||||
|
||||
@@ -455,13 +492,6 @@
|
||||
|
||||
<profile>
|
||||
<id>java10</id>
|
||||
<activation>
|
||||
<jdk>10</jdk>
|
||||
</activation>
|
||||
|
||||
<properties>
|
||||
<source.level>1.10</source.level>
|
||||
</properties>
|
||||
</profile>
|
||||
|
||||
</profiles>
|
||||
@@ -562,6 +592,12 @@
|
||||
<artifactId>de.flapdoodle.embed.mongo</artifactId>
|
||||
<version>${flapdoodle.version}</version>
|
||||
<scope>test</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
|
||||
Reference in New Issue
Block a user