You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by al...@apache.org on 2022/03/13 15:49:44 UTC

[juddi] branch feature/JUDDI-1019 created (now 10836ac)

This is an automated email from the ASF dual-hosted git repository.

alexoree pushed a change to branch feature/JUDDI-1019
in repository https://gitbox.apache.org/repos/asf/juddi.git.


      at 10836ac  updates to jre11 compatible build tech, tested with jdk17. biggest changes were related to soap stacks all sha1 based hashes moved to sha256 digital signature applet has been removed due to no path forward with the jre9+ api changes dependencies updated across the board war will NOT start in tomcat9 with jre17 with the sun jax libraries causing some kind of reflection issue

This branch includes the following new commits:

     new 10836ac  updates to jre11 compatible build tech, tested with jdk17. biggest changes were related to soap stacks all sha1 based hashes moved to sha256 digital signature applet has been removed due to no path forward with the jre9+ api changes dependencies updated across the board war will NOT start in tomcat9 with jre17 with the sun jax libraries causing some kind of reflection issue

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org


[juddi] 01/01: updates to jre11 compatible build tech, tested with jdk17. biggest changes were related to soap stacks all sha1 based hashes moved to sha256 digital signature applet has been removed due to no path forward with the jre9+ api changes dependencies updated across the board war will NOT start in tomcat9 with jre17 with the sun jax libraries causing some kind of reflection issue

Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

alexoree pushed a commit to branch feature/JUDDI-1019
in repository https://gitbox.apache.org/repos/asf/juddi.git

commit 10836ac4b43c7c2d47f40fd6cc066a959bbaa084
Author: Alex O'Ree <al...@apache.org>
AuthorDate: Sun Mar 13 11:49:41 2022 -0400

    updates to jre11 compatible build tech, tested with jdk17. biggest changes were related to soap stacks
    all sha1 based hashes moved to sha256
    digital signature applet has been removed due to no path forward with the jre9+ api changes
    dependencies updated across the board
    war will NOT start in tomcat9 with jre17 with the sun jax libraries causing some kind of reflection issue
---
 juddi-client/pom.xml                               |  174 +-
 .../apache/juddi/v3/client/cryptor/DigSigUtil.java |    4 +-
 juddi-core-openjpa/pom.xml                         |   41 +-
 juddi-core/pom.xml                                 |   34 +-
 .../apache/juddi/api/impl/UDDIReplicationImpl.java |    1 +
 .../main/java/org/apache/juddi/config/Install.java |   10 -
 .../java/org/apache/juddi/model/package-info.java  |   19 -
 .../juddi/replication/ReplicationNotifier.java     |   10 +-
 .../juddi/subscription/notify/package-info.java    |   19 -
 .../org/apache/juddi/v3/auth/package-info.java     |   19 -
 juddi-dist/pom.xml                                 |   22 +-
 juddi-examples/pom.xml                             |   83 +-
 juddi-examples/uddi-annotations/pom.xml            |  364 ++--
 juddi-examples/wsdl2uddi-lifecyle/pom.xml          |    1 -
 juddi-gui-dsig/pom.xml                             |   52 +-
 juddi-gui/pom.xml                                  |  110 +-
 juddi-rest-cxf/pom.xml                             |    4 +-
 juddi-tomcat/build.xml                             |   14 +-
 juddi-tomcat/catalina.bat                          |    2 +-
 juddi-tomcat/catalina.sh                           |    2 +-
 juddiv3-war-repl/pom.xml                           |  880 +++++----
 pom.xml                                            | 2049 ++++++++++----------
 src/site/site.xml                                  |    2 +-
 uddi-client-dist/pom.xml                           |   24 +-
 .../org/apache/juddi/v3/tck/TckSigningUtil.java    |    5 +-
 uddi-tck/pom.xml                                   |  802 ++++----
 .../java/org/apache/juddi/v2/tck/package-info.java |   20 -
 .../java/org/apache/juddi/v3/tck/package-info.java |   20 -
 uddi-ws/pom.xml                                    |   87 +-
 29 files changed, 2399 insertions(+), 2475 deletions(-)

diff --git a/juddi-client/pom.xml b/juddi-client/pom.xml
index 9c4f0aa..c601ec0 100644
--- a/juddi-client/pom.xml
+++ b/juddi-client/pom.xml
@@ -1,90 +1,96 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- * 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/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.apache.juddi</groupId>
-		<artifactId>juddi-parent</artifactId>
-		<version>3.3.11-SNAPSHOT</version>
-	</parent> 
-	<artifactId>juddi-client</artifactId>
-	<packaging>bundle</packaging>
-	<name>jUDDI Client side Code</name>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.juddi</groupId>
+        <artifactId>juddi-parent</artifactId>
+        <version>3.3.11-SNAPSHOT</version>
+    </parent> 
+    <artifactId>juddi-client</artifactId>
+    <packaging>bundle</packaging>
+    <name>jUDDI Client side Code</name>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.juddi</groupId>
-			<artifactId>uddi-ws</artifactId>
-			<version>${project.parent.version}</version>
-		</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>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.5</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>wsdl4j</groupId>
-			<artifactId>wsdl4j</artifactId>
-			<version>1.6.2</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpclient</artifactId>
-		</dependency>
-		<dependency>
-		    <groupId>org.easymock</groupId>
-		    <artifactId>easymock</artifactId>
-		    <version>3.4</version>
-		    <scope>test</scope>
-		  </dependency>
-	</dependencies> 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.1</version>
-				<configuration>
-					<showDeprecation>true</showDeprecation>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
+    <dependencies>
+        <dependency>
+            <groupId>com.sun.xml.ws</groupId>
+            <artifactId>rt</artifactId>
+            <version>2.3.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.juddi</groupId>
+            <artifactId>uddi-ws</artifactId>
+            <version>${project.version}</version>
+        </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>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.5</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>wsdl4j</groupId>
+            <artifactId>wsdl4j</artifactId>
+            <version>1.6.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+            <version>3.4</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies> 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <showDeprecation>true</showDeprecation>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
 
