Merge branch 'main' into fix/958-fix-build-with-windows

spring-projects-experimental · Nov 15, 2023 · b8ee959 · b8ee959
2 parents ff07d26 + b936d5a
commit b8ee959
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/README.adoc b/README.adoc
@@ -37,8 +37,8 @@ ____
 
 == Documentation
 
-- https://spring-projects-experimental.github.io/spring-boot-migrator/user-documentation.html[User documentation,window=_blank]
-- https://spring-projects-experimental.github.io/spring-boot-migrator/developer-documentation.html[Developer documentation,window=_blank]
+- https://github.com/spring-projects-experimental/spring-boot-migrator/blob/main/docs/reference/user-documentation.adoc[User documentation]
+- https://github.com/spring-projects-experimental/spring-boot-migrator/blob/main/docs/reference/developer-documentation.adoc[Developer documentation]
 
 
 == Spring Boot 3.0 Upgrade - Interactive Web UI

diff --git a/...spring-shell/src/test/java/org/springframework/sbm/BootUpgrade_27_30_IntegrationTest.java b/...spring-shell/src/test/java/org/springframework/sbm/BootUpgrade_27_30_IntegrationTest.java
@@ -127,8 +127,7 @@ private void verifyJohnzonCoreDependencyIsUpgraded() {
 
         assertThat(johnzonDependency.getClassifier()).isEqualTo("jakarta");
         assertThat(johnzonDependency.getArtifactId()).isEqualTo("johnzon-core");
-        Optional<String> expectedJohnzonVersion = Optional.of("1.2.21");
-        assertThat(johnzonDependency.getVersion()).isEqualTo(expectedJohnzonVersion.get());
+        assertThat(johnzonDependency.getVersion()).isEqualTo("1.2.21");
     }
 
     @NotNull

diff --git a/pom.xml b/pom.xml
@@ -22,15 +22,15 @@
         <rewrite-migrate-java.version>1.17.0</rewrite-migrate-java.version>
         <spring-boot.version>2.7.5</spring-boot.version>
         <progressbar.version>0.9.5</progressbar.version>
-        <testcontainers.version>1.19.0</testcontainers.version>
+        <testcontainers.version>1.19.1</testcontainers.version>
         <maven-invoker.version>3.2.0</maven-invoker.version>
         <shrinkwrap.resolvers.version>3.1.4</shrinkwrap.resolvers.version>
         <lombok.version>1.18.24</lombok.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.csvParser.outputEncoding>UTF-8</project.csvParser.outputEncoding>
         <generated-sources.dir>src/generated/java</generated-sources.dir>
         <snakeyaml.version>1.33</snakeyaml.version>
-        <spring-asciidoctor-backends.version>0.0.5</spring-asciidoctor-backends.version>
+        <spring-asciidoctor-backends.version>0.0.7</spring-asciidoctor-backends.version>
     </properties>
 
     <scm>
@@ -258,7 +258,7 @@
             <dependency>
                 <groupId>org.junit-pioneer</groupId>
                 <artifactId>junit-pioneer</artifactId>
-                <version>2.0.1</version>
+                <version>2.1.0</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
@@ -272,7 +272,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
-            <version>2.0.6</version>
+            <version>2.0.9</version>
         </dependency>
     </dependencies>
     <modules>
@@ -382,7 +382,7 @@
             <plugin>
                 <groupId>com.mycila</groupId>
                 <artifactId>license-maven-plugin</artifactId>
-                <version>4.1</version>
+                <version>4.3</version>
                 <executions>
                     <execution>
                         <phase>validate</phase>
@@ -441,6 +441,8 @@ limitations under the License.
                                 <exclude>**/*.xsd</exclude>
                                 <exclude>**/*.xml</exclude>
                                 <exclude>**/*.sh</exclude>
+                                <exclude>**/spring.factories</exclude>
+                                <exclude>**/*.gradle*</exclude>
                                 <exclude>**/generated/**</exclude>
                                 <exclude>**/Dockerfile</exclude>
                             </excludes>