X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=odlparent%2Fkaraf4-parent%2Fpom.xml;h=789ae60a4f011e605c459a70c73c2eb7d71b6a22;hb=608e1d462f1c86079c02c359a16775af65681046;hp=acb98133bef7edab85bbb4a50483b66e037577a8;hpb=53574ba587cb9f201e6ed1634f3c734d4156d194;p=ccsdk%2Fparent.git

diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml
index acb98133..789ae60a 100755
--- a/odlparent/karaf4-parent/pom.xml
+++ b/odlparent/karaf4-parent/pom.xml
@@ -1,20 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>pom</packaging>
 	<groupId>org.onap.ccsdk.parent</groupId>
 	<artifactId>karaf4-parent</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.1.1</version>
 
 	<parent>
 		<groupId>org.opendaylight.odlparent</groupId>
 		<artifactId>karaf4-parent</artifactId>
-		<version>3.1.1</version>
-		<relativePath />
+		<version>3.1.3</version>
+		<relativePath/>
 	</parent>
 
 
@@ -90,10 +88,10 @@
 
 
 		<!-- CCSDK component versions -->
-		<ccsdk.sli.core.version>0.3.0-SNAPSHOT</ccsdk.sli.core.version>
-		<ccsdk.sli.adaptors.version>0.3.0-SNAPSHOT</ccsdk.sli.adaptors.version>
-		<ccsdk.sli.northbound.version>0.3.0-SNAPSHOT</ccsdk.sli.northbound.version>
-		<ccsdk.sli.plugins.version>0.3.0-SNAPSHOT</ccsdk.sli.plugins.version>
+		<ccsdk.sli.core.version>0.4.0</ccsdk.sli.core.version>
+		<ccsdk.sli.adaptors.version>0.4.0</ccsdk.sli.adaptors.version>
+		<ccsdk.sli.northbound.version>0.4.0</ccsdk.sli.northbound.version>
+		<ccsdk.sli.plugins.version>0.4.0</ccsdk.sli.plugins.version>
 		<sdnctl.sli.version>${ccsdk.sli.core.version}</sdnctl.sli.version>
 		<sdnctl.aai.service.version>${ccsdk.sli.adaptors.version}</sdnctl.aai.service.version>
 		<sdnctl.dblib.version>${ccsdk.sli.core.version}</sdnctl.dblib.version>
@@ -101,8 +99,8 @@
 		<sdnctl.slipluginutils.version>${ccsdk.sli.core.version}</sdnctl.slipluginutils.version>
 
 		<!-- Support libraries used by OpenDaylight -->
-		<odl.mdsal.version>1.7.1</odl.mdsal.version>
-		<odl.mdsal.model.version>0.12.1</odl.mdsal.model.version>
+		<odl.mdsal.version>1.7.3</odl.mdsal.version>
+		<odl.mdsal.model.version>0.12.3</odl.mdsal.model.version>
 		<!-- Used by aaa, vtn -->
 		<commons.codec.version>1.10</commons.codec.version>
 		<!-- Used by netconf, ovsdb -->
@@ -294,42 +292,25 @@
 									<exportAntProperties>true</exportAntProperties>
 									<tasks>
 
-										<taskdef resource="net/sf/antcontrib/antlib.xml"
-											classpathref="maven.plugin.classpath" />
+										<taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="maven.plugin.classpath"/>
 										<condition property="is_windows" value="true">
-											<os family="windows" />
+											<os family="windows"/>
 										</condition>
 										<condition property="isLinux" value="true">
-											<os family="unix" />
+											<os family="unix"/>
 										</condition>
 										<if>
-											<equals arg1="${is_windows}" arg2="true" />
+											<equals arg1="${is_windows}" arg2="true"/>
 											<then>
-												<property name="swagger.sdk.script.file"
-													value="generated-source-script.bat" />
-												<echo
-													file="${project.build.directory}${file.separator}generated-source-script.bat"
-													append="true"
-													message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
-												<echo
-													file="${project.build.directory}${file.separator}generated-source-script.bat"
-													append="true"
-													message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
+												<property name="swagger.sdk.script.file" value="generated-source-script.bat"/>
+												<echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true" message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
+												<echo file="${project.build.directory}${file.separator}generated-source-script.bat" append="true" message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
 											</then>
 											<else>
-												<property name="swagger.sdk.script.file"
-													value="generated-source-script.sh" />
-												<echo
-													file="${project.build.directory}${file.separator}generated-source-script.sh"
-													append="true"
-													message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
-												<echo
-													file="${project.build.directory}${file.separator}generated-source-script.sh"
-													append="true"
-													message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
-												<chmod
-													file="${project.build.directory}${file.separator}generated-source-script.sh"
-													perm="755" />
+												<property name="swagger.sdk.script.file" value="generated-source-script.sh"/>
+												<echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true" message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}"/>
+												<echo file="${project.build.directory}${file.separator}generated-source-script.sh" append="true" message="mvn clean install -Dmaven.test.skip=true${line.separator}"/>
+												<chmod file="${project.build.directory}${file.separator}generated-source-script.sh" perm="755"/>
 											</else>
 										</if>
 									</tasks>
@@ -772,11 +753,11 @@
 	<distributionManagement>
 		<repository>
 			<id>ecomp-releases</id>
-			<url>http://nexus.onap.org/content/repositories/releases</url>
+			<url>https://nexus.onap.org/content/repositories/releases</url>
 		</repository>
 		<snapshotRepository>
 			<id>ecomp-snapshots</id>
-			<url>http://nexus.onap.org/content/repositories/snapshots</url>
+			<url>https://nexus.onap.org/content/repositories/snapshots</url>
 		</snapshotRepository>
 	</distributionManagement>
 
@@ -791,7 +772,7 @@
 					<!-- This version supports the "deployAtEnd" parameter -->
 					<version>2.8</version>
 					<configuration>
-						<skip />
+						<skip/>
 					</configuration>
 				</plugin>