Author: gertv
Date: Thu Dec 15 00:41:47 2011
New Revision: 1214578
URL: http://svn.apache.org/viewvc?rev=1214578&view=rev
Log:
Prepare for release: Upgrade to released dependencies and fix release build
Modified:
servicemix/archetypes/trunk/pom.xml
Modified: servicemix/archetypes/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/archetypes/trunk/pom.xml?rev=1214578&r1=1214577&r2=1214578&view=diff
==============================================================================
--- servicemix/archetypes/trunk/pom.xml (original)
+++ servicemix/archetypes/trunk/pom.xml Thu Dec 15 00:41:47 2011
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-pom</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<groupId>org.apache.servicemix</groupId>
@@ -40,9 +40,9 @@
</scm>
<properties>
- <components.version>2011.01</components.version>
- <jbi-maven-plugin.version>4.4</jbi-maven-plugin.version>
- <maven-bundle-plugin.version>2.1.0</maven-bundle-plugin.version>
+ <components.version>2011.02</components.version>
+ <jbi-maven-plugin.version>4.5</jbi-maven-plugin.version>
+ <maven-bundle-plugin.version>2.3.6</maven-bundle-plugin.version>
<maven-compiler-plugin.version>2.0.2</maven-compiler-plugin.version>
<maven-resources-plugin.version>2.4.3</maven-resources-plugin.version>
<maven-jar-plugin.version>2.2</maven-jar-plugin.version>
@@ -51,13 +51,13 @@
<junit.version>4.7</junit.version>
<xbean.version>3.7</xbean.version>
<geronimo-jta.specs.version>1.1.1</geronimo-jta.specs.version>
- <servicemix.version>3.3.2</servicemix.version>
+ <servicemix.version>3.4.0</servicemix.version>
<commons-logging.version>1.1.1</commons-logging.version>
- <activemq.version>5.4.2</activemq.version>
- <camel.version>2.6.0</camel.version>
- <cxf.version>2.3.2</cxf.version>
- <servicemix.specs.version>1.7.0</servicemix.specs.version>
- <servicemix-utils.version>1.4.0</servicemix-utils.version>
+ <activemq.version>5.5.1</activemq.version>
+ <camel.version>2.8.3</camel.version>
+ <cxf.version>2.4.4</cxf.version>
+ <servicemix.specs.version>1.9.0</servicemix.specs.version>
+ <servicemix-utils.version>1.5.0</servicemix-utils.version>
<jaxb.version>2.1</jaxb.version>
<jaxws.version>2.1</jaxws.version>
<geronimo.wsmetadata.version>1.1.2</geronimo.wsmetadata.version>
@@ -227,6 +227,15 @@
<artifactId>maven-archetype-plugin</artifactId>
<version>2.0-alpha-5</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <preparationGoals>clean verify
install</preparationGoals>
+ <arguments>-Prelease,deploy</arguments>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -293,14 +302,6 @@
<id>release</id>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <preparationGoals>clean verify
install</preparationGoals>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
- </plugin>
<!-- We want a source jar -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>