X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=mod%2Fgenprocessor%2Fpom.xml;h=a0a3b89b7381193aa28f79ae6b6ba72353f80b41;hb=1e5a6e041efef87d43a182b54d4b01f4ae87355c;hp=3b916caf3dccad97004eba744cf68e7bf7aed6ba;hpb=3fb91dc34bcde5489681f6470cae7f01c8b246d0;p=dcaegen2%2Fplatform.git

diff --git a/mod/genprocessor/pom.xml b/mod/genprocessor/pom.xml
index 3b916ca..a0a3b89 100644
--- a/mod/genprocessor/pom.xml
+++ b/mod/genprocessor/pom.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+============LICENSE_START=======================================================
+Copyright (c) 2020 AT&T Intellectual Property. All rights reserved.
+Copyright (C) 2022 Huawei. 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>
@@ -10,7 +27,7 @@
   </parent>
   <groupId>org.onap.dcaegen2.platform.mod</groupId>
   <artifactId>genprocessor</artifactId>
-  <version>1.0.0</version>
+  <version>1.0.3-SNAPSHOT</version>
   <name>dcaegen2-platform-mod-genprocessor</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -22,6 +39,9 @@
     <start-class>org.onap.dcae.genprocessor.App</start-class>
     <!--NOTE: Nifi jars used here are version 1.9.2 but dcae mod is on 1.9.3 because 1.9.3 is not in Maven Central -->
     <nifi.version>1.9.2</nifi.version>
+    <docker.fabric.version>0.32.0</docker.fabric.version>
+    <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml
+    </sonar.coverage.jacoco.xmlReportPaths>
   </properties>
   <dependencies>
     <dependency>
@@ -62,12 +82,12 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>2.10.0.pr1</version>
+      <version>2.11.0</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.10.0.pr1</version>
+      <version>2.11.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
@@ -80,18 +100,25 @@
       <version>4.11</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.github.stefanbirkner</groupId>
+      <artifactId>system-rules</artifactId>
+      <version>1.19.0</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
       <plugin>
         <groupId>io.fabric8</groupId>
         <artifactId>docker-maven-plugin</artifactId>
+        <version>${docker.fabric.version}</version>
         <configuration>
           <verbose>true</verbose>
           <pullRegistry>${docker.pull.registry}</pullRegistry>
           <pushRegistry>${docker.push.registry}</pushRegistry>
           <images>
-	    <image>
+            <image>
               <name>onap/${project.groupId}.${project.artifactId}-http</name>
               <registry>${onap.nexus.dockerregistry.daily}</registry>
               <build>
@@ -101,32 +128,36 @@
                   <tag>${project.version}</tag>
                   <tag>${project.version}-${maven.build.timestamp}Z</tag>
                 </tags>
-		<assembly>
-		  <targetDir>/</targetDir>
-		  <inline>
-		    <files>
-		      <file>
-		        <source>./nginx.conf</source>
-		        <outputDirectory>/etc/nginx/conf.d</outputDirectory>
-		        <destName>default.conf</destName>
-		      </file>
-		    </files>
-		  </inline>
-		</assembly>
+                <assembly>
+                  <targetDir>/</targetDir>
+                  <inline>
+                    <files>
+                      <file>
+                        <source>./nginx.conf</source>
+                        <outputDirectory>/etc/nginx/conf.d</outputDirectory>
+                        <destName>default.conf</destName>
+                      </file>
+                    </files>
+                  </inline>
+                </assembly>
+                <runCmds>
+                    <runCmd>sed -i /etc/nginx/nginx.conf -e '/^user /d' &amp;&amp; touch /var/run/nginx.pid &amp;&amp; mkdir -p /www/data &amp;&amp; chown -R nginx:nginx /www /etc/nginx /var/cache/nginx /var/log/nginx /var/run/nginx.pid</runCmd>
+                </runCmds>
+        <user>nginx</user>
                 <entryPoint>
                   <exec>
-		    <arg>nginx</arg>
-		    <arg>-g</arg>
-		    <arg>daemon off;</arg>
-		  </exec>
-		</entryPoint>
-	      </build>
-	    </image>
+                    <arg>nginx</arg>
+                    <arg>-g</arg>
+                    <arg>daemon off;</arg>
+                  </exec>
+                </entryPoint>
+              </build>
+            </image>
             <image>
               <name>onap/${project.groupId}.${project.artifactId}-job</name>
               <registry>${onap.nexus.dockerregistry.daily}</registry>
               <build>
-                <from>openjdk:8-jre-alpine</from>
+                <from>openjdk:8</from>
                 <tags>
                   <tag>latest</tag>
                   <tag>${project.version}</tag>
@@ -135,13 +166,16 @@
                 <assembly>
                   <descriptorRef>artifact-with-dependencies</descriptorRef>
                 </assembly>
+                <runCmds>
+                    <runCmd>groupadd -g 1000 dcaemod &amp;&amp; useradd --shell /bin/bash -u 1000 -g 1000 -m dcaemod</runCmd>
+                </runCmds>
                 <workdir>/maven</workdir>
                 <env>
                   <GENPROC_WORKING_DIR>/work</GENPROC_WORKING_DIR>
-                  <GENPROC_ONBOARDING_API_HOST>http://onboarding-api/onboarding</GENPROC_ONBOARDING_API_HOST>
-                  <GENPROC_PROCESSOR_CLASSFILE_PATH>/code/target/classes/sandbox/DCAEPROCESSOR.class</GENPROC_PROCESSOR_CLASSFILE_PATH>
+                  <GENPROC_ONBOARDING_API_HOST>http://onboarding-api:8080/onboarding</GENPROC_ONBOARDING_API_HOST>
                   <GENPROC_SLEEP_SEC>10</GENPROC_SLEEP_SEC>
                 </env>
+                <user>dcaemod</user>
                 <entryPoint>
                   <exec>
                     <arg>java</arg>