servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r565412 - in /incubator/servicemix/branches/servicemix-3.1: ./ archetypes/ archetypes/servicemix-bean-service-unit/ archetypes/servicemix-bean-service-unit/src/main/resources/archetype-resources/ archetypes/servicemix-binding-component/src/...
Date Mon, 13 Aug 2007 16:49:12 GMT
Author: gnodet
Date: Mon Aug 13 09:49:09 2007
New Revision: 565412

URL: http://svn.apache.org/viewvc?view=rev&rev=565412
Log:
SM-1028: Ease release process

Added:
    incubator/servicemix/branches/servicemix-3.1/tooling/res-maven-plugin/   (props changed)
      - copied from r565353, incubator/servicemix/trunk/tooling/res-maven-plugin/
    incubator/servicemix/branches/servicemix-3.1/tooling/res-maven-plugin/pom.xml
      - copied, changed from r565353, incubator/servicemix/trunk/tooling/res-maven-plugin/pom.xml
    incubator/servicemix/branches/servicemix-3.1/tooling/res-maven-plugin/src/
      - copied from r565353, incubator/servicemix/trunk/tooling/res-maven-plugin/src/
    incubator/servicemix/branches/servicemix-3.1/tooling/res-maven-plugin/src/main/
      - copied from r565353, incubator/servicemix/trunk/tooling/res-maven-plugin/src/main/
    incubator/servicemix/branches/servicemix-3.1/tooling/res-maven-plugin/src/main/java/
      - copied from r565353, incubator/servicemix/trunk/tooling/res-maven-plugin/src/main/java/
    incubator/servicemix/branches/servicemix-3.1/tooling/res-maven-plugin/src/main/java/org/
      - copied from r565353, incubator/servicemix/trunk/tooling/res-maven-plugin/src/main/java/org/
    incubator/servicemix/branches/servicemix-3.1/tooling/res-maven-plugin/src/main/java/org/apache/
      - copied from r565353, incubator/servicemix/trunk/tooling/res-maven-plugin/src/main/java/org/apache/
    incubator/servicemix/branches/servicemix-3.1/tooling/res-maven-plugin/src/main/java/org/apache/servicemix/
      - copied from r565353, incubator/servicemix/trunk/tooling/res-maven-plugin/src/main/java/org/apache/servicemix/
    incubator/servicemix/branches/servicemix-3.1/tooling/res-maven-plugin/src/main/java/org/apache/servicemix/maven/
      - copied from r565353, incubator/servicemix/trunk/tooling/res-maven-plugin/src/main/java/org/apache/servicemix/maven/
    incubator/servicemix/branches/servicemix-3.1/tooling/res-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/
      - copied from r565353, incubator/servicemix/trunk/tooling/res-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/
    incubator/servicemix/branches/servicemix-3.1/tooling/res-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/res/
      - copied from r565353, incubator/servicemix/trunk/tooling/res-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/res/
    incubator/servicemix/branches/servicemix-3.1/tooling/res-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/res/InterpolationFilterReader.java
      - copied unchanged from r565353, incubator/servicemix/trunk/tooling/res-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/res/InterpolationFilterReader.java
    incubator/servicemix/branches/servicemix-3.1/tooling/res-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/res/ResMojo.java
      - copied unchanged from r565353, incubator/servicemix/trunk/tooling/res-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/res/ResMojo.java
Modified:
    incubator/servicemix/branches/servicemix-3.1/archetypes/   (props changed)
    incubator/servicemix/branches/servicemix-3.1/archetypes/pom.xml
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/   (props changed)
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-binding-component/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-eip-service-unit/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-embedded-simple/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-poller-service-unit/   (props changed)
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-poller-service-unit/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-sender-service-unit/   (props changed)
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-sender-service-unit/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-http-consumer-service-unit/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-http-provider-service-unit/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jms-consumer-service-unit/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jms-provider-service-unit/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jsr181-annotated-service-unit/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jsr181-wsdl-first-service-unit/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-lwcontainer-service-unit/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ode-service-unit/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-saxon-xquery-service-unit/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-saxon-xslt-service-unit/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-service-assembly/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-service-engine/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-service-unit/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-shared-library/src/main/resources/archetype-resources/pom.xml
    incubator/servicemix/branches/servicemix-3.1/common/   (props changed)
    incubator/servicemix/branches/servicemix-3.1/common/pom.xml
    incubator/servicemix/branches/servicemix-3.1/core/   (props changed)
    incubator/servicemix/branches/servicemix-3.1/core/pom.xml
    incubator/servicemix/branches/servicemix-3.1/deployables/   (props changed)
    incubator/servicemix/branches/servicemix-3.1/deployables/bindingcomponents/   (props changed)
    incubator/servicemix/branches/servicemix-3.1/deployables/pom.xml
    incubator/servicemix/branches/servicemix-3.1/deployables/serviceengines/   (props changed)
    incubator/servicemix/branches/servicemix-3.1/deployables/sharedlibraries/   (props changed)
    incubator/servicemix/branches/servicemix-3.1/distributions/   (props changed)
    incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/pom.xml
    incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/src/main/assembly/bin.xml
    incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/src/main/release/bin/smx-arch
    incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/src/main/release/bin/smx-arch.bat
    incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance2/servicemix2.xml
    incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance3/servicemix3.xml
    incubator/servicemix/branches/servicemix-3.1/distributions/pom.xml
    incubator/servicemix/branches/servicemix-3.1/platforms/   (props changed)
    incubator/servicemix/branches/servicemix-3.1/platforms/geronimo/dependencies/   (props changed)
    incubator/servicemix/branches/servicemix-3.1/platforms/pom.xml
    incubator/servicemix/branches/servicemix-3.1/pom.xml
    incubator/servicemix/branches/servicemix-3.1/samples/loan-broker/loan-broker-jms-su/   (props changed)
    incubator/servicemix/branches/servicemix-3.1/samples/pom.xml
    incubator/servicemix/branches/servicemix-3.1/servicemix-itests/pom.xml
    incubator/servicemix/branches/servicemix-3.1/tooling/pom.xml
    incubator/servicemix/branches/servicemix-3.1/tooling/xfire-maven-plugin/   (props changed)
    incubator/servicemix/branches/servicemix-3.1/web/   (props changed)
    incubator/servicemix/branches/servicemix-3.1/web/pom.xml

