Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWinston Prakash2012-01-30 22:48:53 -0500
committerWinston Prakash2012-01-30 22:48:53 -0500
commitdc950d545bf6a3859f66b3ab30a953f20c009aea (patch)
tree55f899fa6eee612b15b1d71af36ccae117c325a4
parentec584303cf32ff29440b0b38f2a93807d5202135 (diff)
downloadorg.eclipse.hudson.core-dc950d545bf6a3859f66b3ab30a953f20c009aea.tar.gz
org.eclipse.hudson.core-dc950d545bf6a3859f66b3ab30a953f20c009aea.tar.xz
org.eclipse.hudson.core-dc950d545bf6a3859f66b3ab30a953f20c009aea.zip
Remove the unnecessary dependency org.apache.ant.ant-launcher and xpp3:xpp3_min. Also upgrade to asm-all:3.1
-rw-r--r--hudson-core/pom.xml44
-rw-r--r--hudson-core/src/main/java/hudson/util/SubClassGenerator.java2
2 files changed, 29 insertions, 17 deletions
diff --git a/hudson-core/pom.xml b/hudson-core/pom.xml
index b71a3eec..bf4f2321 100644
--- a/hudson-core/pom.xml
+++ b/hudson-core/pom.xml
@@ -25,7 +25,7 @@
<artifactId>hudson-core</artifactId>
<name>Hudson :: Core</name>
<description>
- Contains the core Hudson code and view files to render HTML.
+ Contains the core Hudson code and view files to render HTML.
</description>
<properties>
@@ -63,7 +63,7 @@
<winsw.version>1.9</winsw.version>
<sezpoz.version>1.9</sezpoz.version>
<metainf-services.version>1.1</metainf-services.version>
- <asm-commons.version>2.2.3</asm-commons.version>
+ <asm-all.version>3.1</asm-all.version>
<jline.version>0.9.94</jline.version>
<!--Plugins-->
@@ -278,15 +278,15 @@
</profile>
<profile>
- <id>hudson</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
+ <id>hudson</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</profile>
<profile>
<id>pmd</id>
@@ -383,10 +383,22 @@
<dependency>
<groupId>org.hudsonci.tools</groupId>
<artifactId>xstream</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>xpp3_min</artifactId>
+ <groupId>xpp3</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>ant-launcher</artifactId>
+ <groupId>org.apache.ant</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -405,7 +417,7 @@
<dependency><!-- Left for backward compatibility-->
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.5</version>
+ <version>2.4</version>
</dependency>
<dependency><!-- Left for backward compatibility-->
@@ -523,8 +535,8 @@
<artifactId>commons-cli</artifactId>
</exclusion>
<exclusion>
- <groupId>org.jvnet.hudson</groupId>
- <artifactId>commons-jelly</artifactId>
+ <groupId>org.jvnet.hudson</groupId>
+ <artifactId>commons-jelly</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -691,8 +703,8 @@
<dependency>
<!-- with this, stapler can load parameter names from the debug info -->
<groupId>asm</groupId>
- <artifactId>asm-commons</artifactId>
- <version>${asm-commons.version}</version>
+ <artifactId>asm-all</artifactId>
+ <version>${asm-all.version}</version>
</dependency>
<dependency>
diff --git a/hudson-core/src/main/java/hudson/util/SubClassGenerator.java b/hudson-core/src/main/java/hudson/util/SubClassGenerator.java
index 3a80dec7..e1f638a2 100644
--- a/hudson-core/src/main/java/hudson/util/SubClassGenerator.java
+++ b/hudson-core/src/main/java/hudson/util/SubClassGenerator.java
@@ -37,7 +37,7 @@ public class SubClassGenerator extends ClassLoader {
}
public <T> Class<? extends T> generate(Class<T> base, String name) {
- ClassWriter cw = new ClassWriter(false, false);//?
+ ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);//?
cw.visit(49, ACC_PUBLIC, name.replace('.', '/'), null,
Type.getInternalName(base),null);

Back to the top