X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=dmaap-bc%2Fpom.xml;h=b1918253469b0ee2aae2f3cc24f311ebfbcb7f07;hb=2ac1f7b8c631ae728db25c3609a3a710e5a72a62;hp=e4b64edf0c25e7c4b74780aa0618236ac79bfb3f;hpb=7f7da1e1af9b4a273ce166984ba0113d6355f442;p=dmaap%2Fbuscontroller.git

diff --git a/dmaap-bc/pom.xml b/dmaap-bc/pom.xml
index e4b64ed..b191825 100644
--- a/dmaap-bc/pom.xml
+++ b/dmaap-bc/pom.xml
@@ -22,15 +22,14 @@
 <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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.onap.dmaap.buscontroller</groupId>
   <artifactId>dmaap-bc</artifactId>
-  <version>${artifact.version}</version>
+  <version>${revision}</version>
   <name>dmaap-bc</name>
   <parent>
-    <groupId>org.onap.oparent</groupId>
-    <artifactId>oparent</artifactId>
-    <version>1.2.2</version>
-    <relativePath/>
+    <groupId>org.onap.dmaap.buscontroller</groupId>
+    <artifactId>parent</artifactId>
+    <version>${revision}</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
   <build>
     <finalName>dmaap-bc</finalName>
@@ -50,6 +49,7 @@
                 <requireReleaseDeps>
                   <message>No Snapshots Allowed!</message>
                   <excludes>
+<!-- for example, these might be needed...
                     <exclude>org.onap.dmaap.dbcapi:dbcapi</exclude>
                     <exclude>org.onap.aaf.authz:aaf-cadi-client</exclude>
                     <exclude>org.onap.aaf.authz:aaf-misc-env</exclude>
@@ -57,6 +57,7 @@
                     <exclude>org.onap.aaf.authz:aaf-auth-client</exclude>
                     <exclude>org.onap.aaf.authz:aaf-cadi-core</exclude>
                     <exclude>org.onap.aaf.authz:aaf-misc-rosetta</exclude>
+-->
                   </excludes>
                 </requireReleaseDeps>
               </rules>
@@ -111,17 +112,6 @@
         </executions>
       </plugin>
 
-      <plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>nexus-staging-maven-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <serverId>ecomp-staging</serverId>
-          <nexusUrl>${nexusproxy}</nexusUrl>
-          <stagingProfileId>176c31dfe190a</stagingProfileId>
-        </configuration>
-      </plugin>
-
       <!-- for Distribution management -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -184,6 +174,14 @@
                         <includes>
                             <include>Dockerfile</include>
                         </includes>
+                </resource>
+                 <resource>
+                    <targetPath>${basedir}/target/docker-stage/opt/app/dmaapbc/misc</targetPath>
+                    <directory>${multiproject.basedir}/misc</directory>
+                        <includes>
+                            <include>cert-client-init.sh</include>
+                            <include>aaf-ca.crt</include>
+                        </includes>
                 </resource>
                  <resource>
                     <targetPath>${basedir}/target/docker-stage/opt/app/dmaapbc/etc</targetPath>
@@ -191,13 +189,12 @@
                         <includes>
                           <include>LocalKey</include>
                           <include>logback.xml</include>
-                          <include>org.onap.dmaap-bc.trust.jks</include>
-                          <include>dbc-api.jks</include>
                         </includes>
                 </resource>
+
                  <resource>
                     <targetPath>${basedir}/target/docker-stage/opt/app/dmaapbc/etc</targetPath>
-                    <directory>${basedir}</directory>
+                    <directory>${multiproject.basedir}</directory>
                         <includes>
                             <include>version.properties</include>
                         </includes>
@@ -209,20 +206,12 @@
                             <include>opensource.env</include>
                             <include>*.tmpl</include>
                         </includes>
-                </resource>
-                 <resource>
-                    <targetPath>${basedir}/target/docker-stage/opt/app/dmaapbc/misc</targetPath>
-                    <directory>${multiproject.basedir}/misc</directory>
-                        <includes>
-                            <include>cert-client-init.sh</include>
-                        </includes>
                 </resource>
                  <resource>
                     <targetPath>${basedir}/target/docker-stage/opt/app/dmaapbc/bin</targetPath>
                     <directory>${basedir}/misc</directory>
                         <includes>
                             <include>dmaapbc</include>
-                            <include>doaction</include>
                         </includes>
                 </resource>
               </resources>
@@ -293,9 +282,10 @@
                         <verbose>${docker.verbose}</verbose>
                         <apiVersion>${docker.apiVersion}</apiVersion>
                         <pullRegistry>${docker.pull.registry}</pullRegistry>
+                        <pushRegistry>${docker.push.registry}</pushRegistry>
                         <images>
                             <image>                            
-                                <name>${onap.nexus.dockerregistry.daily}/${docker.image}</name>
+                                <name>${docker.image}</name>
                                 <build>
                                     <cleanup>try</cleanup>
                                     <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
@@ -367,22 +357,31 @@
       <artifactId>jersey-media-moxy</artifactId>
     </dependency>
     <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.17</version>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-api</artifactId>
+      <version>${log4j.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+      <version>${log4j.version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
       <version>${jettyVersion}</version>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
+      <version>${jettyVersion}</version>
+    </dependency>
     <dependency>
       <groupId>org.onap.aaf.authz</groupId>
       <artifactId>aaf-cadi-aaf</artifactId>
       <version>2.1.7</version>
       <classifier>full</classifier>
     </dependency>
-
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlet</artifactId>
@@ -404,19 +403,18 @@
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
-      <version>1.11</version>
+      <version>1.15</version>
     </dependency>
     <!-- https://mvnrepository.com/artifact/org.postgresql/postgresql -->
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>42.2.5</version>
+      <version>42.2.14</version>
     </dependency>
-
     <dependency>
       <groupId>org.onap.dmaap.dbcapi</groupId>
       <artifactId>dbcapi</artifactId>
-      <version>1.0.23-SNAPSHOT</version>
+      <version>2.0.3</version>
     </dependency>
   </dependencies>
   <reporting>
@@ -449,12 +447,14 @@
   <properties>
     <multiproject.basedir>${basedir}/..</multiproject.basedir>
     <docker.maven.plugin.version>1.0.0</docker.maven.plugin.version>
-    <jersey.version>2.16</jersey.version>
+    <jersey.version>2.29</jersey.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <jettyVersion>9.4.12.RC2</jettyVersion>
+    <log4j.version>2.13.3</log4j.version>
+    <jettyVersion>9.4.36.v20210114</jettyVersion>
     <eelf.version>1.0.0</eelf.version>
     <swagger.version>1.5.19</swagger.version>
-    <artifact.version>1.1.1</artifact.version>
+    <timestamp>${maven.build.timestamp}</timestamp>
+    <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
     <!--  SONAR  -->
     <jacoco.version>0.7.7.201606060606</jacoco.version>
     <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
@@ -475,7 +475,7 @@
     <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
 
     <!-- for Distribution Management -->
-    <sitePath>/content/sites/site/org/onap/dmaap/dmaap-bc/${artifact.version}</sitePath>
+    <sitePath>/content/sites/site/org/onap/dmaap/dmaap-bc/${revision}</sitePath>
   </properties>
   <description>Packaging Platform (DMaaP) Bus Controller API as a Docker container.</description>
 </project>