Skip to content

Commit

Permalink
SHRINKWRAP-382: cleaned up the dependency tree
Browse files Browse the repository at this point in the history
  • Loading branch information
@wolfc
wolfc committed Feb 8, 2012
1 parent 3b731f2 commit 3082081
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 61 deletions.
97 changes: 37 additions & 60 deletions impl-maven/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,22 @@

<!-- Versioning -->
<version.org.apache.maven>3.0.3</version.org.apache.maven>
<version.org.apache.maven.wagon>2.0</version.org.apache.maven.wagon>
<version.org.apache.maven.wagon>1.0-beta-7</version.org.apache.maven.wagon>
<version.org.jsoup>1.6.1</version.org.jsoup>

<version.org.codehaus.plexus.classworlds>2.4</version.org.codehaus.plexus.classworlds>
<version.org.codehaus.plexus.component.annotations>1.5.5</version.org.codehaus.plexus.component.annotations>
<version.org.codehaus.plexus.interpolation>1.14</version.org.codehaus.plexus.interpolation>
<version.org.codehaus.plexus.utils>2.0.7</version.org.codehaus.plexus.utils>
<version.org.codehaus.plexus.utils>2.0.6</version.org.codehaus.plexus.utils>


<version.org.sonatype.aether>1.12</version.org.sonatype.aether>
<version.org.sonatype.aether>1.11</version.org.sonatype.aether>

<version.org.sonatype.plexus.cipher>1.4</version.org.sonatype.plexus.cipher>
<version.org.sonatype.plexus.sec.dispatcher>1.3</version.org.sonatype.plexus.sec.dispatcher>

<version.org.sonatype.sisu.inject.plexus>2.2.2</version.org.sonatype.sisu.inject.plexus>
<version.org.sonatype.sisu.inject.bean>2.2.2</version.org.sonatype.sisu.inject.bean>
<version.org.sonatype.sisu.guice>3.0.2</version.org.sonatype.sisu.guice>
<version.org.sonatype.sisu.inject.plexus>2.1.1</version.org.sonatype.sisu.inject.plexus>
<version.org.sonatype.sisu.inject.bean>2.1.1</version.org.sonatype.sisu.inject.bean>

<version.commons.io>2.0.1</version.commons.io>
<appended.jar.for.test>${basedir}/src/test/resources/artifacts/test-pom-in.jar</appended.jar.for.test>
Expand Down Expand Up @@ -96,6 +95,7 @@
<groupId>org.sonatype.aether</groupId>
<artifactId>aether-connector-wagon</artifactId>
<version>${version.org.sonatype.aether}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>junit</groupId>
Expand All @@ -108,12 +108,10 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-classworlds</artifactId>
<version>${version.org.codehaus.plexus.classworlds}</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>${version.org.codehaus.plexus.utils}</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Expand All @@ -127,11 +125,6 @@
</dependency>

<!-- org.sonatype.plexus -->
<dependency>
<groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-sec-dispatcher</artifactId>
<version>${version.org.sonatype.plexus.sec.dispatcher}</version>
</dependency>
<dependency>
<groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-cipher</artifactId>
Expand All @@ -143,30 +136,14 @@
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-inject-plexus</artifactId>
<version>${version.org.sonatype.sisu.inject.plexus}</version>
</dependency>
<dependency>
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-inject-bean</artifactId>
<version>${version.org.sonatype.sisu.inject.bean}</version>
</dependency>
<dependency>
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-guice</artifactId>
<version>${version.org.sonatype.sisu.guice}</version>
<classifier>no_aop</classifier>
<exclusions>
<exclusion>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</exclusion>
<exclusion>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</exclusion>
</exclusions>
</dependency>


<!-- org.apache.maven -->
<dependency>
<groupId>org.apache.maven</groupId>
Expand Down Expand Up @@ -202,46 +179,26 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings-builder</artifactId>
<version>${version.org.apache.maven}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- org.apache.maven.wagon -->
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-provider-api</artifactId>
<version>${version.org.apache.maven.wagon}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId>
<version>${version.org.apache.maven.wagon}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http</artifactId>
<artifactId>wagon-http-lightweight</artifactId>
<version>${version.org.apache.maven.wagon}</version>
<classifier>shaded</classifier>
<exclusions>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http-shared4</artifactId>
</exclusion>
</exclusions>
<scope>test</scope>
</dependency>

<dependency>
Expand Down Expand Up @@ -279,6 +236,26 @@

</dependencies>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-provider-api</artifactId>
<version>${version.org.apache.maven.wagon}</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-classworlds</artifactId>
<version>${version.org.codehaus.plexus.classworlds}</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>${version.org.codehaus.plexus.utils}</version>
</dependency>
</dependencies>
</dependencyManagement>

<!-- Build Configuration -->
<build>
<testResources>
Expand Down
20 changes: 19 additions & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,24 @@
</dependencies>
</plugin>

<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.0.1</version>
<executions>
<execution>
<id>enforce</id>
<configuration>
<rules>
<dependencyConvergence/>
</rules>
</configuration>
<goals>
<goal>enforce</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
Expand Down Expand Up @@ -144,7 +162,7 @@
<source>1.5</source>
<target>1.5</target>
</compilerArguments>
<argLine>-Xmx512M</argLine>
<maxmem>512m</maxmem>
<executable>${JAVA_HOME}/bin/javac</executable>
</configuration>
</plugin>
Expand Down

0 comments on commit 3082081

Please sign in to comment.