Repository: juddi
Updated Branches:
  refs/heads/bug/#JUDDI-968 1e5ff4c76 -> 0d750d9fd


JUDDI-968 more progress with pom clean up and dependency updates


Project: http://git-wip-us.apache.org/repos/asf/juddi/repo
Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/0d750d9f
Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/0d750d9f
Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/0d750d9f

Branch: refs/heads/bug/#JUDDI-968
Commit: 0d750d9fd87b5726753600ac3e893245e17d68d4
Parents: 1e5ff4c
Author: Alex O'Ree <[email protected]>
Authored: Fri Feb 3 07:37:22 2017 -0500
Committer: Alex O'Ree <[email protected]>
Committed: Fri Feb 3 07:37:22 2017 -0500

----------------------------------------------------------------------
 juddi-client/pom.xml                    |   2 -
 juddi-core-openjpa/pom.xml              |   4 +-
 juddi-core/pom.xml                      |   4 +-
 juddi-examples/uddi-annotations/pom.xml |   1 -
 juddi-gui-dsig/pom.xml                  |   4 +-
 juddi-gui/pom.xml                       |   4 -
 juddi-rest-cxf/pom.xml                  | 430 +++++++++++++--------------
 juddiv3-war-repl/pom.xml                |   9 +-
 juddiv3-war/pom.xml                     |   9 +-
 pom.xml                                 |  26 +-
 uddi-migration-tool/pom.xml             |   2 +-
 uddi-tck-base/pom.xml                   |   1 -
 uddi-tck-runner/pom.xml                 |   2 +-
 13 files changed, 237 insertions(+), 261 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/juddi/blob/0d750d9f/juddi-client/pom.xml
----------------------------------------------------------------------
diff --git a/juddi-client/pom.xml b/juddi-client/pom.xml
index db1e833..4f94255 100644
--- a/juddi-client/pom.xml
+++ b/juddi-client/pom.xml
@@ -35,12 +35,10 @@
                <dependency>
                        <groupId>commons-configuration</groupId>
                        <artifactId>commons-configuration</artifactId>
-                       <version>1.9</version>
                </dependency>
                <dependency>
                        <groupId>org.apache.commons</groupId>
                        <artifactId>commons-lang3</artifactId>
-                       <version>3.1</version>
                </dependency>
                <dependency>
                        <groupId>commons-collections</groupId>

http://git-wip-us.apache.org/repos/asf/juddi/blob/0d750d9f/juddi-core-openjpa/pom.xml
----------------------------------------------------------------------
diff --git a/juddi-core-openjpa/pom.xml b/juddi-core-openjpa/pom.xml
index 5b017cd..330fb83 100644
--- a/juddi-core-openjpa/pom.xml
+++ b/juddi-core-openjpa/pom.xml
@@ -121,12 +121,12 @@
         <dependency>
             <groupId>commons-configuration</groupId>
             <artifactId>commons-configuration</artifactId>
-            <version>1.9</version>
+
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.1</version>
+
         </dependency>
         <dependency>
             <groupId>commons-collections</groupId>

http://git-wip-us.apache.org/repos/asf/juddi/blob/0d750d9f/juddi-core/pom.xml
----------------------------------------------------------------------
diff --git a/juddi-core/pom.xml b/juddi-core/pom.xml
index 48cd70a..5304b11 100644
--- a/juddi-core/pom.xml
+++ b/juddi-core/pom.xml
@@ -105,12 +105,12 @@ language governing permissions and * limitations under 
the License. * */ -->
         <dependency>
             <groupId>commons-configuration</groupId>
             <artifactId>commons-configuration</artifactId>
-            <version>1.9</version>
+
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.1</version>
+
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>

http://git-wip-us.apache.org/repos/asf/juddi/blob/0d750d9f/juddi-examples/uddi-annotations/pom.xml
----------------------------------------------------------------------
diff --git a/juddi-examples/uddi-annotations/pom.xml 
b/juddi-examples/uddi-annotations/pom.xml
index bcb5010..48eda59 100644
--- a/juddi-examples/uddi-annotations/pom.xml
+++ b/juddi-examples/uddi-annotations/pom.xml
@@ -147,7 +147,6 @@
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-war-plugin</artifactId>
-                               <version>2.0.1</version>
                                <configuration>
                                        
