X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=rulemgt-standalone%2Fpom.xml;h=54901dcece8c4c4afc5424a2eebe591aae2ecca7;hb=496873842a2d3b15ce14fa91ce3358f2f07ecea6;hp=36e5bee8bdc97a055de94fa5076d0f241416dc0c;hpb=3199971f253c7b8af53104e0c18122b6312701ce;p=holmes%2Frule-management.git

diff --git a/rulemgt-standalone/pom.xml b/rulemgt-standalone/pom.xml
index 36e5bee..54901dc 100644
--- a/rulemgt-standalone/pom.xml
+++ b/rulemgt-standalone/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.holmes.rule-management</groupId>
         <artifactId>holmes-rulemgt-parent</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.7-SNAPSHOT</version>
     </parent>
 
     <artifactId>holmes-rulemgt-standalone</artifactId>
@@ -130,7 +130,9 @@
                                     <directory>src/main/assembly/</directory>
                                     <filtering>false</filtering>
                                     <includes>
-                                        <include>nginx.conf</include>
+                                        <include>nginx-*.conf</include>
+                                        <include>**/holmes-frontend*.*</include>
+                                        <include>**/*.pem</include>
                                     </includes>
                                 </resource>
                             </resources>
@@ -251,6 +253,7 @@
                                 }
 
                                 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'];
@@ -282,8 +285,9 @@
                                         <dockerFile>${basedir}/target/version/Dockerfile</dockerFile>
                                         <tags>
                                             <tag>${project.version}</tag>
-                                            <tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
+                                            <tag>${project.version}-${build.number}</tag>
                                             <tag>${project.docker.latesttag.version}</tag>
+                                            <tag>${project.docker.latesttag.version.with.timestamp}</tag>
                                         </tags>
                                     </build>
                                 </image>
@@ -318,6 +322,36 @@
             <groupId>org.onap.holmes.rule-management</groupId>
             <artifactId>holmes-rulemgt</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>ch.qos.logback</groupId>
+                    <artifactId>logback</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.hibernate</groupId>
+                    <artifactId>hibernate-validator</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-http</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-util</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-server</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-servlet</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.onap.holmes.rule-management</groupId>