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/02/16 13:38:10 UTC
svn commit: r1244959 - /karaf/trunk/admin/core/pom.xml
Author: jbonofre
Date: Thu Feb 16 12:38:10 2012
New Revision: 1244959
URL: http://svn.apache.org/viewvc?rev=1244959&view=rev
Log:
[KARAF-1158] Remove the usage of framework kar in admin in order to avoid this reactor dependency and control the dependencies
Modified:
karaf/trunk/admin/core/pom.xml
Modified: karaf/trunk/admin/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/core/pom.xml?rev=1244959&r1=1244958&r2=1244959&view=diff
==============================================================================
--- karaf/trunk/admin/core/pom.xml (original)
+++ karaf/trunk/admin/core/pom.xml Thu Feb 16 12:38:10 2012
@@ -38,13 +38,6 @@
</properties>
<dependencies>
- <dependency>
- <groupId>org.apache.karaf.features</groupId>
- <artifactId>framework</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
@@ -103,19 +96,18 @@
<artifactId>karaf-maven-plugin</artifactId>
<version>${project.version}</version>
</plugin>
- <!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
- <id>copy-config-properties</id>
- <phase>compile</phase>
+ <id>copy-config-files</id>
+ <phase>generate-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
- <outputDirectory>${basedir}/target/classes/org/apache/karaf/admin/etc</outputDirectory>
+ <outputDirectory>${basedir}/target/framework/org/apache/karaf/admin/etc</outputDirectory>
<resources>
<resource>
<directory>../../assemblies/features/framework/src/main/resources/resources/etc</directory>
@@ -124,6 +116,7 @@
<include>*.cfg</include>
</includes>
<excludes>
+ <exclude>org.apache.karaf.management.cfg</exclude>
<exclude>org.apache.karaf.shell.cfg</exclude>
<exclude>org.ops4j.pax.url.mvn.cfg</exclude>
<exclude>system.properties</exclude>
@@ -142,40 +135,6 @@
</execution>
</executions>
</plugin>
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack-unix</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.karaf.features</groupId>
- <artifactId>framework</artifactId>
- <type>kar</type>
- <overWrite>true</overWrite>
- <outputDirectory>${basedir}/target/framework/org/apache/karaf/admin</outputDirectory>
- <includes>resources/etc/*.properties,resources/etc/*.cfg</includes>
- <excludes>resources/etc/org.apache.karaf.management.cfg,resources/etc/org.apache.karaf.shell.cfg,resources/etc/org.ops4j.pax.url.mvn.cfg,resources/etc/system.properties</excludes>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.karaf.tooling</groupId>
- <artifactId>karaf-maven-plugin</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>