Propchange: incubator/servicemix/branches/servicemix-3.1/archetypes/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Aug 13 09:49:09 2007
@@ -0,0 +1 @@
+target

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/pom.xml?view=diff&rev=565412&r1=565411&r2=565412
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/pom.xml Mon Aug 13 09:49:09 2007
@@ -81,6 +81,79 @@
                     </dependency>
                 </dependencies>
             </plugin>
+			<plugin>
+				<inherited>true</inherited>
+				<groupId>org.apache.servicemix.tooling</groupId>
+				<artifactId>res-maven-plugin</artifactId>
+				<version>${servicemix-version}</version>
+				<configuration>
+					<inputDirectory>${basedir}/src/main/resources</inputDirectory>
+					<outputDirectory>${basedir}/target/classes</outputDirectory>
+					<filters>
+						<servicemix-version>${servicemix-version}</servicemix-version>
+						<xbean-version>${xbean-version}</xbean-version>
+						<camel-version>${camel-version}</camel-version>
+						<xfire-version>${xfire-version}</xfire-version>
+						<repositories><![CDATA[  
+  <pluginRepositories>
+    <pluginRepository>
+      <id>${releases-repo-id}</id>
+      <name>${releases-repo-name}</name>
+      <url>${releases-repo-url}</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+	</pluginRepository>
+	<pluginRepository>
+	  <id>${snapshots-repo-id}</id>
+	  <name>${snapshots-repo-name}</name>
+	  <url>${snapshots-repo-url}</url>
+	  <snapshots>
+	    <enabled>true</enabled>
+	  </snapshots>
+	  <releases>
+	    <enabled>false</enabled>
+	  </releases>
+	</pluginRepository>
+  </pluginRepositories>
+  <repositories>
+    <repository>
+      <id>${releases-repo-id}</id>
+      <name>${releases-repo-name}</name>
+      <url>${releases-repo-url}</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </repository>
+    <repository>
+      <id>${snapshots-repo-id}</id>
+      <name>${snapshots-repo-name}</name>
+      <url>${snapshots-repo-url}</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+    </repository>
+  </repositories>
+]]></repositories>
+					</filters>
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>resources</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
         </plugins>
     </build>
 

Propchange: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 13 09:49:09 2007
@@ -1,2 +1,4 @@
 .classpath
 .project
+target
+target

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565412&r1=565411&r2=565412
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-bean-service-unit/src/main/resources/archetype-resources/pom.xml Mon Aug 13 09:49:09 2007
@@ -26,56 +26,9 @@
   <version>${version}</version>
   <name>A servicemix-bean Service Unit</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </pluginRepository>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </repository>
-    <repository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>
+  @{repositories}
   <properties>
-    <servicemix-version>3.1.2-incubating-SNAPSHOT</servicemix-version>
+    <servicemix-version>@{servicemix-version}</servicemix-version>
   </properties>
   <dependencies>
     <dependency>

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-binding-component/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-binding-component/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565412&r1=565411&r2=565412
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-binding-component/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-binding-component/src/main/resources/archetype-resources/pom.xml Mon Aug 13 09:49:09 2007
@@ -26,24 +26,11 @@
   <version>${version}</version>
   <name>A custom project</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-    </repository>
