From 2bc353807bf3f6db1ee4b7000839432c467b1c75 Mon Sep 17 00:00:00 2001
From: sg481n <sg481n@att.com>
Date: Sat, 23 Sep 2017 15:50:15 +0000
Subject: [PATCH] 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.Authz-core module sitepath updated.Profiles added in authz-service.

Change-Id: Icd9661a4d1a134062c9c88dbc9c8bd29362be2a7
Issue-id: AAF-59
Signed-off-by: sg481n <sg481n@att.com>
---
 authz-core/pom.xml    |  2 +-
 authz-service/pom.xml | 18 ++++++++++++++----
 docs/index.rst        | 11 +++++------
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/authz-core/pom.xml b/authz-core/pom.xml
index 36c72e64..ef361b48 100644
--- a/authz-core/pom.xml
+++ b/authz-core/pom.xml
@@ -64,7 +64,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>
 	<dependencies>
 		<dependency>
diff --git a/authz-service/pom.xml b/authz-service/pom.xml
index 34760557..674f4101 100644
--- a/authz-service/pom.xml
+++ b/authz-service/pom.xml
@@ -140,8 +140,8 @@
 			<version>${project.cadiVersion}</version>
 		</dependency>   
 	</dependencies>
-<profiles>
-   <profile>	
+
+	
 	<build>
 	    <plugins>
 		
@@ -464,8 +464,18 @@
 			</plugins>
 
 	</build>
-</profile>
-</profiles>
+	<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>
+
 		<distributionManagement>
 		<repository>
 			<id>ecomp-releases</id>
diff --git a/docs/index.rst b/docs/index.rst
index 03195bd6..86c6035c 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -24,12 +24,11 @@ Introduction
 ------------
 AAF contains some elements of Role Based Authorization, but includes Attribute Based Authorization elements as well. 
 
-.. image:: aaf-object-model.jpeg
-   :height: 600 px
-   :width: 800 px
-   :scale: 100 %
-   :alt: AAF highlevel Object Model
-   :align: center
+|image0|
+
+.. |image0| image:: aaf-object-model.jpeg
+   :height: 600px
+   :width: 800px
 
 
 Essential Components
-- 
2.16.6