Author: janstey
Date: Mon Oct 19 13:26:24 2009
New Revision: 826666
URL: http://svn.apache.org/viewvc?rev=826666&view=rev
Log:
MR-252 - more dependency cleanup
Modified:
camel/trunk/apache-camel/pom.xml
camel/trunk/components/camel-jms/pom.xml
camel/trunk/components/camel-jpa/pom.xml
camel/trunk/components/camel-quartz/pom.xml
camel/trunk/components/camel-restlet/pom.xml
camel/trunk/components/camel-ruby/pom.xml
camel/trunk/components/camel-script/pom.xml
camel/trunk/components/camel-web/pom.xml
camel/trunk/components/camel-xstream/pom.xml
camel/trunk/examples/camel-example-axis/pom.xml
camel/trunk/examples/camel-example-cxf/pom.xml
camel/trunk/examples/camel-example-reportincident/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/tests/camel-itest-osgi/pom.xml
Modified: camel/trunk/apache-camel/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/apache-camel/pom.xml?rev=826666&r1=826665&r2=826666&view=diff
==============================================================================
--- camel/trunk/apache-camel/pom.xml (original)
+++ camel/trunk/apache-camel/pom.xml Mon Oct 19 13:26:24 2009
@@ -554,7 +554,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
<executions>
<execution>
Modified: camel/trunk/components/camel-jms/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/pom.xml?rev=826666&r1=826665&r2=826666&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/pom.xml (original)
+++ camel/trunk/components/camel-jms/pom.xml Mon Oct 19 13:26:24 2009
@@ -124,7 +124,7 @@
<dependency>
<groupId>org.jencks</groupId>
<artifactId>jencks-amqpool</artifactId>
- <version>2.1</version>
+ <version>2.2</version>
<scope>test</scope>
</dependency>
Modified: camel/trunk/components/camel-jpa/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jpa/pom.xml?rev=826666&r1=826665&r2=826666&view=diff
==============================================================================
--- camel/trunk/components/camel-jpa/pom.xml (original)
+++ camel/trunk/components/camel-jpa/pom.xml Mon Oct 19 13:26:24 2009
@@ -93,13 +93,11 @@
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
- <version>1.2.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-quartz/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/pom.xml?rev=826666&r1=826665&r2=826666&view=diff
==============================================================================
--- camel/trunk/components/camel-quartz/pom.xml (original)
+++ camel/trunk/components/camel-quartz/pom.xml Mon Oct 19 13:26:24 2009
@@ -57,7 +57,6 @@
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
</dependency>
<!-- testing -->
Modified: camel/trunk/components/camel-restlet/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/pom.xml?rev=826666&r1=826665&r2=826666&view=diff
==============================================================================
--- camel/trunk/components/camel-restlet/pom.xml (original)
+++ camel/trunk/components/camel-restlet/pom.xml Mon Oct 19 13:26:24 2009
@@ -75,7 +75,6 @@
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
<scope>test</scope>
</dependency>
Modified: camel/trunk/components/camel-ruby/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ruby/pom.xml?rev=826666&r1=826665&r2=826666&view=diff
==============================================================================
--- camel/trunk/components/camel-ruby/pom.xml (original)
+++ camel/trunk/components/camel-ruby/pom.xml Mon Oct 19 13:26:24 2009
@@ -47,7 +47,6 @@
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby</artifactId>
- <version>1.2.0</version>
</dependency>
<!-- testing -->
Modified: camel/trunk/components/camel-script/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-script/pom.xml?rev=826666&r1=826665&r2=826666&view=diff
==============================================================================
--- camel/trunk/components/camel-script/pom.xml (original)
+++ camel/trunk/components/camel-script/pom.xml Mon Oct 19 13:26:24 2009
@@ -147,7 +147,6 @@
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby</artifactId>
- <version>1.2.0</version>
<scope>test</scope>
</dependency>
Modified: camel/trunk/components/camel-web/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-web/pom.xml?rev=826666&r1=826665&r2=826666&view=diff
==============================================================================
--- camel/trunk/components/camel-web/pom.xml (original)
+++ camel/trunk/components/camel-web/pom.xml Mon Oct 19 13:26:24 2009
@@ -318,7 +318,7 @@
<docletArtifact>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.6.1</version>
+ <version>2.8.1</version>
</docletArtifact>
<!--
<docletArtifact>
Modified: camel/trunk/components/camel-xstream/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-xstream/pom.xml?rev=826666&r1=826665&r2=826666&view=diff
==============================================================================
--- camel/trunk/components/camel-xstream/pom.xml (original)
+++ camel/trunk/components/camel-xstream/pom.xml Mon Oct 19 13:26:24 2009
@@ -58,7 +58,6 @@
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <version>1.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
@@ -86,7 +85,7 @@
<dependency>
<groupId>xpp3</groupId>
<artifactId>xpp3</artifactId>
- <version>1.1.3.3</version>
+ <version>1.1.4c</version>
<scope>test</scope>
</dependency>
Modified: camel/trunk/examples/camel-example-axis/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-axis/pom.xml?rev=826666&r1=826665&r2=826666&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-axis/pom.xml (original)
+++ camel/trunk/examples/camel-example-axis/pom.xml Mon Oct 19 13:26:24 2009
@@ -79,7 +79,6 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.14</version>
</dependency>
<!-- for unit testing -->
Modified: camel/trunk/examples/camel-example-cxf/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/pom.xml?rev=826666&r1=826665&r2=826666&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf/pom.xml (original)
+++ camel/trunk/examples/camel-example-cxf/pom.xml Mon Oct 19 13:26:24 2009
@@ -80,7 +80,6 @@
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.8.1</version>
</dependency>
<!-- testing -->
Modified: camel/trunk/examples/camel-example-reportincident/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-reportincident/pom.xml?rev=826666&r1=826665&r2=826666&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-reportincident/pom.xml (original)
+++ camel/trunk/examples/camel-example-reportincident/pom.xml Mon Oct 19
13:26:24 2009
@@ -81,7 +81,6 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.14</version>
</dependency>
<!-- cxf web container for unit testing -->
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=826666&r1=826665&r2=826666&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Mon Oct 19 13:26:24 2009
@@ -50,6 +50,7 @@
<jetty-version>6.1.16</jetty-version>
<slf4j-version>1.5.8</slf4j-version>
<openjpa-version>1.2.1</openjpa-version>
+ <jruby-version>1.2.0</jruby-version>
<spring-version>2.5.6</spring-version>
<spring-osgi-version>1.2.0</spring-osgi-version>
<mina-version>1.1.7</mina-version>
@@ -1025,7 +1026,7 @@
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <version>1.0.1</version>
+ <version>1.1</version>
</dependency>
<dependency>
@@ -1041,6 +1042,32 @@
<version>1.2.8</version>
</dependency>
+ <dependency>
+ <groupId>org.jruby</groupId>
+ <artifactId>jruby</artifactId>
+ <version>${jruby-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>${commons-dbcp-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>${commons-collections-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${httpclient-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xerces-version}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
@@ -1049,7 +1076,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.2</version>
<inherited>true</inherited>
<executions>
<execution>
@@ -1115,7 +1141,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
- <version>1.0-alpha-2</version>
<inherited>true</inherited>
<executions>
<execution>
@@ -1137,6 +1162,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.5.1</version>
<configuration>
<buildcommands>
<java.lang.String>org.eclipse.jdt.core.javabuilder</java.lang.String>
@@ -1195,6 +1221,106 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>1.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>2.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.1-alpha-2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>properties-maven-plugin</artifactId>
+ <version>1.0-alpha-2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>axistools-maven-plugin</artifactId>
+ <version>1.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.1.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>ianal-maven-plugin</artifactId>
+ <version>1.0-alpha-1</version>
+ </plugin>
</plugins>
</pluginManagement>
<defaultGoal>install</defaultGoal>
Modified: camel/trunk/tests/camel-itest-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/pom.xml?rev=826666&r1=826665&r2=826666&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/pom.xml (original)
+++ camel/trunk/tests/camel-itest-osgi/pom.xml Mon Oct 19 13:26:24 2009
@@ -127,7 +127,6 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -138,7 +137,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.5</version>
<scope>test</scope>
</dependency>
