From 243c4c14aaf7a12a28bde6c6fd477b513a110ffa Mon Sep 17 00:00:00 2001
From: Vitaliy Filippov <vitalif@yourcmc.ru>
Date: Sat, 26 Dec 2015 00:21:59 +0300
Subject: [PATCH] Remove duplicate dependencies and legacy repositories

---
 global-common/ojc-versions/pom.xml            |  5 -----
 ojc-core/bpelse/packaging/pom.xml             |  4 ----
 ojc-core/build-common/ojc-common/pom.xml      | 22 +++++--------------
 .../apache-mina/mina-core/pom.xml             |  2 +-
 ojc-core/component-common/apache-mina/pom.xml |  2 +-
 ojc-core/component-common/bpelmodel/pom.xml   |  4 ----
 .../component-common/xmltransformer/pom.xml   |  4 ----
 ojc-core/encodersl/encoder-hl7/pom.xml        |  6 +----
 ojc-core/iepse/iepcore/pom.xml                |  4 ----
 ojc-core/restbc/jbiadapter/pom.xml            | 12 ----------
 ojc-core/snmpbc/snmpengine/pom.xml            | 13 -----------
 ojc-core/workflowse/packaging/pom.xml         |  6 -----
 ojc-core/workflowse/workflowseimpl/pom.xml    |  5 -----
 13 files changed, 8 insertions(+), 81 deletions(-)

diff --git a/global-common/ojc-versions/pom.xml b/global-common/ojc-versions/pom.xml
index a2ef26ac5..81927ab5d 100755
--- a/global-common/ojc-versions/pom.xml
+++ b/global-common/ojc-versions/pom.xml
@@ -435,11 +435,6 @@
                 <artifactId>test-util</artifactId>
                 <version>${test-util.artifact.version}</version>
             </dependency>
-            <dependency>
-                <groupId>open-jbi-components</groupId>
-                <artifactId>common-util-installer</artifactId>
-                <version>${test-util.artifact.version}</version>
-            </dependency>
             <dependency>
                 <groupId>open-jbi-components</groupId>
                 <artifactId>wfse_def</artifactId>
diff --git a/ojc-core/bpelse/packaging/pom.xml b/ojc-core/bpelse/packaging/pom.xml
index 2b98dcf7e..c254b214d 100755
--- a/ojc-core/bpelse/packaging/pom.xml
+++ b/ojc-core/bpelse/packaging/pom.xml
@@ -261,10 +261,6 @@
             <groupId>open-jbi-components</groupId>
             <artifactId>transform-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>open-jbi-components</groupId>
-            <artifactId>transform-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>open-jbi-components</groupId>
             <artifactId>component-toolkit</artifactId>
