X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=authz-service%2Fpom.xml;h=0efeab7deff454a673ffa45034b94f8a20d80d8c;hb=10027f3cd15afd2c8ef341e5cd92de911e07965e;hp=fab37c4f884542d403ba517a40acd0a5e9cb47c8;hpb=0cd2644960472036e9fd3367eca8c717ba353bdf;p=aaf%2Fauthz.git

diff --git a/authz-service/pom.xml b/authz-service/pom.xml
index fab37c4f..0efeab7d 100644
--- a/authz-service/pom.xml
+++ b/authz-service/pom.xml
@@ -35,12 +35,7 @@
 	<name>Authz Service</name>
 	<description>API for Authorization and Authentication</description>
 		<url>https://github.com/att/AAF</url>
-	<licenses>
-		<license>
-		<name>BSD License</name>
-		<url> </url>
-		</license>
-	</licenses>
+	
 	<developers>
 		<developer>
 		<name>Jonathan Gathman</name>
@@ -56,9 +51,10 @@
 		<project.swmVersion>1</project.swmVersion>
 			<project.innoVersion>1.0.0-SNAPSHOT</project.innoVersion>
 		<project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>
-	    <dockerLocation>${basedir}/target/</dockerLocation>
+        <dockerLocation>${basedir}/target/</dockerLocation>
 		<distFilesRootDirPath>opt/app/aaf/${project.artifactId}/${project.version}</distFilesRootDirPath>
 			<sonar.language>java</sonar.language>
+			<sonar.skip>true</sonar.skip>
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
 		<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
 		<sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>
@@ -66,12 +62,11 @@
 		<sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
 		<sonar.projectVersion>${project.version}</sonar.projectVersion>
         <nexusproxy>https://nexus.onap.org</nexusproxy>
+		<docker.push.registry>localhost:5000</docker.push.registry>
 		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
 		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
 		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
 		<sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>
-		
-        <docker.push.registry>localhost:5000</docker.push.registry>
         <skip.docker.build>true</skip.docker.build>
         <skip.docker.push>true</skip.docker.push>
         <skip.staging.artifacts>false</skip.staging.artifacts>
@@ -148,6 +143,7 @@
 
 
 	<build>
+	<finalName>authz-service</finalName>
 	    <plugins>
 	
 		
@@ -157,27 +153,39 @@
         <version>1.0.0</version>
         <configuration>
           <imageName>onap/aaf/authz-service</imageName>
-          <dockerDirectory>${dockerLocation}</dockerDirectory>
-          <serverId>docker-hub</serverId>
+         <!-- <dockerDirectory>${dockerLocation}</dockerDirectory> -->
+		  <dockerDirectory>${basedir}/src/main/resources/docker</dockerDirectory>
           <imageTags>
             <imageTag>latest</imageTag>
             <imageTag>${project.docker.latesttagtimestamp.version}</imageTag>
             <imageTag>${project.docker.latesttag.version}</imageTag>
           </imageTags>
           <forceTags>true</forceTags>
-		  <resources>
+		 <!-- <resources>
             <resource>
 			    <targetPath>/</targetPath>
-                    <directory>/${basedir}/target/opt</directory>
+                    <directory>${project.build.directory}/opt</directory>
                     <filtering>true</filtering>
                      <includes>
-                        <include>**/*</include>
+                        <include>**/**</include>
                             </includes>
             </resource>
-         </resources>  
-        </configuration>
+         </resources>  -->		 
+		   <resources>
+            <resource>
+              <targetPath>/</targetPath>
+              <directory>${project.build.directory}/opt</directory>
+              <include>${project.build.finalName}.jar</include>
+            </resource>
+            <resource>
+              <targetPath>/</targetPath>
+              <directory>${project.build.directory}</directory>
+              <include>**/**</include>
+            </resource>
+          </resources>
+		 </configuration>
         <executions>
-          <execution>
+       <execution>
             <id>build-image</id>
             <phase>package</phase>
             <goals>
@@ -186,32 +194,22 @@
             <configuration>
               <skipDockerBuild>${skip.docker.build}</skipDockerBuild>
             </configuration>
-          </execution>
+          </execution> 
 
           <execution>
-            <id>tag-image-latest-timestamp</id>
+            <id>tag-image-project-version</id>
             <phase>package</phase>
             <goals>
               <goal>tag</goal>
             </goals>
             <configuration>
               <image>onap/aaf/authz-service</image>
-              <newName>${docker.push.registry}/onap/aaf/authz-service:${project.docker.latesttagtimestamp.version}</newName>
+              <newName>${docker.push.registry}/onap/aaf/authz-service:${project.version}</newName>
               <skipDockerTag>${skip.docker.push}</skipDockerTag>
             </configuration>
           </execution>
-          <execution>
-            <id>push-image-latest-timestamp</id>
-            <phase>deploy</phase>
-            <goals>
-              <goal>push</goal>
-            </goals>
-            <configuration>
-              <imageName>${docker.push.registry}/onap/aaf/authz-service:${project.docker.latesttagtimestamp.version}</imageName>
-              <skipDockerPush>${skip.docker.push}</skipDockerPush>
-            </configuration>
-          </execution>
-          <execution>
+		  
+		  <execution>
             <id>tag-image-latest</id>
             <phase>package</phase>
             <goals>
@@ -219,33 +217,23 @@
             </goals>
             <configuration>
               <image>onap/aaf/authz-service</image>
-              <newName>${docker.push.registry}/onap/aaf/authz-service:${project.docker.latesttag.version}</newName>
+              <newName>${docker.push.registry}/onap/aaf/authz-service:latest</newName>
               <skipDockerTag>${skip.docker.push}</skipDockerTag>
             </configuration>
           </execution>
-          <execution>
+          
+         <execution>
             <id>push-image-latest</id>
             <phase>deploy</phase>
             <goals>
               <goal>push</goal>
             </goals>
             <configuration>
-              <imageName>${docker.push.registry}/onap/aaf/authz-service:${project.docker.latesttag.version}</imageName>
+              <imageName>${docker.push.registry}/onap/aaf/authz-service:${project.version}</imageName>
               <skipDockerPush>${skip.docker.push}</skipDockerPush>
             </configuration>
           </execution>
-          <execution>
-            <id>tag-image</id>
-            <phase>package</phase>
-            <goals>
-              <goal>tag</goal>
-            </goals>
-            <configuration>
-              <image>onap/aaf/authz-service</image>
-              <newName>${docker.push.registry}/onap/aaf/authz-service:latest</newName>
-              <skipDockerTag>${skip.docker.push}</skipDockerTag>
-            </configuration>
-          </execution>
+          
           <execution>
             <id>push-image</id>
             <phase>deploy</phase>
@@ -260,11 +248,11 @@
         </executions>
       </plugin>
 
-			<plugin>
+ <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
                 <version>2.7</version>
               <executions>
-	              <execution>
+	            <execution>
                         <id>copy-docker-file</id>
                         <phase>package</phase>
                         <goals>
@@ -283,7 +271,7 @@
                                 </resource>
                             </resources>
                         </configuration>
-                    </execution>
+                    </execution>  
       <execution>
         <id>copy-resources-1</id>
         <phase>validate</phase>
@@ -548,7 +536,8 @@
                         </configuration>
                     </execution>
 				</executions>
-			</plugin>
+			</plugin>     
+
 		
 			</plugins>