Switching from APT to JSR-269 for annotation processing.

core/pom.xml

@@ -33,7 +33,6 @@ THE SOFTWARE.
   </parent>
 
   <artifactId>jenkins-core</artifactId>
-  <packaging>stapler-jar</packaging>
   <name>Jenkins core</name>
   <description>
     Contains the core Jenkins code and view files to render HTML.
@@ -84,15 +83,8 @@ THE SOFTWARE.
       <plugin>
         <groupId>org.kohsuke.stapler</groupId>
         <artifactId>maven-stapler-plugin</artifactId>
+        <version>1.16</version>
         <!-- version specified in grandparent pom -->
-        <extensions>true</extensions>
-        <dependencies>
-          <dependency>
-            <groupId>org.jvnet.maven-jellydoc-plugin</groupId>
-            <artifactId>maven-jellydoc-plugin</artifactId>
-            <version>1.5</version>
-          </dependency>
-        </dependencies>
         <configuration>
           <fork>${staplerFork}</fork><!-- the source code is big enough now that otherwise it fails with OutOfMemoryError -->
           <maxmem>128m</maxmem>
@@ -367,7 +359,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.kohsuke.stapler</groupId>
       <artifactId>stapler-groovy</artifactId>
-      <version>1.167</version>
+      <version>1.169</version>
       <exclusions>
         <exclusion>
           <groupId>commons-jelly</groupId>

core/src/main/java/hudson/model/Descriptor.java

@@ -687,7 +687,8 @@ public abstract class Descriptor<T extends Describable<T>> implements Saveable {
         for (Facet f : WebApp.get(Jenkins.getInstance().servletContext).facets) {
             if (f instanceof JellyCompatibleFacet) {
                 JellyCompatibleFacet jcf = (JellyCompatibleFacet) f;
-                names.add(baseName +jcf.getDefaultScriptExtension());
+                for (String ext : jcf.getScriptExtensions())
+                    names.add(baseName +ext);
             }
         }
         return names;

plugins/pom.xml

@@ -115,7 +115,7 @@
       <plugin>
         <groupId>org.jenkins-ci.tools</groupId>
         <artifactId>maven-hpi-plugin</artifactId>
-        <version>1.67</version>
+        <version>1.72</version>
         <extensions>true</extensions>
         <configuration>
           <showDeprecation>true</showDeprecation>

pom.xml

@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci</groupId>
     <artifactId>jenkins</artifactId>
-    <version>1.21</version>
+    <version>1.22</version>
   </parent>
   
   <groupId>org.jenkins-ci.main</groupId>
@@ -253,7 +253,7 @@ THE SOFTWARE.
         <plugin>
           <groupId>org.jenkins-ci.tools</groupId>
           <artifactId>maven-hpi-plugin</artifactId>
-          <version>1.70</version>
+          <version>1.72</version>
         </plugin>
       </plugins>
     </pluginManagement>