aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cschnei...@apache.org
Subject svn commit: r1792735 - in /aries/trunk/blueprint/itests: blueprint-itests/pom.xml blueprint-testbundlea/pom.xml blueprint-testbundleb/pom.xml blueprint-testbundlee/pom.xml blueprint-testbundles/pom.xml blueprint-testquiescebundle/pom.xml pom.xml
Date Wed, 26 Apr 2017 11:34:42 GMT
Author: cschneider
Date: Wed Apr 26 11:34:42 2017
New Revision: 1792735

URL: http://svn.apache.org/viewvc?rev=1792735&view=rev
Log:
Use common parent for blueprint itests

Modified:
    aries/trunk/blueprint/itests/blueprint-itests/pom.xml
    aries/trunk/blueprint/itests/blueprint-testbundlea/pom.xml
    aries/trunk/blueprint/itests/blueprint-testbundleb/pom.xml
    aries/trunk/blueprint/itests/blueprint-testbundlee/pom.xml
    aries/trunk/blueprint/itests/blueprint-testbundles/pom.xml
    aries/trunk/blueprint/itests/blueprint-testquiescebundle/pom.xml
    aries/trunk/blueprint/itests/pom.xml

Modified: aries/trunk/blueprint/itests/blueprint-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/itests/blueprint-itests/pom.xml?rev=1792735&r1=1792734&r2=1792735&view=diff
==============================================================================
--- aries/trunk/blueprint/itests/blueprint-itests/pom.xml (original)
+++ aries/trunk/blueprint/itests/blueprint-itests/pom.xml Wed Apr 26 11:34:42 2017
@@ -22,10 +22,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.aries</groupId>
-        <artifactId>parent</artifactId>
-        <version>2.0.1</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <groupId>org.apache.aries.blueprint</groupId>
+        <artifactId>blueprint-itests-parent</artifactId>
+        <version>1.1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.blueprint</groupId>
@@ -56,10 +56,6 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.core</artifactId>
             <version>1.8.1-SNAPSHOT</version>

Modified: aries/trunk/blueprint/itests/blueprint-testbundlea/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/itests/blueprint-testbundlea/pom.xml?rev=1792735&r1=1792734&r2=1792735&view=diff
==============================================================================
--- aries/trunk/blueprint/itests/blueprint-testbundlea/pom.xml (original)
+++ aries/trunk/blueprint/itests/blueprint-testbundlea/pom.xml Wed Apr 26 11:34:42 2017
@@ -22,25 +22,18 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.aries</groupId>
-        <artifactId>parent</artifactId>
-        <version>2.0.1</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <groupId>org.apache.aries.blueprint</groupId>
+        <artifactId>blueprint-itests-parent</artifactId>
+        <version>1.1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.blueprint</groupId>
     <artifactId>org.apache.aries.blueprint.testbundlea</artifactId>
     <name>Apache Aries Blueprint Test Bundle A</name>
-    <version>1.1.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <description>Blueprint Test Bundle A, provides NamespaceHandler, BeanProcessor
etc implementations for Test Bundle B</description>
 
-    <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-testbundlea</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-testbundlea</developerConnection>
-        <url>http://svn.apache.org/viewvc/aries/branches/trunk/blueprint-testbundlea</url>
-    </scm>
-
     <properties>
         <aries.osgi.activator>
             org.apache.aries.blueprint.testbundlea.Activator
@@ -49,23 +42,4 @@
         <aries.osgi.export.pkg>${project.artifactId}*</aries.osgi.export.pkg>
     </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>osgi</artifactId>
-            <version>3.5.0.v20090520</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.blueprint</groupId>
-            <artifactId>org.apache.aries.blueprint.api</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.blueprint</groupId>
-            <artifactId>org.apache.aries.blueprint.core</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-    </dependencies>
-
 </project>

