Code Review
/
sdnc
/
oam.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update to release version parent 1.0.3
[sdnc/oam.git]
/
installation
/
admportal
/
pom.xml
diff --git
a/installation/admportal/pom.xml
b/installation/admportal/pom.xml
index
16ac1c9
..
1506812
100644
(file)
--- a/
installation/admportal/pom.xml
+++ b/
installation/admportal/pom.xml
@@
-3,23
+3,24
@@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>org.o
penecomp.sdnc.oam
</groupId>
- <artifactId>
installation
</artifactId>
- <version>1.
1.0-SNAPSHOT
</version>
+ <groupId>org.o
nap.ccsdk.parent
</groupId>
+ <artifactId>
odlparent-lite
</artifactId>
+ <version>1.
0.3
</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
- <groupId>org.o
penecom
p.sdnc.oam</groupId>
+ <groupId>org.o
na
p.sdnc.oam</groupId>
<artifactId>installation-admportal</artifactId>
<artifactId>installation-admportal</artifactId>
- <version>1.
1.0
-SNAPSHOT</version>
+ <version>1.
3.2
-SNAPSHOT</version>
- <name>
Installation - admportal
</name>
+ <name>
sdnc-oam :: installation :: ${project.artifactId}
</name>
<description>Creates admportal Docker container</description>
<properties>
<description>Creates admportal Docker container</description>
<properties>
- <image.name>o
penecom
p/admportal-sdnc-image</image.name>
+ <image.name>o
na
p/admportal-sdnc-image</image.name>
<sdnc.project.version>${project.version}</sdnc.project.version>
<sdnc.project.version>${project.version}</sdnc.project.version>
+ <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
</properties>
</properties>
@@
-45,7
+46,7
@@
}
if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) {
}
if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) {
- project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-S
NAPSHOT
-latest";
+ project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-S
TAGING
-latest";
} else {
project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
}
} else {
project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
}
@@
-130,7
+131,7
@@
</goals><!-- here the phase you need -->
<phase>validate</phase>
<configuration>
</goals><!-- here the phase you need -->
<phase>validate</phase>
<configuration>
- <outputDirectory>${basedir}/target/docker-stage/opt/o
penecom
p/sdnc/data/properties</outputDirectory>
+ <outputDirectory>${basedir}/target/docker-stage/opt/o
na
p/sdnc/data/properties</outputDirectory>
<resources>
<resource>
<directory>../src/main/properties</directory>
<resources>
<resource>
<directory>../src/main/properties</directory>
@@
-160,7
+161,7
@@
<executable>/usr/bin/unzip</executable>
<arguments>
<argument>-d</argument>
<executable>/usr/bin/unzip</executable>
<arguments>
<argument>-d</argument>
- <argument>${basedir}/target/docker-stage/opt/o
penecom
p/sdnc</argument>
+ <argument>${basedir}/target/docker-stage/opt/o
na
p/sdnc</argument>
<argument>../../admportal/target/*.zip</argument>
</arguments>
</configuration>
<argument>../../admportal/target/*.zip</argument>
</arguments>
</configuration>
@@
-176,7
+177,7
@@
<executable>/bin/cp</executable>
<arguments>
<argument>../../admportal/config/admportal.json</argument>
<executable>/bin/cp</executable>
<arguments>
<argument>../../admportal/config/admportal.json</argument>
- <argument>${basedir}/target/docker-stage/opt/o
penecom
p/sdnc/data/properties</argument>
+ <argument>${basedir}/target/docker-stage/opt/o
na
p/sdnc/data/properties</argument>
</arguments>
</configuration>
</execution>
</arguments>
</configuration>
</execution>
@@
-191,7
+192,7
@@
<executable>/bin/cp</executable>
<arguments>
<argument>../../admportal/config/admportal.log4js.json</argument>
<executable>/bin/cp</executable>
<arguments>
<argument>../../admportal/config/admportal.log4js.json</argument>
- <argument>${basedir}/target/docker-stage/opt/o
penecom
p/sdnc/data/properties</argument>
+ <argument>${basedir}/target/docker-stage/opt/o
na
p/sdnc/data/properties</argument>
</arguments>
</configuration>
</execution>
</arguments>
</configuration>
</execution>
@@
-206,7
+207,7
@@
<configuration>
<executable>/usr/bin/find</executable>
<arguments>
<configuration>
<executable>/usr/bin/find</executable>
<arguments>
- <argument>${basedir}/target/docker-stage/opt/o
penecom
p/sdnc</argument>
+ <argument>${basedir}/target/docker-stage/opt/o
na
p/sdnc</argument>
<argument>-name</argument>
<argument>*.sh</argument>
<argument>-exec</argument>
<argument>-name</argument>
<argument>*.sh</argument>
<argument>-exec</argument>