Merge "Update M2/3 API Docs Update M2/3 Release Notes"

4 files changed, 41 insertions, 14 deletions

diff --git a/auth/auth-cass/.gitignore b/auth/auth-cass/.gitignore
index 5fd2ede3..d0b9b474 100644
--- a/auth/auth-cass/.gitignore
+++ b/auth/auth-cass/.gitignore
@@ -2,3 +2,4 @@
 /.project
 /target/
 /.classpath
+/*.tgz
diff --git a/docs/sections/development/index.rst b/docs/sections/development/index.rst
index 623da6aa..4115c15c 100644
--- a/docs/sections/development/index.rst
+++ b/docs/sections/development/index.rst
@@ -49,6 +49,25 @@ your accessing machine:
 
     10.12.6.214 aaf-onap-beijing-test aaf-onap-beijing-test.osaaf.org
 
+--------------------
+Finding AAF Services
+--------------------
+
+AAF can be run as standalone Java Services, Docker and Kubernetes. For Kubernetes and some Docker installs, AAF's Services  need to be able to be contacted both inside the K8S, not just one name or port. 
+
+AAF has a Locator Service, default port of 8095, which will give the URLs of Running Services.  The CADI Client uses this, but any Authenticated Client may make queries.
+
+With El Alto, you can request Internal or External URLs.
+
+Example
+  * assumes ONAP Test Env URL, and access to ONAP Test Systems
+  * put URL in browser
+
+External URL:https://aaf-onap-test.osaaf.org:8095/locate/org.osaaf.aaf.service:2.1
+Internal URL:https://aaf-onap-test.osaaf.org:8095/locate/onap.org.osaaf.aaf.service:2.1
+
+Where "onap" is the Container name
+
 ------------------------------
 Environment Artifacts (AAF FS)
 ------------------------------
diff --git a/docs/sections/release-notes.rst b/docs/sections/release-notes.rst
index a6b4806c..437aa43e 100644
--- a/docs/sections/release-notes.rst
+++ b/docs/sections/release-notes.rst
@@ -5,6 +5,22 @@
 Release Notes
 =============
 
+Version: 2.1.15 (El Alto, Early Drop, 5.0.0)
+---------------------------------------------
+
+:Release Date: 2019-08-12
+
+**New Features**
+El Alto is a consolidation release.  New Features are not Added.  
+However, for El Alto, ONAP is propagating the AAF Auto-Configuration and Certificate Generation feature from Dublin, see below
+
+An important change, however, is that the AAF Locator requires internal K8s Apps to use 
+	internal-to-K8s Service URL tags as (example) "onap.org.osaaf.aaf.service:2.1" 
+        external-to-K8s Service URL tags as (example) "org.osaaf.aaf.service.2.1"
+
+**Bug Fixes**
+	- `AAF-859 <https://jira.onap.org/browse/AAF-859>`_ Images hardcoded in AAF helm deployment yamls
+
 Version: 2.1.13 (Dublin, 4.0.0-ONAP)
 ---------------------------------------
 
@@ -91,11 +107,6 @@ Note: AAF did not create new artifacts for Casablanca Maintenance Release.
 
  - AAF code has been formally scanned during build time using NexusIQ and all Critical vulnerabilities have been addressed, items that remain open have been assessed for risk and determined to be false positive. The AAF open Critical security vulnerabilities and their risk assessment have been documented as part of the `project <https://wiki.onap.org/pages/viewpage.action?pageId=43386201>`_.
 
-**Quick Links:**
- 	- `AAF project page <https://wiki.onap.org/display/DW/Application+Authorization+Framework+Project>`_
- 	- `CII Best Practices Silver Badge information for AAF <https://bestpractices.coreinfrastructure.org/en/projects/2303?criteria_level=1>`_
- 	- `CII Best Practices Passing Badge information for AAF <https://bestpractices.coreinfrastructure.org/en/projects/2303?criteria_level=0>`_
- 	- `Project Vulnerability Review Table for AAF <https://wiki.onap.org/pages/viewpage.action?pageId=43386201>`_
 
 **Upgrade Notes**
   NA
@@ -133,10 +144,13 @@ Version: 2.1.1 (Beijing, 2.0.0-ONAP)
      - Cassandra Instance in Kubernetes ONAP Test environment is a single instance.  REAL deployments should follow global, multi-datacenter deployment strategies per Cassandra recommendations.
 
 
-**Quick Links:**
+================
+Quick Links
+================
  	- `AAF project page <https://wiki.onap.org/display/DW/Application+Authorization+Framework+Project>`_
+ 	- `CII Best Practices Silver Badge information for AAF <https://bestpractices.coreinfrastructure.org/en/projects/2303?criteria_level=1>`_
  	- `CII Best Practices Passing Badge information for AAF <https://bestpractices.coreinfrastructure.org/en/projects/2303?criteria_level=0>`_
- 	- `Project Vulnerability Review Table for AAF <https://wiki.onap.org/pages/viewpage.action?pageId=43385140>`_
+ 	- `Project Vulnerability Review Table for AAF <https://wiki.onap.org/pages/viewpage.action?pageId=43386201>`_
 
 
 
diff --git a/pom.xml b/pom.xml
index 1926eb0e..976de89d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,13 +41,6 @@
         <sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>
 
         <maven.test.failure.ignore>false</maven.test.failure.ignore>
-        <!-- SONAR -->
-        <jacoco.version>0.7.7.201606060606</jacoco.version>
-        <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-        <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-        <!-- Default Sonar configuration -->
-        <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
-        <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
         <!-- Note: This list should match jacoco-maven-plugin's exclusion list 
             below -->
         <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>