X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=rulemgt-standalone%2Fpom.xml;h=81f0babf08201e470852fb5c62d1066ed44e4825;hb=5bdc1954c173c390e7e620f2a99902101fbd021e;hp=2b9ea50931186261ae640097de8dd2a8fdd2cd75;hpb=d165bd9397c9de0d16c5dc580306d6e63e1e1d60;p=holmes%2Frule-management.git

diff --git a/rulemgt-standalone/pom.xml b/rulemgt-standalone/pom.xml
index 2b9ea50..81f0bab 100644
--- a/rulemgt-standalone/pom.xml
+++ b/rulemgt-standalone/pom.xml
@@ -17,12 +17,12 @@
 
 -->
 <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>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>holmes-rulemgt-standalone</artifactId>
@@ -31,8 +31,8 @@
     <packaging>pom</packaging>
 
     <properties>
-	<holmes.rule.project.version>${project.version}</holmes.rule.project.version>
-	<maven.build.timestamp.format>yyMMdd-HHmmss</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>
 
@@ -69,23 +69,6 @@
                             <overwrite>true</overwrite>
                         </configuration>
                     </execution>
-                    <execution>
-                        <id>copy-lib-${linux64id}</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${linux64outputdir}/lib</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>${project.parent.basedir}/rulemgt/target/lib</directory>
-                                    <filtering>false</filtering>
-                                </resource>
-                            </resources>
-                            <overwrite>true</overwrite>
-                        </configuration>
-                    </execution>
                     <execution>
                         <id>copy-resources-${win64id}</id>
                         <phase>process-resources</phase>
@@ -115,24 +98,27 @@
                         </configuration>
                     </execution>
                     <execution>
-                        <id>copy-lib-${win64id}</id>
+                        <id>copy-dockerfile</id>
                         <phase>process-resources</phase>
                         <goals>
                             <goal>copy-resources</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>${win64outputdir}/lib</outputDirectory>
+                            <outputDirectory>target/version</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>${project.parent.basedir}/rulemgt/target/lib</directory>
+                                    <directory>src/main/assembly/</directory>
                                     <filtering>false</filtering>
+                                    <includes>
+                                        <include>Dockerfile</include>
+                                    </includes>
                                 </resource>
                             </resources>
                             <overwrite>true</overwrite>
                         </configuration>
                     </execution>
                     <execution>
-                        <id>copy-dockerfile</id>
+                        <id>copy-nginx-conf-file</id>
                         <phase>process-resources</phase>
                         <goals>
                             <goal>copy-resources</goal>
@@ -144,7 +130,7 @@
                                     <directory>src/main/assembly/</directory>
                                     <filtering>false</filtering>
                                     <includes>
-                                        <include>Dockerfile</include>
+                                        <include>nginx.conf</include>
                                     </includes>
                                 </resource>
                             </resources>
@@ -158,7 +144,7 @@
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>copy-jar-${linux64id}</id>
+                        <id>copy-artifacts-${linux64id}</id>
                         <goals>
                             <goal>copy</goal>
                         </goals>
@@ -173,11 +159,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>
@@ -192,6 +186,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>
@@ -244,14 +246,15 @@
                             <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";
+                                project.properties['project.docker.latesttag.version.with.timestamp'] = versionArray[0] + "-STAGING-${build.number}";
 
                                 println 'New Tag for docker:' +
-                                project.properties['project.docker.latesttag.version'];
+                                        project.properties['project.docker.latesttag.version'];
                             </source>
                         </configuration>
                     </execution>
@@ -279,9 +282,10 @@
                                         <dockerFileDir>${basedir}/target/version/</dockerFileDir>
                                         <dockerFile>${basedir}/target/version/Dockerfile</dockerFile>
                                         <tags>
-	                                    <tag>${project.version}</tag>
-                                            <tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
+                                            <tag>${project.version}</tag>
+                                            <tag>${project.version}-${build.number}</tag>
                                             <tag>${project.docker.latesttag.version}</tag>
+                                            <tag>${project.docker.latesttag.version.with.timestamp}</tag>
                                         </tags>
                                     </build>
                                 </image>
@@ -317,5 +321,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>