From bbae7a7e35c5ffa7a5a309ad62659663b9205974 Mon Sep 17 00:00:00 2001
From: Pawel Kadlubanski <pawel.kadlubanski@nokia.com>
Date: Wed, 23 May 2018 16:33:20 +0200
Subject: Update in pnfsimulator code.

Correction problem with license.

Issue-ID: INT-458

Change-Id: I961133ff5695b241a8c82c87a0e1aa800e79d6d8
Signed-off-by: Pawel Kadlubanski <pawel.kadlubanski@nokia.com>
---
 test/mocks/pnfsimulator/pom.xml | 276 ++++++++++++++++++++--------------------
 1 file changed, 136 insertions(+), 140 deletions(-)

(limited to 'test/mocks/pnfsimulator/pom.xml')

diff --git a/test/mocks/pnfsimulator/pom.xml b/test/mocks/pnfsimulator/pom.xml
index 1f1f46a04..105cd03cf 100644
--- a/test/mocks/pnfsimulator/pom.xml
+++ b/test/mocks/pnfsimulator/pom.xml
@@ -1,155 +1,151 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <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">
-    <modelVersion>4.0.0</modelVersion>
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>org.onap.oparent</groupId>
-        <artifactId>oparent</artifactId>
-        <version>0.1.1</version>
-    </parent>
+  <groupId>org.onap.pnfsimulator</groupId>
+  <artifactId>pnf-simulator</artifactId>
+  <version>1.0-SNAPSHOT</version>
 
-    <groupId>org.onap.pnfsimulator</groupId>
-    <artifactId>pnf-simulator</artifactId>
-    <version>1.0</version>
-
-    <name>pnf-simulator</name>
+  <name>pnf-simulator</name>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <simulator.main.class>org.onap.pnfsimulator.Main</simulator.main.class>
+        <docker.image.tag>latest</docker.image.tag>
         <dependency.directory.name>libs</dependency.directory.name>
