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:11:35 UTC
svn commit: r1298902 - in /karaf/trunk/archetypes/kar: pom.xml
src/main/resources/archetype-resources/pom.xml
src/main/resources/archetype-resources/src/main/feature/feature.xml
Author: jbonofre
Date: Fri Mar 9 16:11:34 2012
New Revision: 1298902
URL: http://svn.apache.org/viewvc?rev=1298902&view=rev
Log:
[KARAF-1256] Not use default delimiters in the kar archetype
Modified:
karaf/trunk/archetypes/kar/pom.xml
karaf/trunk/archetypes/kar/src/main/resources/archetype-resources/pom.xml
karaf/trunk/archetypes/kar/src/main/resources/archetype-resources/src/main/feature/feature.xml
Modified: karaf/trunk/archetypes/kar/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/archetypes/kar/pom.xml?rev=1298902&r1=1298901&r2=1298902&view=diff
==============================================================================
--- karaf/trunk/archetypes/kar/pom.xml (original)
+++ karaf/trunk/archetypes/kar/pom.xml Fri Mar 9 16:11:34 2012
@@ -39,6 +39,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>
@@ -50,6 +60,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/trunk/archetypes/kar/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/archetypes/kar/src/main/resources/archetype-resources/pom.xml?rev=1298902&r1=1298901&r2=1298902&view=diff
==============================================================================
--- karaf/trunk/archetypes/kar/src/main/resources/archetype-resources/pom.xml (original)
+++ karaf/trunk/archetypes/kar/src/main/resources/archetype-resources/pom.xml Fri Mar 9 16:11:34 2012
@@ -11,12 +11,8 @@
<name>${artifactId}-kar</name>
<description>${artifactId} details</description>
- <properties>
- <karaf.version>3.0.0-SNAPSHOT</karaf.version>
- </properties>
-
<dependencies>
-
+ <!-- add the artifacts that should be in the kar in the dependencies set -->
</dependencies>
<build>
@@ -25,7 +21,7 @@
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
- <version>${karaf.version}</version>
+ <version>^project.version^</version>
<extensions>true</extensions>
</plugin>
</plugins>
@@ -34,12 +30,10 @@
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
-
<configuration>
<startLevel>50</startLevel>
<aggregateFeatures>true</aggregateFeatures>
<resolver>(obr)</resolver>
-
<checkDependencyChange>true</checkDependencyChange>
<warnOnDependencyChange>true</warnOnDependencyChange>
<logDependencyChanges>true</logDependencyChanges>
@@ -48,4 +42,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: karaf/trunk/archetypes/kar/src/main/resources/archetype-resources/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/archetypes/kar/src/main/resources/archetype-resources/src/main/feature/feature.xml?rev=1298902&r1=1298901&r2=1298902&view=diff
==============================================================================
--- karaf/trunk/archetypes/kar/src/main/resources/archetype-resources/src/main/feature/feature.xml (original)
+++ karaf/trunk/archetypes/kar/src/main/resources/archetype-resources/src/main/feature/feature.xml Fri Mar 9 16:11:34 2012
@@ -22,7 +22,7 @@
<feature name='${project.artifactId}' description='${project.name}' version='${project.version}' resolver="${resolver}">
<details>${project.description}</details>
- <config>foo=bar</config>
+ <!-- <config>foo=bar</config> -->
</feature>
</features>
\ No newline at end of file