root
/
spring-boot
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch '1.2.x'

Browse Source
pull/3706/head
Phillip Webb 9 years ago
parent 67f7079cb2 4b17f3ceef
commit e3b59774c8
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File

1
spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java
Unescape Escape View File

@ -172,7 +172,6 @@ public class Repackager {
try { try {
final List<Library> unpackLibraries = new ArrayList<Library>(); final List<Library> unpackLibraries = new ArrayList<Library>();
final List<Library> standardLibraries = new ArrayList<Library>(); final List<Library> standardLibraries = new ArrayList<Library>();
libraries.doWithLibraries(new LibraryCallback() { libraries.doWithLibraries(new LibraryCallback() {
@Override @Override
public void library(Library library) throws IOException { public void library(Library library) throws IOException {

8
spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/RepackagerTests.java
Unescape Escape View File

@ -432,7 +432,7 @@ public class RepackagerTests {
@Test @Test
public void unpackLibrariesTakePrecedenceOverExistingSourceEntries() throws Exception { public void unpackLibrariesTakePrecedenceOverExistingSourceEntries() throws Exception {
final TestJarFile nested = new TestJarFile(this.temporaryFolder); TestJarFile nested = new TestJarFile(this.temporaryFolder);
nested.addClass("a/b/C.class", ClassWithoutMainMethod.class); nested.addClass("a/b/C.class", ClassWithoutMainMethod.class);
final File nestedFile = nested.getFile(); final File nestedFile = nested.getFile();
this.testJarFile.addFile("lib/" + nestedFile.getName(), nested.getFile()); this.testJarFile.addFile("lib/" + nestedFile.getName(), nested.getFile());
@ -447,7 +447,6 @@ public class RepackagerTests {
} }
}); });
JarFile jarFile = new JarFile(file); JarFile jarFile = new JarFile(file);
try { try {
assertThat(jarFile.getEntry("lib/" + nestedFile.getName()).getComment(), assertThat(jarFile.getEntry("lib/" + nestedFile.getName()).getComment(),
@ -461,16 +460,14 @@ public class RepackagerTests {
@Test @Test
public void existingSourceEntriesTakePrecedenceOverStandardLibraries() public void existingSourceEntriesTakePrecedenceOverStandardLibraries()
throws Exception { throws Exception {
final TestJarFile nested = new TestJarFile(this.temporaryFolder); TestJarFile nested = new TestJarFile(this.temporaryFolder);
nested.addClass("a/b/C.class", ClassWithoutMainMethod.class); nested.addClass("a/b/C.class", ClassWithoutMainMethod.class);
final File nestedFile = nested.getFile(); final File nestedFile = nested.getFile();
this.testJarFile.addFile("lib/" + nestedFile.getName(), nested.getFile()); this.testJarFile.addFile("lib/" + nestedFile.getName(), nested.getFile());
this.testJarFile.addClass("A.class", ClassWithMainMethod.class); this.testJarFile.addClass("A.class", ClassWithMainMethod.class);
File file = this.testJarFile.getFile(); File file = this.testJarFile.getFile();
Repackager repackager = new Repackager(file); Repackager repackager = new Repackager(file);
long sourceLength = nestedFile.length(); long sourceLength = nestedFile.length();
repackager.repackage(new Libraries() { repackager.repackage(new Libraries() {
@Override @Override
@ -482,7 +479,6 @@ public class RepackagerTests {
} }
}); });
JarFile jarFile = new JarFile(file); JarFile jarFile = new JarFile(file);
try { try {
assertThat(jarFile.getEntry("lib/" + nestedFile.getName()).getSize(), assertThat(jarFile.getEntry("lib/" + nestedFile.getName()).getSize(),

Write Preview
Loading…
Cancel
Save