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>

diff --git a/authz-core/pom.xml b/authz-core/pom.xml
index 36c72e6..ef361b4 100644 (file)
--- a/authz-core/pom.xml
+++ b/authz-core/pom.xml
@@ -64,7 +64,7 @@
                <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
                <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>\r
                <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>\r
-               <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>\r
+               <sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>\r
 </properties>\r
        <dependencies>\r
                <dependency>\r

diff --git a/authz-service/pom.xml b/authz-service/pom.xml
index 3476055..674f410 100644 (file)
--- a/authz-service/pom.xml
+++ b/authz-service/pom.xml
@@ -140,8 +140,8 @@
                        <version>${project.cadiVersion}</version>\r
                </dependency>   \r
        </dependencies>\r
-<profiles>\r
-   <profile>   \r
+\r
+       \r
        <build>\r
            <plugins>\r
                \r
@@ -464,8 +464,18 @@
                        </plugins>\r
 \r
        </build>\r
-</profile>\r
-</profiles>\r
+       <profiles>\r
+    <profile>\r
+      <id>docker</id>\r
+      <properties>\r
+        <skip.staging.artifacts>true</skip.staging.artifacts>\r
+        <skip.docker.build>false</skip.docker.build>\r
+        <skip.docker.tag>false</skip.docker.tag>\r
+        <skip.docker.push>false</skip.docker.push>\r
+      </properties>\r
+    </profile>\r
+  </profiles>\r
+\r
                <distributionManagement>\r
                <repository>\r
                        <id>ecomp-releases</id>\r

diff --git a/docs/index.rst b/docs/index.rst
index 03195bd..86c6035 100644 (file)
--- 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