You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2011/09/22 18:24:15 UTC
svn commit: r1174243 - in /camel/branches/camel-2.7.x: ./
tooling/archetypes/camel-archetype-activemq/
tooling/archetypes/camel-archetype-component/
tooling/archetypes/camel-archetype-java/
tooling/archetypes/camel-archetype-scala/ tooling/archetypes/c...
Author: davsclaus
Date: Thu Sep 22 16:24:15 2011
New Revision: 1174243
URL: http://svn.apache.org/viewvc?rev=1174243&view=rev
Log:
Merged revisions 1147216 via svnmerge from
https://svn.apache.org/repos/asf/camel/branches/camel-2.8.x
Modified:
camel/branches/camel-2.7.x/ (props changed)
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-activemq/pom.xml
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-component/pom.xml
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-java/pom.xml
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-scala/pom.xml
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-spring/pom.xml
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-web/pom.xml
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-webconsole/pom.xml
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 22 16:24:15 2011
@@ -1 +1 @@
-/camel/trunk:1146903
+/camel/trunk:1146903,1147216
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Sep 22 16:24:15 2011
@@ -1 +1 @@
-/camel/branches/camel-2.8.x:1-1146127,1146653,1146771,1146903
+/camel/branches/camel-2.8.x:1-1146127,1146653,1146771,1146903,1147216
Modified: camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-activemq/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-activemq/pom.xml?rev=1174243&r1=1174242&r2=1174243&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-activemq/pom.xml (original)
+++ camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-activemq/pom.xml Thu Sep 22 16:24:15 2011
@@ -39,6 +39,7 @@
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
+ <version>2.0</version>
</extension>
</extensions>
<resources>
Modified: camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-component/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-component/pom.xml?rev=1174243&r1=1174242&r2=1174243&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-component/pom.xml (original)
+++ camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-component/pom.xml Thu Sep 22 16:24:15 2011
@@ -39,6 +39,7 @@
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
+ <version>2.0</version>
</extension>
</extensions>
<resources>
Modified: camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-java/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-java/pom.xml?rev=1174243&r1=1174242&r2=1174243&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-java/pom.xml (original)
+++ camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-java/pom.xml Thu Sep 22 16:24:15 2011
@@ -39,6 +39,7 @@
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
+ <version>2.0</version>
</extension>
</extensions>
<resources>
Modified: camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-scala/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-scala/pom.xml?rev=1174243&r1=1174242&r2=1174243&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-scala/pom.xml (original)
+++ camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-scala/pom.xml Thu Sep 22 16:24:15 2011
@@ -39,6 +39,7 @@
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
+ <version>2.0</version>
</extension>
</extensions>
<resources>
Modified: camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-spring/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-spring/pom.xml?rev=1174243&r1=1174242&r2=1174243&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-spring/pom.xml (original)
+++ camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-spring/pom.xml Thu Sep 22 16:24:15 2011
@@ -39,6 +39,7 @@
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
+ <version>2.0</version>
</extension>
</extensions>
<resources>
Modified: camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-web/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-web/pom.xml?rev=1174243&r1=1174242&r2=1174243&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-web/pom.xml (original)
+++ camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-web/pom.xml Thu Sep 22 16:24:15 2011
@@ -39,6 +39,7 @@
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
+ <version>2.0</version>
</extension>
</extensions>
<resources>
Modified: camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-webconsole/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-webconsole/pom.xml?rev=1174243&r1=1174242&r2=1174243&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-webconsole/pom.xml (original)
+++ camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-webconsole/pom.xml Thu Sep 22 16:24:15 2011
@@ -39,6 +39,7 @@
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
+ <version>2.0</version>
</extension>
</extensions>
<resources>