Author: jbonofre
Date: Tue Oct 11 12:09:58 2011
New Revision: 1181738
URL: http://svn.apache.org/viewvc?rev=1181738&view=rev
Log:
[KARAF-772] Update POMs with the default assembly name
Modified:
karaf/trunk/demos/web/pom.xml
karaf/trunk/itests/kittests/pom.xml
karaf/trunk/pom.xml
karaf/trunk/tooling/testing/pom.xml
Modified: karaf/trunk/demos/web/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/demos/web/pom.xml?rev=1181738&r1=1181737&r2=1181738&view=diff
==============================================================================
--- karaf/trunk/demos/web/pom.xml (original)
+++ karaf/trunk/demos/web/pom.xml Tue Oct 11 12:09:58 2011
@@ -51,7 +51,7 @@
</dependency>
<dependency>
<groupId>org.apache.karaf.assemblies</groupId>
- <artifactId>apache-karaf-full</artifactId>
+ <artifactId>apache-karaf</artifactId>
<type>zip</type>
<scope>provided</scope>
</dependency>
@@ -120,7 +120,7 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.karaf.assemblies</groupId>
- <artifactId>apache-karaf-full</artifactId>
+ <artifactId>apache-karaf</artifactId>
<type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/karaf/WEB-INF</outputDirectory>
@@ -145,7 +145,7 @@
<tasks>
<move
todir="${project.build.directory}/karaf/WEB-INF/karaf">
<fileset
-
dir="${project.build.directory}/karaf/WEB-INF/apache-karaf-full-${project.version}"/>
+
dir="${project.build.directory}/karaf/WEB-INF/apache-karaf-${project.version}"/>
</move>
</tasks>
</configuration>
Modified: karaf/trunk/itests/kittests/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/itests/kittests/pom.xml?rev=1181738&r1=1181737&r2=1181738&view=diff
==============================================================================
--- karaf/trunk/itests/kittests/pom.xml (original)
+++ karaf/trunk/itests/kittests/pom.xml Tue Oct 11 12:09:58 2011
@@ -42,14 +42,14 @@
which would lead to java.lang.RuntimeException: Could not create
[service.obr] -->
<dependency>
<groupId>org.apache.karaf.assemblies</groupId>
- <artifactId>apache-karaf-full</artifactId>
+ <artifactId>apache-karaf</artifactId>
<type>tar.gz</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf.assemblies</groupId>
- <artifactId>apache-karaf-full</artifactId>
+ <artifactId>apache-karaf</artifactId>
<type>zip</type>
<scope>test</scope>
</dependency>
@@ -105,7 +105,7 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.karaf.assemblies</groupId>
- <artifactId>apache-karaf-full</artifactId>
+ <artifactId>apache-karaf</artifactId>
<type>tar.gz</type>
<outputDirectory>target/distributions</outputDirectory>
<destFileName>karaf.tar.gz</destFileName>
@@ -123,7 +123,7 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.karaf.assemblies</groupId>
- <artifactId>apache-karaf-full</artifactId>
+ <artifactId>apache-karaf</artifactId>
<type>zip</type>
<outputDirectory>target/distributions</outputDirectory>
<destFileName>karaf.zip</destFileName>
Modified: karaf/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1181738&r1=1181737&r2=1181738&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Tue Oct 11 12:09:58 2011
@@ -492,13 +492,13 @@
</dependency>
<dependency>
<groupId>org.apache.karaf.assemblies</groupId>
- <artifactId>apache-karaf-full</artifactId>
+ <artifactId>apache-karaf</artifactId>
<type>tar.gz</type>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.karaf.assemblies</groupId>
- <artifactId>apache-karaf-full</artifactId>
+ <artifactId>apache-karaf</artifactId>
<type>zip</type>
<version>${project.version}</version>
</dependency>
Modified: karaf/trunk/tooling/testing/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/tooling/testing/pom.xml?rev=1181738&r1=1181737&r2=1181738&view=diff
==============================================================================
--- karaf/trunk/tooling/testing/pom.xml (original)
+++ karaf/trunk/tooling/testing/pom.xml Tue Oct 11 12:09:58 2011
@@ -42,7 +42,7 @@
<!-- The assembly and all the dependencies -->
<dependency>
<groupId>org.apache.karaf.assemblies</groupId>
- <artifactId>apache-karaf-full</artifactId>
+ <artifactId>apache-karaf</artifactId>
<type>zip</type>
</dependency>
<!-- Feature Files -->
@@ -110,11 +110,10 @@
<outputDirectory>${basedir}/target/classes/</outputDirectory>
<resources>
<resource>
-
<directory>../../assemblies/apache-karaf/src/main/filtered-resources/etc</directory>
+
<directory>../../assemblies/features/framework/src/main/filtered-resources/resources/etc</directory>
<filtering>true</filtering>
<includes>
<include>config.properties</include>
- <include>startup.properties</include>
<include>jre.properties</include>
<include>custom.properties</include>
</includes>
@@ -153,8 +152,7 @@
{maven-resources},
org/apache/karaf/testing/config.properties=target/classes/config.properties,
org/apache/karaf/testing/jre.properties=target/classes/jre.properties,
-
org/apache/karaf/testing/custom.properties=target/classes/custom.properties,
-
org/apache/karaf/testing/startup.properties=target/classes/startup.properties
+
org/apache/karaf/testing/custom.properties=target/classes/custom.properties
</Include-Resource>
<_versionpolicy>${bnd.version.policy}</_versionpolicy>
</instructions>
