diff --git a/Jenkinsfile b/Jenkinsfile
index 7365e56189..6a50e3448e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,10 +14,10 @@ pipeline {
stages {
stage("Docker images") {
parallel {
- stage('Publish OpenJDK 8 + Redis 6.0 docker image') {
+ stage('Publish OpenJDK 8 + Redis 6.2 docker image') {
when {
anyOf {
- changeset "ci/openjdk8-redis-6.0/**"
+ changeset "ci/openjdk8-redis-6.2/**"
changeset "Makefile"
}
}
@@ -26,17 +26,17 @@ pipeline {
steps {
script {
- def image = docker.build("springci/spring-data-openjdk8-with-redis-6.0", "-f ci/openjdk8-redis-6.0/Dockerfile .")
+ def image = docker.build("springci/spring-data-openjdk8-with-redis-6.2", "-f ci/openjdk8-redis-6.2/Dockerfile .")
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
image.push()
}
}
}
}
- stage('Publish OpenJDK 11 + Redis 6.0 docker image') {
+ stage('Publish OpenJDK 11 + Redis 6.2 docker image') {
when {
anyOf {
- changeset "ci/openjdk11-redis-6.0/**"
+ changeset "ci/openjdk11-redis-6.2/**"
changeset "Makefile"
}
}
@@ -45,17 +45,17 @@ pipeline {
steps {
script {
- def image = docker.build("springci/spring-data-openjdk11-with-redis-6.0", "-f ci/openjdk11-redis-6.0/Dockerfile .")
+ def image = docker.build("springci/spring-data-openjdk11-with-redis-6.2", "-f ci/openjdk11-redis-6.2/Dockerfile .")
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
image.push()
}
}
}
}
- stage('Publish OpenJDK 15 + Redis 6.0 docker image') {
+ stage('Publish OpenJDK 15 + Redis 6.2 docker image') {
when {
anyOf {
- changeset "ci/openjdk15-redis-6.0/**"
+ changeset "ci/openjdk15-redis-6.2/**"
changeset "Makefile"
}
}
@@ -64,7 +64,7 @@ pipeline {
steps {
script {
- def image = docker.build("springci/spring-data-openjdk15-with-redis-6.0", "-f ci/openjdk15-redis-6.0/Dockerfile .")
+ def image = docker.build("springci/spring-data-openjdk15-with-redis-6.2", "-f ci/openjdk15-redis-6.2/Dockerfile .")
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
image.push()
}
@@ -88,7 +88,7 @@ pipeline {
steps {
script {
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
- docker.image('springci/spring-data-openjdk8-with-redis-6.0:latest').inside('-v $HOME:/tmp/jenkins-home') {
+ docker.image('springci/spring-data-openjdk8-with-redis-6.2:latest').inside('-v $HOME:/tmp/jenkins-home') {
sh 'PROFILE=none LONG_TESTS=true ci/test.sh'
}
}
@@ -112,7 +112,7 @@ pipeline {
steps {
script {
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
- docker.image('springci/spring-data-openjdk11-with-redis-6.0:latest').inside('-v $HOME:/tmp/jenkins-home') {
+ docker.image('springci/spring-data-openjdk11-with-redis-6.2:latest').inside('-v $HOME:/tmp/jenkins-home') {
sh 'PROFILE=java11 ci/test.sh'
}
}
@@ -127,7 +127,7 @@ pipeline {
steps {
script {
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
- docker.image('springci/spring-data-openjdk15-with-redis-6.0:latest').inside('-v $HOME:/tmp/jenkins-home') {
+ docker.image('springci/spring-data-openjdk15-with-redis-6.2:latest').inside('-v $HOME:/tmp/jenkins-home') {
sh 'PROFILE=java11 ci/test.sh'
}
}
diff --git a/ci/openjdk11-redis-6.0/Dockerfile b/ci/openjdk11-redis-6.2/Dockerfile
similarity index 75%
rename from ci/openjdk11-redis-6.0/Dockerfile
rename to ci/openjdk11-redis-6.2/Dockerfile
index 8f249302dd..5ab4fd42c1 100644
--- a/ci/openjdk11-redis-6.0/Dockerfile
+++ b/ci/openjdk11-redis-6.2/Dockerfile
@@ -6,8 +6,7 @@ COPY ./Makefile /
RUN set -eux; \
apt-get update ; \
apt-get install -y build-essential ; \
- make work/redis/bin/redis-cli work/redis/bin/redis-server; \
+ make work/redis/bin/redis-cli work/redis/bin/redis-server REDIS_VERSION=6.2.1; \
chmod -R o+rw work; \
apt-get clean; \
rm -rf /var/lib/apt/lists/*;
-
diff --git a/ci/openjdk15-redis-6.0/Dockerfile b/ci/openjdk15-redis-6.2/Dockerfile
similarity index 75%
rename from ci/openjdk15-redis-6.0/Dockerfile
rename to ci/openjdk15-redis-6.2/Dockerfile
index 8d9064d2d5..09f9ad25d1 100644
--- a/ci/openjdk15-redis-6.0/Dockerfile
+++ b/ci/openjdk15-redis-6.2/Dockerfile
@@ -6,8 +6,7 @@ COPY ./Makefile /
RUN set -eux; \
apt-get update ; \
apt-get install -y build-essential ; \
- make work/redis/bin/redis-cli work/redis/bin/redis-server; \
+ make work/redis/bin/redis-cli work/redis/bin/redis-server REDIS_VERSION=6.2.1; \
chmod -R o+rw work; \
apt-get clean; \
rm -rf /var/lib/apt/lists/*;
-
diff --git a/ci/openjdk8-redis-6.0/Dockerfile b/ci/openjdk8-redis-6.2/Dockerfile
similarity index 75%
rename from ci/openjdk8-redis-6.0/Dockerfile
rename to ci/openjdk8-redis-6.2/Dockerfile
index 516cf6fd9b..7181f3903e 100644
--- a/ci/openjdk8-redis-6.0/Dockerfile
+++ b/ci/openjdk8-redis-6.2/Dockerfile
@@ -6,7 +6,7 @@ COPY ./Makefile /
RUN set -eux; \
apt-get update ; \
apt-get install -y build-essential ; \
- make work/redis/bin/redis-cli work/redis/bin/redis-server; \
+ make work/redis/bin/redis-cli work/redis/bin/redis-server REDIS_VERSION=6.2.1; \
chmod -R o+rw work; \
apt-get clean; \
rm -rf /var/lib/apt/lists/*;
diff --git a/pom.xml b/pom.xml
index b20e7c9dcc..c4bfaf99c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
org.springframework.data
spring-data-redis
- 2.5.0-SNAPSHOT
+ 2.5.0-GH-1990-SNAPSHOT
Spring Data Redis