-  </repositories>
-	<properties>
-	  <xbean-version>2.8</xbean-version>
-	  <servicemix-version>3.1.2-incubating-SNAPSHOT</servicemix-version>
-	</properties>
+  @{repositories}
+  <properties>
+    <xbean-version>@{xbean-version}</xbean-version>
+    <servicemix-version>@{servicemix-version}</servicemix-version>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-eip-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-eip-service-unit/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565412&r1=565411&r2=565412
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-eip-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-eip-service-unit/src/main/resources/archetype-resources/pom.xml Mon Aug 13 09:49:09 2007
@@ -26,23 +26,10 @@
   <version>${version}</version>
   <name>A Service HTTP Service Engine Service Unit</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-    </repository>
-  </repositories>
-	<properties>
-	  <servicemix-version>3.1.2-incubating-SNAPSHOT</servicemix-version>
-	</properties>
+  @{repositories}
+  <properties>
+    <servicemix-version>@{servicemix-version}</servicemix-version>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-embedded-simple/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-embedded-simple/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565412&r1=565411&r2=565412
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-embedded-simple/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-embedded-simple/src/main/resources/archetype-resources/pom.xml Mon Aug 13 09:49:09 2007
@@ -25,26 +25,11 @@
   <version>${version}</version>
   <name>A custom project</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-    </repository>
-  </repositories>
-  <dependencies>   
-  </dependencies>
-	<properties>
-	  <xbean-version>2.8</xbean-version>
-	  <servicemix-version>3.1.2-incubating-SNAPSHOT</servicemix-version>
-	</properties>
+  @{repositories}
+  <properties>
+    <xbean-version>@{xbean-version}</xbean-version>
+    <servicemix-version>@{servicemix-version}</servicemix-version>
+  </properties>
   <build>
   	<resources>
       <resource>

Propchange: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-poller-service-unit/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 13 09:49:09 2007
@@ -1,2 +1,3 @@
 .classpath
 .project
+target

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-poller-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-poller-service-unit/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565412&r1=565411&r2=565412
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-poller-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-poller-service-unit/src/main/resources/archetype-resources/pom.xml Mon Aug 13 09:49:09 2007
@@ -26,57 +26,10 @@
   <version>${version}</version>
   <name>A Service HTTP Service Engine Service Unit</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </pluginRepository>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </repository>
-    <repository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>
-	<properties>
-	  <servicemix-version>3.1.2-incubating-SNAPSHOT</servicemix-version>
-	</properties>
+  @{repositories}
+  <properties>
+    <servicemix-version>@{servicemix-version}</servicemix-version>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>

Propchange: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-sender-service-unit/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 13 09:49:09 2007
@@ -1,2 +1,3 @@
 .classpath
 .project
+target

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-sender-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-sender-service-unit/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565412&r1=565411&r2=565412
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-sender-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ftp-sender-service-unit/src/main/resources/archetype-resources/pom.xml Mon Aug 13 09:49:09 2007
@@ -26,57 +26,10 @@
   <version>${version}</version>
   <name>A Service HTTP Service Engine Service Unit</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </pluginRepository>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </repository>
-    <repository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>
-	<properties>
-	  <servicemix-version>3.1.2-incubating-SNAPSHOT</servicemix-version>
-	</properties>
+  @{repositories}
+  <properties>
+    <servicemix-version>@{servicemix-version}</servicemix-version>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-http-consumer-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-http-consumer-service-unit/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565412&r1=565411&r2=565412
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-http-consumer-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-http-consumer-service-unit/src/main/resources/archetype-resources/pom.xml Mon Aug 13 09:49:09 2007
@@ -26,23 +26,10 @@
   <version>${version}</version>
   <name>A Service HTTP Service Engine Service Unit</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-    </repository>
-  </repositories>
-	<properties>
-	  <servicemix-version>3.1.2-incubating-SNAPSHOT</servicemix-version>
-	</properties>
+  @{repositories}
+  <properties>
+    <servicemix-version>@{servicemix-version}</servicemix-version>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-http-provider-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-http-provider-service-unit/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565412&r1=565411&r2=565412
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-http-provider-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-http-provider-service-unit/src/main/resources/archetype-resources/pom.xml Mon Aug 13 09:49:09 2007
@@ -26,23 +26,10 @@
   <version>${version}</version>
   <name>A Service HTTP Service Engine Service Unit</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-    </repository>
-  </repositories>
-	<properties>
-	  <servicemix-version>3.1.2-incubating-SNAPSHOT</servicemix-version>
-	</properties>
+  @{repositories}
+  <properties>
+    <servicemix-version>@{servicemix-version}</servicemix-version>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jms-consumer-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jms-consumer-service-unit/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565412&r1=565411&r2=565412
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jms-consumer-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jms-consumer-service-unit/src/main/resources/archetype-resources/pom.xml Mon Aug 13 09:49:09 2007
@@ -26,23 +26,10 @@
   <version>${version}</version>
   <name>A custom project</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-    </repository>
