Merge "Use new container push registry variable in pom"
authorparichay gupta <pg0057291@techmahindra.com>
Mon, 19 Aug 2019 18:41:57 +0000 (18:41 +0000)
committerGerrit Code Review <gerrit@acumos.org>
Mon, 19 Aug 2019 18:41:57 +0000 (18:41 +0000)
1  2 
elk-client/pom.xml

diff --combined elk-client/pom.xml
@@@ -16,7 -16,7 +16,7 @@@
  
        <groupId>org.acumos.elk-client</groupId>
        <artifactId>elk-client</artifactId>
 -      <version>2.2.4-SNAPSHOT</version>
 +      <version>3.0.0-SNAPSHOT</version>
        <packaging>jar</packaging>
  
        <name>elk-client</name>
@@@ -44,6 -44,7 +44,6 @@@
                <json.simple.version>1.1.1</json.simple.version>
                <elasticsearch.version>6.5.4</elasticsearch.version>
                <elasticsearch.client.version>6.5.4</elasticsearch.client.version>
 -
                <!-- tests still depend on Azure host -->
                <skipTests>false</skipTests>
                <!-- Jenkins invokes mvn with argument -Dbuild.number=${BUILD_NUMBER} -->
@@@ -51,7 -52,7 +51,7 @@@
                <!-- Not supplied to all jobs; e.g., Javadoc -->
                <docker.pull.registry>nexus3.acumos.org:10001</docker.pull.registry>
                <!--Supplied by Jenkins -->
-               <docker.push.registry>${env.NEXUS3_PUSH_REGISTRY}</docker.push.registry>
+               <docker.push.registry>${env.CONTAINER_PUSH_REGISTRY}</docker.push.registry>
  
        </properties>
  
                        <plugin>
                                <groupId>io.fabric8</groupId>
                                <artifactId>docker-maven-plugin</artifactId>
 -                              <version>0.23.0</version>
 +                              <version>0.30.0</version>
                                <configuration>
                                        <verbose>true</verbose>
                                        <!-- docker runs on the LF build minion so the default value is ok -->
                                                                <assembly>
                                                                        <inline>
                                                                                <files>
 +                                                                                  <file>
 +                                                                                              <source>script/archive_script.sh</source>
 +                                                                                              <outputDirectory />
 +                                                                                              <destName>es_archive_script/archive_script.sh</destName>
 +                                                                                      </file>
                                                                                        <file>
                                                                                                <source>target/${project.artifactId}-${project.version}.${project.packaging}</source>
                                                                                                <outputDirectory />