| author | akozak | 2011-11-30 07:52:44 (EST) |
|---|---|---|
| committer | Winston Prakash | 2011-12-01 20:47:39 (EST) |
| commit | 42bcceb2f3e21b3381c1f1b436df1c855a4cffa9 (patch) (side-by-side diff) | |
| tree | 65c1ba5c4c0c7cf35601febfeec98fdfe9ec9a00 | |
| parent | 48890fa8933ae64aea6cd1d422f3c4cf11b47cb2 (diff) | |
| download | org.eclipse.hudson.core-42bcceb2f3e21b3381c1f1b436df1c855a4cffa9.zip org.eclipse.hudson.core-42bcceb2f3e21b3381c1f1b436df1c855a4cffa9.tar.gz org.eclipse.hudson.core-42bcceb2f3e21b3381c1f1b436df1c855a4cffa9.tar.bz2 | |
Move sisu-inject back to 2.2.3 to facilitate separation of maven-plugin from hudson-core. Updated version of jaxen to resolve issue on Tomcat
Signed-off-by: Winston Prakash <winston.prakash@gmail.com>
| -rw-r--r-- | hudson-core/pom.xml | 29 | ||||
| -rw-r--r-- | pom.xml | 4 |
2 files changed, 30 insertions, 3 deletions
diff --git a/hudson-core/pom.xml b/hudson-core/pom.xml index a3ad898..83fc0fa 100644 --- a/hudson-core/pom.xml +++ b/hudson-core/pom.xml @@ -53,7 +53,7 @@ <commons-collections.version>3.2</commons-collections.version> <javax-mail.version>1.4</javax-mail.version> <activation.version>1.1.1-hudson-1</activation.version> - <jaxen.version>1.1-beta-11</jaxen.version> + <jaxen.version>1.1.3</jaxen.version> <spring-security.version>2.0.7.RELEASE</spring-security.version> <spring-ldap.version>1.2.1</spring-ldap.version> <spring.version>2.5.6</spring.version> @@ -515,6 +515,29 @@ <version>${activation.version}</version> </dependency> <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <version>${jaxen.version}</version> + <exclusions> + <exclusion> + <groupId>maven-plugins</groupId> + <artifactId>maven-cobertura-plugin</artifactId> + </exclusion> + <exclusion> + <groupId>maven-plugins</groupId> + <artifactId>maven-findbugs-plugin</artifactId> + </exclusion> + <exclusion> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + </exclusion> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>commons-jelly</groupId> <artifactId>commons-jelly-tags-fmt</artifactId> <version>${commons-jelly-tags-fmt.version}</version> @@ -552,6 +575,10 @@ <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> </exclusion> + <exclusion> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -58,8 +58,8 @@ <!--Libraries--> <localizer.version>1.10</localizer.version> <aspectj.version>1.6.11</aspectj.version> - <sisuGuice.version>3.1.0</sisuGuice.version> - <sisuInject.version>2.3.0</sisuInject.version> + <sisuGuice.version>3.0.3</sisuGuice.version> + <sisuInject.version>2.2.3</sisuInject.version> <jetty.version>6.1.26</jetty.version> <wagon-http.version>1.0-beta-7</wagon-http.version> <animal-sniffer-annotation.version>1.0</animal-sniffer-annotation.version> |