Changes to remove maven-staging-plugin

Root pom ccsdk version updated to latest and
dependency versions are fixed so that they are
compliant with the maven enforcer plugin.

Change-Id: If85006519678a14af6ace21268eb0bfc195e4215
Signed-off-by: Patrick Brady <patrick.brady@att.com>
Issue-ID: APPC-1686

diff --git a/appc-directed-graph/appc-dgraph/provider/pom.xml b/appc-directed-graph/appc-dgraph/provider/pom.xml
index c9c0787..e4becb8 100644 (file)
--- a/appc-directed-graph/appc-dgraph/provider/pom.xml
+++ b/appc-directed-graph/appc-dgraph/provider/pom.xml
@@ -49,7 +49,10 @@
             <artifactId>eelf-core</artifactId>
             <version>${eelf.version}</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-binding-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.onap.appc.plugins</groupId>
             <artifactId>dg-loader-provider</artifactId>
@@ -67,6 +70,11 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.codehaus.jettison</groupId>
             <artifactId>jettison</artifactId>

diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateConfig.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateConfig.java
index 5ab9a3a..8670b94 100644 (file)
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateConfig.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateConfig.java
@@ -49,7 +49,6 @@ import org.onap.sdnc.dgtestlibrary.GraphKey;
 import org.apache.sling.testing.mock.osgi.MockOsgi;
 */
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
-import org.onap.ccsdk.sli.core.sli.provider.ExecuteNodeExecutor;
 import org.onap.ccsdk.sli.core.sli.provider.SvcLogicAdaptorFactory;
 
 

diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetVfModuleInfo.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetVfModuleInfo.java
index ba4f6ce..bd382f2 100644 (file)
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetVfModuleInfo.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetVfModuleInfo.java
@@ -49,7 +49,6 @@ import org.onap.sdnc.dgtestlibrary.DGTestCase;
 import org.onap.sdnc.dgtestlibrary.GraphKey;
 */
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
-import org.onap.ccsdk.sli.core.sli.provider.ExecuteNodeExecutor;
 import org.onap.ccsdk.sli.core.sli.provider.SvcLogicAdaptorFactory;
 
 

diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestPublishConfiguration.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestPublishConfiguration.java
index 28b5098..3f28b59 100644 (file)
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestPublishConfiguration.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestPublishConfiguration.java
@@ -43,7 +43,6 @@ import org.slf4j.LoggerFactory;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
-import org.onap.ccsdk.sli.core.sli.provider.ExecuteNodeExecutor;
 import org.onap.ccsdk.sli.core.sli.provider.SvcLogicAdaptorFactory;
 
 

diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSaveRunningConfig.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSaveRunningConfig.java
index 0930473..87ad43e 100644 (file)
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSaveRunningConfig.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSaveRunningConfig.java
@@ -49,7 +49,6 @@ import org.onap.sdnc.dgtestlibrary.GraphKey;
 import org.apache.sling.testing.mock.osgi.MockOsgi;
 */
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
-import org.onap.ccsdk.sli.core.sli.provider.ExecuteNodeExecutor;
 import org.onap.ccsdk.sli.core.sli.provider.SvcLogicAdaptorFactory;
 
 

diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSetStatus.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSetStatus.java
index 21f770d..65dd697 100644 (file)
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSetStatus.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSetStatus.java
@@ -49,7 +49,6 @@ import org.onap.sdnc.dgtestlibrary.DGTestCase;
 import org.onap.sdnc.dgtestlibrary.GraphKey;
 */
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
-import org.onap.ccsdk.sli.core.sli.provider.ExecuteNodeExecutor;
 import org.onap.ccsdk.sli.core.sli.provider.SvcLogicAdaptorFactory;
 
 

diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestUpdateAaiInfo.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestUpdateAaiInfo.java
index 6683c87..4a476ca 100644 (file)
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestUpdateAaiInfo.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestUpdateAaiInfo.java
@@ -50,7 +50,6 @@ import org.onap.sdnc.dgtestlibrary.DGTestCase;
 import org.onap.sdnc.dgtestlibrary.GraphKey;
 */
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
-import org.onap.ccsdk.sli.core.sli.provider.ExecuteNodeExecutor;
 import org.onap.ccsdk.sli.core.sli.provider.SvcLogicAdaptorFactory;
 
 

diff --git a/appc-directed-graph/dg-loader/features/pom.xml b/appc-directed-graph/dg-loader/features/pom.xml
index c8498dc..7915275 100644 (file)
--- a/appc-directed-graph/dg-loader/features/pom.xml
+++ b/appc-directed-graph/dg-loader/features/pom.xml
@@ -54,15 +54,6 @@
             <scope>runtime</scope>
         </dependency>
 
-
-        <dependency>
-            <!-- Required for launching the feature tests -->
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>features-test</artifactId>
-            <version>${odl.commons.opendaylight.version}</version>
-            <scope>test</scope>
-        </dependency>
-
     </dependencies>
 
     <build>

diff --git a/appc-directed-graph/dg-loader/provider/pom.xml b/appc-directed-graph/dg-loader/provider/pom.xml
index 2abeb12..0c96cff 100644 (file)
--- a/appc-directed-graph/dg-loader/provider/pom.xml
+++ b/appc-directed-graph/dg-loader/provider/pom.xml
@@ -63,6 +63,11 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>

diff --git a/pom.xml b/pom.xml
index 798a9f0..47b6419 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>1.0.3</version>
+        <version>1.3.2</version>
     </parent>
 
 
@@ -218,11 +218,6 @@ limitations under the License.
                 <artifactId>sal-binding-config</artifactId>
                 <version>${odl.mdsal.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sal-binding-api</artifactId>
-                <version>${odl.mdsal.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>sal-test-model</artifactId>
@@ -642,7 +637,7 @@ limitations under the License.
                 <module>appc-outbound</module>
                 <module>appc-inbound</module>
                 <module>appc-sequence-generator</module>
-                <module>appc-client</module>
+<!--                 <module>appc-client</module> -->
             </modules>
         </profile>
         <profile>