Permalink
Browse files

ISPN-2326 c3p0 not part of the release

* c3p0 dependency was ignored by maven assembly plugin because this dependency is referenced by multiple modules, in multiple scopes (including test scope). The processing order of modules (and their dependencies) becomes important because only the first one is considered, so if that happens to have 'test' scope it won't make it into the distro.  This is a consequence of a broader issue/limitation that is already documented in the plugin user guide and to overcome it we should avoid multiple moduleSets (not doable). The current solution consists of adding a FIRST moduleSet that aggregates all jar deps in 'proper' order and removing dependency processing from existing moduleSets.

* Made some trivial changes in bin.xml assembly to reduce the amount of text differences to all.xml (bin.xml is a subset of all.xml and any irrelevant differences should go away to simplify maintaining them in parallel)

* Force dependency resolution for commons-codec and commons-collections to use a global common version (otherwise they would diverge)

* Remove some duplicated dependencies in spring/pom.xml and  cli-server/pom.xml.
  • Loading branch information...
1 parent 86942af commit dbd382de1d1b5698309952e2ee6ff896b4296eee @anistor anistor committed with galderz Jan 14, 2013
@@ -52,6 +52,12 @@
<artifactId>cassandra-all</artifactId>
<scope>test</scope>
</dependency>
+ <!-- We need to force the version defined in parent pom for this indirect dependency -->
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
<build>
View
@@ -83,11 +83,6 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>infinispan-server-hotrod</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>infinispan-server-hotrod</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
View
@@ -120,6 +120,8 @@
<version.cdi>1.0-SP4</version.cdi>
<version.com.intellij.forms_rt>6.0.5</version.com.intellij.forms_rt>
<version.commons.compress>1.4</version.commons.compress>
+ <version.commons.codec>1.4</version.commons.codec>
+ <version.commons.collections>3.2.1</version.commons.collections>
<version.commons.dbcp>1.4</version.commons.dbcp>
<version.commons.pool>1.6</version.commons.pool>
<version.commons.httpclient>3.1</version.commons.httpclient>
@@ -472,6 +474,16 @@
<version>${version.commons.compress}</version>
</dependency>
<dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${version.commons.codec}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>${version.commons.collections}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math</artifactId>
<version>${version.commons.math}</version>
@@ -1523,7 +1535,6 @@
<configuration>
<includeScope>runtime</includeScope>
<excludeScope>test</excludeScope>
- <!-- all jar paths are relative to bin dir inside the distribution bundle -->
<prefix>$ISPN_HOME/lib</prefix>
<outputFile>${project.build.directory}/runtime-classpath.txt</outputFile>
</configuration>
View
@@ -89,6 +89,13 @@
<scope>provided</scope>
</dependency>
+ <!-- We need to force the version defined in parent pom for this indirect dependency -->
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
View
@@ -105,12 +105,6 @@
<artifactId>infinispan-core</artifactId>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>infinispan-core</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
<!-- Made the RHQ dependency non-transitive in case we only need the remote cache -->
<dependency>
<groupId>org.rhq.helpers</groupId>
Oops, something went wrong.

0 comments on commit dbd382d

Please sign in to comment.