Code Review
/
ccsdk
/
distribution.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "DG Update and Templates for ranSlice feature"
[ccsdk/distribution.git]
/
pom.xml
diff --git
a/pom.xml
b/pom.xml
index
8de2428
..
65d7ba9
100644
(file)
--- a/
pom.xml
+++ b/
pom.xml
@@
-5,16
+5,16
@@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.
0.1
</version>
+ <version>2.
1.0
</version>
</parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-root</artifactId>
</parent>
<groupId>org.onap.ccsdk.distribution</groupId>
<artifactId>distribution-root</artifactId>
- <version>1.
0
.1-SNAPSHOT</version>
+ <version>1.
1
.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-distribution</name>
<packaging>pom</packaging>
<name>ccsdk-distribution</name>
- <description>Creates distribut
u
on bundles for CCSDK</description>
+ <description>Creates distribut
i
on bundles for CCSDK</description>
<modules>
<module>platform-logic</module>
<modules>
<module>platform-logic</module>
@@
-31,9
+31,16
@@
<properties>
<application.name>distribution</application.name>
<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>
<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>
<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>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
@@
-83,5
+90,4
@@
</build>
</profile>
</profiles>
</build>
</profile>
</profiles>
-
</project>
</project>