Revert to snapshots

dsyer · Aug 17, 2018 · 9c9de63 · 9c9de63
1 parent 3a943d4
commit 9c9de63
Show file tree

Hide file tree

Showing 37 changed files with 42 additions and 42 deletions.
diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@ and in Gradle for Spring Boot up to 1.5.x:
 buildscript {
 	ext {
 		springBootVersion = '1.5.6.RELEASE'
-		wrapperVersion = '1.0.14.RELEASE'
+		wrapperVersion = '1.0.15.BUILD-SNAPSHOT'
 	}
 	repositories {
 		mavenLocal()
@@ -52,7 +52,7 @@ and for Spring Boot 2.0.x:
 buildscript {
 	ext {
 		springBootVersion = '2.0.1.RELEASE'
-		wrapperVersion = '1.0.14.RELEASE'
+		wrapperVersion = '1.0.15.BUILD-SNAPSHOT'
 	}
 	repositories {
 		mavenLocal()
@@ -317,7 +317,7 @@ You can set a variety of options on the command line or with system properties (
 | `thin.location` | `file:.,classpath:/` | The path to directory containing thin properties files (as per `thin.name`), as a comma-separated list of resource locations (directories). These locations plus the same paths relative /META-INF will be searched. |
 | `thin.name` | "thin" | The name of the properties file to search for dependency specifications and overrides. |
 | `thin.profile` |<empty> | Comma-separated list of profiles to use to locate thin properties. E.g. if `thin.profile=foo` the launcher searches for files called `thin.properties` and `thin-foo.properties`. |
-| `thin.library` | `org.springframework.boot.experimental:spring-boot-thin-launcher:1.0.14.RELEASE` | A locator for the launcher library. Can be Maven coordinates (with optional `maven://` prefix), or a file (with optional `file://` prefix). |
+| `thin.library` | `org.springframework.boot.experimental:spring-boot-thin-launcher:1.0.15.BUILD-SNAPSHOT` | A locator for the launcher library. Can be Maven coordinates (with optional `maven://` prefix), or a file (with optional `file://` prefix). |
 | `thin.launcher` | `org.springframework.boot.thin.ThinJarLauncher` | The main class in the `thin.library`. If not specified it is discovered from the manifest `Main-Class` attribute. |
 | `thin.parent.first` | true | Flag to say that the class loader is "parent first" (i.e. the system class loader will be used as the default). This is the "standard" JDK class loader strategy. Setting it to false is similar to what is normally used in web containers and application servers. |
 | `thin.parent.boot` | true | Flag to say that the parent class loader should be the boot class loader not the "system" class loader. The boot loader normally includes the JDK classes, but not the target archive, nor any agent jars added on the command line. |
@@ -455,7 +455,7 @@ There is a converter tool that you can use as a library in place of the launcher
 
 ```
 $ java -jar myapp.jar --thin.dryrun --thin.root=target/thin/root
-$ java -jar myapp.jar --thin.library=org.springframework.boot.experimental:spring-boot-thin-tools-converter:1.0.14.RELEASE
+$ java -jar myapp.jar --thin.library=org.springframework.boot.experimental:spring-boot-thin-tools-converter:1.0.15.BUILD-SNAPSHOT
 $ java -jar myapp-exec.jar
 ```
 

diff --git a/deployer/pom.xml b/deployer/pom.xml
@@ -13,13 +13,13 @@
 	<parent>
 		<groupId>org.springframework.boot.experimental</groupId>
 		<artifactId>spring-boot-thin-launcher-parent</artifactId>
-		<version>1.0.14.RELEASE</version>
+		<version>1.0.15.BUILD-SNAPSHOT</version>
 	</parent>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<wrapper.version>1.0.14.RELEASE</wrapper.version>
+		<wrapper.version>1.0.15.BUILD-SNAPSHOT</wrapper.version>
 		<spring-boot.version>1.5.3.RELEASE</spring-boot.version>
 		<deployer.version>1.1.4.RELEASE</deployer.version>
 	</properties>

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.14.RELEASE</wrapper.version>
+		<wrapper.version>1.0.15.BUILD-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.14.RELEASE</version>
+		<version>1.0.15.BUILD-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-boot-thin-gradle-plugin</artifactId>

diff --git a/...plugin/src/main/java/org/springframework/boot/experimental/gradle/ThinLauncherPlugin.java b/...plugin/src/main/java/org/springframework/boot/experimental/gradle/ThinLauncherPlugin.java
@@ -45,7 +45,7 @@
 
 /**
  * Gradle {@link Plugin} for Spring Boot's thin launcher.
- * <p>
+ * 
  * If the Java plugin is applied to the project, some tasks are added to the project.
  * <ul>
  * <li>"thinResolve": runs the project jar and download its dependencies. If you have more
@@ -58,7 +58,7 @@
  * output.</li>
  * <li>"thinPom": runs automatically if you apply the Maven plugin. Generates a pom.xml
  * and puts it in the main build output.</li>
- * </p>
+ * </ul>
  * 
  * @author Andy Wilkinson
  */

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

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>1.5.3.RELEASE</spring-boot.version>
-		<wrapper.version>1.0.14.RELEASE</wrapper.version>
+		<wrapper.version>1.0.15.BUILD-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.14.RELEASE</thin-launcher.version>
+		<thin-launcher.version>1.0.15.BUILD-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.14.RELEASE</thin-launcher.version>
+		<thin-launcher.version>1.0.15.BUILD-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/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.14.RELEASE</thin-launcher.version>
+		<thin-launcher.version>1.0.15.BUILD-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/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.14.RELEASE</wrapper.version>
+		<wrapper.version>1.0.15.BUILD-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>1.5.3.RELEASE</spring-boot.version>
-		<wrapper.version>1.0.14.RELEASE</wrapper.version>
+		<wrapper.version>1.0.15.BUILD-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>1.5.3.RELEASE</spring-boot.version>
-		<wrapper.version>1.0.14.RELEASE</wrapper.version>
+		<wrapper.version>1.0.15.BUILD-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.14.RELEASE</wrapper.version>
+		<wrapper.version>1.0.15.BUILD-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.14.RELEASE</version>
+		<version>1.0.15.BUILD-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.14.RELEASE'
+		wrapperVersion = '1.0.15.BUILD-SNAPSHOT'
 	}
 	repositories {
 		mavenLocal()

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.14.RELEASE</version>
+		<version>1.0.15.BUILD-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-boot-thin-maven-plugin</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>org.springframework.boot.experimental</groupId>
 	<artifactId>spring-boot-thin-launcher-parent</artifactId>
-	<version>1.0.14.RELEASE</version>
+	<version>1.0.15.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Thin Launcher Parent</name>
 	<description>Tools for working with "thin" executable jars that can download their own dependendies, either at runtime or build time</description>

diff --git a/samples/app/build.gradle b/samples/app/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
 	ext {
 		springBootVersion = '2.0.2.RELEASE'
-		wrapperVersion = '1.0.14.RELEASE'
+		wrapperVersion = '1.0.15.BUILD-SNAPSHOT'
 	}
 	repositories {
 		mavenLocal()

diff --git a/samples/app/pom.xml b/samples/app/pom.xml
@@ -23,7 +23,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
 		<spring-boot-plugin.version>2.0.3.RELEASE</spring-boot-plugin.version>
-		<wrapper.version>1.0.14.RELEASE</wrapper.version>
+		<wrapper.version>1.0.15.BUILD-SNAPSHOT</wrapper.version>
 	</properties>
 
 	<dependencies>

diff --git a/samples/multi/application/build.gradle b/samples/multi/application/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     ext {
         springBootVersion = '1.5.10.RELEASE'
-        wrapperVersion = '1.0.14.RELEASE'
+        wrapperVersion = '1.0.15.BUILD-SNAPSHOT'
     }
     repositories {
         mavenLocal()

diff --git a/samples/multi/pom.xml b/samples/multi/pom.xml
@@ -18,7 +18,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.8</java.version>
-		<wrapper.version>1.0.14.RELEASE</wrapper.version>
+		<wrapper.version>1.0.15.BUILD-SNAPSHOT</wrapper.version>
     </properties>
 
     <modules>

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

diff --git a/samples/other/pom.xml b/samples/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.14.RELEASE</wrapper.version>
+		<wrapper.version>1.0.15.BUILD-SNAPSHOT</wrapper.version>
 	</properties>
 
 	<dependencies>

diff --git a/samples/petclinic/pom.xml b/samples/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.14.RELEASE</thin-launcher.version>
+		<thin-launcher.version>1.0.15.BUILD-SNAPSHOT</thin-launcher.version>
 		<spring-boot-plugin.version>1.5.9.RELEASE</spring-boot-plugin.version>
 		<spring-boot.version>1.4.2.RELEASE</spring-boot.version>
 

diff --git a/samples/pom/pom.xml b/samples/pom/pom.xml
@@ -11,7 +11,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.8</java.version>
-		<wrapper.version>1.0.14.RELEASE</wrapper.version>
+		<wrapper.version>1.0.15.BUILD-SNAPSHOT</wrapper.version>
     </properties>
 
     <build>

diff --git a/samples/shadow/build.gradle b/samples/shadow/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
 	ext {
 		springBootVersion = '2.0.3.RELEASE'
-		wrapperVersion = '1.0.14.RELEASE'
+		wrapperVersion = '1.0.15.BUILD-SNAPSHOT'
         shadowVersion = '2.0.1'
 	}
 	repositories {

diff --git a/samples/shadow/pom.xml b/samples/shadow/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.14.RELEASE</wrapper.version>
+		<wrapper.version>1.0.15.BUILD-SNAPSHOT</wrapper.version>
 	</properties>
 
 	<dependencies>

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

diff --git a/samples/simple/pom.xml b/samples/simple/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.2.RELEASE</spring-boot.version>
-		<wrapper.version>1.0.14.RELEASE</wrapper.version>
+		<wrapper.version>1.0.15.BUILD-SNAPSHOT</wrapper.version>
 	</properties>
 
 	<dependencies>

diff --git a/samples/tests/build.gradle b/samples/tests/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
 	ext {
 		springBootVersion = '1.5.3.RELEASE'
-		wrapperVersion = '1.0.14.RELEASE'
+		wrapperVersion = '1.0.15.BUILD-SNAPSHOT'
 	}
 	repositories {
 		mavenLocal()

diff --git a/samples/tests/pom.xml b/samples/tests/pom.xml
@@ -21,7 +21,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
 		<spring-boot.version>1.5.2.RELEASE</spring-boot.version>
-		<wrapper.version>1.0.14.RELEASE</wrapper.version>
+		<wrapper.version>1.0.15.BUILD-SNAPSHOT</wrapper.version>
 		<gradle.exec>./gradlew</gradle.exec>
 	</properties>
 

diff --git a/tools/converter/pom.xml b/tools/converter/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot.experimental</groupId>
 		<artifactId>spring-boot-thin-tools</artifactId>
-		<version>1.0.14.RELEASE</version>
+		<version>1.0.15.BUILD-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-boot-thin-tools-converter</artifactId>

diff --git a/...rc/main/java/org/springframework/boot/loader/thin/converter/ThinConverterApplication.java b/...rc/main/java/org/springframework/boot/loader/thin/converter/ThinConverterApplication.java
@@ -143,7 +143,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.14.RELEASE\n"
+						+ "    $ java -jar myapp.jar --thin.library=org.springframework.boot.experimental:spring-boot-thin-converter:1.0.15.BUILD-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
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot.experimental</groupId>
 		<artifactId>spring-boot-thin-launcher-parent</artifactId>
-		<version>1.0.14.RELEASE</version>
+		<version>1.0.15.BUILD-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-boot-thin-tools</artifactId>

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

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
@@ -83,7 +83,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.14.RELEASE";
+	private static final String DEFAULT_LIBRARY = "org.springframework.boot.experimental:spring-boot-thin-launcher:jar:exec:1.0.15.BUILD-SNAPSHOT";
 
 	private Properties properties;