summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortang peng <tang.peng5@zte.com.cn>2018-07-21 07:04:02 +0000
committerGerrit Code Review <gerrit@onap.org>2018-07-21 07:04:02 +0000
commitef042aed45323c47bff694e2980f857a7658b31c (patch)
tree3db7aa717fed2276b09f7a3debe88c71db9cdbe2
parent1283f95fd9a01b875167725982c19aece10acf5b (diff)
parenta966da9a6108017711152fc69725397c8779fd08 (diff)
Merge "Add the frontend into the final package"
-rw-r--r--rulemgt-standalone/pom.xml42
1 files changed, 32 insertions, 10 deletions
diff --git a/rulemgt-standalone/pom.xml b/rulemgt-standalone/pom.xml
index ef8b295..6fc8a98 100644
--- a/rulemgt-standalone/pom.xml
+++ b/rulemgt-standalone/pom.xml
@@ -17,8 +17,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">
+ 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">
<parent>
<groupId>org.onap.holmes.rule-management</groupId>
<artifactId>holmes-rulemgt-parent</artifactId>
@@ -31,8 +31,8 @@
<packaging>pom</packaging>
<properties>
- <holmes.rule.project.version>${project.version}</holmes.rule.project.version>
- <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+ <holmes.rule.project.version>${project.version}</holmes.rule.project.version>
+ <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
<build.number>${maven.build.timestamp}</build.number>
</properties>
@@ -124,7 +124,7 @@
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>copy-jar-${linux64id}</id>
+ <id>copy-artifacts-${linux64id}</id>
<goals>
<goal>copy</goal>
</goals>
@@ -139,11 +139,19 @@
<outputDirectory>${linux64outputdir}</outputDirectory>
<destFileName>holmes-rulemgt.jar</destFileName>
</artifactItem>
+ <artifactItem>
+ <groupId>org.onap.holmes.rule-management</groupId>
+ <artifactId>holmes-rulemgt-frontend</artifactId>
+ <type>tar.gz</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/version</outputDirectory>
+ <destFileName>holmes-rulemgt-frontend-${project.version}.tar.gz</destFileName>
+ </artifactItem>
</artifactItems>
</configuration>
</execution>
<execution>
- <id>copy-jar-${win64id}</id>
+ <id>copy-artifacts-${win64id}</id>
<goals>
<goal>copy</goal>
</goals>
@@ -158,6 +166,14 @@
<outputDirectory>${win64outputdir}</outputDirectory>
<destFileName>holmes-rulemgt.jar</destFileName>
</artifactItem>
+ <artifactItem>
+ <groupId>org.onap.holmes.rule-management</groupId>
+ <artifactId>holmes-rulemgt-frontend</artifactId>
+ <type>tar.gz</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/version</outputDirectory>
+ <destFileName>holmes-rulemgt-frontend-${project.version}.tar.gz</destFileName>
+ </artifactItem>
</artifactItems>
</configuration>
</execution>
@@ -210,14 +226,14 @@
<source>
println project.properties['holmes.rule.project.version'];
def versionArray;
- if ( project.properties['holmes.rule.project.version'] != null ) {
+ if (project.properties['holmes.rule.project.version'] != null) {
versionArray = project.properties['holmes.rule.project.version'].split('-');
}
- project.properties['project.docker.latesttag.version']=versionArray[0] + "-STAGING-latest";
+ project.properties['project.docker.latesttag.version'] = versionArray[0] + "-STAGING-latest";
println 'New Tag for docker:' +
- project.properties['project.docker.latesttag.version'];
+ project.properties['project.docker.latesttag.version'];
</source>
</configuration>
</execution>
@@ -245,7 +261,7 @@
<dockerFileDir>${basedir}/target/version/</dockerFileDir>
<dockerFile>${basedir}/target/version/Dockerfile</dockerFile>
<tags>
- <tag>${project.version}</tag>
+ <tag>${project.version}</tag>
<tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
<tag>${project.docker.latesttag.version}</tag>
</tags>
@@ -283,5 +299,11 @@
<artifactId>holmes-rulemgt</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.onap.holmes.rule-management</groupId>
+ <artifactId>holmes-rulemgt-frontend</artifactId>
+ <version>${project.version}</version>
+ <type>tar.gz</type>
+ </dependency>
</dependencies>
</project>