camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jans...@apache.org
Subject svn commit: r826726 - in /camel/trunk: parent/pom.xml tests/test-bundles/pom.xml
Date Mon, 19 Oct 2009 17:23:56 GMT
Author: janstey
Date: Mon Oct 19 17:23:56 2009
New Revision: 826726

URL: http://svn.apache.org/viewvc?rev=826726&view=rev
Log:
MR-252 - clean up more plugin versions

Modified:
    camel/trunk/parent/pom.xml
    camel/trunk/tests/test-bundles/pom.xml

Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=826726&r1=826725&r2=826726&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Mon Oct 19 17:23:56 2009
@@ -1,21 +1,12 @@
 <?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>
@@ -32,7 +23,7 @@
   <packaging>pom</packaging>
   <name>Camel :: Parent</name>
   <description>Camel Parent POM</description>
-  
+
   <properties>
     <compiler.fork>false</compiler.fork>
     <!-- Note that activemq dependency is only used for testing! -->
@@ -79,7 +70,7 @@
     <junit-version>4.6</junit-version>
     <ognl-version>2.7.3_1</ognl-version>
     <pax-exam-version>1.0.0</pax-exam-version>
-    <pax-tiny-bundle-version>1.0.0</pax-tiny-bundle-version>  
+    <pax-tiny-bundle-version>1.0.0</pax-tiny-bundle-version>
     <qpid-version>0.5.0</qpid-version>
     <restlet-version>1.1.5</restlet-version>
     <saxon-version>9.1.0.1</saxon-version>
@@ -107,31 +98,31 @@
     <camel.osgi.import.strict.version>version="[$(version;===;${camel.osgi.version.clean}),$(version;==+;${camel.osgi.version.clean}))"</camel.osgi.import.strict.version>
     <camel.osgi.import.default.version>[$(version;==;$(@)),$(version;+;$(@)))</camel.osgi.import.default.version>
     <camel.osgi.import.defaults>
-        org.apache.commons.logging.*;version="[1.1,2)",
-        org.apache.cxf.*;version="[2.2,3)",
-        org.apache.qpid.*;version="[0.5,0.6)",
-        org.apache.abdera.*;version="[0.4,0.5)",
-        org.apache.commons.httpclient.*;version="[3.1,4.0)",
-        org.apache.mina.*;version="[1.1.7,2.0)",
-        org.apache.velocity.*;version="[1.6.2,2)",
-        org.apache.xmlbeans.*;version="[2.4,3)",
-        com.thoughtworks.xstream.*;version="[1.3,2)",
-        org.antlr.stringtemplate.*;version="[3.0,4)",
-        org.jivesoftware.smack.*;version="[3.0,4)",
-        org.ccil.cowan.tagsoup.*;version="[1.2,2)",
-        org.mortbay.cometd.*;version="[6.1,7)",
-        net.sf.flatpack.*;version="[3.1.1,4)",
-        freemarker.*;version="[2.3.15,3)",
-        javax.persistence.*;version="[1.1,2)",
+      org.apache.commons.logging.*;version="[1.1,2)",
+      org.apache.cxf.*;version="[2.2,3)",
+      org.apache.qpid.*;version="[0.5,0.6)",
+      org.apache.abdera.*;version="[0.4,0.5)",
+      org.apache.commons.httpclient.*;version="[3.1,4.0)",
+      org.apache.mina.*;version="[1.1.7,2.0)",
+      org.apache.velocity.*;version="[1.6.2,2)",
+      org.apache.xmlbeans.*;version="[2.4,3)",
+      com.thoughtworks.xstream.*;version="[1.3,2)",
+      org.antlr.stringtemplate.*;version="[3.0,4)",
+      org.jivesoftware.smack.*;version="[3.0,4)",
+      org.ccil.cowan.tagsoup.*;version="[1.2,2)",
+      org.mortbay.cometd.*;version="[6.1,7)",
+      net.sf.flatpack.*;version="[3.1.1,4)",
+      freemarker.*;version="[2.3.15,3)",
+      javax.persistence.*;version="[1.1,2)",
     </camel.osgi.import.defaults>
     <camel.osgi.import.additional />
     <camel.osgi.import.pkg>
