diff options
| author |   Singal, Kapil (ks220y) <ks220y@att.com> | 2020-12-17 14:37:06 -0500 |
|---|---|---|
| committer | Singal, Kapil (ks220y) <ks220y@att.com> | 2020-12-18 12:13:29 -0500 |
| commit | b6e7d96acfa2459c7a8c8f9fbdefcfacaf62e9f2 (patch) | |
| tree | 86a814c9117a651cd7146b3f6f9d74b10c582e56 | |
| parent | 110bb110a48b98a40dad33e80071e0a21386f11d (diff) | |
1) Adding docker.skip.push tag so that it can be used to skip docker push during verify job
2) Upgrading docker-maven-plugin to 0.34.0 and replacing dockerFileDir to contextDir
3) Refactoring execution section of docker-maven-plugin
4) Refactoring POM Names
5) Running mvn tidy:pom
Issue-ID: CCSDK-3057
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: I19b9e231e5288e1372a9b3ac89d263bbb2209186
28 files changed, 1251 insertions, 1358 deletions
diff --git a/alpine/java11/pom.xml b/alpine/java11/pom.xml index 84a83dcf..75adb93b 100644 --- a/alpine/java11/pom.xml +++ b/alpine/java11/pom.xml @@ -9,7 +9,6 @@ </parent> <artifactId>distribution-j11-alpine</artifactId> - <version>1.1.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-distribution :: alpine :: java11</name> @@ -20,31 +19,28 @@ <properties> <image.name>onap/ccsdk-alpine-j11-image</image.name> - <ccsdk.project.version>${project.version}</ccsdk.project.version> - <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> <base.image>onap/integration-java11</base.image> <base.image.version>7.1.0</base.image.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> + <configuration> <source>${basedir}/../../src/main/scripts/TagVersion.groovy</source> </configuration> </execution> </executions> </plugin> - <plugin> <artifactId>maven-resources-plugin</artifactId> <version>2.6</version> @@ -81,38 +77,30 @@ <plugin> <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> - <version>0.28.0</version> + <version>0.34.0</version> <inherited>false</inherited> <configuration> - <images> <image> <name>${image.name}</name> <build> <cleanup>try</cleanup> - <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir> + <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.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>generate-images</id> - <phase>generate-sources</phase> - <goals> - <goal>build</goal> - </goals> - </execution> - - <execution> - <id>push-images</id> - <phase>deploy</phase> + <id>build-push-images</id> <goals> <goal>build</goal> <goal>push</goal> @@ -120,7 +108,6 @@ </execution> </executions> </plugin> - </plugins> </build> </profile> diff --git a/alpine/pom.xml b/alpine/pom.xml index 5ff34161..089b0af4 100644 --- a/alpine/pom.xml +++ b/alpine/pom.xml @@ -9,10 +9,9 @@ </parent> <artifactId>distribution-alpine-root</artifactId> - <version>1.1.1-SNAPSHOT</version> <packaging>pom</packaging> - <name>ccsdk-distribution :: opendaylight</name> + <name>ccsdk-distribution :: alpine</name> <description>Creates OpenDaylight container</description> <modules> diff --git a/ansible-server/pom.xml b/ansible-server/pom.xml index dd0d0103..a5fc4839 100644 --- a/ansible-server/pom.xml +++ b/ansible-server/pom.xml @@ -1,176 +1,170 @@ <?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/maven-v4_0_0.xsd"> +<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.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> - </parent> + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.0</version> + </parent> - <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> - <groupId>org.onap.ccsdk.distribution</groupId> - <artifactId>ansible-server</artifactId> - <version>1.1.1-SNAPSHOT</version> + <groupId>org.onap.ccsdk.distribution</groupId> + <artifactId>ansible-server</artifactId> + <version>1.1.1-SNAPSHOT</version> + <packaging>pom</packaging> - <name>ccsdk :: distribution :: ${project.artifactId}</name> - <description>Creates ansible-server Docker container</description> + <name>ccsdk-distribution :: ${project.artifactId}</name> + <description>Creates ansible-server Docker container</description> + <organization> + <name>ONAP</name> + </organization> - <properties> - <image.name>onap/ccsdk-ansible-server-image</image.name> + <properties> + <image.name>onap/ccsdk-ansible-server-image</image.name> <ccsdk.project.version>${project.version}</ccsdk.project.version> <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> <ccsdk.distribution.version>${project.version}</ccsdk.distribution.version> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> - <docker.verbose>true</docker.verbose> - </properties> + <docker.verbose>true</docker.verbose> + <docker.skip.push>false</docker.skip.push> + </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> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.groovy.maven</groupId> - <artifactId>gmaven-plugin</artifactId> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>execute</goal> - </goals> - <configuration> - <source>${basedir}/../src/main/scripts/TagVersion.groovy</source> - </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</directory> + <includes> + <include>**/*</include> + </includes> + <filtering>false</filtering> + </resource> + </resources> + </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</directory> - <includes> - <include>**/*</include> - </includes> - <filtering>false</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.5.0</version> + <executions> + <execution> + <id>change python permissions</id> + <phase>process-sources</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>/usr/bin/find</executable> + <arguments> + <argument>${basedir}/target/docker-stage/ansible-server</argument> + <argument>-name</argument> + <argument>*.py</argument> + <argument>-exec</argument> + <argument>chmod</argument> + <argument>+x</argument> + <argument>{}</argument> + <argument>;</argument> + </arguments> + </configuration> + </execution> + <execution> + <id>change shell permissions</id> + <phase>process-sources</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>/usr/bin/find</executable> + <arguments> + <argument>${basedir}/target/docker-stage/ansible-server</argument> + <argument>-name</argument> + <argument>*.sh</argument> + <argument>-exec</argument> + <argument>chmod</argument> + <argument>+x</argument> + <argument>{}</argument> + <argument>;</argument> + </arguments> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> - <plugin> - <artifactId>exec-maven-plugin</artifactId> - <groupId>org.codehaus.mojo</groupId> - <version>1.5.0</version> - <executions> - <execution> - <id>change python permissions</id> - <phase>process-sources</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <executable>/usr/bin/find</executable> - <arguments> - <argument>${basedir}/target/docker-stage/ansible-server</argument> - <argument>-name</argument> - <argument>*.py</argument> - <argument>-exec</argument> - <argument>chmod</argument> - <argument>+x</argument> - <argument>{}</argument> - <argument>;</argument> - </arguments> - </configuration> - </execution> - <execution> - <id>change shell permissions</id> - <phase>process-sources</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <executable>/usr/bin/find</executable> - <arguments> - <argument>${basedir}/target/docker-stage/ansible-server</argument> - <argument>-name</argument> - <argument>*.sh</argument> - <argument>-exec</argument> - <argument>chmod</argument> - <argument>+x</argument> - <argument>{}</argument> - <argument>;</argument> - </arguments> - </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.28.0</version> - <inherited>false</inherited> - <configuration> - <images> - <image> - <name>${image.name}</name> - <build> - <cleanup>try</cleanup> - <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir> - <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> - </configuration> - <executions> - <execution> - <id>generate-images</id> - <phase>package</phase> - <goals> - <goal>build</goal> - </goals> - </execution> - - <execution> - <id>push-images</id> - <phase>deploy</phase> - <goals> - <goal>build</goal> - <goal>push</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - <organization> - <name>ONAP</name> - </organization> + <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> + <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/dependencies/pom.xml b/dependencies/pom.xml index 7dc26789..d969c2bf 100755 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -14,7 +14,7 @@ <version>1.1.1-SNAPSHOT</version> <packaging>pom</packaging> - <name>ccsdk-distribution:: dependencies</name> + <name>ccsdk-distribution :: ${project.artifactId}</name> <properties> <include.transitive.dependencies>false</include.transitive.dependencies> diff --git a/dgbuilder-docker/pom.xml b/dgbuilder-docker/pom.xml index 6b88b557..3dfbc0e7 100644 --- a/dgbuilder-docker/pom.xml +++ b/dgbuilder-docker/pom.xml @@ -1,218 +1,209 @@ <?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> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.ccsdk.distribution</groupId> - <artifactId>distribution-root</artifactId> - <version>1.1.1-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.onap.ccsdk.distribution</groupId> + <artifactId>distribution-root</artifactId> + <version>1.1.1-SNAPSHOT</version> + </parent> - <groupId>org.onap.ccsdk.distribution</groupId> - <artifactId>distribution-dgbuilder-docker</artifactId> - <version>1.1.1-SNAPSHOT</version> - <packaging>pom</packaging> + <groupId>org.onap.ccsdk.distribution</groupId> + <artifactId>distribution-dgbuilder-docker</artifactId> + <packaging>pom</packaging> - <name>ccsdk-distribution :: dgbuilder-docker</name> - <description>Creates docker container for dgbuilder</description> - <organization> - <name>ONAP</name> - </organization> + <name>ccsdk-distribution :: dgbuilder-docker</name> + <description>Creates docker container for dgbuilder</description> + <organization> + <name>ONAP</name> + </organization> - <properties> - <image.name>onap/ccsdk-dgbuilder-image</image.name> - <ccsdk.project.version>${project.version}</ccsdk.project.version> - <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> - <uniquedockertag>${env.UNIQUE_DOCKER_TAG}</uniquedockertag> - </properties> + <properties> + <image.name>onap/ccsdk-dgbuilder-image</image.name> + <uniquedockertag>${env.UNIQUE_DOCKER_TAG}</uniquedockertag> + </properties> - <build> - <plugins> + <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/TagSnapshotVersion.groovy</source> + </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> + </resources> + </configuration> + </execution> + </executions> + </plugin> - <plugin> - <groupId>org.codehaus.groovy.maven</groupId> - <artifactId>gmaven-plugin</artifactId> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>execute</goal> - </goals> - <configuration> - <source>${basedir}/../src/main/scripts/TagSnapshotVersion.groovy</source> - </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> - </resources> - </configuration> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.5.0</version> + <executions> + <execution> + <id>Make-stage-dir</id> + <phase>generate-sources</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>/bin/mkdir</executable> + <arguments> + <argument>-p</argument> + <argument>${basedir}/target/docker-stage/opt/onap/ccsdk</argument> + </arguments> + </configuration> + </execution> + <execution> + <id>Unzip dgbuilder</id> + <phase>generate-sources</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>/usr/bin/unzip</executable> + <arguments> + <argument>-d</argument> + <argument>${basedir}/target/docker-stage/opt/onap/ccsdk</argument> + <argument>../dgbuilder/target/*.zip</argument> + </arguments> + </configuration> + </execution> + <execution> + <id>Copy dgbuilder</id> + <phase>generate-sources</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>/bin/cp</executable> + <arguments> + <argument>-r</argument> + <argument>../dgbuilder</argument> + <argument>${basedir}/target/docker-stage/opt/onap/ccsdk</argument> + </arguments> + </configuration> + </execution> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.5.0</version> - <executions> - <execution> - <id>Make-stage-dir</id> - <phase>generate-sources</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <executable>/bin/mkdir</executable> - <arguments> - <argument>-p</argument> - <argument>${basedir}/target/docker-stage/opt/onap/ccsdk</argument> - </arguments> - </configuration> - </execution> - <execution> - <id>Unzip dgbuilder</id> - <phase>generate-sources</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <executable>/usr/bin/unzip</executable> - <arguments> - <argument>-d</argument> - <argument>${basedir}/target/docker-stage/opt/onap/ccsdk</argument> - <argument>../dgbuilder/target/*.zip</argument> - </arguments> - </configuration> - </execution> - <execution> - <id>Copy dgbuilder</id> - <phase>generate-sources</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <executable>/bin/cp</executable> - <arguments> - <argument>-r</argument> - <argument>../dgbuilder</argument> - <argument>${basedir}/target/docker-stage/opt/onap/ccsdk</argument> - </arguments> - </configuration> - </execution> + <execution> + <id>dgbuilder createReleaseDir</id> + <phase>generate-sources</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>/bin/bash</executable> + <arguments> + <argument>${basedir}/target/docker-stage/opt/onap/ccsdk/dgbuilder/createReleaseDir.sh</argument> + <argument>1702</argument> + <argument>dguser</argument> + <argument>change_email_id@dgbuilder.com</argument> + </arguments> + </configuration> + </execution> - <execution> - <id>dgbuilder createReleaseDir</id> - <phase>generate-sources</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <executable>/bin/bash</executable> - <arguments> - <argument>${basedir}/target/docker-stage/opt/onap/ccsdk/dgbuilder/createReleaseDir.sh</argument> - <argument>1702</argument> - <argument>dguser</argument> - <argument>change_email_id@dgbuilder.com</argument> - </arguments> - </configuration> - </execution> + <execution> + <id>change shell permissions</id> + <phase>process-sources</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>/usr/bin/find</executable> + <arguments> + <argument>${basedir}/target/docker-stage/opt/onap/ccsdk</argument> + <argument>-name</argument> + <argument>*.sh</argument> + <argument>-exec</argument> + <argument>chmod</argument> + <argument>+x</argument> + <argument>{}</argument> + <argument>;</argument> + </arguments> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> - <execution> - <id>change shell permissions</id> - <phase>process-sources</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <executable>/usr/bin/find</executable> - <arguments> - <argument>${basedir}/target/docker-stage/opt/onap/ccsdk</argument> - <argument>-name</argument> - <argument>*.sh</argument> - <argument>-exec</argument> - <argument>chmod</argument> - <argument>+x</argument> - <argument>{}</argument> - <argument>;</argument> - </arguments> - </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.28.0</version> - <inherited>false</inherited> - <configuration> - - <images> - <image> - <name>${image.name}</name> - <build> - <cleanup>try</cleanup> - <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir> - <dockerFile>Dockerfile</dockerFile> - <tags> - <tag>${project.docker.latestminortag.snapshot.version}</tag> - <tag>${project.docker.latestfulltag.snapshot.version}</tag> - <tag>${project.docker.latesttagtimestamp.snapshot.version}</tag> + <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> + <contextDir>${basedir}/target/docker-stage</contextDir> + <dockerFile>Dockerfile</dockerFile> + <tags> + <tag>${project.docker.latestminortag.snapshot.version}</tag> + <tag>${project.docker.latestfulltag.snapshot.version}</tag> + <tag>${project.docker.latesttagtimestamp.snapshot.version}</tag> <tag>${project.docker.uniquedockertag.snapshot.version}</tag> - </tags> - </build> - </image> - </images> - </configuration> - <executions> - <execution> - <id>generate-images</id> - <phase>package</phase> - <goals> - <goal>build</goal> - </goals> - </execution> - - <execution> - <id>push-images</id> - <phase>deploy</phase> - <goals> - <goal>build</goal> - <goal>push</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> + </tags> + </build> + </image> + </images> + <verbose>${docker.verbose}</verbose> + <!-- Hardocding skipPush to false, as during verification CSIT currently pulling docker image from nexus --> + <!-- <skipPush>${docker.skip.push}</skipPush> --> + <skipPush>false</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/dgbuilder/pom.xml b/dgbuilder/pom.xml index df58bd81..afd30c45 100644 --- a/dgbuilder/pom.xml +++ b/dgbuilder/pom.xml @@ -1,135 +1,132 @@ <?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> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.ccsdk.distribution</groupId> - <artifactId>distribution-root</artifactId> - <version>1.1.1-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.onap.ccsdk.distribution</groupId> + <artifactId>distribution-root</artifactId> + <version>1.1.1-SNAPSHOT</version> + </parent> - <groupId>org.onap.ccsdk.distribution</groupId> - <artifactId>distribution-dgbuilder</artifactId> - <version>1.1.1-SNAPSHOT</version> - <packaging>pom</packaging> + <groupId>org.onap.ccsdk.distribution</groupId> + <artifactId>distribution-dgbuilder</artifactId> + <packaging>pom</packaging> - <name>ccsdk-distribution :: dgbuilder</name> - <description>Directed Graph Builder</description> - <organization> - <name>ONAP</name> - </organization> + <name>ccsdk-distribution :: dgbuilder</name> + <description>Directed Graph Builder</description> + <organization> + <name>ONAP</name> + </organization> - <properties> - <application.name>dgbuilder</application.name> - <skip.SWM>true</skip.SWM> - <adm.base>/opt/app/dgbuilder</adm.base> - <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> - <build.number>${maven.build.timestamp}</build.number> - <SWM_VERSION>${project.version}-${build.number}</SWM_VERSION> - </properties> + <properties> + <application.name>dgbuilder</application.name> + <skip.SWM>true</skip.SWM> + <adm.base>/opt/app/dgbuilder</adm.base> + <SWM_VERSION>${project.version}-${build.number}</SWM_VERSION> + </properties> - <dependencies> - <dependency> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>sli-common</artifactId> - <version>${sdnctl.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> - <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> + <dependencies> + <dependency> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>sli-common</artifactId> + <version>${sdnctl.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> + <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> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <id>create-zip</id> - <goals> - <goal>single</goal> - </goals> - <phase>package</phase> - <configuration> - <finalName>${application.name}.${project.version}</finalName> - <attach>true</attach> - <descriptors> - <descriptor>src/assembly/assemble_zip.xml</descriptor> - </descriptors> - <appendAssemblyId>false</appendAssemblyId> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-dependencies</id> - <goals> - <goal>copy-dependencies</goal> - </goals> - <phase>prepare-package</phase> - <configuration> - <transitive>false</transitive> - <outputDirectory>${project.build.directory}/svclogic/lib</outputDirectory> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>true</overWriteSnapshots> - <overWriteIfNewer>true</overWriteIfNewer> - <useRepositoryLayout>false</useRepositoryLayout> - <addParentPoms>false</addParentPoms> - <copyPom>false</copyPom> - <scope>provided</scope> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>generate-sources</phase> - <configuration> - <target> - <exec executable="${project.basedir}/build_pom_for_yang_compile"> - <!--<arg value="${odlparent-carbon-sr1-version}"/>--> - </exec> - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <id>create-zip</id> + <goals> + <goal>single</goal> + </goals> + <phase>package</phase> + <configuration> + <finalName>${application.name}.${project.version}</finalName> + <attach>true</attach> + <descriptors> + <descriptor>src/assembly/assemble_zip.xml</descriptor> + </descriptors> + <appendAssemblyId>false</appendAssemblyId> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-dependencies</id> + <goals> + <goal>copy-dependencies</goal> + </goals> + <phase>prepare-package</phase> + <configuration> + <transitive>false</transitive> + <outputDirectory>${project.build.directory}/svclogic/lib</outputDirectory> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>true</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + <useRepositoryLayout>false</useRepositoryLayout> + <addParentPoms>false</addParentPoms> + <copyPom>false</copyPom> + <scope>provided</scope> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>generate-sources</phase> + <configuration> + <target> + <exec executable="${project.basedir}/build_pom_for_yang_compile"> + <!--<arg value="${odlparent-carbon-sr1-version}"/>--> + </exec> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml index 847a4e69..7742d6b6 100644 --- a/odlsli/odlsli-alpine/pom.xml +++ b/odlsli/odlsli-alpine/pom.xml @@ -23,17 +23,19 @@ <properties> <base.image.name>onap/ccsdk-odl-sodium-alpine-image</base.image.name> <image.name>onap/ccsdk-odlsli-alpine-image</image.name> + <ccsdk.project.version>${project.version}</ccsdk.project.version> - <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> - <uniquedockertag>${env.UNIQUE_DOCKER_TAG}</uniquedockertag> - <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> - <opendaylight.root>opt/opendaylight</opendaylight.root> - <docker.push.phase>deploy</docker.push.phase> + <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> + <docker.verbose>true</docker.verbose> + + <uniquedockertag>${env.UNIQUE_DOCKER_TAG}</uniquedockertag> + <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy> + <opendaylight.root>opt/opendaylight</opendaylight.root> + <ansible.gpg.key>93C4A3FD7BB9C367</ansible.gpg.key> - <odl.features.extra>odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs, odl-daexim-all, odl-restconf-nb-rfc8040 - </odl.features.extra> + <odl.features.extra>odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs, odl-daexim-all, odl-restconf-nb-rfc8040</odl.features.extra> <ccsdk.odl.features> ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all,ccsdk-features-all </ccsdk.odl.features> @@ -46,287 +48,277 @@ <ccsdk.sli.plugins.version>1.1.0</ccsdk.sli.plugins.version> <ccsdk.oran.a1adapter.version>1.1.0</ccsdk.oran.a1adapter.version> <docker.autoCreateCustomNetworks>true</docker.autoCreateCustomNetworks> -</properties> + </properties> <dependencies> <dependency> <groupId>${project.groupId}</groupId> <artifactId>dependencies</artifactId> <version>${project.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>dblib-installer</artifactId> <version>${ccsdk.sli.core.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>filters-installer</artifactId> <version>${ccsdk.sli.core.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-installer</artifactId> <version>${ccsdk.sli.core.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sliapi-installer</artifactId> <version>${ccsdk.sli.core.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sliPluginUtils-installer</artifactId> <version>${ccsdk.sli.core.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>utils-installer</artifactId> <version>${ccsdk.sli.core.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>slicore-features-installer</artifactId> <version>${ccsdk.sli.core.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>aai-service-installer</artifactId> <version>${ccsdk.sli.adaptors.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>ansible-adapter-installer</artifactId> <version>${ccsdk.sli.adaptors.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>base-http-installer</artifactId> <version>${ccsdk.sli.adaptors.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>mdsal-resource-installer</artifactId> <version>${ccsdk.sli.adaptors.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> <artifactId>publisher.installer</artifactId> <version>${ccsdk.sli.adaptors.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>netbox-client-installer</artifactId> <version>${ccsdk.sli.adaptors.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>resource-assignment-installer</artifactId> <version>${ccsdk.sli.adaptors.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>saltstack-adapter-installer</artifactId> <version>${ccsdk.sli.adaptors.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>sql-resource-installer</artifactId> <version>${ccsdk.sli.adaptors.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>sliadaptors-features-installer</artifactId> <version>${ccsdk.sli.adaptors.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> - <dependency> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>asdcApi-installer</artifactId> <version>${ccsdk.sli.northbound.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>dataChange-installer</artifactId> <version>${ccsdk.sli.northbound.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>lcm-installer</artifactId> <version>${ccsdk.sli.northbound.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>slinorthbound-features-installer</artifactId> <version>${ccsdk.sli.northbound.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>properties-node-installer</artifactId> <version>${ccsdk.sli.plugins.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>restapi-call-node-installer</artifactId> <version>${ccsdk.sli.plugins.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>template-node-installer</artifactId> <version>${ccsdk.sli.plugins.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>restconf-client-installer</artifactId> <version>${ccsdk.sli.plugins.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>sshapi-call-node-installer</artifactId> <version>${ccsdk.sli.plugins.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.plugins</groupId> <artifactId>sliplugins-features-installer</artifactId> <version>${ccsdk.sli.plugins.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.features</groupId> <artifactId>features-installer</artifactId> <version>${ccsdk.features.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> <artifactId>sdnr-wt-feature-aggregator-installer</artifactId> <version>${ccsdk.features.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.features</groupId> <artifactId>aafshiro-installer</artifactId> <version>${ccsdk.features.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> <artifactId>sdnr-northbound-features-installer</artifactId> <version>${ccsdk.features.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.oran</groupId> <artifactId>a1-adapter-northbound-installer</artifactId> <version>${ccsdk.oran.a1adapter.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> <artifactId>oofpcipoc-installer</artifactId> <version>${ccsdk.features.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.oran</groupId> <artifactId>a1-adapter-installer</artifactId> <version>${ccsdk.oran.a1adapter.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> <artifactId>CMNotify-installer</artifactId> <version>${ccsdk.features.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> <dependency> <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> <artifactId>ranSlice-installer</artifactId> <version>${ccsdk.features.version}</version> - <classifier>repo</classifier> <type>zip</type> + <classifier>repo</classifier> </dependency> </dependencies> <build> - <extensions> - <extension> - <!-- this extension is required by wagon in order to pass the proxy --> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-http-lightweight</artifactId> - <version>2.2</version> - </extension> - </extensions> <plugins> - - <plugin> <groupId>org.codehaus.groovy.maven</groupId> <artifactId>gmaven-plugin</artifactId> + <version>1.0</version> <executions> <execution> <phase>validate</phase> @@ -339,8 +331,6 @@ </execution> </executions> </plugin> - - <plugin> <artifactId>maven-resources-plugin</artifactId> <version>2.6</version> @@ -364,7 +354,6 @@ </resources> </configuration> </execution> - <execution> <id>copy-scripts</id> <goals> @@ -384,7 +373,6 @@ </resources> </configuration> </execution> - <execution> <id>copy-odl-resources</id> <goals> @@ -528,7 +516,6 @@ <artifactId>exec-maven-plugin</artifactId> <version>1.5.0</version> <executions> - <execution> <id>change shell permissions</id> <phase>process-sources</phase> @@ -555,18 +542,25 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> <executions> - <execution> - <goals> - <goal>integration-test</goal> - <goal>verify</goal> - </goals> - </execution> + <execution> + <goals> + <goal>integration-test</goal> + <goal>verify</goal> + </goals> + </execution> </executions> <configuration> - <skipITs>true</skipITs> + <skipITs>true</skipITs> </configuration> - </plugin> + </plugin> </plugins> + <extensions> + <extension><!-- this extension is required by wagon in order to pass the proxy --> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-http-lightweight</artifactId> + <version>2.2</version> + </extension> + </extensions> </build> <profiles> @@ -578,24 +572,24 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> <executions> - <execution> - <goals> - <goal>integration-test</goal> - <goal>verify</goal> - </goals> - </execution> + <execution> + <goals> + <goal>integration-test</goal> + <goal>verify</goal> + </goals> + </execution> </executions> <configuration> - <skipITs>false</skipITs> - <environmentVariables> - <ODLSLI_PORT>${odlsli.port}</ODLSLI_PORT> - </environmentVariables> + <skipITs>false</skipITs> + <environmentVariables> + <ODLSLI_PORT>${odlsli.port}</ODLSLI_PORT> + </environmentVariables> </configuration> - </plugin> + </plugin> <plugin> <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> - <version>0.28.0</version> + <version>0.34.0</version> <inherited>false</inherited> <configuration> <images> @@ -603,21 +597,25 @@ <name>${image.name}</name> <build> <cleanup>try</cleanup> - <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir> + <contextDir>${basedir}/target/docker-stage</contextDir> <dockerFile>Dockerfile</dockerFile> <tags> <tag>${project.docker.latestminortag.snapshot.version}</tag> <tag>${project.docker.latestfulltag.snapshot.version}</tag> <tag>${project.docker.latesttagtimestamp.snapshot.version}</tag> <tag>${project.docker.uniquedockertag.snapshot.version}</tag> - </tags> + </tags> </build> </image> </images> + <verbose>${docker.verbose}</verbose> + <!-- Hardocding skipPush to false, as during verification CSIT currently pulling docker image from nexus --> + <!-- <skipPush>${docker.skip.push}</skipPush> --> + <skipPush>false</skipPush> </configuration> <executions> <execution> - <id>generate-images</id> + <id>build-images</id> <phase>package</phase> <goals> <goal>build</goal> @@ -700,9 +698,8 @@ </execution> <execution> <id>push-images</id> - <phase>${docker.push.phase}</phase> <goals> - <goal>build</goal> + <!--<goal>build</goal>--> <goal>push</goal> </goals> </execution> diff --git a/odlsli/pom.xml b/odlsli/pom.xml index 5c85d929..762b3ba7 100644 --- a/odlsli/pom.xml +++ b/odlsli/pom.xml @@ -9,13 +9,12 @@ </parent> <artifactId>distribution-odlsli</artifactId> - <version>1.1.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-distribution :: odlsli</name> <description>Creates ODLSLI containers</description> <modules> - <module>odlsli-alpine</module> + <module>odlsli-alpine</module> </modules> </project> diff --git a/opendaylight/aluminum/aluminum-alpine/pom.xml b/opendaylight/aluminum/aluminum-alpine/pom.xml index 61a559dd..84d9f307 100644 --- a/opendaylight/aluminum/aluminum-alpine/pom.xml +++ b/opendaylight/aluminum/aluminum-alpine/pom.xml @@ -1,168 +1,155 @@ <?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-aluminum</artifactId> - <version>1.1.1-SNAPSHOT</version> - </parent> - - <artifactId>distribution-odl-aluminum-docker</artifactId> - <version>1.1.1-SNAPSHOT</version> - <packaging>pom</packaging> - - <name>ccsdk-distribution :: opendaylight :: aluminum :: docker</name> - <description>Creates OpenDaylight container</description> - <organization> - <name>ONAP</name> - </organization> - - <properties> - <image.name>onap/ccsdk-odl-aluminum-alpine-image</image.name> - <odl.karaf.artifactId>onap-karaf</odl.karaf.artifactId> - </properties> - <build> - <plugins> - - - <plugin> - <groupId>org.codehaus.groovy.maven</groupId> - <artifactId>gmaven-plugin</artifactId> - <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> - </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> - </executions> - </plugin> - - - - </plugins> - </build> - - <profiles> - <profile> - <id>docker</id> - <build> - <plugins> - <plugin> - <groupId>io.fabric8</groupId> - <artifactId>docker-maven-plugin</artifactId> - <version>0.28.0</version> - <inherited>false</inherited> - <configuration> - <images> - <image> - <name>${image.name}</name> - <build> - <cleanup>try</cleanup> - <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir> - <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> - </configuration> - <executions> - <execution> - <id>generate-images</id> - <phase>package</phase> - <goals> - <goal>build</goal> - </goals> - </execution> - - <execution> - <id>push-images</id> - <phase>${docker.push.phase}</phase> - <goals> - <goal>build</goal> - <goal>push</goal> - </goals> - </execution> - </executions> - </plugin> - - </plugins> - </build> - </profile> - - </profiles> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.onap.ccsdk.distribution</groupId> + <artifactId>distribution-odl-aluminum</artifactId> + <version>1.1.1-SNAPSHOT</version> + </parent> + + <artifactId>distribution-odl-aluminum-docker</artifactId> + <packaging>pom</packaging> + + <name>ccsdk-distribution :: opendaylight :: aluminum :: docker</name> + <description>Creates OpenDaylight container</description> + <organization> + <name>ONAP</name> + </organization> + + <properties> + <image.name>onap/ccsdk-odl-aluminum-alpine-image</image.name> + <odl.karaf.artifactId>onap-karaf</odl.karaf.artifactId> + </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> + </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> + </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> + <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/aluminum/pom.xml b/opendaylight/aluminum/pom.xml index 5123355c..91f93706 100644 --- a/opendaylight/aluminum/pom.xml +++ b/opendaylight/aluminum/pom.xml @@ -9,33 +9,27 @@ </parent> <artifactId>distribution-odl-aluminum</artifactId> - <version>1.1.1-SNAPSHOT</version> <packaging>pom</packaging> - <name>ccsdk-distribution :: opendaylight</name> + <name>ccsdk-distribution :: opendaylight :: aluminum</name> <description>Creates OpenDaylight container</description> - - <properties> - <ccsdk.project.version>${project.version}</ccsdk.project.version> - <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> - <ccsdk.opendaylight.version>0.13.1</ccsdk.opendaylight.version> - <docker.push.phase>deploy</docker.push.phase> - </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> - - <modules> - <module>aluminum-alpine</module> + <module>aluminum-alpine</module> </modules> + + <properties> + <ccsdk.opendaylight.version>0.13.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/onap-distribution/fluorine/karaf/pom.xml b/opendaylight/onap-distribution/fluorine/karaf/pom.xml index ef718f5d..aca9b90d 100644 --- a/opendaylight/onap-distribution/fluorine/karaf/pom.xml +++ b/opendaylight/onap-distribution/fluorine/karaf/pom.xml @@ -11,7 +11,7 @@ <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-opendaylight-onap-fluorine-karaf</artifactId> <version>0.4.1-SNAPSHOT</version> - <name>ccsdk-distribution :: onap :: opendaylight :: fluorine :: karaf</name> + <name>ccsdk-distribution :: opendaylight :: onap :: fluorine :: karaf</name> <modelVersion>4.0.0</modelVersion> <licenses> diff --git a/opendaylight/onap-distribution/fluorine/pom.xml b/opendaylight/onap-distribution/fluorine/pom.xml index 44f8269d..4d76a88d 100644 --- a/opendaylight/onap-distribution/fluorine/pom.xml +++ b/opendaylight/onap-distribution/fluorine/pom.xml @@ -9,9 +9,8 @@ </parent> <artifactId>distribution-opendaylight-onap-fluorine-parent</artifactId> - <version>0.4.1-SNAPSHOT</version> <packaging>pom</packaging> - <name>ccsdk-distribution :: onap :: opendaylight :: fluorine :: parent</name> + <name>ccsdk-distribution :: opendaylight :: onap :: fluorine</name> <description>Creates ONAP's OpenDaylight Fluorine container</description> <modules> diff --git a/opendaylight/onap-distribution/pom.xml b/opendaylight/onap-distribution/pom.xml index dbc5a5b0..b6a4d464 100644 --- a/opendaylight/onap-distribution/pom.xml +++ b/opendaylight/onap-distribution/pom.xml @@ -9,10 +9,9 @@ </parent> <artifactId>distribution-opendaylight-onap</artifactId> - <version>0.7.0-SNAPSHOT</version> <packaging>pom</packaging> - <name>ccsdk-distribution :: onap :: opendaylight :: parent</name> + <name>ccsdk-distribution :: opendaylight :: onap</name> <description>Creates ONAP's OpenDaylight distribution</description> <modules> diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml index a5a61063..fd4cebc3 100644 --- a/opendaylight/pom.xml +++ b/opendaylight/pom.xml @@ -9,7 +9,6 @@ </parent> <artifactId>distribution-opendaylight</artifactId> - <version>1.1.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-distribution :: opendaylight</name> diff --git a/opendaylight/sodium/pom.xml b/opendaylight/sodium/pom.xml index 6310fea9..fe63f6db 100644 --- a/opendaylight/sodium/pom.xml +++ b/opendaylight/sodium/pom.xml @@ -9,33 +9,27 @@ </parent> <artifactId>distribution-odl-sodium</artifactId> - <version>1.1.1-SNAPSHOT</version> <packaging>pom</packaging> - <name>ccsdk-distribution :: opendaylight</name> + <name>ccsdk-distribution :: opendaylight :: sodium</name> <description>Creates OpenDaylight container</description> - - <properties> - <ccsdk.project.version>${project.version}</ccsdk.project.version> - <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> - <ccsdk.opendaylight.version>0.11.4</ccsdk.opendaylight.version> - <docker.push.phase>deploy</docker.push.phase> - </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> - - <modules> - <module>sodium-alpine</module> + <module>sodium-alpine</module> </modules> + + <properties> + <ccsdk.opendaylight.version>0.11.4</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/sodium/sodium-alpine/pom.xml b/opendaylight/sodium/sodium-alpine/pom.xml index 05e1f2eb..7e3ea9a2 100644 --- a/opendaylight/sodium/sodium-alpine/pom.xml +++ b/opendaylight/sodium/sodium-alpine/pom.xml @@ -1,168 +1,155 @@ <?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-sodium</artifactId> - <version>1.1.1-SNAPSHOT</version> - </parent> - - <artifactId>distribution-odl-sodium-docker</artifactId> - <version>1.1.1-SNAPSHOT</version> - <packaging>pom</packaging> - - <name>ccsdk-distribution :: opendaylight :: sodium :: docker</name> - <description>Creates OpenDaylight container</description> - <organization> - <name>ONAP</name> - </organization> - - <properties> - <image.name>onap/ccsdk-odl-sodium-alpine-image</image.name> - <odl.karaf.artifactId>onap-karaf</odl.karaf.artifactId> - </properties> - <build> - <plugins> - - - <plugin> - <groupId>org.codehaus.groovy.maven</groupId> - <artifactId>gmaven-plugin</artifactId> - <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> - </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> - </executions> - </plugin> - - - - </plugins> - </build> - - <profiles> - <profile> - <id>docker</id> - <build> - <plugins> - <plugin> - <groupId>io.fabric8</groupId> - <artifactId>docker-maven-plugin</artifactId> - <version>0.28.0</version> - <inherited>false</inherited> - <configuration> - <images> - <image> - <name>${image.name}</name> - <build> - <cleanup>try</cleanup> - <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir> - <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> - </configuration> - <executions> - <execution> - <id>generate-images</id> - <phase>package</phase> - <goals> - <goal>build</goal> - </goals> - </execution> - - <execution> - <id>push-images</id> - <phase>${docker.push.phase}</phase> - <goals> - <goal>build</goal> - <goal>push</goal> - </goals> - </execution> - </executions> - </plugin> - - </plugins> - </build> - </profile> - - </profiles> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.onap.ccsdk.distribution</groupId> + <artifactId>distribution-odl-sodium</artifactId> + <version>1.1.1-SNAPSHOT</version> + </parent> + + <artifactId>distribution-odl-sodium-docker</artifactId> + <packaging>pom</packaging> + + <name>ccsdk-distribution :: opendaylight :: sodium :: docker</name> + <description>Creates OpenDaylight container</description> + <organization> + <name>ONAP</name> + </organization> + + <properties> + <image.name>onap/ccsdk-odl-sodium-alpine-image</image.name> + <odl.karaf.artifactId>onap-karaf</odl.karaf.artifactId> + </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> + </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> + </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> + <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/platform-logic/a1Adapter-api/pom.xml b/platform-logic/a1Adapter-api/pom.xml index 3eb953b2..547e8985 100644 --- a/platform-logic/a1Adapter-api/pom.xml +++ b/platform-logic/a1Adapter-api/pom.xml @@ -1,54 +1,53 @@ <?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> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.ccsdk.distribution</groupId> - <artifactId>distribution-platform-logic</artifactId> - <version>1.1.1-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.onap.ccsdk.distribution</groupId> + <artifactId>distribution-platform-logic</artifactId> + <version>1.1.1-SNAPSHOT</version> + </parent> - <artifactId>platform-logic-a1Adapterapi</artifactId> - <version>1.1.1-SNAPSHOT</version> - <packaging>pom</packaging> + <artifactId>platform-logic-a1Adapterapi</artifactId> + <packaging>pom</packaging> - <name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name> - <description>Contains platform-level service logic for a1Adapter to interface with A1 Mediator</description> + <name>ccsdk-distribution :: ${project.artifactId}</name> + <description>Contains platform-level service logic for a1Adapter to interface with A1 Mediator</description> - <build> - <plugins> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <id>copy-version</id> - <goals> - <goal>copy-resources</goal> - </goals><!-- here the phase you need --> - <phase>validate</phase> - <configuration> - <outputDirectory>../target/graphs/a1Adapterapi</outputDirectory> - <resources> - <resource> - <directory>src/main/xml</directory> - <includes> - <include>*.xml</include> - </includes> - <filtering>true</filtering> - </resource> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>graph.versions</include> - </includes> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <id>copy-version</id> + <goals> + <goal>copy-resources</goal> + </goals><!-- here the phase you need --> + <phase>validate</phase> + <configuration> + <outputDirectory>../target/graphs/a1Adapterapi</outputDirectory> + <resources> + <resource> + <directory>src/main/xml</directory> + <includes> + <include>*.xml</include> + </includes> + <filtering>true</filtering> + </resource> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>graph.versions</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> diff --git a/platform-logic/asdc-api/pom.xml b/platform-logic/asdc-api/pom.xml index a84bede7..2f52fbd5 100644 --- a/platform-logic/asdc-api/pom.xml +++ b/platform-logic/asdc-api/pom.xml @@ -1,54 +1,53 @@ <?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> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.ccsdk.distribution</groupId> - <artifactId>distribution-platform-logic</artifactId> - <version>1.1.1-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.onap.ccsdk.distribution</groupId> + <artifactId>distribution-platform-logic</artifactId> + <version>1.1.1-SNAPSHOT</version> + </parent> - <artifactId>platform-logic-asdcapi</artifactId> - <version>1.1.1-SNAPSHOT</version> - <packaging>pom</packaging> + <artifactId>platform-logic-asdcapi</artifactId> + <packaging>pom</packaging> - <name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name> - <description>Contains platform-level service logic for the ASDC-API</description> + <name>ccsdk-distribution :: ${project.artifactId}</name> + <description>Contains platform-level service logic for the ASDC-API</description> - <build> - <plugins> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <id>copy-version</id> - <goals> - <goal>copy-resources</goal> - </goals><!-- here the phase you need --> - <phase>validate</phase> - <configuration> - <outputDirectory>../target/graphs/asdcapi</outputDirectory> - <resources> - <resource> - <directory>src/main/xml</directory> - <includes> - <include>*.xml</include> - </includes> - <filtering>true</filtering> - </resource> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>graph.versions</include> - </includes> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <id>copy-version</id> + <goals> + <goal>copy-resources</goal> + </goals><!-- here the phase you need --> + <phase>validate</phase> + <configuration> + <outputDirectory>../target/graphs/asdcapi</outputDirectory> + <resources> + <resource> + <directory>src/main/xml</directory> + <includes> + <include>*.xml</include> + </includes> + <filtering>true</filtering> + </resource> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>graph.versions</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> diff --git a/platform-logic/cMNotify-api/pom.xml b/platform-logic/cMNotify-api/pom.xml index 2556ee77..2cd54dae 100644 --- a/platform-logic/cMNotify-api/pom.xml +++ b/platform-logic/cMNotify-api/pom.xml @@ -1,54 +1,53 @@ <?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> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.ccsdk.distribution</groupId> - <artifactId>distribution-platform-logic</artifactId> - <version>1.1.1-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.onap.ccsdk.distribution</groupId> + <artifactId>distribution-platform-logic</artifactId> + <version>1.1.1-SNAPSHOT</version> + </parent> - <artifactId>platform-logic-cMNotifyai</artifactId> - <version>1.1.1-SNAPSHOT</version> - <packaging>pom</packaging> + <artifactId>platform-logic-cMNotifyai</artifactId> + <packaging>pom</packaging> - <name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name> - <description>Contains platform-level service logic for responding to ORAN VES events</description> + <name>ccsdk-distribution :: ${project.artifactId}</name> + <description>Contains platform-level service logic for responding to ORAN VES events</description> - <build> - <plugins> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <id>copy-version</id> - <goals> - <goal>copy-resources</goal> - </goals><!-- here the phase you need --> - <phase>validate</phase> - <configuration> - <outputDirectory>../target/graphs/cMNotifyapi</outputDirectory> - <resources> - <resource> - <directory>src/main/xml</directory> - <includes> - <include>*.xml</include> - </includes> - <filtering>true</filtering> - </resource> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>graph.versions</include> - </includes> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <id>copy-version</id> + <goals> + <goal>copy-resources</goal> + </goals><!-- here the phase you need --> + <phase>validate</phase> + <configuration> + <outputDirectory>../target/graphs/cMNotifyapi</outputDirectory> + <resources> + <resource> + <directory>src/main/xml</directory> + <includes> + <include>*.xml</include> + </includes> + <filtering>true</filtering> + </resource> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>graph.versions</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index 74843651..c2686d8a 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -9,22 +9,21 @@ </parent> <artifactId>platform-logic-installer</artifactId> - <version>1.1.1-SNAPSHOT</version> <packaging>pom</packaging> - <name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name> + <name>ccsdk-distribution :: ${project.artifactId}</name> <description>Contains platform-level service logic installer</description> <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>sli-core-artifacts</artifactId> - <version>${ccsdk.sli.core.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>sli-core-artifacts</artifactId> + <version>${ccsdk.sli.core.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> </dependencyManagement> <dependencies> <dependency> diff --git a/platform-logic/oofpcipoc-api/pom.xml b/platform-logic/oofpcipoc-api/pom.xml index 5a044846..fc59a9cf 100644 --- a/platform-logic/oofpcipoc-api/pom.xml +++ b/platform-logic/oofpcipoc-api/pom.xml @@ -1,54 +1,53 @@ <?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> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.ccsdk.distribution</groupId> - <artifactId>distribution-platform-logic</artifactId> - <version>1.1.1-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.onap.ccsdk.distribution</groupId> + <artifactId>distribution-platform-logic</artifactId> + <version>1.1.1-SNAPSHOT</version> + </parent> - <artifactId>platform-logic-oofpcipocapi</artifactId> - <version>1.1.1-SNAPSHOT</version> - <packaging>pom</packaging> + <artifactId>platform-logic-oofpcipocapi</artifactId> + <packaging>pom</packaging> - <name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name> - <description>Contains platform-level service logic for the oofpcipoc-api</description> + <name>ccsdk-distribution :: ${project.artifactId}</name> + <description>Contains platform-level service logic for the oofpcipoc-api</description> - <build> - <plugins> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <id>copy-version</id> - <goals> - <goal>copy-resources</goal> - </goals><!-- here the phase you need --> - <phase>validate</phase> - <configuration> - <outputDirectory>../target/graphs/oofpcipocapi</outputDirectory> - <resources> - <resource> - <directory>src/main/xml</directory> - <includes> - <include>*.xml</include> - </includes> - <filtering>true</filtering> - </resource> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>graph.versions</include> - </includes> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <id>copy-version</id> + <goals> + <goal>copy-resources</goal> + </goals><!-- here the phase you need --> + <phase>validate</phase> + <configuration> + <outputDirectory>../target/graphs/oofpcipocapi</outputDirectory> + <resources> + <resource> + <directory>src/main/xml</directory> + <includes> + <include>*.xml</include> + </includes> + <filtering>true</filtering> + </resource> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>graph.versions</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml index 2487b8d4..3f2721f9 100644 --- a/platform-logic/pom.xml +++ b/platform-logic/pom.xml @@ -1,38 +1,34 @@ <?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> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.ccsdk.distribution</groupId> - <artifactId>distribution-root</artifactId> - <version>1.1.1-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.onap.ccsdk.distribution</groupId> + <artifactId>distribution-root</artifactId> + <version>1.1.1-SNAPSHOT</version> + </parent> - <artifactId>distribution-platform-logic</artifactId> - <version>1.1.1-SNAPSHOT</version> - <packaging>pom</packaging> + <artifactId>distribution-platform-logic</artifactId> + <packaging>pom</packaging> - <name>ccsdk-distribution :: platform-logic</name> - <description>Contains platform-level service logic</description> - <organization> - <name>openECOMP</name> - </organization> + <name>ccsdk-distribution :: platform-logic</name> + <description>Contains platform-level service logic</description> + <organization> + <name>openECOMP</name> + </organization> - <modules> - <module>asdc-api</module> - <module>sliapi</module> - <module>oofpcipoc-api</module> - <module>a1Adapter-api</module> - <module>cMNotify-api</module> - <module>ran-slice-api</module> - <module>restapi-templates</module> - <module>installer</module> - </modules> + <modules> + <module>asdc-api</module> + <module>sliapi</module> + <module>oofpcipoc-api</module> + <module>a1Adapter-api</module> + <module>cMNotify-api</module> + <module>ran-slice-api</module> + <module>restapi-templates</module> + <module>installer</module> + </modules> - <properties> - <application.name>platform-logic</application.name> - - <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> - <build.number>${maven.build.timestamp}</build.number> - </properties> + <properties> + <application.name>platform-logic</application.name> + </properties> </project> diff --git a/platform-logic/ran-slice-api/pom.xml b/platform-logic/ran-slice-api/pom.xml index 15b6f007..fc117ea8 100644 --- a/platform-logic/ran-slice-api/pom.xml +++ b/platform-logic/ran-slice-api/pom.xml @@ -1,54 +1,53 @@ <?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> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.ccsdk.distribution</groupId> - <artifactId>distribution-platform-logic</artifactId> - <version>1.1.1-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.onap.ccsdk.distribution</groupId> + <artifactId>distribution-platform-logic</artifactId> + <version>1.1.1-SNAPSHOT</version> + </parent> - <artifactId>platform-logic-ranSlice</artifactId> - <version>1.1.1-SNAPSHOT</version> - <packaging>pom</packaging> + <artifactId>platform-logic-ranSlice</artifactId> + <packaging>pom</packaging> - <name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name> - <description>Contains platform-level service logic for responding to ORAN VES events</description> + <name>ccsdk-distribution :: ${project.artifactId}</name> + <description>Contains platform-level service logic for responding to ORAN VES events</description> - <build> - <plugins> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <id>copy-version</id> - <goals> - <goal>copy-resources</goal> - </goals><!-- here the phase you need --> - <phase>validate</phase> - <configuration> - <outputDirectory>../target/graphs/ranSliceapi</outputDirectory> - <resources> - <resource> - <directory>src/main/xml</directory> - <includes> - <include>*.xml</include> - </includes> - <filtering>true</filtering> - </resource> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>graph.versions</include> - </includes> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <id>copy-version</id> + <goals> + <goal>copy-resources</goal> + </goals><!-- here the phase you need --> + <phase>validate</phase> + <configuration> + <outputDirectory>../target/graphs/ranSliceapi</outputDirectory> + <resources> + <resource> + <directory>src/main/xml</directory> + <includes> + <include>*.xml</include> + </includes> + <filtering>true</filtering> + </resource> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>graph.versions</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml index 0981dd62..5947c453 100644 --- a/platform-logic/restapi-templates/pom.xml +++ b/platform-logic/restapi-templates/pom.xml @@ -3,16 +3,15 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.distribution</groupId> - <artifactId>distribution-platform-logic</artifactId> - <version>1.1.1-SNAPSHOT</version> - </parent> + <groupId>org.onap.ccsdk.distribution</groupId> + <artifactId>distribution-platform-logic</artifactId> + <version>1.1.1-SNAPSHOT</version> + </parent> <artifactId>platform-logic-restapi-templates</artifactId> - <version>1.1.1-SNAPSHOT</version> - <packaging>pom</packaging> + <packaging>pom</packaging> - <name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name> + <name>ccsdk-distribution :: ${project.artifactId}</name> <description>Contains platform-level platform logic for REST API templates</description> <build> diff --git a/platform-logic/sliapi/pom.xml b/platform-logic/sliapi/pom.xml index e0d2d260..df4ff002 100644 --- a/platform-logic/sliapi/pom.xml +++ b/platform-logic/sliapi/pom.xml @@ -1,54 +1,53 @@ <?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> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.ccsdk.distribution</groupId> - <artifactId>distribution-platform-logic</artifactId> - <version>1.1.1-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.onap.ccsdk.distribution</groupId> + <artifactId>distribution-platform-logic</artifactId> + <version>1.1.1-SNAPSHOT</version> + </parent> - <artifactId>platform-logic-sliapi</artifactId> - <version>1.1.1-SNAPSHOT</version> - <packaging>pom</packaging> + <artifactId>platform-logic-sliapi</artifactId> + <packaging>pom</packaging> - <name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name> - <description>Contains platform-level service logic for the SLI-API</description> + <name>ccsdk-distribution :: ${project.artifactId}</name> + <description>Contains platform-level service logic for the SLI-API</description> - <build> - <plugins> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <id>copy-version</id> - <goals> - <goal>copy-resources</goal> - </goals><!-- here the phase you need --> - <phase>validate</phase> - <configuration> - <outputDirectory>../target/graphs/sliapi</outputDirectory> - <resources> - <resource> - <directory>src/main/xml</directory> - <includes> - <include>*.xml</include> - </includes> - <filtering>true</filtering> - </resource> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>graph.versions</include> - </includes> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <id>copy-version</id> + <goals> + <goal>copy-resources</goal> + </goals><!-- here the phase you need --> + <phase>validate</phase> + <configuration> + <outputDirectory>../target/graphs/sliapi</outputDirectory> + <resources> + <resource> + <directory>src/main/xml</directory> + <includes> + <include>*.xml</include> + </includes> + <filtering>true</filtering> + </resource> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>graph.versions</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> @@ -31,9 +31,16 @@ <properties> <application.name>distribution</application.name> + <ccsdk.project.version>${project.version}</ccsdk.project.version> + <ccsdk.distribution.version>${project.version}</ccsdk.distribution.version> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> + <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> <build.number>${maven.build.timestamp}</build.number> + + <docker.skip.push>false</docker.skip.push> + <docker.verbose>true</docker.verbose> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> </properties> @@ -83,5 +90,4 @@ </build> </profile> </profiles> - </project> diff --git a/saltstack-server/pom.xml b/saltstack-server/pom.xml index f0a59235..16a29610 100644 --- a/saltstack-server/pom.xml +++ b/saltstack-server/pom.xml @@ -9,16 +9,13 @@ </parent> <artifactId>saltstack-server</artifactId> - <version>1.1.1-SNAPSHOT</version> <packaging>pom</packaging> - <name>ccsdk-distribution :: saltstack-server</name> + <name>ccsdk-distribution :: ${project.artifactId}</name> <description>Creates base saltstack-server Docker container</description> <properties> <image.name>onap/ccsdk-saltstack-server-image</image.name> - <ccsdk.project.version>${project.version}</ccsdk.project.version> - <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> </properties> <build> @@ -27,6 +24,7 @@ <plugin> <groupId>org.codehaus.groovy.maven</groupId> <artifactId>gmaven-plugin</artifactId> + <version>1.0</version> <executions> <execution> <phase>validate</phase> @@ -34,7 +32,7 @@ <goal>execute</goal> </goals> <configuration> - <source>${basedir}/../src/main/scripts/TagVersion.groovy</source> + <source>${basedir}/../src/main/scripts/TagVersion.groovy</source> </configuration> </execution> </executions> @@ -76,38 +74,30 @@ <plugin> <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> - <version>0.26.0</version> + <version>0.34.0</version> <inherited>false</inherited> <configuration> - <images> <image> <name>${image.name}</name> <build> <cleanup>try</cleanup> - <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir> + <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> + <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>generate-images</id> - <phase>generate-sources</phase> - <goals> - <goal>build</goal> - </goals> - </execution> - - <execution> - <id>push-images</id> - <phase>deploy</phase> + <id>build-push-images</id> <goals> <goal>build</goal> <goal>push</goal> @@ -115,7 +105,6 @@ </execution> </executions> </plugin> - </plugins> </build> </profile> diff --git a/ubuntu/pom.xml b/ubuntu/pom.xml index 22ee2eee..63f64335 100644 --- a/ubuntu/pom.xml +++ b/ubuntu/pom.xml @@ -9,7 +9,6 @@ </parent> <artifactId>distribution-ubuntu</artifactId> - <version>1.1.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-distribution :: ubuntu</name> @@ -20,17 +19,14 @@ <properties> <image.name>onap/ccsdk-ubuntu-image</image.name> - <ccsdk.project.version>${project.version}</ccsdk.project.version> - <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> - <ccsdk.distribution.version>${project.version}</ccsdk.distribution.version> </properties> <build> <plugins> - <plugin> <groupId>org.codehaus.groovy.maven</groupId> <artifactId>gmaven-plugin</artifactId> + <version>1.0</version> <executions> <execution> <phase>validate</phase> @@ -80,16 +76,15 @@ <plugin> <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> - <version>0.28.0</version> + <version>0.34.0</version> <inherited>false</inherited> <configuration> - <images> <image> <name>${image.name}</name> <build> <cleanup>try</cleanup> - <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir> + <contextDir>${basedir}/target/docker-stage</contextDir> <dockerFile>Dockerfile</dockerFile> <tags> <tag>${project.docker.latestminortag.version}</tag> @@ -99,19 +94,12 @@ </build> </image> </images> + <verbose>${docker.verbose}</verbose> + <skipPush>${docker.skip.push}</skipPush> </configuration> <executions> <execution> - <id>generate-images</id> - <phase>generate-sources</phase> - <goals> - <goal>build</goal> - </goals> - </execution> - - <execution> - <id>push-images</id> - <phase>deploy</phase> + <id>build-push-images</id> <goals> <goal>build</goal> <goal>push</goal> @@ -119,7 +107,6 @@ </execution> </executions> </plugin> - </plugins> </build> </profile> |