Use correct groupId for apache juddi

silveringsea · Nov 18, 2011 · e0ae4b2 · e0ae4b2
1 parent 637bed0
commit e0ae4b2
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 15 deletions.
diff --git a/build/build.xml b/build/build.xml
@@ -258,10 +258,6 @@
             <maven-resource group="jline" artifact="jline"/>
         </module-def>
 
-        <module-def name="juddi">
-            <maven-resource group="juddi" artifact="juddi"/>
-        </module-def>
-
         <module-def name="net.sourceforge.cssparser">
             <maven-resource group="net.sourceforge.cssparser" artifact="cssparser"/>
         </module-def>
@@ -350,6 +346,10 @@
             <maven-resource group="org.apache.james" artifact="apache-mime4j"/>
         </module-def>
 
+        <module-def name="org.apache.juddi">
+            <maven-resource group="org.apache.juddi" artifact="juddi"/>
+        </module-def>
+
         <module-def name="org.apache.log4j">
             <maven-resource group="log4j" artifact="log4j"/>
         </module-def>

diff --git a/build/pom.xml b/build/pom.xml
@@ -239,7 +239,7 @@
         </dependency>
 
         <dependency>
-            <groupId>juddi</groupId>
+            <groupId>org.apache.juddi</groupId>
             <artifactId>juddi</artifactId>
         </dependency>
 

diff --git a/...n/resources/modules/juddi/main/module.xml → .../modules/org/apache/juddi/main/module.xml b/...n/resources/modules/juddi/main/module.xml → .../modules/org/apache/juddi/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.0" name="juddi">
+<module xmlns="urn:jboss:module:1.0" name="org.apache.juddi">
     <resources>
         <!-- Insert resources here -->
     </resources>

diff --git a/build/src/main/resources/modules/org/jboss/as/jaxr/main/module.xml b/build/src/main/resources/modules/org/jboss/as/jaxr/main/module.xml
@@ -7,7 +7,7 @@
         <module name="javax.api"/>
         <module name="javax.servlet.api"/>
         <module name="javax.xml.soap.api"/>
-        <module name="juddi"/>
+        <module name="org.apache.juddi"/>
         <module name="org.apache.ws.scout"/>
         <module name="org.jboss.as.controller"/>
         <module name="org.jboss.as.naming"/>

diff --git a/jaxr/pom.xml b/jaxr/pom.xml
@@ -70,7 +70,7 @@
             <artifactId>jboss-common-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>juddi</groupId>
+            <groupId>org.apache.juddi</groupId>
             <artifactId>juddi</artifactId>
         </dependency>
         <dependency>

diff --git a/pom.xml b/pom.xml
@@ -92,7 +92,6 @@
         <version.jaxen.jaxen>1.1.3</version.jaxen.jaxen>
         <version.jline>0.9.94</version.jline>
         <version.joda-time>1.6.2</version.joda-time>
-        <version.juddi>2.0.1</version.juddi>
         <version.junit>4.10</version.junit>
         <version.log4j.log4j>1.2.16</version.log4j.log4j>
         <version.net.sourceforge.cssparser.cssparser>0.9.5</version.net.sourceforge.cssparser.cssparser>
@@ -110,6 +109,7 @@
         <version.org.apache.felix.scr>1.6.0</version.org.apache.felix.scr>
         <version.org.apache.felix.webconsole>3.1.6.SP1</version.org.apache.felix.webconsole>
         <version.org.apache.james.apache-mime4j>0.6</version.org.apache.james.apache-mime4j>
+        <version.org.apache.juddi>2.0.1</version.org.apache.juddi>
         <version.org.apache.httpcomponents.httpclient>4.1.2</version.org.apache.httpcomponents.httpclient>
         <version.org.apache.httpcomponents.httpcore>4.1.2</version.org.apache.httpcomponents.httpcore>
         <version.org.apache.neethi>3.0.1</version.org.apache.neethi>
@@ -1325,12 +1325,6 @@
                 <version>${version.joda-time}</version>
             </dependency>
 
-            <dependency>
-              <groupId>juddi</groupId>
-              <artifactId>juddi</artifactId>
-              <version>${version.juddi}</version>
-            </dependency>
-
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
@@ -2792,6 +2786,19 @@
                 </exclusions>
             </dependency>
 
+            <dependency>
+                <groupId>org.apache.juddi</groupId>
+                <artifactId>juddi</artifactId>
+                <version>${version.org.apache.juddi}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+
+                </exclusions>
+            </dependency>
+
             <dependency>
                 <groupId>org.apache.neethi</groupId>
                 <artifactId>neethi</artifactId>