-  </repositories>
-	<properties>
-	  <servicemix-version>3.1.2-incubating-SNAPSHOT</servicemix-version>
-	</properties>
+  @{repositories}
+  <properties>
+    <servicemix-version>@{servicemix-version}</servicemix-version>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jms-provider-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jms-provider-service-unit/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565412&r1=565411&r2=565412
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jms-provider-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jms-provider-service-unit/src/main/resources/archetype-resources/pom.xml Mon Aug 13 09:49:09 2007
@@ -26,23 +26,10 @@
   <version>${version}</version>
   <name>A custom project</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-    </repository>
-  </repositories>
-	<properties>
-	  <servicemix-version>3.1.2-incubating-SNAPSHOT</servicemix-version>
-	</properties>
+  @{repositories}
+  <properties>
+    <servicemix-version>@{servicemix-version}</servicemix-version>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jsr181-annotated-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jsr181-annotated-service-unit/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565412&r1=565411&r2=565412
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jsr181-annotated-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jsr181-annotated-service-unit/src/main/resources/archetype-resources/pom.xml Mon Aug 13 09:49:09 2007
@@ -26,56 +26,9 @@
   <version>${version}</version>
   <name>A custom project</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </pluginRepository>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </repository>
-    <repository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>
+  @{repositories}
   <properties>
-    <servicemix-version>3.1.2-incubating-SNAPSHOT</servicemix-version>
+    <servicemix-version>@{servicemix-version}</servicemix-version>
   </properties>
   <dependencies>
     <dependency>

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jsr181-wsdl-first-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jsr181-wsdl-first-service-unit/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565412&r1=565411&r2=565412
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jsr181-wsdl-first-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-jsr181-wsdl-first-service-unit/src/main/resources/archetype-resources/pom.xml Mon Aug 13 09:49:09 2007
@@ -27,56 +27,10 @@
   <version>${version}</version>
   <name>An example JSR-181 Service Unit</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </pluginRepository>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-         <enabled>true</enabled>
-      </releases>
-    </repository>
-    <repository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshots Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-         <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>
+  @{repositories}
   <properties>
-    <servicemix-version>3.1.2-incubating-SNAPSHOT</servicemix-version>
+    <xfire-version>@{xfire-version}</xfire-version>
+    <servicemix-version>@{servicemix-version}</servicemix-version>
   </properties>
   <dependencies>
     <dependency>

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-lwcontainer-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-lwcontainer-service-unit/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565412&r1=565411&r2=565412
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-lwcontainer-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-lwcontainer-service-unit/src/main/resources/archetype-resources/pom.xml Mon Aug 13 09:49:09 2007
@@ -26,23 +26,10 @@
   <version>${version}</version>
   <name>A LWContainer Service Unit</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-    </repository>
-  </repositories>
-	<properties>
-	  <servicemix-version>3.1.2-incubating-SNAPSHOT</servicemix-version>
-	</properties>
+  @{repositories}
+  <properties>
+    <servicemix-version>@{servicemix-version}</servicemix-version>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ode-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ode-service-unit/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565412&r1=565411&r2=565412
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ode-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-ode-service-unit/src/main/resources/archetype-resources/pom.xml Mon Aug 13 09:49:09 2007
@@ -26,24 +26,11 @@
   <version>1.0-SNAPSHOT</version>
   <name>A example service unit using Apache ODE's Service Engine</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-    </repository>
-  </repositories>
-	<properties>
-	  <servicemix-version>3.1.2-incubating-SNAPSHOT</servicemix-version>
+  @{repositories}
+  <properties>
     <componentName>OdeBpelEngine</componentName>
-	</properties>
+    <servicemix-version>@{servicemix-version}</servicemix-version>
+  </properties>
   <dependencies> 
   </dependencies>
   <build>

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-saxon-xquery-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-saxon-xquery-service-unit/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565412&r1=565411&r2=565412
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-saxon-xquery-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-saxon-xquery-service-unit/src/main/resources/archetype-resources/pom.xml Mon Aug 13 09:49:09 2007
@@ -26,23 +26,10 @@
   <version>${version}</version>
   <name>An X-Query based Service</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-    </repository>
-  </repositories>
-	<properties>
-	  <servicemix-version>3.1.2-incubating-SNAPSHOT</servicemix-version>
-	</properties>
+  @{repositories}
+  <properties>
+    <servicemix-version>@{servicemix-version}</servicemix-version>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-saxon-xslt-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-saxon-xslt-service-unit/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565412&r1=565411&r2=565412
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-saxon-xslt-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-saxon-xslt-service-unit/src/main/resources/archetype-resources/pom.xml Mon Aug 13 09:49:09 2007
@@ -26,23 +26,10 @@
   <version>${version}</version>
   <name>An XSLT based Service</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-    </repository>
-  </repositories>
-	<properties>
-	  <servicemix-version>3.1.2-incubating-SNAPSHOT</servicemix-version>
-	</properties>
+  @{repositories}
+  <properties>
+    <servicemix-version>@{servicemix-version}</servicemix-version>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-service-assembly/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-service-assembly/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565412&r1=565411&r2=565412
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-service-assembly/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-service-assembly/src/main/resources/archetype-resources/pom.xml Mon Aug 13 09:49:09 2007
@@ -26,23 +26,10 @@
   <version>${version}</version>
   <name>A custom project</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-    </repository>
