Merge branch '1.2.x'

spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,6 +30,7 @@
  * '{@literal java -jar}'.
  *
  * @author Phillip Webb
+ * @author Andy Wilkinson
  */
 public class Repackager {
 
@@ -157,7 +158,6 @@ private void repackage(JarFile sourceJar, File destination, Libraries libraries)
 		try {
 			final Set<String> seen = new HashSet<String>();
 			writer.writeManifest(buildManifest(sourceJar));
-			writer.writeEntries(sourceJar);
 			libraries.doWithLibraries(new LibraryCallback() {
 				@Override
 				public void library(Library library) throws IOException {
@@ -176,7 +176,7 @@ public void library(Library library) throws IOException {
 					}
 				}
 			});
-
+			writer.writeEntries(sourceJar);
 			if (this.layout.isExecutable()) {
 				writer.writeLoaderClasses();
 			}

spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/RepackagerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -280,6 +280,8 @@ public void libraries() throws Exception {
 		final File libNonJarFile = this.temporaryFolder.newFile();
 		FileCopyUtils.copy(new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8 }, libNonJarFile);
 		this.testJarFile.addClass("a/b/C.class", ClassWithMainMethod.class);
+		this.testJarFile.addFile("lib/" + libJarFileToUnpack.getName(),
+				libJarFileToUnpack);
 		File file = this.testJarFile.getFile();
 		Repackager repackager = new Repackager(file);
 		repackager.repackage(new Libraries() {

spring-boot-tools/spring-boot-maven-plugin/src/it/jar-with-unpack/verify.groovy

@@ -22,7 +22,7 @@ new Verify.JarArchiveVerification(f, Verify.SAMPLE_APP) {
 	@Override
 	protected void verifyZipEntries(Verify.ArchiveVerifier verifier) throws Exception {
 		super.verifyZipEntries(verifier)
-		verifier.hasUnpackEntry("lib/spring-core-")
-		verifier.hasNonUnpackEntry("lib/spring-context-")
+		verifier.assertHasUnpackEntry("lib/spring-core-")
+		verifier.assertHasNonUnpackEntry("lib/spring-context-")
 	}
 }.verify();

spring-boot-tools/spring-boot-maven-plugin/src/it/war-with-unpack/pom.xml

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.springframework.boot.maven.it</groupId>
+	<artifactId>war</artifactId>
+	<version>0.0.1.BUILD-SNAPSHOT</version>
+	<packaging>war</packaging>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>@project.groupId@</groupId>
+				<artifactId>@project.artifactId@</artifactId>
+				<version>@project.version@</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+						<configuration>
+							<requiresUnpack>
+								<dependency>
+									<groupId>org.springframework</groupId>
+									<artifactId>spring-core</artifactId>
+								</dependency>
+							</requiresUnpack>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<version>2.3</version>
+				<configuration>
+					<failOnMissingWebXml>false</failOnMissingWebXml>
+					<archive>
+						<manifestEntries>
+							<Not-Used>Foo</Not-Used>
+						</manifestEntries>
+					</archive>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+			<version>@spring.version@</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<version>@servlet-api.version@</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+</project>

spring-boot-tools/spring-boot-maven-plugin/src/it/war-with-unpack/src/main/java/org/test/SampleApplication.java

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2012-2015 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.test;
+
+public class SampleApplication {
+
+	public static void main(String[] args) {
+	}
+
+}

spring-boot-tools/spring-boot-maven-plugin/src/it/war-with-unpack/src/main/webapp/index.html

@@ -0,0 +1 @@
+<html></html>

spring-boot-tools/spring-boot-maven-plugin/src/it/war-with-unpack/verify.groovy

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2012-2015 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.io.*;
+import org.springframework.boot.maven.*;
+
+File f = new File( basedir, "target/war-0.0.1.BUILD-SNAPSHOT.war")
+new Verify.WarArchiveVerification(f) {
+	@Override
+	protected void verifyZipEntries(Verify.ArchiveVerifier verifier) throws Exception {
+		super.verifyZipEntries(verifier)
+		verifier.assertHasUnpackEntry("WEB-INF/lib/spring-core-")
+		verifier.assertHasNonUnpackEntry("WEB-INF/lib/spring-context-")
+	}
+}.verify()
+

spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/Verify.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2013 the original author or authors.
+ * Copyright 2012-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,6 +34,7 @@
  * Verification utility for use with maven-invoker-plugin verification scripts.
  *
  * @author Phillip Webb
+ * @author Andy Wilkinson
  */
 public class Verify {
 
@@ -92,11 +93,21 @@ public void assertHasNoEntryNameStartingWith(String entry) {
 			}
 		}
 
-		public boolean hasNonUnpackEntry(String entryName) {
+		public void assertHasNonUnpackEntry(String entryName) {
+			assertTrue("Entry starting with " + entryName + " was an UNPACK entry",
+					hasNonUnpackEntry(entryName));
+		}
+
+		public void assertHasUnpackEntry(String entryName) {
+			assertTrue("Entry starting with " + entryName + " was not an UNPACK entry",
+					hasUnpackEntry(entryName));
+		}
+
+		private boolean hasNonUnpackEntry(String entryName) {
 			return !hasUnpackEntry(entryName);
 		}
 
-		public boolean hasUnpackEntry(String entryName) {
+		private boolean hasUnpackEntry(String entryName) {
 			String comment = getEntryStartingWith(entryName).getComment();
 			return comment != null && comment.startsWith("UNPACK:");
 		}