diff --git a/deployer/pom.xml b/deployer/pom.xml index 4983951c..76d25a19 100644 --- a/deployer/pom.xml +++ b/deployer/pom.xml @@ -14,13 +14,13 @@ org.springframework.boot.experimental spring-boot-thin-launcher-parent - 1.0.30.BUILD-SNAPSHOT + 1.1.0-SNAPSHOT UTF-8 UTF-8 - 1.0.30.BUILD-SNAPSHOT + 1.1.0-SNAPSHOT 2.3.1.RELEASE 1.8 @@ -73,10 +73,10 @@ [11,) - + 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 index 1f11a39f..4fff68ca 100644 --- 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 index a6246f67..8911d288 100644 --- 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 index 03c954c1..5ff3b310 100644 --- 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 @@ UTF-8 UTF-8 1.8 - 1.0.30.BUILD-SNAPSHOT + 1.1.0-SNAPSHOT diff --git a/gradle-plugin/pom.xml b/gradle-plugin/pom.xml index 19adc90f..364f2c26 100644 --- a/gradle-plugin/pom.xml +++ b/gradle-plugin/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot.experimental spring-boot-thin-launcher-parent - 1.0.30.BUILD-SNAPSHOT + 1.1.0-SNAPSHOT spring-boot-thin-gradle-plugin diff --git a/launcher/pom.xml b/launcher/pom.xml index 630d3e3f..21c71969 100644 --- a/launcher/pom.xml +++ b/launcher/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot.experimental spring-boot-thin-launcher-parent - 1.0.30.BUILD-SNAPSHOT + 1.1.0-SNAPSHOT spring-boot-thin-launcher @@ -17,8 +17,8 @@ Demo project for Spring Boot - 1.0.0.RELEASE - 5.8.0-M1 + 1.1.0-SNAPSHOT + 5.9.3 @@ -34,6 +34,7 @@ + org.springframework spring-core @@ -233,6 +234,21 @@ spring-boot-thin-launcher-shade-locator ${locator.version} + + org.ow2.asm + asm + 9.5 + + + org.ow2.asm + asm-commons + 9.5 + + + org.ow2.asm + asm-tree + 9.5 + 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 index e3dd8791..10ec7653 100644 --- 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 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 index d14db218..32c2813a 100644 --- 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 getNestedArchives(EntryFilter filter) throws IOException { + public Iterator 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 index edf1f9c6..212b5fbe 100644 --- a/launcher/src/test/resources/apps/basic/pom.xml +++ b/launcher/src/test/resources/apps/basic/pom.xml @@ -23,7 +23,7 @@ UTF-8 1.8 2.3.1.RELEASE - 1.0.30.BUILD-SNAPSHOT + 1.1.0-SNAPSHOT diff --git a/launcher/src/test/resources/apps/boot/pom.xml b/launcher/src/test/resources/apps/boot/pom.xml index 75bcd050..17508d89 100644 --- a/launcher/src/test/resources/apps/boot/pom.xml +++ b/launcher/src/test/resources/apps/boot/pom.xml @@ -22,7 +22,7 @@ UTF-8 UTF-8 1.8 - 1.0.30.BUILD-SNAPSHOT + 1.1.0-SNAPSHOT diff --git a/launcher/src/test/resources/apps/child/pom.xml b/launcher/src/test/resources/apps/child/pom.xml index 87d40d92..ef50c617 100644 --- a/launcher/src/test/resources/apps/child/pom.xml +++ b/launcher/src/test/resources/apps/child/pom.xml @@ -22,7 +22,7 @@ UTF-8 UTF-8 1.8 - 1.0.30.BUILD-SNAPSHOT + 1.1.0-SNAPSHOT diff --git a/launcher/src/test/resources/apps/classifier/pom.xml b/launcher/src/test/resources/apps/classifier/pom.xml index 6d6b24d6..1a4e6e7a 100644 --- a/launcher/src/test/resources/apps/classifier/pom.xml +++ b/launcher/src/test/resources/apps/classifier/pom.xml @@ -22,7 +22,7 @@ UTF-8 UTF-8 1.8 - 1.0.30.BUILD-SNAPSHOT + 1.1.0-SNAPSHOT diff --git a/launcher/src/test/resources/apps/petclinic-preresolved/pom.xml b/launcher/src/test/resources/apps/petclinic-preresolved/pom.xml index c2e71506..1c8a7574 100644 --- a/launcher/src/test/resources/apps/petclinic-preresolved/pom.xml +++ b/launcher/src/test/resources/apps/petclinic-preresolved/pom.xml @@ -33,7 +33,7 @@ Ingalls-RELEASE org.springframework.samples.petclinic.PetClinicApplication - 1.0.30.BUILD-SNAPSHOT + 1.1.0-SNAPSHOT 1.5.2.RELEASE 1.4.2.RELEASE diff --git a/launcher/src/test/resources/apps/petclinic/pom.xml b/launcher/src/test/resources/apps/petclinic/pom.xml index c2e71506..1c8a7574 100644 --- a/launcher/src/test/resources/apps/petclinic/pom.xml +++ b/launcher/src/test/resources/apps/petclinic/pom.xml @@ -33,7 +33,7 @@ Ingalls-RELEASE org.springframework.samples.petclinic.PetClinicApplication - 1.0.30.BUILD-SNAPSHOT + 1.1.0-SNAPSHOT 1.5.2.RELEASE 1.4.2.RELEASE diff --git a/launcher/src/test/resources/apps/preresolved-classifier/pom.xml b/launcher/src/test/resources/apps/preresolved-classifier/pom.xml index 6d6b24d6..1a4e6e7a 100644 --- a/launcher/src/test/resources/apps/preresolved-classifier/pom.xml +++ b/launcher/src/test/resources/apps/preresolved-classifier/pom.xml @@ -22,7 +22,7 @@ UTF-8 UTF-8 1.8 - 1.0.30.BUILD-SNAPSHOT + 1.1.0-SNAPSHOT diff --git a/launcher/src/test/resources/apps/preresolved/pom.xml b/launcher/src/test/resources/apps/preresolved/pom.xml index c2e71506..1c8a7574 100644 --- a/launcher/src/test/resources/apps/preresolved/pom.xml +++ b/launcher/src/test/resources/apps/preresolved/pom.xml @@ -33,7 +33,7 @@ Ingalls-RELEASE org.springframework.samples.petclinic.PetClinicApplication - 1.0.30.BUILD-SNAPSHOT + 1.1.0-SNAPSHOT 1.5.2.RELEASE 1.4.2.RELEASE diff --git a/launcher/src/test/resources/apps/profiles/pom.xml b/launcher/src/test/resources/apps/profiles/pom.xml index 51dba62d..c74864ef 100644 --- a/launcher/src/test/resources/apps/profiles/pom.xml +++ b/launcher/src/test/resources/apps/profiles/pom.xml @@ -23,7 +23,7 @@ UTF-8 UTF-8 1.8 - 1.0.30.BUILD-SNAPSHOT + 1.1.0-SNAPSHOT diff --git a/launcher/src/test/resources/apps/repositories/pom.xml b/launcher/src/test/resources/apps/repositories/pom.xml index d62ef398..9a617a80 100644 --- a/launcher/src/test/resources/apps/repositories/pom.xml +++ b/launcher/src/test/resources/apps/repositories/pom.xml @@ -23,7 +23,7 @@ UTF-8 1.8 1.5.3.RELEASE - 1.0.30.BUILD-SNAPSHOT + 1.1.0-SNAPSHOT diff --git a/launcher/src/test/resources/apps/same-artifact-names/pom.xml b/launcher/src/test/resources/apps/same-artifact-names/pom.xml index c7dc3a99..caa457bb 100644 --- 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 @@ UTF-8 UTF-8 1.8 - 1.0.30.BUILD-SNAPSHOT + 1.1.0-SNAPSHOT diff --git a/launcher/src/test/resources/apps/snapshots-with-repos/pom.xml b/launcher/src/test/resources/apps/snapshots-with-repos/pom.xml index 04047b67..0b4de66a 100644 --- 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 @@ UTF-8 1.8 2.0.6.RELEASE - 1.0.30.BUILD-SNAPSHOT + 1.1.0-SNAPSHOT diff --git a/launcher/src/test/resources/apps/snapshots/pom.xml b/launcher/src/test/resources/apps/snapshots/pom.xml index 751d839c..bd131237 100644 --- a/launcher/src/test/resources/apps/snapshots/pom.xml +++ b/launcher/src/test/resources/apps/snapshots/pom.xml @@ -23,7 +23,7 @@ UTF-8 1.8 2.0.6.RELEASE - 1.0.30.BUILD-SNAPSHOT + 1.1.0-SNAPSHOT diff --git a/launcher/src/test/resources/apps/source/pom.xml b/launcher/src/test/resources/apps/source/pom.xml index dc3ba08d..9f453a7e 100644 --- a/launcher/src/test/resources/apps/source/pom.xml +++ b/launcher/src/test/resources/apps/source/pom.xml @@ -23,7 +23,7 @@ UTF-8 1.8 1.5.3.RELEASE - 1.0.30.BUILD-SNAPSHOT + 1.1.0-SNAPSHOT diff --git a/layout/pom.xml b/layout/pom.xml index e9601237..8bc115be 100644 --- a/layout/pom.xml +++ b/layout/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot.experimental spring-boot-thin-launcher-parent - 1.0.30.BUILD-SNAPSHOT + 1.1.0-SNAPSHOT spring-boot-thin-layout diff --git a/locator/build.gradle b/locator/build.gradle index f9b055ed..59760562 100644 --- 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 index 27f99e14..2ba8f30a 100644 --- a/locator/pom.xml +++ b/locator/pom.xml @@ -5,7 +5,7 @@ spring-boot-thin-launcher-shade-locator jar - 1.0.0.RELEASE + 1.1.0-SNAPSHOT spring-boot-thin-launcher-shade-locator Supports Spring Boot Maven plugin @@ -13,7 +13,7 @@ org.springframework.boot.experimental spring-boot-thin-launcher-parent - 1.0.3.RELEASE + 1.1.0-SNAPSHOT @@ -26,8 +26,29 @@ org.apache.maven.plugins maven-shade-plugin - 2.4.3 + 3.2.4 + + org.ow2.asm + asm + 9.5 + + + org.ow2.asm + asm-commons + 9.5 + + + org.ow2.asm + asm-tree + 9.5 + + + com.google.guava + guava + 31.1-jre + + diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 9150067f..79e7f516 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot.experimental spring-boot-thin-launcher-parent - 1.0.30.BUILD-SNAPSHOT + 1.1.0-SNAPSHOT spring-boot-thin-maven-plugin @@ -16,11 +16,16 @@ Bootstrap wrapper for launching a thin Boot jar - 3.1.1 - 3.4 + 3.6.3 + 4.7.1 + + org.springframework.boot + spring-boot-maven-plugin + 3.2.0-SNAPSHOT + org.springframework.boot spring-boot-loader-tools @@ -49,7 +54,7 @@ org.apache.maven.plugin-tools maven-plugin-annotations - 3.2 + 3.9.0 provided 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 index beb257b9..19840adc 100644 --- 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; diff --git a/pom.xml b/pom.xml index a89156ac..b192797a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot.experimental spring-boot-thin-launcher-parent - 1.0.30.BUILD-SNAPSHOT + 1.1.0-SNAPSHOT pom Thin Launcher Parent Tools for working with "thin" executable jars that can download their own dependendies, either at runtime or build time @@ -13,9 +13,10 @@ wrapper layout + locator launcher maven-plugin - gradle-plugin + tools samples deployer @@ -27,7 +28,7 @@ ${java.version} ${java.version} ${java.version} - 2.7.10 + 3.2.0-SNAPSHOT 3.0.0 3.1.0 3.1.0 @@ -38,9 +39,9 @@ 3.1.0 3.1.0 3.0.1 - 3.5 + 3.9.0 3.1.0 - 3.1.1 + 3.2.4 3.0.1 3.0.0-M4 diff --git a/samples/app/build.gradle b/samples/app/build.gradle index 4dc0b919..05c8db65 100644 --- a/samples/app/build.gradle +++ b/samples/app/build.gradle @@ -1,7 +1,7 @@ buildscript { ext { springBootVersion = '2.0.2.RELEASE' - wrapperVersion = '1.0.30.BUILD-SNAPSHOT' + wrapperVersion = '1.1.0-SNAPSHOT' } repositories { mavenLocal() diff --git a/samples/app/pom.xml b/samples/app/pom.xml index cbd3a85e..3e3cf920 100644 --- a/samples/app/pom.xml +++ b/samples/app/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.3.RELEASE + 3.2.0-SNAPSHOT @@ -22,7 +22,7 @@ UTF-8 UTF-8 1.8 - 1.0.30.BUILD-SNAPSHOT + 1.1.0-SNAPSHOT 2.22.1 diff --git a/samples/fat/pom.xml b/samples/fat/pom.xml index 1b6da20d..44e602c1 100644 --- a/samples/fat/pom.xml +++ b/samples/fat/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.4.RELEASE + 3.2.0-SNAPSHOT @@ -108,10 +108,10 @@ [11,) - + diff --git a/samples/multi/application/build.gradle b/samples/multi/application/build.gradle index d547d8b3..134630a9 100644 --- a/samples/multi/application/build.gradle +++ b/samples/multi/application/build.gradle @@ -3,7 +3,7 @@ plugins { id 'io.spring.dependency-management' version '1.0.11.RELEASE' id 'java' id 'maven-publish' - id 'org.springframework.boot.experimental.thin-launcher' version '1.0.30.BUILD-SNAPSHOT' + id 'org.springframework.boot.experimental.thin-launcher' version '1.1.0-SNAPSHOT' } jar { diff --git a/samples/multi/pom.xml b/samples/multi/pom.xml index c2e51686..c9cfc95b 100644 --- a/samples/multi/pom.xml +++ b/samples/multi/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.9.RELEASE + 3.2.0-SNAPSHOT @@ -19,7 +19,7 @@ UTF-8 1.8 3.1.0 - 1.0.30.BUILD-SNAPSHOT + 1.1.0-SNAPSHOT diff --git a/samples/other/build.gradle b/samples/other/build.gradle index 5f4acdab..5a47741c 100644 --- a/samples/other/build.gradle +++ b/samples/other/build.gradle @@ -3,7 +3,7 @@ plugins { id 'io.spring.dependency-management' version '1.0.11.RELEASE' id 'java' id 'maven-publish' - id 'org.springframework.boot.experimental.thin-launcher' version '1.0.30.BUILD-SNAPSHOT' + id 'org.springframework.boot.experimental.thin-launcher' version '1.1.0-SNAPSHOT' } group = 'com.example' diff --git a/samples/other/pom.xml b/samples/other/pom.xml index b2634f25..9b1b502b 100644 --- a/samples/other/pom.xml +++ b/samples/other/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 3.2.0-SNAPSHOT @@ -23,7 +23,7 @@ UTF-8 1.8 3.1.0 - 1.0.30.BUILD-SNAPSHOT + 1.1.0-SNAPSHOT diff --git a/samples/petclinic/pom.xml b/samples/petclinic/pom.xml index d1c91eab..1ba1278c 100644 --- a/samples/petclinic/pom.xml +++ b/samples/petclinic/pom.xml @@ -30,7 +30,7 @@ org.springframework.samples.petclinic.PetClinicApplication - 1.0.30.BUILD-SNAPSHOT + 1.1.0-SNAPSHOT @@ -234,10 +234,10 @@ [11,) - + org.glassfish.jaxb jaxb-runtime diff --git a/samples/pom/pom.xml b/samples/pom/pom.xml index 29ea6756..6ec4ddfe 100644 --- a/samples/pom/pom.xml +++ b/samples/pom/pom.xml @@ -11,7 +11,7 @@ UTF-8 1.8 - 1.0.30.BUILD-SNAPSHOT + 1.1.0-SNAPSHOT diff --git a/samples/shadow/build.gradle b/samples/shadow/build.gradle index 8a2509e7..4b6ff347 100644 --- a/samples/shadow/build.gradle +++ b/samples/shadow/build.gradle @@ -1,7 +1,7 @@ buildscript { ext { springBootVersion = '2.0.5.RELEASE' - wrapperVersion = '1.0.30.BUILD-SNAPSHOT' + wrapperVersion = '1.1.0-SNAPSHOT' shadowVersion = '2.0.1' } repositories { diff --git a/samples/shadow/pom.xml b/samples/shadow/pom.xml index 44da53e0..45c8f466 100644 --- a/samples/shadow/pom.xml +++ b/samples/shadow/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.2.RELEASE + 3.2.0-SNAPSHOT @@ -23,7 +23,7 @@ UTF-8 1.8 3.1.0 - 1.0.30.BUILD-SNAPSHOT + 1.1.0-SNAPSHOT diff --git a/samples/simple/build.gradle b/samples/simple/build.gradle index 0e14f24d..5b5cbfbd 100644 --- a/samples/simple/build.gradle +++ b/samples/simple/build.gradle @@ -3,7 +3,7 @@ plugins { id 'io.spring.dependency-management' version '1.0.11.RELEASE' id 'java' id 'maven-publish' - id 'org.springframework.boot.experimental.thin-launcher' version '1.0.30.BUILD-SNAPSHOT' + id 'org.springframework.boot.experimental.thin-launcher' version '1.1.0-SNAPSHOT' } group = 'com.example' diff --git a/samples/simple/pom.xml b/samples/simple/pom.xml index 856fdfdd..87906ef1 100644 --- a/samples/simple/pom.xml +++ b/samples/simple/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 3.2.0-SNAPSHOT @@ -23,7 +23,7 @@ UTF-8 UTF-8 1.8 - 1.0.30.BUILD-SNAPSHOT + 1.1.0-SNAPSHOT @@ -123,10 +123,10 @@ [11,) - + diff --git a/samples/tests/build.gradle b/samples/tests/build.gradle index 58a27140..8b97b8c5 100644 --- a/samples/tests/build.gradle +++ b/samples/tests/build.gradle @@ -1,7 +1,7 @@ buildscript { ext { springBootVersion = '1.5.3.RELEASE' - wrapperVersion = '1.0.30.BUILD-SNAPSHOT' + wrapperVersion = '1.1.0-SNAPSHOT' } repositories { mavenLocal() diff --git a/samples/tests/pom.xml b/samples/tests/pom.xml index 2a6b8609..6d635257 100644 --- a/samples/tests/pom.xml +++ b/samples/tests/pom.xml @@ -21,8 +21,8 @@ UTF-8 1.8 3.1.0 - 2.7.10 - 1.0.30.BUILD-SNAPSHOT + 3.2.0-SNAPSHOT + 1.1.0-SNAPSHOT ./gradlew diff --git a/samples/tests/src/it/cloud/pom.xml b/samples/tests/src/it/cloud/pom.xml index 9b0cbaba..2f9b7436 100644 --- a/samples/tests/src/it/cloud/pom.xml +++ b/samples/tests/src/it/cloud/pom.xml @@ -16,7 +16,7 @@ 1.8 - 1.0.30.BUILD-SNAPSHOT + 1.1.0-SNAPSHOT diff --git a/samples/tests/src/it/empty/pom.xml b/samples/tests/src/it/empty/pom.xml index a0d4d132..f3014af7 100644 --- a/samples/tests/src/it/empty/pom.xml +++ b/samples/tests/src/it/empty/pom.xml @@ -16,7 +16,7 @@ 1.8 - 1.0.30.BUILD-SNAPSHOT + 1.1.0-SNAPSHOT diff --git a/samples/tests/src/it/fat/pom.xml b/samples/tests/src/it/fat/pom.xml index 32e62216..52e66797 100644 --- a/samples/tests/src/it/fat/pom.xml +++ b/samples/tests/src/it/fat/pom.xml @@ -15,7 +15,7 @@ 1.8 - 1.0.30.BUILD-SNAPSHOT + 1.1.0-SNAPSHOT diff --git a/samples/tests/src/test/java/com/example/AppMavenIT.java b/samples/tests/src/test/java/com/example/AppMavenIT.java index b9f65fc3..7781f27c 100644 --- a/samples/tests/src/test/java/com/example/AppMavenIT.java +++ b/samples/tests/src/test/java/com/example/AppMavenIT.java @@ -66,7 +66,7 @@ public void launcherDownloaded() { "target/it/app/target/thin/root/repository/org/springframework/boot/experimental"); assertThat(downloaded).exists(); downloaded = new File(downloaded, - "spring-boot-thin-launcher/1.0.30.BUILD-SNAPSHOT/spring-boot-thin-launcher-1.0.30.BUILD-SNAPSHOT-exec.jar"); + "spring-boot-thin-launcher/1.1.0-SNAPSHOT/spring-boot-thin-launcher-1.1.0-SNAPSHOT-exec.jar"); assertThat(downloaded).exists(); } diff --git a/tools/converter/pom.xml b/tools/converter/pom.xml index abf2dcdd..ec83ca98 100644 --- a/tools/converter/pom.xml +++ b/tools/converter/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot.experimental spring-boot-thin-tools - 1.0.30.BUILD-SNAPSHOT + 1.1.0-SNAPSHOT spring-boot-thin-tools-converter @@ -47,7 +47,7 @@ false - org.springframework.boot.loader.thin.converter.ThinConverterApplication + org.springframework.boot.loader.thin.converter.ThinConverterApplication @@ -57,6 +57,16 @@ spring-boot-thin-layout ${project.version} + + org.apache.maven.shared + maven-common-artifact-filters + 3.0.1 + + + org.springframework.boot + spring-boot-loader-tools + 3.2.0-SNAPSHOT + diff --git a/tools/converter/src/main/java/org/springframework/boot/loader/thin/converter/ThinConverterApplication.java b/tools/converter/src/main/java/org/springframework/boot/loader/thin/converter/ThinConverterApplication.java index 28ddfd51..0015bc19 100644 --- a/tools/converter/src/main/java/org/springframework/boot/loader/thin/converter/ThinConverterApplication.java +++ b/tools/converter/src/main/java/org/springframework/boot/loader/thin/converter/ThinConverterApplication.java @@ -151,7 +151,7 @@ private void help() { "\nConverts a thin executable jar to a Spring Boot fat jar with the same name but with '-exec' suffix.\n\n" + "Usage: run a thin jar and make this one the --thin.library for it. E.g. \n\n" + " $ java -jar myapp.jar --thin.dryrun --thin.root=target/thin/root\n" - + " $ java -jar myapp.jar --thin.library=org.springframework.boot.experimental:spring-boot-thin-converter:1.0.30.BUILD-SNAPSHOT\n" + + " $ java -jar myapp.jar --thin.library=org.springframework.boot.experimental:spring-boot-thin-converter:1.1.0-SNAPSHOT\n" + " $ java -jar myapp-exec.jar\n\n" + // " Optional args:\n\n" // + " repository - location of Maven repository cache (defaults to target/thin/root/repository)\n" diff --git a/tools/pom.xml b/tools/pom.xml index 077c2ced..a76569d6 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot.experimental spring-boot-thin-launcher-parent - 1.0.30.BUILD-SNAPSHOT + 1.1.0-SNAPSHOT spring-boot-thin-tools diff --git a/wrapper/pom.xml b/wrapper/pom.xml index 983093a2..720b34ab 100644 --- a/wrapper/pom.xml +++ b/wrapper/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot.experimental spring-boot-thin-launcher-parent - 1.0.30.BUILD-SNAPSHOT + 1.1.0-SNAPSHOT spring-boot-thin-wrapper diff --git a/wrapper/src/main/java/org/springframework/boot/loader/wrapper/ThinJarWrapper.java b/wrapper/src/main/java/org/springframework/boot/loader/wrapper/ThinJarWrapper.java index e1249f6e..0ce233d8 100644 --- a/wrapper/src/main/java/org/springframework/boot/loader/wrapper/ThinJarWrapper.java +++ b/wrapper/src/main/java/org/springframework/boot/loader/wrapper/ThinJarWrapper.java @@ -91,7 +91,7 @@ public class ThinJarWrapper { private static final String DEFAULT_LAUNCHER_CLASS = "org.springframework.boot.loader.thin.ThinJarLauncher"; - private static final String DEFAULT_LIBRARY = "org.springframework.boot.experimental:spring-boot-thin-launcher:jar:exec:1.0.30.BUILD-SNAPSHOT"; + private static final String DEFAULT_LIBRARY = "org.springframework.boot.experimental:spring-boot-thin-launcher:jar:exec:1.1.0-SNAPSHOT"; private Properties properties;