Merge branch '1.4.x' into 1.5.x

This commit is contained in:
Phillip Webb
2016-12-19 12:36:57 -08:00
330 changed files with 554 additions and 47 deletions

View File

@@ -134,4 +134,5 @@ public abstract class AbstractDependencyFilterMojo extends AbstractMojo {
}
return cleaned.toString();
}
}

View File

@@ -506,6 +506,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
class LaunchRunner implements Runnable {
private final String startClassName;
private final String[] args;
LaunchRunner(String startClassName, String... args) {

View File

@@ -93,4 +93,5 @@ public class DependencyFilterMojoTests {
}
}
}

View File

@@ -87,6 +87,7 @@ public final class Verify {
public static class ArchiveVerifier {
private final ZipFile zipFile;
private final Map<String, ZipEntry> content;
public ArchiveVerifier(ZipFile zipFile) {
@@ -253,6 +254,7 @@ public final class Verify {
assertThat(manifest.getMainAttributes().getValue("Not-Used"))
.isEqualTo("Foo");
}
}
public static class WarArchiveVerification extends AbstractArchiveVerification {
@@ -286,6 +288,7 @@ public final class Verify {
assertThat(manifest.getMainAttributes().getValue("Not-Used"))
.isEqualTo("Foo");
}
}
private static class ZipArchiveVerification extends AbstractArchiveVerification {
@@ -303,6 +306,7 @@ public final class Verify {
assertThat(manifest.getMainAttributes().getValue("Not-Used"))
.isEqualTo("Foo");
}
}
private static class ModuleArchiveVerification extends AbstractArchiveVerification {