Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Clean up dependencies
Browse files Browse the repository at this point in the history 
- Update parent/module versions
- Exclude unwanted dependencies
  • Loading branch information
@seanf
seanf committed Sep 2, 2013
1 parent f0d63b7 commit d2922e6
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 33 deletions.
37 changes: 19 additions & 18 deletions pom.xml
View file
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.zanata</groupId>
<artifactId>zanata-parent</artifactId>
<version>13</version>
<version>14-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>

Expand All @@ -19,8 +19,8 @@
</scm>

<properties>
<zanata.api.version>3.0.1</zanata.api.version>
<zanata.common.version>3.0.2-SNAPSHOT</zanata.common.version>
<zanata.api.version>3.1-SNAPSHOT</zanata.api.version>
<zanata.common.version>3.1-SNAPSHOT</zanata.common.version>
<powermock.version>1.4.12</powermock.version>
<httpclient.version>4.1.2</httpclient.version>
<resteasy.version>3.0.1.Final</resteasy.version>
Expand All @@ -42,6 +42,12 @@
<groupId>org.zanata</groupId>
<artifactId>zanata-common-api</artifactId>
<version>${zanata.api.version}</version>
<exclusions>
<exclusion>
<artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.zanata</groupId>
Expand Down Expand Up @@ -101,6 +107,10 @@
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
Expand All @@ -121,10 +131,6 @@
<groupId>org.scannotation</groupId>
<artifactId>scannotation</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
Expand All @@ -143,6 +149,12 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${httpclient.version}</version>
<exclusions>
<exclusion>
<artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
Expand Down Expand Up @@ -172,21 +184,11 @@
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.zanata</groupId>
<artifactId>zanata-common-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand All @@ -205,7 +207,6 @@
<failOnWarning>true</failOnWarning>
<usedDependencies>
<usedDependency>org.slf4j:slf4j-log4j12</usedDependency>
<usedDependency>org.zanata:zanata-common-api</usedDependency>
</usedDependencies>
</configuration>
</execution>
Expand Down
4 changes: 4 additions & 0 deletions zanata-cli/pom.xml
View file
Expand Up @@ -120,6 +120,10 @@
<groupId>args4j</groupId>
<artifactId>args4j</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
Expand Down
5 changes: 5 additions & 0 deletions zanata-client-commands/pom.xml
View file
Expand Up @@ -62,6 +62,11 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down
11 changes: 0 additions & 11 deletions zanata-maven-plugin/pom.xml
View file
Expand Up @@ -67,14 +67,6 @@
<version>1.5.7</version>
<scope>test</scope>
</dependency>

<!-- We do not need slf4j-api in this module. But parent module defines it.-->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
Expand Down Expand Up @@ -142,9 +134,6 @@
<configuration>
<failOnWarning>true</failOnWarning>
<usedDependencies>
<usedDependency>org.slf4j:slf4j-api</usedDependency>
<usedDependency>org.slf4j:slf4j-log4j12</usedDependency>
<usedDependency>org.zanata:zanata-common-api</usedDependency>
<usedDependency>org.codehaus.plexus:plexus-utils</usedDependency>
</usedDependencies>
</configuration>
Expand Down
8 changes: 4 additions & 4 deletions zanata-rest-client/pom.xml
View file
Expand Up @@ -19,7 +19,6 @@
</scm>

<dependencies>

<dependency>
<groupId>org.zanata</groupId>
<artifactId>zanata-common-api</artifactId>
Expand All @@ -30,8 +29,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>


<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>jaxrs-api</artifactId>
Expand All @@ -46,7 +43,10 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
Expand Down

1 comment on commit d2922e6

@buildhive
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Zanata » zanata-client #41 FAILURE
Looks like this commit caused a build failure
(what's this?)

Please sign in to comment.