Author: gnodet
Date: Fri Nov 19 08:09:41 2010
New Revision: 1036759
URL: http://svn.apache.org/viewvc?rev=1036759&view=rev
Log:
[KARAF-284] Remove snapshot dependency on org.apache.karaf.shell.console in
archetypes/command/src/main/resources/archetype-resources/pom.xml
Modified:
karaf/branches/karaf-2.1.x/archetypes/command/pom.xml
karaf/branches/karaf-2.1.x/archetypes/command/src/main/resources/archetype-resources/pom.xml
Modified: karaf/branches/karaf-2.1.x/archetypes/command/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.1.x/archetypes/command/pom.xml?rev=1036759&r1=1036758&r2=1036759&view=diff
==============================================================================
--- karaf/branches/karaf-2.1.x/archetypes/command/pom.xml (original)
+++ karaf/branches/karaf-2.1.x/archetypes/command/pom.xml Fri Nov 19 08:09:41
2010
@@ -15,39 +15,62 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>archetypes</artifactId>
<version>2.1.2-SNAPSHOT</version>
</parent>
-
- <groupId>org.apache.karaf.archetypes</groupId>
- <artifactId>archetypes-command</artifactId>
- <version>2.1.2-SNAPSHOT</version>
-
- <name>Apache Karaf :: Command Archetype</name>
-
- <build>
- <extensions>
- <extension>
- <groupId>org.apache.maven.archetype</groupId>
- <artifactId>archetype-packaging</artifactId>
- <version>2.0-alpha-5</version>
- </extension>
- </extensions>
-
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-archetype-plugin</artifactId>
- <version>2.0-alpha-5</version>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
+
+ <groupId>org.apache.karaf.archetypes</groupId>
+ <artifactId>archetypes-command</artifactId>
+ <version>2.1.2-SNAPSHOT</version>
+
+ <name>Apache Karaf :: Command Archetype</name>
+
+ <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>
+ <artifactId>archetype-packaging</artifactId>
+ <version>2.0-alpha-5</version>
+ </extension>
+ </extensions>
+
+ <plugins>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.4.3</version>
+ <configuration>
+ <delimiters>
+ <delimiter>^*^</delimiter>
+ </delimiters>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-archetype-plugin</artifactId>
+ <version>2.0-alpha-5</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
Modified:
karaf/branches/karaf-2.1.x/archetypes/command/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.1.x/archetypes/command/src/main/resources/archetype-resources/pom.xml?rev=1036759&r1=1036758&r2=1036759&view=diff
==============================================================================
---
karaf/branches/karaf-2.1.x/archetypes/command/src/main/resources/archetype-resources/pom.xml
(original)
+++
karaf/branches/karaf-2.1.x/archetypes/command/src/main/resources/archetype-resources/pom.xml
Fri Nov 19 08:09:41 2010
@@ -26,28 +26,29 @@
<description>Provides the OSGi ${scope} commands</description>
<properties>
- <junit.version>4.7_1</junit.version>
- <felix.osgi.version>1.4.0</felix.osgi.version>
+ <junit.version>^junit.bundle.version^</junit.version>
+ <osgi.version>4.2.0</osgi.version>
+ <karaf.version>^project.version^</karaf.version>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.console</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>${karaf.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>${felix.osgi.version}</version>
+ <version>${osgi.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>${felix.osgi.version}</version>
+ <version>${osgi.version}</version>
<scope>provided</scope>
</dependency>
