You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ju...@apache.org on 2011/06/17 18:41:46 UTC
svn commit: r1136929 - in /sling/trunk: ./ launchpad/test-bundles/
launchpad/test-bundles/src/ launchpad/test-bundles/src/main/
launchpad/test-bundles/src/main/bundles/ launchpad/testing-war/
launchpad/testing-war/src/main/bundles/ launchpad/testing/ l...
Author: justin
Date: Fri Jun 17 16:41:46 2011
New Revision: 1136929
URL: http://svn.apache.org/viewvc?rev=1136929&view=rev
Log:
converting testing and testing-war projects to use a partial bundle list for the test services bundles
Added:
sling/trunk/launchpad/test-bundles/
sling/trunk/launchpad/test-bundles/pom.xml
sling/trunk/launchpad/test-bundles/src/
sling/trunk/launchpad/test-bundles/src/main/
sling/trunk/launchpad/test-bundles/src/main/bundles/
sling/trunk/launchpad/test-bundles/src/main/bundles/list.xml
Removed:
sling/trunk/launchpad/testing-war/src/main/bundles/list.xml
sling/trunk/launchpad/testing/src/main/bundles/list.xml
Modified:
sling/trunk/launchpad/testing-war/pom.xml
sling/trunk/launchpad/testing/pom.xml
sling/trunk/pom.xml
Added: sling/trunk/launchpad/test-bundles/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-bundles/pom.xml?rev=1136929&view=auto
==============================================================================
--- sling/trunk/launchpad/test-bundles/pom.xml (added)
+++ sling/trunk/launchpad/test-bundles/pom.xml Fri Jun 17 16:41:46 2011
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>sling</artifactId>
+ <version>10</version>
+ <relativePath>../../parent/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>org.apache.sling.launchpad.test-bundles</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>partialbundlelist</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>maven-launchpad-plugin</artifactId>
+ <version>2.0.11-SNAPSHOT</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Added: sling/trunk/launchpad/test-bundles/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-bundles/src/main/bundles/list.xml?rev=1136929&view=auto
==============================================================================
--- sling/trunk/launchpad/test-bundles/src/main/bundles/list.xml (added)
+++ sling/trunk/launchpad/test-bundles/src/main/bundles/list.xml Fri Jun 17 16:41:46 2011
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<bundles>
+ <startLevel level="0">
+ <bundle>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.launchpad.test-services</artifactId>
+ <version>2.0.9-SNAPSHOT</version>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.launchpad.test-services-war</artifactId>
+ <version>2.0.8</version>
+ <type>war</type>
+ </bundle>
+ </startLevel>
+</bundles>
Modified: sling/trunk/launchpad/testing-war/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing-war/pom.xml?rev=1136929&r1=1136928&r2=1136929&view=diff
==============================================================================
--- sling/trunk/launchpad/testing-war/pom.xml (original)
+++ sling/trunk/launchpad/testing-war/pom.xml Fri Jun 17 16:41:46 2011
@@ -178,7 +178,7 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-launchpad-plugin</artifactId>
- <version>2.0.10</version>
+ <version>2.0.11-SNAPSHOT</version>
<executions>
<execution>
<id>prepare-package</id>
@@ -447,6 +447,14 @@
<scope>test</scope>
</dependency>
+ <!-- The test services bundles -->
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.launchpad.test-bundles</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <type>partialbundlelist</type>
+ </dependency>
+
<!-- The basic Sling WebApp -->
<dependency>
<groupId>org.apache.sling</groupId>
Modified: sling/trunk/launchpad/testing/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/pom.xml?rev=1136929&r1=1136928&r2=1136929&view=diff
==============================================================================
--- sling/trunk/launchpad/testing/pom.xml (original)
+++ sling/trunk/launchpad/testing/pom.xml Fri Jun 17 16:41:46 2011
@@ -133,7 +133,8 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-launchpad-plugin</artifactId>
- <version>2.0.10</version>
+ <version>2.0.11-SNAPSHOT</version>
+ <extensions>true</extensions>
<executions>
<execution>
<id>prepare-package</id>
@@ -455,6 +456,14 @@
<scope>test</scope>
</dependency>
+ <!-- The test services bundles -->
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.launchpad.test-bundles</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <type>partialbundlelist</type>
+ </dependency>
+
<!-- The basic Sling WebApp -->
<dependency>
<groupId>org.apache.sling</groupId>
Modified: sling/trunk/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/pom.xml?rev=1136929&r1=1136928&r2=1136929&view=diff
==============================================================================
--- sling/trunk/pom.xml (original)
+++ sling/trunk/pom.xml Fri Jun 17 16:41:46 2011
@@ -193,6 +193,7 @@
<modules>
<module>launchpad/test-services</module>
<module>launchpad/test-services-war</module>
+ <module>launchpad/test-bundles</module>
<module>launchpad/integration-tests</module>
<module>launchpad/testing</module>
</modules>
@@ -205,6 +206,7 @@
<modules>
<module>launchpad/test-services</module>
<module>launchpad/test-services-war</module>
+ <module>launchpad/test-bundles
<module>launchpad/integration-tests</module>
<module>launchpad/testing</module>
<module>launchpad/testing-war</module>