-        !javax.xml.bind.annotation.adapters,
-        !${camel.osgi.export.pkg},
-        org.apache.camel.*;${camel.osgi.import.camel.version},
-        ${camel.osgi.import.defaults},
-        ${camel.osgi.import.additional},
-        *
+      !javax.xml.bind.annotation.adapters,
+      !${camel.osgi.export.pkg},
+      org.apache.camel.*;${camel.osgi.import.camel.version},
+      ${camel.osgi.import.defaults},
+      ${camel.osgi.import.additional},
+      *
     </camel.osgi.import.pkg>
     <camel.osgi.activator />
     <camel.osgi.private.pkg>!*</camel.osgi.private.pkg>
@@ -537,7 +528,7 @@
         <artifactId>camel-manual</artifactId>
         <version>${project.version}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.apache.camel.tests</groupId>
         <artifactId>org.apache.camel.tests.mock-javamail_1.7</artifactId>
@@ -614,28 +605,12 @@
       </dependency>
 
       <!-- TODO not needed as parent dependency -->
-<!--
-      <dependency>
-        <groupId>commons-collections</groupId>
-        <artifactId>commons-collections</artifactId>
-        <version>${commons-collections-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-pool</groupId>
-        <artifactId>commons-pool</artifactId>
-        <version>${commons-pool-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-dbcp</groupId>
-        <artifactId>commons-dbcp</artifactId>
-        <version>${commons-dbcp-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-io</groupId>
-        <artifactId>commons-io</artifactId>
-        <version>${commons-io-version}</version>
-      </dependency>
--->
+      <!--
+        <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId>
<version>${commons-collections-version}</version>
+        </dependency> <dependency> <groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId> <version>${commons-pool-version}</version>
+        </dependency> <dependency> <groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId> <version>${commons-dbcp-version}</version>
+        </dependency> <dependency> <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId> <version>${commons-io-version}</version>
</dependency>
+      -->
       <dependency>
         <groupId>log4j</groupId>
         <artifactId>log4j</artifactId>
@@ -643,10 +618,10 @@
       </dependency>
 
       <!-- optional dependencies for felix -->
-      <dependency>       
+      <dependency>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.osgi.core</artifactId>
-        <version>${felix-osgi-version}</version>     
+        <version>${felix-osgi-version}</version>
       </dependency>
 
       <!-- optional dependencies for JMS -->
@@ -724,7 +699,7 @@
         <groupId>org.springframework</groupId>
         <artifactId>spring-test</artifactId>
         <version>${spring-version}</version>
-      </dependency>      
+      </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-core</artifactId>
@@ -743,17 +718,17 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-web</artifactId>
-        <version>${spring-version}</version>       
+        <version>${spring-version}</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-aop</artifactId>
-        <version>${spring-version}</version>      
+        <version>${spring-version}</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-jdbc</artifactId>
-        <version>${spring-version}</version>         
+        <version>${spring-version}</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
@@ -763,7 +738,7 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-jms</artifactId>
-        <version>${spring-version}</version>	  
+        <version>${spring-version}</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
@@ -839,7 +814,7 @@
         <artifactId>jetty-client</artifactId>
         <version>${jetty-version}</version>
       </dependency>
-   
+
       <!-- optional restlet support -->
       <dependency>
         <groupId>org.restlet</groupId>
@@ -848,7 +823,7 @@
       </dependency>
       <dependency>
         <groupId>com.noelios.restlet</groupId>
-        <artifactId>com.noelios.restlet</artifactId>      
+        <artifactId>com.noelios.restlet</artifactId>
         <version>${restlet-version}</version>
       </dependency>
 
@@ -880,12 +855,12 @@
         <artifactId>groovy-engine</artifactId>
         <version>20070112</version>
       </dependency>
-      
+
       <!-- optional ognl support -->
       <dependency>
-         <groupId>org.apache.servicemix.bundles</groupId>
-         <artifactId>org.apache.servicemix.bundles.ognl</artifactId>
-         <version>${ognl-version}</version>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.ognl</artifactId>
+        <version>${ognl-version}</version>
       </dependency>
 
       <!-- optional Pax support-->
@@ -1008,14 +983,14 @@
         <artifactId>org.apache.servicemix.bundles.javax.mail</artifactId>
         <version>${javax-mail-version}</version>
       </dependency>
-      
+
       <!-- optional SNMP4J -->
       <dependency>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>org.apache.servicemix.bundles.snmp4j</artifactId>
         <version>${snmp4j-version}</version>
       </dependency>
-   
+
       <!-- optional XStream -->
       <dependency>
         <groupId>com.thoughtworks.xstream</groupId>
@@ -1072,294 +1047,299 @@
   </dependencyManagement>
 
   <build>
-      <plugins>
-          <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-antrun-plugin</artifactId>
-              <inherited>true</inherited>
-              <executions>
-                  <execution>
-                      <id>create-prop</id>
-                      <phase>initialize</phase>
-                      <configuration>
-                          <tasks>
-                              <taskdef resource="net/sf/antcontrib/antcontrib.properties"
classpathref="maven.plugin.classpath"/>
-                              <property name="ant.regexp.regexpimpl" value="org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp"/>
-                              <property name="mv" value="${project.version}"/>
-                              <echo message="Maven version:   ${mv}" />
-                              <propertyregex property="ov.p1" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?"
replace="\1" defaultValue="0"/>
-                              <propertyregex property="ov.p2" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?"
replace=".\2" defaultValue=".0"/>
-                              <propertyregex property="ov.p3" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?"
replace=".\3" defaultValue=".0"/>
-                              <propertyregex property="ov.p4" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?"
replace=".\4" defaultValue=""/>
-                              <propertyregex property="ov.p1a" input="${ov.p1}" regexp="(.+)"
replace="\1" defaultValue="0"/>
-                              <propertyregex property="ov.p2a" input="${ov.p2}" regexp="(\..+)"
replace="\1" defaultValue=".0"/>
-                              <propertyregex property="ov.p3a" input="${ov.p3}" regexp="(\..+)"
replace="\1" defaultValue=".0"/>
-                              <propertyregex property="ov.p4a" input="${ov.p4}" regexp="(\..+)"
replace="\1" defaultValue=""/>
-                              <property name="ov" value="${ov.p1a}${ov.p2a}${ov.p3a}${ov.p4a}"/>
-                              <property name="os" value="${ov.p1a}${ov.p2a}"/>
-                              <echo message="OSGi version:    ${ov}" />
-                              <mkdir dir="target"/>
-                              <echo file="target/camel.osgi.version.txt">
-                                camel.osgi.version.clean = ${ov}
-                                camel.schema.version = ${os}
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <inherited>true</inherited>
+        <executions>
+          <execution>
+            <id>create-prop</id>
+            <phase>initialize</phase>
+            <configuration>
+              <tasks>
+                <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath"
/>
+                <property name="ant.regexp.regexpimpl" value="org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp"
/>
+                <property name="mv" value="${project.version}" />
+                <echo message="Maven version:   ${mv}" />
+                <propertyregex property="ov.p1" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?"
replace="\1"
+                  defaultValue="0" />
+                <propertyregex property="ov.p2" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?"
replace=".\2"
+                  defaultValue=".0" />
+                <propertyregex property="ov.p3" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?"
replace=".\3"
+                  defaultValue=".0" />
+                <propertyregex property="ov.p4" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?"
replace=".\4"
+                  defaultValue="" />
+                <propertyregex property="ov.p1a" input="${ov.p1}" regexp="(.+)" replace="\1"
defaultValue="0" />
+                <propertyregex property="ov.p2a" input="${ov.p2}" regexp="(\..+)" replace="\1"
defaultValue=".0" />
+                <propertyregex property="ov.p3a" input="${ov.p3}" regexp="(\..+)" replace="\1"
defaultValue=".0" />
+                <propertyregex property="ov.p4a" input="${ov.p4}" regexp="(\..+)" replace="\1"
defaultValue="" />
+                <property name="ov" value="${ov.p1a}${ov.p2a}${ov.p3a}${ov.p4a}" />
+                <property name="os" value="${ov.p1a}${ov.p2a}" />
+                <echo message="OSGi version:    ${ov}" />
+                <mkdir dir="target" />
+                <echo file="target/camel.osgi.version.txt">
+                  camel.osgi.version.clean = ${ov}
+                  camel.schema.version = ${os}
                               </echo>
-                          </tasks>
-                      </configuration>
-                      <goals>
-                          <goal>run</goal>
-                      </goals>
-                  </execution>
-              </executions>
-              <dependencies>
-                  <dependency>
-                      <groupId>javax.xml.bind</groupId>
-                      <artifactId>jaxb-api</artifactId>
-                      <version>2.1</version>
-                  </dependency>
-                  <dependency>
-                      <groupId>com.sun.xml.bind</groupId>
-                      <artifactId>jaxb-impl</artifactId>
-                      <version>2.1.5-dev</version>
-                  </dependency>
-                  <dependency>
-                      <groupId>com.sun.xml.bind</groupId>
-                      <artifactId>jaxb-xjc</artifactId>
-                      <version>2.1.5-dev</version>
-                  </dependency>
-                  <dependency>
-                      <groupId>ant-contrib</groupId>
-                      <artifactId>ant-contrib</artifactId>
-                      <version>1.0b3</version>
-                  </dependency>
-                  <dependency>
-                      <groupId>ant</groupId>
-                      <artifactId>ant-optional</artifactId>
-                      <version>1.5.3-1</version>
-                  </dependency>
-             </dependencies>
-          </plugin>
-          <plugin>
-              <groupId>org.codehaus.mojo</groupId>
-              <artifactId>properties-maven-plugin</artifactId>
-              <inherited>true</inherited>
-              <executions>
-                <execution>
-                  <phase>initialize</phase>
-                  <goals>
-                    <goal>read-project-properties</goal>
-                  </goals>
-                  <configuration>
-                    <files>
-                      <file>target/camel.osgi.version.txt</file>
-                    </files>
-                  </configuration>
-                </execution>
-              </executions>
-          </plugin>
-     </plugins>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.1</version>
+          </dependency>
+          <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>2.1.5-dev</version>
+          </dependency>
+          <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-xjc</artifactId>
+            <version>2.1.5-dev</version>
+          </dependency>
+          <dependency>
+            <groupId>ant-contrib</groupId>
+            <artifactId>ant-contrib</artifactId>
+            <version>1.0b3</version>
+          </dependency>
+          <dependency>
+            <groupId>ant</groupId>
+            <artifactId>ant-optional</artifactId>
+            <version>1.5.3-1</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>properties-maven-plugin</artifactId>
+        <inherited>true</inherited>
+        <executions>
+          <execution>
+            <phase>initialize</phase>
+            <goals>
+              <goal>read-project-properties</goal>
+            </goals>
+            <configuration>
+              <files>
+                <file>target/camel.osgi.version.txt</file>
+              </files>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
     <pluginManagement>
-            <plugins>
-                <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>
-                            <java.lang.String>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</java.lang.String>
-                            <!--java.lang.String>net.sourceforge.pmd.eclipse.plugin.pmdBuilder</java.lang.String-->
-                        </buildcommands>
-                        <projectnatures>
-                            <nature>org.eclipse.jdt.core.javanature</nature>
-                            <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
-                            <!--nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature-->
-                        </projectnatures>
-                        <additionalConfig>
-                            <file>
-                                <name>.checkstyle</name>
-                                <location>/camel-eclipse-checkstyle</location>
-                            </file>
-                            <!--file>
-                                <name>.pmd</name>
-                                <location>/cxf-eclipse-pmd</location>
-                            </file>
-                            <file>
-                                <name>.ruleset</name>
-                                <location>/cxf-pmd-ruleset.xml</location-->
-       
-                        </additionalConfig>
-                    </configuration>
-                </plugin>
-                
-		<plugin>
-			<groupId>org.apache.maven.plugins</groupId>
-			<artifactId>maven-checkstyle-plugin</artifactId>
-			<version>2.2</version>
-			<dependencies>
-				<dependency>
-					<groupId>org.apache.camel</groupId>
-					<artifactId>camel-buildtools</artifactId>
-					<version>${project.version}</version>						
-				</dependency>
-			</dependencies>
-			<executions>
-				<execution>
-					<id>validate</id>
-					<phase>validate</phase>
-					<configuration>
-						<configLocation>camel-checkstyle.xml</configLocation>
-						<consoleOutput>true</consoleOutput>
-						<failsOnError>true</failsOnError>
-						<linkXRef>false</linkXRef>
-						<suppressionsLocation>camel-checkstyle-suppressions.xml</suppressionsLocation>
-						<sourceDirectory>${basedir}/src</sourceDirectory>
-						<excludes>**/archetype-resources/**/*.java</excludes>
-					</configuration>
-					<goals>
-						<goal>checkstyle</goal>
-					</goals>
-				</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>
+      <plugins>
+        <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>
+              <java.lang.String>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</java.lang.String>
+              <!--java.lang.String>net.sourceforge.pmd.eclipse.plugin.pmdBuilder</java.lang.String-->
+            </buildcommands>
+            <projectnatures>
+              <nature>org.eclipse.jdt.core.javanature</nature>
+              <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
+              <!--nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature-->
+            </projectnatures>
+            <additionalConfig>
+              <file>
+                <name>.checkstyle</name>
+                <location>/camel-eclipse-checkstyle</location>
+              </file>
+              <!--
+                file> <name>.pmd</name> <location>/cxf-eclipse-pmd</location>
</file> <file> <name>.ruleset</name> <location>/cxf-pmd-ruleset.xml</location
+              -->
+
+            </additionalConfig>
+          </configuration>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-checkstyle-plugin</artifactId>
+          <version>2.2</version>
+          <dependencies>
+            <dependency>
+              <groupId>org.apache.camel</groupId>
+              <artifactId>camel-buildtools</artifactId>
+              <version>${project.version}</version>
+            </dependency>
+          </dependencies>
+          <executions>
+            <execution>
+              <id>validate</id>
+              <phase>validate</phase>
+              <configuration>
+                <configLocation>camel-checkstyle.xml</configLocation>
+                <consoleOutput>true</consoleOutput>
+                <failsOnError>true</failsOnError>
+                <linkXRef>false</linkXRef>
+                <suppressionsLocation>camel-checkstyle-suppressions.xml</suppressionsLocation>
+                <sourceDirectory>${basedir}/src</sourceDirectory>
+                <excludes>**/archetype-resources/**/*.java</excludes>
+              </configuration>
+              <goals>
+                <goal>checkstyle</goal>
+              </goals>
+            </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>
+        <plugin>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>maven-bundle-plugin</artifactId>
+          <version>2.0.1</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <defaultGoal>install</defaultGoal>
   </build>
   <reporting>
-         <plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>cobertura-maven-plugin</artifactId>
-            <version>2.3</version>
-            <configuration>
-              <formats>
-                <format>html</format>
-              </formats>
-            </configuration>
-          </plugin>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>cobertura-maven-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <formats>
+            <format>html</format>
+          </formats>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </reporting>
+  <profiles>
+    <profile>
+      <id>nochecks</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+    </profile>
+    <profile>
+      <id>sourcecheck</id>
+      <build>
+        <plugins>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-checkstyle-plugin</artifactId>
           </plugin>
         </plugins>
-    </reporting> 
-  <profiles>
-    <profile>
-	  <id>nochecks</id>
-          <activation>
-		<activeByDefault>true</activeByDefault>
-	  </activation>
-    </profile>
-    <profile>
-	<id>sourcecheck</id>
-        <build>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-checkstyle-plugin</artifactId>
-                </plugin>
-            </plugins>
-        </build>
+      </build>
     </profile>
     <profile>
       <id>on-sunjdk</id>
@@ -1373,23 +1353,23 @@
       <build>
         <plugins>
           <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-antrun-plugin</artifactId>
-              <inherited>true</inherited>
-              <dependencies>
-                <dependency>
-                  <groupId>com.sun</groupId>
-                  <artifactId>tools</artifactId>
-                  <version>1.5.0</version>
-                  <scope>system</scope>
-                  <systemPath>${java.home}/../lib/tools.jar</systemPath>
-                </dependency>
-              </dependencies>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <inherited>true</inherited>
+            <dependencies>
+              <dependency>
+                <groupId>com.sun</groupId>
+                <artifactId>tools</artifactId>
+                <version>1.5.0</version>
+                <scope>system</scope>
+                <systemPath>${java.home}/../lib/tools.jar</systemPath>
+              </dependency>
+            </dependencies>
           </plugin>
         </plugins>
       </build>
     </profile>
-      
+
   </profiles>
 
 </project>

Modified: camel/trunk/tests/test-bundles/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/test-bundles/pom.xml?rev=826726&r1=826725&r2=826726&view=diff
==============================================================================
--- camel/trunk/tests/test-bundles/pom.xml (original)
+++ camel/trunk/tests/test-bundles/pom.xml Mon Oct 19 17:23:56 2009
@@ -50,16 +50,10 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.3.1</version>
                     <configuration>
                         <skip>true</skip>
                     </configuration>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-shade-plugin</artifactId>
-                    <version>1.1</version>
-                </plugin>
             </plugins>
         </pluginManagement>
 
@@ -67,7 +61,6 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.4.1</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
@@ -84,7 +77,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.0</version>
                 <executions>
                     <execution>
                         <id>copy-legal</id>
@@ -117,7 +109,6 @@
             </plugin>
             <plugin>
                 <artifactId>maven-remote-resources-plugin</artifactId>
-                <version>1.0</version>
                 <executions>
                     <execution>
                         <goals>



Mime
View raw message