diff options
| author |   Timoney, Dan (dt5972) <dt5972@att.com> | 2018-08-15 11:22:55 -0400 |
|---|---|---|
| committer | Timoney, Dan (dt5972) <dt5972@att.com> | 2018-08-15 11:22:55 -0400 |
| commit | b5dfc03248533fb70c9989ac378d94b88934e399 (patch) | |
| tree | 8b4f8fe14aed0ecf6a4805d158ee0db487dd82bd | |
| parent | e95f32a81fca90d8011df0f5c0eeb07c55153161 (diff) | |
Update sli/core for Oxygen SR3
Removed version for yangtools dependency in sliapi so that it is
controlled by parent pom to resolve issue caused in Oxygen SR3 upgrade
due to hard-coded SR1 version. Also, updated name of utils features
directory to match name of artifact (sdnc-slicore-utils renamed to
ccsdk-slicore-utils).
Change-Id: I32b3822e4ae0fdd4c07d5912e4674b19c8615d54
Issue-ID: CCSDK-453
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
| -rwxr-xr-x | .gitignore | 2 | ||||
| -rwxr-xr-x | sliapi/provider/pom.xml | 8 | ||||
| -rw-r--r-- | utils/features/ccsdk-slicore-utils/pom.xml (renamed from utils/features/sdnc-slicore-utils/pom.xml) | 0 | ||||
| -rwxr-xr-x | utils/features/pom.xml | 2 |
4 files changed, 2 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore index a5a0d80e3..b45dfca41 100755 --- a/.gitignore +++ b/.gitignore @@ -40,7 +40,7 @@ ExprGrammar.tokens ExprGrammarLexer.tokens # BlackDuck generated file -sdnc-core_bdio.jsonld +*.jsonld blackDuckHubProjectName.txt blackDuckHubProjectVersionName.txt diff --git a/sliapi/provider/pom.xml b/sliapi/provider/pom.xml index 994557a5a..bcd585323 100755 --- a/sliapi/provider/pom.xml +++ b/sliapi/provider/pom.xml @@ -29,47 +29,39 @@ <dependency> <groupId>org.opendaylight.controller</groupId> <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-common-util</artifactId> - <version>${odl.mdsal.version}</version> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-common</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-provider</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>sal-core-api</artifactId> - <version>${odl.mdsal.version}</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-data-impl</artifactId> - <version>2.0.3</version> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>${junit.version}</version> <scope>test</scope> </dependency> diff --git a/utils/features/sdnc-slicore-utils/pom.xml b/utils/features/ccsdk-slicore-utils/pom.xml index 952e4ab1c..952e4ab1c 100644 --- a/utils/features/sdnc-slicore-utils/pom.xml +++ b/utils/features/ccsdk-slicore-utils/pom.xml diff --git a/utils/features/pom.xml b/utils/features/pom.xml index 4f3be1b86..bac928ab8 100755 --- a/utils/features/pom.xml +++ b/utils/features/pom.xml @@ -17,6 +17,6 @@ <modules> <module>features-util</module> - <module>sdnc-slicore-utils</module> + <module>ccsdk-slicore-utils</module> </modules> </project> |