From 5cdc09261f4a79d65f91caa69bcfc62c865cc97c Mon Sep 17 00:00:00 2001
From: Robert Varga <rovarga@cisco.com>
Date: Wed, 24 Dec 2014 21:52:37 +0100
Subject: [PATCH] Do not test bundle activation of maven plugins

maven-sal-api-gen-plugin is intended for maven use only. Do not test it
for startability.

Change-Id: Ic40f77c7f65bd27b429680b5dc9064d42b9dab18
Signed-off-by: Robert Varga <rovarga@cisco.com>
---
 integration-test/bundle-test/pom.xml                        | 6 +-----
 .../opendaylight/yangtools/bundle/test/BundleStartTest.java | 6 ------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/integration-test/bundle-test/pom.xml b/integration-test/bundle-test/pom.xml
index 4fde8986ea..5767124eb2 100644
--- a/integration-test/bundle-test/pom.xml
+++ b/integration-test/bundle-test/pom.xml
@@ -42,10 +42,6 @@
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.sonatype.plexus</groupId>
-            <artifactId>plexus-build-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-slf4j-logging</artifactId>
@@ -57,7 +53,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>maven-sal-api-gen-plugin</artifactId>
+            <artifactId>binding-generator-impl</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools.thirdparty</groupId>
diff --git a/integration-test/bundle-test/src/test/java/org/opendaylight/yangtools/bundle/test/BundleStartTest.java b/integration-test/bundle-test/src/test/java/org/opendaylight/yangtools/bundle/test/BundleStartTest.java
index 1b5e1d8548..f0bbe6d77c 100644
--- a/integration-test/bundle-test/src/test/java/org/opendaylight/yangtools/bundle/test/BundleStartTest.java
+++ b/integration-test/bundle-test/src/test/java/org/opendaylight/yangtools/bundle/test/BundleStartTest.java
@@ -43,8 +43,6 @@ public class BundleStartTest {
         options.add(mavenBundle("org.opendaylight.yangtools.thirdparty", "antlr4-runtime-osgi-nohead")
                 .versionAsInProject());
         options.add(mavenBundle("org.opendaylight.yangtools.thirdparty", "xtend-lib-osgi").versionAsInProject());
-        options.add(mavenBundle("org.sonatype.plexus", "plexus-build-api").versionAsInProject());
-        options.add(mavenBundle("org.codehaus.plexus", "plexus-slf4j-logging").versionAsInProject());
         options.add(mavenBundle("org.javassist", "javassist").versionAsInProject());
 
         options.add(mavenBundle(GROUP, "concepts").versionAsInProject());
@@ -64,10 +62,8 @@ public class BundleStartTest {
         options.add(mavenBundle(GROUP, "binding-generator-impl").versionAsInProject());
         options.add(mavenBundle(GROUP, "binding-generator-spi").versionAsInProject());
         options.add(mavenBundle(GROUP, "binding-generator-util").versionAsInProject());
-        options.add(mavenBundle(GROUP, "binding-java-api-generator").versionAsInProject());
         options.add(mavenBundle(GROUP, "binding-model-api").versionAsInProject());
         options.add(mavenBundle(GROUP, "binding-type-provider").versionAsInProject());
-        options.add(mavenBundle(GROUP, "maven-sal-api-gen-plugin").versionAsInProject());
 
         options.add(junitBundles());
         return options;
@@ -96,9 +92,7 @@ public class BundleStartTest {
         testBundle("binding-generator-spi");
         testBundle("binding-generator-util");
         testBundle("binding-model-api");
-        testBundle("binding-java-api-generator");
         testBundle("binding-type-provider");
-        testBundle("maven-sal-api-gen-plugin");
     }
 
     private void testBundle(String name) throws BundleException {
-- 
2.36.6