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/13 19:27:38 UTC
svn commit: r1022200 - in /camel/trunk: ./ camel-core/ components/
components/camel-blueprint/ components/camel-crypto/
components/camel-spring/ components/camel-web/ parent/
tests/camel-itest-osgi/ tooling/ tooling/maven/
Author: hadrian
Date: Wed Oct 13 17:27:35 2010
New Revision: 1022200
URL: http://svn.apache.org/viewvc?rev=1022200&view=rev
Log:
CAMEL-3229. Patch applied with thanks to Dan Kulp
Modified:
camel/trunk/camel-core/pom.xml
camel/trunk/components/camel-blueprint/pom.xml
camel/trunk/components/camel-crypto/pom.xml
camel/trunk/components/camel-spring/pom.xml
camel/trunk/components/camel-web/pom.xml
camel/trunk/components/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/pom.xml
camel/trunk/tests/camel-itest-osgi/pom.xml
camel/trunk/tooling/maven/pom.xml
camel/trunk/tooling/pom.xml
Modified: camel/trunk/camel-core/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/pom.xml?rev=1022200&r1=1022199&r2=1022200&view=diff
==============================================================================
--- camel/trunk/camel-core/pom.xml (original)
+++ camel/trunk/camel-core/pom.xml Wed Oct 13 17:27:35 2010
@@ -23,6 +23,7 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-parent</artifactId>
<version>2.5-SNAPSHOT</version>
+ <relativePath>../parent</relativePath>
</parent>
<artifactId>camel-core</artifactId>
Modified: camel/trunk/components/camel-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/pom.xml?rev=1022200&r1=1022199&r2=1022200&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/pom.xml (original)
+++ camel/trunk/components/camel-blueprint/pom.xml Wed Oct 13 17:27:35 2010
@@ -23,6 +23,7 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-parent</artifactId>
<version>2.5-SNAPSHOT</version>
+ <relativePath>../../parent</relativePath>
</parent>
<artifactId>camel-blueprint</artifactId>
@@ -197,9 +198,25 @@
</sources>
</configuration>
</execution>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>${project.build.directory}/schema/camel-blueprint.xsd</file>
+ <type>xsd</type>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
</executions>
</plugin>
+
<!-- generate the attached tests jar -->
<plugin>
<artifactId>maven-jar-plugin</artifactId>
@@ -219,27 +236,6 @@
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>${project.build.directory}/schema/camel-blueprint.xsd</file>
- <type>xsd</type>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
<pluginManagement>
Modified: camel/trunk/components/camel-crypto/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-crypto/pom.xml?rev=1022200&r1=1022199&r2=1022200&view=diff
==============================================================================
--- camel/trunk/components/camel-crypto/pom.xml (original)
+++ camel/trunk/components/camel-crypto/pom.xml Wed Oct 13 17:27:35 2010
@@ -71,14 +71,14 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
<classifier>tests</classifier>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
<classifier>tests</classifier>
</dependency>
Modified: camel/trunk/components/camel-spring/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/pom.xml?rev=1022200&r1=1022199&r2=1022200&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/pom.xml (original)
+++ camel/trunk/components/camel-spring/pom.xml Wed Oct 13 17:27:35 2010
@@ -302,6 +302,21 @@
</sources>
</configuration>
</execution>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>${project.build.directory}/schema/camel-spring.xsd</file>
+ <type>xsd</type>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
</executions>
</plugin>
@@ -323,28 +338,6 @@
</excludes>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>${project.build.directory}/schema/camel-spring.xsd</file>
- <type>xsd</type>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
<pluginManagement>
Modified: camel/trunk/components/camel-web/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/pom.xml?rev=1022200&r1=1022199&r2=1022200&view=diff
==============================================================================
--- camel/trunk/components/camel-web/pom.xml (original)
+++ camel/trunk/components/camel-web/pom.xml Wed Oct 13 17:27:35 2010
@@ -876,7 +876,7 @@
<supportedProjectType>war</supportedProjectType>
</supportedProjectTypes>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-ClassPath>${osgi.classpath}</Bundle-ClassPath>
<Import-Package>${osgi.import.pkg}</Import-Package>
<Export-Package>${osgi.export.pkg}</Export-Package>
Modified: camel/trunk/components/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/pom.xml?rev=1022200&r1=1022199&r2=1022200&view=diff
==============================================================================
--- camel/trunk/components/pom.xml (original)
+++ camel/trunk/components/pom.xml Wed Oct 13 17:27:35 2010
@@ -22,6 +22,7 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-parent</artifactId>
<version>2.5-SNAPSHOT</version>
+ <relativePath>../parent</relativePath>
</parent>
<artifactId>components</artifactId>
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1022200&r1=1022199&r2=1022200&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Oct 13 17:27:35 2010
@@ -1506,6 +1506,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.4</version>
<configuration>
<formats>
<format>html</format>
@@ -1515,6 +1516,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.3</version>
</plugin>
</plugins>
</reporting>
Modified: camel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/pom.xml?rev=1022200&r1=1022199&r2=1022200&view=diff
==============================================================================
--- camel/trunk/pom.xml (original)
+++ camel/trunk/pom.xml Wed Oct 13 17:27:35 2010
@@ -368,11 +368,6 @@
<version>2.5</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<version>1.0-alpha-2</version>
@@ -402,11 +397,6 @@
<artifactId>findbugs-maven-plugin</artifactId>
<version>2.3.1</version>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.5</version>
- </plugin>
</plugins>
</pluginManagement>
Modified: camel/trunk/tests/camel-itest-osgi/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/pom.xml?rev=1022200&r1=1022199&r2=1022200&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/pom.xml (original)
+++ camel/trunk/tests/camel-itest-osgi/pom.xml Wed Oct 13 17:27:35 2010
@@ -85,7 +85,7 @@
<dependency>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>apache-camel</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
</dependency>
@@ -241,6 +241,7 @@
<plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>depends-maven-plugin</artifactId>
+ <version>1.2</version>
<executions>
<execution>
<id>generate-depends-file</id>
@@ -314,11 +315,6 @@
on this information to PAX mvn url
-->
<argLine>-Dorg.ops4j.pax.url.mvn.localRepository=${maven.repo.local}</argLine>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
<includes>
<include>**/*Test.*</include>
</includes>
Modified: camel/trunk/tooling/maven/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/pom.xml?rev=1022200&r1=1022199&r2=1022200&view=diff
==============================================================================
--- camel/trunk/tooling/maven/pom.xml (original)
+++ camel/trunk/tooling/maven/pom.xml Wed Oct 13 17:27:35 2010
@@ -49,6 +49,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
+ <version>2.0.9</version>
</plugin>
<plugin>
Modified: camel/trunk/tooling/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/pom.xml?rev=1022200&r1=1022199&r2=1022200&view=diff
==============================================================================
--- camel/trunk/tooling/pom.xml (original)
+++ camel/trunk/tooling/pom.xml Wed Oct 13 17:27:35 2010
@@ -22,6 +22,7 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-parent</artifactId>
<version>2.5-SNAPSHOT</version>
+ <relativePath>../parent</relativePath>
</parent>
<artifactId>tooling</artifactId>