Author: danhaywood
Date: Thu Nov 29 16:05:33 2012
New Revision: 1415230
URL: http://svn.apache.org/viewvc?rev=1415230&view=rev
Log:
ISIS-188: enforcing dependency convergence
Modified:
isis/trunk/framework/pom.xml
isis/trunk/framework/viewer/bdd/concordion-tck/pom.xml
isis/trunk/framework/viewer/bdd/concordion/pom.xml
isis/trunk/framework/viewer/wicket/pom.xml
Modified: isis/trunk/framework/pom.xml
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/pom.xml?rev=1415230&r1=1415229&r2=1415230&view=diff
==============================================================================
--- isis/trunk/framework/pom.xml (original)
+++ isis/trunk/framework/pom.xml Thu Nov 29 16:05:33 2012
@@ -301,9 +301,7 @@
<banLatest>true</banLatest>
<banRelease>true</banRelease>
</requirePluginVersions>
- <!--
<DependencyConvergence/>
- -->
</rules>
</configuration>
<!-- goal:enforce supposedly binds to phase:validate,
@@ -1347,6 +1345,7 @@ archetype includes this explicit depende
<version>2.5.1</version>
<exclusions>
<exclusion>
+ <!-- for dependency convergence -->
<groupId>junit</groupId>
<artifactId>junit-dep</artifactId>
</exclusion>
Modified: isis/trunk/framework/viewer/bdd/concordion-tck/pom.xml
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/viewer/bdd/concordion-tck/pom.xml?rev=1415230&r1=1415229&r2=1415230&view=diff
==============================================================================
--- isis/trunk/framework/viewer/bdd/concordion-tck/pom.xml (original)
+++ isis/trunk/framework/viewer/bdd/concordion-tck/pom.xml Thu Nov 29 16:05:33
2012
@@ -106,6 +106,19 @@
<groupId>xom</groupId>
<artifactId>xom</artifactId>
<version>1.2.5</version>
+ <exclusions>
+ <exclusion>
+ <!-- for dependency convergence -->
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.3.03</version>
</dependency>
</dependencies>
Modified: isis/trunk/framework/viewer/bdd/concordion/pom.xml
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/viewer/bdd/concordion/pom.xml?rev=1415230&r1=1415229&r2=1415230&view=diff
==============================================================================
--- isis/trunk/framework/viewer/bdd/concordion/pom.xml (original)
+++ isis/trunk/framework/viewer/bdd/concordion/pom.xml Thu Nov 29 16:05:33 2012
@@ -66,6 +66,11 @@
<groupId>xom</groupId>
<artifactId>xom</artifactId>
</exclusion>
+ <exclusion>
+ <!-- for dependency convergence -->
+ <groupId>junit</groupId>
+ <artifactId>junit-dep</artifactId>
+ </exclusion>
</exclusions>
</dependency>
Modified: isis/trunk/framework/viewer/wicket/pom.xml
URL:
http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/pom.xml?rev=1415230&r1=1415229&r2=1415230&view=diff
==============================================================================
--- isis/trunk/framework/viewer/wicket/pom.xml (original)
+++ isis/trunk/framework/viewer/wicket/pom.xml Thu Nov 29 16:05:33 2012
@@ -153,42 +153,91 @@
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
<version>${wicket.version}</version>
+ <exclusions>
+ <exclusion>
+ <!-- for dependency convergence
-->
+ <groupId>org.slf4j</groupId>
+
<artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-request</artifactId>
<version>${wicket.version}</version>
+ <exclusions>
+ <exclusion>
+ <!-- for dependency convergence
-->
+ <groupId>org.slf4j</groupId>
+
<artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-util</artifactId>
<version>${wicket.version}</version>
+ <exclusions>
+ <exclusion>
+ <!-- for dependency convergence
-->
+ <groupId>org.slf4j</groupId>
+
<artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-extensions</artifactId>
<version>${wicket.version}</version>
+ <exclusions>
+ <exclusion>
+ <!-- for dependency convergence
-->
+ <groupId>org.slf4j</groupId>
+
<artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-datetime</artifactId>
<version>${wicket.version}</version>
+ <exclusions>
+ <exclusion>
+ <!-- for dependency convergence
-->
+ <groupId>org.slf4j</groupId>
+
<artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-auth-roles</artifactId>
<version>${wicket.version}</version>
+ <exclusions>
+ <exclusion>
+ <!-- for dependency convergence
-->
+ <groupId>org.slf4j</groupId>
+
<artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-guice</artifactId>
<version>${wicket.version}</version>
+ <exclusions>
+ <exclusion>
+ <!-- for dependency convergence
-->
+ <groupId>org.slf4j</groupId>
+
<artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
@@ -197,6 +246,13 @@
<groupId>com.vaynberg.wicket.select2</groupId>
<artifactId>wicket-select2</artifactId>
<version>${wicket-select2.version}</version>
+ <exclusions>
+ <exclusion>
+ <!-- for dependency convergence
-->
+
<groupId>org.apache.wicket</groupId>
+
<artifactId>wicket-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- Other -->
