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 2010/10/14 20:24:59 UTC
svn commit: r1022639 - in /camel/trunk: .gitignore
components/camel-blueprint/pom.xml components/camel-spring/pom.xml
Author: hadrian
Date: Thu Oct 14 18:24:59 2010
New Revision: 1022639
URL: http://svn.apache.org/viewvc?rev=1022639&view=rev
Log:
CAMEL-3233. Patch applied with many thanks to Dan Kulp
Modified:
camel/trunk/.gitignore
camel/trunk/components/camel-blueprint/pom.xml
camel/trunk/components/camel-spring/pom.xml
Modified: camel/trunk/.gitignore
URL: http://svn.apache.org/viewvc/camel/trunk/.gitignore?rev=1022639&r1=1022638&r2=1022639&view=diff
==============================================================================
--- camel/trunk/.gitignore (original)
+++ camel/trunk/.gitignore Thu Oct 14 18:24:59 2010
@@ -2,4 +2,5 @@ target
*.i??
.classpath
.project
-.settings
\ No newline at end of file
+.settings
+.checkstyle
Modified: camel/trunk/components/camel-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/pom.xml?rev=1022639&r1=1022638&r2=1022639&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/pom.xml (original)
+++ camel/trunk/components/camel-blueprint/pom.xml Thu Oct 14 18:24:59 2010
@@ -171,6 +171,11 @@
<echo>Deleting unwanted resources from the test-jar</echo>
<delete file="${project.build.directory}/test-classes/log4j.properties" verbose="true" />
<delete file="${project.build.directory}/test-classes/META-INF/spring/*" verbose="true" />
+
+ <jar destfile="${project.build.directory}/${project.artifactId}-${project.version}-sources.jar" update="true">
+ <fileset dir="${basedir}/../camel-core-osgi/src/main/java" includes="**/*"/>
+ <fileset dir="${basedir}/../camel-core-xml/src/main/java" includes="**/*"/>
+ </jar>
</tasks>
</configuration>
<goals>
@@ -186,19 +191,6 @@
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${basedir}/../camel-core-osgi/src/main/java</source>
- <source>${basedir}/../camel-core-xml/src/main/java</source>
- </sources>
- </configuration>
- </execution>
- <execution>
<id>attach-artifacts</id>
<phase>package</phase>
<goals>
Modified: camel/trunk/components/camel-spring/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/pom.xml?rev=1022639&r1=1022638&r2=1022639&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/pom.xml (original)
+++ camel/trunk/components/camel-spring/pom.xml Thu Oct 14 18:24:59 2010
@@ -275,6 +275,11 @@
<echo>Deleting unwanted resources from the test-jar</echo>
<delete file="${project.build.directory}/test-classes/log4j.properties" verbose="true" />
<delete file="${project.build.directory}/test-classes/META-INF/spring/*" verbose="true" />
+
+ <jar destfile="${project.build.directory}/${project.artifactId}-${project.version}-sources.jar" update="true">
+ <fileset dir="${basedir}/../camel-core-osgi/src/main/java" includes="**/*"/>
+ <fileset dir="${basedir}/../camel-core-xml/src/main/java" includes="**/*"/>
+ </jar>
</tasks>
</configuration>
<goals>
@@ -290,19 +295,6 @@
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${basedir}/../camel-core-osgi/src/main/java</source>
- <source>${basedir}/../camel-core-xml/src/main/java</source>
- </sources>
- </configuration>
- </execution>
- <execution>
<id>attach-artifacts</id>
<phase>package</phase>
<goals>