Modified: aries/trunk/blueprint/itests/blueprint-testbundleb/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/itests/blueprint-testbundleb/pom.xml?rev=1792735&r1=1792734&r2=1792735&view=diff
==============================================================================
--- aries/trunk/blueprint/itests/blueprint-testbundleb/pom.xml (original)
+++ aries/trunk/blueprint/itests/blueprint-testbundleb/pom.xml Wed Apr 26 11:34:42 2017
@@ -22,25 +22,18 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.aries</groupId>
-        <artifactId>parent</artifactId>
-        <version>2.0.1</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <groupId>org.apache.aries.blueprint</groupId>
+        <artifactId>blueprint-itests-parent</artifactId>
+        <version>1.1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.blueprint</groupId>
     <artifactId>org.apache.aries.blueprint.testbundleb</artifactId>
     <name>Apache Aries Blueprint Test Bundle B</name>
-    <version>1.0.2-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <description>Blueprint Test Bundle B, tests namespace handlers, bean processors
etc provided by Test Bundle A</description>
 
-    <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-testbundleb</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-testbundleb</developerConnection>
-        <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-testbundleb</url>
-    </scm>
-
     <properties>
         <aries.osgi.activator>
             org.apache.aries.blueprint.testbundleb.Activator
@@ -51,26 +44,10 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>osgi</artifactId>
-            <version>3.5.0.v20090520</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.blueprint</groupId>
-            <artifactId>org.apache.aries.blueprint.api</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.testbundlea</artifactId>
             <version>1.1.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.aries.blueprint</groupId>
-            <artifactId>org.apache.aries.blueprint.core</artifactId>
-            <version>1.0.0</version>
-        </dependency>
     </dependencies>
 
 </project>

Modified: aries/trunk/blueprint/itests/blueprint-testbundlee/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/itests/blueprint-testbundlee/pom.xml?rev=1792735&r1=1792734&r2=1792735&view=diff
==============================================================================
--- aries/trunk/blueprint/itests/blueprint-testbundlee/pom.xml (original)
+++ aries/trunk/blueprint/itests/blueprint-testbundlee/pom.xml Wed Apr 26 11:34:42 2017
@@ -22,25 +22,18 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.aries</groupId>
-        <artifactId>parent</artifactId>
-        <version>2.0.1</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <groupId>org.apache.aries.blueprint</groupId>
+        <artifactId>blueprint-itests-parent</artifactId>
+        <version>1.1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.blueprint</groupId>
     <artifactId>org.apache.aries.blueprint.testbundlee</artifactId>
     <name>Apache Aries Blueprint Test Bundle E</name>
-    <version>1.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <description>Blueprint Test Bundle E, provides Spring Extender test</description>
 
-    <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-testbundlee</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-testbundlee</developerConnection>
-        <url>http://svn.apache.org/viewvc/aries/branches/trunk/blueprint-testbundlee</url>
-    </scm>
-
     <properties>
         <aries.osgi.private.pkg />
         <aries.osgi.export.pkg>${project.artifactId}*</aries.osgi.export.pkg>
@@ -48,22 +41,6 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>osgi</artifactId>
-            <version>3.5.0.v20090520</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.blueprint</groupId>
-            <artifactId>org.apache.aries.blueprint.api</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.blueprint</groupId>
-            <artifactId>org.apache.aries.blueprint.core</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
             <version>4.2.2.RELEASE</version>
@@ -77,25 +54,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.aries.versioning</groupId>
-                <artifactId>org.apache.aries.versioning.plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>default-verify</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>version-check</goal>
-                        </goals>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>

Modified: aries/trunk/blueprint/itests/blueprint-testbundles/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/itests/blueprint-testbundles/pom.xml?rev=1792735&r1=1792734&r2=1792735&view=diff
==============================================================================
--- aries/trunk/blueprint/itests/blueprint-testbundles/pom.xml (original)
+++ aries/trunk/blueprint/itests/blueprint-testbundles/pom.xml Wed Apr 26 11:34:42 2017
@@ -22,25 +22,18 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.aries</groupId>
-        <artifactId>parent</artifactId>
-        <version>2.0.1</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <groupId>org.apache.aries.blueprint</groupId>
+        <artifactId>blueprint-itests-parent</artifactId>
+        <version>1.1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.blueprint</groupId>
     <artifactId>org.apache.aries.blueprint.testbundles</artifactId>
     <name>Apache Aries Blueprint Test Bundle S</name>
