From a9d2108ed04172d2a54a8a317350946c83b0bbde Mon Sep 17 00:00:00 2001
From: sg481n <sg481n@att.com>
Date: Sat, 23 Sep 2017 14:26:06 +0000
Subject: Update License & modify properties in aaf/authz

Updated license file & sitepath modified and O-parent latest added to
parent pom of aaf/authz,Javadocs plugin version added & duplicate staging plugin
removed.

Issue-id: AAF-59
Change-Id: I13a843d1b1868a12b0f0387ff2ba99e516c7601f
Signed-off-by: sg481n <sg481n@att.com>
---
 authz-service/pom.xml | 80 ++++++++++++++++-----------------------------------
 1 file changed, 24 insertions(+), 56 deletions(-)

(limited to 'authz-service')

diff --git a/authz-service/pom.xml b/authz-service/pom.xml
index d589b815..34760557 100644
--- a/authz-service/pom.xml
+++ b/authz-service/pom.xml
@@ -69,7 +69,7 @@
 		<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>
 	</properties>
 	
 		
@@ -144,33 +144,7 @@
    <profile>	
 	<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>
@@ -201,6 +175,26 @@
     <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>
       <execution>
         <id>copy-resources-1</id>
         <phase>validate</phase>
@@ -375,6 +369,7 @@
 		<plugin>
 			<groupId>org.apache.maven.plugins</groupId>
 			<artifactId>maven-javadoc-plugin</artifactId>
+			<version>2.10.4</version>
 			<configuration>
 			<failOnError>false</failOnError>
 			</configuration>
@@ -487,32 +482,5 @@
 			<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>
+
 </project>
-- 
cgit 1.2.3-korg