<dependentWarExcludes>WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/*,
                                                
WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/*</dependentWarExcludes>

http://git-wip-us.apache.org/repos/asf/juddi/blob/0d750d9f/juddi-gui-dsig/pom.xml
----------------------------------------------------------------------
diff --git a/juddi-gui-dsig/pom.xml b/juddi-gui-dsig/pom.xml
index 41b11a8..d8177ac 100644
--- a/juddi-gui-dsig/pom.xml
+++ b/juddi-gui-dsig/pom.xml
@@ -18,7 +18,7 @@ language governing permissions and * limitations under the 
License. * */ -->
     <name>jUDDI Web Client Digital Signature Applet</name>
 
     <build>
-        <finalName>${artifactId}-${version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
         <plugins>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
@@ -52,7 +52,7 @@ language governing permissions and * limitations under the 
License. * */ -->
                         <phase>package</phase>
                         <configuration>
 
-                            
<archive>${project.build.directory}/${artifactId}-${version}-jar-with-dependencies.jar</archive>
+                            
<archive>${project.build.directory}/${project.artifactId}-${project.version}-jar-with-dependencies.jar</archive>
                             
<keystore>src/main/keystore/signing-jar.keystore</keystore>
                             <alias>applet</alias>
                             <storepass>applet</storepass>

http://git-wip-us.apache.org/repos/asf/juddi/blob/0d750d9f/juddi-gui/pom.xml
----------------------------------------------------------------------
diff --git a/juddi-gui/pom.xml b/juddi-gui/pom.xml
index defc904..f1a1a01 100644
--- a/juddi-gui/pom.xml
+++ b/juddi-gui/pom.xml
@@ -34,7 +34,6 @@ language governing permissions and * limitations under the 
License. * */ -->
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>1.1.3</version>
         </dependency>
         <dependency>
             <groupId>log4j</groupId>
@@ -50,12 +49,10 @@ language governing permissions and * limitations under the 
License. * */ -->
         <dependency>
             <groupId>commons-configuration</groupId>
             <artifactId>commons-configuration</artifactId>
-            <version>1.9</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
                          <artifactId>commons-lang3</artifactId>
-                         <version>3.2.1</version>
         </dependency>
         <dependency>
             <groupId>commons-collections</groupId>
@@ -180,7 +177,6 @@ language governing permissions and * limitations under the 
License. * */ -->
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-war-plugin</artifactId>
-                        <version>2.4</version>
                         <configuration>
                             <packagingExcludes>
                                 WEB-INF/lib/cxf*.jar,

http://git-wip-us.apache.org/repos/asf/juddi/blob/0d750d9f/juddi-rest-cxf/pom.xml
----------------------------------------------------------------------
diff --git a/juddi-rest-cxf/pom.xml b/juddi-rest-cxf/pom.xml
index b93afc8..0eb9a2f 100644
--- a/juddi-rest-cxf/pom.xml
+++ b/juddi-rest-cxf/pom.xml
@@ -1,113 +1,86 @@
 <?xml version="1.0"?>
 <!--
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */ -->
+* Copyright 2001-2009 The Apache Software Foundation.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* 
+*      http://www.apache.org/licenses/LICENSE-2.0
+* 
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*
+*/ -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.apache.juddi</groupId>
-               <artifactId>juddi-parent</artifactId>
-               <version>3.3.4-SNAPSHOT</version>
-       </parent>
-       <groupId>org.apache.juddi</groupId>
-       <artifactId>juddi-rest-cxf</artifactId>
-       <packaging>jar</packaging>
-       <name>jUDDI REST Services using Apache CXF</name>
-       <dependencies>
-               <dependency>
-                       <groupId>org.apache.juddi</groupId>
-                       <artifactId>uddi-ws</artifactId>
-                       <version>${project.parent.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.juddi</groupId>
-                       <artifactId>juddi-client</artifactId>
-                       <version>${project.parent.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.juddi</groupId>
-                       <artifactId>juddi-core</artifactId>
-                       <version>${project.parent.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.juddi</groupId>
-                       <artifactId>uddi-tck-base</artifactId>
-                       <version>${project.parent.version}</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>commons-configuration</groupId>
-                       <artifactId>commons-configuration</artifactId>
-                       <version>1.9</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>commons-lang3</artifactId>
-                       <version>3.1</version>
-               </dependency>
-               <dependency>
-                       <groupId>commons-collections</groupId>
-                       <artifactId>commons-collections</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.cxf</groupId>
-                       <artifactId>cxf-bundle-jaxrs</artifactId>
-                       <version>${cxf.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.juddi</groupId>
-                       <artifactId>uddi-ws</artifactId>
-                       <version>${project.parent.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.juddi</groupId>
-                       <artifactId>juddi-client</artifactId>
-                       <version>${project.parent.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-test</artifactId>
-                       <version>3.2.2.RELEASE</version>
-                       <scope>test</scope>
-               </dependency>
-                                       <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-context</artifactId>
-                       <version>3.2.2.RELEASE</version>
-                       <scope>test</scope>
-               </dependency>
-            
-               <dependency>
-                       <groupId>org.apache.juddi</groupId>
-                       <artifactId>uddi-tck-base</artifactId>
-                       <version>${project.parent.version}</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>commons-configuration</groupId>
-                       <artifactId>commons-configuration</artifactId>
-                       <version>1.9</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>commons-lang3</artifactId>
-                       <version>3.1</version>
-               </dependency>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.juddi</groupId>
+        <artifactId>juddi-parent</artifactId>
+        <version>3.3.4-SNAPSHOT</version>
+    </parent>
+    <groupId>org.apache.juddi</groupId>
+    <artifactId>juddi-rest-cxf</artifactId>
+    <packaging>jar</packaging>
+    <name>jUDDI REST Services using Apache CXF</name>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.juddi</groupId>
+            <artifactId>uddi-ws</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.juddi</groupId>
+            <artifactId>juddi-client</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.juddi</groupId>
+            <artifactId>juddi-core</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.juddi</groupId>
+            <artifactId>uddi-tck-base</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-configuration</groupId>
+            <artifactId>commons-configuration</artifactId>
+                       
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+                       
+        </dependency>
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-bundle-jaxrs</artifactId>
+            <version>${cxf.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>3.2.2.RELEASE</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>3.2.2.RELEASE</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.hibernate.javax.persistence</groupId>
             <artifactId>hibernate-jpa-2.1-api</artifactId>
@@ -129,136 +102,131 @@
             <artifactId>hibernate-entitymanager</artifactId>
             <version>4.3.6.Final</version>
         </dependency>
-               <dependency>
-                       <groupId>cglib</groupId>
-                       <artifactId>cglib-nodep</artifactId>
-                       <version>2.1_3</version>
-               </dependency>
-               <dependency>
-                       <groupId>commons-codec</groupId>
-                       <artifactId>commons-codec</artifactId>
-                       <version>1.3</version>
-               </dependency>
+        <dependency>
+            <groupId>cglib</groupId>
+            <artifactId>cglib-nodep</artifactId>
+            <version>2.1_3</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.3</version>
+        </dependency>
 
-               <dependency>
-                       <groupId>org.apache.geronimo.specs</groupId>
-                       <artifactId>geronimo-jta_1.1_spec</artifactId>
-                       <version>1.1.1</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.geronimo.javamail</groupId>
-                       <artifactId>geronimo-javamail_1.4_mail</artifactId>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.geronimo.specs</groupId>
-                       <artifactId>geronimo-jaxrs_1.1_spec</artifactId>
-                       <version>1.0</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.derby</groupId>
-                       <artifactId>derby</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>mysql</groupId>
-                       <artifactId>mysql-connector-java</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.postgresql</groupId>
-                       <artifactId>postgresql</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.mockejb</groupId>
-                       <artifactId>mockejb</artifactId>
-                       <version>0.6-beta2</version>
-                       <scope>test</scope>
-               </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.1_spec</artifactId>
+            <version>1.1.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.javamail</groupId>
+            <artifactId>geronimo-javamail_1.4_mail</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxrs_1.1_spec</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockejb</groupId>
+            <artifactId>mockejb</artifactId>
+            <version>0.6-beta2</version>
+            <scope>test</scope>
+        </dependency>
                
-               <dependency>
-                       <groupId>commons-collections</groupId>
-                       <artifactId>commons-collections</artifactId>
-                       <version>3.2</version>
-               </dependency>
-               <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>servlet-api</artifactId>
-                       <version>2.4</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.cxf</groupId>
-                       <artifactId>cxf-rt-rs-extension-providers</artifactId>
-                       <version>${cxf.version}</version>
-               </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-rs-extension-providers</artifactId>
+            <version>${cxf.version}</version>
+        </dependency>
 
-               <dependency>
-                       <groupId>org.codehaus.jettison</groupId>
-                       <artifactId>jettison</artifactId>
-                       <version>1.3.4</version>
-               </dependency>
+        <dependency>
+            <groupId>org.codehaus.jettison</groupId>
+            <artifactId>jettison</artifactId>
+            <version>1.3.4</version>
+        </dependency>
 
-       </dependencies>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <version>1.4.0</version>
-                               <configuration>
-                                       <instructions>
-                                               <Export-Package>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>1.4.0</version>
+                <configuration>
+                    <instructions>
+                        <Export-Package>
 
                             org.apache.juddi.api.impl.rest
 
-                                               </Export-Package>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-antrun-plugin</artifactId>
-                               <version>1.3</version>
-                               <executions>
-                                       <execution>
-                                               
<phase>generate-resources</phase>
-                                               <configuration>
-                                                       <tasks>
-                                                               <delete 
dir="juddi-derby-test-db" />
-                                                       </tasks>
-                                               </configuration>
-                                               <goals>
-                                                       <goal>run</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>hibernate3-maven-plugin</artifactId>
-                               <version>2.2</version>
-                               <!-- <executions> <execution> 
<phase>process-classes</phase> <goals> 
+                        </Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.3</version>
+                <executions>
+                    <execution>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <tasks>
+                                <delete dir="juddi-derby-test-db" />
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>hibernate3-maven-plugin</artifactId>
+                <version>2.2</version>
+                <!-- <executions> <execution> <phase>process-classes</phase> 
<goals> 
                 <goal>hbm2ddl</goal> </goals> </execution> </executions> -->
-                               <configuration>
-                                       <components>
-                                               <component>
-                                                       <name>hbm2ddl</name>
-                                                       
<implementation>jpaconfiguration</implementation>
-                                               </component>
-                                       </components>
-                                       <componentProperties>
-                                               
<persistenceunit>juddiDatabase</persistenceunit>
-                                               
<outputfilename>schema.ddl</outputfilename>
-                                               <drop>false</drop>
-                                               <create>true</create>
-                                               <export>false</export>
-                                               <format>true</format>
-                                       </componentProperties>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
+                <configuration>
+                    <components>
+                        <component>
+                            <name>hbm2ddl</name>
+                            <implementation>jpaconfiguration</implementation>
+                        </component>
+                    </components>
+                    <componentProperties>
+                        <persistenceunit>juddiDatabase</persistenceunit>
+                        <outputfilename>schema.ddl</outputfilename>
+                        <drop>false</drop>
+                        <create>true</create>
+                        <export>false</export>
+                        <format>true</format>
+                    </componentProperties>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

http://git-wip-us.apache.org/repos/asf/juddi/blob/0d750d9f/juddiv3-war-repl/pom.xml
----------------------------------------------------------------------
diff --git a/juddiv3-war-repl/pom.xml b/juddiv3-war-repl/pom.xml
index 2fbc0ef..0ce27b9 100644
--- a/juddiv3-war-repl/pom.xml
+++ b/juddiv3-war-repl/pom.xml
@@ -28,7 +28,7 @@
                <dependency>
                        <groupId>commons-logging</groupId>
                        <artifactId>commons-logging</artifactId>
-                       <version>1.1.3</version>
+                       
                </dependency>
                <dependency>
                        <groupId>javax.servlet</groupId>
@@ -39,13 +39,12 @@
                <dependency>
                        <groupId>commons-configuration</groupId>
                        <artifactId>commons-configuration</artifactId>
-                       <version>1.10</version>
+                       
                </dependency>
                    <dependency>
                 <groupId>org.apache.commons</groupId>
   <artifactId>commons-lang3</artifactId>
-  <version>3.2.1</version>
-                       </dependency>
+                       </dependency>
                        <dependency>
                <groupId>org.json</groupId>
                <artifactId>json</artifactId>
@@ -442,7 +441,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-war-plugin</artifactId>
-                        <version>2.4</version>
+
                         <configuration>
                             <packagingExcludes>
                                 WEB-INF/lib/hibernate*.jar,

http://git-wip-us.apache.org/repos/asf/juddi/blob/0d750d9f/juddiv3-war/pom.xml
----------------------------------------------------------------------
diff --git a/juddiv3-war/pom.xml b/juddiv3-war/pom.xml
index aae2264..bbe6d3e 100644
--- a/juddiv3-war/pom.xml
+++ b/juddiv3-war/pom.xml
@@ -28,7 +28,6 @@
                <dependency>
                        <groupId>commons-logging</groupId>
                        <artifactId>commons-logging</artifactId>
-                       <version>1.1.3</version>
                </dependency>
                <dependency>
                        <groupId>javax.servlet</groupId>
@@ -43,10 +42,9 @@
                </dependency>
                    <dependency>
                 <groupId>org.apache.commons</groupId>
-  <artifactId>commons-lang3</artifactId>
-  <version>3.2.1</version>
-                       </dependency>
-                       <dependency>
+             <artifactId>commons-lang3</artifactId>
+               </dependency>
+               <dependency>
                <groupId>org.json</groupId>
                <artifactId>json</artifactId>
                <version>20090211</version>
@@ -442,7 +440,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-war-plugin</artifactId>
-                        <version>2.4</version>
                         <configuration>
                             <packagingExcludes>
                                 WEB-INF/lib/hibernate*.jar,

http://git-wip-us.apache.org/repos/asf/juddi/blob/0d750d9f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4cf3636..8d38abe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -170,6 +170,11 @@ under the License.
             <plugins>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>2.4</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
                     <version>2.6</version>
                 </plugin>
@@ -272,7 +277,7 @@ under the License.
                     </filesets>
                 </configuration>
             </plugin>
-            <!--<plugin>
+            <plugin>
                 <groupId>org.owasp</groupId>
                 <artifactId>dependency-check-maven</artifactId>
                 <version>1.4.5</version>
@@ -283,7 +288,7 @@ under the License.
                         </goals>
                     </execution>
                 </executions>
-            </plugin>-->
+            </plugin>
         </plugins>
     </build>
     <reporting>
@@ -374,6 +379,11 @@ under the License.
                 <version>1.1</version>
             </dependency>
             <dependency>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+                <version>1.2</version>
+            </dependency>
+            <dependency>
                 <groupId>commons-collections</groupId>
                 <artifactId>commons-collections</artifactId>
                 <version>3.2.2</version>
@@ -386,7 +396,7 @@ under the License.
             <dependency>
                 <groupId>org.apache.derby</groupId>
                 <artifactId>derby</artifactId>
-                <version>10.5.3.0_1</version>
+                <version>10.13.1.1</version>
             </dependency>
             <dependency>
                 <groupId>org.postgresql</groupId>
@@ -403,6 +413,16 @@ under the License.
                     <artifactId>httpclient</artifactId>
                     <version>4.5.2</version>
             </dependency>
+            <dependency>
+                    <groupId>commons-configuration</groupId>
+                    <artifactId>commons-configuration</artifactId>
+                    <version>1.10</version>
+            </dependency>
+            <dependency>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>commons-lang3</artifactId>
+                    <version>3.5</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     

http://git-wip-us.apache.org/repos/asf/juddi/blob/0d750d9f/uddi-migration-tool/pom.xml
----------------------------------------------------------------------
diff --git a/uddi-migration-tool/pom.xml b/uddi-migration-tool/pom.xml
index 3c1df7a..6485e79 100644
--- a/uddi-migration-tool/pom.xml
+++ b/uddi-migration-tool/pom.xml
@@ -53,7 +53,7 @@
        </dependencies>
 
        <build>
-               <finalName>${artifactId}-${version}</finalName>
+               <finalName>${project.artifactId}-${project.version}</finalName>
                <plugins>
                        <plugin>
                                <artifactId>maven-assembly-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/juddi/blob/0d750d9f/uddi-tck-base/pom.xml
----------------------------------------------------------------------
diff --git a/uddi-tck-base/pom.xml b/uddi-tck-base/pom.xml
index a58d569..aff7f28 100644
--- a/uddi-tck-base/pom.xml
+++ b/uddi-tck-base/pom.xml
@@ -33,7 +33,6 @@
                <dependency>
                        <groupId>junit</groupId>
                        <artifactId>junit</artifactId>
-                       <version>4.11</version>
                </dependency>
                 <dependency>
                         <groupId>xmlunit</groupId>

http://git-wip-us.apache.org/repos/asf/juddi/blob/0d750d9f/uddi-tck-runner/pom.xml
----------------------------------------------------------------------
diff --git a/uddi-tck-runner/pom.xml b/uddi-tck-runner/pom.xml
index 37a2d1f..a68dc8c 100644
--- a/uddi-tck-runner/pom.xml
+++ b/uddi-tck-runner/pom.xml
@@ -63,7 +63,7 @@
                </dependency>
   </dependencies>
   <build>
-               <finalName>${artifactId}-${version}</finalName>
+               <finalName>${project.artifactId}-${project.version}</finalName>
                <plugins>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to