X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=opendaylight%2Fneon%2Fneon-alpine%2Fpom.xml;h=a6730fb80825c616012f0c0515ea136c68d69420;hb=1fefac5b19757ebb9645a1db55e775ce01f50f8b;hp=f7621118e60922ce2938915f3e395c685d4b9c0b;hpb=6cbe47603a3c6f6d18f5b21a994448d4e5cc0c32;p=ccsdk%2Fdistribution.git

diff --git a/opendaylight/neon/neon-alpine/pom.xml b/opendaylight/neon/neon-alpine/pom.xml
index f7621118..a6730fb8 100644
--- a/opendaylight/neon/neon-alpine/pom.xml
+++ b/opendaylight/neon/neon-alpine/pom.xml
@@ -5,14 +5,14 @@
 	<parent>
 		<groupId>org.onap.ccsdk.distribution</groupId>
 		<artifactId>distribution-odl-neon</artifactId>
-		<version>0.6.1-SNAPSHOT</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>distribution-odl-neon-alpine</artifactId>
-	<version>0.6.1-SNAPSHOT</version>
+	<artifactId>distribution-odl-neon-docker</artifactId>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
-	<name>ccsdk-distribution :: opendaylight :: ${project.artifactId}</name>
+	<name>ccsdk-distribution :: opendaylight :: neon :: docker</name>
 	<description>Creates OpenDaylight container</description>
 	<organization>
 		<name>ONAP</name>
@@ -20,6 +20,7 @@
 
 	<properties>
 		<image.name>onap/ccsdk-odl-neon-alpine-image</image.name>
+		<odl.karaf.artifactId>onap-karaf</odl.karaf.artifactId>
 	</properties>
 	<build>
 		<plugins>
@@ -58,7 +59,7 @@
 							<artifactItems>
 								<artifactItem>
 									<groupId>org.opendaylight.integration</groupId>
-									<artifactId>karaf</artifactId>
+									<artifactId>${odl.karaf.artifactId}</artifactId>
 									<version>${ccsdk.opendaylight.version}</version>
 									<type>tar.gz</type>
 
@@ -71,29 +72,6 @@
 							<overWriteIfNewer>true</overWriteIfNewer>
 						</configuration>
 					</execution>
-
-					<execution>
-						<id>get-mariadb-connector-jar</id>
-						<phase>validate</phase>
-						<goals>
-							<goal>copy</goal>
-						</goals>
-						<configuration>
-							<artifactItems>
-								<artifactItem>
-									<groupId>org.mariadb.jdbc</groupId>
-									<artifactId>mariadb-java-client</artifactId>
-									<version>${ccsdk.mariadb-connector-java.version}</version>
-									<type>jar</type>
-									<overWrite>true</overWrite>
-									<outputDirectory>${basedir}/target/docker-stage</outputDirectory>
-								</artifactItem>
-							</artifactItems>
-							<overWriteReleases>false</overWriteReleases>
-							<overWriteSnapshots>true</overWriteSnapshots>
-							<overWriteIfNewer>true</overWriteIfNewer>
-						</configuration>
-					</execution>
 				</executions>
 			</plugin>
 
@@ -117,6 +95,13 @@
 									</includes>
 									<filtering>true</filtering>
 								</resource>
+								<resource>
+									<directory>src/main/odlscripts</directory>
+									<includes>
+										<include>*</include>
+									</includes>
+									<filtering>false</filtering>
+								</resource>
 							</resources>
 						</configuration>
 					</execution>