spring-projects-experimental · spencergibb · Jun 13, 2023
diff --git a/deployer/pom.xml b/deployer/pom.xml
@@ -14,13 +14,13 @@
 	<parent>
 		<groupId>org.springframework.boot.experimental</groupId>
 		<artifactId>spring-boot-thin-launcher-parent</artifactId>
-		<version>1.0.30.BUILD-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<wrapper.version>1.0.30.BUILD-SNAPSHOT</wrapper.version>
+		<wrapper.version>1.1.0-SNAPSHOT</wrapper.version>
 		<deployer.version>2.3.1.RELEASE</deployer.version>
 		<java.version>1.8</java.version>
 	</properties>
@@ -73,10 +73,10 @@
 				<jdk>[11,)</jdk>
 			</activation>
 			<dependencies>
-				<dependency>
+				<!--<dependency>
 					<groupId>javax.xml.bind</groupId>
 					<artifactId>jaxb-api</artifactId>
-				</dependency>
+				</dependency>-->
 			</dependencies>
 		</profile>
 	</profiles>

diff --git a/deployer/src/main/java/org/springframework/cloud/deployer/thin/ThinJarAppDeployer.java b/deployer/src/main/java/org/springframework/cloud/deployer/thin/ThinJarAppDeployer.java
@@ -181,8 +181,8 @@ private Object findContext(ThinJarAppWrapper wrapper) {
 	@Override
 	public RuntimeEnvironmentInfo environmentInfo() {
 		return new RuntimeEnvironmentInfo.Builder().spiClass(RuntimeEnvironmentInfo.class).implementationName("thin")
-				.implementationVersion("1.0.30.BUILD-SNAPSHOT").platformApiVersion("N/A").platformApiVersion("N/A")
-				.platformClientVersion("1.0.30.BUILD-SNAPSHOT").platformHostVersion("N/A").platformType("local")
+				.implementationVersion("1.1.0-SNAPSHOT").platformApiVersion("N/A").platformApiVersion("N/A")
+				.platformClientVersion("1.1.0-SNAPSHOT").platformHostVersion("N/A").platformType("local")
 				.build();
 	}
 

diff --git a/deployer/src/main/java/org/springframework/cloud/deployer/thin/ThinJarTaskLauncher.java b/deployer/src/main/java/org/springframework/cloud/deployer/thin/ThinJarTaskLauncher.java
@@ -52,8 +52,8 @@ public void destroy(String appName) {
 	@Override
 	public RuntimeEnvironmentInfo environmentInfo() {
 		return new RuntimeEnvironmentInfo.Builder().spiClass(RuntimeEnvironmentInfo.class).implementationName("thin")
-				.implementationVersion("1.0.30.BUILD-SNAPSHOT").platformApiVersion("N/A").platformApiVersion("N/A")
-				.platformClientVersion("1.0.30.BUILD-SNAPSHOT").platformHostVersion("N/A").platformType("local")
+				.implementationVersion("1.1.0-SNAPSHOT").platformApiVersion("N/A").platformApiVersion("N/A")
+				.platformClientVersion("1.1.0-SNAPSHOT").platformHostVersion("N/A").platformType("local")
 				.build();
 	}
 

diff --git a/deployer/src/test/resources/apps/props/META-INF/maven/com.example/other/pom.xml b/deployer/src/test/resources/apps/props/META-INF/maven/com.example/other/pom.xml
@@ -22,7 +22,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<wrapper.version>1.0.30.BUILD-SNAPSHOT</wrapper.version>
+		<wrapper.version>1.1.0-SNAPSHOT</wrapper.version>
 	</properties>
 
 	<dependencies>

diff --git a/gradle-plugin/pom.xml b/gradle-plugin/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot.experimental</groupId>
 		<artifactId>spring-boot-thin-launcher-parent</artifactId>
-		<version>1.0.30.BUILD-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-boot-thin-gradle-plugin</artifactId>

diff --git a/launcher/pom.xml b/launcher/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.boot.experimental</groupId>
 		<artifactId>spring-boot-thin-launcher-parent</artifactId>
-		<version>1.0.30.BUILD-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-boot-thin-launcher</artifactId>
@@ -17,8 +17,8 @@
 	<description>Demo project for Spring Boot</description>
 
 	<properties>
-		<locator.version>1.0.0.RELEASE</locator.version>
-		<junit-jupiter.version>5.8.0-M1</junit-jupiter.version>
+		<locator.version>1.1.0-SNAPSHOT</locator.version>
+		<junit-jupiter.version>5.9.3</junit-jupiter.version>
 	</properties>
 
 	<dependencyManagement>
@@ -34,6 +34,7 @@
 	</dependencyManagement>
 
 	<dependencies>
+
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
@@ -233,6 +234,21 @@
 						<artifactId>spring-boot-thin-launcher-shade-locator</artifactId>
 						<version>${locator.version}</version>
 					</dependency>
+					<dependency>
+						<groupId>org.ow2.asm</groupId>
+						<artifactId>asm</artifactId>
+						<version>9.5</version>
+					</dependency>
+					<dependency>
+						<groupId>org.ow2.asm</groupId>
+						<artifactId>asm-commons</artifactId>
+						<version>9.5</version>
+					</dependency>
+					<dependency>
+						<groupId>org.ow2.asm</groupId>
+						<artifactId>asm-tree</artifactId>
+						<version>9.5</version>
+					</dependency>
 				</dependencies>
 			</plugin>
 		</plugins>

diff --git a/launcher/src/main/java/org/springframework/boot/loader/thin/ThinJarLauncher.java b/launcher/src/main/java/org/springframework/boot/loader/thin/ThinJarLauncher.java
@@ -371,7 +371,6 @@ protected String getMainClass() throws Exception {
 		return ArchiveUtils.findMainClass(getArchive());
 	}
 
-	@Override
 	protected List<Archive> getClassPathArchives() throws Exception {
 		return getClassPathArchives(null);
 	}

diff --git a/launcher/src/main/java/org/springframework/boot/loader/thin/UrlArchive.java b/launcher/src/main/java/org/springframework/boot/loader/thin/UrlArchive.java
@@ -62,7 +62,7 @@ public Manifest getManifest() throws IOException {
 	}
 
 	@Override
-	public List<Archive> getNestedArchives(EntryFilter filter) throws IOException {
+	public Iterator<Archive> getNestedArchives(EntryFilter searchFilter, EntryFilter includeFilter) throws IOException {
 		throw new UnsupportedOperationException();
 	}
 

diff --git a/launcher/src/test/resources/apps/basic/pom.xml b/launcher/src/test/resources/apps/basic/pom.xml
@@ -23,7 +23,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
 		<spring-boot.version>2.3.1.RELEASE</spring-boot.version>
-		<wrapper.version>1.0.30.BUILD-SNAPSHOT</wrapper.version>
+		<wrapper.version>1.1.0-SNAPSHOT</wrapper.version>
 	</properties>
 
 	<dependencies>

diff --git a/launcher/src/test/resources/apps/boot/pom.xml b/launcher/src/test/resources/apps/boot/pom.xml
@@ -22,7 +22,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<wrapper.version>1.0.30.BUILD-SNAPSHOT</wrapper.version>
+		<wrapper.version>1.1.0-SNAPSHOT</wrapper.version>
 	</properties>
 
 	<dependencies>

diff --git a/launcher/src/test/resources/apps/child/pom.xml b/launcher/src/test/resources/apps/child/pom.xml
@@ -22,7 +22,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<wrapper.version>1.0.30.BUILD-SNAPSHOT</wrapper.version>
+		<wrapper.version>1.1.0-SNAPSHOT</wrapper.version>
 	</properties>
 
 	<dependencies>

diff --git a/launcher/src/test/resources/apps/classifier/pom.xml b/launcher/src/test/resources/apps/classifier/pom.xml
@@ -22,7 +22,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<wrapper.version>1.0.30.BUILD-SNAPSHOT</wrapper.version>
+		<wrapper.version>1.1.0-SNAPSHOT</wrapper.version>
 	</properties>
 
 	<dependencies>

diff --git a/launcher/src/test/resources/apps/petclinic-preresolved/pom.xml b/launcher/src/test/resources/apps/petclinic-preresolved/pom.xml
@@ -33,7 +33,7 @@
 		<spring-data-releasetrain.version>Ingalls-RELEASE</spring-data-releasetrain.version>
 		<start-class>org.springframework.samples.petclinic.PetClinicApplication</start-class>
 
-		<thin-launcher.version>1.0.30.BUILD-SNAPSHOT</thin-launcher.version>
+		<thin-launcher.version>1.1.0-SNAPSHOT</thin-launcher.version>
 		<spring-boot-plugin.version>1.5.2.RELEASE</spring-boot-plugin.version>
 		<spring-boot.version>1.4.2.RELEASE</spring-boot.version>
 

diff --git a/launcher/src/test/resources/apps/petclinic/pom.xml b/launcher/src/test/resources/apps/petclinic/pom.xml
@@ -33,7 +33,7 @@
 		<spring-data-releasetrain.version>Ingalls-RELEASE</spring-data-releasetrain.version>
 		<start-class>org.springframework.samples.petclinic.PetClinicApplication</start-class>
 
-		<thin-launcher.version>1.0.30.BUILD-SNAPSHOT</thin-launcher.version>
+		<thin-launcher.version>1.1.0-SNAPSHOT</thin-launcher.version>
 		<spring-boot-plugin.version>1.5.2.RELEASE</spring-boot-plugin.version>
 		<spring-boot.version>1.4.2.RELEASE</spring-boot.version>
 

diff --git a/launcher/src/test/resources/apps/preresolved-classifier/pom.xml b/launcher/src/test/resources/apps/preresolved-classifier/pom.xml
@@ -22,7 +22,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<wrapper.version>1.0.30.BUILD-SNAPSHOT</wrapper.version>
+		<wrapper.version>1.1.0-SNAPSHOT</wrapper.version>
 	</properties>
 
 	<dependencies>

diff --git a/launcher/src/test/resources/apps/preresolved/pom.xml b/launcher/src/test/resources/apps/preresolved/pom.xml
@@ -33,7 +33,7 @@
 		<spring-data-releasetrain.version>Ingalls-RELEASE</spring-data-releasetrain.version>
 		<start-class>org.springframework.samples.petclinic.PetClinicApplication</start-class>
 
-		<thin-launcher.version>1.0.30.BUILD-SNAPSHOT</thin-launcher.version>
+		<thin-launcher.version>1.1.0-SNAPSHOT</thin-launcher.version>
 		<spring-boot-plugin.version>1.5.2.RELEASE</spring-boot-plugin.version>
 		<spring-boot.version>1.4.2.RELEASE</spring-boot.version>
 

diff --git a/launcher/src/test/resources/apps/profiles/pom.xml b/launcher/src/test/resources/apps/profiles/pom.xml
@@ -23,7 +23,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<wrapper.version>1.0.30.BUILD-SNAPSHOT</wrapper.version>
+		<wrapper.version>1.1.0-SNAPSHOT</wrapper.version>
 	</properties>
 
 	<dependencies>

diff --git a/launcher/src/test/resources/apps/repositories/pom.xml b/launcher/src/test/resources/apps/repositories/pom.xml
@@ -23,7 +23,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
 		<spring-boot.version>1.5.3.RELEASE</spring-boot.version>
-		<wrapper.version>1.0.30.BUILD-SNAPSHOT</wrapper.version>
+		<wrapper.version>1.1.0-SNAPSHOT</wrapper.version>
 	</properties>
 
 	<dependencies>

diff --git a/launcher/src/test/resources/apps/same-artifact-names/pom.xml b/launcher/src/test/resources/apps/same-artifact-names/pom.xml
@@ -22,7 +22,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<wrapper.version>1.0.30.BUILD-SNAPSHOT</wrapper.version>
+		<wrapper.version>1.1.0-SNAPSHOT</wrapper.version>
 	</properties>
 
 	<dependencies>

diff --git a/launcher/src/test/resources/apps/snapshots-with-repos/pom.xml b/launcher/src/test/resources/apps/snapshots-with-repos/pom.xml
@@ -23,7 +23,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
 		<spring-boot.version>2.0.6.RELEASE</spring-boot.version>
-		<wrapper.version>1.0.30.BUILD-SNAPSHOT</wrapper.version>
+		<wrapper.version>1.1.0-SNAPSHOT</wrapper.version>
 	</properties>
 
 	<dependencies>

diff --git a/launcher/src/test/resources/apps/snapshots/pom.xml b/launcher/src/test/resources/apps/snapshots/pom.xml
@@ -23,7 +23,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
 		<spring-boot.version>2.0.6.RELEASE</spring-boot.version>
-		<wrapper.version>1.0.30.BUILD-SNAPSHOT</wrapper.version>
+		<wrapper.version>1.1.0-SNAPSHOT</wrapper.version>
 	</properties>
 
 	<dependencies>

diff --git a/launcher/src/test/resources/apps/source/pom.xml b/launcher/src/test/resources/apps/source/pom.xml
@@ -23,7 +23,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
 		<spring-boot.version>1.5.3.RELEASE</spring-boot.version>
-		<wrapper.version>1.0.30.BUILD-SNAPSHOT</wrapper.version>
+		<wrapper.version>1.1.0-SNAPSHOT</wrapper.version>
 	</properties>
 
 	<dependencies>

diff --git a/layout/pom.xml b/layout/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot.experimental</groupId>
 		<artifactId>spring-boot-thin-launcher-parent</artifactId>
-		<version>1.0.30.BUILD-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-boot-thin-layout</artifactId>

diff --git a/locator/build.gradle b/locator/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
 	ext {
 		springBootVersion = '1.5.1.RELEASE'
-		wrapperVersion = '1.0.30.BUILD-SNAPSHOT'
+		wrapperVersion = '1.1.0-SNAPSHOT'
 	}
 	repositories {
 		mavenLocal()

diff --git a/locator/pom.xml b/locator/pom.xml
@@ -5,15 +5,15 @@
 
 	<artifactId>spring-boot-thin-launcher-shade-locator</artifactId>
 	<packaging>jar</packaging>
-	<version>1.0.0.RELEASE</version>
+	<version>1.1.0-SNAPSHOT</version>
 
 	<name>spring-boot-thin-launcher-shade-locator</name>
 	<description>Supports Spring Boot Maven plugin</description>
 
 	<parent>
 		<groupId>org.springframework.boot.experimental</groupId>
 		<artifactId>spring-boot-thin-launcher-parent</artifactId>
-		<version>1.0.3.RELEASE</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 
 	<properties>
@@ -26,8 +26,29 @@
 		<dependency>
 			<groupId>org.apache.maven.plugins</groupId>
 			<artifactId>maven-shade-plugin</artifactId>
-			<version>2.4.3</version>
+			<version>3.2.4</version>
 		</dependency>
+		<dependency>
+			<groupId>org.ow2.asm</groupId>
+			<artifactId>asm</artifactId>
+			<version>9.5</version>
+		</dependency>
+		<dependency>
+			<groupId>org.ow2.asm</groupId>
+			<artifactId>asm-commons</artifactId>
+			<version>9.5</version>
+		</dependency>
+		<dependency>
+			<groupId>org.ow2.asm</groupId>
+			<artifactId>asm-tree</artifactId>
+			<version>9.5</version>
+		</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>31.1-jre</version>
+		</dependency>
+
 	</dependencies>
 
 	<build>

diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot.experimental</groupId>
 		<artifactId>spring-boot-thin-launcher-parent</artifactId>
-		<version>1.0.30.BUILD-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-boot-thin-maven-plugin</artifactId>
@@ -16,11 +16,16 @@
 	<description>Bootstrap wrapper for launching a thin Boot jar</description>
 
 	<properties>
-		<maven.version>3.1.1</maven.version>
-		<plexus-archiver.version>3.4</plexus-archiver.version>
+		<maven.version>3.6.3</maven.version>
+		<plexus-archiver.version>4.7.1</plexus-archiver.version>
 	</properties>
 
 	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-maven-plugin</artifactId>
+			<version>3.2.0-SNAPSHOT</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-loader-tools</artifactId>
@@ -49,7 +54,7 @@
 		<dependency>
 			<groupId>org.apache.maven.plugin-tools</groupId>
 			<artifactId>maven-plugin-annotations</artifactId>
-			<version>3.2</version>
+			<version>3.9.0</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>

diff --git a/maven-plugin/src/main/java/org/springframework/boot/experimental/maven/ThinJarMojo.java b/maven-plugin/src/main/java/org/springframework/boot/experimental/maven/ThinJarMojo.java
@@ -81,7 +81,7 @@ public abstract class ThinJarMojo extends AbstractMojo {
 	 * (group:artifact:version[:packaging[:classifier]]).
 	 */
 	@Parameter(
-			defaultValue = "org.springframework.boot.experimental:spring-boot-thin-launcher:1.0.30.BUILD-SNAPSHOT:jar:exec",
+			defaultValue = "org.springframework.boot.experimental:spring-boot-thin-launcher:1.1.0-SNAPSHOT:jar:exec",
 			required = true, property = "thin.launcherArtifact")
 	private String thinLauncherArtifact;