diff --git a/ojc-core/build-common/ojc-common/pom.xml b/ojc-core/build-common/ojc-common/pom.xml
index 743b79cba..66ac97814 100755
--- a/ojc-core/build-common/ojc-common/pom.xml
+++ b/ojc-core/build-common/ojc-common/pom.xml
@@ -171,12 +171,11 @@ java.lang.NoSuchMethodError: org.codehaus.plexus.util.cli.Commandline.createArg(
 		  <artifactId>ant</artifactId>
 		  <version>1.7.1</version>
 	    </dependency>
-
-	    <dependency>
-		 <groupId>ant</groupId>
-		 <artifactId>ant-nodeps</artifactId>
-		 <version>1.6.5</version>
-	    </dependency>
+            <dependency>
+                <groupId>ant</groupId>
+                <artifactId>ant-nodeps</artifactId>
+                <version>1.6.5</version>
+            </dependency>
 
             <dependency>
                 <groupId>antlr</groupId>
@@ -455,11 +454,6 @@ java.lang.NoSuchMethodError: org.codehaus.plexus.util.cli.Commandline.createArg(
                 <artifactId>xbean</artifactId>
                 <version>2.0.0</version>
             </dependency>
-            <dependency>
-                <groupId>xmlbeans</groupId>
-                <artifactId>xmlbeans</artifactId>
-                <version>2.0-dev-2</version>
-            </dependency>
             <dependency>
                 <groupId>xmlbeans</groupId>
                 <artifactId>xmlpublic</artifactId>
@@ -470,12 +464,6 @@ java.lang.NoSuchMethodError: org.codehaus.plexus.util.cli.Commandline.createArg(
                 <artifactId>xml-resolver</artifactId>
                 <version>1.1</version>
             </dependency>
-            <dependency>
-                <groupId>ant</groupId>
-                <artifactId>ant-nodeps</artifactId>
-                <version>1.6.5</version>
-                <scope>test</scope>
-            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
diff --git a/ojc-core/component-common/apache-mina/mina-core/pom.xml b/ojc-core/component-common/apache-mina/mina-core/pom.xml
index 6c4aa770f..1e5ae420d 100755
--- a/ojc-core/component-common/apache-mina/mina-core/pom.xml
+++ b/ojc-core/component-common/apache-mina/mina-core/pom.xml
@@ -32,7 +32,7 @@
         <artifactId>build-common</artifactId>
         <groupId>open-jbi-components</groupId>
         <version>1.1</version>
-        <relativePath>../../build-common</relativePath>
+        <relativePath>../../../build-common</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>open-jbi-components</groupId>
diff --git a/ojc-core/component-common/apache-mina/pom.xml b/ojc-core/component-common/apache-mina/pom.xml
index 78abe4e3c..ef54381e8 100755
--- a/ojc-core/component-common/apache-mina/pom.xml
+++ b/ojc-core/component-common/apache-mina/pom.xml
@@ -32,7 +32,7 @@
         <artifactId>ojc-common</artifactId>
         <groupId>open-jbi-components</groupId>
         <version>1.1</version>
-        <relativePath>../build-common/ojc-common</relativePath>
+        <relativePath>../../build-common/ojc-common</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>open-jbi-components</groupId>
diff --git a/ojc-core/component-common/bpelmodel/pom.xml b/ojc-core/component-common/bpelmodel/pom.xml
index 01bf1ca7e..ecc621e2a 100755
--- a/ojc-core/component-common/bpelmodel/pom.xml
+++ b/ojc-core/component-common/bpelmodel/pom.xml
@@ -126,10 +126,6 @@
             <groupId>open-jbi-components</groupId>
             <artifactId>wsdl4jext</artifactId>
         </dependency>
-        <dependency>
-            <groupId>open-jbi-components</groupId>
-            <artifactId>xpathmodel</artifactId>
-        </dependency>
         <dependency>
             <groupId>open-jbi-components</groupId>
             <artifactId>qos</artifactId>
diff --git a/ojc-core/component-common/xmltransformer/pom.xml b/ojc-core/component-common/xmltransformer/pom.xml
index 43dbd569e..f3531ad59 100755
--- a/ojc-core/component-common/xmltransformer/pom.xml
+++ b/ojc-core/component-common/xmltransformer/pom.xml
@@ -161,10 +161,6 @@
             <groupId>xmlbeans</groupId>
             <artifactId>jsr173_api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
         <dependency>
             <groupId>ant</groupId>
             <artifactId>ant-junit</artifactId>
diff --git a/ojc-core/encodersl/encoder-hl7/pom.xml b/ojc-core/encodersl/encoder-hl7/pom.xml
index 810aca62f..8fa8e7771 100755
--- a/ojc-core/encodersl/encoder-hl7/pom.xml
+++ b/ojc-core/encodersl/encoder-hl7/pom.xml
@@ -156,6 +156,7 @@
         <dependency>
             <groupId>open-jbi-components</groupId>
             <artifactId>hl7encoder-xsdextension</artifactId>
+            <version>${encodersl.artifact.version}</version>
         </dependency>
         <dependency>
             <groupId>xmlbeans</groupId>
@@ -172,10 +173,5 @@
             <artifactId>ant-junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>open-jbi-components</groupId>
-            <artifactId>hl7encoder-xsdextension</artifactId>
-            <version>${encodersl.artifact.version}</version>
-        </dependency>
     </dependencies>
 </project>
diff --git a/ojc-core/iepse/iepcore/pom.xml b/ojc-core/iepse/iepcore/pom.xml
index 0fb42376f..58f4e982d 100755
--- a/ojc-core/iepse/iepcore/pom.xml
+++ b/ojc-core/iepse/iepcore/pom.xml
@@ -174,10 +174,6 @@
             <artifactId>ant-junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>open-jbi-components</groupId>
-            <artifactId>componentsl</artifactId>
-        </dependency>
     </dependencies>
     <properties>
         <SECONDARY_ARTIFACT_ID>iepderby</SECONDARY_ARTIFACT_ID>
diff --git a/ojc-core/restbc/jbiadapter/pom.xml b/ojc-core/restbc/jbiadapter/pom.xml
index 01fff1661..5dfa8bc89 100755
--- a/ojc-core/restbc/jbiadapter/pom.xml
+++ b/ojc-core/restbc/jbiadapter/pom.xml
@@ -41,18 +41,6 @@
     <version>${restbc.artifact.version}</version>
     <description>Implementation of Rest Binding Component</description>
 
-    <pluginRepositories>
-        <pluginRepository>
-            <!-- note that the <id> is important - must agree with the config in global-common/pom.xml
-              ## This allows us to specify mirror settings uniformly.  RT 10/11/07
-              -->
-            <id>java-net-legacy-repository</id>
-            <name>java.net Maven 1.x repository</name>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </pluginRepository>
-    </pluginRepositories>
-
     <build>
         <testResources>
             <testResource>
diff --git a/ojc-core/snmpbc/snmpengine/pom.xml b/ojc-core/snmpbc/snmpengine/pom.xml
index a2842000b..121003e4d 100755
--- a/ojc-core/snmpbc/snmpengine/pom.xml
+++ b/ojc-core/snmpbc/snmpengine/pom.xml
@@ -41,19 +41,6 @@
     <version>${snmpbc.artifact.version}</version>
     <description>snmpengine description</description>
 
-    <pluginRepositories>
-        <pluginRepository>
-            <!-- note that the <id> is important - must agree with the config in global-common/pom.xml
-              ## This allows us to specify mirror settings uniformly.  RT 10/11/07
-              -->
-            <id>java-net-legacy-repository</id>
-            <name>java.net Maven 1.x repository</name>
-            <!-- <url>https://maven-repository.dev.java.net/nonav/repository</url> -->
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </pluginRepository>
-    </pluginRepositories>
-
     <build>
         <plugins>
             <plugin>
diff --git a/ojc-core/workflowse/packaging/pom.xml b/ojc-core/workflowse/packaging/pom.xml
index 01a1906a9..a6e66ad65 100755
--- a/ojc-core/workflowse/packaging/pom.xml
+++ b/ojc-core/workflowse/packaging/pom.xml
@@ -369,12 +369,6 @@
 	  <version>1.5.8</version>
 	</dependency>
 
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>slf4j-api</artifactId>
-	  <version>1.5.8</version>
-	</dependency>
-
 	<dependency>
 	  <groupId>org.slf4j</groupId>
 	  <artifactId>slf4j-simple</artifactId>
diff --git a/ojc-core/workflowse/workflowseimpl/pom.xml b/ojc-core/workflowse/workflowseimpl/pom.xml
index fcb2501b4..b808897c2 100755
--- a/ojc-core/workflowse/workflowseimpl/pom.xml
+++ b/ojc-core/workflowse/workflowseimpl/pom.xml
@@ -182,11 +182,6 @@
 	  <artifactId>slf4j-api</artifactId>
 	  <version>1.5.8</version>
 	</dependency>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>slf4j-api</artifactId>
-	  <version>1.5.8</version>
-	</dependency>
 	<dependency>
 	  <groupId>org.slf4j</groupId>
 	  <artifactId>slf4j-simple</artifactId>