Author: cmueller
Date: Sat Sep 29 13:19:05 2012
New Revision: 1391795
URL: http://svn.apache.org/viewvc?rev=1391795&view=rev
Log:
CAMEL-5578: Polish our pom's to be as DRY as possible
Modified:
camel/trunk/components/camel-cache/pom.xml
camel/trunk/components/camel-tagsoup/pom.xml
camel/trunk/components/camel-xmlsecurity/pom.xml
camel/trunk/examples/camel-example-bam/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/tooling/maven/camel-maven-plugin/pom.xml
camel/trunk/tooling/maven/guice-maven-plugin/pom.xml
camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml
camel/trunk/tooling/maven/pom.xml
camel/trunk/tooling/pom.xml
Modified: camel/trunk/components/camel-cache/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cache/pom.xml?rev=1391795&r1=1391794&r2=1391795&view=diff
==============================================================================
--- camel/trunk/components/camel-cache/pom.xml (original)
+++ camel/trunk/components/camel-cache/pom.xml Sat Sep 29 13:19:05 2012
@@ -55,7 +55,6 @@
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
- <version>${xalan-version}</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
Modified: camel/trunk/components/camel-tagsoup/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-tagsoup/pom.xml?rev=1391795&r1=1391794&r2=1391795&view=diff
==============================================================================
--- camel/trunk/components/camel-tagsoup/pom.xml (original)
+++ camel/trunk/components/camel-tagsoup/pom.xml Sat Sep 29 13:19:05 2012
@@ -94,12 +94,11 @@
</plugin>
</plugins>
</build>
+
<dependencies>
-
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
- <version>${xalan-version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
Modified: camel/trunk/components/camel-xmlsecurity/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-xmlsecurity/pom.xml?rev=1391795&r1=1391794&r2=1391795&view=diff
==============================================================================
--- camel/trunk/components/camel-xmlsecurity/pom.xml (original)
+++ camel/trunk/components/camel-xmlsecurity/pom.xml Sat Sep 29 13:19:05 2012
@@ -47,7 +47,6 @@
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
- <version>${xalan-version}</version>
</dependency>
<!-- testing -->
<dependency>
Modified: camel/trunk/examples/camel-example-bam/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-bam/pom.xml?rev=1391795&r1=1391794&r2=1391795&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-bam/pom.xml (original)
+++ camel/trunk/examples/camel-example-bam/pom.xml Sat Sep 29 13:19:05 2012
@@ -70,7 +70,6 @@
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
- <version>2.7.1</version>
</dependency>
<!-- lets use hibernate by default -->
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1391795&r1=1391794&r2=1391795&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Sat Sep 29 13:19:05 2012
@@ -100,6 +100,7 @@
<elasticsearch-bundle-version>0.19.8_1</elasticsearch-bundle-version>
<elasticsearch-version>0.19.8</elasticsearch-version>
<el-api-1.0-version>1.0.1</el-api-1.0-version>
+ <exec-maven-plugin-version>1.1.1</exec-maven-plugin-version>
<ezmorph-bundle-version>1.0.6_1</ezmorph-bundle-version>
<fastinfoset-version>1.2.7_4</fastinfoset-version>
<felix-configadmin-version>1.2.4</felix-configadmin-version>
@@ -203,6 +204,9 @@
<lightcouch-version>0.0.4</lightcouch-version>
<!-- needed from tooling/archetypes -->
<maven-compiler-plugin-version>2.5.1</maven-compiler-plugin-version>
+ <maven-reporting-api-version>2.2.1</maven-reporting-api-version>
+ <maven-reporting-impl-version>2.0.5</maven-reporting-impl-version>
+ <maven-version>2.0</maven-version>
<mina-bundle-version>1.1.7_6</mina-bundle-version>
<mina-version>1.1.7</mina-version>
<mina2-version>2.0.4</mina2-version>
@@ -230,6 +234,8 @@
<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>
+
<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>
<protobuf-java-bundle-version>2.3.0_3</protobuf-java-bundle-version>
<protobuf-version>2.3.0</protobuf-version>
@@ -1643,6 +1649,43 @@
<version>${axiom-version}</version>
</dependency>
+ <!-- Tooling dependencies -->
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>${maven-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>${maven-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>${exec-maven-plugin-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <version>${plexus-container-default-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>${plexus-utils-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-api</artifactId>
+ <version>${maven-reporting-api-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-impl</artifactId>
+ <version>${maven-reporting-impl-version}</version>
+ </dependency>
+
<!-- optional misc -->
<dependency>
<groupId>org.jruby</groupId>
@@ -1669,6 +1712,11 @@
<artifactId>commons-httpclient</artifactId>
<version>${httpclient-version}</version>
</dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>${xalan-version}</version>
+ </dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
Modified: camel/trunk/tooling/maven/camel-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/maven/camel-maven-plugin/pom.xml?rev=1391795&r1=1391794&r2=1391795&view=diff
==============================================================================
--- camel/trunk/tooling/maven/camel-maven-plugin/pom.xml (original)
+++ camel/trunk/tooling/maven/camel-maven-plugin/pom.xml Sat Sep 29 13:19:05
2012
@@ -16,7 +16,6 @@
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
-
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -57,29 +56,23 @@
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.1.1</version>
</dependency>
-
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-48</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>${maven-reporting-version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>2.0.5</version>
</dependency>
<!-- add some logging to the classpath -->
@@ -91,6 +84,5 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
-
</dependencies>
</project>
Modified: camel/trunk/tooling/maven/guice-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/maven/guice-maven-plugin/pom.xml?rev=1391795&r1=1391794&r2=1391795&view=diff
==============================================================================
--- camel/trunk/tooling/maven/guice-maven-plugin/pom.xml (original)
+++ camel/trunk/tooling/maven/guice-maven-plugin/pom.xml Sat Sep 29 13:19:05
2012
@@ -16,7 +16,6 @@
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
-
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -43,29 +42,23 @@
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.1.1</version>
</dependency>
-
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-48</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>${maven-reporting-version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>2.0.5</version>
</dependency>
<!-- add some logging to the classpath -->
@@ -77,6 +70,5 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
-
</dependencies>
</project>
Modified: camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml?rev=1391795&r1=1391794&r2=1391795&view=diff
==============================================================================
--- camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml (original)
+++ camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml Sat Sep 29 13:19:05 2012
@@ -16,7 +16,6 @@
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
-
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -38,7 +37,6 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -47,7 +45,6 @@
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
- <version>${xalan-version}</version>
<exclusions>
<exclusion>
<groupId>xml-apis</groupId>
Modified: camel/trunk/tooling/maven/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/maven/pom.xml?rev=1391795&r1=1391794&r2=1391795&view=diff
==============================================================================
--- camel/trunk/tooling/maven/pom.xml (original)
+++ camel/trunk/tooling/maven/pom.xml Sat Sep 29 13:19:05 2012
@@ -16,7 +16,6 @@
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
-
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -30,12 +29,6 @@
<description>Camel Maven Plugins</description>
<packaging>pom</packaging>
- <properties>
- <maven-version>2.0</maven-version>
- <maven-plugin-version>2.2</maven-plugin-version>
- <maven-reporting-version>2.2.1</maven-reporting-version>
- </properties>
-
<modules>
<module>camel-maven-plugin</module>
<module>guice-maven-plugin</module>
@@ -46,22 +39,18 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>${maven-version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>${maven-version}</version>
</dependency>
</dependencies>
<reporting>
<plugins>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>${maven-plugin-version}</version>
</plugin>
<plugin>
@@ -71,13 +60,12 @@
<links>
<link>http://download.oracle.com/javase/6/docs/api/</link>
<link>http://download.oracle.com/javaee/6/api/</link>
-
<link>http://static.springsource.org/spring/docs/3.0.6.RELEASE/api/</link>
+
<link>http://static.springsource.org/spring/docs/${spring-version}/api/</link>
</links>
<stylesheetfile>${basedir}/../../../etc/css/stylesheet.css</stylesheetfile>
<linksource>true</linksource>
<maxmemory>900m</maxmemory>
<source>1.6</source>
-
<!-- TODO we can't aggregate as it won't find the CSS file :( -->
<!--<aggregate>true</aggregate>-->
</configuration>
Modified: camel/trunk/tooling/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/pom.xml?rev=1391795&r1=1391794&r2=1391795&view=diff
==============================================================================
--- camel/trunk/tooling/pom.xml (original)
+++ camel/trunk/tooling/pom.xml Sat Sep 29 13:19:05 2012
@@ -16,7 +16,6 @@
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
-
<modelVersion>4.0.0</modelVersion>
<parent>
