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:53:06 UTC
svn commit: r1298917 - in /karaf/branches/karaf-2.2.x/archetypes/bundle:
pom.xml src/main/resources/archetype-resources/pom.xml
Author: jbonofre
Date: Fri Mar 9 16:53:06 2012
New Revision: 1298917
URL: http://svn.apache.org/viewvc?rev=1298917&view=rev
Log:
[KARAF-1256] Use filtering in the bundle archetype
Modified:
karaf/branches/karaf-2.2.x/archetypes/bundle/pom.xml
karaf/branches/karaf-2.2.x/archetypes/bundle/src/main/resources/archetype-resources/pom.xml
Modified: karaf/branches/karaf-2.2.x/archetypes/bundle/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/archetypes/bundle/pom.xml?rev=1298917&r1=1298916&r2=1298917&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/archetypes/bundle/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/archetypes/bundle/pom.xml Fri Mar 9 16:53:06 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>
@@ -50,6 +59,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/bundle/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/archetypes/bundle/src/main/resources/archetype-resources/pom.xml?rev=1298917&r1=1298916&r2=1298917&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/archetypes/bundle/src/main/resources/archetype-resources/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/archetypes/bundle/src/main/resources/archetype-resources/pom.xml Fri Mar 9 16:53:06 2012
@@ -9,20 +9,13 @@
<packaging>bundle</packaging>
<name>${artifactId} Bundle</name>
- <description>
- ${artifactId} OSGi bundle project.
- </description>
-
- <properties>
- <maven-bundle-plugin.version>2.3.6</maven-bundle-plugin.version>
- <osgi.version>4.2.0</osgi.version>
- </properties>
+ <description>${artifactId} OSGi bundle project.</description>
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>${osgi.version}</version>
+ <version>^osgi.version^</version>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -32,7 +25,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${maven-bundle-plugin.version}</version>
+ <version>^felix.plugin.version^</version>
<extensions>true</extensions>
<configuration>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>