Author: cmueller Date: Wed Oct 3 21:56:50 2012 New Revision: 1393788 URL: http://svn.apache.org/viewvc?rev=1393788&view=rev Log: CAMEL-5578: Polish our pom's to be as DRY as possible
Modified: camel/trunk/components/camel-spring-ws/pom.xml camel/trunk/components/camel-ssh/pom.xml camel/trunk/components/camel-stax/pom.xml camel/trunk/components/camel-stream/pom.xml camel/trunk/components/camel-stringtemplate/pom.xml camel/trunk/components/camel-syslog/pom.xml camel/trunk/components/camel-tagsoup/pom.xml camel/trunk/components/camel-test-spring/pom.xml camel/trunk/components/camel-twitter/pom.xml camel/trunk/components/camel-velocity/pom.xml camel/trunk/components/camel-web/pom.xml camel/trunk/components/camel-websocket/pom.xml camel/trunk/components/camel-xmlbeans/pom.xml camel/trunk/components/camel-xmlsecurity/pom.xml camel/trunk/components/camel-xmpp/pom.xml camel/trunk/components/camel-xstream/pom.xml camel/trunk/components/camel-zookeeper/pom.xml camel/trunk/parent/pom.xml camel/trunk/platforms/karaf/features/src/main/resources/features.xml Modified: camel/trunk/components/camel-spring-ws/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-ws/pom.xml?rev=1393788&r1=1393787&r2=1393788&view=diff ============================================================================== --- camel/trunk/components/camel-spring-ws/pom.xml (original) +++ camel/trunk/components/camel-spring-ws/pom.xml Wed Oct 3 21:56:50 2012 @@ -84,7 +84,7 @@ <scope>provided</scope> </dependency> - <!-- testing --> + <!-- test dependencies --> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> @@ -145,7 +145,7 @@ <dependency> <groupId>net.javacrumbs</groupId> <artifactId>spring-ws-test</artifactId> - <version>0.19</version> + <version>${javacrumbs-version}</version> <exclusions> <exclusion> <groupId>xmlunit</groupId> Modified: camel/trunk/components/camel-ssh/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ssh/pom.xml?rev=1393788&r1=1393787&r2=1393788&view=diff ============================================================================== --- camel/trunk/components/camel-ssh/pom.xml (original) +++ camel/trunk/components/camel-ssh/pom.xml Wed Oct 3 21:56:50 2012 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. @@ -15,7 +14,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and 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> @@ -51,35 +49,23 @@ <version>${sshd-version}</version> </dependency> - <!-- for testing --> + <!-- test dependencies --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-test</artifactId> <scope>test</scope> </dependency> - <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcpg-jdk16</artifactId> <version>${bouncycastle-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-stax/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-stax/pom.xml?rev=1393788&r1=1393787&r2=1393788&view=diff ============================================================================== --- camel/trunk/components/camel-stax/pom.xml (original) +++ camel/trunk/components/camel-stax/pom.xml Wed Oct 3 21:56:50 2012 @@ -40,6 +40,7 @@ <artifactId>camel-core</artifactId> </dependency> + <!-- test dependencies --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-test-spring</artifactId> Modified: camel/trunk/components/camel-stream/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-stream/pom.xml?rev=1393788&r1=1393787&r2=1393788&view=diff ============================================================================== --- camel/trunk/components/camel-stream/pom.xml (original) +++ camel/trunk/components/camel-stream/pom.xml Wed Oct 3 21:56:50 2012 @@ -42,7 +42,7 @@ <artifactId>camel-core</artifactId> </dependency> - <!-- testing --> + <!-- test dependencies --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-test</artifactId> Modified: camel/trunk/components/camel-stringtemplate/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-stringtemplate/pom.xml?rev=1393788&r1=1393787&r2=1393788&view=diff ============================================================================== --- camel/trunk/components/camel-stringtemplate/pom.xml (original) +++ camel/trunk/components/camel-stringtemplate/pom.xml Wed Oct 3 21:56:50 2012 @@ -46,7 +46,7 @@ <version>${stringtemplate-version}</version> </dependency> - <!-- testing --> + <!-- test dependencies --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-test</artifactId> Modified: camel/trunk/components/camel-syslog/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-syslog/pom.xml?rev=1393788&r1=1393787&r2=1393788&view=diff ============================================================================== --- camel/trunk/components/camel-syslog/pom.xml (original) +++ camel/trunk/components/camel-syslog/pom.xml Wed Oct 3 21:56:50 2012 @@ -39,7 +39,7 @@ <artifactId>camel-core</artifactId> </dependency> - <!-- testing --> + <!-- test dependencies --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-test-spring</artifactId> Modified: camel/trunk/components/camel-tagsoup/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-tagsoup/pom.xml?rev=1393788&r1=1393787&r2=1393788&view=diff ============================================================================== --- camel/trunk/components/camel-tagsoup/pom.xml (original) +++ camel/trunk/components/camel-tagsoup/pom.xml Wed Oct 3 21:56:50 2012 @@ -45,7 +45,7 @@ <artifactId>tagsoup</artifactId> </dependency> - <!-- testing --> + <!-- test dependencies --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-test</artifactId> Modified: camel/trunk/components/camel-test-spring/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test-spring/pom.xml?rev=1393788&r1=1393787&r2=1393788&view=diff ============================================================================== --- camel/trunk/components/camel-test-spring/pom.xml (original) +++ camel/trunk/components/camel-test-spring/pom.xml Wed Oct 3 21:56:50 2012 @@ -45,19 +45,17 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-spring</artifactId> </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + </dependency> - <!-- optional dependencies for running tests --> + <!-- test dependencies --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> <scope>test</scope> </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - </dependency> - </dependencies> </project> Modified: camel/trunk/components/camel-twitter/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-twitter/pom.xml?rev=1393788&r1=1393787&r2=1393788&view=diff ============================================================================== --- camel/trunk/components/camel-twitter/pom.xml (original) +++ camel/trunk/components/camel-twitter/pom.xml Wed Oct 3 21:56:50 2012 @@ -49,7 +49,8 @@ <artifactId>twitter4j-stream</artifactId> <version>${twitter4j-version}</version> </dependency> - <!-- testing --> + + <!-- test dependencies --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-test</artifactId> Modified: camel/trunk/components/camel-velocity/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-velocity/pom.xml?rev=1393788&r1=1393787&r2=1393788&view=diff ============================================================================== --- camel/trunk/components/camel-velocity/pom.xml (original) +++ camel/trunk/components/camel-velocity/pom.xml Wed Oct 3 21:56:50 2012 @@ -46,7 +46,7 @@ <version>${velocity-version}</version> </dependency> - <!-- testing --> + <!-- test dependencies --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-test-spring</artifactId> @@ -71,7 +71,7 @@ <dependency> <groupId>org.apache.velocity</groupId> <artifactId>velocity-tools</artifactId> - <version>2.0</version> + <version>${velocity-tools-version}</version> <scope>test</scope> </dependency> </dependencies> Modified: camel/trunk/components/camel-web/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/pom.xml?rev=1393788&r1=1393787&r2=1393788&view=diff ============================================================================== --- camel/trunk/components/camel-web/pom.xml (original) +++ camel/trunk/components/camel-web/pom.xml Wed Oct 3 21:56:50 2012 @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version - 2.0 (the "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 Unless required by - applicable law or agreed to in writing, software distributed under the - License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR - CONDITIONS OF ANY KIND, either express or implied. See the License for - the specific language governing permissions and limitations under the - License. - --> + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version + 2.0 (the "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 Unless required by + applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + CONDITIONS OF ANY KIND, either express or implied. See the License for + the specific language governing permissions and 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"> <parent> @@ -255,11 +255,6 @@ <plugin> <groupId>org.apache.tomcat.maven</groupId> <artifactId>tomcat7-maven-plugin</artifactId> - <version>2.0-beta-1</version> - <configuration> - <path>/</path> - <useSeparateTomcatClassLoader>true</useSeparateTomcatClassLoader> - </configuration> </plugin> @@ -295,17 +290,11 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>tomcat-maven-plugin</artifactId> - <version>1.0</version> - <configuration> - <path>/</path> - </configuration> </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> - <version>1.1.1</version> <executions> <execution> <goals> @@ -805,19 +794,17 @@ <dependency> <groupId>jline</groupId> <artifactId>jline</artifactId> - <version>0.9.94</version> + <version>${jline-version}</version> </dependency> </dependencies> <build> <plugins> - <!-- to generate the MANIFEST-FILE required by the bundle --> <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <version>2.0.1</version> <extensions>true</extensions> <executions> <execution> @@ -850,7 +837,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <version>2.1</version> <configuration> <attachClasses>true</attachClasses> <!-- <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes> --> Modified: camel/trunk/components/camel-websocket/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-websocket/pom.xml?rev=1393788&r1=1393787&r2=1393788&view=diff ============================================================================== --- camel/trunk/components/camel-websocket/pom.xml (original) +++ camel/trunk/components/camel-websocket/pom.xml Wed Oct 3 21:56:50 2012 @@ -69,7 +69,8 @@ <artifactId>jetty-jmx</artifactId> <version>${jetty-version}</version> </dependency> - <!-- Unit test --> + + <!-- test dependencies --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-test</artifactId> @@ -89,10 +90,8 @@ <groupId>com.ning</groupId> <artifactId>async-http-client</artifactId> <version>${ahc-version}</version> - <!--<version>1.8.0-SNAPSHOT</version> --> <scope>test</scope> </dependency> - <!-- logging --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> Modified: camel/trunk/components/camel-xmlbeans/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmlbeans/pom.xml?rev=1393788&r1=1393787&r2=1393788&view=diff ============================================================================== --- camel/trunk/components/camel-xmlbeans/pom.xml (original) +++ camel/trunk/components/camel-xmlbeans/pom.xml Wed Oct 3 21:56:50 2012 @@ -50,7 +50,7 @@ <artifactId>stax-api</artifactId> </dependency> - <!-- testing --> + <!-- test dependencies --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-test</artifactId> Modified: camel/trunk/components/camel-xmlsecurity/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmlsecurity/pom.xml?rev=1393788&r1=1393787&r2=1393788&view=diff ============================================================================== --- camel/trunk/components/camel-xmlsecurity/pom.xml (original) +++ camel/trunk/components/camel-xmlsecurity/pom.xml Wed Oct 3 21:56:50 2012 @@ -48,7 +48,8 @@ <groupId>xalan</groupId> <artifactId>xalan</artifactId> </dependency> - <!-- testing --> + + <!-- test dependencies --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-spring</artifactId> Modified: camel/trunk/components/camel-xmpp/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/pom.xml?rev=1393788&r1=1393787&r2=1393788&view=diff ============================================================================== --- camel/trunk/components/camel-xmpp/pom.xml (original) +++ camel/trunk/components/camel-xmpp/pom.xml Wed Oct 3 21:56:50 2012 @@ -54,6 +54,8 @@ <artifactId>smackx</artifactId> <version>${smack-version}</version> </dependency> + + <!-- test dependencies --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> Modified: camel/trunk/components/camel-xstream/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xstream/pom.xml?rev=1393788&r1=1393787&r2=1393788&view=diff ============================================================================== --- camel/trunk/components/camel-xstream/pom.xml (original) +++ camel/trunk/components/camel-xstream/pom.xml Wed Oct 3 21:56:50 2012 @@ -64,7 +64,7 @@ <artifactId>woodstox-core-asl</artifactId> </dependency> - <!-- testing --> + <!-- test dependencies --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-test</artifactId> @@ -78,10 +78,9 @@ <dependency> <groupId>xpp3</groupId> <artifactId>xpp3</artifactId> - <version>1.1.4c</version> + <version>${xpp3-version}</version> <scope>test</scope> </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> Modified: camel/trunk/components/camel-zookeeper/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/pom.xml?rev=1393788&r1=1393787&r2=1393788&view=diff ============================================================================== --- camel/trunk/components/camel-zookeeper/pom.xml (original) +++ camel/trunk/components/camel-zookeeper/pom.xml Wed Oct 3 21:56:50 2012 @@ -45,7 +45,7 @@ <artifactId>zookeeper</artifactId> </dependency> - <!-- testing --> + <!-- test dependencies --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-test-spring</artifactId> Modified: camel/trunk/parent/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1393788&r1=1393787&r2=1393788&view=diff ============================================================================== --- camel/trunk/parent/pom.xml (original) +++ camel/trunk/parent/pom.xml Wed Oct 3 21:56:50 2012 @@ -172,6 +172,7 @@ <jasypt-version>1.9.0</jasypt-version> <java-apns-bundle-version>0.1.6_3</java-apns-bundle-version> <java-apns-version>0.1.6</java-apns-version> + <javacrumbs-version>0.19</javacrumbs-version> <javassist-bundle-version>3.12.1.GA_3</javassist-bundle-version> <javax-mail-version>1.4.5</javax-mail-version> <jaxb-bundle-version>2.2.1.1_2</jaxb-bundle-version> @@ -191,6 +192,7 @@ <jibx-version>1.2.4.5</jibx-version> <jing-bundle-version>20030619_5</jing-bundle-version> <jing-version>20030619</jing-version> + <jline-version>0.9.94</jline-version> <jodatime-bundle-version>1.6.2</jodatime-bundle-version> <jodatime2-bundle-version>2.1</jodatime2-bundle-version> <josql-bundle-version>1.5_5</josql-bundle-version> @@ -313,6 +315,7 @@ <twitter4j-bundle-version>2.2.5_2</twitter4j-bundle-version> <twitter4j-version>2.2.5</twitter4j-version> <velocity-bundle-version>1.7_4</velocity-bundle-version> + <velocity-tools-version>2.0</velocity-tools-version> <velocity-version>1.7</velocity-version> <vysper-version>0.7</vysper-version> <!-- should be in-sync with deltaspike --> @@ -334,6 +337,7 @@ <xmlsec-version>1.5.1</xmlsec-version> <xmlunit-version>1.3</xmlunit-version> <xpp3-bundle-version>1.1.4c_6</xpp3-bundle-version> + <xpp3-version>1.1.4c</xpp3-version> <xsdlib-version>20060615</xsdlib-version> <xstream-bundle-version>1.4.3_1</xstream-bundle-version> <xstream-version>1.4.3</xstream-version> @@ -1690,11 +1694,6 @@ <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> @@ -2127,6 +2126,15 @@ <artifactId>apache-rat-plugin</artifactId> <version>0.8</version> </plugin> + <plugin> + <groupId>org.apache.tomcat.maven</groupId> + <artifactId>tomcat7-maven-plugin</artifactId> + <version>2.0</version> + <configuration> + <path>/</path> + <useSeparateTomcatClassLoader>true</useSeparateTomcatClassLoader> + </configuration> + </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>axistools-maven-plugin</artifactId> @@ -2191,6 +2199,14 @@ <version>2.4</version> </plugin> <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>tomcat-maven-plugin</artifactId> + <version>1.1</version> + <configuration> + <path>/</path> + </configuration> + </plugin> + <plugin> <groupId>org.jvnet.jaxb2.maven2</groupId> <artifactId>maven-jaxb2-plugin</artifactId> <version>0.8.1</version> Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1393788&r1=1393787&r2=1393788&view=diff ============================================================================== --- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original) +++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Wed Oct 3 21:56:50 2012 @@ -135,12 +135,12 @@ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mina/${mina-bundle-version}</bundle> <bundle>mvn:org.apache.camel/camel-mina/${project.version}</bundle> </feature> - <feature name='camel-mina2' version='${pom.version}' resolver='(obr)' start-level='50'> - <feature version='${pom.version}'>camel-core</feature> + <feature name='camel-mina2' version='${project.version}' resolver='(obr)' start-level='50'> + <feature version='${project.version}'>camel-core</feature> <bundle dependency="true">mvn:org.apache.mina/mina-core/${mina2-version}</bundle> - <bundle>mvn:org.apache.camel/camel-mina2/${pom.version}</bundle> + <bundle>mvn:org.apache.camel/camel-mina2/${project.version}</bundle> </feature> - <feature name='camel-jetty' version='${pom.version}' resolver='(obr)' start-level='50'> + <feature name='camel-jetty' version='${project.version}' resolver='(obr)' start-level='50'> <feature>jetty</feature> <feature version='${project.version}'>camel-core</feature> <feature version='${project.version}'>camel-http</feature> @@ -314,7 +314,7 @@ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.flatpack/${flatpack-bundle-version}</bundle> <bundle>mvn:org.apache.camel/camel-flatpack/${project.version}</bundle> </feature> - <feature name='camel-fop' version='${pom.version}' resolver='(obr)' start-level='50'> + <feature name='camel-fop' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.avalon-framework/${avalon-bundle-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.fop/${fop-bundle-version}</bundle>