Merge "Pin jnr-unixsocket for Docker plugin to 0.13"

[aai/esr-server.git] / standalone / pom.xml

diff --git a/standalone/pom.xml b/standalone/pom.xml
index 2736e71..9bffe50 100644 (file)
--- a/standalone/pom.xml
+++ b/standalone/pom.xml
@@ -20,7 +20,7 @@
     <parent>
                <groupId>org.onap.aai.esr-server</groupId>
                <artifactId>aai-esr-server</artifactId>
-               <version>1.0.0-SNAPSHOT</version>
+               <version>1.1.0-SNAPSHOT</version>
        </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -36,7 +36,7 @@
         <win64outputdir>target/assembly/${win64id}</win64outputdir>
         <version.output>target/version</version.output>
                <aai.esr.server.project.version>${project.version}</aai.esr.server.project.version>
-               <maven.build.timestamp.format>yyMMdd-HHmmss</maven.build.timestamp.format>
+               <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
        </properties>
     <build>
         <plugins>
@@ -225,6 +225,13 @@
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
                         <version>0.16.5</version>
+                        <dependencies>
+                            <dependency>
+                                <groupId>com.github.jnr</groupId>
+                                <artifactId>jnr-unixsocket</artifactId>
+                                <version>0.13</version>
+                            </dependency>
+                        </dependencies>
                         <inherited>false</inherited>
                         <configuration>
                             <images>
@@ -236,7 +243,7 @@
                                         <dockerFile>${basedir}/target/version/Dockerfile</dockerFile>
                                         <tags>
                                             <tag>${project.version}</tag>
-                                            <tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
+                                            <tag>${project.version}-${maven.build.timestamp}</tag>
                                             <tag>${project.docker.latesttag.version}</tag>
                                         </tags>
                                     </build>