Author: ruwan
Date: Fri May  1 16:58:49 2009
New Revision: 34624
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=34624

Log:
log4j version fixed


Modified:
   branches/synapse/1.3-wso2v1/modules/distribution/pom.xml
   branches/synapse/1.3-wso2v1/pom.xml

Modified: branches/synapse/1.3-wso2v1/modules/distribution/pom.xml
URL: 
http://wso2.org/svn/browse/wso2/branches/synapse/1.3-wso2v1/modules/distribution/pom.xml?rev=34624&r1=34623&r2=34624&view=diff
==============================================================================
--- branches/synapse/1.3-wso2v1/modules/distribution/pom.xml    (original)
+++ branches/synapse/1.3-wso2v1/modules/distribution/pom.xml    Fri May  1 
16:58:49 2009
@@ -59,6 +59,14 @@
             <version>${wrapper.version}</version>
         </dependency>
 
+        <!-- The distribution is configured for log4j. Normally, log4j should 
not
+             be a transitive dependency, so we need to declare it explicitly. 
-->
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
+
         <!-- Modules -->
         <dependency>
             <groupId>org.apache.rampart</groupId>

Modified: branches/synapse/1.3-wso2v1/pom.xml
URL: 
http://wso2.org/svn/browse/wso2/branches/synapse/1.3-wso2v1/pom.xml?rev=34624&r1=34623&r2=34624&view=diff
==============================================================================
--- branches/synapse/1.3-wso2v1/pom.xml (original)
+++ branches/synapse/1.3-wso2v1/pom.xml Fri May  1 16:58:49 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>

_______________________________________________
Esb-java-dev mailing list
[email protected]
https://wso2.org/cgi-bin/mailman/listinfo/esb-java-dev

Reply via email to