diff options
| -rwxr-xr-x | dependencies/pom.xml | 8 | ||||
| -rw-r--r-- | odlsli/odlsli-alpine/pom.xml | 2 | ||||
| -rw-r--r-- | opendaylight/phosphorus/phosphorus-alpine/pom.xml | 243 | ||||
| -rw-r--r-- | opendaylight/phosphorus/phosphorus-alpine/src/main/docker/Dockerfile | 60 | ||||
| -rw-r--r-- | opendaylight/phosphorus/phosphorus-alpine/src/main/resources/framework-4.3.3-features.xml | 74 | ||||
| -rwxr-xr-x | opendaylight/phosphorus/phosphorus-alpine/src/main/resources/startup.properties | 25 | ||||
| -rw-r--r-- | opendaylight/phosphorus/pom.xml | 35 | ||||
| -rw-r--r-- | opendaylight/pom.xml | 1 | ||||
| -rw-r--r-- | pom.xml | 2 |
9 files changed, 446 insertions, 4 deletions
diff --git a/dependencies/pom.xml b/dependencies/pom.xml index d3cf064b..1a1f4321 100755 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -22,7 +22,7 @@ <dependency> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>dependencies-odl-bom</artifactId> - <version>2.3.1</version> + <version>2.3.3-SNAPSHOT</version> <scope>import</scope> <type>pom</type> </dependency> @@ -126,6 +126,10 @@ <artifactId>jettison</artifactId> </dependency> <dependency> + <groupId>org.dom4j</groupId> + <artifactId>dom4j</artifactId> + </dependency> + <dependency> <groupId>org.glassfish.jersey.bundles.repackaged</groupId> <artifactId>jersey-guava</artifactId> </dependency> @@ -196,7 +200,7 @@ <dependency> <groupId>com.google.errorprone</groupId> <artifactId>error_prone_annotations</artifactId> - <version>2.3.4</version> + <version>2.5.1</version> </dependency> </dependencies> diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml index 785c8f4d..7f8a4ac6 100644 --- a/odlsli/odlsli-alpine/pom.xml +++ b/odlsli/odlsli-alpine/pom.xml @@ -18,7 +18,7 @@ </organization> <properties> - <base.image.name>onap/ccsdk-odl-silicon-alpine-image</base.image.name> + <base.image.name>onap/ccsdk-odl-phosphorus-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/opendaylight/phosphorus/phosphorus-alpine/pom.xml b/opendaylight/phosphorus/phosphorus-alpine/pom.xml new file mode 100644 index 00000000..8c674270 --- /dev/null +++ b/opendaylight/phosphorus/phosphorus-alpine/pom.xml @@ -0,0 +1,243 @@ +<?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-phosphorus</artifactId> + <version>1.3.1-SNAPSHOT</version> + </parent> + + <artifactId>distribution-odl-phosphorus-docker</artifactId> + <packaging>pom</packaging> + + <name>ccsdk-distribution :: opendaylight :: phosphorus :: docker</name> + <description>Creates OpenDaylight container</description> + <organization> + <name>ONAP</name> + </organization> + + <properties> + <image.name>onap/ccsdk-odl-phosphorus-alpine-image</image.name> + <odl.karaf.artifactId>onap-karaf</odl.karaf.artifactId> + <odl.shiro.version>0.14.7</odl.shiro.version> + <odl.netconf.version>2.0.11</odl.netconf.version> + <odl.ops4j.version>7.3.19</odl.ops4j.version> + <odl.pax.logging.version>2.0.10</odl.pax.logging.version> + <patch.pax.logging.version>2.0.14</patch.pax.logging.version> + <odl.karaf.framework.version>4.3.3</odl.karaf.framework.version> + </properties> + + <build> + <plugins> + + <plugin> + <groupId>org.codehaus.groovy.maven</groupId> + <artifactId>gmaven-plugin</artifactId> + <version>1.0</version> + <executions> + <execution> + <phase>validate</phase> + <goals> + <goal>execute</goal> + </goals> + <configuration> + <source>${basedir}/../../../src/main/scripts/TagVersion.groovy</source> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>3.0.0</version> + <executions> + <execution> + <id>get-odl-distribution</id> + <phase>validate</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.opendaylight.integration</groupId> + <artifactId>${odl.karaf.artifactId}</artifactId> + <version>${ccsdk.opendaylight.version}</version> + <type>tar.gz</type> + <overWrite>true</overWrite> + <outputDirectory>${basedir}/target/docker-stage</outputDirectory> + </artifactItem> + </artifactItems> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>true</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + </configuration> + </execution> + <execution> + <id>copy-with-alternalte-repo-2</id> + <phase>generate-sources</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>com.highstreet-technologies.aaa</groupId> + <artifactId>aaa-authn-api</artifactId> + <version>${odl.shiro.version}</version> + <outputDirectory>${project.build.directory}/docker-stage/system/org/opendaylight/aaa/aaa-authn-api/${odl.shiro.version}</outputDirectory> + <destFileName>aaa-authn-api-${odl.shiro.version}.jar</destFileName> + <excludes>*</excludes> + </artifactItem> + <artifactItem> + <groupId>com.highstreet-technologies.ops4j.pax.web</groupId> + <artifactId>pax-web-jetty</artifactId> + <version>${odl.ops4j.version}</version> + <outputDirectory>${project.build.directory}/docker-stage/system/org/ops4j/pax/web/pax-web-jetty/${odl.ops4j.version}</outputDirectory> + <destFileName>pax-web-jetty-${odl.ops4j.version}.jar</destFileName> + <excludes>*</excludes> + </artifactItem> + <artifactItem> + <groupId>com.highstreet-technologies.netconf</groupId> + <artifactId>sal-netconf-connector</artifactId> + <version>${odl.netconf.version}</version> + <outputDirectory>${project.build.directory}/docker-stage/system/org/opendaylight/netconf/sal-netconf-connector/${odl.netconf.version}</outputDirectory> + <destFileName>sal-netconf-connector-${odl.netconf.version}.jar</destFileName> + <excludes>*</excludes> + </artifactItem> + <artifactItem> + <groupId>org.ops4j.pax.logging</groupId> + <artifactId>pax-logging-log4j2</artifactId> + <version>${patch.pax.logging.version}</version> + <outputDirectory>${project.build.directory}/docker-stage/system/org/ops4j/pax/logging/pax-logging-log4j2/${patch.pax.logging.version}</outputDirectory> + <destFileName>pax-logging-log4j2-${patch.pax.logging.version}.jar</destFileName> + <excludes>*</excludes> + </artifactItem> + <artifactItem> + <groupId>org.ops4j.pax.logging</groupId> + <artifactId>pax-logging-logback</artifactId> + <version>${patch.pax.logging.version}</version> + <outputDirectory>${project.build.directory}/docker-stage/system/org/ops4j/pax/logging/pax-logging-logback/${patch.pax.logging.version}</outputDirectory> + <destFileName>pax-logging-logback-${patch.pax.logging.version}.jar</destFileName> + <excludes>*</excludes> + </artifactItem> + <artifactItem> + <groupId>org.ops4j.pax.logging</groupId> + <artifactId>pax-logging-api</artifactId> + <version>${patch.pax.logging.version}</version> + <outputDirectory>${project.build.directory}/docker-stage/system/org/ops4j/pax/logging/pax-logging-api/${patch.pax.logging.version}</outputDirectory> + <destFileName>pax-logging-api-${patch.pax.logging.version}.jar</destFileName> + <excludes>*</excludes> + </artifactItem> + </artifactItems> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>true</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <id>copy-dockerfile</id> + <goals> + <goal>copy-resources</goal> + </goals><!-- here the phase you need --> + <phase>validate</phase> + <configuration> + <outputDirectory>${basedir}/target/docker-stage</outputDirectory> + <resources> + <resource> + <directory>src/main/docker</directory> + <includes> + <include>Dockerfile</include> + </includes> + <filtering>true</filtering> + </resource> + <resource> + <directory>src/main/odlscripts</directory> + <includes> + <include>*</include> + </includes> + <filtering>false</filtering> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-karaf-framework-features</id> + <goals> + <goal>copy-resources</goal> + </goals><!-- here the phase you need --> + <phase>validate</phase> + <configuration> + <outputDirectory>${basedir}/target/docker-stage</outputDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>framework-${odl.karaf.framework.version}-features.xml</include> + <include>startup.properties</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + </build> + + <profiles> + <profile> + <id>docker</id> + <build> + <plugins> + <plugin> + <groupId>io.fabric8</groupId> + <artifactId>docker-maven-plugin</artifactId> + <version>0.34.0</version> + <inherited>false</inherited> + <configuration> + <images> + <image> + <name>${image.name}</name> + <build> + <cleanup>try</cleanup> + <noCache>true</noCache> + <contextDir>${basedir}/target/docker-stage</contextDir> + <dockerFile>Dockerfile</dockerFile> + <tags> + <tag>${project.docker.latestminortag.version}</tag> + <tag>${project.docker.latestfulltag.version}</tag> + <tag>${project.docker.latesttagtimestamp.version}</tag> + </tags> + </build> + </image> + </images> + <verbose>${docker.verbose}</verbose> + <skipPush>${docker.skip.push}</skipPush> + </configuration> + <executions> + <execution> + <id>build-push-images</id> + <goals> + <goal>build</goal> + <goal>push</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> diff --git a/opendaylight/phosphorus/phosphorus-alpine/src/main/docker/Dockerfile b/opendaylight/phosphorus/phosphorus-alpine/src/main/docker/Dockerfile new file mode 100644 index 00000000..19cd55f6 --- /dev/null +++ b/opendaylight/phosphorus/phosphorus-alpine/src/main/docker/Dockerfile @@ -0,0 +1,60 @@ +# Prepare stage for multistage image build +## START OF STAGE0 ## +FROM onap/ccsdk-alpine-j11-image:${project.docker.latestfulltag.version} AS stage0 +USER root + +ENV ODL_HOME /opt/opendaylight/current + +# copy the opendaylight tar and expand +COPY ${odl.karaf.artifactId}-${ccsdk.opendaylight.version}.tar.gz /tmp/ +RUN mkdir -p /opt/odl \ + && tar xzf /tmp/${odl.karaf.artifactId}-${ccsdk.opendaylight.version}.tar.gz --directory /opt/odl \ + && rm -rf /tmp/${odl.karaf.artifactId}-${ccsdk.opendaylight.version}.tar.gz \ + && mv /opt/odl/${odl.karaf.artifactId}-${ccsdk.opendaylight.version} /opt/opendaylight \ + && ln -s /opt/opendaylight /opt/opendaylight/${odl.karaf.artifactId}-${ccsdk.opendaylight.version} \ + && ln -s /opt/opendaylight /opt/opendaylight/current + +# Enable wheel and create a group and user +RUN sed -i -e 's/# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/g' /etc/sudoers \ + && addgroup -S odl \ + && adduser -S odl -G odl \ + && addgroup odl wheel + +# Patch some opendaylight artifacts +COPY system $ODL_HOME/system + +# Add missing scripts see SDNC-1056 +#COPY configure_cluster.sh configure-cluster-ipdetect.sh custom_shard_config.txt set_persistence.sh $ODL_HOME/bin/ +#RUN chmod 755 $ODL_HOME/bin/configure_cluster.sh $ODL_HOME/bin/configure-cluster-ipdetect.sh $ODL_HOME/bin/set_persistence.sh $ODL_HOME/bin/custom_shard_config.txt + + +# Remove vulnerable version of ops4j logging +COPY framework-${odl.karaf.framework.version}-features.xml $ODL_HOME/system/org/apache/karaf/features/framework/${odl.karaf.framework.version}/framework-${odl.karaf.framework.version}-features.xml +COPY startup.properties $ODL_HOME/etc/startup.properties +RUN rm -rf $ODL_HOME/system/org/ops4j/pax/logging/pax-logging-log4j2/${odl.pax.logging.version} +RUN rm -rf $ODL_HOME/system/org/ops4j/pax/logging/pax-logging-logback/${odl.pax.logging.version} +RUN rm -rf $ODL_HOME/system/org/ops4j/pax/logging/pax-logging-api/${odl.pax.logging.version} + +# Changing ownership and permission of /opt +RUN chown -R odl:odl /opt && chmod -R 755 /opt + +## END OF STAGE0 ## + +################################################# + +## This will create actual image +FROM scratch +MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org) +USER root + +ENV JAVA_HOME=/opt/java/openjdk \ + PATH=$PATH:/opt/java/openjdk/bin \ + ODL_HOME=/opt/opendaylight/current + +# Copy Everything from stage0 +COPY --from=stage0 / / + +USER odl +EXPOSE 8181 +WORKDIR $ODL_HOME +# ENTRYPOINT exec /opt/opendaylight/bin/karaf diff --git a/opendaylight/phosphorus/phosphorus-alpine/src/main/resources/framework-4.3.3-features.xml b/opendaylight/phosphorus/phosphorus-alpine/src/main/resources/framework-4.3.3-features.xml new file mode 100644 index 00000000..6f2ad09e --- /dev/null +++ b/opendaylight/phosphorus/phosphorus-alpine/src/main/resources/framework-4.3.3-features.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<features name="framework-4.3.3" xmlns="http://karaf.apache.org/xmlns/features/v1.3.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0"> + + <!-- This file is not used in the assembly., This file is used by the karaf-maven-plugin to generate a "final" feature.xml + including the correct start-level for the generation of the startup.propertie file --> + + <feature version="4.3.3" description="Karaf core feature" name="framework" hidden="true"> + <!-- persistent wiring extension --> + <bundle start-level="1">mvn:org.apache.karaf.features/org.apache.karaf.features.extension/4.3.3</bundle> + <!-- mvn: url handlers --> + <bundle start-level="5">mvn:org.ops4j.pax.url/pax-url-aether/2.6.7</bundle> + <!-- logging --> + <bundle start-level="8">mvn:org.ops4j.pax.logging/pax-logging-api/${patch.pax.logging.version}</bundle> + <bundle start-level="8">mvn:org.ops4j.pax.logging/pax-logging-log4j2/${patch.pax.logging.version}</bundle> + <bundle start-level="8">mvn:org.fusesource.jansi/jansi/1.18</bundle> + <!-- config admin --> + <bundle start-level="9">mvn:org.osgi/org.osgi.util.function/1.1.0</bundle> + <bundle start-level="9">mvn:org.osgi/org.osgi.util.promise/1.1.1</bundle> + <bundle start-level="9">mvn:org.apache.felix/org.apache.felix.coordinator/1.0.2</bundle> + <bundle start-level="9">mvn:org.apache.felix/org.apache.felix.converter/1.0.14</bundle> + <bundle start-level="10">mvn:org.apache.felix/org.apache.felix.configadmin/1.9.22</bundle> + <bundle start-level="11">mvn:org.apache.felix/org.apache.felix.configadmin.plugin.interpolation/1.1.4</bundle> + <bundle start-level="11">mvn:org.apache.felix/org.apache.felix.cm.json/1.0.6</bundle> + <bundle start-level="11">mvn:org.apache.sling/org.apache.sling.commons.johnzon/1.2.6</bundle> + <bundle start-level="11">mvn:org.apache.felix/org.apache.felix.configurator/1.0.14</bundle> + <!-- file install --> + <bundle start-level="12">mvn:org.apache.felix/org.apache.felix.fileinstall/3.7.0</bundle> + <!-- features service --> + <bundle start-level="15">mvn:org.apache.karaf.features/org.apache.karaf.features.core/4.3.3</bundle> + <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/2.9.0</bundle> + </feature> + + <feature version="4.3.3" description="Karaf core feature" name="framework-logback" hidden="true"> + <!-- persistent wiring extension --> + <bundle start-level="1">mvn:org.apache.karaf.features/org.apache.karaf.features.extension/4.3.3</bundle> + <!-- mvn: url handlers --> + <bundle start-level="5">mvn:org.ops4j.pax.url/pax-url-aether/2.6.7</bundle> + <!-- logging --> + <bundle start-level="8">mvn:org.ops4j.pax.logging/pax-logging-api/${patch.pax.logging.version}</bundle> + <bundle start-level="8">mvn:org.ops4j.pax.logging/pax-logging-logback/${patch.pax.logging.version}</bundle> + <!-- config admin --> + <bundle start-level="9">mvn:org.osgi/org.osgi.util.function/1.1.0</bundle> + <bundle start-level="9">mvn:org.osgi/org.osgi.util.promise/1.1.1</bundle> + <bundle start-level="9">mvn:org.apache.felix/org.apache.felix.coordinator/1.0.2</bundle> + <bundle start-level="9">mvn:org.apache.felix/org.apache.felix.converter/1.0.14</bundle> + <bundle start-level="10">mvn:org.apache.felix/org.apache.felix.configadmin/1.9.22</bundle> + <bundle start-level="11">mvn:org.apache.felix/org.apache.felix.configadmin.plugin.interpolation/1.1.4</bundle> + <bundle start-level="11">mvn:org.apache.felix/org.apache.felix.cm.json/1.0.6</bundle> + <bundle start-level="11">mvn:org.apache.sling/org.apache.sling.commons.johnzon/1.2.6</bundle> + <bundle start-level="11">mvn:org.apache.felix/org.apache.felix.configurator/1.0.14</bundle> + <!-- file install --> + <bundle start-level="12">mvn:org.apache.felix/org.apache.felix.fileinstall/3.7.0</bundle> + <!-- features service --> + <bundle start-level="15">mvn:org.apache.karaf.features/org.apache.karaf.features.core/4.3.3</bundle> + </feature> + +</features> diff --git a/opendaylight/phosphorus/phosphorus-alpine/src/main/resources/startup.properties b/opendaylight/phosphorus/phosphorus-alpine/src/main/resources/startup.properties new file mode 100755 index 00000000..c097c8af --- /dev/null +++ b/opendaylight/phosphorus/phosphorus-alpine/src/main/resources/startup.properties @@ -0,0 +1,25 @@ +# Bundles to be started on startup, with startlevel +mvn\:org.apache.karaf.features/org.apache.karaf.features.extension/4.3.3 = 1 +mvn\:org.ops4j.pax.url/pax-url-aether/2.6.7 = 5 +mvn\:org.ops4j.pax.logging/pax-logging-log4j2/${patch.pax.logging.version} = 8 +mvn\:org.fusesource.jansi/jansi/1.18 = 8 +mvn\:org.ops4j.pax.logging/pax-logging-api/${patch.pax.logging.version} = 8 +mvn\:org.osgi/org.osgi.util.promise/1.1.1 = 9 +mvn\:org.apache.felix/org.apache.felix.coordinator/1.0.2 = 9 +mvn\:org.apache.felix/org.apache.felix.converter/1.0.14 = 9 +mvn\:org.osgi/org.osgi.util.function/1.1.0 = 9 +mvn\:org.apache.felix/org.apache.felix.configadmin/1.9.22 = 10 +mvn\:org.apache.felix/org.apache.felix.configurator/1.0.14 = 11 +mvn\:org.apache.sling/org.apache.sling.commons.johnzon/1.2.6 = 11 +mvn\:org.apache.felix/org.apache.felix.configadmin.plugin.interpolation/1.1.4 = 11 +mvn\:org.apache.felix/org.apache.felix.cm.json/1.0.6 = 11 +mvn\:org.apache.felix/org.apache.felix.fileinstall/3.7.0 = 12 +mvn\:org.apache.karaf.features/org.apache.karaf.features.core/4.3.3 = 15 +# The following are added by opendaylight-karaf-resources +mvn\:org.osgi/org.osgi.service.event/1.4.0 = 7 +mvn\:org.apache.felix/org.apache.felix.metatype/1.2.4 = 8 +mvn\:org.opendaylight.odlparent/bcprov-framework-ext/9.0.8 = 14 +mvn\:org.opendaylight.odlparent/bcutil-framework-ext/9.0.8 = 14 +mvn\:org.opendaylight.odlparent/bcpkix-framework-ext/9.0.8 = 14 +mvn\:org.opendaylight.odlparent/logging-markers/9.0.8 = 14 +mvn\:org.apache.aries.blueprint/org.apache.aries.blueprint.core.compatibility/1.0.0 = 14
\ No newline at end of file diff --git a/opendaylight/phosphorus/pom.xml b/opendaylight/phosphorus/pom.xml new file mode 100644 index 00000000..e91f2bb1 --- /dev/null +++ b/opendaylight/phosphorus/pom.xml @@ -0,0 +1,35 @@ +<?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-opendaylight</artifactId> + <version>1.3.1-SNAPSHOT</version> + </parent> + + <artifactId>distribution-odl-phosphorus</artifactId> + <packaging>pom</packaging> + + <name>ccsdk-distribution :: opendaylight :: phosphorus</name> + <description>Creates OpenDaylight container</description> + + <modules> + <module>phosphorus-alpine</module> + </modules> + + <properties> + <ccsdk.opendaylight.version>0.15.1</ccsdk.opendaylight.version> + </properties> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.opendaylight.integration</groupId> + <artifactId>onap-karaf</artifactId> + <version>${ccsdk.opendaylight.version}</version> + <type>tar.gz</type> + </dependency> + </dependencies> + </dependencyManagement> +</project> diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml index cdc3ba79..a70fdf00 100644 --- a/opendaylight/pom.xml +++ b/opendaylight/pom.xml @@ -16,5 +16,6 @@ <modules> <module>silicon</module> + <module>phosphorus</module> </modules> </project> @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>oparent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.distribution</groupId> |