diff options
| -rwxr-xr-x | .gitignore | 1 | ||||
| -rw-r--r-- | INFO.yaml | 2 | ||||
| -rwxr-xr-x | dependencies/pom.xml | 15 | ||||
| -rw-r--r-- | dgbuilder-docker/src/main/docker/Dockerfile | 2 | ||||
| -rw-r--r-- | odlsli/odlsli-alpine/src/main/docker/Dockerfile | 3 | ||||
| -rw-r--r-- | odlsli/src/main/scripts/installSdncDb.sh | 2 | ||||
| -rw-r--r-- | odlsli/src/main/scripts/startODL.sh | 2 | ||||
| -rw-r--r-- | opendaylight/sodium/pom.xml | 2 |
8 files changed, 18 insertions, 11 deletions
@@ -10,6 +10,7 @@ org.eclipse.core.resources.prefs .checkstyle maven-eclipse.xml workspace +.vscode ## Compilation Files ## *.class @@ -1,7 +1,7 @@ --- project: 'ccsdk-distribution' project_creation_date: '2017-08-08' -lifecycle_state: 'Incubation' +lifecycle_state: 'Mature' project_category: '' project_lead: &onap_releng_ptl name: 'Dan Timoney' diff --git a/dependencies/pom.xml b/dependencies/pom.xml index fb57c40a..03e15336 100755 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -6,7 +6,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> <version>2.0.1-SNAPSHOT</version> - <relativePath/> + <relativePath /> </parent> <groupId>org.onap.ccsdk.distribution</groupId> @@ -48,12 +48,12 @@ <artifactId>jackson-module-jsonSchema</artifactId> </dependency> <dependency> - <groupId>com.jayway.jsonpath</groupId> - <artifactId>json-path</artifactId> + <groupId>com.google.code.findbugs</groupId> + <artifactId>annotations</artifactId> </dependency> <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> + <groupId>com.jayway.jsonpath</groupId> + <artifactId>json-path</artifactId> </dependency> <dependency> <groupId>javax</groupId> @@ -134,6 +134,11 @@ <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> </dependency> + <dependency> + <groupId>org.apache.servicemix.specs</groupId> + <artifactId>org.apache.servicemix.specs.jaxws-api-2.3</artifactId> + <version>2.3_1</version> + </dependency> </dependencies> <build> diff --git a/dgbuilder-docker/src/main/docker/Dockerfile b/dgbuilder-docker/src/main/docker/Dockerfile index 1c3a4034..974647e8 100644 --- a/dgbuilder-docker/src/main/docker/Dockerfile +++ b/dgbuilder-docker/src/main/docker/Dockerfile @@ -7,7 +7,7 @@ USER root RUN addgroup -S dgbuilder && adduser -S dgbuilder -G dgbuilder RUN apk --no-cache add curl -RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - +#RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - RUN apk add gcc g++ make ncurses # copy onap diff --git a/odlsli/odlsli-alpine/src/main/docker/Dockerfile b/odlsli/odlsli-alpine/src/main/docker/Dockerfile index cca71f6d..e8fa5ef6 100644 --- a/odlsli/odlsli-alpine/src/main/docker/Dockerfile +++ b/odlsli/odlsli-alpine/src/main/docker/Dockerfile @@ -3,7 +3,7 @@ FROM ${base.image.name}:${project.docker.latestfulltag.version} AS stage0 # copy the opendaylight credentials -USER ROOT +USER root COPY idmlight.db.mv.db $ODL_HOME/data # copy CCSDK mvn artifacts to ODL repository @@ -18,6 +18,7 @@ COPY org.ops4j.pax.logging.cfg $ODL_HOME/etc/org.ops4j.pax.logging.cfg FROM ${base.image.name}:${project.docker.latestfulltag.version} LABEL maintainer="CCSDK Team (onap-ccsdk@lists.onap.org)" +USER root ENV SDNC_CONFIG_DIR /opt/onap/ccsdk/data/properties ENV CCSDKFEATUREVERSION ${ccsdk.features.version} diff --git a/odlsli/src/main/scripts/installSdncDb.sh b/odlsli/src/main/scripts/installSdncDb.sh index b8cf6938..efd7fe02 100644 --- a/odlsli/src/main/scripts/installSdncDb.sh +++ b/odlsli/src/main/scripts/installSdncDb.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash ### # ============LICENSE_START======================================================= diff --git a/odlsli/src/main/scripts/startODL.sh b/odlsli/src/main/scripts/startODL.sh index 3943115d..4d608577 100644 --- a/odlsli/src/main/scripts/startODL.sh +++ b/odlsli/src/main/scripts/startODL.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash ### # ============LICENSE_START======================================================= diff --git a/opendaylight/sodium/pom.xml b/opendaylight/sodium/pom.xml index 5a82bbb9..f2b571f6 100644 --- a/opendaylight/sodium/pom.xml +++ b/opendaylight/sodium/pom.xml @@ -18,7 +18,7 @@ <properties> <ccsdk.project.version>${project.version}</ccsdk.project.version> <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> - <ccsdk.opendaylight.version>0.11.3</ccsdk.opendaylight.version> + <ccsdk.opendaylight.version>0.11.4</ccsdk.opendaylight.version> <docker.push.phase>deploy</docker.push.phase> </properties> |