fix: Typo in introduction of security doc

.gitignore

@@ -24,5 +24,4 @@ _site
 
 credentials.yml
 .flattened-pom.xml
-.mvn/.gradle-enterprise
 .mvn/.develocity

.mvn/extensions.xml

@@ -1,13 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extensions>
 	<extension>
-		<groupId>com.gradle</groupId>
-		<artifactId>develocity-maven-extension</artifactId>
-		<version>1.21.3</version>
-	</extension>
-	<extension>
-		<groupId>com.gradle</groupId>
-		<artifactId>common-custom-user-data-maven-extension</artifactId>
-		<version>2.0</version>
+		<groupId>io.spring.develocity.conventions</groupId>
+		<artifactId>develocity-conventions-maven-extension</artifactId>
+		<version>0.0.22</version>
 	</extension>
 </extensions>

Jenkinsfile

@@ -37,8 +37,7 @@ pipeline {
 			options { timeout(time: 30, unit: 'MINUTES')}
 			environment {
 				ARTIFACTORY = credentials("${p['artifactory.credentials']}")
-				GRADLE_ENTERPRISE_CACHE = credentials("${p['gradle-enterprise-cache.credentials']}")
-				GRADLE_ENTERPRISE_ACCESS_KEY = credentials("${p['gradle-enterprise.access-key']}")
+				DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
 			}
 			steps {
 				script {
@@ -63,8 +62,7 @@ pipeline {
 					options { timeout(time: 30, unit: 'MINUTES')}
 					environment {
 						ARTIFACTORY = credentials("${p['artifactory.credentials']}")
-						GRADLE_ENTERPRISE_CACHE = credentials("${p['gradle-enterprise-cache.credentials']}")
-						GRADLE_ENTERPRISE_ACCESS_KEY = credentials("${p['gradle-enterprise.access-key']}")
+						DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
 					}
 					steps {
 						script {
@@ -82,8 +80,7 @@ pipeline {
 					options { timeout(time: 30, unit: 'MINUTES')}
 					environment {
 						ARTIFACTORY = credentials("${p['artifactory.credentials']}")
-						GRADLE_ENTERPRISE_CACHE = credentials("${p['gradle-enterprise-cache.credentials']}")
-						GRADLE_ENTERPRISE_ACCESS_KEY = credentials("${p['gradle-enterprise.access-key']}")
+						DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
 					}
 					steps {
 						script {
@@ -101,8 +98,7 @@ pipeline {
 					options { timeout(time: 30, unit: 'MINUTES')}
 					environment {
 						ARTIFACTORY = credentials("${p['artifactory.credentials']}")
-						GRADLE_ENTERPRISE_CACHE = credentials("${p['gradle-enterprise-cache.credentials']}")
-						GRADLE_ENTERPRISE_ACCESS_KEY = credentials("${p['gradle-enterprise.access-key']}")
+						DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
 					}
 					steps {
 						script {
@@ -120,8 +116,7 @@ pipeline {
 					options { timeout(time: 30, unit: 'MINUTES')}
 					environment {
 						ARTIFACTORY = credentials("${p['artifactory.credentials']}")
-						GRADLE_ENTERPRISE_CACHE = credentials("${p['gradle-enterprise-cache.credentials']}")
-						GRADLE_ENTERPRISE_ACCESS_KEY = credentials("${p['gradle-enterprise.access-key']}")
+						DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
 					}
 					steps {
 						script {
@@ -137,8 +132,7 @@ pipeline {
 					options { timeout(time: 30, unit: 'MINUTES')}
 					environment {
 						ARTIFACTORY = credentials("${p['artifactory.credentials']}")
-						GRADLE_ENTERPRISE_CACHE = credentials("${p['gradle-enterprise-cache.credentials']}")
-						GRADLE_ENTERPRISE_ACCESS_KEY = credentials("${p['gradle-enterprise.access-key']}")
+						DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
 					}
 					steps {
 						script {
@@ -161,8 +155,7 @@ pipeline {
 				KEYRING = credentials('spring-signing-secring.gpg')
 				PASSPHRASE = credentials('spring-gpg-passphrase')
 				STAGING_PROFILE_ID = credentials('spring-data-release-deployment-maven-central-staging-profile-id')
-				GRADLE_ENTERPRISE_CACHE = credentials("${p['gradle-enterprise-cache.credentials']}")
-				GRADLE_ENTERPRISE_ACCESS_KEY = credentials("${p['gradle-enterprise.access-key']}")
+				DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
 			}
 
 			steps {
@@ -234,8 +227,7 @@ pipeline {
 				KEYRING = credentials('spring-signing-secring.gpg')
 				PASSPHRASE = credentials('spring-gpg-passphrase')
 				STAGING_PROFILE_ID = credentials('spring-data-release-deployment-maven-central-staging-profile-id')
-				GRADLE_ENTERPRISE_CACHE = credentials("${p['gradle-enterprise-cache.credentials']}")
-				GRADLE_ENTERPRISE_ACCESS_KEY = credentials("${p['gradle-enterprise.access-key']}")
+				DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
 			}
 
 			steps {
@@ -294,18 +286,15 @@ pipeline {
 
 			environment {
 				ARTIFACTORY = credentials("${p['artifactory.credentials']}")
-				GRADLE_ENTERPRISE_CACHE = credentials("${p['gradle-enterprise-cache.credentials']}")
-				GRADLE_ENTERPRISE_ACCESS_KEY = credentials("${p['gradle-enterprise.access-key']}")
+				DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
 			}
 
 			steps {
 				script {
 				    docker.withRegistry('', "${p['dockerhub.credentials']}") {
 					    docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
                             sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ' +
-                                    'GRADLE_ENTERPRISE_CACHE_USERNAME=${GRADLE_ENTERPRISE_CACHE_USR} ' +
-                                    'GRADLE_ENTERPRISE_CACHE_PASSWORD=${GRADLE_ENTERPRISE_CACHE_PSW} ' +
-                                    './mvnw -s settings.xml -Pjakarta-ee-10,distribute,docs ' +
+                                    './mvnw -s settings.xml -Pjakarta-ee-10,distribute,docs,default ' +
                                     '-Dartifactory.server=https://repo.spring.io ' +
                                     "-Dartifactory.username=${ARTIFACTORY_USR} " +
                                     "-Dartifactory.password=${ARTIFACTORY_PSW} " +

README.adoc

@@ -1,10 +1,11 @@
 :doctype: book
-image:https://spring.io/img/projects/logo-web-services.svg["Spring Web Services", width=50%, link="https://spring.io/projects/spring-ws#learn"]
+image:https://spring.io/img/projects/logo-web-services.svg["Spring Web Services", width=20%, link="https://spring.io/projects/spring-ws#learn"]
 
 = Spring Web Services
 
 image:https://jenkins.spring.io/buildStatus/icon?job=spring-ws%2Fmain)[link='https://jenkins.spring.io/job/spring-ws/job/main/']
 
+image:https://jenkins.spring.io/buildStatus/icon?job=spring-ws%2F4.0.x)[link='https://jenkins.spring.io/job/spring-ws/job/4.0.x/']
 
 Spring Web Services is a product of the Spring community focused on creating
 document-driven Web services. Spring Web Services aims to facilitate

ci/Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17.0.6_10-jdk-focal
+FROM eclipse-temurin:17-jdk-jammy
 
 RUN apt-get update && apt-get install -y gpg
 

ci/build-and-deploy-to-artifactory.sh

@@ -4,13 +4,10 @@ set -euo pipefail
 
 RELEASE_TYPE=$1
 
-export GRADLE_ENTERPRISE_CACHE_USERNAME=${GRADLE_ENTERPRISE_CACHE_USR}
-export GRADLE_ENTERPRISE_CACHE_PASSWORD=${GRADLE_ENTERPRISE_CACHE_PSW}
-
 echo 'Deploying to Artifactory...'
 
 MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home" ./mvnw \
   -s settings.xml \
-  -Pjakarta-ee-10,distribute,${RELEASE_TYPE} \
+  -Pjakarta-ee-10,distribute,${RELEASE_TYPE},default \
   -Dmaven.test.skip=true \
   clean deploy -B

ci/build-and-deploy-to-maven-central.sh

@@ -5,9 +5,6 @@ set -euo pipefail
 PROJECT_VERSION=$1
 STAGING_REPOSITORY_ID=$2
 
-export GRADLE_ENTERPRISE_CACHE_USERNAME=${GRADLE_ENTERPRISE_CACHE_USR}
-export GRADLE_ENTERPRISE_CACHE_PASSWORD=${GRADLE_ENTERPRISE_CACHE_PSW}
-
 echo 'Staging on Maven Central...'
 
 GNUPGHOME=/tmp/gpghome
@@ -18,7 +15,7 @@ cp $KEYRING $GNUPGHOME
 
 MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home" ./mvnw \
     -s settings.xml \
-    -Pjakarta-ee-10,distribute,central  \
+    -Pjakarta-ee-10,distribute,central,default  \
     -Dmaven.test.skip=true \
     -Dgpg.passphrase=${PASSPHRASE} \
     -Dgpg.secretKeyring=${GNUPGHOME}/secring.gpg \

ci/pipeline.properties

@@ -1,7 +1,7 @@
 # Java versions
-java.legacy.tag=8u362-b09-jdk-focal
-java.main.tag=17.0.6_10-jdk-focal
-java.next.tag=20-jdk-jammy
+java.legacy.tag=8-jdk-focal
+java.main.tag=17-jdk-jammy
+java.next.tag=21-jdk-jammy
 
 # Docker container images - standard
 docker.java.legacy.image=library/eclipse-temurin:${java.legacy.tag}
@@ -18,5 +18,4 @@ docker.java.inside.basic=-v $HOME:/tmp/jenkins-home
 # Credentials
 artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c
 dockerhub.credentials=hub.docker.com-springbuildmaster
-gradle-enterprise-cache.credentials=gradle_enterprise_cache_user
-gradle-enterprise.access-key=gradle_enterprise_secret_access_key
+develocity.access-key=gradle_enterprise_secret_access_key

ci/smoke-test-against-artifactory.sh

@@ -9,7 +9,7 @@ echo 'Smoke test against Artifactory...'
 cd smoke-tests
 
 MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home" ./mvnw \
-    -Partifactory  \
+    -Partifactory,default  \
     -Dspring-ws.version="${PROJECT_VERSION}" \
     clean dependency:purge-local-repository verify -B -U
 

ci/smoke-test-against-maven-central.sh

@@ -10,7 +10,7 @@ echo 'Smoke test against Maven Central...'
 cd smoke-tests
 
 MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home" ./mvnw \
-    -Pmaven-central  \
+    -Pmaven-central,default  \
     -DstagingRepositoryId="${STAGING_REPOSITORY_ID}" \
     -Dspring-ws.version="${PROJECT_VERSION}" \
     clean dependency:purge-local-repository verify -B -U

ci/test.sh

@@ -2,9 +2,10 @@
 
 set -euo pipefail
 
-export GRADLE_ENTERPRISE_CACHE_USERNAME=${GRADLE_ENTERPRISE_CACHE_USR}
-export GRADLE_ENTERPRISE_CACHE_PASSWORD=${GRADLE_ENTERPRISE_CACHE_PSW}
-
 MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home" \
   ./mvnw -s settings.xml \
-  -P${PROFILE} clean dependency:list test -Dsort -B -U
+  -P${PROFILE},default clean dependency:list test -Dsort -B -U
+# Provides for testing org.springframework.ws.observation.ObservationInWsConfigurerTests separately
+MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home" \
+  ./mvnw -s settings.xml \
+  -P-default,${PROFILE},observation clean dependency:list test -Dsort -B -U

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>org.springframework.ws</groupId>
     <artifactId>spring-ws</artifactId>
-    <version>4.0.12-SNAPSHOT</version>
+    <version>4.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Spring Web Services</name>
@@ -109,7 +109,7 @@
         <jakarta-mail-api.version>2.1.3</jakarta-mail-api.version>
         <jakarta.activation-api.version>2.1.3</jakarta.activation-api.version>
         <jakarta-servlet.version>6.0.0</jakarta-servlet.version>
-        <jakarta-soap.version>3.0.1</jakarta-soap.version>
+        <jakarta-soap.version>3.0.2</jakarta-soap.version>
         <jakarta-xml-bind.version>4.0.2</jakarta-xml-bind.version>
         <glassfish-xml-bind.version>4.0.5</glassfish-xml-bind.version>
         <jaxen.version>1.1.6</jaxen.version>
@@ -119,33 +119,33 @@
         <log4j2.version>2.19.0</log4j2.version>
         <mail.version>1.4.7</mail.version>
         <mockito.version>4.11.0</mockito.version>
-        <saaj-impl.version>3.0.3</saaj-impl.version>
+        <saaj-impl.version>3.0.4</saaj-impl.version>
         <slf4j.version>2.0.6</slf4j.version>
         <smack.version>4.3.5</smack.version>
 
         <!-- Spring Framework/Spring Security baseline -->
-        <spring.version>6.0.20</spring.version> <!-- TODO: Ensure smoke-tests matches, also check spring-next-gen -->
-        <spring-security.version>6.1.9</spring-security.version>
+        <spring.version>6.1.13</spring.version> <!-- TODO: Ensure smoke-tests matches, also check spring-next-gen -->
+        <spring-security.version>6.3.3</spring-security.version>
 
         <!-- Spring Framework/Spring Security baseline-SNAPSHOT -->
-        <spring-snapshot.version>6.0.21-SNAPSHOT</spring-snapshot.version>
-        <spring-security-snapshot.version>6.1.10-SNAPSHOT</spring-security-snapshot.version>
+        <spring-snapshot.version>6.1.14-SNAPSHOT</spring-snapshot.version>
+        <spring-security-snapshot.version>6.3.4-SNAPSHOT</spring-security-snapshot.version>
 
         <!-- Spring Framework/Spring Security Next Gen -->
-        <spring-next-gen.version>6.1.6</spring-next-gen.version>
-        <spring-security-next-gen.version>6.2.4</spring-security-next-gen.version>
+        <spring-next-gen.version>6.2.0</spring-next-gen.version>
+        <spring-security-next-gen.version>6.4.1</spring-security-next-gen.version>
 
         <!-- Spring Framework/Spring Security Next Gen-SNAPSHOT -->
-        <spring-next-gen-snapshot.version>6.1.7-SNAPSHOT</spring-next-gen-snapshot.version>
-        <spring-security-next-gen-snapshot.version>6.2.5-SNAPSHOT</spring-security-next-gen-snapshot.version>
+        <spring-next-gen-snapshot.version>6.2.1-SNAPSHOT</spring-next-gen-snapshot.version>
+        <spring-security-next-gen-snapshot.version>6.4.2-SNAPSHOT</spring-security-next-gen-snapshot.version>
 
-        <spring-hateos.version>2.1.5</spring-hateos.version>
+        <spring-hateos.version>2.3.3</spring-hateos.version>
         <sun-mail.version>2.0.1</sun-mail.version>
         <stax.version>2.1.0</stax.version>
         <woodstox.version>6.5.1</woodstox.version>
         <wsdl4j.version>1.6.3</wsdl4j.version>
-        <wss4j.version>2.4.3</wss4j.version>
-        <wss4j-next.version>3.0.0</wss4j-next.version>
+        <wss4j.version>3.0.3</wss4j.version>
+        <wss4j-next.version>3.0.3</wss4j-next.version>
         <xmlsec.version>3.0.4</xmlsec.version>
         <xml-schema-core.version>2.3.1</xml-schema-core.version>
         <xmlunit1.version>1.6</xmlunit1.version>
@@ -154,6 +154,7 @@
         <bouncycastle.version>1.78</bouncycastle.version>
         <byte-buddy.version>1.14.13</byte-buddy.version>
         <spring-asciidoctor-backends.version>0.0.5</spring-asciidoctor-backends.version>
+        <micrometer-observation.version>1.13.5</micrometer-observation.version>
     </properties>
 
     <dependencyManagement>
@@ -181,7 +182,11 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-
+            <dependency>
+                <groupId>jakarta.xml.soap</groupId>
+                <artifactId>jakarta.xml.soap-api</artifactId>
+                <version>${jakarta-soap.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-bom</artifactId>
@@ -195,7 +200,22 @@
                 <artifactId>guava</artifactId>
                 <version>32.1.3-jre</version>
             </dependency>
-
+            <dependency>
+                <groupId>com.sun.xml.messaging.saaj</groupId>
+                <artifactId>saaj-impl</artifactId>
+                <version>${saaj-impl.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jvnet.staxex</groupId>
+                <artifactId>stax-ex</artifactId>
+                <version>${stax.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>jakarta.activation</groupId>
+                        <artifactId>jakarta.activation-api</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -337,6 +357,19 @@
 
         <pluginManagement>
             <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>3.3.0</version>
+                    <configuration>
+                        <archive>
+                            <manifest>
+                                <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                                <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                            </manifest>
+                        </archive>
+                    </configuration>
+                </plugin>
                 <plugin>
                     <groupId>com.gradle</groupId>
                     <artifactId>develocity-maven-extension</artifactId>
@@ -649,7 +682,7 @@
                                 <dependency>
                                     <groupId>com.thoughtworks.xstream</groupId>
                                     <artifactId>xstream</artifactId>
-                                    <version>1.4.20</version>
+                                    <version>1.4.21</version>
                                 </dependency>
                             </dependencies>
                         </plugin>