diff options
| author |   Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-03-21 16:32:05 -0400 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2019-03-24 14:56:12 +0000 |
| commit | 43a582e191786fac59b16e5651e387a0558e484f (patch) | |
| tree | a10308929bd989eedd2925bae46ed8e61499f2e7 /opendaylight | |
| parent | 315c6ff4b428f56ad0937966d158c1880185fbd5 (diff) | |
Create Fluorine SR2 based containers
Create docker containers based on OpenDaylight Fluorine SR2
Change-Id: I0d0d7eeec54da77105fe8626987c8aa3049d4495
Issue-ID: CCSDK-1056
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Diffstat (limited to 'opendaylight')
| -rw-r--r-- | opendaylight/fluorine/fluorine-alpine/pom.xml | 28 | ||||
| -rw-r--r-- | opendaylight/fluorine/fluorine-ubuntu/pom.xml | 27 | ||||
| -rw-r--r-- | opendaylight/fluorine/pom.xml | 32 | ||||
| -rw-r--r-- | opendaylight/pom.xml | 4 |
4 files changed, 36 insertions, 55 deletions
diff --git a/opendaylight/fluorine/fluorine-alpine/pom.xml b/opendaylight/fluorine/fluorine-alpine/pom.xml index 56c3c747..ef33e374 100644 --- a/opendaylight/fluorine/fluorine-alpine/pom.xml +++ b/opendaylight/fluorine/fluorine-alpine/pom.xml @@ -5,11 +5,11 @@ <parent> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-odl-fluorine</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.2-SNAPSHOT</version> </parent> <artifactId>distribution-odl-fluorine-alpine</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-distribution :: opendaylight :: ${project.artifactId}</name> @@ -20,31 +20,7 @@ <properties> <image.name>onap/ccsdk-odl-fluorine-alpine-image</image.name> - <ccsdk.project.version>${project.version}</ccsdk.project.version> - <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> - <ccsdk.opendaylight.version>0.9.1</ccsdk.opendaylight.version> - <ccsdk.mariadb-connector-java.version>2.1.1</ccsdk.mariadb-connector-java.version> - <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy> - <docker.push.phase>deploy</docker.push.phase> </properties> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.opendaylight.integration</groupId> - <artifactId>karaf</artifactId> - <version>${ccsdk.opendaylight.version}</version> - <type>tar.gz</type> - </dependency> - <dependency> - <groupId>org.mariadb.jdbc</groupId> - <artifactId>mariadb-java-client</artifactId> - <version>${ccsdk.mariadb-connector-java.version}</version> - <type>jar</type> - </dependency> - </dependencies> - </dependencyManagement> - <build> <plugins> diff --git a/opendaylight/fluorine/fluorine-ubuntu/pom.xml b/opendaylight/fluorine/fluorine-ubuntu/pom.xml index b1a9191b..13e01743 100644 --- a/opendaylight/fluorine/fluorine-ubuntu/pom.xml +++ b/opendaylight/fluorine/fluorine-ubuntu/pom.xml @@ -5,11 +5,11 @@ <parent> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-odl-fluorine</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.2-SNAPSHOT</version> </parent> <artifactId>distribution-odl-fluorine-ubuntu</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-distribution :: opendaylight :: ${project.artifactId}</name> @@ -20,31 +20,8 @@ <properties> <image.name>onap/ccsdk-odl-fluorine-ubuntu-image</image.name> - <ccsdk.project.version>${project.version}</ccsdk.project.version> - <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> - <ccsdk.opendaylight.version>0.9.1</ccsdk.opendaylight.version> - <ccsdk.mariadb-connector-java.version>2.1.1</ccsdk.mariadb-connector-java.version> - <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy> - <docker.push.phase>deploy</docker.push.phase> </properties> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.opendaylight.integration</groupId> - <artifactId>karaf</artifactId> - <version>${ccsdk.opendaylight.version}</version> - <type>tar.gz</type> - </dependency> - <dependency> - <groupId>org.mariadb.jdbc</groupId> - <artifactId>mariadb-java-client</artifactId> - <version>${ccsdk.mariadb-connector-java.version}</version> - <type>jar</type> - </dependency> - </dependencies> - </dependencyManagement> - <build> <plugins> diff --git a/opendaylight/fluorine/pom.xml b/opendaylight/fluorine/pom.xml index 8d4fa4bf..29f88f57 100644 --- a/opendaylight/fluorine/pom.xml +++ b/opendaylight/fluorine/pom.xml @@ -5,15 +5,43 @@ <parent> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-opendaylight</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.2-SNAPSHOT</version> </parent> <artifactId>distribution-odl-fluorine</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-distribution :: opendaylight</name> <description>Creates OpenDaylight container</description> + + <properties> + <ccsdk.project.version>${project.version}</ccsdk.project.version> + <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> + <ccsdk.opendaylight.version>0.9.2</ccsdk.opendaylight.version> + <ccsdk.mariadb-connector-java.version>2.1.1</ccsdk.mariadb-connector-java.version> + <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy> + <docker.push.phase>deploy</docker.push.phase> + </properties> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.opendaylight.integration</groupId> + <artifactId>karaf</artifactId> + <version>${ccsdk.opendaylight.version}</version> + <type>tar.gz</type> + </dependency> + <dependency> + <groupId>org.mariadb.jdbc</groupId> + <artifactId>mariadb-java-client</artifactId> + <version>${ccsdk.mariadb-connector-java.version}</version> + <type>jar</type> + </dependency> + </dependencies> + </dependencyManagement> + + <modules> <module>fluorine-ubuntu</module> diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml index 93efd670..901a7549 100644 --- a/opendaylight/pom.xml +++ b/opendaylight/pom.xml @@ -5,11 +5,11 @@ <parent> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-root</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.2-SNAPSHOT</version> </parent> <artifactId>distribution-opendaylight</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-distribution :: opendaylight</name> |