You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2009/08/06 20:03:37 UTC
svn commit: r801748 - in /camel/trunk: ./ apache-camel/
apache-camel/src/main/descriptors/ buildingtools/ components/camel-web/
etc/ examples/camel-example-axis/
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
Modified: camel/trunk/apache-camel/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/apache-camel/pom.xml?rev=801748&r1=801747&r2=801748&view=diff
==============================================================================
--- camel/trunk/apache-camel/pom.xml (original)
+++ camel/trunk/apache-camel/pom.xml Thu Aug 6 18:03:36 2009
@@ -424,30 +424,30 @@
<appendAssemblyId>false</appendAssemblyId>
</configuration>
</execution>
- <execution>
- <id>unix-src</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/descriptors/unix-src.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- <execution>
- <id>windows-src</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/descriptors/windows-src.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
+ <!--<execution>-->
+ <!--<id>unix-src</id>-->
+ <!--<phase>package</phase>-->
+ <!--<goals>-->
+ <!--<goal>single</goal>-->
+ <!--</goals>-->
+ <!--<configuration>-->
+ <!--<descriptors>-->
+ <!--<descriptor>src/main/descriptors/unix-src.xml</descriptor>-->
+ <!--</descriptors>-->
+ <!--</configuration>-->
+ <!--</execution>-->
+ <!--<execution>-->
+ <!--<id>windows-src</id>-->
+ <!--<phase>package</phase>-->
+ <!--<goals>-->
+ <!--<goal>single</goal>-->
+ <!--</goals>-->
+ <!--<configuration>-->
+ <!--<descriptors>-->
+ <!--<descriptor>src/main/descriptors/windows-src.xml</descriptor>-->
+ <!--</descriptors>-->
+ <!--</configuration>-->
+ <!--</execution>-->
</executions>
</plugin>
</plugins>
@@ -559,43 +559,43 @@
</plugins>
</build>
</profile>
- <profile>
- <id>assembly-src</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>unix-src</id>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/descriptors/unix-src.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- <execution>
- <id>windows-src</id>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/descriptors/windows-src.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
+ <!--<profile>-->
+ <!--<id>assembly-src</id>-->
+ <!--<build>-->
+ <!--<plugins>-->
+ <!--<plugin>-->
+ <!--<groupId>org.apache.maven.plugins</groupId>-->
+ <!--<artifactId>maven-assembly-plugin</artifactId>-->
+ <!--<executions>-->
+ <!--<execution>-->
+ <!--<id>unix-src</id>-->
+ <!--<phase>package</phase>-->
+ <!--<goals>-->
+ <!--<goal>attached</goal>-->
+ <!--</goals>-->
+ <!--<configuration>-->
+ <!--<descriptors>-->
+ <!--<descriptor>src/main/descriptors/unix-src.xml</descriptor>-->
+ <!--</descriptors>-->
+ <!--</configuration>-->
+ <!--</execution>-->
+ <!--<execution>-->
+ <!--<id>windows-src</id>-->
+ <!--<phase>package</phase>-->
+ <!--<goals>-->
+ <!--<goal>attached</goal>-->
+ <!--</goals>-->
+ <!--<configuration>-->
+ <!--<descriptors>-->
+ <!--<descriptor>src/main/descriptors/windows-src.xml</descriptor>-->
+ <!--</descriptors>-->
+ <!--</configuration>-->
+ <!--</execution>-->
+ <!--</executions>-->
+ <!--</plugin>-->
+ <!--</plugins>-->
+ <!--</build>-->
+ <!--</profile>-->
</profiles>
</project>
Modified: camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
URL: http://svn.apache.org/viewvc/camel/trunk/apache-camel/src/main/descriptors/common-bin.xml?rev=801748&r1=801747&r2=801748&view=diff
==============================================================================
--- camel/trunk/apache-camel/src/main/descriptors/common-bin.xml (original)
+++ camel/trunk/apache-camel/src/main/descriptors/common-bin.xml Thu Aug 6 18:03:36 2009
@@ -16,7 +16,7 @@
limitations under the License.
-->
<component>
- <id>common-bin</id>
+ <!--<id>common-bin</id>-->
<fileSets>
<fileSet>
Modified: camel/trunk/components/camel-web/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/pom.xml?rev=801748&r1=801747&r2=801748&view=diff
==============================================================================
--- camel/trunk/components/camel-web/pom.xml (original)
+++ camel/trunk/components/camel-web/pom.xml Thu Aug 6 18:03:36 2009
@@ -232,16 +232,13 @@
</configuration>
</plugin>
-
<plugin>
<artifactId>maven-war-plugin</artifactId>
- <version>2.1-alpha-2</version>
<configuration>
<attachClasses>true</attachClasses>
</configuration>
</plugin>
-
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
@@ -286,12 +283,12 @@
</executions>
<configuration>
-
<encoding>UTF-8</encoding>
<verbose>false</verbose>
<show>public</show>
<subpackages>org.apache.camel.web.resources</subpackages>
-
+ <!-- see http://jira.codehaus.org/browse/MJAVADOC-229 -->
+ <useStandardDocletOptions>false</useStandardDocletOptions>
<doclet>com.sun.jersey.wadl.resourcedoc.ResourceDoclet</doclet>
<docletArtifacts>
<docletArtifact>
Modified: camel/trunk/examples/camel-example-axis/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-axis/pom.xml?rev=801748&r1=801747&r2=801748&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-axis/pom.xml (original)
+++ camel/trunk/examples/camel-example-axis/pom.xml Thu Aug 6 18:03:36 2009
@@ -109,15 +109,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
Modified: camel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/pom.xml?rev=801748&r1=801747&r2=801748&view=diff
==============================================================================
--- camel/trunk/pom.xml (original)
+++ camel/trunk/pom.xml Thu Aug 6 18:03:36 2009
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>5</version>
+ <version>6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -32,33 +32,21 @@
<packaging>pom</packaging>
<name>Camel</name>
<description>Camel build POM</description>
+ <url>http://camel.apache.org</url>
+ <inceptionYear>2007</inceptionYear>
<prerequisites>
<maven>2.0.9</maven>
</prerequisites>
<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>
- <url>http://camel.apache.org</url>
-
- <organization>
- <name>Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
-
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
<mailingLists>
<mailingList>
<name>Development List</name>
@@ -118,35 +106,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-3</version>
+ <version>2.2-beta-4</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.4</version>
</plugin>
- <plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-codegen-plugin</artifactId>
- <version>${cxf-version}</version>
- <dependencies>
- <!-- needed to add this to get around the following error on IBM's JDK
- org.apache.xerces.impl.dv.DVFactoryException: DTD factory class
- org.apache.xerces.impl.dv.dtd.DTDDVFactoryImpl does not extend
- from DTDDVFactory.
- -->
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.8.1</version>
- </dependency>
- </dependencies>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
@@ -157,6 +127,32 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.5.1</version>
+ <configuration>
+ <outputDirectory>${basedir}/eclipse-classes</outputDirectory>
+ <downloadSources>true</downloadSources>
+ <!-- Eclipse update site for the Checkstyle plugin is http://eclipse-cs.sourceforge.net/update -->
+ <!-- Eclipse update site for the PMD plugin is http://pmd.sf.net/eclipse -->
+ <buildcommands>
+ <java.lang.String>org.eclipse.jdt.core.javabuilder</java.lang.String>
+ <java.lang.String>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</java.lang.String>
+ <!-- Lets not enable the PMD buidler just yet..
+ <java.lang.String>net.sourceforge.pmd.runtime.pmdBuilder</java.lang.String>
+ -->
+ </buildcommands>
+ <projectnatures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
+ <!-- Lets not enable the PMD buidler just yet..
+ <nature>net.sourceforge.pmd.runtime.pmdNature</nature>
+ -->
+ </projectnatures>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-idea-plugin</artifactId>
<configuration>
<downloadSources>true</downloadSources>
@@ -165,6 +161,62 @@
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <attach>true</attach>
+ <source>1.5</source>
+ <quiet>true</quiet>
+ <bottom>Apache CAMEL</bottom>
+ <javadocVersion>1.5</javadocVersion>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <!--<tagBase>https://svn.apache.org/repos/asf/camel/tags</tagBase>-->
+ <!--<useReleaseProfile>false</useReleaseProfile>-->
+ <!--<preparationGoals>clean install</preparationGoals>-->
+ <!--<goals>deploy</goals>-->
+ <arguments>-Papache-release,enable-schemagen,sourcecheck,hibernate-derby</arguments>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>1.2</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.1-alpha-2</version>
+ <configuration>
+ <webResources>
+ <!--
+ HACK: Include legal files explicity, otherwise they will end up in the wrong path
+ or in another jar file in the war.
+
+ NOTE: targetPath is broken for webResources (as documented)
+ -->
+ <resource>
+ <directory>${project.build.outputDirectory}</directory>
+ <includes>
+ <include>META-INF/LICENSE*</include>
+ <include>META-INF/NOTICE*</include>
+ <include>META-INF/DEPENDENCIES*</include>
+ </includes>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.2</version>
@@ -194,67 +246,27 @@
</plugin>
<plugin>
- <groupId>com.sun.tools.jxc.maven2</groupId>
- <artifactId>maven-jaxb-schemagen-plugin</artifactId>
- <version>1.3-dev</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <attach>true</attach>
- <source>1.5</source>
- <quiet>true</quiet>
- <bottom>Apache CAMEL</bottom>
- <javadocVersion>1.5</javadocVersion>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-3</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>1.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>2.5</version>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-codegen-plugin</artifactId>
+ <version>${cxf-version}</version>
+ <dependencies>
+ <!-- needed to add this to get around the following error on IBM's JDK
+ org.apache.xerces.impl.dv.DVFactoryException: DTD factory class
+ org.apache.xerces.impl.dv.dtd.DTDDVFactoryImpl does not extend
+ from DTDDVFactory.
+ -->
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.8.1</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <version>2.5.1</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-buildtools</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
+ <groupId>com.sun.tools.jxc.maven2</groupId>
+ <artifactId>maven-jaxb-schemagen-plugin</artifactId>
+ <version>1.3-dev</version>
</plugin>
<plugin>
@@ -262,26 +274,12 @@
<artifactId>maven-jetty-plugin</artifactId>
<version>${jetty-version}</version>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <tagBase>https://svn.apache.org/repos/asf/camel/tags</tagBase>
- <useReleaseProfile>false</useReleaseProfile>
- <preparationGoals>clean install</preparationGoals>
- <goals>deploy</goals>
- <arguments>-Prelease,deploy,enable-schemagen,sourcecheck,hibernate-derby</arguments>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
- </plugin>
-
</plugins>
</pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${felix-version}</version>
<extensions>true</extensions>
@@ -299,25 +297,7 @@
</instructions>
</configuration>
</plugin>
- <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-one-plugin</artifactId>
- <extensions>true</extensions>
- <executions>
- <execution>
- <goals>
- <goal>install-maven-one-repository</goal>
- <goal>deploy-maven-one-repository</goal>
- </goals>
- <configuration>
- <remoteRepositoryId>apache.m1.releases</remoteRepositoryId>
- <remoteRepositoryUrl>${m1-repo-url}</remoteRepositoryUrl>
- </configuration>
- </execution>
- </executions>
- </plugin>
- -->
+
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
@@ -330,6 +310,20 @@
</includes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>ianal-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>verify-legal-files</goal>
+ </goals>
+ <configuration>
+ <strict>true</strict>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -341,14 +335,14 @@
</plugin>
<!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ </plugin>
-->
<plugin>
@@ -610,68 +604,79 @@
</build>
</profile>
<profile>
- <id>deploy</id>
- <build>
- <defaultGoal>deploy</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.0.4</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <id>deploy</id>
+ <build>
+ <defaultGoal>deploy</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.0.4</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</profile>
+
<profile>
- <id>release</id>
- <!-- this profile will be hit when you do relase work for camel -->
+ <id>apache-release</id>
+ <activation>
+ <property>
+ <name>apache-release</name>
+ </property>
+ </activation>
<build>
- <plugins>
- <!-- We want to deploy the artifact to a staging location for perusal -->
- <plugin>
- <inherited>true</inherited>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <updateReleaseInfo>true</updateReleaseInfo>
- </configuration>
- </plugin>
- <!-- We want to sign the artifact, the POM, and all attached artifacts -->
- <plugin>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.0-alpha-4</version>
- <executions>
- <execution>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
+ <plugins>
+ <!-- waiting for release -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+ <descriptorRefs>
+ <descriptorRef>source-release</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <!-- apache version not yet released -->
+ <!--<groupId>org.apache</groupId>-->
+ <groupId>org.apache.geronimo.genesis</groupId>
+ <artifactId>apache-source-release-assembly-descriptor</artifactId>
+ <!-- apache version not yet known -->
+ <version>2.0</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
</build>
</profile>
-
-
</profiles>
</project>
Re: svn commit: r801748 - in /camel/trunk: ./ apache-camel/ apache-camel/src/main/descriptors/
buildingtools/ components/camel-web/ etc/ examples/camel-example-axis/
Posted by Willem Jiang <wi...@gmail.com>.
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
hadrian@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
>