From: Li Zi <li.zi30@zte.com.cn>
Date: Fri, 29 Jun 2018 08:02:43 +0000 (+0000)
Subject: Merge "Pin jnr-unixsocket for Docker plugin to 0.13"
X-Git-Tag: 1.2.1~18
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=6f31082c9081f9e453b7e279f9591cc11eeb9d92;hp=-c;p=aai%2Fesr-server.git

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

6f31082c9081f9e453b7e279f9591cc11eeb9d92
diff --combined standalone/pom.xml
index f960369,47e85ec..9bffe50
--- a/standalone/pom.xml
+++ b/standalone/pom.xml
@@@ -225,6 -225,13 +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 +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>