servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r389038 - in /incubator/servicemix/trunk/tooling/maven-jbi-plugin: maven.xml project.xml src/plugin-resources/project.jsl
Date Mon, 27 Mar 2006 07:34:14 GMT
Author: gnodet
Date: Sun Mar 26 23:34:13 2006
New Revision: 389038

URL: http://svn.apache.org/viewcvs?rev=389038&view=rev
Log:
SM-368: The project.xml generated by the jbi:createArchetype goal is invalid

Modified:
    incubator/servicemix/trunk/tooling/maven-jbi-plugin/maven.xml
    incubator/servicemix/trunk/tooling/maven-jbi-plugin/project.xml
    incubator/servicemix/trunk/tooling/maven-jbi-plugin/src/plugin-resources/project.jsl

Modified: incubator/servicemix/trunk/tooling/maven-jbi-plugin/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/maven-jbi-plugin/maven.xml?rev=389038&r1=389037&r2=389038&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/maven-jbi-plugin/maven.xml (original)
+++ incubator/servicemix/trunk/tooling/maven-jbi-plugin/maven.xml Sun Mar 26 23:34:13 2006
@@ -30,5 +30,15 @@
             
           <attainGoal name="plugin:repository-deploy"/>
   </goal>
+  
+  <preGoal name="plugin:plugin">
+    <mkdir dir="${maven.build.dir}/plugin-resources"/>
+    <copy todir="${maven.build.dir}/plugin-resources">
+      <fileset dir="${basedir}/src/plugin-resources"/>
+      <filterset begintoken="%" endtoken="%">
+        <filter token="pom.currentVersion" value="${pom.currentVersion}"/>
+      </filterset>
+    </copy>
+  </preGoal>
 
 </project>

Modified: incubator/servicemix/trunk/tooling/maven-jbi-plugin/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/maven-jbi-plugin/project.xml?rev=389038&r1=389037&r2=389038&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/maven-jbi-plugin/project.xml (original)
+++ incubator/servicemix/trunk/tooling/maven-jbi-plugin/project.xml Sun Mar 26 23:34:13 2006
@@ -50,7 +50,7 @@
       <!-- This section is compulsory -->
       <resources>
         <resource>
-          <directory>${basedir}/src/plugin-resources</directory>
+          <directory>${maven.build.dir}/plugin-resources</directory>
           <targetPath>plugin-resources</targetPath>
         </resource>
         <resource>

Modified: incubator/servicemix/trunk/tooling/maven-jbi-plugin/src/plugin-resources/project.jsl
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/maven-jbi-plugin/src/plugin-resources/project.jsl?rev=389038&r1=389037&r2=389038&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/maven-jbi-plugin/src/plugin-resources/project.jsl (original)
+++ incubator/servicemix/trunk/tooling/maven-jbi-plugin/src/plugin-resources/project.jsl Sun
Mar 26 23:34:13 2006
@@ -27,7 +27,7 @@
 	<pomVersion>3</pomVersion>
 	<name>${projectName}</name>
 	<id>${projectName}</id>
-	<currentVersion>3.0-SNAPSHOT</currentVersion>
+	<currentVersion>1.0</currentVersion>
 	<package>org.apache.servicemix.demo</package>
 	<shortDescription>
           A new JBI component
@@ -38,8 +38,9 @@
 
 	<dependencies>
 	<dependency>
-	  <id>org.apache.servicemix</id>
-	  <version>3.0</version>
+	  <groupId>incubator-servicemix</groupId>
+	  <artifactId>servicemix</artifactId>
+	  <version>%pom.currentVersion%</version>
 	  <type>jar</type>
 	  <url>http://www.servicemix.org</url>
         </dependency>
@@ -75,4 +76,4 @@
 	</build>
 	
 </project>
-</j:whitespace>
\ No newline at end of file
+</j:whitespace>



Mime
View raw message