Remove duplicate dependencies and legacy repositories

master
Vitaliy Filippov 2015-12-26 00:21:59 +03:00
parent a8362d5220
commit 243c4c14aa
13 changed files with 8 additions and 81 deletions

View File

@ -435,11 +435,6 @@
<artifactId>test-util</artifactId> <artifactId>test-util</artifactId>
<version>${test-util.artifact.version}</version> <version>${test-util.artifact.version}</version>
</dependency> </dependency>
<dependency>
<groupId>open-jbi-components</groupId>
<artifactId>common-util-installer</artifactId>
<version>${test-util.artifact.version}</version>
</dependency>
<dependency> <dependency>
<groupId>open-jbi-components</groupId> <groupId>open-jbi-components</groupId>
<artifactId>wfse_def</artifactId> <artifactId>wfse_def</artifactId>

View File

@ -261,10 +261,6 @@
<groupId>open-jbi-components</groupId> <groupId>open-jbi-components</groupId>
<artifactId>transform-api</artifactId> <artifactId>transform-api</artifactId>
</dependency> </dependency>
<dependency>
<groupId>open-jbi-components</groupId>
<artifactId>transform-api</artifactId>
</dependency>
<dependency> <dependency>
<groupId>open-jbi-components</groupId> <groupId>open-jbi-components</groupId>
<artifactId>component-toolkit</artifactId> <artifactId>component-toolkit</artifactId>

View File

@ -171,12 +171,11 @@ java.lang.NoSuchMethodError: org.codehaus.plexus.util.cli.Commandline.createArg(
<artifactId>ant</artifactId> <artifactId>ant</artifactId>
<version>1.7.1</version> <version>1.7.1</version>
</dependency> </dependency>
<dependency>
<dependency> <groupId>ant</groupId>
<groupId>ant</groupId> <artifactId>ant-nodeps</artifactId>
<artifactId>ant-nodeps</artifactId> <version>1.6.5</version>
<version>1.6.5</version> </dependency>
</dependency>
<dependency> <dependency>
<groupId>antlr</groupId> <groupId>antlr</groupId>
@ -455,11 +454,6 @@ java.lang.NoSuchMethodError: org.codehaus.plexus.util.cli.Commandline.createArg(
<artifactId>xbean</artifactId> <artifactId>xbean</artifactId>
<version>2.0.0</version> <version>2.0.0</version>
</dependency> </dependency>
<dependency>
<groupId>xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
<version>2.0-dev-2</version>
</dependency>
<dependency> <dependency>
<groupId>xmlbeans</groupId> <groupId>xmlbeans</groupId>
<artifactId>xmlpublic</artifactId> <artifactId>xmlpublic</artifactId>
@ -470,12 +464,6 @@ java.lang.NoSuchMethodError: org.codehaus.plexus.util.cli.Commandline.createArg(
<artifactId>xml-resolver</artifactId> <artifactId>xml-resolver</artifactId>
<version>1.1</version> <version>1.1</version>
</dependency> </dependency>
<dependency>
<groupId>ant</groupId>
<artifactId>ant-nodeps</artifactId>
<version>1.6.5</version>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>

View File

@ -32,7 +32,7 @@
<artifactId>build-common</artifactId> <artifactId>build-common</artifactId>
<groupId>open-jbi-components</groupId> <groupId>open-jbi-components</groupId>
<version>1.1</version> <version>1.1</version>
<relativePath>../../build-common</relativePath> <relativePath>../../../build-common</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>open-jbi-components</groupId> <groupId>open-jbi-components</groupId>

View File

@ -32,7 +32,7 @@
<artifactId>ojc-common</artifactId> <artifactId>ojc-common</artifactId>
<groupId>open-jbi-components</groupId> <groupId>open-jbi-components</groupId>
<version>1.1</version> <version>1.1</version>
<relativePath>../build-common/ojc-common</relativePath> <relativePath>../../build-common/ojc-common</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>open-jbi-components</groupId> <groupId>open-jbi-components</groupId>

View File

@ -126,10 +126,6 @@
<groupId>open-jbi-components</groupId> <groupId>open-jbi-components</groupId>
<artifactId>wsdl4jext</artifactId> <artifactId>wsdl4jext</artifactId>
</dependency> </dependency>
<dependency>
<groupId>open-jbi-components</groupId>
<artifactId>xpathmodel</artifactId>
</dependency>
<dependency> <dependency>
<groupId>open-jbi-components</groupId> <groupId>open-jbi-components</groupId>
<artifactId>qos</artifactId> <artifactId>qos</artifactId>

View File

@ -161,10 +161,6 @@
<groupId>xmlbeans</groupId> <groupId>xmlbeans</groupId>
<artifactId>jsr173_api</artifactId> <artifactId>jsr173_api</artifactId>
</dependency> </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency> <dependency>
<groupId>ant</groupId> <groupId>ant</groupId>
<artifactId>ant-junit</artifactId> <artifactId>ant-junit</artifactId>

View File

@ -156,6 +156,7 @@
<dependency> <dependency>
<groupId>open-jbi-components</groupId> <groupId>open-jbi-components</groupId>
<artifactId>hl7encoder-xsdextension</artifactId> <artifactId>hl7encoder-xsdextension</artifactId>
<version>${encodersl.artifact.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>xmlbeans</groupId> <groupId>xmlbeans</groupId>
@ -172,10 +173,5 @@
<artifactId>ant-junit</artifactId> <artifactId>ant-junit</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>open-jbi-components</groupId>
<artifactId>hl7encoder-xsdextension</artifactId>
<version>${encodersl.artifact.version}</version>
</dependency>
</dependencies> </dependencies>
</project> </project>

View File

@ -174,10 +174,6 @@
<artifactId>ant-junit</artifactId> <artifactId>ant-junit</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>open-jbi-components</groupId>
<artifactId>componentsl</artifactId>
</dependency>
</dependencies> </dependencies>
<properties> <properties>
<SECONDARY_ARTIFACT_ID>iepderby</SECONDARY_ARTIFACT_ID> <SECONDARY_ARTIFACT_ID>iepderby</SECONDARY_ARTIFACT_ID>

View File

@ -41,18 +41,6 @@
<version>${restbc.artifact.version}</version> <version>${restbc.artifact.version}</version>
<description>Implementation of Rest Binding Component</description> <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> <build>
<testResources> <testResources>
<testResource> <testResource>

View File

@ -41,19 +41,6 @@
<version>${snmpbc.artifact.version}</version> <version>${snmpbc.artifact.version}</version>
<description>snmpengine description</description> <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> <build>
<plugins> <plugins>
<plugin> <plugin>

View File

@ -369,12 +369,6 @@
<version>1.5.8</version> <version>1.5.8</version>
</dependency> </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.5.8</version>
</dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId> <artifactId>slf4j-simple</artifactId>

View File

@ -182,11 +182,6 @@
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
<version>1.5.8</version> <version>1.5.8</version>
</dependency> </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.5.8</version>
</dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId> <artifactId>slf4j-simple</artifactId>