You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by dj...@apache.org on 2011/08/31 08:09:56 UTC
svn commit: r1163501 - in /karaf/trunk: assemblies/pom.xml demos/web/pom.xml
itests/kittests/pom.xml pom.xml tooling/testing/pom.xml
Author: djencks
Date: Wed Aug 31 06:09:55 2011
New Revision: 1163501
URL: http://svn.apache.org/viewvc?rev=1163501&view=rev
Log:
KARAF-424 use new apache-karaf-full assembly in tests
Modified:
karaf/trunk/assemblies/pom.xml
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/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/pom.xml?rev=1163501&r1=1163500&r2=1163501&view=diff
==============================================================================
--- karaf/trunk/assemblies/pom.xml (original)
+++ karaf/trunk/assemblies/pom.xml Wed Aug 31 06:09:55 2011
@@ -34,7 +34,7 @@
<modules>
<module>features</module>
- <module>apache-karaf</module>
+ <!--<module>apache-karaf</module>-->
<module>apache-karaf-minimal</module>
<module>apache-karaf-full</module>
</modules>
Modified: karaf/trunk/demos/web/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/demos/web/pom.xml?rev=1163501&r1=1163500&r2=1163501&view=diff
==============================================================================
--- karaf/trunk/demos/web/pom.xml (original)
+++ karaf/trunk/demos/web/pom.xml Wed Aug 31 06:09:55 2011
@@ -50,7 +50,8 @@
</dependency>
<dependency>
<groupId>org.apache.karaf.assemblies</groupId>
- <artifactId>apache-karaf</artifactId>
+ <artifactId>apache-karaf-full</artifactId>
+ <classifier>bin</classifier>
<type>zip</type>
<scope>provided</scope>
</dependency>
@@ -121,7 +122,8 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.karaf.assemblies</groupId>
- <artifactId>apache-karaf</artifactId>
+ <artifactId>apache-karaf-full</artifactId>
+ <classifier>bin</classifier>
<type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/karaf/WEB-INF</outputDirectory>
@@ -145,7 +147,7 @@
<configuration>
<tasks>
<move todir="${project.build.directory}/karaf/WEB-INF/karaf">
- <fileset dir="${project.build.directory}/karaf/WEB-INF/apache-karaf-${project.version}" />
+ <fileset dir="${project.build.directory}/karaf/WEB-INF/apache-karaf-full-${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=1163501&r1=1163500&r2=1163501&view=diff
==============================================================================
--- karaf/trunk/itests/kittests/pom.xml (original)
+++ karaf/trunk/itests/kittests/pom.xml Wed Aug 31 06:09:55 2011
@@ -44,14 +44,16 @@
which would lead to java.lang.RuntimeException: Could not create [service.obr] -->
<dependency>
<groupId>org.apache.karaf.assemblies</groupId>
- <artifactId>apache-karaf</artifactId>
+ <artifactId>apache-karaf-full</artifactId>
+ <classifier>bin</classifier>
<type>tar.gz</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf.assemblies</groupId>
- <artifactId>apache-karaf</artifactId>
+ <artifactId>apache-karaf-full</artifactId>
+ <classifier>bin</classifier>
<type>zip</type>
<scope>test</scope>
</dependency>
@@ -109,7 +111,8 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.karaf.assemblies</groupId>
- <artifactId>apache-karaf</artifactId>
+ <artifactId>apache-karaf-full</artifactId>
+ <classifier>bin</classifier>
<type>tar.gz</type>
<outputDirectory>target/distributions</outputDirectory>
<destFileName>karaf.tar.gz</destFileName>
@@ -127,7 +130,8 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.karaf.assemblies</groupId>
- <artifactId>apache-karaf</artifactId>
+ <artifactId>apache-karaf-full</artifactId>
+ <classifier>bin</classifier>
<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=1163501&r1=1163500&r2=1163501&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Wed Aug 31 06:09:55 2011
@@ -456,24 +456,6 @@
</dependency>
<dependency>
<groupId>org.apache.karaf.assemblies</groupId>
- <artifactId>apache-karaf</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.assemblies</groupId>
- <artifactId>apache-karaf</artifactId>
- <type>tar.gz</type>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.assemblies</groupId>
- <artifactId>apache-karaf</artifactId>
- <type>zip</type>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.assemblies</groupId>
<artifactId>apache-karaf-full</artifactId>
<type>tar.gz</type>
<classifier>bin</classifier>
Modified: karaf/trunk/tooling/testing/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/testing/pom.xml?rev=1163501&r1=1163500&r2=1163501&view=diff
==============================================================================
--- karaf/trunk/tooling/testing/pom.xml (original)
+++ karaf/trunk/tooling/testing/pom.xml Wed Aug 31 06:09:55 2011
@@ -43,8 +43,9 @@
<!-- The assembly and all the dependencies -->
<dependency>
<groupId>org.apache.karaf.assemblies</groupId>
- <artifactId>apache-karaf</artifactId>
- <type>pom</type>
+ <artifactId>apache-karaf-full</artifactId>
+ <classifier>bin</classifier>
+ <type>zip</type>
</dependency>
<!-- Feature Files -->
<dependency>