[FIXED JENKINS-11739] Various mistakes in annotation processors affec…

…ting some plugins.
jenkinsci · Aug 3, 2012 · 10dddeb · 10dddeb
1 parent f39fbdb
commit 10dddeb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/changelog.html b/changelog.html
@@ -55,6 +55,9 @@
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
+  <li class=bug>
+    Annotation processor bugs in Stapler affecting plugin compilation.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-11739">issue 11739</a>)
   <li class='major bug'>
     Regressions in add/delete buttons starting in 1.474.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-14434">issue 14434</a> and <a href="https://issues.jenkins-ci.org/browse/JENKINS-14495">issue 14495</a>)

diff --git a/core/pom.xml b/core/pom.xml
@@ -42,7 +42,7 @@ THE SOFTWARE.
 
   <properties>
     <staplerFork>true</staplerFork>
-    <stapler.version>1.192</stapler.version>
+    <stapler.version>1.195</stapler.version>
   </properties>
 
   <dependencies>

diff --git a/war/pom.xml b/war/pom.xml
@@ -71,6 +71,11 @@ THE SOFTWARE.
           <groupId>javax.servlet</groupId>
           <artifactId>jsp-api</artifactId>
         </exclusion>
+        <!-- Stapler 1.195 fails to declare this as optional, and the 1.1 version lacks a license: -->
+        <exclusion>
+          <artifactId>metainf-services</artifactId>
+          <groupId>org.kohsuke.metainf-services</groupId>
+        </exclusion>
       </exclusions>
     </dependency>
     <!-- declare this in reactors, so i can use now directly : mvn install -pl war -am to get the war  -->