-  </repositories>
-	<properties>
-	  <servicemix-version>3.1.2-incubating-SNAPSHOT</servicemix-version>
-	</properties>
+  @{repositories}
+  <properties>
+    <servicemix-version>@{servicemix-version}</servicemix-version>
+  </properties>
   <dependencies>    
     <dependency>
       <groupId>junit</groupId>

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-service-engine/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-service-engine/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565412&r1=565411&r2=565412
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-service-engine/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-service-engine/src/main/resources/archetype-resources/pom.xml Mon Aug 13 09:49:09 2007
@@ -26,24 +26,11 @@
   <version>${version}</version>
   <name>A custom project</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-    </repository>
-  </repositories>
-	<properties>
-	  <servicemix-version>3.1.2-incubating-SNAPSHOT</servicemix-version>
-	  <xbean-version>2.8</xbean-version>
-	</properties>
+  @{repositories}
+  <properties>
+	<xbean-version>@{xbean-version}</xbean-version>
+    <servicemix-version>@{servicemix-version}</servicemix-version>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-service-unit/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-service-unit/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565412&r1=565411&r2=565412
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-service-unit/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-service-unit/src/main/resources/archetype-resources/pom.xml Mon Aug 13 09:49:09 2007
@@ -26,23 +26,10 @@
   <version>${version}</version>
   <name>A custom project</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-    </repository>
-  </repositories>
-	<properties>
-	  <servicemix-version>3.1.2-incubating-SNAPSHOT</servicemix-version>
-	</properties>
+  @{repositories}
+  <properties>
+    <servicemix-version>@{servicemix-version}</servicemix-version>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>junit</groupId>

Modified: incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-shared-library/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-shared-library/src/main/resources/archetype-resources/pom.xml?view=diff&rev=565412&r1=565411&r2=565412
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-shared-library/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/archetypes/servicemix-shared-library/src/main/resources/archetype-resources/pom.xml Mon Aug 13 09:49:09 2007
@@ -26,23 +26,10 @@
   <version>${version}</version>
   <name>A custom project</name>
   <url>http://www.myorganization.org</url>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>apache.incubating</id>
-      <name>Apache Incubating Repository</name>
-      <url>http://people.apache.org/repo/m2-incubating-repository</url>
-    </repository>
-  </repositories>
-	<properties>
-	  <servicemix-version>3.1.2-incubating-SNAPSHOT</servicemix-version>
-	</properties>
+  @{repositories}
+  <properties>
+    <servicemix-version>@{servicemix-version}</servicemix-version>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>junit</groupId>

Propchange: incubator/servicemix/branches/servicemix-3.1/common/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Aug 13 09:49:09 2007
@@ -0,0 +1 @@
+target

Modified: incubator/servicemix/branches/servicemix-3.1/common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/common/pom.xml?view=diff&rev=565412&r1=565411&r2=565412
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/common/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/common/pom.xml Mon Aug 13 09:49:09 2007
@@ -60,7 +60,7 @@
                     <dependency>
                         <groupId>org.apache.servicemix</groupId>
                         <artifactId>build</artifactId>
-                        <version>3.1.2-incubating-SNAPSHOT-SNAPSHOT</version>
+                        <version>${servicemix-version}</version>
                     </dependency>
                 </dependencies>
             </plugin>

Propchange: incubator/servicemix/branches/servicemix-3.1/core/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Aug 13 09:49:09 2007
@@ -0,0 +1 @@
+target

Modified: incubator/servicemix/branches/servicemix-3.1/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/core/pom.xml?view=diff&rev=565412&r1=565411&r2=565412
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/core/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/core/pom.xml Mon Aug 13 09:49:09 2007
@@ -60,7 +60,7 @@
                     <dependency>
                         <groupId>org.apache.servicemix</groupId>
                         <artifactId>build</artifactId>
-                        <version>3.1.2-incubating-SNAPSHOT-SNAPSHOT</version>
+                        <version>${servicemix-version}</version>
                     </dependency>
                 </dependencies>
             </plugin>

Propchange: incubator/servicemix/branches/servicemix-3.1/deployables/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Aug 13 09:49:09 2007
@@ -0,0 +1 @@
+target

Propchange: incubator/servicemix/branches/servicemix-3.1/deployables/bindingcomponents/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Aug 13 09:49:09 2007
@@ -0,0 +1 @@
+target

Modified: incubator/servicemix/branches/servicemix-3.1/deployables/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/deployables/pom.xml?view=diff&rev=565412&r1=565411&r2=565412
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/deployables/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/deployables/pom.xml Mon Aug 13 09:49:09 2007
@@ -59,7 +59,7 @@
                     <dependency>
                         <groupId>org.apache.servicemix</groupId>
                         <artifactId>build</artifactId>
