Code Review
/
ccsdk
/
distribution.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "reduce ccsdk-ansible-server image footprint"
[ccsdk/distribution.git]
/
odlsli
/
odlsli-alpine
/
pom.xml
diff --git
a/odlsli/odlsli-alpine/pom.xml
b/odlsli/odlsli-alpine/pom.xml
index
c971da2
..
6c9a182
100644
(file)
--- a/
odlsli/odlsli-alpine/pom.xml
+++ b/
odlsli/odlsli-alpine/pom.xml
@@
-1,28
+1,27
@@
<?xml version="1.0" encoding="UTF-8"?>
<?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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.2.
0
-SNAPSHOT</version>
- <relativePath
/>
+ <version>1.2.
1
-SNAPSHOT</version>
+ <relativePath/>
</parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-odlsli-alpine</artifactId>
</parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-odlsli-alpine</artifactId>
- <version>0.4.
0
-SNAPSHOT</version>
+ <version>0.4.
1
-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution :: odlsli-alpine</name>
<packaging>pom</packaging>
<name>ccsdk-distribution :: odlsli-alpine</name>
- <description>Creates
SDN Controller
Docker container</description>
+ <description>Creates
Alpine-based ODLSLI
Docker container</description>
<organization>
<name>openECOMP</name>
</organization>
<properties>
<organization>
<name>openECOMP</name>
</organization>
<properties>
+ <base.image.name>onap/ccsdk-odl-fluorine-alpine-image</base.image.name>
<image.name>onap/ccsdk-odlsli-alpine-image</image.name>
<ccsdk.project.version>${project.version}</ccsdk.project.version>
<ccsdk.features.version>${project.version}</ccsdk.features.version>
<image.name>onap/ccsdk-odlsli-alpine-image</image.name>
<ccsdk.project.version>${project.version}</ccsdk.project.version>
<ccsdk.features.version>${project.version}</ccsdk.features.version>
@@
-33,7
+32,7
@@
<docker.verbose>true</docker.verbose>
<ansible.gpg.key>93C4A3FD7BB9C367</ansible.gpg.key>
</properties>
<docker.verbose>true</docker.verbose>
<ansible.gpg.key>93C4A3FD7BB9C367</ansible.gpg.key>
</properties>
-
+
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@
-113,6
+112,13
@@
<classifier>repo</classifier>
<type>zip</type>
</dependency>
<classifier>repo</classifier>
<type>zip</type>
</dependency>
+ <dependency>
+ <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+ <artifactId>netbox-client-installer</artifactId>
+ <version>${ccsdk.sli.adaptors.version}</version>
+ <classifier>repo</classifier>
+ <type>zip</type>
+ </dependency>
<dependency>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>resource-assignment-installer</artifactId>
<dependency>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>resource-assignment-installer</artifactId>
@@
-122,7
+128,7
@@
</dependency>
<dependency>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
</dependency>
<dependency>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
- <artifactId>
netbox-client
-installer</artifactId>
+ <artifactId>
saltstack-adapter
-installer</artifactId>
<version>${ccsdk.sli.adaptors.version}</version>
<classifier>repo</classifier>
<type>zip</type>
<version>${ccsdk.sli.adaptors.version}</version>
<classifier>repo</classifier>
<type>zip</type>
@@
-183,6
+189,13
@@
<classifier>repo</classifier>
<type>zip</type>
</dependency>
<classifier>repo</classifier>
<type>zip</type>
</dependency>
+ <dependency>
+ <groupId>org.onap.ccsdk.sli.plugins</groupId>
+ <artifactId>template-node-installer</artifactId>
+ <version>${ccsdk.sli.plugins.version}</version>
+ <classifier>repo</classifier>
+ <type>zip</type>
+ </dependency>
<dependency>
<groupId>org.onap.ccsdk.sli.plugins</groupId>
<artifactId>restconf-client-installer</artifactId>
<dependency>
<groupId>org.onap.ccsdk.sli.plugins</groupId>
<artifactId>restconf-client-installer</artifactId>