diff --git a/WHATSNEW b/WHATSNEW index 3f37d82be..33bf42aad 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -6,6 +6,8 @@ Changes that could break older environments: Fixed bugs: ----------- +* SPI support in jar was broken. + Bugzilla report 41201. Other changes: -------------- diff --git a/src/main/org/apache/tools/ant/taskdefs/Jar.java b/src/main/org/apache/tools/ant/taskdefs/Jar.java index 2dabb5349..0ba35a16f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Jar.java +++ b/src/main/org/apache/tools/ant/taskdefs/Jar.java @@ -397,7 +397,7 @@ public class Jar extends Zip { service = (Service) serviceIterator.next(); //stolen from writeManifest super.zipFile(service.getAsStream(), zOut, - "META-INF/service/" + service.getType(), + "META-INF/services/" + service.getType(), System.currentTimeMillis(), null, ZipFileSet.DEFAULT_FILE_MODE); } diff --git a/src/tests/antunit/taskdefs/jar-spi-test.xml b/src/tests/antunit/taskdefs/jar-spi-test.xml index 4fa48ff8c..90131d680 100644 --- a/src/tests/antunit/taskdefs/jar-spi-test.xml +++ b/src/tests/antunit/taskdefs/jar-spi-test.xml @@ -23,7 +23,7 @@ dest="${jar.dir}/output"/> @@ -46,7 +46,7 @@ dest="${jar.dir}/output"/> @@ -72,7 +72,7 @@ dest="${jar.dir}/output"/> @@ -80,7 +80,7 @@