-        <dependency.directory.location>${project.build.directory}/${dependency.directory.name}
-        </dependency.directory.location>
-      </properties>
+        <dependency.directory.location>${project.build.directory}/${dependency.directory.name}</dependency.directory.location>
+    </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-            <version>2.11.0</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>2.6</version>
-        </dependency>
-        <dependency>
-            <groupId>org.json</groupId>
-            <artifactId>json</artifactId>
-            <version>20180130</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.5.5</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>21.0</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
-            <version>1.4</version>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.1.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <version>3.9.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.7</version>
-        </dependency>
-    </dependencies>
+  <dependencies>
+      <dependency>
+          <groupId>org.apache.logging.log4j</groupId>
+          <artifactId>log4j-core</artifactId>
+          <version>2.11.0</version>
+      </dependency>
+      <dependency>
+          <groupId>commons-io</groupId>
+          <artifactId>commons-io</artifactId>
+          <version>2.6</version>
+      </dependency>
+      <dependency>
+          <groupId>org.json</groupId>
+          <artifactId>json</artifactId>
+          <version>20180130</version>
+      </dependency>
+      <dependency>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpclient</artifactId>
+          <version>4.5.5</version>
+      </dependency>
+      <dependency>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+          <version>21.0</version>
+      </dependency>
+      <dependency>
+          <groupId>commons-cli</groupId>
+          <artifactId>commons-cli</artifactId>
+          <version>1.4</version>
+      </dependency>
+      <dependency>
+          <groupId>org.junit.jupiter</groupId>
+          <artifactId>junit-jupiter-engine</artifactId>
+          <version>5.1.1</version>
+          <scope>test</scope>
+      </dependency>
+      <dependency>
+          <groupId>org.assertj</groupId>
+          <artifactId>assertj-core</artifactId>
+          <version>3.9.1</version>
+          <scope>test</scope>
+      </dependency>
+      <dependency>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-lang3</artifactId>
+          <version>3.7</version>
+      </dependency>
+  </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>${maven.compiler.source}</source>
-                    <target>${maven.compiler.target}</target>
-                    <showWarnings>true</showWarnings>
-                    <showDeprecation>true</showDeprecation>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.19</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.junit.platform</groupId>
-                        <artifactId>junit-platform-surefire-provider</artifactId>
-                        <version>1.1.1</version>
-                    </dependency>
-                </dependencies>
-                <configuration>
-                    <detail>true</detail>
-                    <printSummary>true</printSummary>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <configuration>
-                    <outputDirectory>${dependency.directory.location}</outputDirectory>
-                    <includeScope>runtime</includeScope>
-                    <silent>true</silent>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>copy-external-dependencies</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <configuration>
-                    <skipDockerBuild>false</skipDockerBuild>
-                    <imageName>
-                        ${onap.nexus.dockerregistry.daily}/onap/${project.artifactId}
-                    </imageName>
-                    <baseImage>openjdk:8-jdk-alpine</baseImage>
-                    <cmd>java -cp ${dependency.directory.name}/*:${project.build.finalName}.jar ${simulator.main.class}
-                    </cmd>
-                    <resources>
-                        <resource>
-                            <targetPath>${dependency.directory.name}</targetPath>
-                            <directory>${dependency.directory.location}</directory>
-                        </resource>
-                        <resource>
-                            <targetPath>/</targetPath>
-                            <directory>${project.build.directory}</directory>
-                            <include>${project.build.finalName}.jar</include>
-                        </resource>
-                    </resources>
-                    <imageTags>
-                        <imageTag>${project.version}</imageTag>
-                        <imageTag>latest</imageTag>
-                    </imageTags>
-                    <serverId>${onap.nexus.dockerregistry.daily}</serverId>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+  <build>
+      <plugins>
+          <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-compiler-plugin</artifactId>
+              <configuration>
+                  <source>${maven.compiler.source}</source>
+                  <target>${maven.compiler.target}</target>
+                  <showWarnings>true</showWarnings>
+                  <showDeprecation>true</showDeprecation>
+              </configuration>
+          </plugin>
+          <plugin>
+              <artifactId>maven-surefire-plugin</artifactId>
+              <version>2.19</version>
+              <dependencies>
+                  <dependency>
+                      <groupId>org.junit.platform</groupId>
+                      <artifactId>junit-platform-surefire-provider</artifactId>
+                      <version>1.1.1</version>
+                  </dependency>
+              </dependencies>
+              <configuration>
+                  <detail>true</detail>
+                  <printSummary>true</printSummary>
+              </configuration>
+          </plugin>
+          <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-dependency-plugin</artifactId>
+              <configuration>
+                  <outputDirectory>${dependency.directory.location}</outputDirectory>
+                  <includeScope>runtime</includeScope>
+                  <silent>true</silent>
+              </configuration>
+              <executions>
+                  <execution>
+                      <id>copy-external-dependencies</id>
+                      <phase>package</phase>
+                      <goals>
+                          <goal>copy-dependencies</goal>
+                      </goals>
+                  </execution>
+              </executions>
+          </plugin>
+          <plugin>
+              <groupId>com.spotify</groupId>
+              <artifactId>docker-maven-plugin</artifactId>
+              <version>1.0.0</version>
+              <configuration>
+                  <imageName>${project.name}</imageName>
+                  <imageTags>${docker.image.tag}</imageTags>
+                  <baseImage>openjdk:8-jdk-alpine</baseImage>
+                  <cmd>java -cp  ${dependency.directory.name}/*:${project.build.finalName}.jar ${simulator.main.class}</cmd>
+                  <resources>
+                      <resource>
+                          <targetPath>${dependency.directory.name}</targetPath>
+                          <directory>${dependency.directory.location}</directory>
+                      </resource>
+                      <resource>
+                          <targetPath>/</targetPath>
+                          <directory>${project.build.directory}</directory>
+                          <include>${project.build.finalName}.jar</include>
+                      </resource>
+                  </resources>
+              </configuration>
+              <executions>
+                  <execution>
+                      <id>build-image</id>
+                      <phase>package</phase>
+                      <goals>
+                          <goal>build</goal>
+                      </goals>
+                  </execution>
+              </executions>
+          </plugin>
+      </plugins>
+  </build>
 </project>
-- 
cgit 1.2.3-korg


From b2341a5b10c1dd57f19fdeb8fd19ed820dcaa2eb Mon Sep 17 00:00:00 2001
From: Pawel Kadlubanski <pawel.kadlubanski@nokia.com>
Date: Fri, 25 May 2018 15:58:11 +0200
Subject: Correction in pom.

Issue-ID: INT-458

Change-Id: I66d7a6458b38ee5394c6b4f9449223ed29502c3c
Signed-off-by: Pawel Kadlubanski <pawel.kadlubanski@nokia.com>
---
 test/mocks/pnfsimulator/pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'test/mocks/pnfsimulator/pom.xml')

diff --git a/test/mocks/pnfsimulator/pom.xml b/test/mocks/pnfsimulator/pom.xml
index 105cd03cf..040f37023 100644
--- a/test/mocks/pnfsimulator/pom.xml
+++ b/test/mocks/pnfsimulator/pom.xml
@@ -18,6 +18,7 @@
         <docker.image.tag>latest</docker.image.tag>
         <dependency.directory.name>libs</dependency.directory.name>
         <dependency.directory.location>${project.build.directory}/${dependency.directory.name}</dependency.directory.location>
+        <onap.nexus.dockerregistry.daily>nexus3.onap.org:10003</onap.nexus.dockerregistry.daily>
     </properties>
 
   <dependencies>
@@ -120,8 +121,9 @@
               <artifactId>docker-maven-plugin</artifactId>
               <version>1.0.0</version>
               <configuration>
-                  <imageName>${project.name}</imageName>
+                  <imageName>${onap.nexus.dockerregistry.daily}/onap/${project.artifactId}</imageName>
                   <imageTags>${docker.image.tag}</imageTags>
+                  <serverId>${onap.nexus.dockerregistry.daily}</serverId>
                   <baseImage>openjdk:8-jdk-alpine</baseImage>
                   <cmd>java -cp  ${dependency.directory.name}/*:${project.build.finalName}.jar ${simulator.main.class}</cmd>
                   <resources>
-- 
cgit 1.2.3-korg


From d77cb63fe253a8f9335764aeecf971348c894728 Mon Sep 17 00:00:00 2001
From: Pawel Kadlubanski <pawel.kadlubanski@nokia.com>
Date: Thu, 7 Jun 2018 15:48:38 +0200
Subject: Changing docker image tag

Issue-ID: INT-458

Change-Id: Iffde91aa44e76ebbb76bc03c570a3a4298f76278
Signed-off-by: Pawel Kadlubanski <pawel.kadlubanski@nokia.com>
---
 test/mocks/pnfsimulator/pom.xml      | 4 ++--
 test/mocks/pnfsimulator/simulator.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'test/mocks/pnfsimulator/pom.xml')

diff --git a/test/mocks/pnfsimulator/pom.xml b/test/mocks/pnfsimulator/pom.xml
index 040f37023..2fee83622 100644
--- a/test/mocks/pnfsimulator/pom.xml
+++ b/test/mocks/pnfsimulator/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>org.onap.pnfsimulator</groupId>
   <artifactId>pnf-simulator</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
 
   <name>pnf-simulator</name>
 
@@ -15,7 +15,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <simulator.main.class>org.onap.pnfsimulator.Main</simulator.main.class>
-        <docker.image.tag>latest</docker.image.tag>
+        <docker.image.tag>${project.version}-latest</docker.image.tag>
         <dependency.directory.name>libs</dependency.directory.name>
         <dependency.directory.location>${project.build.directory}/${dependency.directory.name}</dependency.directory.location>
         <onap.nexus.dockerregistry.daily>nexus3.onap.org:10003</onap.nexus.dockerregistry.daily>
diff --git a/test/mocks/pnfsimulator/simulator.sh b/test/mocks/pnfsimulator/simulator.sh
index 5e8b2d5ac..d1185565f 100755
--- a/test/mocks/pnfsimulator/simulator.sh
+++ b/test/mocks/pnfsimulator/simulator.sh
@@ -5,7 +5,7 @@ set -euo pipefail
 CONTAINER_NAME=pnf-simulator
 CONFIG_FILE_PATH=/config/body.json
 SIMULATOR_DOCKER_HUB=nexus3.onap.org:10003/onap
-SIMULATOR_TAG=latest
+SIMULATOR_TAG=1.0.0-SNAPSHOT-latest
 
 function main(){
 
-- 
cgit 1.2.3-korg