Merge "Update Lifecycle state to mature"

diff --git a/INFO.yaml b/INFO.yaml
index 7cc19d7..014c5e7 100644 (file)
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -4,11 +4,11 @@ project_creation_date: '2017-05-03'
 project_category: ''
 lifecycle_state: 'Mature'
 project_lead: &onap_aai_ptl
-    name: 'James Forsyth'
-    email: 'jf2512@att.com'
-    id: 'jimmydot'
+    name: 'William Reehil'
+    email: 'william.reehil@att.com'
     company: 'ATT'
-    timezone: 'America/Detroit'
+    id: 'wreehil'
+    timezone: 'America/New_York'
 primary_contact: *onap_aai_ptl
 issue_tracking:
     type: 'jira'
@@ -46,6 +46,11 @@ committers:
       company: 'ATT'
       id: 'vk250x'
       timezone: 'America/New_York'
+    - name: 'James Forsyth'
+      email: 'jf2512@att.com'
+      id: 'jimmydot'
+      company: 'ATT'
+      timezone: 'America/Detroit'
 tsc:
     approval: 'https://lists.onap.org/g/onap-tsc'
     changes:
@@ -55,3 +60,6 @@ tsc:
         - type: 'removal'
           name: 'Tian Lee'
           link: 'https://lists.onap.org/g/onap-tsc/message/6227'
+        - type: 'Addition'
+          name: 'William Reehil'
+          link: 'https://lists.onap.org/g/onap-tsc/message/6506'

diff --git a/docs/conf.py b/docs/conf.py
index 8f40e8b..5371015 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -12,4 +12,4 @@ intersphinx_mapping = {}
 html_last_updated_fmt = '%d-%b-%y %H:%M'
 
 def setup(app):
-    app.add_stylesheet("css/ribbon_onap.css")
+    app.add_stylesheet("css/ribbon.css")

diff --git a/sparkybe-onap-application/pom.xml b/sparkybe-onap-application/pom.xml
index 485542f..9f179f9 100644 (file)
--- a/sparkybe-onap-application/pom.xml
+++ b/sparkybe-onap-application/pom.xml
@@ -229,7 +229,7 @@
         <dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>eclipselink</artifactId>
-            <version>2.6.2</version>
+            <version>2.7.7</version>
         </dependency>
 
         <dependency>

diff --git a/sparkybe-onap-service/pom.xml b/sparkybe-onap-service/pom.xml
index 7a25a9f..909e641 100644 (file)
--- a/sparkybe-onap-service/pom.xml
+++ b/sparkybe-onap-service/pom.xml
@@ -218,7 +218,7 @@ some of the depedencies should probably have a scope of provided so they don't a
                <dependency>
                        <groupId>org.eclipse.persistence</groupId>
                        <artifactId>eclipselink</artifactId>
-                       <version>2.6.2</version>
+                       <version>2.7.7</version>
                </dependency>
 
                <dependency>
@@ -313,6 +313,24 @@ some of the depedencies should probably have a scope of provided so they don't a
                        </exclusions>
                </dependency>
 
+               <dependency>
+                       <groupId>jakarta.xml.bind</groupId>
+                       <artifactId>jakarta.xml.bind-api</artifactId>
+                       <version>2.3.3</version>
+               </dependency>
+
+               <dependency>
+                       <groupId>javax.json</groupId>
+                       <artifactId>javax.json-api</artifactId>
+                       <version>1.1</version>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.glassfish</groupId>
+                       <artifactId>javax.json</artifactId>
+                       <version>1.1</version>
+               </dependency>
+
                <!-- Test dependencies -->
 
                <dependency>