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 17:52:43 UTC
svn commit: r1298915 - in /karaf/branches/karaf-2.2.x/archetypes/assembly:
pom.xml src/main/resources/META-INF/maven/archetype-metadata.xml
src/main/resources/archetype-resources/pom.xml
Author: jbonofre
Date: Fri Mar 9 16:52:43 2012
New Revision: 1298915
URL: http://svn.apache.org/viewvc?rev=1298915&view=rev
Log:
[KARAF-1256] Use dynamic variable in assembly archetype
Modified:
karaf/branches/karaf-2.2.x/archetypes/assembly/pom.xml
karaf/branches/karaf-2.2.x/archetypes/assembly/src/main/resources/META-INF/maven/archetype-metadata.xml
karaf/branches/karaf-2.2.x/archetypes/assembly/src/main/resources/archetype-resources/pom.xml
Modified: karaf/branches/karaf-2.2.x/archetypes/assembly/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/archetypes/assembly/pom.xml?rev=1298915&r1=1298914&r2=1298915&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/archetypes/assembly/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/archetypes/assembly/pom.xml Fri Mar 9 16:52:43 2012
@@ -38,6 +38,15 @@
</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 +58,16 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <delimiters>
+ <delimiter>^*^</delimiter>
+ </delimiters>
+ <useDefaultDelimiters>false</useDefaultDelimiters>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-archetype-plugin</artifactId>
</plugin>
</plugins>
Modified: karaf/branches/karaf-2.2.x/archetypes/assembly/src/main/resources/META-INF/maven/archetype-metadata.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/archetypes/assembly/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=1298915&r1=1298914&r2=1298915&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/archetypes/assembly/src/main/resources/META-INF/maven/archetype-metadata.xml (original)
+++ karaf/branches/karaf-2.2.x/archetypes/assembly/src/main/resources/META-INF/maven/archetype-metadata.xml Fri Mar 9 16:52:43 2012
@@ -34,12 +34,6 @@
<include>**/*</include>
</includes>
</fileSet>
- <fileSet filtered="true" encoding="UTF-8">
- <directory></directory>
- <includes>
- <include>pom.xml</include>
- </includes>
- </fileSet>
</fileSets>
</archetype-descriptor>
Modified: karaf/branches/karaf-2.2.x/archetypes/assembly/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/archetypes/assembly/src/main/resources/archetype-resources/pom.xml?rev=1298915&r1=1298914&r2=1298915&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/archetypes/assembly/src/main/resources/archetype-resources/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/archetypes/assembly/src/main/resources/archetype-resources/pom.xml Fri Mar 9 16:52:43 2012
@@ -8,12 +8,10 @@
<version>${version}</version>
<packaging>pom</packaging>
<name>${artifactId} Karaf Assembly</name>
- <description>
- This project creates a Karaf custom distribution that you can customize to fit your needs.
- </description>
+ <description>This project creates a Karaf custom distribution that you can customize to fit your needs.</description>
<properties>
- <karaf.version>2.2.6-SNAPSHOT</karaf.version>
+ <karaf.version>^project.version^</karaf.version>
</properties>
<dependencies>