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

diff --git a/authz-service/pom.xml b/authz-service/pom.xml
index f850e5d5..0efeab7d 100644
--- a/authz-service/pom.xml
+++ b/authz-service/pom.xml
@@ -27,7 +27,7 @@
 	<parent>
 		<groupId>org.onap.aaf.authz</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.0.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 		
@@ -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>
@@ -51,13 +46,15 @@
 	</developers>
 
 	<properties>
+	<maven.build.timestamp.format>yyyy.MM.dd'T'hh.mm.ss'Z'</maven.build.timestamp.format>
 		<maven.test.failure.ignore>true</maven.test.failure.ignore>
 		<project.swmVersion>1</project.swmVersion>
-			<project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>
-	    <dockerLocation>${basedir}/target/</dockerLocation>
-		<docker.registry>nexus3.onap.org</docker.registry>
+			<project.innoVersion>1.0.0-SNAPSHOT</project.innoVersion>
+		<project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>
+        <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>
@@ -65,10 +62,14 @@
 		<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/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
+		<sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>
+        <skip.docker.build>true</skip.docker.build>
+        <skip.docker.push>true</skip.docker.push>
+        <skip.staging.artifacts>false</skip.staging.artifacts>
 	</properties>
 	
 		
@@ -113,14 +114,14 @@
         <dependency > 
 			<groupId>org.onap.aaf.inno</groupId>
 			<artifactId>env</artifactId>
-			<version>${project.version}</version>
+			<version>${project.innoVersion}</version>
 		</dependency>
 
 
 		<dependency>
 			<groupId>org.onap.aaf.cadi</groupId>
 			<artifactId>cadi-core</artifactId>
-			<version>${project.version}</version>
+			<version>${project.cadiVersion}</version>
 		</dependency>
 
 		<dependency>
@@ -131,23 +132,127 @@
  		<dependency>
 			<groupId>org.onap.aaf.inno</groupId>
 			<artifactId>rosetta</artifactId>
-			<version>${project.version}</version>
+			<version>${project.innoVersion}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.onap.aaf.cadi</groupId>
 			<artifactId>cadi-aaf</artifactId>
-			<version>${project.version}</version>
+			<version>${project.cadiVersion}</version>
 		</dependency>   
 	</dependencies>
-	
+
+
 	<build>
+	<finalName>authz-service</finalName>
 	    <plugins>
-		<plugin>
-                <groupId>org.apache.maven.plugins</groupId>
+	
+		
+<plugin>
+        <groupId>com.spotify</groupId>
+        <artifactId>docker-maven-plugin</artifactId>
+        <version>1.0.0</version>
+        <configuration>
+          <imageName>onap/aaf/authz-service</imageName>
+         <!-- <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>
+            <resource>
+			    <targetPath>/</targetPath>
+                    <directory>${project.build.directory}/opt</directory>
+                    <filtering>true</filtering>
+                     <includes>
+                        <include>**/**</include>
+                            </includes>
+            </resource>
+         </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>
+            <id>build-image</id>
+            <phase>package</phase>
+            <goals>
+              <goal>build</goal>
+            </goals>
+            <configuration>
+              <skipDockerBuild>${skip.docker.build}</skipDockerBuild>
+            </configuration>
+          </execution> 
+
+          <execution>
+            <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.version}</newName>
+              <skipDockerTag>${skip.docker.push}</skipDockerTag>
+            </configuration>
+          </execution>
+		  
+		  <execution>
+            <id>tag-image-latest</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-latest</id>
+            <phase>deploy</phase>
+            <goals>
+              <goal>push</goal>
+            </goals>
+            <configuration>
+              <imageName>${docker.push.registry}/onap/aaf/authz-service:${project.version}</imageName>
+              <skipDockerPush>${skip.docker.push}</skipDockerPush>
+            </configuration>
+          </execution>
+          
+          <execution>
+            <id>push-image</id>
+            <phase>deploy</phase>
+            <goals>
+              <goal>push</goal>
+            </goals>
+            <configuration>
+              <imageName>${docker.push.registry}/onap/aaf/authz-service:latest</imageName>
+              <skipDockerPush>${skip.docker.push}</skipDockerPush>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+ <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
                 <version>2.7</version>
-                <executions>
-                    <execution>
+              <executions>
+	            <execution>
                         <id>copy-docker-file</id>
                         <phase>package</phase>
                         <goals>
@@ -166,39 +271,7 @@
                                 </resource>
                             </resources>
                         </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-			<plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>0.4.11</version>
-                <configuration>
-                    <imageName>onap/aaf/authz-service</imageName>
-                    <dockerDirectory>${dockerLocation}</dockerDirectory>
-                    <serverId>docker-hub</serverId>
-                     <registryUrl>https://${docker.registry}</registryUrl>
-                    <imageTags>
-                        <imageTag>${project.version}</imageTag>
-                        <imageTag>latest</imageTag>
-                    </imageTags>
-					     <resources>
-                                <resource>
-								<targetPath>/</targetPath>
-                                    <directory>/${basedir}/target/opt</directory>
-                                    <filtering>true</filtering>
-                                    <includes>
-                                        <include>**/*</include>
-                                    </includes>
-                                </resource>
-                            </resources>
-                    <forceTags>true</forceTags>
-                </configuration>
-            </plugin>
-			<plugin>
-    <artifactId>maven-resources-plugin</artifactId>
-    <version>2.7</version>
-    <executions>
+                    </execution>  
       <execution>
         <id>copy-resources-1</id>
         <phase>validate</phase>
@@ -224,7 +297,7 @@
           <goal>copy-resources</goal>
         </goals>
         <configuration>
