Code Review
/
ccsdk
/
cds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Roll to initial Honolulu version
[ccsdk/cds.git]
/
ms
/
sdclistener
/
distribution
/
pom.xml
diff --git
a/ms/sdclistener/distribution/pom.xml
b/ms/sdclistener/distribution/pom.xml
index
764a889
..
e9f5b94
100755
(executable)
--- a/
ms/sdclistener/distribution/pom.xml
+++ b/
ms/sdclistener/distribution/pom.xml
@@
-14,17
+14,22
@@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
+
<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>
<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.cds.sdclistener</groupId>
<parent>
<groupId>org.onap.ccsdk.cds.sdclistener</groupId>
- <artifactId>parent</artifactId>
- <version>
0.5.1
-SNAPSHOT</version>
+ <artifactId>
sdclistener-
parent</artifactId>
+ <version>
1.1.0
-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<relativePath>../parent</relativePath>
</parent>
- <artifactId>distribution</artifactId>
+
+ <artifactId>sdclistener-distribution</artifactId>
<packaging>pom</packaging>
<packaging>pom</packaging>
- <name>SDC Listener Distribution</name>
+
+ <name>MS SDC Listener - Distribution</name>
+
<properties>
<assembly.id>maven</assembly.id>
<name.space>org.onap.ccsdk.cds</name.space>
<properties>
<assembly.id>maven</assembly.id>
<name.space>org.onap.ccsdk.cds</name.space>
@@
-32,18
+37,15
@@
<image.name>onap/ccsdk-sdclistener</image.name>
<!--disabled for now to mirror #85964 https://gerrit.onap.org/r/#/c/85964/2/ms/command-executor/pom.xml-->
<!--<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>-->
<image.name>onap/ccsdk-sdclistener</image.name>
<!--disabled for now to mirror #85964 https://gerrit.onap.org/r/#/c/85964/2/ms/command-executor/pom.xml-->
<!--<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>-->
- <docker.push.phase>deploy</docker.push.phase>
- <docker.verbose>true</docker.verbose>
- <ccsdk.project.version>${project.version}</ccsdk.project.version>
- <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
</properties>
<dependencies>
<dependency>
<groupId>org.onap.ccsdk.cds.sdclistener</groupId>
</properties>
<dependencies>
<dependency>
<groupId>org.onap.ccsdk.cds.sdclistener</groupId>
- <artifactId>application</artifactId>
+ <artifactId>
sdclistener-
application</artifactId>
</dependency>
</dependencies>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
<build>
<plugins>
<plugin>
@@
-89,8
+91,7
@@
</execution>
</executions>
</plugin>
</execution>
</executions>
</plugin>
- <plugin>
- <!--build the final artifact for docker deployment -->
+ <plugin><!--build the final artifact for docker deployment -->
<artifactId>maven-assembly-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.1.0</version>
<configuration>
@@
-139,7
+140,7
@@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.
26.1
</version>
+ <version>0.
34.0
</version>
<inherited>false</inherited>
<configuration>
<images>
<inherited>false</inherited>
<configuration>
<images>
@@
-156,18
+157,12
@@
</build>
</image>
</images>
</build>
</image>
</images>
- <verbose>true</verbose>
+ <verbose>${docker.verbose}</verbose>
+ <skipPush>${docker.skip.push}</skipPush>
</configuration>
<executions>
<execution>
</configuration>
<executions>
<execution>
- <id>generate-images</id>
- <phase>package</phase>
- <goals>
- <goal>build</goal>
- </goals>
- </execution>
- <execution>
- <id>push-images</id>
+ <id>build-push-images</id>
<phase>${docker.push.phase}</phase>
<goals>
<goal>build</goal>
<phase>${docker.push.phase}</phase>
<goals>
<goal>build</goal>