X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=authz-service%2Fpom.xml;h=b6b4b2fabfb51254a959aee9ae90ec38987a264e;hb=a2ac6780451f31bf01718cf4e3f196ac421186fd;hp=6abe62d3864c405a991fd71cf2e8c0374fd759b1;hpb=c548cc96e7cf048894686a12dce8d77111378317;p=aaf%2Fauthz.git

diff --git a/authz-service/pom.xml b/authz-service/pom.xml
index 6abe62d3..b6b4b2fa 100644
--- a/authz-service/pom.xml
+++ b/authz-service/pom.xml
@@ -25,9 +25,9 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>com.att.authz</groupId>
+		<groupId>org.onap.aaf.authz</groupId>
 		<artifactId>parent</artifactId>
-		<version>2.0.15</version>
+		<version>1.0.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 		
@@ -53,18 +53,42 @@
 	<properties>
 		<maven.test.failure.ignore>true</maven.test.failure.ignore>
 		<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>
+		<docker.registry>nexus3.onap.org</docker.registry>
+		<distFilesRootDirPath>opt/app/aaf/${project.artifactId}/${project.version}</distFilesRootDirPath>
+			<sonar.language>java</sonar.language>
+		<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>
+		<sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>
+		<sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
+		<sonar.projectVersion>${project.version}</sonar.projectVersion>
+        <nexusproxy>https://nexus.onap.org</nexusproxy>
+		<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>
 	</properties>
 	
 		
 	<dependencies>
         <dependency>
-            <groupId>com.att.authz</groupId>
+            <groupId>org.onap.aaf.authz</groupId>
             <artifactId>authz-client</artifactId>
+			<version>${project.version}</version>
         </dependency>
-
+		
+		<dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>authz-cmd</artifactId>
+			<version>${project.version}</version>
+        </dependency>		
         <dependency>
-            <groupId>com.att.authz</groupId>
+            <groupId>org.onap.aaf.authz</groupId>
             <artifactId>authz-core</artifactId>
+			<version>${project.version}</version>
             <exclusions>
 			  <exclusion> 
 					<groupId>javax.servlet</groupId>
@@ -74,32 +98,30 @@
         </dependency>
         
         <dependency>
-            <groupId>com.att.authz</groupId>
+            <groupId>org.onap.aaf.authz</groupId>
             <artifactId>authz-cass</artifactId>
