X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=99251e7c575e353837f35e30aa21c4a83ca26680;hb=cdd17d2146e854d13a71922bcb4f3741f9c15ffe;hp=25827bd6fe6fa7f17de6f205d92f88a109dc4c49;hpb=06c5771a730304d2f3451059aae996a443297330;p=dmaap%2Fbuscontroller.git

diff --git a/pom.xml b/pom.xml
index 25827bd..99251e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,9 +8,9 @@
   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.
@@ -19,7 +19,8 @@
   ============LICENSE_END============================================
   ECOMP is a trademark and service mark of AT&T Intellectual Property.
 -->
-<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">
+<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>buscontroller</artifactId>
@@ -28,10 +29,10 @@
   <parent>
     <groupId>org.onap.oparent</groupId>
     <artifactId>oparent</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.2</version>
     <relativePath/>
   </parent>
-    <build>
+  <build>
     <finalName>buscontroller</finalName>
 
     <plugins>
@@ -50,13 +51,12 @@
                   <message>No Snapshots Allowed!</message>
                   <excludes>
                     <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>
-					<exclude>org.onap.aaf.authz:aaf-cadi-aaf</exclude>
-					<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>
-
+                    <exclude>org.onap.aaf.authz:aaf-cadi-client</exclude>
+                    <exclude>org.onap.aaf.authz:aaf-misc-env</exclude>
+                    <exclude>org.onap.aaf.authz:aaf-cadi-aaf</exclude>
+                    <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>
@@ -66,76 +66,73 @@
         </executions>
       </plugin>
 
