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 15:14:06 UTC
svn commit: r1298836 - in /karaf/trunk/archetypes/bundle: ./
src/main/resources/META-INF/maven/ src/main/resources/archetype-resources/
src/test/ src/test/resources/ src/test/resources/projects/
src/test/resources/projects/bundle/
Author: jbonofre
Date: Fri Mar 9 14:14:06 2012
New Revision: 1298836
URL: http://svn.apache.org/viewvc?rev=1298836&view=rev
Log:
Refactore bundle archetype to use new Maven itests
Added:
karaf/trunk/archetypes/bundle/src/test/
karaf/trunk/archetypes/bundle/src/test/resources/
karaf/trunk/archetypes/bundle/src/test/resources/projects/
karaf/trunk/archetypes/bundle/src/test/resources/projects/bundle/
karaf/trunk/archetypes/bundle/src/test/resources/projects/bundle/archetype.properties
karaf/trunk/archetypes/bundle/src/test/resources/projects/bundle/goal.txt
Modified:
karaf/trunk/archetypes/bundle/pom.xml
karaf/trunk/archetypes/bundle/src/main/resources/META-INF/maven/archetype-metadata.xml
karaf/trunk/archetypes/bundle/src/main/resources/archetype-resources/pom.xml
Modified: karaf/trunk/archetypes/bundle/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/archetypes/bundle/pom.xml?rev=1298836&r1=1298835&r2=1298836&view=diff
==============================================================================
--- karaf/trunk/archetypes/bundle/pom.xml (original)
+++ karaf/trunk/archetypes/bundle/pom.xml Fri Mar 9 14:14:06 2012
@@ -33,21 +33,32 @@
<packaging>maven-archetype</packaging>
<name>Apache Karaf :: Archetypes :: Bundle Archetype</name>
- <build>
+ <properties>
+ <archetype.version>2.2</archetype.version>
+ </properties>
+ <build>
<extensions>
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
- <version>2.2</version>
+ <version>${archetype.version}</version>
</extension>
</extensions>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-archetype-plugin</artifactId>
+ </plugin>
+ </plugins>
+
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-archetype-plugin</artifactId>
+ <version>${archetype.version}</version>
</plugin>
</plugins>
</pluginManagement>
Modified: karaf/trunk/archetypes/bundle/src/main/resources/META-INF/maven/archetype-metadata.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/archetypes/bundle/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=1298836&r1=1298835&r2=1298836&view=diff
==============================================================================
--- karaf/trunk/archetypes/bundle/src/main/resources/META-INF/maven/archetype-metadata.xml (original)
+++ karaf/trunk/archetypes/bundle/src/main/resources/META-INF/maven/archetype-metadata.xml Fri Mar 9 14:14:06 2012
@@ -20,6 +20,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
name="karaf-bundle-archetype">
+ <requiredProperties>
+ <requiredProperty key="package"/>
+ </requiredProperties>
+
<fileSets>
<fileSet filtered="true" packaged="true" encoding="UTF-8">
<directory>src/main/java</directory>
Modified: karaf/trunk/archetypes/bundle/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/archetypes/bundle/src/main/resources/archetype-resources/pom.xml?rev=1298836&r1=1298835&r2=1298836&view=diff
==============================================================================
--- karaf/trunk/archetypes/bundle/src/main/resources/archetype-resources/pom.xml (original)
+++ karaf/trunk/archetypes/bundle/src/main/resources/archetype-resources/pom.xml Fri Mar 9 14:14:06 2012
@@ -14,7 +14,7 @@
</description>
<properties>
- <maven-bundle-plugin.version>2.3.6</maven-bundle-plugin.version>
+ <maven-bundle-plugin.version>2.3.7</maven-bundle-plugin.version>
<osgi.version>4.3.0</osgi.version>
</properties>
Added: karaf/trunk/archetypes/bundle/src/test/resources/projects/bundle/archetype.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/archetypes/bundle/src/test/resources/projects/bundle/archetype.properties?rev=1298836&view=auto
==============================================================================
--- karaf/trunk/archetypes/bundle/src/test/resources/projects/bundle/archetype.properties (added)
+++ karaf/trunk/archetypes/bundle/src/test/resources/projects/bundle/archetype.properties Fri Mar 9 14:14:06 2012
@@ -0,0 +1,4 @@
+groupId=archetype.it
+artifactId=bundle
+version=1.0-SNAPSHOT
+package=org.apache.karaf.archetype.it
\ No newline at end of file
Added: karaf/trunk/archetypes/bundle/src/test/resources/projects/bundle/goal.txt
URL: http://svn.apache.org/viewvc/karaf/trunk/archetypes/bundle/src/test/resources/projects/bundle/goal.txt?rev=1298836&view=auto
==============================================================================
--- karaf/trunk/archetypes/bundle/src/test/resources/projects/bundle/goal.txt (added)
+++ karaf/trunk/archetypes/bundle/src/test/resources/projects/bundle/goal.txt Fri Mar 9 14:14:06 2012
@@ -0,0 +1 @@
+clean install verify
\ No newline at end of file