aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dt5972@att.com>2018-06-18 17:11:56 -0400
committerTimoney, Dan (dt5972) <dt5972@att.com>2018-06-18 23:05:23 -0400
commit784e3ef65f03017ea82055dcedab73a5b04e4972 (patch)
tree52aa42c8a18ba13ef280ebaa44ad4d11ec7b7326
parenta2af7369129998533139d57f0f1a0757c7e13a10 (diff)
Update sli/core/utils version
Update sli/core/utils features versions to ODL Oxygen Change-Id: Icef6bd776bf489b3991dc2406bccfea4104b1299 Issue-ID: CCSDK-280 Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
-rw-r--r--sliPluginUtils/installer/src/main/resources/scripts/install-feature.sh2
-rw-r--r--utils/features/sdnc-slicore-utils/pom.xml11
2 files changed, 4 insertions, 9 deletions
diff --git a/sliPluginUtils/installer/src/main/resources/scripts/install-feature.sh b/sliPluginUtils/installer/src/main/resources/scripts/install-feature.sh
index 74b95b5c..638c7339 100644
--- a/sliPluginUtils/installer/src/main/resources/scripts/install-feature.sh
+++ b/sliPluginUtils/installer/src/main/resources/scripts/install-feature.sh
@@ -29,7 +29,7 @@ REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip
if [ -f ${REPOZIP} ]
then
- unzip -d ${ODL_HOME} ${REPOZIP}
+ unzip -nd ${ODL_HOME} ${REPOZIP}
else
echo "ERROR : repo zip ($REPOZIP) not found"
exit 1
diff --git a/utils/features/sdnc-slicore-utils/pom.xml b/utils/features/sdnc-slicore-utils/pom.xml
index 8ff1d4cf..952e4ab1 100644
--- a/utils/features/sdnc-slicore-utils/pom.xml
+++ b/utils/features/sdnc-slicore-utils/pom.xml
@@ -21,26 +21,21 @@
<dependency>
<groupId>org.opendaylight.mdsal.model</groupId>
<artifactId>mdsal-model-artifacts</artifactId>
- <version>0.11.1</version>
+ <version>${odl.mdsal.model.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>mdsal-artifacts</artifactId>
- <version>1.6.1</version>
+ <version>${odl.mdsal.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>odl-mdsal-broker</artifactId>
- <type>xml</type>
- <classifier>features</classifier>
- </dependency>
+
<dependency>
<groupId>${project.groupId}</groupId>