diff options
10 files changed, 16 insertions, 23 deletions
diff --git a/appc-directed-graph/appc-dgraph/provider/pom.xml b/appc-directed-graph/appc-dgraph/provider/pom.xml index c9c078700..e4becb82d 100644 --- 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> @@ -68,6 +71,11 @@ <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> <version>1.3.7</version> 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 5ab9a3aa2..8670b9445 100644 --- 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 ba4f6ce96..bd382f2de 100644 --- 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 28b509854..3f28b598b 100644 --- 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 0930473fa..87ad43ed9 100644 --- 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 21f770d0f..65dd6977b 100644 --- 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 6683c878f..4a476ca39 100644 --- 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 c8498dcd6..7915275b1 100644 --- 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 2abeb12a7..0c96cff96 100644 --- a/appc-directed-graph/dg-loader/provider/pom.xml +++ b/appc-directed-graph/dg-loader/provider/pom.xml @@ -64,6 +64,11 @@ <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> </dependency> @@ -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> @@ -220,11 +220,6 @@ limitations under the License. </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> <version>${odl.mdsal.version}</version> </dependency> @@ -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> |