mso-cnf-adapter changes for docker tag name

Issue-ID: SO-3518

Signed-off-by: mukesh.paliwal <mukesh.paliwal1@huawei.com>
Change-Id: I7a89e5b5f22cf7562b6a47dc41d4efdd1f2d647c

1 files changed, 102 insertions, 231 deletions

diff --git a/pom.xml b/pom.xml
index c1250f4..7d7848e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,234 +1,105 @@
-<!--
-  ~*
-  ~============LICENSE_START=======================================================
-  ~* ONAP - SO
-  ~*================================================================================
-  ~* Copyright (C) 2020 Huawei Technologies Co., Ltd. All rights reserved.
-  ~*================================================================================
-  ~* Licensed under the Apache License, Version 2.0 (the "License");
-  ~* you may not use this file except in compliance with the License.
-  ~* You may obtain a copy of the License at
-  ~*
-  ~*      http://www.apache.org/licenses/LICENSE-2.0
-  ~*
-  ~* Unless required by applicable law or agreed to in writing, software
-  ~* distributed under the License is distributed on an "AS IS" BASIS,
-  ~* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~* See the License for the specific language governing permissions and
-  ~* limitations under the License.
-  ~* ============LICENSE_END=========================================================
-  ~*/
-  -->
-
 <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>
-  <parent>
-    <groupId>org.onap.so</groupId>
-    <artifactId>so</artifactId>
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.onap.so</groupId>
+        <artifactId>so</artifactId>
+        <version>1.8.0-SNAPSHOT</version>
+    </parent>
+    <groupId>org.onap.so.adapters.so-cnf-adapter</groupId>
+    <artifactId>so-cnf-adapter</artifactId>
     <version>1.8.0-SNAPSHOT</version>
