Revert "Make utils.servicehelper a bundle"

This reverts commit 933dcb0728022a5d20fc1eafea5ed8e83edf83f8.

Change-Id: Iae3d935d926dc206a5c85a20d34dc16ec295fa47
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 3fa43dc7b6a10182ce09f5f737487da2b6954d11..6f310e11b410d02c4259feb2bf11b0de7649caa5 100755 (executable)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -42,7 +42,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <ovsdb.plugin.compatibility.layer.version>1.1.0-SNAPSHOT</ovsdb.plugin.compatibility.layer.version>
     <ovsdb.ovssfc.version>0.1.0-SNAPSHOT</ovsdb.ovssfc.version>
     <ovsdb.utils.config.version>1.1.0-SNAPSHOT</ovsdb.utils.config.version>
-    <ovsdb.utils.servicehelper.version>1.1.0-SNAPSHOT</ovsdb.utils.servicehelper.version>
     <plugin.shell.version>1.1.0-SNAPSHOT</plugin.shell.version>
     <schema.hardwarevtep.version>1.1.0-SNAPSHOT</schema.hardwarevtep.version>
     <schema.openvswitch.version>1.1.0-SNAPSHOT</schema.openvswitch.version>
@@ -355,11 +354,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <artifactId>utils.mdsal-openflow</artifactId>
         <version>${utils.mdsal.openflow.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.ovsdb</groupId>
-        <artifactId>utils.servicehelper</artifactId>
-        <version>${ovsdb.utils.servicehelper.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.powermock</groupId>
         <artifactId>powermock-module-junit4</artifactId>

diff --git a/features/ovsdb/pom.xml b/features/ovsdb/pom.xml
index deb657ed3ff00d2ce3bd76c0fd305aa79df411ef..990602a649711a7f5e2b5b3bd0ab6dff8bfd71dd 100644 (file)
--- a/features/ovsdb/pom.xml
+++ b/features/ovsdb/pom.xml
@@ -114,10 +114,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>org.opendaylight.ovsdb</groupId>
       <artifactId>schema.hardwarevtep</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>utils.servicehelper</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>

diff --git a/features/ovsdb/src/main/resources/features.xml b/features/ovsdb/src/main/resources/features.xml
index d98574a6a610e90711223998cc63aa4b363e7359..9de097a9f80fd8ed3ddc277b242e217bc8309b98 100644 (file)
--- a/features/ovsdb/src/main/resources/features.xml
+++ b/features/ovsdb/src/main/resources/features.xml
@@ -44,7 +44,6 @@
         <feature version="${ovsdb.plugin.version}">odl-ovsdb-plugin</feature>
         <feature version="${nsf.version}">odl-adsal-northbound</feature>
         <feature version="${openflowplugin.version}">odl-openflowplugin-nsf-services</feature>
-        <bundle>mvn:org.opendaylight.ovsdb/utils.servicehelper/${ovsdb.utils.servicehelper.version}</bundle>
         <bundle>mvn:org.opendaylight.ovsdb/northbound/${ovsdb.northbound.version}</bundle>
     </feature>
 
@@ -61,7 +60,6 @@
         <feature version="${openflowplugin.version}">odl-openflowplugin-flow-services</feature>
         <feature version="${networkconfig.neutron.version}">odl-neutron-service</feature>
         <feature version="${nsf.version}">odl-nsf-service</feature>
-        <bundle>mvn:org.opendaylight.ovsdb/utils.servicehelper/${ovsdb.utils.servicehelper.version}</bundle>
         <bundle>mvn:org.opendaylight.ovsdb/openstack.net-virt/${openstack.netvirt.version}</bundle>
         <bundle>mvn:org.opendaylight.ovsdb/openstack.net-virt-providers/${openstack.netvirt.providers.version}</bundle>
     </feature>

diff --git a/utils/servicehelper/pom.xml b/utils/servicehelper/pom.xml
index 110f2783612d0905c5e0db6a14205d137b5b32cd..403300ab1276e869530f08fa19fc3c13ff7e9283 100644 (file)
--- a/utils/servicehelper/pom.xml
+++ b/utils/servicehelper/pom.xml
@@ -18,9 +18,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <relativePath>../../commons/parent/pom.xml</relativePath>
   </parent>
 
-  <artifactId>utils.servicehelper</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
-  <packaging>bundle</packaging>
+  <groupId>org.opendaylight.ovsdb</groupId>
+  <artifactId>servicehelper</artifactId>
+  <version>1.3.0-SNAPSHOT</version>
+  <name>${project.artifactId}</name>
+  <packaging>jar</packaging>
 
   <dependencies>
     <dependency>
@@ -39,7 +41,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
@@ -68,21 +69,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <scope>test</scope>
     </dependency>
   </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.jacoco</groupId>
-        <artifactId>jacoco-maven-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
 </project>

diff --git a/utils/servicehelper/src/main/java/org/opendaylight/ovsdb/utils/servicehelper/ServiceHelper.java b/utils/servicehelper/src/main/java/org/opendaylight/ovsdb/utils/servicehelper/ServiceHelper.java
index 5458f73b40476f46f6b2fd8d83ad5ecd1e187eef..f33e9076fa3e68db5cb1e58900cbcb8dc73bf79d 100644 (file)
--- a/utils/servicehelper/src/main/java/org/opendaylight/ovsdb/utils/servicehelper/ServiceHelper.java
+++ b/utils/servicehelper/src/main/java/org/opendaylight/ovsdb/utils/servicehelper/ServiceHelper.java
@@ -22,7 +22,7 @@ import org.osgi.framework.ServiceReference;
 /**
  * The class helps to register and retrieve OSGi service registry
  */
-public final class ServiceHelper {
+public class ServiceHelper {
     private static final Logger LOG = LoggerFactory.getLogger(ServiceHelper.class);
     /**
      * Retrieve global instance of a class via OSGI registry, if

diff --git a/utils/servicehelper/src/test/java/org/opendaylight/ovsdb/utils/servicehelper/ServiceHelperTest.java b/utils/servicehelper/src/test/java/org/opendaylight/ovsdb/utils/servicehelper/ServiceHelperTest.java
index 45b05c6a935d3076b21d94d8200e26ceef06dd25..92db5c400888e042ab0a26127905483465fde356 100644 (file)
--- a/utils/servicehelper/src/test/java/org/opendaylight/ovsdb/utils/servicehelper/ServiceHelperTest.java
+++ b/utils/servicehelper/src/test/java/org/opendaylight/ovsdb/utils/servicehelper/ServiceHelperTest.java
@@ -24,7 +24,7 @@ import org.springframework.osgi.mock.MockBundle;
 
 /**
  * JUnit test for
- * {@link ServiceHelper}
+ * {@link org.opendaylight.ovsdb.utils.servicehelper.ServiceHelper}
  */
 @RunWith(PowerMockRunner.class)
 @PrepareForTest(FrameworkUtil.class)