You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/03/09 16:41:13 UTC
svn commit: r1298879 - in /karaf/trunk/archetypes/assembly: ./
src/main/resources/archetype-resources/
src/test/resources/projects/assembly/ src/test/resources/projects/kar/
Author: jbonofre
Date: Fri Mar 9 15:41:12 2012
New Revision: 1298879
URL: http://svn.apache.org/viewvc?rev=1298879&view=rev
Log:
[KARAF-1256] Dynamically use of Karaf version in the assembly archetype
Added:
karaf/trunk/archetypes/assembly/src/test/resources/projects/assembly/archetype.properties
- copied, changed from r1298841, karaf/trunk/archetypes/assembly/src/test/resources/projects/kar/archetype.properties
karaf/trunk/archetypes/assembly/src/test/resources/projects/assembly/goal.txt
- copied, changed from r1298841, karaf/trunk/archetypes/assembly/src/test/resources/projects/kar/goal.txt
Removed:
karaf/trunk/archetypes/assembly/src/test/resources/projects/kar/archetype.properties
karaf/trunk/archetypes/assembly/src/test/resources/projects/kar/goal.txt
Modified:
karaf/trunk/archetypes/assembly/pom.xml
karaf/trunk/archetypes/assembly/src/main/resources/archetype-resources/pom.xml
Modified: karaf/trunk/archetypes/assembly/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/archetypes/assembly/pom.xml?rev=1298879&r1=1298878&r2=1298879&view=diff
==============================================================================
--- karaf/trunk/archetypes/assembly/pom.xml (original)
+++ karaf/trunk/archetypes/assembly/pom.xml Fri Mar 9 15:41:12 2012
@@ -38,6 +38,16 @@
</properties>
<build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ </resources>
+
<extensions>
<extension>
<groupId>org.apache.maven.archetype</groupId>
@@ -49,6 +59,15 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <delimiters>
+ <delimiter>^*^</delimiter>
+ </delimiters>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-archetype-plugin</artifactId>
</plugin>
</plugins>
Modified: karaf/trunk/archetypes/assembly/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/archetypes/assembly/src/main/resources/archetype-resources/pom.xml?rev=1298879&r1=1298878&r2=1298879&view=diff
==============================================================================
--- karaf/trunk/archetypes/assembly/src/main/resources/archetype-resources/pom.xml (original)
+++ karaf/trunk/archetypes/assembly/src/main/resources/archetype-resources/pom.xml Fri Mar 9 15:41:12 2012
@@ -12,7 +12,7 @@
<description>${artifactId} details</description>
<properties>
- <karaf.version>3.0.0-SNAPSHOT</karaf.version>
+ <karaf.version>^project.version^</karaf.version>
</properties>
<dependencies>
@@ -59,4 +59,5 @@
</plugin>
</plugins>
</build>
+
</project>
Copied: karaf/trunk/archetypes/assembly/src/test/resources/projects/assembly/archetype.properties (from r1298841, karaf/trunk/archetypes/assembly/src/test/resources/projects/kar/archetype.properties)
URL: http://svn.apache.org/viewvc/karaf/trunk/archetypes/assembly/src/test/resources/projects/assembly/archetype.properties?p2=karaf/trunk/archetypes/assembly/src/test/resources/projects/assembly/archetype.properties&p1=karaf/trunk/archetypes/assembly/src/test/resources/projects/kar/archetype.properties&r1=1298841&r2=1298879&rev=1298879&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/archetypes/assembly/src/test/resources/projects/assembly/goal.txt (from r1298841, karaf/trunk/archetypes/assembly/src/test/resources/projects/kar/goal.txt)
URL: http://svn.apache.org/viewvc/karaf/trunk/archetypes/assembly/src/test/resources/projects/assembly/goal.txt?p2=karaf/trunk/archetypes/assembly/src/test/resources/projects/assembly/goal.txt&p1=karaf/trunk/archetypes/assembly/src/test/resources/projects/kar/goal.txt&r1=1298841&r2=1298879&rev=1298879&view=diff
==============================================================================
(empty)