+			<version>${project.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>com.att.authz</groupId>
+            <groupId>org.onap.aaf.authz</groupId>
             <artifactId>authz-defOrg</artifactId>
             <version>${project.version}</version>
         </dependency>
-    
-    
-       <!-- <dependency>
-            <groupId>com.att.authz</groupId>
-            <artifactId>authz-att</artifactId>
-        </dependency>   --> 
+
 
 	
         <dependency > 
-			<groupId>com.att.inno</groupId>
+			<groupId>org.onap.aaf.inno</groupId>
 			<artifactId>env</artifactId>
+			<version>${project.innoVersion}</version>
 		</dependency>
 
 
 		<dependency>
-			<groupId>com.att.cadi</groupId>
+			<groupId>org.onap.aaf.cadi</groupId>
 			<artifactId>cadi-core</artifactId>
+			<version>${project.cadiVersion}</version>
 		</dependency>
 
 		<dependency>
@@ -108,28 +130,208 @@
 		</dependency>
 
  		<dependency>
-			<groupId>com.att.inno</groupId>
+			<groupId>org.onap.aaf.inno</groupId>
 			<artifactId>rosetta</artifactId>
+			<version>${project.innoVersion}</version>
 		</dependency>
 		<dependency>
-			<groupId>com.att.cadi</groupId>
+			<groupId>org.onap.aaf.cadi</groupId>
 			<artifactId>cadi-aaf</artifactId>
-		</dependency>
-
-	
-	
-		<!-- 
-		<dependency>
-			<groupId>com.att.aft</groupId>
-			<artifactId>aft-notifymgr-api</artifactId>
-			<version>1.0.1</version>
-		</dependency>
-        -->
-       
+			<version>${project.cadiVersion}</version>
+		</dependency>   
 	</dependencies>
 	
 	<build>
 	    <plugins>
+		<plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.7</version>
+                <executions>
+                    <execution>
+                        <id>copy-docker-file</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${dockerLocation}</outputDirectory>
+                            <overwrite>true</overwrite>
+                            <resources>
+                                <resource>
+                                    <directory>${basedir}/src/main/resources/docker</directory>
+                                    <filtering>true</filtering>
+                                    <includes>
+                                        <include>**/*</include>
+                                    </includes>
+                                </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>
+        <id>copy-resources-1</id>
+        <phase>validate</phase>
+        <goals>
+          <goal>copy-resources</goal>
+        </goals>
+        <configuration>
+         <outputDirectory>${project.build.directory}/opt/dme2reg/</outputDirectory>
+          <resources>
+            <resource>
+                        <directory>${project.basedir}/src/main/resources/dme2reg/</directory> 
+						 <includes>
+						 <include>**/*.txt</include>
+                        </includes>
+                    </resource>
+          </resources>
+        </configuration>
+      </execution>
+      <execution>
+        <id>copy-resources-2</id>
+        <phase>validate</phase>
+        <goals>
+          <goal>copy-resources</goal>
+        </goals>
+        <configuration>
+          <outputDirectory>${project.build.directory}/opt/app/aaf/authz-service/etc</outputDirectory>
+          <resources>
+            <resource>
+                        <directory>${project.basedir}/src/main/resources/etc</directory>
+                        <includes>
+                            <include>**/**</include>
+                        </includes>
+                    </resource>
+          </resources>
+        </configuration>
+      </execution>
+	  
+	   <execution>
+        <id>copy-resources-3</id>
+        <phase>validate</phase>
+        <goals>
+          <goal>copy-resources</goal>
+        </goals>
+        <configuration>
+          <outputDirectory>${project.build.directory}/opt/app/aaf/authz-service/lib</outputDirectory>
+          <resources>
+            <resource>
+                        <directory>${project.basedir}/../authz-cmd/target</directory>
+                        <includes>
+                            <include>**/*.jar</include>
+                        </includes>
+                    </resource>
+          </resources>
+        </configuration>
+      </execution>
+	  <execution>
+        <id>copy-resources-4</id>
+        <phase>validate</phase>
+        <goals>
+          <goal>copy-resources</goal>
+        </goals>
+        <configuration>
+          <outputDirectory>${project.build.directory}/opt/app/aaf/authz-service/</outputDirectory>
+          <resources>
+            <resource>
+                        <directory>${project.basedir}/../authz-cmd</directory>
+                        <includes>
+                            <include>**/aafcli.sh</include>
+                        </includes>
+                    </resource>
+          </resources>
+        </configuration>
+      </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/etc/</outputDirectory>
+          <resources>
+            <resource>
+                        <directory>${project.basedir}/src/main/config</directory>
+                        <includes>
+                            <include>**/**</include>
+                        </includes>
+                    </resource>
+          </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>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>2.10</version>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.directory}/opt/app/aaf/authz-service/lib</outputDirectory>
+							<overWriteReleases>false</overWriteReleases>
+							<overWriteSnapshots>false</overWriteSnapshots>
+							<overWriteIfNewer>true</overWriteIfNewer>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+				
 	            <plugin>
 	                <groupId>org.codehaus.mojo</groupId>
 	                <artifactId>exec-maven-plugin</artifactId>
@@ -150,9 +352,9 @@
 	                        <classpath>
 	                        
 	                        </classpath>
-	                        <argument>com.att.authz.service.AuthAPI</argument>
+	                        <argument>org.onap.aaf.authz.service.AuthAPI</argument>
 	
-	                   <argument>service=com.att.authz.AuthorizationService/version=2.0/envContext=DEV/routeOffer=Dev</argument>
+	                   <argument>service=org.onap.aaf.authz.AuthorizationService/version=2.0/envContext=DEV/routeOffer=Dev</argument>
 	                    </arguments>
 	                </configuration>
 	            </plugin>
@@ -167,14 +369,7 @@
 					</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>
@@ -207,39 +402,115 @@
 		      </executions>
 		    </plugin>
 			
-		<plugin>
-			<groupId>org.sonatype.plugins</groupId>
-			<artifactId>nexus-staging-maven-plugin</artifactId>
-			<version>1.6.7</version>
-			<extensions>true</extensions>
-			<configuration>
-			<serverId>ossrhdme</serverId>
-			<nexusUrl>https://oss.sonatype.org/</nexusUrl>
-			<autoReleaseAfterClose>true</autoReleaseAfterClose>
-			</configuration>
-		</plugin>
-
+<plugin>
+				<groupId>org.sonatype.plugins</groupId>
+				<artifactId>nexus-staging-maven-plugin</artifactId>
+				<version>1.6.7</version>
+				<extensions>true</extensions>
+				<configuration>
+					<nexusUrl>${nexusproxy}</nexusUrl>
+					<stagingProfileId>176c31dfe190a</stagingProfileId>
+					<serverId>ecomp-staging</serverId>
+				</configuration>
+			</plugin>		
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+				<version>0.7.7.201606060606</version>
+				<configuration>
+					<dumpOnExit>true</dumpOnExit>
+					<includes>
+						<include>org.onap.aaf.*</include>
+					</includes>
+				</configuration>
+				<executions>
+					<execution>
+						<id>pre-unit-test</id>
+						<goals>
+							<goal>prepare-agent</goal>
+						</goals>
+						<configuration>
+							<destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
+							<!-- <append>true</append> -->
+						</configuration>
+					</execution>
+					<execution>
+						<id>pre-integration-test</id>
+						<phase>pre-integration-test</phase>
+						<goals>
+							<goal>prepare-agent</goal>
+						</goals>
+						<configuration>
+							<destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
+							<!-- <append>true</append> -->
+						</configuration>
+					</execution>
+					<execution>
+                        <goals>
+                            <goal>merge</goal>
+                        </goals>
+                        <phase>post-integration-test</phase>
+                        <configuration>
+                            <fileSets>
+                                <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">
+                                    <directory>${project.build.directory}/coverage-reports</directory>
+                                    <includes>
+                                        <include>*.exec</include>
+                                    </includes>
+                                </fileSet>
+                            </fileSets>
+                            <destFile>${project.build.directory}/jacoco-dev.exec</destFile>
+                        </configuration>
+                    </execution>
+				</executions>
+			</plugin>
 		
 			</plugins>
-		<pluginManagement>
-			<plugins/>
-		</pluginManagement>
+
 	</build>
 
-	<distributionManagement>
-    		<snapshotRepository>
-      			<id>ossrhdme</id>
-      			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
-    		</snapshotRepository>
-    		<repository>
-      			<id>ossrhdme</id>
-      			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-    		</repository>
+		<distributionManagement>
+		<repository>
+			<id>ecomp-releases</id>
+			<name>AAF Release Repository</name>
+			<url>${nexusproxy}${releaseNexusPath}</url>
+		</repository>
+		<snapshotRepository>
+			<id>ecomp-snapshots</id>
+			<name>AAF Snapshot Repository</name>
+			<url>${nexusproxy}${snapshotNexusPath}</url>
+		</snapshotRepository>
+		<site>
+			<id>ecomp-site</id>
+			<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>
 	
-	<scm>
-		<connection>https://github.com/att/AAF.git</connection>
-		<developerConnection>${project.scm.connection}</developerConnection>
-		<url>http://github.com/att/AAF/tree/master</url>
-	</scm>
+	<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>
 </project>