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

diff --git a/rulemgt-standalone/pom.xml b/rulemgt-standalone/pom.xml
index 2b9ea50..95a0c03 100644
--- a/rulemgt-standalone/pom.xml
+++ b/rulemgt-standalone/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-    Copyright 2017 ZTE Corporation.
+    Copyright 2017-2020 ZTE Corporation.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -16,13 +16,14 @@
     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">
+         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.7-SNAPSHOT</version>
     </parent>
 
     <artifactId>holmes-rulemgt-standalone</artifactId>
@@ -31,13 +32,44 @@
     <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>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.holmes.rule-management</groupId>
+            <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>
+
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <outputDirectory>${linux64outputdir}/lib</outputDirectory>
+                    <includeScope>runtime</includeScope>
+                </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
                 <executions>
@@ -58,7 +90,6 @@
                                     </includes>
                                     <excludes>
                                         <exclude>**/*.bat</exclude>
-                                        <exclude>Dockerfile</exclude>
                                     </excludes>
                                 </resource>
                                 <resource>
@@ -70,69 +101,27 @@
                         </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>
+                        <id>copy-dockerfile</id>
                         <phase>process-resources</phase>
                         <goals>
                             <goal>copy-resources</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>${win64outputdir}</outputDirectory>
+                            <outputDirectory>target/version</outputDirectory>
                             <resources>
                                 <resource>
                                     <directory>src/main/assembly/</directory>
                                     <filtering>false</filtering>
                                     <includes>
-                                        <include>**/*</include>
+                                        <include>Dockerfile</include>
                                     </includes>
-                                    <excludes>
-                                        <exclude>**/*.sh</exclude>
-                                        <exclude>Dockerfile</exclude>
-                                    </excludes>
-                                </resource>
-                                <resource>
-                                    <directory>../rulemgt/src/main/resources</directory>
-                                    <filtering>false</filtering>
-                                </resource>
-                            </resources>
-                            <overwrite>true</overwrite>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-lib-${win64id}</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${win64outputdir}/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-dockerfile</id>
+                        <id>copy-nginx-conf-file</id>
                         <phase>process-resources</phase>
                         <goals>
                             <goal>copy-resources</goal>
@@ -144,7 +133,9 @@
                                     <directory>src/main/assembly/</directory>
                                     <filtering>false</filtering>
                                     <includes>
-                                        <include>Dockerfile</include>
+                                        <include>nginx-*.conf</include>
+                                        <include>**/holmes-frontend*.*</include>
+                                        <include>**/*.pem</include>
                                     </includes>
                                 </resource>
                             </resources>
@@ -158,7 +149,7 @@
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>copy-jar-${linux64id}</id>
+                        <id>copy-artifacts-${linux64id}</id>
                         <goals>
                             <goal>copy</goal>
                         </goals>
@@ -167,30 +158,11 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>org.onap.holmes.rule-management</groupId>
-                                    <artifactId>holmes-rulemgt</artifactId>
-                                    <type>jar</type>
+                                    <artifactId>holmes-rulemgt-frontend</artifactId>
+                                    <type>tar.gz</type>
                                     <overWrite>true</overWrite>
-                                    <outputDirectory>${linux64outputdir}</outputDirectory>
-                                    <destFileName>holmes-rulemgt.jar</destFileName>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-jar-${win64id}</id>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <phase>prepare-package</phase>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.onap.holmes.rule-management</groupId>
-                                    <artifactId>holmes-rulemgt</artifactId>
-                                    <type>jar</type>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>${win64outputdir}</outputDirectory>
-                                    <destFileName>holmes-rulemgt.jar</destFileName>
+                                    <outputDirectory>target/version</outputDirectory>
+                                    <destFileName>holmes-rulemgt-frontend-${project.version}.tar.gz</destFileName>
                                 </artifactItem>
                             </artifactItems>
                         </configuration>
@@ -215,25 +187,11 @@
                             <goal>attached</goal>
                         </goals>
                     </execution>
-                    <execution>
-                        <id>win64</id>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>win64-assembly.xml</descriptor>
-                            </descriptors>
-                            <appendAssemblyId>true</appendAssemblyId>
-                            <outputDirectory>target/version</outputDirectory>
-                        </configuration>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attached</goal>
-                        </goals>
-                    </execution>
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.groovy.maven</groupId>
-                <artifactId>gmaven-plugin</artifactId>
+                <groupId>org.codehaus.gmaven</groupId>
+                <artifactId>groovy-maven-plugin</artifactId>
                 <executions>
                     <execution>
                         <phase>validate</phase>
@@ -244,14 +202,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 +238,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>
@@ -310,12 +270,4 @@
             </build>
         </profile>
     </profiles>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.onap.holmes.rule-management</groupId>
-            <artifactId>holmes-rulemgt</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
 </project>