-					<descriptorRefs>
-						<descriptorRef>jar-with-dependencies</descriptorRef>
-					</descriptorRefs>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/DigSigUtil.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/DigSigUtil.java
index 848d051..8aade9f 100644
--- a/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/DigSigUtil.java
+++ b/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/DigSigUtil.java
@@ -829,7 +829,7 @@ public class DigSigUtil {
 
                 String dm = map.getProperty(SIGNATURE_OPTION_DIGEST_METHOD);
                 if (dm == null) {
-                        dm = DigestMethod.SHA1;
+                        dm = DigestMethod.SHA256;
                 }
                 Reference ref = fac.newReference("", fac.newDigestMethod(dm, null), transformers, null, null);
                 return ref;
@@ -842,7 +842,7 @@ public class DigSigUtil {
                 String sigmethod = null;
                 sigmethod = map.getProperty(SIGNATURE_METHOD);
                 if (sigmethod == null) {
-                        sigmethod = SignatureMethod.RSA_SHA1;
+                        sigmethod = SignatureMethod.RSA_SHA256;
                 }
                 if (cm == null) {
                         cm = CanonicalizationMethod.EXCLUSIVE;
diff --git a/juddi-core-openjpa/pom.xml b/juddi-core-openjpa/pom.xml
index e2adb03..e62d314 100644
--- a/juddi-core-openjpa/pom.xml
+++ b/juddi-core-openjpa/pom.xml
@@ -41,7 +41,6 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.4.0</version>
                 <configuration>
                     <instructions>
                         <Export-Package>org.apache.juddi, org.apache.juddi.api, org.apache.juddi.api.impl,
@@ -62,9 +61,10 @@
             <plugin>
                 <groupId>org.apache.openjpa</groupId>
                 <artifactId>openjpa-maven-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.2.1</version>
                 <configuration>
                     <includes>**/org/apache/juddi/model/*.class</includes>
+                    <excludes>**/package-info.class</excludes>
                     <addDefaultConstructor>true</addDefaultConstructor>
                     <enforcePropertyRestrictions>true</enforcePropertyRestrictions>
                     <persistenceXmlFile>${basedir}/src/test/resources/META-INF/persistence.xml</persistenceXmlFile>
@@ -82,14 +82,14 @@
                     <dependency>
                         <groupId>org.apache.openjpa</groupId>
                         <artifactId>openjpa</artifactId>
-                        <version>3.1.0</version>
+                        <version>3.2.1</version>
                     </dependency>
                 </dependencies>
             </plugin>
 
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>2.6.1</version>
                 <configuration>
                     <filesets>
                         <fileset>
@@ -140,7 +140,7 @@
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa</artifactId>
-            <version>2.3.0</version>
+            <version>3.2.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -150,7 +150,6 @@
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.3</version>
         </dependency>
 
         <dependency>
@@ -196,7 +195,6 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jta_1.1_spec</artifactId>
-            <version>1.1.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -207,19 +205,42 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jaxrs_1.1_spec</artifactId>
-            <version>1.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>dumbster</groupId>
             <artifactId>dumbster</artifactId>
-            <version>1.5</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.4</version>
+        </dependency>
+        
+        
+
+
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-core</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.xml.ws</groupId>
+            <artifactId>jaxws-api</artifactId>
+            <version>2.3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.ws</groupId>
+            <artifactId>rt</artifactId>
+            <version>2.3.1</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/juddi-core/pom.xml b/juddi-core/pom.xml
index 941e999..76a3c12 100644
--- a/juddi-core/pom.xml
+++ b/juddi-core/pom.xml
@@ -63,7 +63,7 @@ language governing permissions and * limitations under the License. * */ -->
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>hibernate3-maven-plugin</artifactId>
-                <version>2.2</version>
+                <version>3.0</version>
                 <!-- <executions> <execution> <phase>process-classes</phase> <goals> 
                 <goal>hbm2ddl</goal> </goals> </execution> </executions> -->
                 <configuration>
@@ -87,6 +87,12 @@ language governing permissions and * limitations under the License. * */ -->
     </build>
     <dependencies>
         <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>1.3.1</version>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.juddi</groupId>
             <artifactId>uddi-ws</artifactId>
             <version>${project.parent.version}</version>
@@ -184,6 +190,32 @@ language governing permissions and * limitations under the License. * */ -->
             <artifactId>audit4j-core</artifactId>
             <version>2.2.0</version>
         </dependency>
+     
+
+
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-core</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.xml.ws</groupId>
+            <artifactId>jaxws-api</artifactId>
+            <version>2.3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.ws</groupId>
+            <artifactId>rt</artifactId>
+            <version>2.3.1</version>
+        </dependency>
+
     </dependencies>
 		
 </project>
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
index ae25798..f7e9d0e 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
@@ -41,6 +41,7 @@ import javax.persistence.Query;
 import javax.xml.bind.JAXB;
 import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.ws.BindingProvider;
+import static org.apache.juddi.api.impl.AuthenticatedService.logger;
 import org.apache.juddi.api.util.QueryStatus;
 import org.apache.juddi.api.util.ReplicationQuery;
 import org.apache.juddi.config.AppConfig;
diff --git a/juddi-core/src/main/java/org/apache/juddi/config/Install.java b/juddi-core/src/main/java/org/apache/juddi/config/Install.java
index 363f26b..4d529c7 100644
--- a/juddi-core/src/main/java/org/apache/juddi/config/Install.java
+++ b/juddi-core/src/main/java/org/apache/juddi/config/Install.java
@@ -32,20 +32,11 @@ import java.util.StringTokenizer;
 import java.util.UUID;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
-import javax.xml.bind.JAXB;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
 import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.transform.stream.StreamSource;
 
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.ConfigurationException;
@@ -57,7 +48,6 @@ import org.apache.juddi.api.impl.UDDIInquiryImpl;
 import org.apache.juddi.api.impl.UDDIPublicationImpl;
 import org.apache.juddi.keygen.KeyGenerator;
 import org.apache.juddi.mapping.MappingApiToModel;
-import org.apache.juddi.mapping.MappingModelToApi;
 import org.apache.juddi.model.ReplicationConfiguration;
 import org.apache.juddi.model.UddiEntityPublisher;
 import org.apache.juddi.replication.ReplicationNotifier;
diff --git a/juddi-core/src/main/java/org/apache/juddi/model/package-info.java b/juddi-core/src/main/java/org/apache/juddi/model/package-info.java
deleted file mode 100644
index bad9e87..0000000
--- a/juddi-core/src/main/java/org/apache/juddi/model/package-info.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 2014 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.
- */
-/**
- * JPA representations of the JAXB classes from uddi-ws
- */
-package org.apache.juddi.model;
diff --git a/juddi-core/src/main/java/org/apache/juddi/replication/ReplicationNotifier.java b/juddi-core/src/main/java/org/apache/juddi/replication/ReplicationNotifier.java
index 48ea677..b5b960c 100644
--- a/juddi-core/src/main/java/org/apache/juddi/replication/ReplicationNotifier.java
+++ b/juddi-core/src/main/java/org/apache/juddi/replication/ReplicationNotifier.java
@@ -68,7 +68,15 @@ public class ReplicationNotifier extends TimerTask {
         private long startBuffer = 5000;//AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_START_BUFFER, 20000l); // 20s startup delay default 
         private long interval = 5000;//AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_INTERVAL, 300000l); //5 min default
         private static String node = null;
-        private static UDDIService uddiService = new UDDIService();
+        private static UDDIService uddiService ;
+        
+        static {
+            try{
+            uddiService = new UDDIService();
+            }catch (Throwable t) {
+                log.error(t,t);
+            }
+        }
 
         /**
          * default constructor
diff --git a/juddi-core/src/main/java/org/apache/juddi/subscription/notify/package-info.java b/juddi-core/src/main/java/org/apache/juddi/subscription/notify/package-info.java
deleted file mode 100644
index 8b5a0ce..0000000
--- a/juddi-core/src/main/java/org/apache/juddi/subscription/notify/package-info.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 2014 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.
- */
-/**
- * Handles transport specific notifications
- */
-package org.apache.juddi.subscription.notify;
diff --git a/juddi-core/src/main/java/org/apache/juddi/v3/auth/package-info.java b/juddi-core/src/main/java/org/apache/juddi/v3/auth/package-info.java
deleted file mode 100644
index 188f09a..0000000
--- a/juddi-core/src/main/java/org/apache/juddi/v3/auth/package-info.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 2014 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.
- */
-/**
- * jUDDI User Authentication
- */
-package org.apache.juddi.v3.auth;
diff --git a/juddi-dist/pom.xml b/juddi-dist/pom.xml
index 04490f1..3ab280d 100644
--- a/juddi-dist/pom.xml
+++ b/juddi-dist/pom.xml
@@ -59,11 +59,7 @@
             <artifactId>uddi-tck-base</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.juddi</groupId>
-            <artifactId>juddi-gui-dsig</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
+       
 		<!--  source archives -->
 		<dependency>
             <groupId>org.apache.juddi</groupId>
@@ -96,13 +92,7 @@
             <version>${project.parent.version}</version>
             <classifier>sources</classifier>
         </dependency>
-        <dependency>
-            <groupId>org.apache.juddi</groupId>
-            <artifactId>juddi-gui-dsig</artifactId>
-            <version>${project.parent.version}</version>
-            <type>jar</type>
-            <classifier>sources</classifier>
-        </dependency>
+       
         <dependency>
             <groupId>org.apache.juddi</groupId>
             <artifactId>juddiv3-war</artifactId>
@@ -152,13 +142,7 @@
             <version>${project.parent.version}</version>
             <classifier>javadoc</classifier>
         </dependency>
-        <dependency>
-            <groupId>org.apache.juddi</groupId>
-            <artifactId>juddi-gui-dsig</artifactId>
-            <version>${project.parent.version}</version>
-            <type>jar</type>
-            <classifier>javadoc</classifier>
-        </dependency>
+      
         
 		<!--  documentation -->
 		<dependency>
diff --git a/juddi-examples/pom.xml b/juddi-examples/pom.xml
index 7609c4b..48319f7 100644
--- a/juddi-examples/pom.xml
+++ b/juddi-examples/pom.xml
@@ -1,45 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-		* 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/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.apache.juddi</groupId>
-		<artifactId>juddi-parent</artifactId>
-		<version>3.3.11-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-	<groupId>org.apache.juddi.example</groupId>
-	<artifactId>juddi-examples</artifactId>
-	<name>jUDDI Examples</name>
-	<packaging>pom</packaging>
-	<prerequisites>
-		<maven>3.0.3</maven>
-	</prerequisites>
-	<modules>
-		<module>create-partition</module>
-		<module>hello-world</module>
-		<module>hello-world-embedded</module>
-		<module>simple-browse</module>
-		<module>simple-publish-portable</module>
-		<module>simple-publish-clerk</module>
-		<module>uddi-annotations</module>
-		<module>wsdl2uddi</module>
-		<module>wsdl2uddi-lifecyle</module>
-		<module>subscription-notification-amqp</module>
-		<module>more-uddi-samples</module>
-		<module>service-version</module>
-    <module>uddiv2-api-bridge-example</module>
-    <module>ValueSetValidator</module>
-	 <module>juddi-embedded</module>
-	</modules>
+        * 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/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.juddi</groupId>
+        <artifactId>juddi-parent</artifactId>
+        <version>3.3.11-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <groupId>org.apache.juddi.example</groupId>
+    <artifactId>juddi-examples</artifactId>
+    <name>jUDDI Examples</name>
+    <packaging>pom</packaging>
+	
+    <modules>
+        <module>create-partition</module>
+        <module>hello-world</module>
+        <module>hello-world-embedded</module>
+        <module>simple-browse</module>
+        <module>simple-publish-portable</module>
+        <module>simple-publish-clerk</module>
+        <module>uddi-annotations</module>
+        <module>wsdl2uddi</module>
+        <module>wsdl2uddi-lifecyle</module>
+        <module>subscription-notification-amqp</module>
+        <module>more-uddi-samples</module>
+        <module>service-version</module>
+        <module>uddiv2-api-bridge-example</module>
+        <module>ValueSetValidator</module>
+        <module>juddi-embedded</module>
+    </modules>
 </project>
\ No newline at end of file
diff --git a/juddi-examples/uddi-annotations/pom.xml b/juddi-examples/uddi-annotations/pom.xml
index 340725c..af54172 100644
--- a/juddi-examples/uddi-annotations/pom.xml
+++ b/juddi-examples/uddi-annotations/pom.xml
@@ -1,198 +1,198 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- * 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/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.apache.juddi.example</groupId>
-		<artifactId>juddi-examples</artifactId>
-		<version>3.3.11-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-	<artifactId>uddi-annotations</artifactId>
-	<name>jUDDI Example Service Registration</name>
-	<packaging>war</packaging>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.juddi.example</groupId>
+        <artifactId>juddi-examples</artifactId>
+        <version>3.3.11-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>uddi-annotations</artifactId>
+    <name>jUDDI Example Service Registration</name>
+    <packaging>war</packaging>
 	
-	<dependencies>
-		<dependency>
-			<artifactId>juddi-core-openjpa</artifactId>
-			<groupId>org.apache.juddi</groupId>
-			<version>${project.parent.version}</version>
-		</dependency>
-		<dependency>
-			<artifactId>juddi-client</artifactId>
-			<groupId>org.apache.juddi</groupId>
-			<version>${project.parent.version}</version>
-		</dependency>
-		<dependency>
-			<artifactId>uddi-ws</artifactId>
-			<groupId>org.apache.juddi</groupId>
-			<version>${project.parent.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.5</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-frontend-jaxws</artifactId>
-			<version>${cxf.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-transports-http</artifactId>
-			<version>${cxf.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>cglib</groupId>
-					<artifactId>cglib</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>cglib</groupId>
-			<artifactId>cglib-nodep</artifactId>
-			<version>2.1_3</version>
-		</dependency>
-		<dependency>
-           <groupId>org.springframework</groupId>
-           <artifactId>spring-context</artifactId>
-           <version>${springframework.version}</version>
+    <dependencies>
+        <dependency>
+            <artifactId>juddi-core-openjpa</artifactId>
+            <groupId>org.apache.juddi</groupId>
+            <version>${project.parent.version}</version>
+        </dependency>
+        <dependency>
+            <artifactId>juddi-client</artifactId>
+            <groupId>org.apache.juddi</groupId>
+            <version>${project.parent.version}</version>
+        </dependency>
+        <dependency>
+            <artifactId>uddi-ws</artifactId>
+            <groupId>org.apache.juddi</groupId>
+            <version>${project.parent.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-frontend-jaxws</artifactId>
+            <version>${cxf.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-transports-http</artifactId>
+            <version>${cxf.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>cglib</groupId>
+                    <artifactId>cglib</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>cglib</groupId>
+            <artifactId>cglib-nodep</artifactId>
+            <version>2.1_3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>${springframework.version}</version>
         </dependency>
         <dependency>
-           <groupId>org.springframework</groupId>
-           <artifactId>spring-web</artifactId>
-           <version>${springframework.version}</version>
+            <groupId>org.apache.juddi</groupId>
+            <artifactId>juddiv3-war</artifactId>
+            <version>${project.parent.version}</version>
+            <type>war</type>
         </dependency>
-		<dependency>
-			<groupId>org.apache.juddi</groupId>
-			<artifactId>juddiv3-war</artifactId>
-			<version>${project.parent.version}</version>
-			<type>war</type>
-		</dependency>
-	</dependencies>
-	<build>
-	   <finalName>uddi-annotations</finalName>
-		<plugins>
-		    <plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-				<configuration>
-					<excludes>
-						<exclude>*.xml</exclude>
-					</excludes>
-				</configuration>
-				<executions>
-					<execution>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<skip>false</skip>
-					<includes>
-						<include>**/*Test.java</include>
-					</includes>
-				</configuration>
-			</plugin>
+    </dependencies>
+    <build>
+        <finalName>uddi-annotations</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>*.xml</exclude>
+                    </excludes>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>false</skip>
+                    <includes>
+                        <include>**/*Test.java</include>
+                    </includes>
+                </configuration>
+            </plugin>
 			
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>foo</id>
-						<phase>package</phase>
-						<configuration>
-							<tasks>
-								<echo>getting the war from:
-									${maven.dependency.org.apache.juddi.juddiv3-war.war.path}</echo>
-								<unzip src="${maven.dependency.org.apache.juddi.juddiv3-war.war.path}" dest="target/jv3">
-									<patternset>
-										<include name="**/persistence.xml" />
-									</patternset>
-								</unzip>
-								<copy todir="target/classes" overwrite="true">
-									<fileset dir="target/jv3/WEB-INF/classes" />
-								</copy>
-							</tasks>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-war-plugin</artifactId>
-				<configuration>
-					<dependentWarExcludes>WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/*,
-						WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/*</dependentWarExcludes>
-				</configuration>
-			</plugin>
-			<!-- examples are not very useful from a maven repo, so don't put it there -->
-		    <plugin>
-		        <groupId>org.apache.maven.plugins</groupId>
-		        <artifactId>maven-deploy-plugin</artifactId>
-		        <configuration>
-		            <skip>true</skip>
-		        </configuration>
-		    </plugin>
-		</plugins>
-	</build>  
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>foo</id>
+                        <phase>package</phase>
+                        <configuration>
+                            <target>
+                                
+                                <echo>getting the war from:
+                                    ${org.apache.juddi:juddiv3-war:war}</echo>
+                                <unzip src="${org.apache.juddi:juddiv3-war:war}" dest="target/jv3">
+                                    <patternset>
+                                        <include name="**/persistence.xml" />
+                                    </patternset>
+                                </unzip>
+                                <copy todir="target/classes" overwrite="true">
+                                    <fileset dir="target/jv3/WEB-INF/classes" />
+                                </copy>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <dependentWarExcludes>WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/*,
+                        WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/*</dependentWarExcludes>
+                </configuration>
+            </plugin>
+            <!-- examples are not very useful from a maven repo, so don't put it there -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>  
 	
 	
     <profiles>
         <profile>
-        <id>demo</id>
-        <build>
-            <plugins>
-                <plugin>
-	                <groupId>org.codehaus.cargo</groupId>
-	                <artifactId>cargo-maven2-plugin</artifactId>
-	                <version>1.3.3</version>
-	                <configuration>
-	                    <container>
-	                        <containerId>tomcat6x</containerId>
-	                    </container>
-	                    <configuration>
-	                        <type>existing</type>
-	                        <home>${basedir}/../../juddi-tomcat-${project.parent.version}</home>
-	                    </configuration>
-	                    <deployables>
-	                        <deployable>
-	                            <groupId>org.apache.juddi.example</groupId>
-	                            <artifactId>uddi-annotations</artifactId>
-	                            <type>war</type>
+            <id>demo</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.cargo</groupId>
+                        <artifactId>cargo-maven2-plugin</artifactId>
+                        <version>1.3.3</version>
+                        <configuration>
+                            <container>
+                                <containerId>tomcat6x</containerId>
+                            </container>
+                            <configuration>
+                                <type>existing</type>
+                                <home>${basedir}/../../juddi-tomcat-${project.parent.version}</home>
+                            </configuration>
+                            <deployables>
+                                <deployable>
+                                    <groupId>org.apache.juddi.example</groupId>
+                                    <artifactId>uddi-annotations</artifactId>
+                                    <type>war</type>
 	                            
-	                        </deployable>
-	                     </deployables>
-	                 </configuration>
-	            </plugin>
-	        </plugins>
-        </build>  
+                                </deployable>
+                            </deployables>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>  
         </profile>
     </profiles>
 	
diff --git a/juddi-examples/wsdl2uddi-lifecyle/pom.xml b/juddi-examples/wsdl2uddi-lifecyle/pom.xml
index 01009d4..f0acc3c 100644
--- a/juddi-examples/wsdl2uddi-lifecyle/pom.xml
+++ b/juddi-examples/wsdl2uddi-lifecyle/pom.xml
@@ -62,7 +62,6 @@
         <dependency>
             <groupId>cglib</groupId>
             <artifactId>cglib-nodep</artifactId>
-            <version>2.1_3</version>
         </dependency>
         <dependency>
            <groupId>org.springframework</groupId>
diff --git a/juddi-gui-dsig/pom.xml b/juddi-gui-dsig/pom.xml
index 4dffdd6..7cfa549 100644
--- a/juddi-gui-dsig/pom.xml
+++ b/juddi-gui-dsig/pom.xml
@@ -70,14 +70,50 @@ language governing permissions and * limitations under the License. * */ -->
             <artifactId>juddi-client</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
-        <!--<dependency>
-            <groupId>com.sun.jdk</groupId>
-            <artifactId>plugin</artifactId>
-            <version>1.6.0</version>
-            <type>jar</type>
-            <scope>system</scope>
-            <systemPath>${java.home}/lib/plugin.jar</systemPath>
-        </dependency>-->
+        
+        
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-core</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.xml.ws</groupId>
+            <artifactId>jaxws-api</artifactId>
+            <version>2.3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.ws</groupId>
+            <artifactId>rt</artifactId>
+            <version>2.3.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.xml.ws</groupId>
+            <artifactId>jaxws-api</artifactId>
+            <version>2.3.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.3.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.jws</groupId>
+            <artifactId>javax.jws-api</artifactId>
+            <version>1.1</version>
+        </dependency>
+
+
     </dependencies>
  <profiles>
 
diff --git a/juddi-gui/pom.xml b/juddi-gui/pom.xml
index 9aa888e..8442e87 100644
--- a/juddi-gui/pom.xml
+++ b/juddi-gui/pom.xml
@@ -24,13 +24,7 @@ language governing permissions and * limitations under the License. * */ -->
             <artifactId>juddi-client</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.juddi</groupId>
-            <artifactId>juddi-gui-dsig</artifactId>
-            <version>${project.parent.version}</version>
-            <classifier>jar-with-dependencies</classifier>
-            <scope>provided</scope>
-        </dependency>
+       
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
@@ -50,7 +44,7 @@ language governing permissions and * limitations under the License. * */ -->
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
-			  <artifactId>commons-lang3</artifactId>
+            <artifactId>commons-lang3</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-collections</groupId>
@@ -79,71 +73,41 @@ language governing permissions and * limitations under the License. * */ -->
     </dependencies>
     <build>
         <finalName>juddi-gui</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.juddi</groupId>
-                                    <artifactId>juddi-gui-dsig</artifactId>
-                                    <classifier>jar-with-dependencies</classifier>
-                                    <overWrite>true</overWrite>
-                                    <destFileName>juddi-gui-dsig-all.jar</destFileName>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${project.build.directory}/juddi-gui/applets</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-			
-		
-			
-			
-        </plugins>
+
         <pluginManagement>
-        	<plugins>
-        		<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-        		<plugin>
-        			<groupId>org.eclipse.m2e</groupId>
-        			<artifactId>lifecycle-mapping</artifactId>
-        			<version>1.0.0</version>
-        			<configuration>
-        				<lifecycleMappingMetadata>
-        					<pluginExecutions>
-        						<pluginExecution>
-        							<pluginExecutionFilter>
-        								<groupId>
-        									org.apache.sling
-        								</groupId>
-        								<artifactId>
-        									maven-jspc-plugin
-        								</artifactId>
-        								<versionRange>
-        									[2.0.6,)
-        								</versionRange>
-        								<goals>
-        									<goal>jspc</goal>
-        								</goals>
-        							</pluginExecutionFilter>
-        							<action>
-        								<ignore />
-        							</action>
-        						</pluginExecution>
-        					</pluginExecutions>
-        				</lifecycleMappingMetadata>
-        			</configuration>
-        		</plugin>
-        	</plugins>
+            <plugins>
+                <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+                <plugin>
+                    <groupId>org.eclipse.m2e</groupId>
+                    <artifactId>lifecycle-mapping</artifactId>
+                    <version>1.0.0</version>
+                    <configuration>
+                        <lifecycleMappingMetadata>
+                            <pluginExecutions>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>
+                                            org.apache.sling
+                                        </groupId>
+                                        <artifactId>
+                                            maven-jspc-plugin
+                                        </artifactId>
+                                        <versionRange>
+                                            [2.0.6,)
+                                        </versionRange>
+                                        <goals>
+                                            <goal>jspc</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <ignore />
+                                    </action>
+                                </pluginExecution>
+                            </pluginExecutions>
+                        </lifecycleMappingMetadata>
+                    </configuration>
+                </plugin>
+            </plugins>
         </pluginManagement>
     </build>
     <profiles>
@@ -174,6 +138,6 @@ language governing permissions and * limitations under the License. * */ -->
                     </plugin>
                 </plugins>
             </build>
-       </profile>
+        </profile>
     </profiles>
 </project>
diff --git a/juddi-rest-cxf/pom.xml b/juddi-rest-cxf/pom.xml
index 7c161cf..ec13595 100644
--- a/juddi-rest-cxf/pom.xml
+++ b/juddi-rest-cxf/pom.xml
@@ -205,9 +205,9 @@
                     <execution>
                         <phase>generate-resources</phase>
                         <configuration>
-                            <tasks>
+                            <target>
                                 <delete dir="juddi-derby-test-db" />
-                            </tasks>
+                            </target>
                         </configuration>
                         <goals>
                             <goal>run</goal>
diff --git a/juddi-tomcat/build.xml b/juddi-tomcat/build.xml
index 83a4d70..0c569af 100644
--- a/juddi-tomcat/build.xml
+++ b/juddi-tomcat/build.xml
@@ -20,8 +20,7 @@
 	<property name="lib.dir" value="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/lib"/>
 	<property name="webapps.dir" value="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/webapps"/>
 	<property name="conf.dir" value="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/conf"/>
-	<property name="endorsed.dir" value="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/endorsed"/>
-
+	
 	<target name="unzip-tomcat">
 		<mkdir dir="${basedir}/target/tomcat"/>
 		<unzip dest="${basedir}/target/tomcat" src="${dependency.tomcat.zip}"/>
@@ -60,7 +59,7 @@
 		<copy file="${dependency.log4j.jar}" todir="${lib.dir}"/>
 		<copy file="${dependency.derby.jar}" todir="${lib.dir}"/>
 		<copy file="${dependency.commons-discovery.jar}" todir="${lib.dir}"/>
-		<copy file="${dependency.jaxws.jar}" todir="${endorsed.dir}"/>
+		
 	</target>
 	
 	<target name="package-tomcat" depends="copy-resources">
@@ -76,8 +75,7 @@
 	<property name="lib2.dir" value="${basedir}/target/tomcat2/apache-tomcat-${apache.tomcat.version}/lib"/>
 	<property name="webapps2.dir" value="${basedir}/target/tomcat2/apache-tomcat-${apache.tomcat.version}/webapps"/>
 	<property name="conf2.dir" value="${basedir}/target/tomcat2/apache-tomcat-${apache.tomcat.version}/conf"/>
-	<property name="endorsed2.dir" value="${basedir}/target/tomcat2/apache-tomcat-${apache.tomcat.version}/endorsed"/>
-
+	
 	<target name="unzip-tomcat2">
 		<mkdir dir="${basedir}/target/tomcat2"/>
 		<unzip dest="${basedir}/target/tomcat2" src="${dependency.tomcat.zip}"/>
@@ -128,7 +126,7 @@
 		<copy file="${dependency.log4j.jar}" todir="${lib2.dir}"/>
 		<copy file="${dependency.derby.jar}" todir="${lib2.dir}"/>
 		<copy file="${dependency.commons-discovery.jar}" todir="${lib2.dir}"/>
-		<copy file="${dependency.jaxws.jar}" todir="${endorsed2.dir}"/>
+		
 	</target>
 	
 	<target name="package-tomcat2" depends="copy-resources2">
@@ -145,7 +143,7 @@
         <property name="lib3.dir" value="${basedir}/target/tomcat3/apache-tomcat-${apache.tomcat.version}/lib"/>
 	<property name="webapps3.dir" value="${basedir}/target/tomcat3/apache-tomcat-${apache.tomcat.version}/webapps"/>
 	<property name="conf3.dir" value="${basedir}/target/tomcat3/apache-tomcat-${apache.tomcat.version}/conf"/>
-	<property name="endorsed3.dir" value="${basedir}/target/tomcat3/apache-tomcat-${apache.tomcat.version}/endorsed"/>
+	
 
 	<target name="unzip-tomcat3">
 		<mkdir dir="${basedir}/target/tomcat3"/>
@@ -197,7 +195,7 @@
 		<copy file="${dependency.log4j.jar}" todir="${lib3.dir}"/>
 		<copy file="${dependency.derby.jar}" todir="${lib3.dir}"/>
 		<copy file="${dependency.commons-discovery.jar}" todir="${lib3.dir}"/>
-		<copy file="${dependency.jaxws.jar}" todir="${endorsed3.dir}"/>
+			
 	</target>
 	
 	<target name="package-tomcat3" depends="copy-resources3">
diff --git a/juddi-tomcat/catalina.bat b/juddi-tomcat/catalina.bat
index 8a97006..9860bfd 100644
--- a/juddi-tomcat/catalina.bat
+++ b/juddi-tomcat/catalina.bat
@@ -110,7 +110,7 @@ setlocal
 
 
 rem these are jUDDI specific settings
-set JAVA_OPTS=%JAVA_OPTS% -Xms1024m -Xmx1024m -XX:MaxPermSize=512m -XX:PermSize=256M
+set JAVA_OPTS=%JAVA_OPTS% -Xms1024m -Xmx1024m 
 set JAVA_OPTS=%JAVA_OPTS% -Djavax.net.ssl.trustStore=truststore.jks -Djavax.net.ssl.trustStorePassword=password
 set JAVA_OPTS=%JAVA_OPTS% -Djavax.net.ssl.trustStore=truststore.jks -Djavax.net.ssl.trustStorePassword=password -Djavax.net.ssl.keyStore=../conf/keystore.jks -Djavax.net.ssl.keyStorePassword=password
 rem end custom settings
diff --git a/juddi-tomcat/catalina.sh b/juddi-tomcat/catalina.sh
index 48f9a08..d1971fe 100755
--- a/juddi-tomcat/catalina.sh
+++ b/juddi-tomcat/catalina.sh
@@ -123,7 +123,7 @@ esac
 
 
 # begin custom juddi settings
-JAVA_OPTS="$JAVA_OPTS -Xms1024m -Xmx1024m -XX:MaxPermSize=512m -XX:PermSize=256M"
+JAVA_OPTS="$JAVA_OPTS -Xms1024m -Xmx1024m "
 JAVA_OPTS="$JAVA_OPTS -Djavax.net.ssl.trustStore=truststore.jks -Djavax.net.ssl.trustStorePassword=password -Djavax.net.ssl.keyStore=../conf/keystore.jks -Djavax.net.ssl.keyStorePassword=password"
 # end custom juddi settings
 
diff --git a/juddiv3-war-repl/pom.xml b/juddiv3-war-repl/pom.xml
index c5899a8..3b1c8d5 100644
--- a/juddiv3-war-repl/pom.xml
+++ b/juddiv3-war-repl/pom.xml
@@ -1,459 +1,445 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- * 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. * */ -->
+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/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.apache.juddi</groupId>
-		<artifactId>juddi-parent</artifactId>
-		<version>3.3.11-SNAPSHOT</version>
-	</parent>
-	<artifactId>juddiv3-war-repl</artifactId>
-	<packaging>war</packaging>
-	<name>jUDDI Replication Services WAR</name>
-	<url>http://juddi.apache.org</url>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.juddi</groupId>
+        <artifactId>juddi-parent</artifactId>
+        <version>3.3.11-SNAPSHOT</version>
+    </parent>
+    <artifactId>juddiv3-war-repl</artifactId>
+    <packaging>war</packaging>
+    <name>jUDDI Replication Services WAR</name>
+    <url>http://juddi.apache.org</url>
 
-	<dependencies>
-		<dependency>
-			<artifactId>uddi-ws</artifactId>
-			<groupId>org.apache.juddi</groupId>
-			<version>${project.parent.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
+    <dependencies>
+        <dependency>
+            <artifactId>uddi-ws</artifactId>
+            <groupId>org.apache.juddi</groupId>
+            <version>${project.parent.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
 			
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.5</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>commons-configuration</groupId>
-			<artifactId>commons-configuration</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <scope>provided</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>org.json</groupId>
-		<artifactId>json</artifactId>
-		<version>20090211</version>
-	</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.17</version>
-		</dependency>
-	</dependencies>
-	<build>
-		<finalName>juddiv3replication</finalName>
-	</build>
-	<profiles>
-		<!-- the hibernate-jbossws-native profile builds a war for jboss, where 
-			hibernate and jbossws are provided by the appserver -->
-		<profile>
-			<id>hibernate-jbossws-native</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-war-plugin</artifactId>
-						<configuration>
-							<webResources>
-								<resource>
-									<directory>JPA/Hibernate-JBoss</directory>
-								</resource>
-								<resource>
-									<directory>JAX-WS/JBossWS-Native</directory>
-								</resource>
-							</webResources>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-			<dependencies>
-				<dependency>
-					<artifactId>juddi-core</artifactId>
-					<groupId>org.apache.juddi</groupId>
-					<version>${project.version}</version>
-				</dependency>
-				<dependency>
-					<groupId>javax.persistence</groupId>
-					<artifactId>persistence-api</artifactId>
-					<version>1.0</version>
-					<scope>provided</scope>
-				</dependency>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+        </dependency>
+    </dependencies>
+    <build>
+        <finalName>juddiv3replication</finalName>
+    </build>
+    <profiles>
+        <!-- the hibernate-jbossws-native profile builds a war for jboss, where 
+        hibernate and jbossws are provided by the appserver -->
+        <profile>
+            <id>hibernate-jbossws-native</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-war-plugin</artifactId>
+                        <configuration>
+                            <webResources>
+                                <resource>
+                                    <directory>JPA/Hibernate-JBoss</directory>
+                                </resource>
+                                <resource>
+                                    <directory>JAX-WS/JBossWS-Native</directory>
+                                </resource>
+                            </webResources>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+            <dependencies>
+                <dependency>
+                    <artifactId>juddi-core</artifactId>
+                    <groupId>org.apache.juddi</groupId>
+                    <version>${project.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>javax.persistence</groupId>
+                    <artifactId>persistence-api</artifactId>
+                    <version>1.0</version>
+                    <scope>provided</scope>
+                </dependency>
 				
-				<dependency>
-					<groupId>org.hibernate</groupId>
-					<artifactId>hibernate-entitymanager</artifactId>
-					<scope>provided</scope>
-				</dependency>
+                <dependency>
+                    <groupId>org.hibernate</groupId>
+                    <artifactId>hibernate-entitymanager</artifactId>
+                    <scope>provided</scope>
+                </dependency>
 
-			</dependencies>
-		</profile>
-		<profile>
-			<id>hibernate-jbossws-cxf</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-war-plugin</artifactId>
-						<configuration>
-							<webResources>
-								<resource>
-									<directory>JPA/Hibernate-JBoss</directory>
-								</resource>
-								<resource>
-									<directory>JAX-WS/JBossWS-CXF</directory>
-								</resource>
-							</webResources>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-			<dependencies>
-				<dependency>
-					<artifactId>juddi-core</artifactId>
-					<groupId>org.apache.juddi</groupId>
-					<version>${project.version}</version>
-				</dependency>
-                      		<dependency>
-					<artifactId>juddi-rest-cxf</artifactId>
-					<groupId>org.apache.juddi</groupId>
-					<version>${project.version}</version>
-				</dependency>
-				<dependency>
-					<groupId>javax.persistence</groupId>
-					<artifactId>persistence-api</artifactId>
-					<version>1.0</version>
-					<scope>provided</scope>
-				</dependency>
-				<dependency>
-					<groupId>org.hibernate</groupId>
-					<artifactId>hibernate</artifactId>
-					<scope>provided</scope>
-				</dependency>
-				<dependency>
-					<groupId>org.hibernate</groupId>
-					<artifactId>hibernate-entitymanager</artifactId>
-					<scope>provided</scope>
-				</dependency>
-				<dependency>
-					<groupId>cglib</groupId>
-					<artifactId>cglib-nodep</artifactId>
-					<version>2.1_3</version>
-					<scope>provided</scope>
-				</dependency>
-                                 <dependency>
-                                    <groupId>org.apache.cxf</groupId>
-                                    <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-                                    <version>${cxf.version}</version>
-                                </dependency>
-                                <dependency>
-                                    <groupId>org.apache.cxf</groupId>
-                                    <artifactId>cxf-rt-rs-client</artifactId>
-                                    <version>${cxf.version}</version>
-                                </dependency>
-                                <dependency>
-                                    <groupId>org.apache.cxf</groupId>
-                                    <artifactId>cxf-rt-rs-service-description</artifactId>
-                                    <version>${cxf.version}</version>
-                                </dependency>
-			</dependencies>
-		</profile>
-		<profile>
-			<!-- the hibernate profile builds a war for tomcat, with hibernate and 
-				cxf in the war -->
-			<id>hibernate</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-war-plugin</artifactId>
-						<configuration>
-							<webResources>
-								<resource>
-									<directory>JPA/Hibernate</directory>
-								</resource>
-								<resource>
-									<directory>JAX-WS/CXF</directory>
-								</resource>
-							</webResources>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-			<dependencies>
-				<dependency>
-					<artifactId>juddi-core</artifactId>
-					<groupId>org.apache.juddi</groupId>
-					<version>${project.version}</version>
-				</dependency>
-                                <dependency>
-					<artifactId>juddi-rest-cxf</artifactId>
-					<groupId>org.apache.juddi</groupId>
-					<version>${project.version}</version>
-				</dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>hibernate-jbossws-cxf</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-war-plugin</artifactId>
+                        <configuration>
+                            <webResources>
+                                <resource>
+                                    <directory>JPA/Hibernate-JBoss</directory>
+                                </resource>
+                                <resource>
+                                    <directory>JAX-WS/JBossWS-CXF</directory>
+                                </resource>
+                            </webResources>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+            <dependencies>
+                <dependency>
+                    <artifactId>juddi-core</artifactId>
+                    <groupId>org.apache.juddi</groupId>
+                    <version>${project.version}</version>
+                </dependency>
+                <dependency>
+                    <artifactId>juddi-rest-cxf</artifactId>
+                    <groupId>org.apache.juddi</groupId>
+                    <version>${project.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>javax.persistence</groupId>
+                    <artifactId>persistence-api</artifactId>
+                    <version>1.0</version>
+                    <scope>provided</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.hibernate</groupId>
+                    <artifactId>hibernate</artifactId>
+                    <scope>provided</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.hibernate</groupId>
+                    <artifactId>hibernate-entitymanager</artifactId>
+                    <scope>provided</scope>
+                </dependency>
+                <dependency>
+                    <groupId>cglib</groupId>
+                    <artifactId>cglib-nodep</artifactId>
+                    <version>2.1_3</version>
+                    <scope>provided</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.cxf</groupId>
+                    <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+                    <version>${cxf.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.cxf</groupId>
+                    <artifactId>cxf-rt-rs-client</artifactId>
+                    <version>${cxf.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.cxf</groupId>
+                    <artifactId>cxf-rt-rs-service-description</artifactId>
+                    <version>${cxf.version}</version>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <!-- the hibernate profile builds a war for tomcat, with hibernate and 
+            cxf in the war -->
+            <id>hibernate</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-war-plugin</artifactId>
+                        <configuration>
+                            <webResources>
+                                <resource>
+                                    <directory>JPA/Hibernate</directory>
+                                </resource>
+                                <resource>
+                                    <directory>JAX-WS/CXF</directory>
+                                </resource>
+                            </webResources>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+            <dependencies>
+                <dependency>
+                    <artifactId>juddi-core</artifactId>
+                    <groupId>org.apache.juddi</groupId>
+                    <version>${project.version}</version>
+                </dependency>
+                <dependency>
+                    <artifactId>juddi-rest-cxf</artifactId>
+                    <groupId>org.apache.juddi</groupId>
+                    <version>${project.version}</version>
+                </dependency>
 				
-				<dependency>
-					<groupId>org.apache.cxf</groupId>
-					<artifactId>cxf-rt-frontend-jaxws</artifactId>
-					<version>${cxf.version}</version>
-				</dependency>
-				<dependency>
-					<groupId>org.apache.cxf</groupId>
-					<artifactId>cxf-rt-frontend-jaxrs</artifactId>
-					<version>${cxf.version}</version>
-				</dependency>
-				<dependency>
-					<groupId>org.apache.cxf</groupId>
-					<artifactId>cxf-rt-transports-http</artifactId>
-					<version>${cxf.version}</version>
-					<exclusions>
-						<exclusion>
-							<groupId>cglib</groupId>
-							<artifactId>cglib</artifactId>
-						</exclusion>
-					</exclusions>
-				</dependency>
-				<dependency>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-context</artifactId>
-					<version>${springframework.version}</version>
-				</dependency>
-				<dependency>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-web</artifactId>
-					<version>${springframework.version}</version>
-				</dependency>
-				<dependency>
-					<groupId>org.apache.geronimo.javamail</groupId>
-					<artifactId>geronimo-javamail_1.4_mail</artifactId>
-				</dependency>
-			</dependencies>
-		</profile>
-		<profile>
-			<!-- the openjpa profile builds a war for tomcat, with openjpa and cxf 
-				in the war -->
-			<id>openjpa</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-war-plugin</artifactId>
-						<configuration>
-							<webResources>
-								<resource>
-									<directory>JPA/OpenJPA</directory>
-								</resource>
-								<resource>
-									<directory>JAX-WS/CXF</directory>
-								</resource>
-							</webResources>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-			<dependencies>
-				<dependency>
-					<artifactId>juddi-core-openjpa</artifactId>
-					<groupId>org.apache.juddi</groupId>
-					<version>${project.version}</version>
-					<exclusions>
-						<exclusion>
-							<groupId>junit</groupId>
-							<artifactId>junit</artifactId>
-						</exclusion>
-					</exclusions>
-				</dependency>
-                                 <dependency>
-                                    <groupId>org.apache.cxf</groupId>
-                                    <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-                                    <version>${cxf.version}</version>
-                                </dependency>
-                                <dependency>
-                                    <groupId>org.apache.cxf</groupId>
-                                    <artifactId>cxf-rt-rs-client</artifactId>
-                                    <version>${cxf.version}</version>
-                                </dependency>
-                                <dependency>
-                                    <groupId>org.apache.cxf</groupId>
-                                    <artifactId>cxf-rt-rs-service-description</artifactId>
-                                    <version>${cxf.version}</version>
-                                </dependency>
-                                <dependency>
-					<artifactId>juddi-rest-cxf</artifactId>
-					<groupId>org.apache.juddi</groupId>
-					<version>${project.version}</version>
-				</dependency>
-				<dependency>
-					<groupId>org.apache.cxf</groupId>
-					<artifactId>cxf-rt-frontend-jaxws</artifactId>
-					<version>${cxf.version}</version>
-				</dependency>
-				<!--added AO 6/8/2013 support for JSON encoding on REST endpoints -->
-				<dependency>
-					<groupId>org.apache.cxf</groupId>
-					<artifactId>cxf-rt-rs-extension-providers</artifactId>
-					<version>${cxf.version}</version>
-				</dependency>
+                <dependency>
+                    <groupId>org.apache.cxf</groupId>
+                    <artifactId>cxf-rt-frontend-jaxws</artifactId>
+                    <version>${cxf.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.cxf</groupId>
+                    <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+                    <version>${cxf.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.cxf</groupId>
+                    <artifactId>cxf-rt-transports-http</artifactId>
+                    <version>${cxf.version}</version>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>cglib</groupId>
+                            <artifactId>cglib</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-context</artifactId>
+                    <version>${springframework.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-web</artifactId>
+                    <version>${springframework.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.javamail</groupId>
+                    <artifactId>geronimo-javamail_1.4_mail</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <!-- the openjpa profile builds a war for tomcat, with openjpa and cxf 
+            in the war -->
+            <id>openjpa</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-war-plugin</artifactId>
+                        <configuration>
+                            <webResources>
+                                <resource>
+                                    <directory>JPA/OpenJPA</directory>
+                                </resource>
+                                <resource>
+                                    <directory>JAX-WS/CXF</directory>
+                                </resource>
+                            </webResources>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+            <dependencies>
+                <dependency>
+                    <artifactId>juddi-core-openjpa</artifactId>
+                    <groupId>org.apache.juddi</groupId>
+                    <version>${project.version}</version>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>junit</groupId>
+                            <artifactId>junit</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.cxf</groupId>
+                    <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+                    <version>${cxf.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.cxf</groupId>
+                    <artifactId>cxf-rt-rs-client</artifactId>
+                    <version>${cxf.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.cxf</groupId>
+                    <artifactId>cxf-rt-rs-service-description</artifactId>
+                    <version>${cxf.version}</version>
+                </dependency>
+                <dependency>
+                    <artifactId>juddi-rest-cxf</artifactId>
+                    <groupId>org.apache.juddi</groupId>
+                    <version>${project.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.cxf</groupId>
+                    <artifactId>cxf-rt-frontend-jaxws</artifactId>
+                    <version>${cxf.version}</version>
+                </dependency>
+                <!--added AO 6/8/2013 support for JSON encoding on REST endpoints -->
+                <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>
-				<!--END added AO 6/8/2013 support for JSON encoding on REST endpoints -->
-				<dependency>
-					<groupId>org.apache.cxf</groupId>
-					<artifactId>cxf-rt-frontend-jaxrs</artifactId>
-					<version>${cxf.version}</version>
-				</dependency>
-				<dependency>
-					<groupId>org.apache.cxf</groupId>
-					<artifactId>cxf-rt-transports-http</artifactId>
-					<version>${cxf.version}</version>
-					<exclusions>
-						<exclusion>
-							<groupId>cglib</groupId>
-							<artifactId>cglib</artifactId>
-						</exclusion>
-					</exclusions>
-				</dependency>
-				<dependency>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-context</artifactId>
-					<version>${springframework.version}</version>
-				</dependency>
-				<dependency>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-web</artifactId>
-					<version>${springframework.version}</version>
-				</dependency>
-				<dependency>
-					<groupId>org.apache.geronimo.javamail</groupId>
-					<artifactId>geronimo-javamail_1.4_mail</artifactId>
-				</dependency>
-			</dependencies>
-		</profile>
-		<profile>
-			<!-- the openjpa-axis2 profile builds a war for tomcat, with openjpa and 
-				axis2 in the war -->
-			<id>axis2</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-war-plugin</artifactId>
-						<configuration>
-							<webResources>
-								<resource>
-									<directory>JPA/OpenJPA</directory>
-								</resource>
-								<resource>
-									<directory>JAX-WS/Axis2</directory>
-								</resource>
-							</webResources>
-						</configuration>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-antrun-plugin</artifactId>
-						<version>1.6</version>
-						<executions>
-							<execution>
-								<id>default-cli</id>
-								<configuration>
-									<target name="axis2-servicejars">
-										<dependencyfilesets prefix="mydeps." />
-										<mkdir dir="${basedir}/target/juddiv3/WEB-INF/servicejars" />
-										<copy todir="${basedir}/target/juddiv3/WEB-INF/servicejars">
-											<fileset refid="mydeps.org.apache.juddi:juddi-core-openjpa:jar" />
-										</copy>
-									</target>
-								</configuration>
-								<phase>compile</phase>
-								<goals>
-									<goal>run</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-			<dependencies>
-				<!-- providing this through ant in the servicejars directory -->
-				<dependency>
-					<artifactId>juddi-core-openjpa</artifactId>
-					<groupId>org.apache.juddi</groupId>
-					<version>${project.version}</version>
-					<exclusions>
-						<exclusion>
-							<groupId>junit</groupId>
-							<artifactId>junit</artifactId>
-						</exclusion>
-					</exclusions>
-				</dependency>
-				<!-- and then add the axis2 jars -->
-				<dependency>
-					<groupId>org.apache.axis2</groupId>
-					<artifactId>axis2</artifactId>
-					<version>1.6.2</version>
-				</dependency>
-				<dependency>
-					<groupId>org.apache.axis2</groupId>
-					<artifactId>axis2-jaxws</artifactId>
-					<version>1.6.2</version>
-				</dependency>
-				<dependency>
-					<groupId>org.apache.axis2</groupId>
-					<artifactId>axis2-transport-http</artifactId>
-					<version>1.6.2</version>
-				</dependency>
-				<dependency>
-					<groupId>org.apache.axis2</groupId>
-					<artifactId>axis2-transport-local</artifactId>
-					<version>1.6.2</version>
-				</dependency>
-				<dependency>
-					<groupId>org.apache.xmlbeans</groupId>
-					<artifactId>xmlbeans</artifactId>
-					<version>2.4.0</version>
-				</dependency>
-				<dependency>
-					<groupId>org.apache.geronimo.javamail</groupId>
-					<artifactId>geronimo-javamail_1.4_mail</artifactId>
-				</dependency>
-			</dependencies>
-		</profile>
-		<profile>
+                <dependency>
+                    <groupId>org.codehaus.jettison</groupId>
+                    <artifactId>jettison</artifactId>
+                </dependency>
+                <!--END added AO 6/8/2013 support for JSON encoding on REST endpoints -->
+                <dependency>
+                    <groupId>org.apache.cxf</groupId>
+                    <artifactId>cxf-rt-transports-http</artifactId>
+                    <version>${cxf.version}</version>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>cglib</groupId>
+                            <artifactId>cglib</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-context</artifactId>
+                    <version>${springframework.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-web</artifactId>
+                    <version>${springframework.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.javamail</groupId>
+                    <artifactId>geronimo-javamail_1.4_mail</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <!-- the openjpa-axis2 profile builds a war for tomcat, with openjpa and 
+            axis2 in the war -->
+            <id>axis2</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-war-plugin</artifactId>
+                        <configuration>
+                            <webResources>
+                                <resource>
+                                    <directory>JPA/OpenJPA</directory>
+                                </resource>
+                                <resource>
+                                    <directory>JAX-WS/Axis2</directory>
+                                </resource>
+                            </webResources>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <version>1.6</version>
+                        <executions>
+                            <execution>
+                                <id>default-cli</id>
+                                <configuration>
+                                    <target name="axis2-servicejars">
+                                        <dependencyfilesets prefix="mydeps." />
+                                        <mkdir dir="${basedir}/target/juddiv3/WEB-INF/servicejars" />
+                                        <copy todir="${basedir}/target/juddiv3/WEB-INF/servicejars">
+                                            <fileset refid="mydeps.org.apache.juddi:juddi-core-openjpa:jar" />
+                                        </copy>
+                                    </target>
+                                </configuration>
+                                <phase>compile</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+            <dependencies>
+                <!-- providing this through ant in the servicejars directory -->
+                <dependency>
+                    <artifactId>juddi-core-openjpa</artifactId>
+                    <groupId>org.apache.juddi</groupId>
+                    <version>${project.version}</version>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>junit</groupId>
+                            <artifactId>junit</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <!-- and then add the axis2 jars -->
+                <dependency>
+                    <groupId>org.apache.axis2</groupId>
+                    <artifactId>axis2</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.axis2</groupId>
+                    <artifactId>axis2-jaxws</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.axis2</groupId>
+                    <artifactId>axis2-transport-http</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.axis2</groupId>
+                    <artifactId>axis2-transport-local</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.xmlbeans</groupId>
+                    <artifactId>xmlbeans</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.javamail</groupId>
+                    <artifactId>geronimo-javamail_1.4_mail</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
             <id>jboss7up</id>
             <activation>
                 <activeByDefault>false</activeByDefault>
@@ -541,5 +527,5 @@
                 
             </dependencies>
         </profile>
-	</profiles>
+    </profiles>
 </project>
diff --git a/pom.xml b/pom.xml
index 362f4ad..172c637 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,542 +18,535 @@ 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/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.apache</groupId>
-		<artifactId>apache</artifactId>
-		<version>18</version>
-	</parent>
-	<packaging>pom</packaging>
-	<groupId>org.apache.juddi</groupId>
-	<artifactId>juddi-parent</artifactId>
-	<version>3.3.11-SNAPSHOT</version>
-	<name>jUDDI_v3 Parent</name>
-	<description>jUDDI (pronounced "Judy") is an open source Java
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache</groupId>
+        <artifactId>apache</artifactId>
+        <version>25</version>
+    </parent>
+    <packaging>pom</packaging>
+    <groupId>org.apache.juddi</groupId>
+    <artifactId>juddi-parent</artifactId>
+    <version>3.3.11-SNAPSHOT</version>
+    <name>jUDDI_v3 Parent</name>
+    <description>jUDDI (pronounced "Judy") is an open source Java
         implementation of the Universal Description, Discovery, and
         Integration (UDDI) specification for Web Services.</description>
-	<url>http://juddi.apache.org/</url>
+    <url>http://juddi.apache.org/</url>
 
-	<prerequisites>
-		<maven>3.0.3</maven>
-	</prerequisites>
+    <properties>
+        <sourceReleaseAssemblyDescriptor>source-release</sourceReleaseAssemblyDescriptor>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <cxf.version>3.3.4</cxf.version>
+        <springframework.version>5.3.16</springframework.version>
+        <apache.tomcat.version>9.0.59</apache.tomcat.version>
+        <jacoco.it.execution.data.file>${project.build.directory}/coverage-reports/jacoco-it.exec</jacoco.it.execution.data.file>
+        <jacoco.ut.execution.data.file>${project.build.directory}/coverage-reports/jacoco-ut.exec</jacoco.ut.execution.data.file>
 
-	<properties>
-		<sourceReleaseAssemblyDescriptor>source-release</sourceReleaseAssemblyDescriptor>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<cxf.version>3.3.4</cxf.version>
-		<springframework.version>5.2.4.RELEASE</springframework.version>
-		<apache.tomcat.version>9.0.37</apache.tomcat.version>
-		<jacoco.it.execution.data.file>${project.build.directory}/coverage-reports/jacoco-it.exec</jacoco.it.execution.data.file>
-		<jacoco.ut.execution.data.file>${project.build.directory}/coverage-reports/jacoco-ut.exec</jacoco.ut.execution.data.file>
+    </properties>
 
-	</properties>
-
-	<issueManagement>
-		<system>JIRA</system>
-		<url>https://issues.apache.org/jira/browse/JUDDI</url>
-	</issueManagement>
-	<ciManagement>
-		<system>Buildbot</system>
-		<url>http://ci.apache.org/buildbot.html</url>
-		<notifiers>
-			<notifier>
-				<sendOnError>true</sendOnError>
-				<sendOnFailure>true</sendOnFailure>
-				<sendOnSuccess>true</sendOnSuccess>
-				<sendOnWarning>true</sendOnWarning>
-				<configuration>
-					<address>dev@juddi.apache.org</address>
-				</configuration>
-			</notifier>
-		</notifiers>
-	</ciManagement>
-	<inceptionYear>2004</inceptionYear>
-	<mailingLists>
-		<mailingList>
-			<name>jUDDI User List</name>
-			<subscribe>user-subscribe@juddi.apache.org</subscribe>
-			<unsubscribe>user-unsubscribe@juddi.apache.org</unsubscribe>
-			<post>user@juddi.apache.org</post>
-			<archive>http://mail-archives.apache.org/mod_mbox/juddi-user/</archive>
-		</mailingList>
-		<mailingList>
-			<name>jUDDI Developer List</name>
-			<subscribe>dev-subscribe@juddi.apache.org</subscribe>
-			<unsubscribe>dev-unsubscribe@juddi.apache.org</unsubscribe>
-			<post>dev@juddi.apache.org</post>
-			<archive>http://mail-archives.apache.org/mod_mbox/juddi-dev/</archive>
-		</mailingList>
-		<mailingList>
-			<name>jUDDI SVN List</name>
-			<subscribe>cvs-subscribe@juddi.apache.org</subscribe>
-			<unsubscribe>cvs-unsubscribe@juddi.apache.org</unsubscribe>
-			<post>commits@juddi.apache.org</post>
-			<archive>http://mail-archives.apache.org/mod_mbox/juddi-cvs/</archive>
-		</mailingList>
-	</mailingLists>
-	<developers>
-		<developer>
-			<id>kstam</id>
-			<name>Kurt Stam</name>
-			<email>kstam AT apache.org</email>
-			<organization>ASF</organization>
-		</developer>
-		<developer>
-			<id>jfaath</id>
-			<name>Jeffrey Faath</name>
-			<email>jfaath AT apache.org</email>
-			<url>http://www.esigma.com</url>
-			<organization>ESigma</organization>
-		</developer>
-		<developer>
-			<id>tcunning</id>
-			<name>Tom Cunningham</name>
-			<email>tcunning AT apache.org</email>
-			<url>http://www.jboss.org/jbossesb</url>
-			<organization>JBoss/Red Hat</organization>
-		</developer>
-		<developer>
-			<id>sviens</id>
-			<name>Steve Viens</name>
-			<email>steve AT viens.net</email>
-			<url>http://www.viens.net</url>
-			<organization>ASF</organization>
-		</developer>
-		<developer>
-			<id>anil</id>
-			<name>Anil Saldhana</name>
-			<email>anil AT apache.org</email>
-			<url>http://www.jboss.org</url>
-			<organization>JBoss/Red Hat</organization>
-		</developer>
-		<developer>
-			<id>djencks</id>
-			<name>David Jencks</name>
-			<email>djencks AT apache.org</email>
-			<url>http://www.apache.org</url>
-			<organization>ASF</organization>
-		</developer>
-		<developer>
-			<id>alexoree</id>
-			<name>Alex O'Ree</name>
-			<email>alexoree AT apache.org</email>
-			<url>http://www.apache.org</url>
-			<organization>ASF</organization>
-		</developer>
-	</developers>
-	<contributors>
-		<contributor>
-			<name>Ken Wilson</name>
-			<organization>Dynamic Site Design</organization>
-			<url>http://www.dynamicsitedesign.com</url>
-		</contributor>
-		<contributor>
-			<name>Jeremi Thebeau</name>
-			<organization>Xceptance Software Technologies</organization>
-			<url>http://www.xceptance.com</url>
-		</contributor>
-	</contributors>
-	<licenses>
-		<license>
-			<name>The Apache Software License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-	<scm>
-		<connection>scm:git:https://gitbox.apache.org/repos/asf/juddi.git</connection>
-		<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/juddi.git</developerConnection>
-		<url>https://gitbox.apache.org/repos/asf/juddi.git/?p=juddi.git;a=summary</url>
-		<tag>HEAD</tag>
-	</scm>
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-jarsigner-plugin</artifactId>
-					<version>1.4</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.sling</groupId>
-					<artifactId>maven-jspc-plugin</artifactId>
-					<version>2.0.8</version>
-				</plugin>
-				<plugin>
-					<groupId>org.asciidoctor</groupId>
-					<artifactId>asciidoctor-maven-plugin</artifactId>
-					<version>0.1.4</version>
-				</plugin>
-				<plugin>
-					<!-- Entry needed to enable jdocbook unzipping -->
-					<groupId>org.jboss.maven.plugins</groupId>
-					<artifactId>maven-jdocbook-plugin</artifactId>
-					<version>2.3.8</version>
-				</plugin>
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>exec-maven-plugin</artifactId>
-					<version>1.1.1</version>
-				</plugin>
-				<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>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<configuration>
-						<source>1.7</source>
-						<target>1.7</target>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-release-plugin</artifactId>
-					<version>2.5.3</version>
-					<configuration>
-						<autoVersionSubmodules>true</autoVersionSubmodules>
-						<preparationGoals>clean install</preparationGoals>
-						<goals>deploy</goals>
-						<releaseProfiles>apache-release</releaseProfiles>
-						<tagNameFormat>juddi-@{project.version}</tagNameFormat>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.felix</groupId>
-					<artifactId>maven-bundle-plugin</artifactId>
-					<version>2.3.6</version>
-					<extensions>true</extensions>
-					<configuration>
-						<classifier>${envClassifier}</classifier>
-						<obrRepository>target/OBRRepository.xml</obrRepository>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>ianal-maven-plugin</artifactId>
-					<version>1.0-alpha-1</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-site-plugin</artifactId>
-                    <version>3.9.1</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>3.3.0</version>
-					<configuration>
-						<aggregate>true</aggregate>
-						<doclint>none</doclint>
-					</configuration>
-					<executions>
-						<execution>
-							<id>aggregate</id>
-							<goals>
-								<goal>aggregate</goal>
-							</goals>
-							<phase>site</phase>
-						</execution>
-					</executions>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.rat</groupId>
-					<artifactId>apache-rat-plugin</artifactId>
-					<version>0.12</version>
-				</plugin>
-				<plugin>
-					<groupId>org.jacoco</groupId>
-					<artifactId>jacoco-maven-plugin</artifactId>
-					<version>0.7.5.201505241946</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-antrun-plugin</artifactId>
-					<version>1.6</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-dependency-plugin</artifactId>
-					<version>2.1</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-clean-plugin</artifactId>
-					<version>2.6.1</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-surefire-plugin</artifactId>
-					<version>2.19.1</version>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-			<groupId>net.nicoulaj.maven.plugins</groupId>
-			<artifactId>checksum-maven-plugin</artifactId>
-			<version>1.8</version>
-			<executions>
-			  <execution>
-				<goals>
-				  <goal>artifacts</goal>
-				</goals>
-			  </execution>
-			</executions>
-			<configuration>
-			<algorithms>
-				<algorithm>SHA-512</algorithm>
-			</algorithms>
-			  <!-- put your configurations here -->
-			</configuration>
-		  </plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-enforcer-plugin</artifactId>
-				<version>3.0.0-M1</version>
-				<executions>
-				  <execution>
-					<id>enforce-versions</id>
-					<goals>
-					  <goal>enforce</goal>
-					</goals>
-					<phase>validate</phase>
-					<configuration>
-					  <rules>
+    <issueManagement>
+        <system>JIRA</system>
+        <url>https://issues.apache.org/jira/browse/JUDDI</url>
+    </issueManagement>
+    <ciManagement>
+        <system>Buildbot</system>
+        <url>http://ci.apache.org/buildbot.html</url>
+        <notifiers>
+            <notifier>
+                <sendOnError>true</sendOnError>
+                <sendOnFailure>true</sendOnFailure>
+                <sendOnSuccess>true</sendOnSuccess>
+                <sendOnWarning>true</sendOnWarning>
+                <configuration>
+                    <address>dev@juddi.apache.org</address>
+                </configuration>
+            </notifier>
+        </notifiers>
+    </ciManagement>
+    <inceptionYear>2004</inceptionYear>
+    <mailingLists>
+        <mailingList>
+            <name>jUDDI User List</name>
+            <subscribe>user-subscribe@juddi.apache.org</subscribe>
+            <unsubscribe>user-unsubscribe@juddi.apache.org</unsubscribe>
+            <post>user@juddi.apache.org</post>
+            <archive>http://mail-archives.apache.org/mod_mbox/juddi-user/</archive>
+        </mailingList>
+        <mailingList>
+            <name>jUDDI Developer List</name>
+            <subscribe>dev-subscribe@juddi.apache.org</subscribe>
+            <unsubscribe>dev-unsubscribe@juddi.apache.org</unsubscribe>
+            <post>dev@juddi.apache.org</post>
+            <archive>http://mail-archives.apache.org/mod_mbox/juddi-dev/</archive>
+        </mailingList>
+        <mailingList>
+            <name>jUDDI SVN List</name>
+            <subscribe>cvs-subscribe@juddi.apache.org</subscribe>
+            <unsubscribe>cvs-unsubscribe@juddi.apache.org</unsubscribe>
+            <post>commits@juddi.apache.org</post>
+            <archive>http://mail-archives.apache.org/mod_mbox/juddi-cvs/</archive>
+        </mailingList>
+    </mailingLists>
+    <developers>
+        <developer>
+            <id>kstam</id>
+            <name>Kurt Stam</name>
+            <email>kstam AT apache.org</email>
+            <organization>ASF</organization>
+        </developer>
+        <developer>
+            <id>jfaath</id>
+            <name>Jeffrey Faath</name>
+            <email>jfaath AT apache.org</email>
+            <url>http://www.esigma.com</url>
+            <organization>ESigma</organization>
+        </developer>
+        <developer>
+            <id>tcunning</id>
+            <name>Tom Cunningham</name>
+            <email>tcunning AT apache.org</email>
+            <url>http://www.jboss.org/jbossesb</url>
+            <organization>JBoss/Red Hat</organization>
+        </developer>
+        <developer>
+            <id>sviens</id>
+            <name>Steve Viens</name>
+            <email>steve AT viens.net</email>
+            <url>http://www.viens.net</url>
+            <organization>ASF</organization>
+        </developer>
+        <developer>
+            <id>anil</id>
+            <name>Anil Saldhana</name>
+            <email>anil AT apache.org</email>
+            <url>http://www.jboss.org</url>
+            <organization>JBoss/Red Hat</organization>
+        </developer>
+        <developer>
+            <id>djencks</id>
+            <name>David Jencks</name>
+            <email>djencks AT apache.org</email>
+            <url>http://www.apache.org</url>
+            <organization>ASF</organization>
+        </developer>
+        <developer>
+            <id>alexoree</id>
+            <name>Alex O'Ree</name>
+            <email>alexoree AT apache.org</email>
+            <url>http://www.apache.org</url>
+            <organization>ASF</organization>
+        </developer>
+    </developers>
+    <contributors>
+        <contributor>
+            <name>Ken Wilson</name>
+            <organization>Dynamic Site Design</organization>
+            <url>http://www.dynamicsitedesign.com</url>
+        </contributor>
+        <contributor>
+            <name>Jeremi Thebeau</name>
+            <organization>Xceptance Software Technologies</organization>
+            <url>http://www.xceptance.com</url>
+        </contributor>
+    </contributors>
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <scm>
+        <connection>scm:git:https://gitbox.apache.org/repos/asf/juddi.git</connection>
+        <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/juddi.git</developerConnection>
+        <url>https://gitbox.apache.org/repos/asf/juddi.git/?p=juddi.git;a=summary</url>
+        <tag>HEAD</tag>
+    </scm>
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jarsigner-plugin</artifactId>
+                    <version>3.0.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.sling</groupId>
+                    <artifactId>maven-jspc-plugin</artifactId>
+                    <version>2.0.8</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.asciidoctor</groupId>
+                    <artifactId>asciidoctor-maven-plugin</artifactId>
+                    <version>2.2.2</version>
+                </plugin>
+                <plugin>
+                    <!-- Entry needed to enable jdocbook unzipping -->
+                    <groupId>org.jboss.maven.plugins</groupId>
+                    <artifactId>maven-jdocbook-plugin</artifactId>
+                    <version>2.3.10</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>exec-maven-plugin</artifactId>
+                    <version>3.0.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>3.3.2</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <version>2.6</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.10.0</version>
+                    <configuration>
+                        <source>1.8</source>
+                        <target>1.8</target>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-release-plugin</artifactId>
+                    <version>2.5.3</version>
+                    <configuration>
+                        <autoVersionSubmodules>true</autoVersionSubmodules>
+                        <preparationGoals>clean install</preparationGoals>
+                        <goals>deploy</goals>
+                        <releaseProfiles>apache-release</releaseProfiles>
+                        <tagNameFormat>juddi-@{project.version}</tagNameFormat>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-bundle-plugin</artifactId>
+                    <version>5.1.4</version>
+                    <extensions>true</extensions>
+                    <configuration>
+                        <classifier>${envClassifier}</classifier>
+                        <obrRepository>target/OBRRepository.xml</obrRepository>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>ianal-maven-plugin</artifactId>
+                    <version>1.0-alpha-1</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-site-plugin</artifactId>
+                    <version>3.11.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>3.3.2</version>
+                    <configuration>
+                        <aggregate>true</aggregate>
+                        <doclint>none</doclint>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>aggregate</id>
+                            <goals>
+                                <goal>aggregate</goal>
+                            </goals>
+                            <phase>site</phase>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.rat</groupId>
+                    <artifactId>apache-rat-plugin</artifactId>
+                    <version>0.13</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.jacoco</groupId>
+                    <artifactId>jacoco-maven-plugin</artifactId>
+                    <version>0.8.7</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-antrun-plugin</artifactId>
+                    <version>3.0.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>3.2.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-clean-plugin</artifactId>
+                    <version>3.1.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>2.22.2</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>net.nicoulaj.maven.plugins</groupId>
+                <artifactId>checksum-maven-plugin</artifactId>
+                <version>1.8</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>artifacts</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <algorithms>
+                        <algorithm>SHA-512</algorithm>
+                    </algorithms>
+                    <!-- put your configurations here -->
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.0.0-M1</version>
+                <executions>
+                    <execution>
+                        <id>enforce-versions</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <phase>validate</phase>
+                        <configuration>
+                            <rules>
 						
-						<requireMavenVersion>
-						  <version>[3.0.3,)</version>
-						</requireMavenVersion>
-						<requireJavaVersion>
-						  <version>[1.6,)</version>
-						</requireJavaVersion>
-					  </rules>
-					</configuration>
-				  </execution>
-				</executions>
-			  </plugin>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>ianal-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-site-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<artifactId>maven-clean-plugin</artifactId>
-				<version>2.6.1</version>
-				<configuration>
-					<filesets>
-						<fileset>
-							<directory>.</directory>
-							<includes>
-								<include>*.ddl</include>
-								<include>*.log</include>
-							</includes>
-
-						</fileset>
-					</filesets>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.7.9</version>
-				<executions>
-					<!--
-							Prepares the property pointing to the JaCoCo runtime agent which
-							is passed as VM argument when Maven the Surefire plugin is executed.
-						-->
-					<execution>
-						<id>pre-unit-test</id>
-						<goals>
-							<goal>prepare-agent</goal>
-						</goals>
-						<configuration>
-							<!-- Sets the path to the file which contains the execution data. -->
-							<destFile>${jacoco.ut.execution.data.file}</destFile>
-							<!--
-									Sets the name of the property containing the settings
-									for JaCoCo runtime agent.
-								-->
-							<propertyName>surefireArgLine</propertyName>
-						</configuration>
-					</execution>
-					<!--
-							Ensures that the code coverage report for unit tests is created after
-							unit tests have been run.
-						-->
-					<execution>
-						<id>post-unit-test</id>
-						<phase>test</phase>
-						<goals>
-							<goal>report</goal>
-						</goals>
-						<configuration>
-							<!-- Sets the path to the file which contains the execution data. -->
-							<dataFile>${jacoco.ut.execution.data.file}</dataFile>
-							<!-- Sets the output directory for the code coverage report. -->
-							<outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-						</configuration>
-					</execution>
-					<!--
-							Prepares the property pointing to the JaCoCo runtime agent which
-							is passed as VM argument when Maven the Failsafe plugin is executed.
-						-->
-					<execution>
-						<id>pre-integration-test</id>
-						<phase>pre-integration-test</phase>
-						<goals>
-							<goal>prepare-agent</goal>
-						</goals>
-						<configuration>
-							<!-- Sets the path to the file which contains the execution data. -->
-							<destFile>${jacoco.it.execution.data.file}</destFile>
-							<!--
-									Sets the name of the property containing the settings
-									for JaCoCo runtime agent.
-								-->
-							<propertyName>failsafeArgLine</propertyName>
-						</configuration>
-					</execution>
-					<!--
-							Ensures that the code coverage report for integration tests after
-							integration tests have been run.
-						-->
-					<execution>
-						<id>post-integration-test</id>
-						<phase>post-integration-test</phase>
-						<goals>
-							<goal>report</goal>
-						</goals>
-						<configuration>
-							<!-- Sets the path to the file which contains the execution data. -->
-							<dataFile>${jacoco.it.execution.data.file}</dataFile>
-							<!-- Sets the output directory for the code coverage report. -->
-							<outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
-						</configuration>
-					</execution>
+                                <requireMavenVersion>
+                                    <version>[3.2.1,)</version>
+                                </requireMavenVersion>
+                                <requireJavaVersion>
+                                    <version>[1.11,)</version>
+                                </requireJavaVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>ianal-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>3.1.0</version>
+                <configuration>
+                    <filesets>
+                        <fileset>
+                            <directory>.</directory>
+                            <includes>
+                                <include>*.ddl</include>
+                                <include>*.log</include>
+                            </includes>
 
-				</executions>
-			</plugin>
+                        </fileset>
+                    </filesets>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <executions>
+                    <!--
+                            Prepares the property pointing to the JaCoCo runtime agent which
+                            is passed as VM argument when Maven the Surefire plugin is executed.
+                    -->
+                    <execution>
+                        <id>pre-unit-test</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                        <configuration>
+                            <!-- Sets the path to the file which contains the execution data. -->
+                            <destFile>${jacoco.ut.execution.data.file}</destFile>
+                            <!--
+                                    Sets the name of the property containing the settings
+                                    for JaCoCo runtime agent.
+                            -->
+                            <propertyName>surefireArgLine</propertyName>
+                        </configuration>
+                    </execution>
+                    <!--
+                            Ensures that the code coverage report for unit tests is created after
+                            unit tests have been run.
+                    -->
+                    <execution>
+                        <id>post-unit-test</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                        <configuration>
+                            <!-- Sets the path to the file which contains the execution data. -->
+                            <dataFile>${jacoco.ut.execution.data.file}</dataFile>
+                            <!-- Sets the output directory for the code coverage report. -->
+                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <!--
+                            Prepares the property pointing to the JaCoCo runtime agent which
+                            is passed as VM argument when Maven the Failsafe plugin is executed.
+                    -->
+                    <execution>
+                        <id>pre-integration-test</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                        <configuration>
+                            <!-- Sets the path to the file which contains the execution data. -->
+                            <destFile>${jacoco.it.execution.data.file}</destFile>
+                            <!--
+                                    Sets the name of the property containing the settings
+                                    for JaCoCo runtime agent.
+                            -->
+                            <propertyName>failsafeArgLine</propertyName>
+                        </configuration>
+                    </execution>
+                    <!--
+                            Ensures that the code coverage report for integration tests after
+                            integration tests have been run.
+                    -->
+                    <execution>
+                        <id>post-integration-test</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                        <configuration>
+                            <!-- Sets the path to the file which contains the execution data. -->
+                            <dataFile>${jacoco.it.execution.data.file}</dataFile>
+                            <!-- Sets the output directory for the code coverage report. -->
+                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+                        </configuration>
+                    </execution>
 
-			<!-- Used for unit tests -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.19.1</version>
-				<configuration>
-					<!-- Sets the VM argument line used when unit tests are run. -->
-					<argLine>${surefireArgLine}</argLine>
-					<!-- Skips unit tests if the value of skip.unit.tests property is true -->
-					<skipTests>${skipTests}</skipTests>
-					<!-- Excludes integration tests when unit tests are run. -->
-                                        <skipAfterFailureCount>1</skipAfterFailureCount>
+                </executions>
+            </plugin>
 
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-	<reporting>
-		<plugins>
-			<plugin>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.2.0</version>
-				<configuration>
-					<doclint>none</doclint>
-				</configuration>
-				
-				
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-project-info-reports-plugin</artifactId>
-				<version>2.9</version>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>jdepend-maven-plugin</artifactId>
-				<version>2.0</version>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jxr-plugin</artifactId>
-				<version>2.5</version>
-			</plugin>
-			<!--<plugin> this generates a large file that's of little value
+            <!-- Used for unit tests -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.19.1</version>
+                <configuration>
+                    <!-- Sets the VM argument line used when unit tests are run.   -verbose:class-->
+                    <argLine>${surefireArgLine}</argLine>
+                    <!-- Skips unit tests if the value of skip.unit.tests property is true -->
+                    <skipTests>${skipTests}</skipTests>
+                    <!-- Excludes integration tests when unit tests are run. -->
+                    <skipAfterFailureCount>1</skipAfterFailureCount>
+                    <trimStackTrace>false</trimStackTrace>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <reporting>
+        <plugins>
+            <plugin>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <doclint>none</doclint>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <version>2.9</version>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jdepend-maven-plugin</artifactId>
+                <version>2.0</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jxr-plugin</artifactId>
+                <version>2.5</version>
+            </plugin>
+            <!--<plugin> this generates a large file that's of little value
                 <groupId>org.apache.rat</groupId>
                 <artifactId>apache-rat-plugin</artifactId>
                 <version>0.11</version>
             </plugin>-->
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>findbugs-maven-plugin</artifactId>
-				<version>3.0.5</version>
-				<configuration>
-					<xmlOutput>true</xmlOutput>
-					<!-- Optional directory to put findbugs xdoc xml report -->
-					<xmlOutputDirectory>target/site</xmlOutputDirectory>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-changes-plugin</artifactId>
-				<version>2.12.1</version>
-				<reportSets>
-					<reportSet>
-						<reports>
-							<report>jira-report</report>
-						</reports>
-					</reportSet>
-				</reportSets>
-			</plugin>
-			<!--
-			  great plugin, but takes a long time to run
             <plugin>
-                <groupId>org.owasp</groupId>
-                <artifactId>dependency-check-maven</artifactId>
-                <version>1.4.5</version>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>findbugs-maven-plugin</artifactId>
+                <version>3.0.5</version>
+                <configuration>
+                    <xmlOutput>true</xmlOutput>
+                    <!-- Optional directory to put findbugs xdoc xml report -->
+                    <xmlOutputDirectory>target/site</xmlOutputDirectory>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-changes-plugin</artifactId>
+                <version>2.12.1</version>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>jira-report</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+            <!--
+             great plugin, but takes a long time to run
+<plugin>
+   <groupId>org.owasp</groupId>
+   <artifactId>dependency-check-maven</artifactId>
+   <version>1.4.5</version>
+   <reportSets>
+       <reportSet>
+           <reports>
+               <report>aggregate</report>
+           </reports>
+       </reportSet>
+   </reportSets>
+</plugin>
+            -->
+            <plugin>
+                <groupId>com.github.spyhunter99</groupId>
+                <artifactId>jacoco-report-plugin</artifactId>
+                <version>1.0.3</version>
                 <reportSets>
                     <reportSet>
                         <reports>
-                            <report>aggregate</report>
+                            <report>jacoco-aggregate</report>
                         </reports>
                     </reportSet>
                 </reportSets>
             </plugin>
-			 -->
-			<plugin>
-				<groupId>com.github.spyhunter99</groupId>
-				<artifactId>jacoco-report-plugin</artifactId>
-				<version>1.0.3</version>
-				<reportSets>
-					<reportSet>
-						<reports>
-							<report>jacoco-aggregate</report>
-						</reports>
-					</reportSet>
-				</reportSets>
-			</plugin>
-			 <plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>findbugs-maven-plugin</artifactId>
-				<version>3.0.5</version>
-			  </plugin>
-			<plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>findbugs-maven-plugin</artifactId>
+                <version>3.0.5</version>
+            </plugin>
+            <plugin>
                 <groupId>com.github.spyhunter99</groupId>
                 <artifactId>findbugs-report-plugin</artifactId>
                 <version>1.0.0</version>
@@ -565,549 +558,549 @@ under the License.
                     </reportSet>
                 </reportSets>
             </plugin>
-		</plugins>
-	</reporting>
-	<modules>
-		<module>uddi-ws</module>
-		<module>uddi-tck-base</module>
-		<module>juddi-client</module>
-		<module>juddi-client-cli</module>
-		<module>uddi-migration-tool</module>
-		<module>juddi-core</module>
-		<module>juddi-rest-cxf</module>
-		<module>juddi-core-openjpa</module>
-		<module>juddiv3-war</module>
-		<module>juddiv3-war-repl</module>
-		<module>juddi-examples</module>
-		<module>juddi-gui-dsig</module>
-		<module>juddi-gui</module>
-		<module>juddi-tomcat</module>
-	</modules>
-	<distributionManagement>
-		<site>
-			<id>website</id>
-			<url>scpexe://people.apache.org/www/juddi.apache.org/</url>
-		</site>
-	</distributionManagement>
-	<dependencies>
-		<!-- these dependencies apply to all subject projects -->
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging-api</artifactId>
-		</dependency>
-	</dependencies>
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.easymock</groupId>
-				<artifactId>easymock</artifactId>
-				<version>2.0</version>
+        </plugins>
+    </reporting>
+    <modules>
+        <module>uddi-ws</module>
+        <module>uddi-tck-base</module>
+        <module>juddi-client</module>
+        <module>juddi-client-cli</module>
+        <module>uddi-migration-tool</module>
+        <module>juddi-core</module>
+        <module>juddi-rest-cxf</module>
+        <module>juddi-core-openjpa</module>
+        <module>juddiv3-war</module>
+        <module>juddiv3-war-repl</module>
+        <module>juddi-examples</module>
+        <module>juddi-gui</module>
+        <module>juddi-tomcat</module>
+        <module>uddi-tck</module>
+    </modules>
+    <distributionManagement>
+        <site>
+            <id>website</id>
+            <url>scpexe://people.apache.org/www/juddi.apache.org/</url>
+        </site>
+    </distributionManagement>
+    <dependencies>
+        <!-- these dependencies apply to all subject projects -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging-api</artifactId>
+        </dependency>
+    </dependencies>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.easymock</groupId>
+                <artifactId>easymock</artifactId>
+                <version>2.0</version>
 
-			</dependency>
-			<dependency>
-				<groupId>dumbster</groupId>
-				<artifactId>dumbster</artifactId>
-				<version>1.5</version>
-			</dependency>
-			<dependency>
-				<groupId>commons-net</groupId>
-				<artifactId>commons-net</artifactId>
-				<version>3.3</version>
-			</dependency>
-			<dependency>
-				<groupId>javax.mail</groupId>
-				<artifactId>mail</artifactId>
-				<version>1.4.7</version>
-			</dependency>
+            </dependency>
+            <dependency>
+                <groupId>dumbster</groupId>
+                <artifactId>dumbster</artifactId>
+                <version>1.5</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-net</groupId>
+                <artifactId>commons-net</artifactId>
+                <version>3.3</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.mail</groupId>
+                <artifactId>mail</artifactId>
+                <version>1.4.7</version>
+            </dependency>
 
-			<dependency>
-				<groupId>org.apache.commons</groupId>
-				<artifactId>commons-email</artifactId>
-				<version>1.3.2</version>
-			</dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-email</artifactId>
+                <version>1.3.2</version>
+            </dependency>
 
-			<dependency>
-				<!-- Entry needed to enable jdocbook unzipping -->
-				<groupId>org.jboss.maven.plugins</groupId>
-				<artifactId>maven-jdocbook-plugin</artifactId>
-				<version>2.3.10</version>
-			</dependency>
+            <dependency>
+                <!-- Entry needed to enable jdocbook unzipping -->
+                <groupId>org.jboss.maven.plugins</groupId>
+                <artifactId>maven-jdocbook-plugin</artifactId>
+                <version>2.3.10</version>
+            </dependency>
 
-			<dependency>
-				<groupId>org.hibernate.javax.persistence</groupId>
-				<artifactId>hibernate-jpa-2.1-api</artifactId>
-				<version>1.0.0.Final</version>
-			</dependency>
-			<dependency>
-				<groupId>commons-codec</groupId>
-				<artifactId>commons-codec</artifactId>
-				<version>1.10</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.geronimo.specs</groupId>
-				<artifactId>geronimo-jta_1.1_spec</artifactId>
-				<version>1.1.1</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.geronimo.specs</groupId>
-				<artifactId>geronimo-jaxrs_1.1_spec</artifactId>
-				<version>1.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.geronimo.specs</groupId>
-				<artifactId>geronimo-jms_1.1_spec</artifactId>
-				<version>1.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.qpid</groupId>
-				<artifactId>qpid-client</artifactId>
-				<version>0.24</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.qpid</groupId>
-				<artifactId>qpid-amqp-1-0-client-jms</artifactId>
-				<version>0.24</version>
-			</dependency>
-			<dependency>
-				<groupId>javax.servlet</groupId>
-				<artifactId>servlet-api</artifactId>
-				<version>2.5</version>
+            <dependency>
+                <groupId>org.hibernate.javax.persistence</groupId>
+                <artifactId>hibernate-jpa-2.1-api</artifactId>
+                <version>1.0.0.Final</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-codec</groupId>
+                <artifactId>commons-codec</artifactId>
+                <version>1.15</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-jta_1.1_spec</artifactId>
+                <version>1.1.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-jaxrs_1.1_spec</artifactId>
+                <version>1.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-jms_1.1_spec</artifactId>
+                <version>1.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.qpid</groupId>
+                <artifactId>qpid-client</artifactId>
+                <version>6.4.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.qpid</groupId>
+                <artifactId>qpid-amqp-1-0-client-jms</artifactId>
+                <version>0.32</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.servlet</groupId>
+                <artifactId>servlet-api</artifactId>
+                <version>2.5</version>
 
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.security</groupId>
-				<artifactId>jboss-security-spi</artifactId>
-				<version>2.0.1.GA</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.javaee</groupId>
-				<artifactId>jboss-jaspi-api</artifactId>
-				<version>1.0.0.GA</version>
-			</dependency>
-			<dependency>
-				<groupId>javax.jmdns</groupId>
-				<artifactId>jmdns</artifactId>
-				<version>3.4.1</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jgroups</groupId>
-				<artifactId>jgroups</artifactId>
-				<version>3.4.1.Final</version>
-			</dependency>
-			<!-- a lorem ipsum generator MIT license-->
-			<dependency>
-				<groupId>de.sven-jacobs</groupId>
-				<artifactId>loremipsum</artifactId>
-				<version>1.0</version>
-			</dependency>
-			<dependency>
-				<groupId>commons-cli</groupId>
-				<artifactId>commons-cli</artifactId>
-				<version>1.3.1</version>
-			</dependency>
-			<dependency>
-				<groupId>junit</groupId>
-				<artifactId>junit</artifactId>
-				<version>4.12</version>
-			</dependency>
-			<dependency>
-				<groupId>commons-logging</groupId>
-				<artifactId>commons-logging-api</artifactId>
-				<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>
-			</dependency>
-			<dependency>
-				<groupId>mysql</groupId>
-				<artifactId>mysql-connector-java</artifactId>
-				<version>6.0.5</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.derby</groupId>
-				<artifactId>derby</artifactId>
-				<version>10.10.1.1</version>
-			</dependency>
-			<dependency>
-				<groupId>org.postgresql</groupId>
-				<artifactId>postgresql</artifactId>
-				<version>9.4.1212</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.geronimo.javamail</groupId>
-				<artifactId>geronimo-javamail_1.4_mail</artifactId>
-				<version>1.8.4</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.httpcomponents</groupId>
-				<artifactId>httpclient</artifactId>
-				<version>4.5.2</version>
-			</dependency>
-			<dependency>
-				<groupId>org.json</groupId>
-				<artifactId>json</artifactId>
-				<version>20090211</version>
-			</dependency>
-			<dependency>
-				<groupId>log4j</groupId>
-				<artifactId>log4j</artifactId>
-				<version>1.2.17</version>
-			</dependency>
-			<dependency>
-				<groupId>javax.persistence</groupId>
-				<artifactId>persistence-api</artifactId>
-				<version>1.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.security</groupId>
+                <artifactId>jboss-security-spi</artifactId>
+                <version>2.0.1.GA</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.javaee</groupId>
+                <artifactId>jboss-jaspi-api</artifactId>
+                <version>1.0.0.GA</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.jmdns</groupId>
+                <artifactId>jmdns</artifactId>
+                <version>3.4.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jgroups</groupId>
+                <artifactId>jgroups</artifactId>
+                <version>5.2.0.Final</version>
+            </dependency>
+            <!-- a lorem ipsum generator MIT license-->
+            <dependency>
+                <groupId>de.sven-jacobs</groupId>
+                <artifactId>loremipsum</artifactId>
+                <version>1.0</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-cli</groupId>
+                <artifactId>commons-cli</artifactId>
+                <version>1.5.0</version>
+            </dependency>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>4.13.2</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging-api</artifactId>
+                <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>
+            </dependency>
+            <dependency>
+                <groupId>mysql</groupId>
+                <artifactId>mysql-connector-java</artifactId>
+                <version>8.0.28</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.derby</groupId>
+                <artifactId>derby</artifactId>
+                <version>10.10.1.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.postgresql</groupId>
+                <artifactId>postgresql</artifactId>
+                <version>42.3.3</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.javamail</groupId>
+                <artifactId>geronimo-javamail_1.4_mail</artifactId>
+                <version>1.8.4</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpclient</artifactId>
+                <version>4.5.13</version>
+            </dependency>
+            <dependency>
+                <groupId>org.json</groupId>
+                <artifactId>json</artifactId>
+                <version>20211205</version>
+            </dependency>
+            <dependency>
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
+                <version>1.2.17</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.persistence</groupId>
+                <artifactId>persistence-api</artifactId>
+                <version>1.0.2</version>
 
-			</dependency>
-			<dependency>
-				<groupId>cglib</groupId>
-				<artifactId>cglib-nodep</artifactId>
-				<version>2.1_3</version>
+            </dependency>
+            <dependency>
+                <groupId>cglib</groupId>
+                <artifactId>cglib-nodep</artifactId>
+                <version>2.1_3</version>
 
-			</dependency>
+            </dependency>
 		
-			<dependency>
-				<groupId>org.hibernate</groupId>
-				<artifactId>hibernate-core</artifactId>
-				<version>5.4.18.Final</version>
+            <dependency>
+                <groupId>org.hibernate</groupId>
+                <artifactId>hibernate-core</artifactId>
+                <version>5.4.18.Final</version>
 
-			</dependency>
-			<dependency>
-				<groupId>org.hibernate</groupId>
-				<artifactId>hibernate-entitymanager</artifactId>
-				<version>5.4.18.Final</version>
+            </dependency>
+            <dependency>
+                <groupId>org.hibernate</groupId>
+                <artifactId>hibernate-entitymanager</artifactId>
+                <version>5.4.18.Final</version>
 
-			</dependency>
+            </dependency>
 
-			<dependency>
-				<groupId>org.apache.axis2</groupId>
-				<artifactId>axis2</artifactId>
-				<version>1.6.2</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.axis2</groupId>
-				<artifactId>axis2-jaxws</artifactId>
-				<version>1.6.2</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.axis2</groupId>
-				<artifactId>axis2-transport-http</artifactId>
-				<version>1.6.2</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.axis2</groupId>
-				<artifactId>axis2-transport-local</artifactId>
-				<version>1.6.2</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.xmlbeans</groupId>
-				<artifactId>xmlbeans</artifactId>
-				<version>2.4.0</version>
-			</dependency>
+            <dependency>
+                <groupId>org.apache.axis2</groupId>
+                <artifactId>axis2</artifactId>
+                <version>1.8.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.axis2</groupId>
+                <artifactId>axis2-jaxws</artifactId>
+                <version>1.8.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.axis2</groupId>
+                <artifactId>axis2-transport-http</artifactId>
+                <version>1.8.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.axis2</groupId>
+                <artifactId>axis2-transport-local</artifactId>
+                <version>1.8.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.xmlbeans</groupId>
+                <artifactId>xmlbeans</artifactId>
+                <version>5.0.3</version>
+            </dependency>
 
-			<dependency>
-				<groupId>org.codehaus.jettison</groupId>
-				<artifactId>jettison</artifactId>
-				<version>1.3.4</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>
+            <dependency>
+                <groupId>org.codehaus.jettison</groupId>
+                <artifactId>jettison</artifactId>
+                <version>1.3.4</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.12.0</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
-	<repositories>
-		<repository>
-			<id>apache.nexus</id>
-			<name>Apache NEXUS Maven 2 Repository</name>
-			<url>https://repository.apache.org/content/repositories/releases/</url>
-			<layout>default</layout>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>jboss</id>
-			<name>JBoss Repository</name>
-			<url>https://repository.jboss.org/nexus/content/groups/public</url>
-			<layout>default</layout>
-		</repository>
+    <repositories>
+        <repository>
+            <id>apache.nexus</id>
+            <name>Apache NEXUS Maven 2 Repository</name>
+            <url>https://repository.apache.org/content/repositories/releases/</url>
+            <layout>default</layout>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>jboss</id>
+            <name>JBoss Repository</name>
+            <url>https://repository.jboss.org/nexus/content/groups/public</url>
+            <layout>default</layout>
+        </repository>
 
-		<repository>
-			<id>central</id>
-			<name>Maven Central Repository</name>
-			<url>https://repo1.maven.org/maven2</url>
-			<layout>default</layout>
-		</repository>
+        <repository>
+            <id>central</id>
+            <name>Maven Central Repository</name>
+            <url>https://repo1.maven.org/maven2</url>
+            <layout>default</layout>
+        </repository>
                 
-                <repository>
-			<id>central1</id>
-			<name>Maven Central Repository</name>
-			<url>https://repo.maven.org/maven2</url>
-			<layout>default</layout>
-		</repository>
-		<repository>
-			<id>jboss3</id>
-			<name>JBoss 3rd Party</name>
-			<url>https://repository.jboss.org/nexus/content/repositories/thirdparty-releases/</url>
-			<layout>default</layout>
-		</repository>
-	</repositories>
+   
+        <repository>
+            <id>jboss3</id>
+            <name>JBoss 3rd Party</name>
+            <url>https://repository.jboss.org/nexus/content/repositories/thirdparty-releases/</url>
+            <layout>default</layout>
+        </repository>
+    </repositories>
 
 
-	<profiles>
-            <profile>
-                <id>prepare-site</id>
-                <activation>
-                    <file>
-                        <exists>src/site/site.xml</exists>
-                    </file>
-                </activation>
-                <build>
-                    <plugins>
-                         <plugin>
-                                <groupId>org.apache.maven.plugins</groupId>
-                                <artifactId>maven-antrun-plugin</artifactId>
-                                <dependencies>
-                                    <!-- force the juddi docs module to build -->
-                                    <dependency>
-                                        <groupId>org.apache.juddi.juddi-docs</groupId>
-                                        <artifactId>juddi-docs</artifactId>
-                                        <version>${project.version}</version>
-										<type>pom</type>
-                                    </dependency>
+    <profiles>
+        <profile>
+            <id>prepare-site</id>
+            <activation>
+                <file>
+                    <exists>src/site/site.xml</exists>
+                </file>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <dependencies>
+                            <!-- force the juddi docs module to build -->
+                            <dependency>
+                                <groupId>org.apache.juddi.juddi-docs</groupId>
+                                <artifactId>juddi-docs</artifactId>
+                                <version>${project.version}</version>
+                                <type>pom</type>
+                            </dependency>
                                                                         
-                                </dependencies>
-                                <executions>
-                                    <execution>
-                                      <phase>site</phase>
-                                      <configuration>
-                                        <target>
+                        </dependencies>
+                        <executions>
+                            <execution>
+                                <phase>site</phase>
+                                <configuration>
+                                    <target>
                                             
                                             
-                                            <copy todir="target/site/docs/3.3/juddi-client-guide/">
-                                                <fileset dir="docs/asciidoc/ClientGuide/target/docbook/publish/en-US" />
-                                              </copy>
+                                        <copy todir="target/site/docs/3.3/juddi-client-guide/">
+                                            <fileset dir="docs/asciidoc/ClientGuide/target/docbook/publish/en-US" />
+                                        </copy>
                                               
-                                              <copy todir="target/site/docs/3.3/juddi-guide/">
-                                                <fileset dir="docs/asciidoc/Guide/target/docbook/publish/en-US" />
-                                              </copy>
+                                        <copy todir="target/site/docs/3.3/juddi-guide/">
+                                            <fileset dir="docs/asciidoc/Guide/target/docbook/publish/en-US" />
+                                        </copy>
                                             
-                                        </target>
-                                      </configuration>
-                                      <goals>
-                                        <goal>run</goal>
-                                      </goals>
-                                    </execution>
-                                  </executions>
-                        </plugin>
-                    </plugins>
-                </build>
-            </profile>
+                                    </target>
+                                </configuration>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
 	
 
-		<!-- inherit from the apache parent: release-profile -->
-		<profile>
-			<id>apache-release</id>
-			<modules>
-				<!-- adding these modules for release only -->
-				<module>uddi-tck</module>
-				<module>uddi-tck-runner</module>
-				<module>juddi-ddl-generator</module>
-				<module>docs</module>
-				<module>juddi-dist</module>
-				<module>uddi-client-dist</module>
-			</modules>
-		</profile>
+        <!-- inherit from the apache parent: release-profile -->
+        <profile>
+            <id>apache-release</id>
+            <modules>
+                <!-- adding these modules for release only -->
+                <module>uddi-tck</module>
+                <module>uddi-tck-runner</module>
+                <module>juddi-ddl-generator</module>
+                <module>docs</module>
+                <module>juddi-dist</module>
+                <module>uddi-client-dist</module>
+            </modules>
+        </profile>
 
-		<!-- same as the apache-release minus signing. CI should use this -->
-		<profile>
-			<id>dist</id>
-			<modules>
-				<!-- adding these module for dist only -->
-				<module>uddi-tck</module>
-				<module>uddi-tck-runner</module>
-				<module>juddi-ddl-generator</module>
-				<module>docs</module>
-				<module>juddi-dist</module>
-				<module>uddi-client-dist</module>
-			</modules>
-			<build>
-				<plugins>
-					<!-- Create a source-release artifact that contains the fully buildable 
+        <!-- same as the apache-release minus signing. CI should use this -->
+        <profile>
+            <id>dist</id>
+            <modules>
+                <!-- adding these module for dist only -->
+                <module>uddi-tck</module>
+                <module>uddi-tck-runner</module>
+                <module>juddi-ddl-generator</module>
+                <module>docs</module>
+                <module>juddi-dist</module>
+                <module>uddi-client-dist</module>
+            </modules>
+            <build>
+                <plugins>
+                    <!-- Create a source-release artifact that contains the fully buildable 
                     project directory source structure. This is the artifact which is the official 
                     subject of any release vote. -->
-					<plugin>
-						<artifactId>maven-assembly-plugin</artifactId>
-						<dependencies>
-							<dependency>
-								<groupId>org.apache.apache.resources</groupId>
-								<artifactId>apache-source-release-assembly-descriptor</artifactId>
-								<version>1.0.6</version>
-							</dependency>
-						</dependencies>
-						<executions>
-							<execution>
-								<id>source-release-assembly</id>
-								<phase>package</phase>
-								<goals>
-									<goal>single</goal>
-								</goals>
-								<configuration>
-									<runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
-									<descriptorRefs>
-										<descriptorRef>${sourceReleaseAssemblyDescriptor}</descriptorRef>
-									</descriptorRefs>
-									<tarLongFileFormat>gnu</tarLongFileFormat>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-					<!-- We want to deploy the artifact to a staging location for perusal -->
-					<plugin>
-						<inherited>true</inherited>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-deploy-plugin</artifactId>
-						<configuration>
-							<updateReleaseInfo>true</updateReleaseInfo>
-						</configuration>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-source-plugin</artifactId>
-						<version>3.0.1</version>
-						<executions>
-							<execution>
-								<id>attach-sources</id>
-								<goals>
-									<goal>jar</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-javadoc-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>attach-javadocs</id>
-								<goals>
-									<goal>jar</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.rat</groupId>
-						<artifactId>apache-rat-plugin</artifactId>
-						<configuration>
-							<excludes>
-								<exclude>**/*.nupkg</exclude>
-								<exclude>**/*.psd</exclude>
-								<exclude>**/*.ddl</exclude>
-								<exclude>Doxyfile</exclude>
-								<exclude>**/*log</exclude>
-								<exclude>*.log</exclude>
-								<exclude>qa/*.*</exclude>
-								<exclude>qa/**/*.*</exclude>
-								<exclude>juddi-client.net/packages/NUnit.2.6.2/NUnit.2.6.2.nuspec</exclude>
-								<exclude>juddi-client.net/clean.txt</exclude>
-								<exclude>juddi-client.net/input.txt</exclude>
-								<exclude>juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.mapping/wadl.xsd</exclude>
-								<exclude>juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.mapping/wsdl.xsd</exclude>
-								<exclude>juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.mapping/XMLSchema.xsd</exclude>
-								<exclude>juddi-client.net/packages/NUnit.2.6.2/lib/nunit.framework.xml</exclude>
-								<exclude>juddi-client.net/example/AspnetServiceLifeCycle/global.asa</exclude>
-								<!-- uddi-ws-->
-								<exclude>src/main/resources/inquire_v2.wsdl</exclude>
-								<exclude>src/main/resources/publish_v2.wsdl</exclude>
-								<exclude>src/main/resources/uddi_v2.xsd</exclude>
-								<exclude>src/main/resources/uddi_v2custody.xsd</exclude>
-								<exclude>src/main/resources/uddi_v2replication.xsd</exclude>
-								<exclude>**/datatypes.dtd</exclude>
-								<exclude>**/xml.xsd</exclude>
-								<exclude>**/*.pfx</exclude>
-								<exclude>**/XMLSchema.dtd</exclude>
-								<exclude>**/xmldsig-core-schema.xsd</exclude>
+                    <plugin>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.apache.apache.resources</groupId>
+                                <artifactId>apache-source-release-assembly-descriptor</artifactId>
+                                <version>1.0.6</version>
+                            </dependency>
+                        </dependencies>
+                        <executions>
+                            <execution>
+                                <id>source-release-assembly</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+                                    <descriptorRefs>
+                                        <descriptorRef>${sourceReleaseAssemblyDescriptor}</descriptorRef>
+                                    </descriptorRefs>
+                                    <tarLongFileFormat>gnu</tarLongFileFormat>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <!-- We want to deploy the artifact to a staging location for perusal -->
+                    <plugin>
+                        <inherited>true</inherited>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-deploy-plugin</artifactId>
+                        <configuration>
+                            <updateReleaseInfo>true</updateReleaseInfo>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <version>3.0.1</version>
+                        <executions>
+                            <execution>
+                                <id>attach-sources</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <configuration>
+                            <doclint>none</doclint>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>attach-javadocs</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.rat</groupId>
+                        <artifactId>apache-rat-plugin</artifactId>
+                        <configuration>
+                            <excludes>
+                                <exclude>**/.github/*.*</exclude>
+                                <exclude>**/.github/**/*.*</exclude>
+                                <exclude>**/*.nupkg</exclude>
+                                <exclude>**/*.psd</exclude>
+                                <exclude>**/*.ddl</exclude>
+                                <exclude>Doxyfile</exclude>
+                                <exclude>**/*log</exclude>
+                                <exclude>*.log</exclude>
+                                <exclude>qa/*.*</exclude>
+                                <exclude>qa/**/*.*</exclude>
+                                <exclude>juddi-client.net/packages/NUnit.2.6.2/NUnit.2.6.2.nuspec</exclude>
+                                <exclude>juddi-client.net/clean.txt</exclude>
+                                <exclude>juddi-client.net/input.txt</exclude>
+                                <exclude>juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.mapping/wadl.xsd</exclude>
+                                <exclude>juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.mapping/wsdl.xsd</exclude>
+                                <exclude>juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.mapping/XMLSchema.xsd</exclude>
+                                <exclude>juddi-client.net/packages/NUnit.2.6.2/lib/nunit.framework.xml</exclude>
+                                <exclude>juddi-client.net/example/AspnetServiceLifeCycle/global.asa</exclude>
+                                <!-- uddi-ws-->
+                                <exclude>src/main/resources/inquire_v2.wsdl</exclude>
+                                <exclude>src/main/resources/publish_v2.wsdl</exclude>
+                                <exclude>src/main/resources/uddi_v2.xsd</exclude>
+                                <exclude>src/main/resources/uddi_v2custody.xsd</exclude>
+                                <exclude>src/main/resources/uddi_v2replication.xsd</exclude>
+                                <exclude>**/datatypes.dtd</exclude>
+                                <exclude>**/xml.xsd</exclude>
+                                <exclude>**/*.pfx</exclude>
+                                <exclude>**/XMLSchema.dtd</exclude>
+                                <exclude>**/xmldsig-core-schema.xsd</exclude>
 
-								<!-- TCK BASE -->
-								<exclude>src/main/resources/uddi_data/bpel/riftsaw/bpel-technote.bpel</exclude>
-								<exclude>src/main/resources/uddi_data/bpel/riftsaw/bpel-technote.wsdl</exclude>
-								<!-- juddi-client-->
-								<exclude>src/test/resources/bpel/bpel-technote.bpel</exclude>
-								<exclude>src/test/resources/bpel/bpel-technote.wsdl</exclude>
-								<exclude>**/*.key</exclude>
-								<exclude>**/log4j.xml</exclude>
+                                <!-- TCK BASE -->
+                                <exclude>src/main/resources/uddi_data/bpel/riftsaw/bpel-technote.bpel</exclude>
+                                <exclude>src/main/resources/uddi_data/bpel/riftsaw/bpel-technote.wsdl</exclude>
+                                <!-- juddi-client-->
+                                <exclude>src/test/resources/bpel/bpel-technote.bpel</exclude>
+                                <exclude>src/test/resources/bpel/bpel-technote.wsdl</exclude>
+                                <exclude>**/*.key</exclude>
+                                <exclude>**/log4j.xml</exclude>
 
-								<exclude>**/spring-beans.xsd</exclude>
-								<exclude>**/spring-util.xsd</exclude>
-								<exclude>**/spring-beans.xsd</exclude>
+                                <exclude>**/spring-beans.xsd</exclude>
+                                <exclude>**/spring-util.xsd</exclude>
+                                <exclude>**/spring-beans.xsd</exclude>
 
-								<exclude>**/font-awesome*</exclude>
-								<exclude>**/jquery*.css</exclude>
-								<exclude>**/*.svg</exclude>
-								<exclude>**/*.txt</exclude>
-								<exclude>**/jquery*.js</exclude>
-								<exclude>**/log4j.properties</exclude>
-								<exclude>**/log4j.xml</exclude>
-								<exclude>**/*.sh</exclude>
-								<exclude>**/*.bat</exclude>
-								<exclude>**/*.policy</exclude>
-								<exclude>**/*.md</exclude>
-								<exclude>**/*.form</exclude>
-								<exclude>**/jboss-deployment-structure.xml</exclude>
-								<exclude>**/MANIFEST.MF</exclude>
-								<exclude>**/license/*.*</exclude>
-								<exclude>src/main/resources/schemas/orm_1_0.xsd</exclude>
-								<exclude>src/main/resources/schemas/persistence_1_0.xsd</exclude>
-								<exclude>src/main/resources/spring-beans.xsd.xml</exclude>
+                                <exclude>**/font-awesome*</exclude>
+                                <exclude>**/jquery*.css</exclude>
+                                <exclude>**/*.svg</exclude>
+                                <exclude>**/*.txt</exclude>
+                                <exclude>**/jquery*.js</exclude>
+                                <exclude>**/log4j.properties</exclude>
+                                <exclude>**/log4j.xml</exclude>
+                                <exclude>**/*.sh</exclude>
+                                <exclude>**/*.bat</exclude>
+                                <exclude>**/*.policy</exclude>
+                                <exclude>**/*.md</exclude>
+                                <exclude>**/*.form</exclude>
+                                <exclude>**/jboss-deployment-structure.xml</exclude>
+                                <exclude>**/MANIFEST.MF</exclude>
+                                <exclude>**/license/*.*</exclude>
+                                <exclude>src/main/resources/schemas/orm_1_0.xsd</exclude>
+                                <exclude>src/main/resources/schemas/persistence_1_0.xsd</exclude>
+                                <exclude>src/main/resources/spring-beans.xsd.xml</exclude>
 
-								<exclude>**/bootstrap-timepicker.*</exclude>
-								<exclude>**/test/selenium/*.*</exclude>
-								<exclude>**/*.properties</exclude>
-								<exclude>**/*.asciidoc</exclude>
-								<exclude>**/TermsOfUse.txt</exclude>
-								<exclude>**/pref-rpt*.txt</exclude>
-								<exclude>**/asciidoctor.css</exclude>
-								<exclude>**/Guardfile</exclude>
-								<exclude>**/target/**/*</exclude>
-								<exclude>**/nb-configuration.xml</exclude>
-								<exclude>.travis.yml</exclude>
-								<exclude>**/*.mwb</exclude>
+                                <exclude>**/bootstrap-timepicker.*</exclude>
+                                <exclude>**/test/selenium/*.*</exclude>
+                                <exclude>**/*.properties</exclude>
+                                <exclude>**/*.asciidoc</exclude>
+                                <exclude>**/TermsOfUse.txt</exclude>
+                                <exclude>**/pref-rpt*.txt</exclude>
+                                <exclude>**/asciidoctor.css</exclude>
+                                <exclude>**/Guardfile</exclude>
+                                <exclude>**/target/**/*</exclude>
+                                <exclude>**/nb-configuration.xml</exclude>
+                                <exclude>.travis.yml</exclude>
+                                <exclude>**/*.mwb</exclude>
 
-							</excludes>
-							<consoleOutput>true</consoleOutput>
-						</configuration>
-						<executions>
-							<execution>
-								<phase>verify</phase>
-								<goals>
-									<goal>check</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
+                            </excludes>
+                            <consoleOutput>true</consoleOutput>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>check</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
\ No newline at end of file
diff --git a/src/site/site.xml b/src/site/site.xml
index 670de8e..716edbc 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -32,7 +32,7 @@
 	<skin>
 		<groupId>org.apache.maven.skins</groupId>
 		<artifactId>maven-fluido-skin</artifactId>
-		<version>1.6</version>
+		<version>1.10.0</version>
 	</skin>
 
 	<publishDate format="dd MMM yyyy" position="right"/>
diff --git a/uddi-client-dist/pom.xml b/uddi-client-dist/pom.xml
index 442a5e5..cccb132 100644
--- a/uddi-client-dist/pom.xml
+++ b/uddi-client-dist/pom.xml
@@ -54,13 +54,9 @@ language governing permissions and * limitations under the License. * */ -->
             <groupId>org.apache.juddi</groupId>
             <artifactId>uddi-migration-tool</artifactId>
             <version>${project.parent.version}</version>
-			<classifier>jar-with-dependencies</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.juddi</groupId>
-            <artifactId>juddi-gui-dsig</artifactId>
-            <version>${project.parent.version}</version>
+            <classifier>jar-with-dependencies</classifier>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.juddi</groupId>
             <artifactId>uddi-migration-tool</artifactId>
@@ -129,13 +125,7 @@ language governing permissions and * limitations under the License. * */ -->
             <type>jar</type>
             <classifier>test-sources</classifier>
         </dependency>
-        <dependency>
-            <groupId>org.apache.juddi</groupId>
-            <artifactId>juddi-gui-dsig</artifactId>
-            <version>${project.parent.version}</version>
-            <type>jar</type>
-            <classifier>sources</classifier>
-        </dependency>
+       
         <dependency>
             <groupId>org.apache.juddi</groupId>
             <artifactId>juddi-gui-war</artifactId>
@@ -192,13 +182,7 @@ language governing permissions and * limitations under the License. * */ -->
             <classifier>test-javadoc</classifier>
             <type>jar</type>
         </dependency>
-        <dependency>
-            <groupId>org.apache.juddi</groupId>
-            <artifactId>juddi-gui-dsig</artifactId>
-            <version>${project.parent.version}</version>
-            <type>jar</type>
-            <classifier>javadoc</classifier>
-        </dependency>
+       
         <dependency>
             <groupId>org.apache.juddi</groupId>
             <artifactId>juddi-gui-war</artifactId>
diff --git a/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSigningUtil.java b/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSigningUtil.java
index a70d520..2540dfe 100644
--- a/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSigningUtil.java
+++ b/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSigningUtil.java
@@ -66,13 +66,14 @@ public class TckSigningUtil {
     private static Reference initReference(XMLSignatureFactory fac) throws NoSuchAlgorithmException, InvalidAlgorithmParameterException {
         List transformers = new ArrayList();
         transformers.add(fac.newTransform(Transform.ENVELOPED, (TransformParameterSpec) null));
-        Reference ref = fac.newReference("", fac.newDigestMethod(DigestMethod.SHA1, null), transformers, null, null);
+        Reference ref = fac.newReference("", fac.newDigestMethod(DigestMethod.SHA256, null), transformers, null, null);
         return ref;
     }
 
     private static SignedInfo initSignedInfo(XMLSignatureFactory fac) throws Exception {
         Reference ref = initReference(fac);
-        SignedInfo si = fac.newSignedInfo(fac.newCanonicalizationMethod(CanonicalizationMethod.EXCLUSIVE, (C14NMethodParameterSpec) null), fac.newSignatureMethod(SignatureMethod.DSA_SHA1, null), Collections.singletonList(ref));
+        SignedInfo si = fac.newSignedInfo(fac.newCanonicalizationMethod(CanonicalizationMethod.EXCLUSIVE, 
+                (C14NMethodParameterSpec) null), fac.newSignatureMethod(SignatureMethod.DSA_SHA256, null), Collections.singletonList(ref));
         return si;
     }
 
diff --git a/uddi-tck/pom.xml b/uddi-tck/pom.xml
index af8473a..7cc7030 100644
--- a/uddi-tck/pom.xml
+++ b/uddi-tck/pom.xml
@@ -1,428 +1,428 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- * 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/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.apache.juddi</groupId>
-		<artifactId>juddi-parent</artifactId>
-		<version>3.3.11-SNAPSHOT</version>
-	</parent>
-	<artifactId>uddi-tck</artifactId>
-	<packaging>jar</packaging>
-	<name>UDDI TCK Tests</name>
-	<properties>
-	     <cargo.version>1.7.9</cargo.version>
-	</properties>
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.juddi</groupId>
-			<artifactId>uddi-ws</artifactId>
-			<version>${project.parent.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.juddi</groupId>
-			<artifactId>uddi-tck-base</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-tomcat</artifactId>
-			<version>${project.parent.version}</version>
-			<type>zip</type>
-			<scope>provided</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>org.apache.juddi</groupId>
-					<artifactId>juddi-core-openjpa</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<!--  for JAXWS
-		   running into JUDDI-451 for CXF
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-frontend-jaxws</artifactId>
-			<version>2.3.1</version>
-		</dependency>
-		-->
-		<!-- so using the SUN reference implementation for now -->
-		<dependency>
-			<groupId>com.sun.xml.ws</groupId>
-			<artifactId>jaxws-rt</artifactId>
-			<version>2.1.4</version>
-		</dependency>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.juddi</groupId>
+        <artifactId>juddi-parent</artifactId>
+        <version>3.3.11-SNAPSHOT</version>
+    </parent>
+    <artifactId>uddi-tck</artifactId>
+    <packaging>jar</packaging>
+    <name>UDDI TCK Tests</name>
+    <properties>
+        <cargo.version>1.9.10</cargo.version>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.juddi</groupId>
+            <artifactId>uddi-ws</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.juddi</groupId>
+            <artifactId>uddi-tck-base</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-tomcat</artifactId>
+            <version>${project.parent.version}</version>
+            <type>zip</type>
+            <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.juddi</groupId>
+                    <artifactId>juddi-core-openjpa</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!--  for JAXWS
+           running into JUDDI-451 for CXF
+        <dependency>
+                <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-rt-frontend-jaxws</artifactId>
+                <version>2.3.1</version>
+        </dependency>
+        -->
+        <!-- so using the SUN reference implementation for now -->
+        <dependency>
+            <groupId>com.sun.xml.ws</groupId>
+            <artifactId>jaxws-rt</artifactId>
+            <version>2.1.4</version>
+        </dependency>
 		
-		<!--   for RMI 
-		<dependency> <groupId>jboss</groupId>
-			<artifactId>jbossall-client</artifactId>
-			<version>4.2.2.GA</version>
-			<scope>test</scope>
-		</dependency>
-		-->
-		<dependency>
-		    <groupId>org.easymock</groupId>
-		    <artifactId>easymock</artifactId>
-		    <scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>dumbster</groupId>
-			<artifactId>dumbster</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>commons-net</groupId>
-			<artifactId>commons-net</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.mail</groupId>
-			<artifactId>mail</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>commons-codec</groupId>
-			<artifactId>commons-codec</artifactId>
-		</dependency>
-   		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-email</artifactId>
-		</dependency>
+        <!--   for RMI 
+        <dependency> <groupId>jboss</groupId>
+                <artifactId>jbossall-client</artifactId>
+                <version>4.2.2.GA</version>
+                <scope>test</scope>
+        </dependency>
+        -->
+        <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>dumbster</groupId>
+            <artifactId>dumbster</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-net</groupId>
+            <artifactId>commons-net</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-email</artifactId>
+        </dependency>
 					
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-			    <artifactId>maven-clean-plugin</artifactId>
-			    <configuration>
-			      <filesets>
-			        <fileset>
-			          <directory>.</directory>
-			          <includes>
-			            <include>pref-rpt-*.txt</include>
-			          </includes>
-			          <followSymlinks>false</followSymlinks>
-			        </fileset>
-			      </filesets>
-			    </configuration>
-			  </plugin>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-clean-plugin</artifactId>
+                <configuration>
+                    <filesets>
+                        <fileset>
+                            <directory>.</directory>
+                            <includes>
+                                <include>pref-rpt-*.txt</include>
+                            </includes>
+                            <followSymlinks>false</followSymlinks>
+                        </fileset>
+                    </filesets>
+                </configuration>
+            </plugin>
 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy</goal>
-						</goals>
-						<configuration>
-							<artifactItems>
-								<artifactItem>
-									<groupId>org.apache.juddi</groupId>
-									<artifactId>juddi-tomcat</artifactId>
-									<version>${project.parent.version}</version>
-									<type>zip</type>
-									<outputDirectory>${basedir}/target</outputDirectory>
-								</artifactItem>
-							</artifactItems>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>test</id>
-						<phase>pre-integration-test</phase>
-						<configuration>
-							<tasks>
-								<unzip dest="target" src="target/juddi-tomcat-${project.parent.version}.zip" />
-								<copy file="${basedir}/server.xml" todir="target/juddi-tomcat-${project.parent.version}/conf" overwrite="true" />
-								<copy file="${basedir}/log4j.properties" todir="target/juddi-tomcat-${project.parent.version}/webapps/juddiv3/WEB-INF/classes" overwrite="true" />
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.juddi</groupId>
+                                    <artifactId>juddi-tomcat</artifactId>
+                                    <version>${project.parent.version}</version>
+                                    <type>zip</type>
+                                    <outputDirectory>${basedir}/target</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>test</id>
+                        <phase>pre-integration-test</phase>
+                        <configuration>
+                            <target>
+                                <unzip dest="target" src="target/juddi-tomcat-${project.parent.version}.zip" />
+                                <copy file="${basedir}/server.xml" todir="target/juddi-tomcat-${project.parent.version}/conf" overwrite="true" />
+                                <copy file="${basedir}/log4j.properties" todir="target/juddi-tomcat-${project.parent.version}/webapps/juddiv3/WEB-INF/classes" overwrite="true" />
 
-								<unzip dest="target/node2" src="target/juddi-tomcat-${project.parent.version}.zip" />
-								<copy file="${basedir}/serverNode2.xml" tofile="target/node2/juddi-tomcat-${project.parent.version}/conf/server.xml" overwrite="true" />
-								<copy file="${basedir}/log4j.properties" todir="target/node2/juddi-tomcat-${project.parent.version}/webapps/juddiv3/WEB-INF/classes" overwrite="true" />
+                                <unzip dest="target/node2" src="target/juddi-tomcat-${project.parent.version}.zip" />
+                                <copy file="${basedir}/serverNode2.xml" tofile="target/node2/juddi-tomcat-${project.parent.version}/conf/server.xml" overwrite="true" />
+                                <copy file="${basedir}/log4j.properties" todir="target/node2/juddi-tomcat-${project.parent.version}/webapps/juddiv3/WEB-INF/classes" overwrite="true" />
 
-								<copy file="${basedir}/juddi_install_data_node2/root_BusinessEntity.xml" todir="target/node2/juddi-tomcat-${project.parent.version}/webapps/juddiv3/WEB-INF/classes/juddi_custom_install_data/" overwrite="true" />
-								<copy file="${basedir}/juddi_install_data_node2/root_Publisher.xml" todir="target/node2/juddi-tomcat-${project.parent.version}/webapps/juddiv3/WEB-INF/classes/juddi_custom_install_data/" overwrite="true" />
-								<copy file="${basedir}/juddi_install_data_node2/root_tModelKeyGen.xml" todir="target/node2/juddi-tomcat-${project.parent.version}/webapps/juddiv3/WEB-INF/classes/juddi_custom_install_data/" overwrite="true" />
-								<copy file="${basedir}/juddi_install_data_node2/UDDI_Publisher.xml" todir="target/node2/juddi-tomcat-${project.parent.version}/webapps/juddiv3/WEB-INF/classes/juddi_custom_install_data/" overwrite="true" />
-								<copy file="${basedir}/juddi_install_data_node2/UDDI_tModels.xml" todir="target/node2/juddi-tomcat-${project.parent.version}/webapps/juddiv3/WEB-INF/classes/juddi_custom_install_data/" overwrite="true" />
+                                <copy file="${basedir}/juddi_install_data_node2/root_BusinessEntity.xml" todir="target/node2/juddi-tomcat-${project.parent.version}/webapps/juddiv3/WEB-INF/classes/juddi_custom_install_data/" overwrite="true" />
+                                <copy file="${basedir}/juddi_install_data_node2/root_Publisher.xml" todir="target/node2/juddi-tomcat-${project.parent.version}/webapps/juddiv3/WEB-INF/classes/juddi_custom_install_data/" overwrite="true" />
+                                <copy file="${basedir}/juddi_install_data_node2/root_tModelKeyGen.xml" todir="target/node2/juddi-tomcat-${project.parent.version}/webapps/juddiv3/WEB-INF/classes/juddi_custom_install_data/" overwrite="true" />
+                                <copy file="${basedir}/juddi_install_data_node2/UDDI_Publisher.xml" todir="target/node2/juddi-tomcat-${project.parent.version}/webapps/juddiv3/WEB-INF/classes/juddi_custom_install_data/" overwrite="true" />
+                                <copy file="${basedir}/juddi_install_data_node2/UDDI_tModels.xml" todir="target/node2/juddi-tomcat-${project.parent.version}/webapps/juddiv3/WEB-INF/classes/juddi_custom_install_data/" overwrite="true" />
 
-								<copy file="${basedir}/context.xml" todir="target/node2/juddi-tomcat-${project.parent.version}/webapps/juddiv3/META-INF" overwrite="true" />
-								<copy file="${basedir}/context.xml" todir="target/node2/juddi-tomcat-${project.parent.version}/webapps/juddiv3replication/META-INF" overwrite="true" />
+                                <copy file="${basedir}/context.xml" todir="target/node2/juddi-tomcat-${project.parent.version}/webapps/juddiv3/META-INF" overwrite="true" />
+                                <copy file="${basedir}/context.xml" todir="target/node2/juddi-tomcat-${project.parent.version}/webapps/juddiv3replication/META-INF" overwrite="true" />
 
-								<copy file="${basedir}/uddiNode2.xml" tofile="target/node2/juddi-tomcat-${project.parent.version}/webapps/juddi-gui/WEB-INF/classes/META-INF/uddi.xml" overwrite="true" />
+                                <copy file="${basedir}/uddiNode2.xml" tofile="target/node2/juddi-tomcat-${project.parent.version}/webapps/juddi-gui/WEB-INF/classes/META-INF/uddi.xml" overwrite="true" />
 
-								<copy file="${basedir}/juddiv3Node2.xml" tofile="target/node2/juddi-tomcat-${project.parent.version}/webapps/juddiv3/WEB-INF/classes/juddiv3.xml" overwrite="true" />
+                                <copy file="${basedir}/juddiv3Node2.xml" tofile="target/node2/juddi-tomcat-${project.parent.version}/webapps/juddiv3/WEB-INF/classes/juddiv3.xml" overwrite="true" />
 
-								<copy file="${basedir}/juddiv3Node2.xml" tofile="target/node2/juddi-tomcat-${project.parent.version}/webapps/juddiv3replication/WEB-INF/classes/juddiv3.xml" overwrite="true" />
+                                <copy file="${basedir}/juddiv3Node2.xml" tofile="target/node2/juddi-tomcat-${project.parent.version}/webapps/juddiv3replication/WEB-INF/classes/juddiv3.xml" overwrite="true" />
 
 
 
-								<copy file="${basedir}/juddiv3Node1.xml" tofile="target/juddi-tomcat-${project.parent.version}/webapps/juddiv3/WEB-INF/classes/juddiv3.xml" overwrite="true" />
-								<copy file="${basedir}/juddiv3Node1.xml" tofile="target/juddi-tomcat-${project.parent.version}/webapps/juddiv3replication/WEB-INF/classes/juddiv3.xml" overwrite="true" />
+                                <copy file="${basedir}/juddiv3Node1.xml" tofile="target/juddi-tomcat-${project.parent.version}/webapps/juddiv3/WEB-INF/classes/juddiv3.xml" overwrite="true" />
+                                <copy file="${basedir}/juddiv3Node1.xml" tofile="target/juddi-tomcat-${project.parent.version}/webapps/juddiv3replication/WEB-INF/classes/juddiv3.xml" overwrite="true" />
 
 
 
 
 
-							</tasks>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.cargo</groupId>
-				<artifactId>cargo-maven2-plugin</artifactId>
-				<version>${cargo.version}</version>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.cargo</groupId>
+                <artifactId>cargo-maven3-plugin</artifactId>
+                <version>${cargo.version}</version>
 				
-				<executions>
-					<execution>
-						<id>start-container1</id>
-						<phase>pre-integration-test</phase>
-						<configuration>
-							<wait>false</wait>
-							<container>
-								<containerId>tomcat9x</containerId>
-								<home>${basedir}/target/juddi-tomcat-${project.parent.version}</home>
-							</container>
-							<configuration>
-								<type>existing</type>
-								<home>${project.build.directory}/juddi-tomcat-${project.parent.version}</home>
-								<properties>
-									<cargo.logging>high</cargo.logging>
-									<cargo.hostname>localhost</cargo.hostname>
-									<cargo.servlet.port>8880</cargo.servlet.port>
-									<cargo.jvmargs>-Xms256m -Xmx256m -XX:MaxPermSize=256M -Djava.endorsed.dirs=${basedir}/target/juddi-tomcat-${project.parent.version}/endorsed -Djavax.net.ssl.keyStore=${basedir}/../juddi-tomcat/keystore.jks -Djavax.net.ssl.keyStorePassword=password -Djavax.net.ssl.trustStore=${basedir}/../juddi-tomcat/truststore.jks -Djavax.net.ssl.trustStorePassword=password -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5000 -Xnoagent</cargo.jvmargs>
-								</properties>
-							</configuration>
-						</configuration>
-						<goals>
-							<goal>start</goal>
-						</goals>
-					</execution>
+                <executions>
+                    <execution>
+                        <id>start-container1</id>
+                        <phase>pre-integration-test</phase>
+                        <configuration>
+                            <wait>false</wait>
+                            <container>
+                                <containerId>tomcat9x</containerId>
+                                <home>${basedir}/target/juddi-tomcat-${project.parent.version}</home>
+                            </container>
+                            <configuration>
+                                <type>existing</type>
+                                <home>${project.build.directory}/juddi-tomcat-${project.parent.version}</home>
+                                <properties>
+                                    <cargo.logging>high</cargo.logging>
+                                    <cargo.hostname>localhost</cargo.hostname>
+                                    <cargo.servlet.port>8880</cargo.servlet.port>
+                                    <cargo.jvmargs>-Xms256m -Xmx256m -Djavax.net.ssl.keyStore=${basedir}/../juddi-tomcat/keystore.jks -Djavax.net.ssl.keyStorePassword=password -Djavax.net.ssl.trustStore=${basedir}/../juddi-tomcat/truststore.jks -Djavax.net.ssl.trustStorePassword=password -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5000 -Xnoagent</cargo.jvmargs>
+                                </properties>
+                            </configuration>
+                        </configuration>
+                        <goals>
+                            <goal>start</goal>
+                        </goals>
+                    </execution>
 
 
-					<execution>
-						<id>start-container2</id>
-						<phase>pre-integration-test</phase>
-						<configuration>
-							<wait>false</wait>
-							<container>
-								<containerId>tomcat9x</containerId>
-								<home>${basedir}/target/node2/juddi-tomcat-${project.parent.version}</home>
-							</container>
-							<configuration>
-								<type>existing</type>
-								<home>${project.build.directory}/node2/juddi-tomcat-${project.parent.version}</home>
-								<properties>
-									<cargo.logging>high</cargo.logging>
-									<cargo.hostname>localhost</cargo.hostname>
-									<cargo.servlet.port>8980</cargo.servlet.port>
-									<cargo.jvmargs>-Xms256m -Xmx256m -XX:MaxPermSize=256M -Djava.endorsed.dirs=${basedir}/target/node2/juddi-tomcat-${project.parent.version}/endorsed -Djavax.net.ssl.keyStore=${basedir}/../juddi-tomcat/keystore.jks -Djavax.net.ssl.keyStorePassword=password  -Djavax.net.ssl.trustStore=${basedir}/../juddi-tomcat/truststore.jks -Djavax.net.ssl.trustStorePassword=password -Xdebug  -Xnoagent</cargo.jvmargs>
-								</properties>
-							</configuration>
-						</configuration>
-						<goals>
-							<goal>start</goal>
-						</goals>
-					</execution>
+                    <execution>
+                        <id>start-container2</id>
+                        <phase>pre-integration-test</phase>
+                        <configuration>
+                            <wait>false</wait>
+                            <container>
+                                <containerId>tomcat9x</containerId>
+                                <home>${basedir}/target/node2/juddi-tomcat-${project.parent.version}</home>
+                            </container>
+                            <configuration>
+                                <type>existing</type>
+                                <home>${project.build.directory}/node2/juddi-tomcat-${project.parent.version}</home>
+                                <properties>
+                                    <cargo.logging>high</cargo.logging>
+                                    <cargo.hostname>localhost</cargo.hostname>
+                                    <cargo.servlet.port>8980</cargo.servlet.port>
+                                    <cargo.jvmargs>-Xms256m -Xmx256m -Djavax.net.ssl.keyStore=${basedir}/../juddi-tomcat/keystore.jks -Djavax.net.ssl.keyStorePassword=password  -Djavax.net.ssl.trustStore=${basedir}/../juddi-tomcat/truststore.jks -Djavax.net.ssl.trustStorePassword=password -Xdebug  -Xnoagent</cargo.jvmargs>
+                                </properties>
+                            </configuration>
+                        </configuration>
+                        <goals>
+                            <goal>start</goal>
+                        </goals>
+                    </execution>
 
-					<execution>
-						<id>stop-container1</id>
-						<phase>post-integration-test</phase>
-						<configuration>
-							<container>
-								<containerId>tomcat9x</containerId>
-                                                                <home>${project.build.directory}/juddi-tomcat-${project.parent.version}</home>
-							</container>
-							<configuration>
-								<properties>
-									<cargo.servlet.port>8880</cargo.servlet.port>
-								</properties>
-								<home>${project.build.directory}/juddi-tomcat-${project.parent.version}</home>
-							</configuration>
-						</configuration>
-						<goals>
-							<goal>stop</goal>
-						</goals>
-					</execution>
+                    <execution>
+                        <id>stop-container1</id>
+                        <phase>post-integration-test</phase>
+                        <configuration>
+                            <container>
+                                <containerId>tomcat9x</containerId>
+                                <home>${project.build.directory}/juddi-tomcat-${project.parent.version}</home>
+                            </container>
+                            <configuration>
+                                <properties>
+                                    <cargo.servlet.port>8880</cargo.servlet.port>
+                                </properties>
+                                <home>${project.build.directory}/juddi-tomcat-${project.parent.version}</home>
+                            </configuration>
+                        </configuration>
+                        <goals>
+                            <goal>stop</goal>
+                        </goals>
+                    </execution>
 
-					<execution>
-						<id>stop-container2</id>
-						<phase>post-integration-test</phase>
-						<configuration>
-							<container>
-								<containerId>tomcat9x</containerId>
-                                                                <home>${basedir}/target/node2/juddi-tomcat-${project.parent.version}</home>
-							</container>
-							<configuration>
-								<properties>
-									<cargo.servlet.port>8980</cargo.servlet.port>
-								</properties>
-								<home>${project.build.directory}/node2/juddi-tomcat-${project.parent.version}</home>
-							</configuration>
-						</configuration>
-						<goals>
-							<goal>stop</goal>
-						</goals>
-					</execution>
+                    <execution>
+                        <id>stop-container2</id>
+                        <phase>post-integration-test</phase>
+                        <configuration>
+                            <container>
+                                <containerId>tomcat9x</containerId>
+                                <home>${basedir}/target/node2/juddi-tomcat-${project.parent.version}</home>
+                            </container>
+                            <configuration>
+                                <properties>
+                                    <cargo.servlet.port>8980</cargo.servlet.port>
+                                </properties>
+                                <home>${project.build.directory}/node2/juddi-tomcat-${project.parent.version}</home>
+                            </configuration>
+                        </configuration>
+                        <goals>
+                            <goal>stop</goal>
+                        </goals>
+                    </execution>
 
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-					<includes>
-						<include>**/*IntegrationTest.java</include>
-					</includes>
-					<systemProperties>
-						<property>
-							<name>derby.stream.error.file</name>
-							<value>target/derby.log</value>
-						</property>
-						<property>
-							<name>java.io.tmpdir</name>
-							<value>${basedir}/temp</value>
-						</property>
-					</systemProperties>
-				</configuration>
-				<executions>
-					<execution>
-						<id>surefire-it</id>
-						<phase>integration-test</phase>
-						<goals>
-							<goal>test</goal>
-						</goals>
-						<configuration>
-							<skip>false</skip>
-                                                        <runOrder>random</runOrder>
-                                                        <skipAfterFailureCount>1</skipAfterFailureCount>
-							<systemProperties>
-								<property>
-									<name>cactus.contextURL</name>
-									<value>http://localhost:8880/juddi</value>
-								</property>
-								<property>
-									<name>java.io.tmpdir</name>
-									<value>${basedir}/temp</value>
-								</property>
-							</systemProperties>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-			<!-- deploying test-jar -->
-			<groupId>org.apache.maven.plugins</groupId>
-			<artifactId>maven-jar-plugin</artifactId>
-			<executions>
-				<execution>
-					<goals>
-						<goal>test-jar</goal>
-					</goals>
-				</execution>
-			</executions>
-		    </plugin>
-		    <plugin>
-		    <!-- deploying test-jar src -->
-	        <groupId>org.apache.maven.plugins</groupId>
-	        <artifactId>maven-source-plugin</artifactId>
-	        <executions>
-	          <execution>
-	            <id>attach-sources</id>
-	            <phase>verify</phase>
-	            <goals>
-	              <goal>jar</goal>
-	              <goal>test-jar</goal>
-	            </goals>
-	          </execution>
-	        </executions>
-	      </plugin>
-	      <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>attach-javadocs</id>
-                <goals>
-                  <goal>test-jar</goal>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-		</plugins>
-	</build>
-	<profiles>
-		<profile>
-			<id>load</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-surefire-plugin</artifactId>
-						<configuration>
-							<skip>true</skip>
-							<includes>
-								<include>**/*LoadTest.java</include>
-							</includes>
-							<systemProperties>
-								<property>
-									<name>derby.stream.error.file</name>
-									<value>target/derby.log</value>
-								</property>
-							</systemProperties>
-						</configuration>
-						<executions>
-							<execution>
-								<id>surefire-it</id>
-								<phase>integration-test</phase>
-								<goals>
-									<goal>test</goal>
-								</goals>
-								<configuration>
-                                                                        <runOrder>random</runOrder>
-									<skip>false</skip>
-									<systemProperties>
-										<property>
-											<name>cactus.contextURL</name>
-											<value>http://localhost:8880/juddi</value>
-										</property>
-									</systemProperties>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                    <includes>
+                        <include>**/*IntegrationTest.java</include>
+                    </includes>
+                    <systemProperties>
+                        <property>
+                            <name>derby.stream.error.file</name>
+                            <value>target/derby.log</value>
+                        </property>
+                        <property>
+                            <name>java.io.tmpdir</name>
+                            <value>${basedir}/temp</value>
+                        </property>
+                    </systemProperties>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>surefire-it</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                        <configuration>
+                            <skip>false</skip>
+                            <runOrder>random</runOrder>
+                            <skipAfterFailureCount>1</skipAfterFailureCount>
+                            <systemProperties>
+                                <property>
+                                    <name>cactus.contextURL</name>
+                                    <value>http://localhost:8880/juddi</value>
+                                </property>
+                                <property>
+                                    <name>java.io.tmpdir</name>
+                                    <value>${basedir}/temp</value>
+                                </property>
+                            </systemProperties>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <!-- deploying test-jar -->
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <!-- deploying test-jar src -->
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>jar</goal>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>test-jar</goal>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <profiles>
+        <profile>
+            <id>load</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skip>true</skip>
+                            <includes>
+                                <include>**/*LoadTest.java</include>
+                            </includes>
+                            <systemProperties>
+                                <property>
+                                    <name>derby.stream.error.file</name>
+                                    <value>target/derby.log</value>
+                                </property>
+                            </systemProperties>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>surefire-it</id>
+                                <phase>integration-test</phase>
+                                <goals>
+                                    <goal>test</goal>
+                                </goals>
+                                <configuration>
+                                    <runOrder>random</runOrder>
+                                    <skip>false</skip>
+                                    <systemProperties>
+                                        <property>
+                                            <name>cactus.contextURL</name>
+                                            <value>http://localhost:8880/juddi</value>
+                                        </property>
+                                    </systemProperties>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
diff --git a/uddi-tck/src/main/java/org/apache/juddi/v2/tck/package-info.java b/uddi-tck/src/main/java/org/apache/juddi/v2/tck/package-info.java
deleted file mode 100644
index 1046a50..0000000
--- a/uddi-tck/src/main/java/org/apache/juddi/v2/tck/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2001-2008 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.
- *
- */
-/**
- * Classes used by the UDDI TCK only.
- */
-package org.apache.juddi.v2.tck;
\ No newline at end of file
diff --git a/uddi-tck/src/main/java/org/apache/juddi/v3/tck/package-info.java b/uddi-tck/src/main/java/org/apache/juddi/v3/tck/package-info.java
deleted file mode 100644
index 9c93161..0000000
--- a/uddi-tck/src/main/java/org/apache/juddi/v3/tck/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2001-2008 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.
- *
- */
-/**
- * Classes used by the UDDI TCK only.
- */
-package org.apache.juddi.v3.tck;
diff --git a/uddi-ws/pom.xml b/uddi-ws/pom.xml
index d2169d4..3b3ac69 100644
--- a/uddi-ws/pom.xml
+++ b/uddi-ws/pom.xml
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- * 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/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.apache.juddi</groupId>
-		<artifactId>juddi-parent</artifactId>
-		<version>3.3.11-SNAPSHOT</version>
-	</parent>
-	<artifactId>uddi-ws</artifactId>
-	<packaging>bundle</packaging>
-	<name>UDDIv2 and v3 WS Stubs and Schema Bindings Generated from WSDL</name>
-	<profiles>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.juddi</groupId>
+        <artifactId>juddi-parent</artifactId>
+        <version>3.3.11-SNAPSHOT</version>
+    </parent>
+    <artifactId>uddi-ws</artifactId>
+    <packaging>bundle</packaging>
+    <name>UDDIv2 and v3 WS Stubs and Schema Bindings Generated from WSDL</name>
+    <profiles>
         <profile>
             <id>regenerate-source</id>
             <build>
@@ -53,19 +53,38 @@
             </build>
         </profile>
     </profiles>
-	<dependencies>
-		 <dependency>
-          <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>geronimo-jaxws_2.2_spec</artifactId>
-          <version>1.0</version>
-          <type>jar</type>
-          <scope>provided</scope>
+    <dependencies> 
+        
+        <dependency>
+            <groupId>javax.xml.ws</groupId>
+            <artifactId>jaxws-api</artifactId>
+            <version>2.3.1</version>
         </dependency>
-          <dependency>
+
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.4.0-b180830.0359</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.jws</groupId>
+            <artifactId>javax.jws-api</artifactId>
+            <version>1.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxws_2.2_spec</artifactId>
+            <version>1.0</version>
+            <type>jar</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
             <scope>test</scope>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-databinding-jaxb</artifactId>
             <version>${cxf.version}</version>
         </dependency>
-	</dependencies>
+    </dependencies>
 </project>
\ No newline at end of file

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org