summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ansible-server/pom.xml6
-rwxr-xr-xdependencies/pom.xml56
-rw-r--r--dgbuilder/pom.xml9
-rw-r--r--odlsli/odlsli-alpine/pom.xml9
-rw-r--r--odlsli/odlsli-alpine/src/main/docker/Dockerfile4
-rwxr-xr-xodlsli/src/main/dc/docker-compose.yaml42
-rw-r--r--opendaylight/pom.xml1
-rw-r--r--platform-logic/installer/pom.xml6
-rw-r--r--pom.xml36
9 files changed, 137 insertions, 32 deletions
diff --git a/ansible-server/pom.xml b/ansible-server/pom.xml
index a5fc4839..1b6757ea 100644
--- a/ansible-server/pom.xml
+++ b/ansible-server/pom.xml
@@ -3,9 +3,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.onap.ccsdk.parent</groupId>
- <artifactId>odlparent-lite</artifactId>
- <version>2.1.0</version>
+ <groupId>org.onap.ccsdk.distribution</groupId>
+ <artifactId>distribution-root</artifactId>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<groupId>org.onap.ccsdk.distribution</groupId>
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index d969c2bf..47636a03 100755
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -3,10 +3,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.onap.ccsdk.parent</groupId>
- <artifactId>odlparent-lite</artifactId>
- <version>2.1.0</version>
- <relativePath/>
+ <groupId>org.onap.ccsdk.distribution</groupId>
+ <artifactId>distribution-root</artifactId>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<groupId>org.onap.ccsdk.distribution</groupId>
@@ -20,16 +19,39 @@
<include.transitive.dependencies>false</include.transitive.dependencies>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.glassfish.jersey</groupId>
+ <artifactId>jersey-bom</artifactId>
+ <version>2.27</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.ccsdk.parent</groupId>
+ <artifactId>dependencies-odl-bom</artifactId>
+ <version>2.1.1-SNAPSHOT</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <version>1.9.6</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+
<dependencies>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
- <version>${logback.version}</version>
</dependency>
<dependency>
<groupId>com.att.eelf</groupId>
@@ -56,10 +78,26 @@
<artifactId>json-path</artifactId>
</dependency>
<dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr4-runtime</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
</dependency>
@@ -78,18 +116,20 @@
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.7</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>
- <version>2.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
</dependency>
<dependency>
+ <groupId>org.glassfish.jersey.bundles.repackaged</groupId>
+ <artifactId>jersey-guava</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId>
</dependency>
diff --git a/dgbuilder/pom.xml b/dgbuilder/pom.xml
index afd30c45..d2f8c8c5 100644
--- a/dgbuilder/pom.xml
+++ b/dgbuilder/pom.xml
@@ -29,35 +29,30 @@
<dependency>
<groupId>org.onap.ccsdk.sli.core</groupId>
<artifactId>sli-common</artifactId>
- <version>${sdnctl.sli.version}</version>
+ <version>${ccsdk.sli.version}</version>
</dependency>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
- <version>${mariadb.connector.version}</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
- <artifactId>antlr4</artifactId>
- <version>${antlr.version}</version>
+ <artifactId>antlr4-runtime</artifactId>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.7.5</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>${commons.lang3.version}</version>
</dependency>
</dependencies>
diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index 57031a1f..00b58973 100644
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -3,10 +3,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.onap.ccsdk.parent</groupId>
- <artifactId>odlparent-lite</artifactId>
- <version>2.1.0</version>
- <relativePath/>
+ <groupId>org.onap.ccsdk.distribution</groupId>
+ <artifactId>distribution-odlsli</artifactId>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<groupId>org.onap.ccsdk.distribution</groupId>
@@ -21,7 +20,7 @@
</organization>
<properties>
- <base.image.name>onap/ccsdk-odl-sodium-alpine-image</base.image.name>
+ <base.image.name>onap/ccsdk-odl-aluminum-alpine-image</base.image.name>
<image.name>onap/ccsdk-odlsli-alpine-image</image.name>
<ccsdk.project.version>${project.version}</ccsdk.project.version>
diff --git a/odlsli/odlsli-alpine/src/main/docker/Dockerfile b/odlsli/odlsli-alpine/src/main/docker/Dockerfile
index adb686ab..5fd78664 100644
--- a/odlsli/odlsli-alpine/src/main/docker/Dockerfile
+++ b/odlsli/odlsli-alpine/src/main/docker/Dockerfile
@@ -26,6 +26,7 @@ ENV CCSDK_SLI_CORE_REPO mvn:org.onap.ccsdk.sli.core/ccsdk-sli-core-all/${ccsdk.s
ENV CCSDK_SLI_ADAPTORS_REPO mvn:org.onap.ccsdk.sli.adaptors/ccsdk-sli-adaptors-all/${ccsdk.sli.adaptors.version}/xml/features
ENV CCSDK_FEATURES_REPO mvn:org.onap.ccsdk.features/ccsdk-features-all/${ccsdk.features.version}/xml/features
ENV CCSDK_FEATURES_SDNR_WT_REPO mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator/${ccsdk.features.version}/xml/features
+ENV CCSDK_FEATURES_SDNR_NORTHBOUND_REPO mvn:org.onap.ccsdk.features.sdnr.northbound/sdnr-northbound-all/${ccsdk.features.version}/xml/features
ENV CCSDK_SLI_NORTHBOUND_REPO mvn:org.onap.ccsdk.sli.northbound/ccsdk-sli-northbound-all/${ccsdk.sli.northbound.version}/xml/features
ENV CCSDK_SLI_PLUGINS_REPO mvn:org.onap.ccsdk.sli.plugins/ccsdk-sli-plugins-all/${ccsdk.sli.plugins.version}/xml/features
ENV A1ADAPTER_NORTHBOUND_REPO mvn:org.onap.ccsdk.oran/a1-adapter-northbound/${ccsdk.oran.a1adapter.version}/xml/features
@@ -36,6 +37,7 @@ ENV ODL_BOOT_FEATURES_EXTRA ${odl.boot.features.extra}
RUN apk update && apk --no-cache add sudo iputils openssl
+
# Enable wheel group
RUN sed -e 's/# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/g' -i /etc/sudoers
@@ -47,7 +49,7 @@ COPY --from=stage0 --chown=odl:odl /opt /opt
# Add CCSDK repositories to boot repositories
RUN cp $ODL_HOME/etc/org.apache.karaf.features.cfg $ODL_HOME/etc/org.apache.karaf.features.cfg.orig
-RUN sed -i -e "\|featuresRepositories|s|$|, ${CCSDK_SLI_CORE_REPO}, ${CCSDK_SLI_ADAPTORS_REPO}, ${CCSDK_SLI_NORTHBOUND_REPO}, ${CCSDK_SLI_PLUGINS_REPO}, ${CCSDK_FEATURES_REPO}, ${A1ADAPTER_NORTHBOUND_REPO}|" $ODL_HOME/etc/org.apache.karaf.features.cfg
+RUN sed -i -e "\|featuresRepositories|s|$|, ${CCSDK_SLI_CORE_REPO}, ${CCSDK_SLI_ADAPTORS_REPO}, ${CCSDK_SLI_NORTHBOUND_REPO}, ${CCSDK_SLI_PLUGINS_REPO}, ${CCSDK_FEATURES_REPO}, ${A1ADAPTER_NORTHBOUND_REPO}, ${CCSDK_FEATURES_SDNR_NORTHBOUND_REPO} |" $ODL_HOME/etc/org.apache.karaf.features.cfg
RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,${ODL_BOOT_FEATURES_EXTRA}|" $ODL_HOME/etc/org.apache.karaf.features.cfg
USER odl
diff --git a/odlsli/src/main/dc/docker-compose.yaml b/odlsli/src/main/dc/docker-compose.yaml
new file mode 100755
index 00000000..e48a8302
--- /dev/null
+++ b/odlsli/src/main/dc/docker-compose.yaml
@@ -0,0 +1,42 @@
+version: '2.1'
+
+services:
+ db:
+ image: mariadb:10.5
+ container_name: odlsli_db
+ ports:
+ - "3306"
+ environment:
+ - MYSQL_ROOT_PASSWORD=MySecretPassword
+ - MYSQL_ROOT_HOST=%
+ logging:
+ driver: "json-file"
+ options:
+ max-size: "30m"
+ max-file: "5"
+
+
+ odlsli:
+ image: onap/ccsdk-odlsli-alpine-image:latest
+ depends_on:
+ - db
+ container_name: odlsli_controller
+ entrypoint: ["/opt/onap/ccsdk/bin/startODL.sh"]
+ ports:
+ - "8383:8181"
+ - "1830:1830"
+ - "8543:8443"
+ links:
+ - db:dbhost
+ - db:sdnctldb01
+ - db:sdnctldb02
+ environment:
+ - MYSQL_ROOT_PASSWORD=MySecretPassword
+ - SDNC_CONFIG_DIR=/opt/onap/ccsdk/data/properties
+ logging:
+ driver: "json-file"
+ options:
+ max-size: "30m"
+ max-file: "5"
+
+
diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml
index fd4cebc3..67a7a0c8 100644
--- a/opendaylight/pom.xml
+++ b/opendaylight/pom.xml
@@ -15,7 +15,6 @@
<description>Creates OpenDaylight container</description>
<modules>
- <module>sodium</module>
<module>aluminum</module>
</modules>
</project>
diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml
index c2686d8a..63c6f414 100644
--- a/platform-logic/installer/pom.xml
+++ b/platform-logic/installer/pom.xml
@@ -29,12 +29,10 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.onap.ccsdk.sli.core</groupId>
@@ -49,13 +47,11 @@
</dependency>
<dependency>
<groupId>org.antlr</groupId>
- <artifactId>antlr4</artifactId>
- <version>${antlr.version}</version>
+ <artifactId>antlr4-runtime</artifactId>
</dependency>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
- <version>${mariadb.connector.version}</version>
</dependency>
<!-- Java 11 : need to install JAXB implementation libraries-->
<dependency>
diff --git a/pom.xml b/pom.xml
index 65d7ba92..7e840e68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,8 +4,8 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
- <artifactId>odlparent-lite</artifactId>
- <version>2.1.0</version>
+ <artifactId>oparent</artifactId>
+ <version>2.1.1-SNAPSHOT</version>
</parent>
<groupId>org.onap.ccsdk.distribution</groupId>
@@ -45,6 +45,38 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
+ <build>
+ <plugins>
+ <!-- Override enforcer rule to allow compile -->
+ <!-- with snapshot version of ccsdk libs -->
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>3.0.0-M2</version>
+ <executions>
+ <execution>
+ <id>enforce-no-snapshots</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireReleaseDeps>
+ <failWhenParentIsSnapshot>false</failWhenParentIsSnapshot>
+ <onlyWhenRelease>true</onlyWhenRelease>
+ <excludes>
+ <exclude>org.onap.ccsdk.*:*</exclude>
+ </excludes>
+ <level>WARN</level>
+ </requireReleaseDeps>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
<profiles>
<profile>
<id>dependency-list</id>