From bcc615679d65ddd42f322c5e1903b794ef236dfd Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Tue, 7 Jan 2020 10:06:08 -0500 Subject: Update mariadb installation Update to install mariadb java client like all other dependencies instead of as special case. Change-Id: I31040362ad89c90ca47be238b438e7e7733cefb7 Issue-ID: CCSDK-2005 Signed-off-by: Timoney, Dan (dt5972) --- opendaylight/neon/neon-alpine/pom.xml | 23 ---------------------- .../neon/neon-alpine/src/main/docker/Dockerfile | 3 --- opendaylight/neon/pom.xml | 7 ------- 3 files changed, 33 deletions(-) (limited to 'opendaylight/neon') diff --git a/opendaylight/neon/neon-alpine/pom.xml b/opendaylight/neon/neon-alpine/pom.xml index 08c131bb..823aebc6 100644 --- a/opendaylight/neon/neon-alpine/pom.xml +++ b/opendaylight/neon/neon-alpine/pom.xml @@ -72,29 +72,6 @@ true - - - get-mariadb-connector-jar - validate - - copy - - - - - org.mariadb.jdbc - mariadb-java-client - ${ccsdk.mariadb-connector-java.version} - jar - true - ${basedir}/target/docker-stage - - - false - true - true - - diff --git a/opendaylight/neon/neon-alpine/src/main/docker/Dockerfile b/opendaylight/neon/neon-alpine/src/main/docker/Dockerfile index 9d518af3..054a44f7 100644 --- a/opendaylight/neon/neon-alpine/src/main/docker/Dockerfile +++ b/opendaylight/neon/neon-alpine/src/main/docker/Dockerfile @@ -15,9 +15,6 @@ RUN mkdir -p /opt/odl \ && ln -s /opt/opendaylight /opt/opendaylight/${odl.karaf.artifactId}-${ccsdk.opendaylight.version} \ && ln -s /opt/opendaylight /opt/opendaylight/current -# workaround till we get proxy working -RUN mkdir -p /opt/opendaylight/system/org/mariadb/jdbc/mariadb-java-client/${ccsdk.mariadb-connector-java.version} -COPY mariadb-java-client-${ccsdk.mariadb-connector-java.version}.jar /opt/opendaylight/system/org/mariadb/jdbc/mariadb-java-client/${ccsdk.mariadb-connector-java.version} # ENTRYPOINT exec /opt/opendaylight/bin/karaf EXPOSE 8181 diff --git a/opendaylight/neon/pom.xml b/opendaylight/neon/pom.xml index ef13ead7..c0bd72d1 100644 --- a/opendaylight/neon/pom.xml +++ b/opendaylight/neon/pom.xml @@ -19,7 +19,6 @@ ${project.version} ${maven.build.timestamp} 0.10.1 - 2.1.1 deploy @@ -31,12 +30,6 @@ ${ccsdk.opendaylight.version} tar.gz - - org.mariadb.jdbc - mariadb-java-client - ${ccsdk.mariadb-connector-java.version} - jar - -- cgit 1.2.3-korg