Spring Boot 3 migration (#255)

* It compiles * WIP * Upgraded jdk to 17: * Added tests for Github repo * Modified the sagan client * Updated versions
spring-cloud · Jun 22, 2023 · aa5d636 · aa5d636
1 parent a0b43f5
commit aa5d636
Show file tree

Hide file tree

Showing 143 changed files with 861 additions and 9,407 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: ["8"]
+        java: ["17"]
 
     steps:
       - uses: actions/checkout@v2

diff --git a/docs/pom.xml b/docs/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud.internal</groupId>
 		<artifactId>releaser-parent</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>3.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>releaser-docs</artifactId>
 	<packaging>pom</packaging>
@@ -16,11 +16,11 @@
 		<configprops.inclusionPattern>releaser.*</configprops.inclusionPattern>
 	</properties>
 	<dependencies>
-		<dependency>
+		<!--<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-info</artifactId>
 			<version>${project.version}</version>
-		</dependency>
+		</dependency>-->
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>releaser-core</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -6,13 +6,13 @@
 
 	<groupId>org.springframework.cloud.internal</groupId>
 	<artifactId>releaser-parent</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
+	<version>3.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.1.1</version>
+		<version>4.0.3</version>
 		<relativePath/>
 		<!-- lookup parent from repository -->
 	</parent>
@@ -28,25 +28,25 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<java.version>1.8</java.version>
+		<java.version>17</java.version>
 
-		<spring-cloud-bom.version>2021.0.1</spring-cloud-bom.version>
-		<jcabi-github.version>1.1.2</jcabi-github.version>
+		<spring-cloud-bom.version>2022.0.3</spring-cloud-bom.version>
+		<github-api.version>1.315</github-api.version>
 		<jsch-agent.version>0.0.9</jsch-agent.version>
-		<hibernate-validator.version>7.0.4.Final</hibernate-validator.version>
 		<!--Matches JGit in Boot:-->
-		<org.eclipse.jgit-version>5.12.0.202106070339-r</org.eclipse.jgit-version>
+		<org.eclipse.jgit-version>6.5.0.202303070854-r</org.eclipse.jgit-version>
 		<!-- Versions plugin uses this version -->
 		<maven-model.version>3.8.5</maven-model.version>
 		<versions-maven-plugin.version>2.10.0</versions-maven-plugin.version>
-		<handlebars.version>4.3.0</handlebars.version>
+		<handlebars.version>4.3.1</handlebars.version>
 		<initializr-metadata.version>0.12.0</initializr-metadata.version>
 		<awaitility.version>4.2.0</awaitility.version>
 		<sagan-site.version>1.0.0-SNAPSHOT</sagan-site.version>
 		<javax.json.version>1.1.4</javax.json.version>
 		<jopt-simple.version>5.0.4</jopt-simple.version>
 		<fliptables.version>1.1.0</fliptables.version>
 		<zt.exec.version>1.12</zt.exec.version>
+		<okhttp.version>4.11.0</okhttp.version>
 	</properties>
 
 	<dependencyManagement>
@@ -58,6 +58,93 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jgit</groupId>
+				<artifactId>org.eclipse.jgit</artifactId>
+				<version>${org.eclipse.jgit-version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jgit</groupId>
+				<artifactId>org.eclipse.jgit.ssh.jsch</artifactId>
+				<version>${org.eclipse.jgit-version}</version>
+			</dependency>
+			<!-- a proxy to ssh-agent and Pageant in Java -->
+			<dependency>
+				<groupId>com.jcraft</groupId>
+				<artifactId>jsch.agentproxy.sshagent</artifactId>
+				<version>${jsch-agent.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.jcraft</groupId>
+				<artifactId>jsch.agentproxy.jsch</artifactId>
+				<version>${jsch-agent.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.jcraft</groupId>
+				<artifactId>jsch.agentproxy.usocket-jna</artifactId>
+				<version>${jsch-agent.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.maven</groupId>
+				<artifactId>maven-model</artifactId>
+				<!--<version>3.3.9</version>-->
+				<!-- Versions plugin uses this version -->
+				<version>${maven-model.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>versions-maven-plugin</artifactId>
+				<version>${versions-maven-plugin.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>org.slf4j</groupId>
+						<artifactId>slf4j-jdk14</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.slf4j</groupId>
+						<artifactId>jcl-over-slf4j</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.slf4j</groupId>
+						<artifactId>slf4j-nop</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+			<dependency>
+				<groupId>org.kohsuke</groupId>
+				<artifactId>github-api</artifactId>
+				<version>${github-api.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.squareup.okhttp3</groupId>
+				<artifactId>okhttp</artifactId>
+				<version>${okhttp.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.github.jknack</groupId>
+				<artifactId>handlebars</artifactId>
+				<version>${handlebars.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>io.spring.initializr</groupId>
+				<artifactId>initializr-metadata</artifactId>
+				<version>${initializr-metadata.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.glassfish</groupId>
+				<artifactId>javax.json</artifactId>
+				<version>${javax.json.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.zeroturnaround</groupId>
+				<artifactId>zt-exec</artifactId>
+				<version>${zt.exec.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.awaitility</groupId>
+				<artifactId>awaitility</artifactId>
+				<version>${awaitility.version}</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
@@ -103,20 +190,12 @@
 				<enabled>false</enabled>
 			</snapshots>
 		</repository>
-		<repository>
-			<id>spring-releases</id>
-			<name>Spring Releases</name>
-			<url>https://repo.spring.io/release</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
 	</repositories>
 	<pluginRepositories>
 		<pluginRepository>
 			<id>spring-snapshots</id>
 			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/libs-snapshot-local</url>
+			<url>https://repo.spring.io/snapshot</url>
 			<snapshots>
 				<enabled>true</enabled>
 			</snapshots>
@@ -127,15 +206,7 @@
 		<pluginRepository>
 			<id>spring-milestones</id>
 			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/libs-milestone-local</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>spring-releases</id>
-			<name>Spring Releases</name>
-			<url>https://repo.spring.io/libs-release-local</url>
+			<url>https://repo.spring.io/milestone</url>
 			<snapshots>
 				<enabled>false</enabled>
 			</snapshots>

diff --git a/projects/pom.xml b/projects/pom.xml
@@ -5,20 +5,19 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>releaser-projects</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
+	<version>3.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<parent>
 		<groupId>org.springframework.cloud.internal</groupId>
 		<artifactId>releaser-parent</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>3.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
 	<modules>
 		<module>spring-cloud</module>
 		<module>spring-cloud-stream</module>
-		<module>reactor</module>
 	</modules>
 
 </project>
diff --git a/projects/reactor/.jdk8 b/projects/reactor/.jdk8
diff --git a/projects/reactor/pom.xml b/projects/reactor/pom.xml
diff --git a/projects/reactor/src/main/java/releaser/ReleaserApplication.java b/projects/reactor/src/main/java/releaser/ReleaserApplication.java