diff options
| author |   Patrick Brady <pb071s@att.com> | 2017-09-04 21:37:25 -0700 |
|---|---|---|
| committer | Patrick Brady <pb071s@att.com> | 2017-09-07 00:45:01 -0700 |
| commit | 76706005ee07da01fc3e00ed44ada720e29855b1 (patch) | |
| tree | 8327ef6892b0f7ba21034bfb467c8c664a3a14e4 /appc-oam | |
| parent | 3e0d86059e4926a0a5197f75f201284075811d98 (diff) | |
Change to CCSDK and ODL Carbon
Change-Id: I49a0f436e366ff4a1b99705fb6bb5e7ba82e6ecc
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-Id: [APPC-91]
Issue-Id: [APPC-158]
Diffstat (limited to 'appc-oam')
| -rw-r--r-- | appc-oam/appc-oam-bundle/pom.xml | 6 | ||||
| -rw-r--r-- | appc-oam/appc-oam-features/src/main/resources/features.xml | 2 | ||||
| -rw-r--r-- | appc-oam/appc-oam-model/pom.xml | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/appc-oam/appc-oam-bundle/pom.xml b/appc-oam/appc-oam-bundle/pom.xml index 20cfbf819..78177c0ee 100644 --- a/appc-oam/appc-oam-bundle/pom.xml +++ b/appc-oam/appc-oam-bundle/pom.xml @@ -64,7 +64,7 @@ </generator> <generator> <codeGeneratorClass> - org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl + org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl </codeGeneratorClass> <outputBaseDir>${salGeneratorPath}</outputBaseDir> </generator> @@ -225,14 +225,14 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <version>1.10.19</version> <scope>test</scope> </dependency> <dependency> <groupId>org.powermock</groupId> <artifactId>powermock-api-mockito</artifactId> - <version>1.6.2</version> + <version>1.6.4</version> <scope>test</scope> </dependency> <dependency> diff --git a/appc-oam/appc-oam-features/src/main/resources/features.xml b/appc-oam/appc-oam-features/src/main/resources/features.xml index 139704093..23dd2430e 100644 --- a/appc-oam/appc-oam-features/src/main/resources/features.xml +++ b/appc-oam/appc-oam-features/src/main/resources/features.xml @@ -31,7 +31,7 @@ <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository> <feature name='appc-oam' description="appc oam module" version='${project.version}'> - <feature version="${broker-mdsal.version}">odl-mdsal-broker</feature> + <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature> <bundle>mvn:org.openecomp.appc/appc-oam-model/${project.version}</bundle> <bundle>mvn:org.openecomp.appc/appc-oam-bundle/${project.version}</bundle> <configfile finalname="etc/opendaylight/karaf/201-appc-oam.xml">mvn:org.openecomp.appc/appc-oam-bundle/${project.version}/xml/config</configfile> diff --git a/appc-oam/appc-oam-model/pom.xml b/appc-oam/appc-oam-model/pom.xml index e44d9a023..5a3ec7a2c 100644 --- a/appc-oam/appc-oam-model/pom.xml +++ b/appc-oam/appc-oam-model/pom.xml @@ -44,7 +44,7 @@ <yangFilesRootDir>${yang.file.directory}</yangFilesRootDir> <codeGenerators> <generator> - <codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass> + <codeGeneratorClass>org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass> <outputBaseDir>${salGeneratorPath}</outputBaseDir> </generator> </codeGenerators> |