Skip to content

Commit 19b2773

Browse files
samueldlightfootsamueldlightfoot
authored
Merge branch 'spring-projects:main' into main
2 parents 0cc4f3c + 17009e7 commit 19b2773

File tree

767 files changed

+783
-782
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

767 files changed

+783
-782
lines changed

‎.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
#Mon Oct 11 14:30:23 CEST 2021
2-
distributionUrl=https\://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.3/apache-maven-3.8.3-bin.zip
1+
#Tue Feb 22 13:59:05 CET 2022
2+
distributionUrl=https\://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip

‎Jenkinsfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ pipeline {
131131
docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-cassandra-3.11:${p['java.next.tag']}").inside(p['docker.java.inside.basic']) {
132132
sh 'mkdir -p /tmp/jenkins-home'
133133
sh 'JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
134-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,external-cassandra,java11 clean dependency:list verify -Dsort -U -B'
134+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,external-cassandra clean dependency:list verify -Dsort -U -B'
135135
}
136136
}
137137
}
@@ -151,7 +151,7 @@ pipeline {
151151
docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-cassandra-3.11:${p['java.lts.tag']}").inside(p['docker.java.inside.basic']) {
152152
sh 'mkdir -p /tmp/jenkins-home'
153153
sh 'JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
154-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,external-cassandra,java11 clean dependency:list verify -Dsort -U -B'
154+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,external-cassandra clean dependency:list verify -Dsort -U -B'
155155
}
156156
}
157157
}
@@ -180,7 +180,7 @@ pipeline {
180180
steps {
181181
script {
182182
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
183-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
183+
docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.basic']) {
184184
sh 'mkdir -p /tmp/jenkins-home'
185185
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
186186
'-Dartifactory.server=https://repo.spring.io ' +

‎ci/pipeline.properties‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
# Java versions
2-
java.main.tag=8u312-b07-jdk
3-
java.next.tag=11.0.13_8-jdk
4-
java.lts.tag=17.0.1_12-jdk
2+
java.main.tag=8u322-b06-jdk
3+
java.next.tag=11.0.14.1_1-jdk
4+
java.lts.tag=17.0.2_8-jdk
55

66
# Docker container images - standard
7-
docker.java.main.image=eclipse-temurin:${java.main.tag}
8-
docker.java.next.image=eclipse-temurin:${java.next.tag}
9-
docker.java.lts.image=eclipse-temurin:${java.lts.tag}
7+
docker.java.main.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.main.tag}
8+
docker.java.next.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.next.tag}
9+
docker.java.lts.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.lts.tag}
1010

1111
# Supported versions of MongoDB
12-
docker.mongodb.4.0.version=4.0.23
13-
docker.mongodb.4.4.version=4.4.4
14-
docker.mongodb.5.0.version=5.0.3
12+
docker.mongodb.4.0.version=4.0.28
13+
docker.mongodb.4.4.version=4.4.12
14+
docker.mongodb.5.0.version=5.0.6
1515

1616
# Supported versions of Redis
17-
docker.redis.6.version=6.2.4
17+
docker.redis.6.version=6.2.6
1818

1919
# Supported versions of Cassandra
20-
docker.cassandra.3.version=3.11.10
20+
docker.cassandra.3.version=3.11.12
2121

2222
# Docker environment settings
2323
docker.java.inside.basic=-v $HOME:/tmp/jenkins-home

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
<build.cassandra.rpc_port>19160</build.cassandra.rpc_port>
9191
<build.cassandra.ssl_storage_port>17001</build.cassandra.ssl_storage_port>
9292
<build.cassandra.storage_port>17000</build.cassandra.storage_port>
93-
<cassandra.version>3.11.10</cassandra.version>
93+
<cassandra.version>3.11.12</cassandra.version>
9494
<cassandra-driver.version>4.13.0</cassandra-driver.version>
9595
<dist.id>spring-data-cassandra</dist.id>
9696
<el.version>1.0</el.version>

‎setup-cassandra.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
if [ -z ${CASSANDRA_VERSION+x} ]; then
4-
CASSANDRA_VERSION=3.0.7
4+
CASSANDRA_VERSION=3.11.12
55
fi
66

77
if [[ ! -d download ]] ; then

‎spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraAuthenticationException.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2013-2021 the original author or authors.
2+
* Copyright 2013-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraConnectionFailureException.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2013-2021 the original author or authors.
2+
* Copyright 2013-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraInsufficientReplicasAvailableException.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2013-2021 the original author or authors.
2+
* Copyright 2013-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraInternalException.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2013-2021 the original author or authors.
2+
* Copyright 2013-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎spring-data-cassandra/src/main/java/org/springframework/data/cassandra/CassandraInvalidConfigurationInQueryException.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2013-2021 the original author or authors.
2+
* Copyright 2013-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)