X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=19e913f2106e912d91f470f2bc7af51ce72c2126;hb=74c8ea18c90307c3b0bb46c13cc0ad8e0f124cb6;hp=3703507597b77bf37b239fb523ba35c812d87ad6;hpb=0113d283d1a1eb9e1f824e33eaf1a33711155b0d;p=dmaap%2Fbuscontroller.git

diff --git a/pom.xml b/pom.xml
index 3703507..19e913f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,24 +1,43 @@
 <?xml version="1.0"?>
+<!--
+  ============LICENSE_START==========================================
+  org.onap.dmaap
+  ===================================================================
+  Copyright © 2018 AT&T Intellectual Property. 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============================================
+  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">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.onap.dmaap.buscontroller</groupId>
   <artifactId>buscontroller</artifactId>
-  <version>1.0.1</version>
+  <version>${artifact.version}</version>
   <name>dmaap-buscontroller</name>
   <parent>
     <groupId>org.onap.oparent</groupId>
     <artifactId>oparent</artifactId>
-    <version>0.1.1</version>
+    <version>1.1.0</version>
     <relativePath/>
   </parent>
-  <build>
+    <build>
     <finalName>buscontroller</finalName>
 
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.0.0-M1</version>
         <executions>
           <execution>
             <id>enforce-no-snapshots</id>
@@ -31,6 +50,13 @@
                   <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>
+
                   </excludes>
                 </requireReleaseDeps>
               </rules>
@@ -53,6 +79,20 @@
                             <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:
@@ -75,7 +115,6 @@
       <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.7</version>
                 <extensions>true</extensions>
                 <configuration>
                     <serverId>ecomp-staging</serverId>
@@ -84,43 +123,11 @@
                 </configuration>
             </plugin>
 
-      <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>
 
 	<!-- for Distribution management -->
 		<plugin>
 		  <groupId>org.apache.maven.plugins</groupId>
 		  <artifactId>maven-site-plugin</artifactId>
-		  <version>3.6</version>
 		  <dependencies>
 			<dependency>
 			  <groupId>org.apache.maven.wagon</groupId>
@@ -162,6 +169,46 @@
       </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>
   <dependencyManagement>
     <dependencies>
  
@@ -210,6 +257,13 @@
       <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.eclipse.jetty</groupId>
       <artifactId>jetty-servlet</artifactId>
@@ -247,7 +301,7 @@
 	<dependency>
 		<groupId>org.onap.dmaap.dbcapi</groupId>
 		<artifactId>dbcapi</artifactId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.0.13-SNAPSHOT</version>
 	</dependency>
   </dependencies>
   <reporting>
@@ -282,7 +336,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <jettyVersion>9.3.7.v20160115</jettyVersion>
     <eelf.version>0.0.1</eelf.version>
-    <artifact.version>1.0.1</artifact.version>
+    <artifact.version>1.0.15</artifact.version>
 		<!--  SONAR  -->
 		 <jacoco.version>0.7.7.201606060606</jacoco.version>
 	    <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>