-  </parent>
-  <!-- <groupId>org.onap.so.adapters</groupId -->
-  <artifactId>so-cnf-adapter</artifactId>
-  <packaging>jar</packaging>
-  <name>so-cnf-adapter</name>
-  <description>Web service endpoint for cnf operations</description>
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-dependencies</artifactId>
-        <version>${springboot.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  <build>
-    <finalName>${project.artifactId}-${project.version}</finalName>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-            <skip>true</skip>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-maven-plugin</artifactId>
-        <configuration>
-          <mainClass>org.onap.so.adapters.cnf.MSOCnfApplication</mainClass>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>repackage</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.jacoco</groupId>
-        <artifactId>jacoco-maven-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>net.revelc.code.formatter</groupId>
-        <artifactId>formatter-maven-plugin</artifactId>
-        <version>2.9.0</version>
-        <executions>
-          <execution>
-            <id>format-java</id>
-            <goals>
-              <goal>format</goal>
-            </goals>
-            <phase>process-sources</phase>
-            <configuration>
-              <skip>${format.skipExecute}</skip>
-              <configFile>${project.basedir}/onap-eclipse-format.xml</configFile>
-            </configuration>
-          </execution>
-          <execution>
-            <id>format-xml</id>
-            <goals>
-              <goal>format</goal>
-            </goals>
-            <phase>process-sources</phase>
-            <configuration>
-              <skip>${format.skipExecute}</skip>
-              <sourceDirectory>${project.basedir}</sourceDirectory>
-              <configXmlFile>${project.basedir}/pom-format.properties</configXmlFile>
-              <includes>
-                <include>pom.xml</include>
-              </includes>
-            </configuration>
-          </execution>
-          <execution>
-            <id>validate-java</id>
-            <goals>
-              <goal>validate</goal>
-            </goals>
-            <configuration>
-              <skip>${format.skipValidate}</skip>
-              <configFile>${project.basedir}/onap-eclipse-format.xml</configFile>
-            </configuration>
-          </execution>
-          <execution>
-            <id>validate-poms</id>
-            <goals>
-              <goal>validate</goal>
-            </goals>
-            <configuration>
-              <skip>${format.skipValidate}</skip>
-              <configFile>${project.basedir}/pom-format.properties</configFile>
-              <includes>
-                <include>pom.xml</include>
-              </includes>
-            </configuration>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <version>2.9.8</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>docker-build</id>
-            <phase>install</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-            <configuration>
-              <dockerFile>Dockerfile</dockerFile>
-              <executable>docker</executable>
-              <workingDirectory>${project.basedir}</workingDirectory>
-              <arguments>
-                <argument>build</argument>
-                <argument>-t</argument>
-                <argument>${project.artifactId}:${project.version}</argument>
-                <argument>.</argument>
-              </arguments>
-              <buildArgs>
-                <JAR_FILE>${project.artifactId}-${project.version}.jar</JAR_FILE>
-                <ARTIFACT_ID>${project.artifactId}</ARTIFACT_ID>
-              </buildArgs>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-actuator</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-web</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-jdbc</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.tomcat</groupId>
-          <artifactId>tomcat-jdbc</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cxf</groupId>
-      <artifactId>cxf-spring-boot-starter-jaxws</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cxf</groupId>
-      <artifactId>cxf-spring-boot-starter-jaxrs</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpmime</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-data-jpa</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpcore</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.cloud</groupId>
-      <artifactId>spring-cloud-contract-wiremock</artifactId>
-      <version>1.2.4.RELEASE</version>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.so</groupId>
-      <artifactId>aai-client</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.xml.ws</groupId>
-      <artifactId>jaxws-ri</artifactId>
-      <version>2.3.0</version>
-      <type>pom</type>
-    </dependency>
-  </dependencies>
-</project>
+    <name>SO CNF Adapter</name>
+    <packaging>pom</packaging>
+    
+    <properties>
+        <java.version>11</java.version>
+        <version.java.compiler>11</version.java.compiler>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <version-swagger-codegen>2.3.1</version-swagger-codegen>
+        <gson-fire-version>1.8.2</gson-fire-version>
+        <retrofit-version>2.7.2</retrofit-version>
+        <threetenbp-version>1.3.5</threetenbp-version>
+        <oltu-version>1.0.1</oltu-version>
+        <swagger-core-version>1.5.21</swagger-core-version>
+        <okhttp3-version>3.14.0</okhttp3-version>
+        <okhttp-version>2.7.5</okhttp-version>
+        <okio-version>1.13.0</okio-version>
+        <spring-security-oauth2-version>2.3.6.RELEASE</spring-security-oauth2-version>
+        <jaxb-api>2.3.0</jaxb-api>
+        <snakeyaml-version>0.11</snakeyaml-version>
+        <hamcrest-version>2.2</hamcrest-version>
+        <equalsverifier-version>3.4.1</equalsverifier-version>
+        <so-core-version>1.8.0-SNAPSHOT</so-core-version>
+    </properties>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>${version.java.compiler}</source>
+                    <target>${version.java.compiler}</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>net.revelc.code.formatter</groupId>
+                <artifactId>formatter-maven-plugin</artifactId>
+                <version>2.9.0</version>
+                <executions>
+                    <execution>
+                        <id>format-java</id>
+                        <goals>
+                            <goal>format</goal>
+                        </goals>
+                        <phase>process-sources</phase>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>format-xml</id>
+                        <goals>
+                            <goal>format</goal>
+                        </goals>
+                        <phase>process-sources</phase>
+                        <configuration>
+                            <skip>true</skip>
+                            <includes>
+                                <include>pom.xml</include>
+                            </includes>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>validate-java</id>
+                        <goals>
+                            <goal>validate</goal>
+                        </goals>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>validate-poms</id>
+                        <goals>
+                            <goal>validate</goal>
+                        </goals>
+                        <configuration>
+                            <skip>true</skip>
+                            <includes>
+                                <include>pom.xml</include>
+                            </includes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <modules>
+        <module>so-cnf-adapter-application</module>
+        <module>packages</module>
+    </modules>
+</project>