-    <version>1.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <description>Blueprint Test Bundle S, provides Spring test</description>
 
-    <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-testbundles</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-testbundles</developerConnection>
-        <url>http://svn.apache.org/viewvc/aries/branches/trunk/blueprint-testbundles</url>
-    </scm>
-
     <properties>
         <aries.osgi.private.pkg />
         <aries.osgi.export.pkg>${project.artifactId}*</aries.osgi.export.pkg>
@@ -48,22 +41,6 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>osgi</artifactId>
-            <version>3.5.0.v20090520</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.blueprint</groupId>
-            <artifactId>org.apache.aries.blueprint.api</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.blueprint</groupId>
-            <artifactId>org.apache.aries.blueprint.core</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
             <version>4.2.2.RELEASE</version>
@@ -77,25 +54,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.aries.versioning</groupId>
-                <artifactId>org.apache.aries.versioning.plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>default-verify</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>version-check</goal>
-                        </goals>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>

Modified: aries/trunk/blueprint/itests/blueprint-testquiescebundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/itests/blueprint-testquiescebundle/pom.xml?rev=1792735&r1=1792734&r2=1792735&view=diff
==============================================================================
--- aries/trunk/blueprint/itests/blueprint-testquiescebundle/pom.xml (original)
+++ aries/trunk/blueprint/itests/blueprint-testquiescebundle/pom.xml Wed Apr 26 11:34:42 2017
@@ -22,25 +22,18 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.aries</groupId>
-        <artifactId>parent</artifactId>
-        <version>2.0.1</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <groupId>org.apache.aries.blueprint</groupId>
+        <artifactId>blueprint-itests-parent</artifactId>
+        <version>1.1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.blueprint</groupId>
     <artifactId>org.apache.aries.blueprint.testquiescebundle</artifactId>
     <name>Apache Aries Blueprint Test Quiesce Bundle</name>
     <packaging>bundle</packaging>
-    <version>1.0.1-SNAPSHOT</version>
     <description>Blueprint Test Quiesce Bundle, tests the blueprint participant for
the quiesce functionality.</description>
 
-    <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-testquiescebundle</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/blueprint/blueprint-testquiescebundle</developerConnection>
-        <url>http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-testquiescebundle</url>
-    </scm>
-
     <properties>
         <aries.osgi.activator>
             org.apache.aries.blueprint.testquiescebundle.Activator
@@ -53,24 +46,5 @@
         <aries.osgi.export.pkg>${project.artifactId}*</aries.osgi.export.pkg>
     </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>osgi</artifactId>
-            <version>3.5.0.v20090520</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.blueprint</groupId>
-            <artifactId>org.apache.aries.blueprint.api</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.blueprint</groupId>
-            <artifactId>org.apache.aries.blueprint.core</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-    </dependencies>
-
 </project>
 

Modified: aries/trunk/blueprint/itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/itests/pom.xml?rev=1792735&r1=1792734&r2=1792735&view=diff
==============================================================================
--- aries/trunk/blueprint/itests/pom.xml (original)
+++ aries/trunk/blueprint/itests/pom.xml Wed Apr 26 11:34:42 2017
@@ -32,7 +32,7 @@
     <artifactId>blueprint-itests-parent</artifactId>
     <name>Apache Aries Blueprint</name>
     <packaging>pom</packaging>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <description>
         Aries Blueprint Integration tests
     </description>
@@ -46,5 +46,43 @@
         <module>blueprint-itests</module>
     </modules>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.blueprint</groupId>
+            <artifactId>org.apache.aries.blueprint.api</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.blueprint</groupId>
+            <artifactId>org.apache.aries.blueprint.core</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.aries.versioning</groupId>
+                <artifactId>org.apache.aries.versioning.plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>default-verify</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>version-check</goal>
+                        </goals>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
 



Mime
View raw message