Use property in release notes

skuzzle · Jan 11, 2023 · 47b38c8 · 47b38c8
1 parent a898973
commit 47b38c8
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -14,9 +14,9 @@ pipeline {
       steps {
         script {
             def versionsAsString = sh(script: 'mvn org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate -Dexpression=compatible-spring-boot-versions -q -DforceStdout', returnStdout:true).trim()
-            def versionsArray = versionsAsString.split(',')
+            def versionsArray = versionsAsString.split(',|and')
             versionsArray.each {
-                stage("Verify against Spring-Boot ${it}") {
+                stage("Verify against Spring-Boot ${it.trim()}") {
                     sh "mvn -B clean verify -Dversion.spring-boot=${it.trim()}"
                 }
             }

diff --git a/README.md b/README.md
@@ -94,7 +94,7 @@ can be injected into the Spring application properties, simply replacing an exis
 
 ## Compatibility
 - [x] Requires Java 11
-- [x] Tested against Spring-Boot `2.2.13.RELEASE, 2.3.12.RELEASE, 2.4.13, 2.5.8, 2.6.1, 2.7.7`
+- [x] Tested against Spring-Boot `2.2.13.RELEASE, 2.3.12.RELEASE, 2.4.13, 2.5.12, 2.6.14 and 2.7.7`
 - [x] Tested against WireMock `2.35.0`
 
 ## Usage

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,7 +1,7 @@
 [![Maven Central](https://img.shields.io/static/v1?label=MavenCentral&message=0.0.19-SNAPSHOT&color=blue)](https://search.maven.org/artifact/de.skuzzle.springboot.test/spring-boot-wiremock/0.0.19-SNAPSHOT/jar) [![JavaDoc](https://img.shields.io/static/v1?label=JavaDoc&message=0.0.19-SNAPSHOT&color=orange)](http://www.javadoc.io/doc/de.skuzzle.springboot.test/spring-boot-wiremock/0.0.19-SNAPSHOT)
 
 ### Changes
-* Adjusted Spring-Boot baseline to `2.4.13`, `2.5.8` and `2.6.2`
+* Adjusted Spring-Boot baseline to 2.3.12.RELEASE, 2.4.13, 2.5.12, 2.6.14 and 2.7.7
 
 
 ### Maven Central coordinates for this release

diff --git a/pom.xml b/pom.xml
@@ -21,7 +21,7 @@
         <!-- Minimal compatible Spring-Boot version. Newer versions are tested during Jenkins build. -->
         <version.spring-boot>2.2.13.RELEASE</version.spring-boot>
         <!-- All the remaining spring-boot versions we run the tests against (comma separated) -->
-        <compatible-spring-boot-versions>2.3.12.RELEASE, 2.4.13, 2.5.12, 2.6.14, 2.7.7</compatible-spring-boot-versions>
+        <compatible-spring-boot-versions>2.3.12.RELEASE, 2.4.13, 2.5.12, 2.6.14 and 2.7.7</compatible-spring-boot-versions>
 
         <version.wiremock>2.35.0</version.wiremock>
         <version.guava>31.1-jre</version.guava>

diff --git a/readme/RELEASE_NOTES.md b/readme/RELEASE_NOTES.md
@@ -1,7 +1,7 @@
 [![Maven Central](https://img.shields.io/static/v1?label=MavenCentral&message=${project.version}&color=blue)](https://search.maven.org/artifact/${project.groupId}/${project.artifactId}/${project.version}/jar) [![JavaDoc](https://img.shields.io/static/v1?label=JavaDoc&message=${project.version}&color=orange)](http://www.javadoc.io/doc/${project.groupId}/${project.artifactId}/${project.version})
 
 ### Changes
-* Adjusted Spring-Boot baseline to `2.4.13`, `2.5.12`, `2.6.14`, and `2.7.7`
+* Adjusted Spring-Boot baseline to ${compatible-spring-boot-versions}
 
 
 ### Maven Central coordinates for this release