Hi Hadrian,

There are some difference between the etc/activemq*.xml and buildingtools/camel-*.xml.
And now the buildingtools/camel-*.xml are used for the checkstyle.

So I will revert the this part of change.

For the pom.xml, I don't know why you add the CXF and Jetty version properties here, We have the parent/pom.xml to hold these dependency information. BTW, current camel 2.0.x dependents on CXF 2.2.2.

>    <properties>
> -    <!-- Repositories -->
> - <m1-repo-url>scpexe://minotaur.apache.org/www/people.apache.org/repo/m1-snapshot-repository</m1-repo-url>
> +    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
> <site-repo-url>scpexe://people.apache.org/www/camel.apache.org/maven/</site-repo-url>
> +    <cxf-version>2.2</cxf-version>
>      <felix-version>1.4.1</felix-version>
> +    <jetty-version>6.1.18</jetty-version>
>    </properties>

Willem

hadr...@apache.org wrote:
Author: hadrian
Date: Thu Aug  6 18:03:36 2009
New Revision: 801748

URL: http://svn.apache.org/viewvc?rev=801748&view=rev
Log:
CAMEL-1766.  Patch applied with many thanks

Added:
    camel/trunk/buildingtools/camel-checkstyle-suppressions.xml
      - copied unchanged from r801653, 
camel/trunk/etc/activemq-checkstyle-suppressions.xml
    camel/trunk/buildingtools/camel-checkstyle.xml
      - copied unchanged from r801653, camel/trunk/etc/activemq-checkstyle.xml
    camel/trunk/buildingtools/camel-eclipse-checkstyle
      - copied unchanged from r801653, 
camel/trunk/etc/activemq-eclipse-checkstyle
    camel/trunk/buildingtools/camel-eclipse-pmd
      - copied unchanged from r801653, camel/trunk/etc/activemq-eclipse-pmd
    camel/trunk/buildingtools/camel-pmd-ruleset.xml
      - copied unchanged from r801653, camel/trunk/etc/activemq-pmd-ruleset.xml
Removed:
    camel/trunk/etc/activemq-checkstyle-suppressions.xml
    camel/trunk/etc/activemq-checkstyle.xml
    camel/trunk/etc/activemq-eclipse-checkstyle
    camel/trunk/etc/activemq-eclipse-pmd
    camel/trunk/etc/activemq-pmd-ruleset.xml
Modified:
    camel/trunk/apache-camel/pom.xml
    camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
    camel/trunk/components/camel-web/pom.xml
    camel/trunk/examples/camel-example-axis/pom.xml
    camel/trunk/pom.xml

Reply via email to