Merge branch '1.2.x'

This commit is contained in:
Phillip Webb
2015-10-09 13:39:09 -07:00
104 changed files with 38 additions and 120 deletions

View File

@@ -21,4 +21,3 @@
* @see org.springframework.boot.loader.archive.Archive
*/
package org.springframework.boot.loader.archive;

View File

@@ -20,4 +20,3 @@
* @see org.springframework.boot.loader.data.RandomAccessData
*/
package org.springframework.boot.loader.data;

View File

@@ -18,4 +18,3 @@
* Support for loading and manipulating JAR/WAR files.
*/
package org.springframework.boot.loader.jar;

View File

@@ -16,12 +16,11 @@
/**
* System that allows self-contained JAR/WAR archives to be launched using
* {@code java -jar}. Archives can include nested packaged dependency JARs (there is
* no need to create shade style jars) and are executed without unpacking. The only
* {@code java -jar}. Archives can include nested packaged dependency JARs (there is no
* need to create shade style jars) and are executed without unpacking. The only
* constraint is that nested JARs must be stored in the archive uncompressed.
*
* @see org.springframework.boot.loader.JarLauncher
* @see org.springframework.boot.loader.WarLauncher
*/
package org.springframework.boot.loader;

View File

@@ -18,4 +18,3 @@
* Utilities used by Spring Boot's JAR loading.
*/
package org.springframework.boot.loader.util;