-                        <version>3.1.2-incubating-SNAPSHOT-SNAPSHOT</version>
+                        <version>${servicemix-version}</version>
                     </dependency>
                 </dependencies>
             </plugin>

Propchange: incubator/servicemix/branches/servicemix-3.1/deployables/serviceengines/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Aug 13 09:49:09 2007
@@ -0,0 +1 @@
+target

Propchange: incubator/servicemix/branches/servicemix-3.1/deployables/sharedlibraries/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Aug 13 09:49:09 2007
@@ -0,0 +1 @@
+target

Propchange: incubator/servicemix/branches/servicemix-3.1/distributions/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Aug 13 09:49:09 2007
@@ -0,0 +1 @@
+target

Modified: incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/pom.xml?view=diff&rev=565412&r1=565411&r2=565412
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/pom.xml Mon Aug 13 09:49:09 2007
@@ -504,6 +504,27 @@
         </executions>
       </plugin>
       <plugin>
+	    <inherited>true</inherited>
+		<groupId>org.apache.servicemix.tooling</groupId>
+		<artifactId>res-maven-plugin</artifactId>
+		<version>${servicemix-version}</version>
+		<configuration>
+		  <inputDirectory>${basedir}/src/main/release</inputDirectory>
+		  <outputDirectory>${basedir}/target/filtered</outputDirectory>
+		  <filters>
+		    <servicemix-version>${servicemix-version}</servicemix-version>
+		    <releases-repo-url>${releases-repo-url}</releases-repo-url>
+		  </filters>
+		</configuration>
+		<executions>
+		  <execution>
+			<goals>
+			  <goal>resources</goal>
+		    </goals>
+          </execution>
+		</executions>
+	  </plugin>
+      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
         <version>${mavenAssemblyPluginVersion}</version>

Modified: incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/src/main/assembly/bin.xml?view=diff&rev=565412&r1=565411&r2=565412
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/src/main/assembly/bin.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/src/main/assembly/bin.xml Mon Aug 13 09:49:09 2007
@@ -36,14 +36,14 @@
       </includes>
     </fileSet>
     <fileSet>
-      <directory>src/main/release</directory>
+      <directory>target/filtered</directory>
       <outputDirectory>/</outputDirectory>
       <excludes>
         <exclude>bin</exclude>
       </excludes>
     </fileSet>
     <fileSet>
-      <directory>src/main/release/bin</directory>
+      <directory>target/filtered/bin</directory>
       <outputDirectory>/bin</outputDirectory>
       <fileMode>755</fileMode>
     </fileSet>

Modified: incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/src/main/release/bin/smx-arch
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/src/main/release/bin/smx-arch?view=diff&rev=565412&r1=565411&r2=565412
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/src/main/release/bin/smx-arch (original)
+++ incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/src/main/release/bin/smx-arch Mon Aug 13 09:49:09 2007
@@ -19,7 +19,7 @@
 #
 
 if [ "$SERVICEMIX_VERSION" = "" ] ; then
-  SERVICEMIX_VERSION=3.1.1-incubating
+  SERVICEMIX_VERSION=@{servicemix-version}
 fi
 
 if [ "$DEF_GROUP_ID" = "" ] ; then
@@ -87,7 +87,7 @@
 fi
 
 mvn archetype:create \
-  -DremoteRepositories=http://people.apache.org/repo/m2-incubating-repository \
+  -DremoteRepositories=@{releases-repo-url} \
   -DarchetypeGroupId=org.apache.servicemix.tooling \
   -DarchetypeArtifactId=$ARCHETYPE \
   -DarchetypeVersion=$SERVICEMIX_VERSION \