-           <!-- Package an Uber jar -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>2.4.3</version>
-                <executions>
-                    <!-- Run shade goal on package phase -->
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-							<!-- this filter section is needed to avoid runtime error:
-								java.lang.SecurityException: Invalid signature file digest for Manifest main attributes
-								suggestion found at: https://stackoverflow.com/q/999489 
-							-->
-							<filters>
-								<filter>
-									<artifact>*:*</artifact>
-									<excludes>
-										<exclude>META-INF/*.SF</exclude>
-										<exclude>META-INF/*.DSA</exclude>
-										<exclude>META-INF/*.RSA</exclude>
-									</excludes>
-								</filter>
-							</filters>
-                            <transformers>
-                                <!-- NOTE: Need the following transformer else gets "Could not resolve type id 'https' into a subtype" error
-                                Solution found from here:
-                                http://stackoverflow.com/questions/27543060/why-does-dropwizard-configuration-is-not-working
-                                Some more context here:
-                                https://github.com/dropwizard/dropwizard/issues/455 -->
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                                <!-- add Main-Class to manifest file -->
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>org.onap.dmaap.dbcapi.server.Main</mainClass>
-                                </transformer>
-                            </transformers>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-
-
+      <!-- Package an Uber jar -->
       <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>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>2.4.3</version>
+        <executions>
+          <!-- Run shade goal on package phase -->
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <!-- this filter section is needed to avoid runtime error:
+                java.lang.SecurityException: Invalid signature file digest for Manifest main attributes
+                suggestion found at: https://stackoverflow.com/q/999489
+              -->
+              <filters>
+                <filter>
+                  <artifact>*:*</artifact>
+                  <excludes>
+                    <exclude>META-INF/*.SF</exclude>
+                    <exclude>META-INF/*.DSA</exclude>
+                    <exclude>META-INF/*.RSA</exclude>
+                  </excludes>
+                </filter>
+              </filters>
+              <transformers>
+                <!-- NOTE: Need the following transformer else gets "Could not resolve type id 'https' into a subtype" error
+                Solution found from here:
+                http://stackoverflow.com/questions/27543060/why-does-dropwizard-configuration-is-not-working
+                Some more context here:
+                https://github.com/dropwizard/dropwizard/issues/455 -->
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                <!-- add Main-Class to manifest file -->
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <mainClass>org.onap.dmaap.dbcapi.server.Main</mainClass>
+                </transformer>
+              </transformers>
+            </configuration>
+          </execution>
+        </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>
-		  <artifactId>maven-site-plugin</artifactId>
-		  <dependencies>
-			<dependency>
-			  <groupId>org.apache.maven.wagon</groupId>
-			  <artifactId>wagon-webdav-jackrabbit</artifactId>
-			  <version>2.10</version>
-			</dependency>
-		  </dependencies>
-		</plugin>
+      <!-- for Distribution management -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.maven.wagon</groupId>
+            <artifactId>wagon-webdav-jackrabbit</artifactId>
+            <version>2.10</version>
+          </dependency>
+        </dependencies>
+      </plugin>
 
     </plugins>
     <pluginManagement>
@@ -153,10 +150,10 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
                     <versionRange>[2.10,)</versionRange>
-					    <phase>install</phase>
-                        <goals>
-                          <goal>copy-dependencies</goal>
-                        </goals>
+                    <phase>install</phase>
+                    <goals>
+                      <goal>copy-dependencies</goal>
+                    </goals>
                   </pluginExecutionFilter>
                   <action>
                     <ignore/>
@@ -169,49 +166,81 @@
       </plugins>
     </pluginManagement>
   </build>
-	<profiles>
-	<profile>
-		<id>docker</id>
-		<build>
-			<plugins>
-      <plugin>
-		<groupId>com.spotify</groupId>
-		 <artifactId>docker-maven-plugin</artifactId>
-		 <version>1.0.0</version>
-		 <configuration>
-				 <imageName>${onap.nexus.dockerregistry.daily}/${docker.image}</imageName>
-			     <dockerDirectory>${project.basedir}</dockerDirectory>
-				 <serverId>${onap.nexus.dockerregistry.daily}</serverId>
-				 <imageTags>
-						 <imageTag>${artifact.version}</imageTag>
-						 <imageTag>latest</imageTag>
-				 </imageTags>
-				 <forceTags>true</forceTags>
-				 <resources>
-						 <resource>
-								 <targetPath>/</targetPath>
-								 <directory>${project.basedir}</directory>
-								 <excludes>
-									<exclude>target/**/*</exclude>
-									<exclude>pom.xml</exclude>
-								</excludes>
-						 </resource>
-
-						 <resource>
-								 <targetPath>/</targetPath>
-								 <directory>${project.build.directory}</directory>
-								 <include>**/**</include>
-						 </resource>
-				 </resources>
-		 </configuration>
-      </plugin>
-			</plugins>
-		</build>
-	</profile>
-	</profiles>
+  <profiles>
+    <profile>
+      <id>docker</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>com.spotify</groupId>
+            <artifactId>docker-maven-plugin</artifactId>
+            <version>1.0.0</version>
+            <configuration>
+              <baseImage>java:openjdk-8-jre</baseImage>
+              <imageName>${onap.nexus.dockerregistry.daily}/${docker.image}</imageName>
+              <entryPoint>["./bin/dmaapbc", "deploy"]</entryPoint>
+              <serverId>${onap.nexus.dockerregistry.daily}</serverId>
+              <imageTags>
+                <imageTag>${artifact.version}</imageTag>
+                <imageTag>latest</imageTag>
+              </imageTags>
+              <volumes>
+                <volume>/opt/app/dmaapbc/log</volume>
+              </volumes>
+              <forceTags>true</forceTags>
+              <user>root</user>
+              <resources>
+                <resource>
+                  <targetPath>/opt/app/dmaapbc/lib</targetPath>
+                  <directory>target</directory>
+                  <include>buscontroller.jar</include>
+                </resource>
+                <resource>
+                  <targetPath>/opt/app/dmaapbc/etc</targetPath>
+                  <directory>misc</directory>
+                  <include>LocalKey</include>
+                  <include>logback.xml</include>
+                  <include>org.onap.dmaap-bc.trust.jks</include>
+                  <include>dbc-api.jks</include>
+                </resource>
+                <resource>
+                  <targetPath>/opt/app/dmaapbc/etc</targetPath>
+                  <directory>.</directory>
+                  <include>version.properties</include>
+                </resource>
+                <resource>
+                  <targetPath>/opt/app/dmaapbc/misc</targetPath>
+                  <directory>misc</directory>
+                  <include>opensource.env</include>
+                  <include>cert-client-init.sh</include>
+                  <include>*.tmpl</include>
+                </resource>
+                <resource>
+                  <targetPath>/opt/app/dmaapbc/bin</targetPath>
+                  <directory>misc</directory>
+                  <include>dmaapbc</include>
+                  <include>doaction</include>
+                </resource>
+              </resources>
+              <runs>
+                <run>mv /opt/app/dmaapbc/etc/dbc-api.jks /opt/app/dmaapbc/etc/keystore</run>
+                <run>chmod 600 /opt/app/dmaapbc/etc/keystore</run>
+                <run>chmod 600 /opt/app/dmaapbc/etc/org.onap.dmaap-bc.trust.jks</run>
+                <run>chmod +x /opt/app/dmaapbc/misc/cert-client-init.sh</run>
+                <run>chmod +x /opt/app/dmaapbc/bin/*</run>
+                <run>mkdir /opt/app/dmaapbc/logs</run>
+                <run>mkdir /opt/app/dmaapbc/www</run>
+                <run>mkdir /opt/app/dmaapbc/www/doc</run>
+              </runs>
+              <workdir>/opt/app/dmaapbc</workdir>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
   <dependencyManagement>
     <dependencies>
- 
       <dependency>
         <groupId>org.glassfish.jersey</groupId>
         <artifactId>jersey-bom</artifactId>
@@ -222,21 +251,21 @@
     </dependencies>
   </dependencyManagement>
   <dependencies>
-        <dependency>
-        <groupId>io.swagger</groupId>
-        <artifactId>swagger-core</artifactId>
-        <version>1.5.13</version>
-      </dependency>
-      <dependency>
-        <groupId>io.swagger</groupId>
-        <artifactId>swagger-jersey2-jaxrs</artifactId>
-        <version>1.5.13</version>
-      </dependency>
-       <dependency>
-        <groupId>io.swagger</groupId>
-        <artifactId>swagger-annotations</artifactId>
-        <version>1.5.13</version>
-      </dependency>   
+    <dependency>
+      <groupId>io.swagger</groupId>
+      <artifactId>swagger-core</artifactId>
+      <version>${swagger.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.swagger</groupId>
+      <artifactId>swagger-jersey2-jaxrs</artifactId>
+      <version>${swagger.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.swagger</groupId>
+      <artifactId>swagger-annotations</artifactId>
+      <version>${swagger.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.glassfish.jersey.containers</groupId>
       <artifactId>jersey-container-servlet-core</artifactId>
@@ -257,12 +286,12 @@
       <artifactId>jetty-server</artifactId>
       <version>${jettyVersion}</version>
     </dependency>
-        <dependency>
-            <groupId>org.onap.aaf.authz</groupId>
-            <artifactId>aaf-cadi-aaf</artifactId>
-            <version>2.1.2-SNAPSHOT</version>
-            <classifier>full</classifier>
-        </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>
@@ -285,24 +314,20 @@
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
-      <version>1.6</version>
+      <version>1.11</version>
     </dependency>
     <!-- https://mvnrepository.com/artifact/org.postgresql/postgresql -->
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>9.4.1208.jre7</version>
+      <version>42.2.5</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.onap.dmaap.dbcapi</groupId>
+      <artifactId>dbcapi</artifactId>
+      <version>1.0.21-SNAPSHOT</version>
     </dependency>
-  	<dependency>
-		<groupId>com.att.eelf</groupId> 
-		<artifactId>eelf-core</artifactId> 
-		<version>${eelf.version}</version> 
-	</dependency>
-	<dependency>
-		<groupId>org.onap.dmaap.dbcapi</groupId>
-		<artifactId>dbcapi</artifactId>
-		<version>1.0.15-SNAPSHOT</version>
-	</dependency>
   </dependencies>
   <reporting>
     <plugins>
@@ -326,35 +351,36 @@
   </reporting>
 
   <distributionManagement>
-	<site>
-		<id>ecomp-site</id>
-		<url>dav:${nexusproxy}${sitePath}</url>
-	</site>
+    <site>
+      <id>ecomp-site</id>
+      <url>dav:${nexusproxy}${sitePath}</url>
+    </site>
   </distributionManagement>
   <properties>
     <jersey.version>2.16</jersey.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <jettyVersion>9.3.8.RC0</jettyVersion>
-    <eelf.version>0.0.1</eelf.version>
-    <artifact.version>1.0.18</artifact.version>
-		<!--  SONAR  -->
-		 <jacoco.version>0.7.7.201606060606</jacoco.version>
-	    <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-	    <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-	    <!-- Default Sonar configuration -->
-	    <sonar.jacoco.reportPath>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
-	    <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
-	    <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
-	    <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+    <jettyVersion>9.4.12.RC2</jettyVersion>
+    <eelf.version>1.0.0</eelf.version>
+    <swagger.version>1.5.19</swagger.version>
+    <artifact.version>1.0.26</artifact.version>
+    <!--  SONAR  -->
+    <jacoco.version>0.7.7.201606060606</jacoco.version>
+    <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
+    <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+    <!-- Default Sonar configuration -->
+    <sonar.jacoco.reportPath>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
+    <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
+    <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
+    <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
 
-	<!-- docker image -->
-		 <docker.image>onap/dmaap/buscontroller</docker.image>
+    <!-- docker image -->
+    <docker.image>onap/dmaap/buscontroller</docker.image>
 
-		 <nexusproxy>https://nexus.onap.org</nexusproxy>
-		 <docker.push.registry>nexus3.onap.org:10003</docker.push.registry>
+    <nexusproxy>https://nexus.onap.org</nexusproxy>
+    <docker.push.registry>nexus3.onap.org:10003</docker.push.registry>
 
-	<!-- for Distribution Management -->
-		<sitePath>/content/sites/site/org/onap/dmaap/buscontroller/${artifact.version}</sitePath>
+    <!-- for Distribution Management -->
+    <sitePath>/content/sites/site/org/onap/dmaap/buscontroller/${artifact.version}</sitePath>
   </properties>
-  <description>Packaging Platform (DMaaP) Bus Controller API as a Docker container. </description>
+  <description>Packaging Platform (DMaaP) Bus Controller API as a Docker container.</description>
 </project>