Author: bvahdat
Date: Sun Oct 21 18:48:29 2012
New Revision: 1400696
URL: http://svn.apache.org/viewvc?rev=1400696&view=rev
Log:
CAMEL-5578: Polish our pom's to be as DRY as possible.
Modified:
camel/trunk/components/camel-cxf/pom.xml
camel/trunk/components/camel-eclipse/pom.xml
camel/trunk/components/camel-mail/pom.xml
camel/trunk/components/camel-sjms/pom.xml
camel/trunk/components/camel-web/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/tests/camel-itest-karaf/pom.xml
camel/trunk/tests/camel-itest-osgi/pom.xml
camel/trunk/tests/camel-itest/pom.xml
camel/trunk/tests/test-bundles/mock-javamail_1.7/pom.xml
Modified: camel/trunk/components/camel-cxf/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/pom.xml?rev=1400696&r1=1400695&r2=1400696&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/pom.xml (original)
+++ camel/trunk/components/camel-cxf/pom.xml Sun Oct 21 18:48:29 2012
@@ -333,12 +333,6 @@
<profiles>
<profile>
- <id>fastinstall</id>
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
- </profile>
- <profile>
<id>ibm-jdk</id>
<activation>
<property>
@@ -354,7 +348,6 @@
<dependency>
<groupId>com.sun.xml.parsers</groupId>
<artifactId>jaxp-ri</artifactId>
- <version>1.4.2</version>
</dependency>
</dependencies>
</profile>
Modified: camel/trunk/components/camel-eclipse/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-eclipse/pom.xml?rev=1400696&r1=1400695&r2=1400696&view=diff
==============================================================================
--- camel/trunk/components/camel-eclipse/pom.xml (original)
+++ camel/trunk/components/camel-eclipse/pom.xml Sun Oct 21 18:48:29 2012
@@ -47,7 +47,7 @@
<dependency>
<groupId>org.eclipse.equinox</groupId>
<artifactId>common</artifactId>
- <version>3.3.0-v20070426</version>
+ <version>${eclipse-equinox-common-version}</version>
</dependency>
<!-- testing -->
Modified: camel/trunk/components/camel-mail/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/pom.xml?rev=1400696&r1=1400695&r2=1400696&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/pom.xml (original)
+++ camel/trunk/components/camel-mail/pom.xml Sun Oct 21 18:48:29 2012
@@ -60,7 +60,7 @@
<dependency>
<groupId>org.jvnet.mock-javamail</groupId>
<artifactId>mock-javamail</artifactId>
- <version>1.7</version>
+ <version>${mock-javamail-version}</version>
<exclusions>
<exclusion>
<groupId>javax.mail</groupId>
Modified: camel/trunk/components/camel-sjms/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/pom.xml?rev=1400696&r1=1400695&r2=1400696&view=diff
==============================================================================
--- camel/trunk/components/camel-sjms/pom.xml (original)
+++ camel/trunk/components/camel-sjms/pom.xml Sun Oct 21 18:48:29 2012
@@ -115,7 +115,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.8.1</version>
<executions>
<execution>
<goals>
Modified: camel/trunk/components/camel-web/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-web/pom.xml?rev=1400696&r1=1400695&r2=1400696&view=diff
==============================================================================
--- camel/trunk/components/camel-web/pom.xml (original)
+++ camel/trunk/components/camel-web/pom.xml Sun Oct 21 18:48:29 2012
@@ -31,9 +31,9 @@
<properties>
<camel.osgi.export.pkg>org.apache.camel.web.*</camel.osgi.export.pkg>
+ <jaxb-api-version>2.1</jaxb-api-version>
<scalate-version>1.5.3</scalate-version>
<jersey-version>1.13</jersey-version>
- <logback-version>1.0.6</logback-version>
<jetty-port>8080</jetty-port>
<webdriver-version>0.9.7376</webdriver-version>
</properties>
@@ -141,13 +141,6 @@
<artifactId>scala-compiler</artifactId>
<version>${scala-version}</version>
</dependency>
- <!--
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback-version}</version>
- </dependency>
- -->
<!-- log4j needed by mvn jetty:run -->
<dependency>
@@ -352,12 +345,12 @@
<docletArtifact>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.8.1</version>
+ <version>${xerces-version}</version>
</docletArtifact>
<docletArtifact>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>2.1</version>
+ <version>${jaxb-api-version}</version>
</docletArtifact>
<docletArtifact>
<groupId>com.sun.xml.bind</groupId>
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1400696&r1=1400695&r2=1400696&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Sun Oct 21 18:48:29 2012
@@ -102,6 +102,7 @@
<dom4j-bundle-version>1.6.1_5</dom4j-bundle-version>
<dozer-version>5.3.2</dozer-version>
<easymock-version>3.1</easymock-version>
+
<eclipse-equinox-common-version>3.3.0-v20070426</eclipse-equinox-common-version>
<ehcache-bundle-version>2.6.0_1</ehcache-bundle-version>
<elasticsearch-bundle-version>0.19.10_1</elasticsearch-bundle-version>
<elasticsearch-version>0.19.10</elasticsearch-version>
@@ -234,6 +235,7 @@
<mina-bundle-version>1.1.7_6</mina-bundle-version>
<mina-version>1.1.7</mina-version>
<mina2-version>2.0.7</mina2-version>
+ <mock-javamail-version>1.7</mock-javamail-version>
<mockito-version>1.9.0</mockito-version>
<mongo-java-driver-version>2.9.1</mongo-java-driver-version>
<mqtt-client-version>1.4</mqtt-client-version>
@@ -1250,6 +1252,11 @@
<artifactId>jaxb-xjc</artifactId>
<version>${jaxb-version}</version>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.parsers</groupId>
+ <artifactId>jaxp-ri</artifactId>
+ <version>1.4.2</version>
+ </dependency>
<!-- logging -->
<dependency>
@@ -2033,6 +2040,11 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>2.8.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>2.3.1</version>
</plugin>
@@ -2136,6 +2148,11 @@
<artifactId>apache-rat-plugin</artifactId>
<version>0.8</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.servicemix.tooling</groupId>
+ <artifactId>depends-maven-plugin</artifactId>
+ <version>1.2</version>
+ </plugin>
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
Modified: camel/trunk/tests/camel-itest-karaf/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/pom.xml?rev=1400696&r1=1400695&r2=1400696&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/pom.xml (original)
+++ camel/trunk/tests/camel-itest-karaf/pom.xml Sun Oct 21 18:48:29 2012
@@ -121,7 +121,6 @@
<plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>depends-maven-plugin</artifactId>
- <version>1.2</version>
<executions>
<execution>
<id>generate-depends-file</id>
Modified: camel/trunk/tests/camel-itest-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/pom.xml?rev=1400696&r1=1400695&r2=1400696&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/pom.xml (original)
+++ camel/trunk/tests/camel-itest-osgi/pom.xml Sun Oct 21 18:48:29 2012
@@ -198,7 +198,7 @@
<dependency>
<groupId>ca.uhn.hapi</groupId>
<artifactId>hapi-structures-v24</artifactId>
- <version>1.0</version>
+ <version>${hapi-version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -388,7 +388,6 @@
<plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>depends-maven-plugin</artifactId>
- <version>1.2</version>
<executions>
<execution>
<id>generate-depends-file</id>
Modified: camel/trunk/tests/camel-itest/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/pom.xml?rev=1400696&r1=1400695&r2=1400696&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/pom.xml (original)
+++ camel/trunk/tests/camel-itest/pom.xml Sun Oct 21 18:48:29 2012
@@ -157,7 +157,7 @@
<dependency>
<groupId>org.jvnet.mock-javamail</groupId>
<artifactId>mock-javamail</artifactId>
- <version>1.7</version>
+ <version>${mock-javamail-version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -226,7 +226,6 @@
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
- <version>1.2.2</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -237,7 +236,6 @@
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
<scope>test</scope>
</dependency>
Modified: camel/trunk/tests/test-bundles/mock-javamail_1.7/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/test-bundles/mock-javamail_1.7/pom.xml?rev=1400696&r1=1400695&r2=1400696&view=diff
==============================================================================
--- camel/trunk/tests/test-bundles/mock-javamail_1.7/pom.xml (original)
+++ camel/trunk/tests/test-bundles/mock-javamail_1.7/pom.xml Sun Oct 21
18:48:29 2012
@@ -68,7 +68,7 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
- <version>1.4.1</version>
+ <version>${javax-mail-version}</version>
</dependency>
</dependencies>
