svn commit: r1214822 - /karaf/trunk/archetypes/assembly/src/main/resources/archetype-resources/pom.xml

[jb...@apache.org]

Author: jbonofre
Date: Thu Dec 15 15:59:46 2011
New Revision: 1214822

URL: http://svn.apache.org/viewvc?rev=1214822&view=rev
Log:
Fix the assembly archetype

Modified:
    karaf/trunk/archetypes/assembly/src/main/resources/archetype-resources/pom.xml

Modified: karaf/trunk/archetypes/assembly/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/archetypes/assembly/src/main/resources/archetype-resources/pom.xml?rev=1214822&r1=1214821&r2=1214822&view=diff
==============================================================================
--- karaf/trunk/archetypes/assembly/src/main/resources/archetype-resources/pom.xml (original)
+++ karaf/trunk/archetypes/assembly/src/main/resources/archetype-resources/pom.xml Thu Dec 15 15:59:46 2011
@@ -1,20 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    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">
+<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>
 
     <groupId>${groupId}</groupId>
@@ -33,12 +19,13 @@
         <dependency>
             <groupId>org.apache.karaf.features</groupId>
             <artifactId>framework</artifactId>
-            <version>${project.version}</version>
+            <version>${karaf.version}</version>
             <type>kar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.karaf.features</groupId>
             <artifactId>standard</artifactId>
+            <version>${karaf.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
             <scope>runtime</scope>