Author: cmueller
Date: Wed Oct 3 13:23:41 2012
New Revision: 1393472
URL: http://svn.apache.org/viewvc?rev=1393472&view=rev
Log:
CAMEL-5578: Polish our pom's to be as DRY as possible - work in progress
Modified:
camel/trunk/components/camel-flatpack/pom.xml
camel/trunk/components/camel-fop/pom.xml
camel/trunk/components/camel-guice/pom.xml
camel/trunk/components/camel-hbase/pom.xml
camel/trunk/components/camel-hdfs/pom.xml
camel/trunk/components/camel-ibatis/pom.xml
camel/trunk/components/camel-irc/pom.xml
camel/trunk/components/camel-jasypt/pom.xml
camel/trunk/components/camel-javaspace/pom.xml
camel/trunk/parent/pom.xml
Modified: camel/trunk/components/camel-flatpack/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-flatpack/pom.xml?rev=1393472&r1=1393471&r2=1393472&view=diff
==============================================================================
--- camel/trunk/components/camel-flatpack/pom.xml (original)
+++ camel/trunk/components/camel-flatpack/pom.xml Wed Oct 3 13:23:41 2012
@@ -59,10 +59,6 @@
<!-- logging -->
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
Modified: camel/trunk/components/camel-fop/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-fop/pom.xml?rev=1393472&r1=1393471&r2=1393472&view=diff
==============================================================================
--- camel/trunk/components/camel-fop/pom.xml (original)
+++ camel/trunk/components/camel-fop/pom.xml Wed Oct 3 13:23:41 2012
@@ -56,7 +56,7 @@
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
- <version>1.6.0</version>
+ <version>${pdfbox-version}</version>
<scope>test</scope>
</dependency>
@@ -70,21 +70,10 @@
<version>${xalan-version}</version>
<scope>test</scope>
</dependency>
-
- <!-- logging -->
- <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>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
Modified: camel/trunk/components/camel-guice/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-guice/pom.xml?rev=1393472&r1=1393471&r2=1393472&view=diff
==============================================================================
--- camel/trunk/components/camel-guice/pom.xml (original)
+++ camel/trunk/components/camel-guice/pom.xml Wed Oct 3 13:23:41 2012
@@ -91,18 +91,5 @@
<enabled>true</enabled>
</releases>
</repository>
-<!--
- <repository>
- <id>guiceyfruit.snapshot</id>
- <name>GuiceyFruit Snapshot Repository</name>
- <url>http://guiceyfruit.googlecode.com/svn/repo/snapshots/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
--->
</repositories>
</project>
Modified: camel/trunk/components/camel-hbase/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/pom.xml?rev=1393472&r1=1393471&r2=1393472&view=diff
==============================================================================
--- camel/trunk/components/camel-hbase/pom.xml (original)
+++ camel/trunk/components/camel-hbase/pom.xml Wed Oct 3 13:23:41 2012
@@ -89,11 +89,6 @@
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
Modified: camel/trunk/components/camel-hdfs/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-hdfs/pom.xml?rev=1393472&r1=1393471&r2=1393472&view=diff
==============================================================================
--- camel/trunk/components/camel-hdfs/pom.xml (original)
+++ camel/trunk/components/camel-hdfs/pom.xml Wed Oct 3 13:23:41 2012
@@ -70,8 +70,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
- <!-- logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
Modified: camel/trunk/components/camel-ibatis/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ibatis/pom.xml?rev=1393472&r1=1393471&r2=1393472&view=diff
==============================================================================
--- camel/trunk/components/camel-ibatis/pom.xml (original)
+++ camel/trunk/components/camel-ibatis/pom.xml Wed Oct 3 13:23:41 2012
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.apache.ibatis</groupId>
<artifactId>ibatis-sqlmap</artifactId>
- <version>2.3.4.726</version>
+ <version>${ibatis-version}</version>
</dependency>
<!-- testing -->
Modified: camel/trunk/components/camel-irc/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-irc/pom.xml?rev=1393472&r1=1393471&r2=1393472&view=diff
==============================================================================
--- camel/trunk/components/camel-irc/pom.xml (original)
+++ camel/trunk/components/camel-irc/pom.xml Wed Oct 3 13:23:41 2012
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.schwering</groupId>
<artifactId>irclib</artifactId>
- <version>1.10</version>
+ <version>${irclib-version}</version>
</dependency>
<!-- testing -->
@@ -62,10 +62,10 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.8.5</version>
- <scope>test</scope>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>${mockito-version}</version>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
Modified: camel/trunk/components/camel-jasypt/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jasypt/pom.xml?rev=1393472&r1=1393471&r2=1393472&view=diff
==============================================================================
--- camel/trunk/components/camel-jasypt/pom.xml (original)
+++ camel/trunk/components/camel-jasypt/pom.xml Wed Oct 3 13:23:41 2012
@@ -40,7 +40,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
@@ -54,7 +53,6 @@
<artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified: camel/trunk/components/camel-javaspace/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-javaspace/pom.xml?rev=1393472&r1=1393471&r2=1393472&view=diff
==============================================================================
--- camel/trunk/components/camel-javaspace/pom.xml (original)
+++ camel/trunk/components/camel-javaspace/pom.xml Wed Oct 3 13:23:41 2012
@@ -41,14 +41,12 @@
<dependency>
<groupId>jini</groupId>
<artifactId>jini-core</artifactId>
- <version>2.1</version>
- <scope>compile</scope>
+ <version>${jini-version}</version>
</dependency>
<dependency>
<groupId>jini</groupId>
<artifactId>jini-ext</artifactId>
- <version>2.1</version>
- <scope>compile</scope>
+ <version>${jini-version}</version>
</dependency>
<!-- testing -->
@@ -62,8 +60,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
- <!-- logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
@@ -83,14 +79,14 @@
<dependency>
<groupId>jini</groupId>
<artifactId>jini-core</artifactId>
- <version>2.1</version>
+ <version>${jini-version}</version>
<scope>system</scope>
<systemPath>${JSHOMEDIR}/lib/required/gs-runtime.jar</systemPath>
</dependency>
<dependency>
<groupId>jini</groupId>
<artifactId>jini-ext</artifactId>
- <version>2.1</version>
+ <version>${jini-version}</version>
<scope>system</scope>
<systemPath>${JSHOMEDIR}/lib/required/gs-runtime.jar</systemPath>
</dependency>
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1393472&r1=1393471&r2=1393472&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Oct 3 13:23:41 2012
@@ -151,9 +151,12 @@
<httpclient4-version>4.2.1</httpclient4-version> <!-- FIXME cmueller:
rename to commons-httpclient4-version -->
<httpclient-version>3.1</httpclient-version> <!-- FIXME cmueller: rename
to commons-httpclient-version -->
<ibatis-bundle-version>2.3.4.726_4</ibatis-bundle-version>
+ <ibatis-version>2.3.4.726</ibatis-version>
<icu4j-version>4.8.1.1</icu4j-version>
<irclib-bundle-version>1.10_5</irclib-bundle-version>
+ <irclib-version>1.10</irclib-version>
<isorelax-bundle-version>20050913_4</isorelax-bundle-version>
+ <jini-version>2.1</jini-version>
<jackson-version>1.9.10</jackson-version>
<jackrabbit-version>2.2.12</jackrabbit-version>
<jain-sip-ri-bundle-version>1.2.154_2</jain-sip-ri-bundle-version>
@@ -236,6 +239,7 @@
<pax-runner-version>1.6.1</pax-runner-version>
<pax-tiny-bundle-version>1.3.1</pax-tiny-bundle-version>
<pax-logging-version>1.6.10</pax-logging-version>
+ <pdfbox-version>1.6.0</pdfbox-version>
<plexus-container-default-version>1.0-alpha-48</plexus-container-default-version>
<plexus-utils-version>1.5.6</plexus-utils-version>
<pojosr-version>0.1.8</pojosr-version>