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 2011/12/15 17:31:01 UTC
svn commit: r1214846 - in
/karaf/trunk/archetypes/kar/src/main/resources/archetype-resources: pom.xml
src/main/feature/feature.xml
Author: jbonofre
Date: Thu Dec 15 16:31:01 2011
New Revision: 1214846
URL: http://svn.apache.org/viewvc?rev=1214846&view=rev
Log:
[KARAF-1109] Cleanup the karaf-kar-archetype
Modified:
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/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=1214846&r1=1214845&r2=1214846&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 Thu Dec 15 16:31:01 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>
@@ -28,6 +14,7 @@
<properties>
<karaf.version>3.0.0-SNAPSHOT</karaf.version>
</properties>
+
<dependencies>
</dependencies>
@@ -51,7 +38,7 @@
<configuration>
<startLevel>50</startLevel>
<aggregateFeatures>true</aggregateFeatures>
- <resolver>(OBR)</resolver>
+ <resolver>(obr)</resolver>
<checkDependencyChange>true</checkDependencyChange>
<warnOnDependencyChange>true</warnOnDependencyChange>
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=1214846&r1=1214845&r2=1214846&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 Thu Dec 15 16:31:01 2011
@@ -19,8 +19,10 @@
-->
<features name="${project.artifactId}-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
- <feature name='${project.artifactId}' description='${project.name}' version='${project.version}'>
+
+ <feature name='${project.artifactId}' description='${project.name}' version='${project.version}' resolver="${resolver}">
<details>${project.description}</details>
<config>foo=bar</config>
</feature>
+
</features>
\ No newline at end of file