diff options
| author |   Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-10-01 13:47:32 -0400 |
|---|---|---|
| committer | Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-10-01 13:47:32 -0400 |
| commit | 2951652d185277ccbf36e7b53df014b895889b71 (patch) | |
| tree | 886cd8c5b6d21edcdee175001278c1834ebf7f0d /opendaylight | |
| parent | 707c6a1ab19a63dcbf375bf7c1ee503ea69ac5f0 (diff) | |
Roll back to using ODL tarball
Roll back to using ODL Neon tarball until finished debugging issues
with custom ODL karaf distribution
Change-Id: Iad014537c15805e32832e2cbcee4813d661ae1fe
Issue-ID: CCSDK-1753
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Diffstat (limited to 'opendaylight')
| -rw-r--r-- | opendaylight/neon/neon-docker/pom.xml | 6 | ||||
| -rw-r--r-- | opendaylight/neon/neon-docker/src/main/docker/Dockerfile | 8 | ||||
| -rw-r--r-- | opendaylight/neon/neon-karaf-parent/pom.xml | 40 |
3 files changed, 7 insertions, 47 deletions
diff --git a/opendaylight/neon/neon-docker/pom.xml b/opendaylight/neon/neon-docker/pom.xml index ec183454..c8228eec 100644 --- a/opendaylight/neon/neon-docker/pom.xml +++ b/opendaylight/neon/neon-docker/pom.xml @@ -57,9 +57,9 @@ <configuration> <artifactItems> <artifactItem> - <groupId>${project.groupId}</groupId> - <artifactId>odl-neon-karaf</artifactId> - <version>${project.version}</version> + <groupId>org.opendaylight.integration</groupId> + <artifactId>karaf</artifactId> + <version>${ccsdk.opendaylight.version}</version> <type>tar.gz</type> <overWrite>true</overWrite> diff --git a/opendaylight/neon/neon-docker/src/main/docker/Dockerfile b/opendaylight/neon/neon-docker/src/main/docker/Dockerfile index 5b5f3774..a043e1e9 100644 --- a/opendaylight/neon/neon-docker/src/main/docker/Dockerfile +++ b/opendaylight/neon/neon-docker/src/main/docker/Dockerfile @@ -5,11 +5,11 @@ ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk ENV ODL_HOME /opt/opendaylight/current # copy the opendaylight tar and expand -COPY odl-neon-karaf-${project.version}.tar.gz /tmp/ +COPY karaf-${ccsdk.opendaylight.version}.tar.gz /tmp/ RUN mkdir -p /opt/odl \ - && tar zxvf /tmp/odl-neon-karaf-${project.version}.tar.gz --directory /opt/odl \ - && rm -rf /tmp/odl-neon-karaf-${project.version}.tar.gz \ - && mv /opt/odl/odl-neon-karaf-${project.version} /opt/opendaylight \ + && tar zxvf /tmp/karaf-${ccsdk.opendaylight.version}.tar.gz --directory /opt/odl \ + && rm -rf /tmp/karaf-${ccsdk.opendaylight.version}.tar.gz \ + && mv /opt/odl/karaf-${ccsdk.opendaylight.version} /opt/opendaylight \ && ln -s /opt/opendaylight /opt/opendaylight/karaf-${ccsdk.opendaylight.version} \ && ln -s /opt/opendaylight /opt/opendaylight/current diff --git a/opendaylight/neon/neon-karaf-parent/pom.xml b/opendaylight/neon/neon-karaf-parent/pom.xml deleted file mode 100644 index baf96c39..00000000 --- a/opendaylight/neon/neon-karaf-parent/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ -<?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"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.onap.ccsdk.distribution</groupId> - <artifactId>distribution-odl-neon</artifactId> - <version>0.7.0-SNAPSHOT</version> - </parent> - - <artifactId>distribution-opendaylight-onap-neon-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> - <packaging>pom</packaging> - <name>ccsdk-distribution :: onap :: opendaylight :: neon :: parent</name> - <description>Creates ONAP's OpenDaylight Fluorine container</description> - - <modules> - <module>karaf</module> - </modules> - - <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build --> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-install-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </build> -</project> |