svn commit: r1778586 - in /aries/trunk/blueprint/itests/blueprint-itests: pom.xml src/test/java/org/apache/aries/blueprint/itests/BlueprintAnnotationTest.java src/test/java/org/apache/aries/blueprint/itests/Helper.java

[cschneider]

Author: cschneider
Date: Fri Jan 13 13:42:59 2017
New Revision: 1778586

URL: http://svn.apache.org/viewvc?rev=1778586&view=rev
Log:
[ARIES-1654] Remove old blueprint annotations from trunk

Removed:
    
aries/trunk/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintAnnotationTest.java
Modified:
    aries/trunk/blueprint/itests/blueprint-itests/pom.xml
    
aries/trunk/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/Helper.java

Modified: aries/trunk/blueprint/itests/blueprint-itests/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/itests/blueprint-itests/pom.xml?rev=1778586&r1=1778585&r2=1778586&view=diff
==============================================================================
--- aries/trunk/blueprint/itests/blueprint-itests/pom.xml (original)
+++ aries/trunk/blueprint/itests/blueprint-itests/pom.xml Fri Jan 13 13:42:59 
2017
@@ -310,28 +310,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
-            <artifactId>org.apache.aries.blueprint.annotation.api</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
-            <type>bundle</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.blueprint</groupId>
-            <artifactId>org.apache.aries.blueprint.annotation.impl</artifactId>
-            <!-- TODO using 1.0.1 released or 1.0.2.SNAPSHOT causes failures in
-            org.apache.aries.blueprint.itests.BlueprintAnnotationTest -->
-            <version>1.0.0</version>
-            <type>bundle</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.blueprint</groupId>
-            
<artifactId>org.apache.aries.blueprint.sample-annotation</artifactId>
-            <version>1.1.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.sample-fragment</artifactId>
             <version>1.0.0</version>
             <scope>test</scope>

Modified: 
aries/trunk/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/Helper.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/Helper.java?rev=1778586&r1=1778585&r2=1778586&view=diff
==============================================================================
--- 
aries/trunk/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/Helper.java
 (original)
+++ 
aries/trunk/blueprint/itests/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/Helper.java
 Fri Jan 13 13:42:59 2017
@@ -77,9 +77,7 @@ public class Helper {
                 mvnBundle("org.apache.aries.quiesce", 
"org.apache.aries.quiesce.api", startBlueprint),
                 mvnBundle("org.apache.aries.blueprint", 
"org.apache.aries.blueprint.api", startBlueprint),
                 mvnBundle("org.apache.aries.blueprint", 
"org.apache.aries.blueprint.core", startBlueprint),
-                mvnBundle("org.apache.aries.blueprint", 
"org.apache.aries.blueprint.cm", startBlueprint),
-                mvnBundle("org.apache.aries.blueprint", 
"org.apache.aries.blueprint.annotation.api", startBlueprint),
-                mvnBundle("org.apache.aries.blueprint", 
"org.apache.aries.blueprint.annotation.impl", startBlueprint)
+                mvnBundle("org.apache.aries.blueprint", 
"org.apache.aries.blueprint.cm", startBlueprint)
         );
     }