[FIXED JENKINS-11960] NoSuchMethodError on slf4j on JBoss EAP 5.1

(cherry picked from commit 5bc37c2) Conflicts: changelog.html maven-plugin/pom.xml
jenkinsci · Feb 1, 2012 · 75f3cae · 75f3cae
1 parent 6901d69
commit 75f3cae
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/changelog.html b/changelog.html
@@ -58,6 +58,9 @@
   <li class=bug>
     Fixed NPE in Subversion polling of Maven jobs.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-11592">issue 11592</a>)
+  <li class=bug>
+    Fixed a <tt>NoSuchMethodError</tt> on JBoss 5.1 EAP
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-11960">issue 11960</a>)
   <li class=bug>
     Failure to check the username/groupname in the matrix security shouldn't hide the user name
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-9519">issue 9519</a>)

diff --git a/core/src/main/java/hudson/util/DescribableList.java b/core/src/main/java/hudson/util/DescribableList.java
@@ -39,7 +39,6 @@
 import hudson.model.ReconfigurableDescribable;
 import hudson.model.Saveable;
 import net.sf.json.JSONObject;
-import org.apache.avalon.framework.configuration.Reconfigurable;
 import org.kohsuke.stapler.StaplerRequest;
 
 import java.io.IOException;

diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
@@ -311,6 +311,21 @@ THE SOFTWARE.
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-webdav-jackrabbit</artifactId>
       <version>${wagonVersion}</version>
+      <exclusions>
+        <exclusion><!-- bundling binding creates a problem with app servers that use different versions of slf4j -->
+          <groupId>org.slf4j</groupId>
+          <artifactId>jcl-over-slf4j</artifactId>
+        </exclusion>
+        <!-- prefer net.sourceforge.nekohtml:nekohtml:jar:1.9.13 so that we use consistent version across Jenkins -->
+        <exclusion>
+          <groupId>nekohtml</groupId>
+          <artifactId>nekohtml</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>nekohtml</groupId>
+          <artifactId>xercesMinimal</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
       <dependency>