Release 2.2.5.RELEASE

Upgrade Hazelcast to 3.12.11
Closes gh-1776
2021-01-19 15:08:24 +01:00 · 2021-01-18 16:28:54 +01:00 · 2021-01-18 16:27:19 +01:00 · 2021-01-18 16:26:04 +01:00 · 2021-01-18 16:16:00 +01:00 · 2021-01-18 15:46:38 +01:00
5 changed files with 39 additions and 15 deletions
--- a/22
+++ b/22
@@ -8,6 +8,8 @@ properties([
 def SUCCESS = hudson.model.Result.SUCCESS.toString()
 currentBuild.result = SUCCESS

+def ARTIFACTORY_CREDENTIALS = usernamePassword(credentialsId: '02bd1690-b54f-4c9f-819d-a77cb7a9822c', usernameVariable: 'ARTIFACTORY_USERNAME', passwordVariable: 'ARTIFACTORY_PASSWORD')
+
 try {
 	parallel check: {
 		stage('Check') {
@@ -17,8 +19,10 @@ try {
 					checkout scm
 					sh "git clean -dfx"
 					try {
-						withEnv(["JAVA_HOME=${tool 'jdk8'}"]) {
-							sh './gradlew clean check --no-daemon --stacktrace'
+					    withCredentials([ARTIFACTORY_CREDENTIALS]) {
+                            withEnv(["JAVA_HOME=${tool 'jdk8'}"]) {
+                                sh './gradlew clean check -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD --no-daemon --stacktrace'
+                            }
 						}
 					}
 					catch (e) {
@@ -39,8 +43,10 @@ try {
 					checkout scm
 					sh "git clean -dfx"
 					try {
-						withEnv(["JAVA_HOME=${tool 'jdk11'}"]) {
-							sh './gradlew clean test integrationTest --no-daemon --stacktrace'
+					    withCredentials([ARTIFACTORY_CREDENTIALS]) {
+                            withEnv(["JAVA_HOME=${tool 'jdk11'}"]) {
+                                sh './gradlew clean test integrationTest -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD --no-daemon --stacktrace'
+                            }
 						}
 					}
 					catch (e) {
@@ -57,8 +63,10 @@ try {
 				node('linux') {
 					checkout scm
 					try {
-						withEnv(["JAVA_HOME=${tool 'openjdk12'}"]) {
-							sh './gradlew clean test integrationTest --no-daemon --stacktrace'
+					    withCredentials([ARTIFACTORY_CREDENTIALS]) {
+                            withEnv(["JAVA_HOME=${tool 'openjdk12'}"]) {
+                                sh './gradlew clean test integrationTest -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD --no-daemon --stacktrace'
+                            }
 						}
 					}
 					catch (e) {
@@ -80,7 +88,7 @@ try {
 						withCredentials([file(credentialsId: 'spring-signing-secring.gpg', variable: 'SIGNING_KEYRING_FILE')]) {
 							withCredentials([string(credentialsId: 'spring-gpg-passphrase', variable: 'SIGNING_PASSWORD')]) {
 								withCredentials([usernamePassword(credentialsId: 'oss-token', passwordVariable: 'OSSRH_PASSWORD', usernameVariable: 'OSSRH_USERNAME')]) {
-									withCredentials([usernamePassword(credentialsId: '02bd1690-b54f-4c9f-819d-a77cb7a9822c', usernameVariable: 'ARTIFACTORY_USERNAME', passwordVariable: 'ARTIFACTORY_PASSWORD')]) {
+									withCredentials([ARTIFACTORY_CREDENTIALS]) {
 										withEnv(["JAVA_HOME=${tool 'jdk8'}"]) {
 											sh './gradlew deployArtifacts --no-daemon --stacktrace -Psigning.secretKeyRingFile=$SIGNING_KEYRING_FILE -Psigning.keyId=$SPRING_SIGNING_KEYID -Psigning.password=$SIGNING_PASSWORD -PossrhUsername=$OSSRH_USERNAME -PossrhPassword=$OSSRH_PASSWORD -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD'
                                            sh './gradlew finalizeDeployArtifacts --no-daemon --stacktrace -Psigning.secretKeyRingFile=$SIGNING_KEYRING_FILE -Psigning.keyId=$SPRING_SIGNING_KEYID -Psigning.password=$SIGNING_PASSWORD -PossrhUsername=$OSSRH_USERNAME -PossrhPassword=$OSSRH_PASSWORD -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD'
--- a/build.gradle
+++ b/build.gradle
@@ -34,3 +34,19 @@ subprojects {
 		useJUnitPlatform()
 	}
 }
+
+if (project.hasProperty('artifactoryUsername')) {
+    allprojects { project ->
+        project.repositories { repos ->
+            all { repo ->
+                if (!repo.url.toString().startsWith("https://repo.spring.io/")) {
+                    return;
+                }
+                repo.credentials {
+                    username = artifactoryUsername
+                    password = artifactoryPassword
+                }
+            }
+        }
+    }
+}
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 org.gradle.parallel=true
-version=2.2.4.RELEASE
+version=2.2.5.RELEASE
--- a/gradle/dependency-management.gradle
+++ b/gradle/dependency-management.gradle
@@ -1,15 +1,15 @@
 dependencyManagement {
 	imports {
-		mavenBom 'io.projectreactor:reactor-bom:Dysprosium-SR12'
+		mavenBom 'io.projectreactor:reactor-bom:Dysprosium-SR16'
 		mavenBom 'org.junit:junit-bom:5.5.2'
-		mavenBom 'org.springframework:spring-framework-bom:5.2.9.RELEASE'
-		mavenBom 'org.springframework.data:spring-data-releasetrain:Moore-SR10'
-		mavenBom 'org.springframework.security:spring-security-bom:5.2.6.RELEASE'
-		mavenBom 'org.testcontainers:testcontainers-bom:1.12.5'
+		mavenBom 'org.springframework:spring-framework-bom:5.2.12.RELEASE'
+		mavenBom 'org.springframework.data:spring-data-releasetrain:Moore-SR12'
+		mavenBom 'org.springframework.security:spring-security-bom:5.2.8.RELEASE'
+		mavenBom 'org.testcontainers:testcontainers-bom:1.15.1'
 	}

 	dependencies {
-		dependencySet(group: 'com.hazelcast', version: '3.12.5') {
+		dependencySet(group: 'com.hazelcast', version: '3.12.11') {
 			entry 'hazelcast'
 			entry 'hazelcast-client'
 		}
--- a/spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/ClientServerHazelcastIndexedSessionRepositoryITests.java
+++ b/spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/ClientServerHazelcastIndexedSessionRepositoryITests.java
@@ -46,7 +46,7 @@ import org.springframework.test.context.web.WebAppConfiguration;
@WebAppConfiguration
 class ClientServerHazelcastIndexedSessionRepositoryITests extends AbstractHazelcastIndexedSessionRepositoryITests {

-	private static GenericContainer container = new GenericContainer<>("hazelcast/hazelcast:3.12.3")
+	private static GenericContainer container = new GenericContainer<>("hazelcast/hazelcast:3.12.11")
 			.withExposedPorts(5701).withCopyFileToContainer(MountableFile.forClasspathResource("/hazelcast-server.xml"),
 					"/opt/hazelcast/hazelcast.xml");
Author	SHA1	Message	Date
Eleftheria Stein	c1e3c2831d	Release 2.2.5.RELEASE	2021-01-19 15:08:24 +01:00
Eleftheria Stein	e228279683	Upgrade Hazelcast to 3.12.11 Closes gh-1776	2021-01-18 16:28:54 +01:00
Eleftheria Stein	70c14368e5	Upgrade Spring Data to Moore-SR12 Closes gh-1775	2021-01-18 16:27:19 +01:00
Eleftheria Stein	7f9abc822f	Upgrade Spring Security to 5.2.8 Closes gh-1774	2021-01-18 16:26:04 +01:00
Eleftheria Stein	f426f91574	Upgrade Spring Framework to 5.2.12 Closes gh-1773	2021-01-18 16:16:00 +01:00
Eleftheria Stein	316fe09f72	Upgrade Reactor to Dysprosium-SR16 Closes gh-1772	2021-01-18 15:46:38 +01:00
Eleftheria Stein	00338e23dd	Update testcontainers to fix Docker connectivity Closes gh-1751	2021-01-07 11:26:59 +01:00
Eleftheria Stein	c6c2d53204	Add artifactory credentials to build	2020-11-18 13:34:35 +01:00
Eleftheria Stein	bf5dcda905	Next development version	2020-09-16 16:37:49 +02:00