Merge "Cleaned repo after work with CI"

4 files changed, 46 insertions, 34 deletions

diff --git a/certService/Dockerfile b/certService/Dockerfile
index ff8a4224..4bb1bf6e 100644
--- a/certService/Dockerfile
+++ b/certService/Dockerfile
@@ -1,6 +1,6 @@
 FROM docker.io/openjdk:11-jre-slim
 
-ARG VERSION=${project.version}
+ARG VERSION=${version}
 
 RUN groupadd certService && useradd -g certService certService
 
diff --git a/certService/README.md b/certService/README.md
index 843e4a90..e3e05fdc 100644
--- a/certService/README.md
+++ b/certService/README.md
@@ -1,5 +1,11 @@
 # Cert service
 
+### General description
+More information about the project and all its functionalities you can find under the wiki page: 
+    ```
+    https://wiki.onap.org/display/DW/AAF+Certification+Service
+    ``` 
+
 ### For developers
     * AAF Cert Service Api is a Spring Boot application
     * Code style
@@ -20,9 +26,9 @@
     ```
     
 ### Building Docker image manually
+Go to the certService subfolder and execute following statement (1.0.0-SNAPSHOT is related to a current project.version parameter):
     ```
-    docker build -t aaf-certservice-api .
-
+    docker build --build-arg VERSION=1.0.0-SNAPSHOT -t onap/org.onap.aaf.certservice.aaf-certservice-api .
     ```
     
 ### Install the package into the local repository
@@ -39,7 +45,7 @@
 
 ### Running Docker container
     ```
-    docker run -p 8080:8080 --name aaf-certservice-api onap/aaf-certservice-api
+    docker run -p 8080:8080 --name aaf-certservice-api onap/org.onap.aaf.certservice.aaf-certservice-api
 
     ```
 
@@ -102,6 +108,12 @@ audit.log  error.log  trace.log
      ```
         https://nexus.onap.org/content/repositories/snapshots/org/onap/aaf/certservice/
     ```
+        
+ ### Docker artifacts
+ All docker images are hosted under nexus3 uri:
+     ```
+        https://nexus3.onap.org/repository/docker.snapshot/v2/onap/org.onap.aaf.certservice.aaf-certservice-api/
+    ```
 
 ### RestAPI
 API is described by Swagger ( OpenAPI 3.0 ) on endpoint /docs 
diff --git a/certService/pom.xml b/certService/pom.xml
index 6ee630ac..3f17f390 100644
--- a/certService/pom.xml
+++ b/certService/pom.xml
@@ -26,35 +26,6 @@
     <description>AAF Certification Service Api</description>
     <packaging>jar</packaging>
 
-    <properties>
-        <java.version>11</java.version>
-        <assertj-core.version>3.11.1</assertj-core.version>
-        <mockito-core.version>3.2.4</mockito-core.version>
-        <spring-core.version>5.2.3.RELEASE</spring-core.version>
-        <spring-boot-starter.version>2.2.4.RELEASE</spring-boot-starter.version>
-        <maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>
-        <maven-surefire-plugin.version>3.0.0-M1</maven-surefire-plugin.version>
-        <spring-boot-starter-actuator.version>2.2.4.RELEASE</spring-boot-starter-actuator.version>
-        <spring-boot-starter-log4j2.version>2.1.5.RELEASE</spring-boot-starter-log4j2.version>
-        <springdoc-openapi-ui.version>1.2.21</springdoc-openapi-ui.version>
-        <bouncycastle.version>1.60</bouncycastle.version>
-        <docker-maven-plugin.version>0.33.0</docker-maven-plugin.version>
-        <springdoc-openapi-maven-plugin.apiDocsUrl>http://localhost:8080/v3/api-docs
-        </springdoc-openapi-maven-plugin.apiDocsUrl>
-        <springdoc-openapi-maven-plugin.version>0.2</springdoc-openapi-maven-plugin.version>
-        <gson.version>2.8.6</gson.version>
-
-        <!-- Docker -->
-        <skipDockerPush>true</skipDockerPush>
-        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
-        <docker-image.registry>${onap.nexus.dockerregistry.daily}</docker-image.registry>
-        <docker-image.namespace>onap</docker-image.namespace>
-        <docker-image.name>${project.groupId}.${project.artifactId}</docker-image.name>
-        <docker-image.latest>${project.version}</docker-image.latest>
-        <docker.http_proxy/>
-
-    </properties>
-
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -248,7 +219,7 @@
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
-                        <version>0.26.0</version>
+                        <version>${docker-maven-plugin.version}</version>
                         <executions>
                             <execution>
                                 <id>docker-build-image</id>
diff --git a/pom.xml b/pom.xml
index e8fca431..a6b35ab0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,6 +34,35 @@
         <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
         <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
         <sitePath>/content/sites/site/org/onap/aaf/cert-service/${project.artifactId}/${project.version}</sitePath>
+        <java.version>11</java.version>
+        <springdoc-openapi-maven-plugin.apiDocsUrl>http://localhost:8080/v3/api-docs</springdoc-openapi-maven-plugin.apiDocsUrl>
+
+        <!-- Dependencies -->
+        <assertj-core.version>3.15.0</assertj-core.version>
+        <mockito-core.version>3.2.4</mockito-core.version>
+        <spring-core.version>5.2.3.RELEASE</spring-core.version>
+        <spring-boot-starter.version>2.2.4.RELEASE</spring-boot-starter.version>
+        <maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
+        <maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
+        <spring-boot-starter-actuator.version>2.2.4.RELEASE</spring-boot-starter-actuator.version>
+        <spring-boot-starter-log4j2.version>2.1.5.RELEASE</spring-boot-starter-log4j2.version>
+        <springdoc-openapi-ui.version>1.2.30</springdoc-openapi-ui.version>
+        <bouncycastle.version>1.60</bouncycastle.version>
+        <docker-maven-plugin.version>0.33.0</docker-maven-plugin.version>
+        <springdoc-openapi-maven-plugin.version>0.2</springdoc-openapi-maven-plugin.version>
+        <gson.version>2.8.6</gson.version>
+        <docker-maven-plugin.version>0.33.0</docker-maven-plugin.version>
+
+        <!-- Docker -->
+        <skipDockerPush>true</skipDockerPush>
+        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
+        <docker-image.registry>${onap.nexus.dockerregistry.daily}</docker-image.registry>
+        <docker-image.namespace>onap</docker-image.namespace>
+        <docker-image.name>${project.groupId}.${project.artifactId}</docker-image.name>
+        <docker-image.latest>${project.version}</docker-image.latest>
+        <version>${project.version}</version>
+        <docker.http_proxy/>
+
     </properties>
 
     <modules>