Modified: incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/src/main/release/bin/smx-arch.bat
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/src/main/release/bin/smx-arch.bat?view=diff&rev=565412&r1=565411&r2=565412
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/src/main/release/bin/smx-arch.bat (original)
+++ incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/src/main/release/bin/smx-arch.bat Mon Aug 13 09:49:09 2007
@@ -21,7 +21,7 @@
 rem 
 
 if "%SERVICEMIX_VERSION%" == "" (
-    set SERVICEMIX_VERSION=3.1.1-incubating
+    set SERVICEMIX_VERSION=@{servicemix-version}
 )
 
 if "%DEF_GROUP_ID%" == "" (
@@ -101,7 +101,7 @@
 shift
 goto setArgs
 :doneSetArgs
-mvn archetype:create -DremoteRepositories=http://people.apache.org/repo/m2-incubating-repository -DarchetypeGroupId=org.apache.servicemix.tooling -DarchetypeArtifactId=%ARCHETYPE% -DarchetypeVersion=%SERVICEMIX_VERSION% -DgroupId=%DEF_GROUP_ID% -DartifactId=%DEF_ARTIFACT_ID% %CMD_LINE_ARGS%
+mvn archetype:create -DremoteRepositories=@{releases-repo-url} -DarchetypeGroupId=org.apache.servicemix.tooling -DarchetypeArtifactId=%ARCHETYPE% -DarchetypeVersion=%SERVICEMIX_VERSION% -DgroupId=%DEF_GROUP_ID% -DartifactId=%DEF_ARTIFACT_ID% %CMD_LINE_ARGS%
 goto end
 
 :end

Modified: incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance2/servicemix2.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance2/servicemix2.xml?view=diff&rev=565412&r1=565411&r2=565412
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance2/servicemix2.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance2/servicemix2.xml Mon Aug 13 09:49:09 2007
@@ -25,8 +25,8 @@
 
   <!-- We need to include the WS-Notification component dependencies in the classpath -->
   <classpath>
-    <location>../lib/servicemix-wsn2005-3.1.2-incubating-SNAPSHOT.jar</location>
-    <location>../lib/servicemix-common-3.1.2-incubating-SNAPSHOT.jar</location>
+    <location>../lib/servicemix-wsn2005-@{servicemix-version}.jar</location>
+    <location>../lib/servicemix-common-@{servicemix-version}.jar</location>
     <location>../lib/jaxb-api-2.0.jar</location>
     <location>../lib/jaxb-impl-2.0.1.jar</location>
     <location>../lib/xfire-jsr181-api-1.0-M1.jar</location>

Modified: incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance3/servicemix3.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance3/servicemix3.xml?view=diff&rev=565412&r1=565411&r2=565412
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance3/servicemix3.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/distributions/apache-servicemix/src/main/release/examples/ws-notification/instance3/servicemix3.xml Mon Aug 13 09:49:09 2007
@@ -25,8 +25,8 @@
 
   <!-- We need to include the WS-Notification component dependencies in the classpath -->
   <classpath>
-    <location>../lib/servicemix-wsn2005-3.1.2-incubating-SNAPSHOT.jar</location>
-    <location>../lib/servicemix-common-3.1.2-incubating-SNAPSHOT.jar</location>
+    <location>../lib/servicemix-wsn2005-@{servicemix-version}.jar</location>
+    <location>../lib/servicemix-common-@{servicemix-version}.jar</location>
     <location>../lib/jaxb-api-2.0.jar</location>
     <location>../lib/jaxb-impl-2.0.1.jar</location>
     <location>../lib/xfire-jsr181-api-1.0-M1.jar</location>

Modified: incubator/servicemix/branches/servicemix-3.1/distributions/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/distributions/pom.xml?view=diff&rev=565412&r1=565411&r2=565412
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/distributions/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/distributions/pom.xml Mon Aug 13 09:49:09 2007
@@ -58,7 +58,7 @@
                     <dependency>
                         <groupId>org.apache.servicemix</groupId>
                         <artifactId>build</artifactId>
-                        <version>3.1.2-incubating-SNAPSHOT-SNAPSHOT</version>
+                        <version>${servicemix-version}</version>
                     </dependency>
                 </dependencies>
             </plugin>

Propchange: incubator/servicemix/branches/servicemix-3.1/platforms/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Aug 13 09:49:09 2007
@@ -0,0 +1 @@
+target

Propchange: incubator/servicemix/branches/servicemix-3.1/platforms/geronimo/dependencies/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 13 09:49:09 2007
@@ -1,2 +1,3 @@
 .project
 .classpath
+target

Modified: incubator/servicemix/branches/servicemix-3.1/platforms/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/platforms/pom.xml?view=diff&rev=565412&r1=565411&r2=565412
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/platforms/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/platforms/pom.xml Mon Aug 13 09:49:09 2007
@@ -57,7 +57,7 @@
                     <dependency>
                         <groupId>org.apache.servicemix</groupId>
                         <artifactId>build</artifactId>
-                        <version>3.1.2-incubating-SNAPSHOT-SNAPSHOT</version>
+                        <version>${servicemix-version}</version>
                     </dependency>
                 </dependencies>
             </plugin>

Modified: incubator/servicemix/branches/servicemix-3.1/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/pom.xml?view=diff&rev=565412&r1=565411&r2=565412
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/pom.xml Mon Aug 13 09:49:09 2007
@@ -213,7 +213,13 @@
         <sitemesh-version>2.2.1</sitemesh-version>
         <woden-version>1.0.0M6</woden-version>
 
-        <topDirectoryLocation>.</topDirectoryLocation>
+
+		<releases-repo-id>apache.incubating</releases-repo-id>
+		<releases-repo-name>Apache Incubating Repository</releases-repo-name>
+		<releases-repo-url>http://people.apache.org/repo/m2-incubating-repository</releases-repo-url>
+		<snapshots-repo-id>apache.snapshots</snapshots-repo-id>
+		<snapshots-repo-name>Apache Snapshots Repository</snapshots-repo-name>
+		<snapshots-repo-url>http://people.apache.org/repo/m2-snapshot-repository</snapshots-repo-url>
     </properties>
 
     <profiles>
@@ -422,7 +428,7 @@
             <dependency>
                 <groupId>org.apache.servicemix</groupId>
                 <artifactId>servicemix-gbean</artifactId>
-                <version>3.1.2-incubating-SNAPSHOT-SNAPSHOT</version>
+                <version>3.1.2-incubating-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix</groupId>

Propchange: incubator/servicemix/branches/servicemix-3.1/samples/loan-broker/loan-broker-jms-su/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 13 09:49:09 2007
@@ -1,2 +1,3 @@
 .classpath
 .project
+target

Modified: incubator/servicemix/branches/servicemix-3.1/samples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/samples/pom.xml?view=diff&rev=565412&r1=565411&r2=565412
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/samples/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/samples/pom.xml Mon Aug 13 09:49:09 2007
@@ -65,7 +65,7 @@
                     <dependency>
                         <groupId>org.apache.servicemix</groupId>
                         <artifactId>build</artifactId>
-                        <version>3.1.2-incubating-SNAPSHOT-SNAPSHOT</version>
+                        <version>${servicemix-version}</version>
                     </dependency>
                 </dependencies>
             </plugin>

Modified: incubator/servicemix/branches/servicemix-3.1/servicemix-itests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/servicemix-itests/pom.xml?view=diff&rev=565412&r1=565411&r2=565412
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/servicemix-itests/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/servicemix-itests/pom.xml Mon Aug 13 09:49:09 2007
@@ -127,7 +127,7 @@
                     <dependency>
                         <groupId>org.apache.servicemix</groupId>
                         <artifactId>build</artifactId>
-                        <version>3.1.2-incubating-SNAPSHOT-SNAPSHOT</version>
+                        <version>${servicemix-version}</version>
                     </dependency>
                 </dependencies>
             </plugin>

Modified: incubator/servicemix/branches/servicemix-3.1/tooling/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/tooling/pom.xml?view=diff&rev=565412&r1=565411&r2=565412
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/tooling/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/tooling/pom.xml Mon Aug 13 09:49:09 2007
@@ -34,6 +34,7 @@
     <packaging>pom</packaging>
   
     <modules>
+        <module>res-maven-plugin</module>
         <module>jbi-maven-plugin</module>
         <module>xfire-maven-plugin</module>
     </modules>
@@ -59,7 +60,7 @@
                     <dependency>
                         <groupId>org.apache.servicemix</groupId>
                         <artifactId>build</artifactId>
-                        <version>3.1.2-incubating-SNAPSHOT-SNAPSHOT</version>
+                        <version>${servicemix-version}</version>
                     </dependency>
                 </dependencies>
             </plugin>

Propchange: incubator/servicemix/branches/servicemix-3.1/tooling/res-maven-plugin/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Aug 13 09:49:09 2007
@@ -0,0 +1,4 @@
+.classpath
+.project
+target
+.settings

Copied: incubator/servicemix/branches/servicemix-3.1/tooling/res-maven-plugin/pom.xml (from r565353, incubator/servicemix/trunk/tooling/res-maven-plugin/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/tooling/res-maven-plugin/pom.xml?view=diff&rev=565412&p1=incubator/servicemix/trunk/tooling/res-maven-plugin/pom.xml&r1=565353&p2=incubator/servicemix/branches/servicemix-3.1/tooling/res-maven-plugin/pom.xml&r2=565412
==============================================================================
--- incubator/servicemix/trunk/tooling/res-maven-plugin/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/tooling/res-maven-plugin/pom.xml Mon Aug 13 09:49:09 2007
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>tooling</artifactId>
-        <version>3.2-incubating-SNAPSHOT</version>
+        <version>3.1.2-incubating-SNAPSHOT</version>
     </parent>
 
     <artifactId>res-maven-plugin</artifactId>

Propchange: incubator/servicemix/branches/servicemix-3.1/tooling/xfire-maven-plugin/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 13 09:49:09 2007
@@ -1,2 +1,3 @@
 .classpath
 .project
+target

Propchange: incubator/servicemix/branches/servicemix-3.1/web/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Aug 13 09:49:09 2007
@@ -0,0 +1 @@
+target

Modified: incubator/servicemix/branches/servicemix-3.1/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/web/pom.xml?view=diff&rev=565412&r1=565411&r2=565412
==============================================================================
--- incubator/servicemix/branches/servicemix-3.1/web/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.1/web/pom.xml Mon Aug 13 09:49:09 2007
@@ -58,7 +58,7 @@
                     <dependency>
                         <groupId>org.apache.servicemix</groupId>
                         <artifactId>build</artifactId>
-                        <version>3.1.2-incubating-SNAPSHOT-SNAPSHOT</version>
+                        <version>${servicemix-version}</version>
                     </dependency>
                 </dependencies>
             </plugin>



Mime
View raw message