-          <outputDirectory>${project.build.directory}/opt/app/aaf/authz-service/${project.version}/etc</outputDirectory>
+          <outputDirectory>${project.build.directory}/opt/app/aaf/authz-service/etc</outputDirectory>
           <resources>
             <resource>
                         <directory>${project.basedir}/src/main/resources/etc</directory>
@@ -243,12 +316,12 @@
           <goal>copy-resources</goal>
         </goals>
         <configuration>
-          <outputDirectory>${project.build.directory}/opt/app/aaf/authz-service/${project.version}/lib</outputDirectory>
+          <outputDirectory>${project.build.directory}/opt/app/aaf/authz-service/lib</outputDirectory>
           <resources>
             <resource>
                         <directory>${project.basedir}/../authz-cmd/target</directory>
                         <includes>
-                            <include>**/authz-cmd-1.0.0-SNAPSHOT-jar-with-dependencies.jar</include>
+                            <include>**/*.jar</include>
                         </includes>
                     </resource>
           </resources>
@@ -261,7 +334,7 @@
           <goal>copy-resources</goal>
         </goals>
         <configuration>
-          <outputDirectory>${project.build.directory}/opt/app/aaf/authz-service/${project.version}</outputDirectory>
+          <outputDirectory>${project.build.directory}/opt/app/aaf/authz-service/</outputDirectory>
           <resources>
             <resource>
                         <directory>${project.basedir}/../authz-cmd</directory>
@@ -272,17 +345,17 @@
           </resources>
         </configuration>
       </execution>
-	   <execution>
+		<execution>
         <id>copy-resources-5</id>
         <phase>validate</phase>
         <goals>
           <goal>copy-resources</goal>
         </goals>
         <configuration>
-          <outputDirectory>${project.build.directory}/opt/app/aaf/authz-service/${project.version}/etc</outputDirectory>
+          <outputDirectory>${project.build.directory}/opt/app/aaf/authz-service/etc/</outputDirectory>
           <resources>
             <resource>
-                        <directory>${project.basedir}/../authz-cmd/etc</directory>
+                        <directory>${project.basedir}/src/main/config</directory>
                         <includes>
                             <include>**/**</include>
                         </includes>
@@ -290,6 +363,24 @@
           </resources>
         </configuration>
       </execution>
+	  <execution>
+        <id>copy-resources-6</id>
+        <phase>validate</phase>
+        <goals>
+          <goal>copy-resources</goal>
+        </goals>
+        <configuration>
+          <outputDirectory>${project.build.directory}/opt/app/aaf/authz-service/etc/data</outputDirectory>
+          <resources>
+            <resource>
+                        <directory>${project.basedir}/../opt/app/aaf/data</directory>
+                        <includes>
+                            <include>**/**</include>
+                        </includes>
+                    </resource>
+          </resources>
+        </configuration>
+		</execution>
     </executions>
   </plugin>
 			<plugin>
@@ -304,7 +395,7 @@
 							<goal>copy-dependencies</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>${project.build.directory}/opt/app/aaf/authz-service/${project.version}/lib</outputDirectory>
+							<outputDirectory>${project.build.directory}/opt/app/aaf/authz-service/lib</outputDirectory>
 							<overWriteReleases>false</overWriteReleases>
 							<overWriteSnapshots>false</overWriteSnapshots>
 							<overWriteIfNewer>true</overWriteIfNewer>
@@ -350,18 +441,12 @@
 					</configuration>
 					<version>2.3.1</version>
 				</plugin>
-
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-deploy-plugin</artifactId>
-					<configuration>
-						<skip>true</skip>
-					</configuration>
-			    </plugin>  
+ 
 
 		<plugin>
 			<groupId>org.apache.maven.plugins</groupId>
 			<artifactId>maven-javadoc-plugin</artifactId>
+			<version>2.10.4</version>
 			<configuration>
 			<failOnError>false</failOnError>
 			</configuration>
@@ -451,12 +536,14 @@
                         </configuration>
                     </execution>
 				</executions>
-			</plugin>
+			</plugin>     
+
 		
 			</plugins>
 
 	</build>
 
+
 		<distributionManagement>
 		<repository>
 			<id>ecomp-releases</id>
@@ -473,32 +560,15 @@
 			<url>dav:${nexusproxy}${sitePath}</url>
 		</site>
 	</distributionManagement>
-<pluginRepositories>
-        <pluginRepository>
-            <id>onap-plugin-snapshots</id>
-            <url>https://nexus.onap.org/content/repositories/snapshots/</url>
-        </pluginRepository>
-    </pluginRepositories>
-	
-	<repositories>
-		<repository>
-			<id>central</id>
-			<name>Maven 2 repository 2</name>
-			<url>http://repo2.maven.org/maven2/</url>
-		</repository>
-		<repository>
-            <id>onap-jar-snapshots</id>
-            <url>https://nexus.onap.org/content/repositories/snapshots</url>
-        </repository>
-		<repository>
-			<id>spring-repo</id>
-			<name>Spring repo</name>
-			<url>https://artifacts.alfresco.com/nexus/content/repositories/public/</url>
-		</repository>
-		<repository>
-			<id>repository.jboss.org-public</id>
-			<name>JBoss.org Maven repository</name>
-			<url>https://repository.jboss.org/nexus/content/groups/public</url>
-		</repository>
-	</repositories>
+ <profiles>
+    <profile>
+      <id>docker</id>
+      <properties>
+        <skip.staging.artifacts>true</skip.staging.artifacts>
+        <skip.docker.build>false</skip.docker.build>
+        <skip.docker.tag>false</skip.docker.tag>
+        <skip.docker.push>false</skip.docker.push>
+      </properties>
+    </profile>
+  </profiles>
 </project>