Merge pull request #232 from basil/org.jenkins-ci-annotation-indexer-…

…1.14 With a new `annotation-indexer` comes a new index location
jenkinsci · Jun 1, 2021 · 32722af · 32722af
2 parents 2f05ce9 + 0b4107f
commit 32722af
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -95,7 +95,7 @@
     <dependency>
       <groupId>org.jenkins-ci</groupId>
       <artifactId>annotation-indexer</artifactId>
-      <version>1.10</version>
+      <version>1.14</version>
       <optional>true</optional>
     </dependency>
     <dependency>

diff --git a/core/src/test/java/org/kohsuke/stapler/jsr269/ExportedBeanAnnotationProcessorTest.java b/core/src/test/java/org/kohsuke/stapler/jsr269/ExportedBeanAnnotationProcessorTest.java
@@ -27,7 +27,7 @@ private void assertEqualsCRLF(String s1, String s2) {
                 addLine("}");
         compilation.doCompile(null, "-source", "6");
         assertEquals(Collections.emptyList(), compilation.getDiagnostics());
-        assertEqualsCRLF("some.pkg.Stuff\n", Utils.getGeneratedResource(compilation, "META-INF/annotations/org.kohsuke.stapler.export.ExportedBean"));
+        assertEqualsCRLF("some.pkg.Stuff\n", Utils.getGeneratedResource(compilation, "META-INF/services/annotations/org.kohsuke.stapler.export.ExportedBean"));
         assertEqualsCRLF("some.pkg.Stuff\n", Utils.getGeneratedResource(compilation, ExportedBeanAnnotationProcessor.STAPLER_BEAN_FILE));
         assertEquals("{getDisplayName=This gets the display name. }", Utils.normalizeProperties(Utils.getGeneratedResource(compilation, "some/pkg/Stuff.javadoc")));
     }
@@ -42,7 +42,7 @@ private void assertEqualsCRLF(String s1, String s2) {
                 addLine("}");
         compilation.doCompile(null, "-source", "6");
         assertEquals(Collections.emptyList(), compilation.getDiagnostics());
-        assertEqualsCRLF("some.pkg.Stuff\n", Utils.getGeneratedResource(compilation, "META-INF/annotations/org.kohsuke.stapler.export.ExportedBean"));
+        assertEqualsCRLF("some.pkg.Stuff\n", Utils.getGeneratedResource(compilation, "META-INF/services/annotations/org.kohsuke.stapler.export.ExportedBean"));
         assertEqualsCRLF("some.pkg.Stuff\n", Utils.getGeneratedResource(compilation, ExportedBeanAnnotationProcessor.STAPLER_BEAN_FILE));
         // TODO should it be null, i.e. is it desired to create an empty *.javadoc file?
         assertEquals("{}", Utils.normalizeProperties(Utils.getGeneratedResource(compilation, "some/pkg/Stuff.javadoc")));
@@ -62,7 +62,7 @@ private void assertEqualsCRLF(String s1, String s2) {
         compilation.doCompile(null, "-source", "6");
         assertEquals(Collections.emptyList(), compilation.getDiagnostics());
         /* #7188605: broken in JDK 6u33 + org.jvnet.hudson:annotation-indexer:1.2:
-        assertEquals("some.pkg.Stuff\n", Utils.getGeneratedResource(compilation, "META-INF/annotations/org.kohsuke.stapler.export.ExportedBean"));
+        assertEquals("some.pkg.Stuff\n", Utils.getGeneratedResource(compilation, "META-INF/services/annotations/org.kohsuke.stapler.export.ExportedBean"));
         */
         // TODO is it intentional that these are not listed here? (example: hudson.plugins.mercurial.MercurialSCM)
         assertEquals(null, Utils.getGeneratedResource(compilation, ExportedBeanAnnotationProcessor.STAPLER_BEAN_FILE));