You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ke...@apache.org on 2011/05/17 22:07:32 UTC

svn commit: r1104512 - in /geronimo/server/trunk/plugins/axis: axis/src/main/history/dependencies.xml pom.xml

Author: kevan
Date: Tue May 17 20:07:31 2011
New Revision: 1104512

URL: http://svn.apache.org/viewvc?rev=1104512&view=rev
Log:
Fix annoying test failure in geronimo-axis-builder. Some platforms/systems would get a java.lang.ExceptionInInitializerError due to commons-logging classloader issues

Modified:
    geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/axis/pom.xml

Modified: geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml?rev=1104512&r1=1104511&r2=1104512&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml Tue May 17 20:07:31 2011
@@ -8,11 +8,6 @@
     </module-id>
     <dependency>
         <groupId>commons-logging</groupId>
-        <artifactId>commons-logging</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>commons-logging</groupId>
         <artifactId>commons-logging-api</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/pom.xml?rev=1104512&r1=1104511&r2=1104512&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis/pom.xml Tue May 17 20:07:31 2011
@@ -55,6 +55,16 @@
                 <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>axis</artifactId>
                 <version>1.4_2-SNAPSHOT</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging-api</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
         </dependencies>
     </dependencyManagement>