Author: veithen
Date: Tue Apr 28 19:56:19 2009
New Revision: 769518
URL: http://svn.apache.org/viewvc?rev=769518&view=rev
Log:
Downgraded log4j from 1.2.15 (latest) to 1.2.14.
Reason: 1.2.15 introduces additional transitive dependencies, some of which are
not resolvable. For the build this can easily be addressed using an exclusion
rule in the dependencyManagement entry for log4j. However, as Ruwan reported,
this doesn't work with the IDEA Maven plugin, and I still see issues with the
Eclipse plugin.
Note that log4j was upgraded to the latest version by Asankha in r748973, along
with other dependencies. Since there is probably no particular reason to prefer
1.2.15 over previous versions, we should use 1.2.14 so that we can avoid
cluttering the POM files with exclusions rules.
Modified:
synapse/trunk/java/modules/transports/pom.xml
synapse/trunk/java/pom.xml
Modified: synapse/trunk/java/modules/transports/pom.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/pom.xml?rev=769518&r1=769517&r2=769518&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/pom.xml (original)
+++ synapse/trunk/java/modules/transports/pom.xml Tue Apr 28 19:56:19 2009
@@ -185,12 +185,6 @@
<artifactId>axis2-transport-testkit</artifactId>
<version>${axis2.transport.version}</version>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>com.sun.jmx</groupId>
- <artifactId>jmxri</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- HTTP transport dependencies -->
Modified: synapse/trunk/java/pom.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/pom.xml?rev=769518&r1=769517&r2=769518&view=diff
==============================================================================
--- synapse/trunk/java/pom.xml (original)
+++ synapse/trunk/java/pom.xml Tue Apr 28 19:56:19 2009
@@ -448,32 +448,6 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jdmk</groupId>
- <artifactId>jmxtools</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jmx</groupId>
- <artifactId>jmxri</artifactId>
- </exclusion>
- <exclusion>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -700,8 +674,8 @@
<type>jar</type>
<exclusions>
<exclusion>
- <groupId>com.sun.jmx</groupId>
- <artifactId>jmxri</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -867,7 +841,9 @@
<JLex.version>0.0</JLex.version>
<!-- misc -->
<junit.version>3.8.2</junit.version>
- <log4j.version>1.2.15</log4j.version>
+ <!-- Warning: log4j versions above 1.2.14 introduce additional
transitive dependencies,
+ some of which are not available from the Maven central
repository. -->
+ <log4j.version>1.2.14</log4j.version>
<xmlunit.version>1.1</xmlunit.version>
<derby.version>10.4.2.0</derby.version>
<wrapper.version>3.2.3</wrapper.version>
