From eeb6d6829a92626139d1a4e332bac3d4061e97a6 Mon Sep 17 00:00:00 2001
From: Brian Freeman <bf1936@att.com>
Date: Tue, 20 Aug 2019 14:08:35 -0500
Subject: [PATCH 01/16] Add INFO.yaml

Issue-ID: INT-1214
Change-Id: I36c05ac27a26fce38d4337da6d9a035043b353bb
Signed-off-by: Brian Freeman <bf1936@att.com>
---
 INFO.yaml | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 INFO.yaml

diff --git a/INFO.yaml b/INFO.yaml
new file mode 100644
index 0000000..828c0fe
--- /dev/null
+++ b/INFO.yaml
@@ -0,0 +1,56 @@
+---
+project: 'oparent'
+project_creation_date: '2017-02-10'
+lifecycle_state: 'Incubation'
+project_category: ''
+project_lead: &onap_releng_ptl
+    name: 'Yang Xu'
+    email: 'yang.xu3@huawei.com'
+    id: 'xuyang11'
+    company: 'Huawei'
+    timezone: 'America/New_York'
+primary_contact: *onap_releng_ptl
+issue_tracking:
+    type: 'jira'
+    url: 'https://jira.onap.org/projects/INT'
+    key: 'INT'
+mailing_list:
+    type: 'groups.io'
+    url: 'lists.onap.org'
+    tag: '<[sub-project_name]>'
+realtime_discussion: ''
+meetings:
+    - type: 'zoom'
+      agenda: 'https://wiki.onap.org/display/DW/Integration+Meeting+Minutes'
+      url: 'https://wiki.onap.org/pages/viewpage.action?pageId=6593670'
+      server: 'n/a'
+      channel: 'n/a'
+      repeats: 'weekly'
+      time: '14:00 UTC'
+repositories:
+    - 'oparent'
+committers:
+    - <<: *onap_releng_ptl
+    - name: 'Christophe Closset'
+      email: 'cc697w@intl.att.com'
+      company: 'ATT'
+      id: 'ChrisC'
+      timezone: 'Belgium/Namur'
+    - name: 'Marco Platania'
+      email: 'platania@research.att.com'
+      company: 'ATT'
+      id: 'platania'
+      timezone: 'America/New_York'
+    - name: 'Brian Freeman'
+      email: 'bf1936@att.com'
+      company: 'AT&T'
+      id: 'bdfreeman1421'
+      timezone: 'America/New_York'
+    - name: 'Morgan Richomme'
+      email: 'morgan.richomme@orange.com'
+      company: 'Orange'
+      id: 'umry8364'
+      timezone: 'Paris/France'
+tsc:
+    approval: 'https://lists.onap.org/pipermail/onap-tsc'
+    changes:
-- 
2.16.6


From 43601c662afdcc54b1d3eef4a0ab48c43af8c28d Mon Sep 17 00:00:00 2001
From: Pamela Dragosh <pdragosh@research.att.com>
Date: Mon, 19 Aug 2019 12:09:03 -0400
Subject: [PATCH 02/16] Upgrade jetty to 9.4.20.v20190813

Issue-ID: INT-1206
Change-Id: Ia57493410b0b1027a3515f6d319b923830512e4b
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
---
 dependencies/pom.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 35396e5..b263a04 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -27,6 +27,7 @@
   <packaging>pom</packaging>
   <properties>
     <spring.version>5.1.2.RELEASE</spring.version>
+    <jetty.version>9.4.20.v20190813</jetty.version>
   </properties>
   <dependencyManagement>
     <dependencies>
@@ -38,17 +39,17 @@
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-http</artifactId>
-        <version>9.4.14.v20181114</version>
+        <version>${jetty.version}</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-servlet</artifactId>
-        <version>9.4.14.v20181114</version>
+        <version>${jetty.version}</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-server</artifactId>
-        <version>9.4.14.v20181114</version>
+        <version>${jetty.version}</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
-- 
2.16.6


From b30c69d2e5590ac7e4644a97a320c420edd93281 Mon Sep 17 00:00:00 2001
From: Brian Freeman <bf1936@att.com>
Date: Thu, 29 Aug 2019 16:05:47 -0500
Subject: [PATCH 03/16] Update for security El Alto

Issue-ID: INT-1232
Change-Id: I38967644bd3bbf1b1f966fc216eb59262cd62487
Signed-off-by: Brian Freeman <bf1936@att.com>
---
 dependencies/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index b263a04..3171add 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -74,12 +74,12 @@
       <dependency>
         <groupId>commons-beanutils</groupId>
         <artifactId>commons-beanutils</artifactId>
-        <version>1.9.3</version>
+        <version>1.9.4</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomcat.embed</groupId>
         <artifactId>tomcat-embed-core</artifactId>
-        <version>9.0.14</version>
+        <version>9.0.24</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.jackson</groupId>
@@ -99,7 +99,7 @@
       <dependency>
         <groupId>org.webjars</groupId>
         <artifactId>jquery</artifactId>
-        <version>3.3.1-1</version>
+        <version>3.4.1</version>
       </dependency>
       <dependency>
         <groupId>ch.qos.logback</groupId>
-- 
2.16.6


From c263f9fddaa062e73c4107bccd4aad8099494478 Mon Sep 17 00:00:00 2001
From: Pamela Dragosh <pdragosh@research.att.com>
Date: Tue, 3 Sep 2019 14:12:33 -0400
Subject: [PATCH 04/16] Release oparent 2.1.0

El Alto 2.1.p0 oparent release.

Issue-ID: INT-1233
Change-Id: I5840d9f1e963fa680766c3f0fddf25eb4948ec48
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
---
 releases/2.1.0.yaml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 releases/2.1.0.yaml

diff --git a/releases/2.1.0.yaml b/releases/2.1.0.yaml
new file mode 100644
index 0000000..3be36cf
--- /dev/null
+++ b/releases/2.1.0.yaml
@@ -0,0 +1,4 @@
+distribution_type: 'maven'
+version: '2.1.0'
+project: 'oparent'
+log_dir: 'oparent-maven-stage-master/195/'
-- 
2.16.6


From 83516054fb4755e269f4f3b5ed8308851f2f115b Mon Sep 17 00:00:00 2001
From: Brian Freeman <bf1936@att.com>
Date: Wed, 4 Sep 2019 07:35:29 -0500
Subject: [PATCH 05/16] Fix timezones in INFO.yaml

Issue-ID: INT-1214
Change-Id: Ie43ba620cb5d67a2b85f82e3a70dac64258d608b
Signed-off-by: Brian Freeman <bf1936@att.com>
---
 INFO.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/INFO.yaml b/INFO.yaml
index 828c0fe..ac15a93 100644
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -35,7 +35,7 @@ committers:
       email: 'cc697w@intl.att.com'
       company: 'ATT'
       id: 'ChrisC'
-      timezone: 'Belgium/Namur'
+      timezone: 'Europe/Brussels'
     - name: 'Marco Platania'
       email: 'platania@research.att.com'
       company: 'ATT'
@@ -50,7 +50,7 @@ committers:
       email: 'morgan.richomme@orange.com'
       company: 'Orange'
       id: 'umry8364'
-      timezone: 'Paris/France'
+      timezone: 'Europe/Paris'
 tsc:
     approval: 'https://lists.onap.org/pipermail/onap-tsc'
     changes:
-- 
2.16.6


From af3385e798215bbf4017a6e3c2694e962339302c Mon Sep 17 00:00:00 2001
From: Pamela Dragosh <pdragosh@research.att.com>
Date: Tue, 3 Sep 2019 14:38:50 -0400
Subject: [PATCH 06/16] Bump oparent to 2.2.0-SNAPSHOT

After release 2.1.0, bump the version. Followed same as
this review: https://gerrit.onap.org/r/c/oparent/+/90407

Issue-ID: INT-1233
Change-Id: Ie139ab223870986d9dfcc443a18af2446884778e
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
---
 checkstyle/pom.xml       | 2 +-
 dependencies-clm/pom.xml | 2 +-
 dependencies/pom.xml     | 2 +-
 license/pom.xml          | 2 +-
 oparent-python/pom.xml   | 2 +-
 oparent/pom.xml          | 6 +++---
 pom.xml                  | 2 +-
 version.properties       | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/checkstyle/pom.xml b/checkstyle/pom.xml
index 87061c0..ff71c36 100644
--- a/checkstyle/pom.xml
+++ b/checkstyle/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.onap.oparent</groupId>
     <artifactId>version</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>checkstyle</artifactId>
diff --git a/dependencies-clm/pom.xml b/dependencies-clm/pom.xml
index 87e4f16..5965479 100644
--- a/dependencies-clm/pom.xml
+++ b/dependencies-clm/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.onap.oparent</groupId>
     <artifactId>oparent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <relativePath>../oparent</relativePath>
   </parent>
   <artifactId>dependencies-clm</artifactId>
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 3171add..f82c5e1 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.onap.oparent</groupId>
     <artifactId>version</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>dependencies</artifactId>
diff --git a/license/pom.xml b/license/pom.xml
index f0f24ad..b01b991 100644
--- a/license/pom.xml
+++ b/license/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.onap.oparent</groupId>
     <artifactId>version</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>onap-license</artifactId>
diff --git a/oparent-python/pom.xml b/oparent-python/pom.xml
index 264e647..5b7b3b6 100644
--- a/oparent-python/pom.xml
+++ b/oparent-python/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.onap.oparent</groupId>
     <artifactId>oparent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <relativePath>../oparent</relativePath>
   </parent>
   <packaging>pom</packaging>
diff --git a/oparent/pom.xml b/oparent/pom.xml
index a0e78ed..ea5a479 100644
--- a/oparent/pom.xml
+++ b/oparent/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.onap.oparent</groupId>
     <artifactId>version</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>oparent</artifactId>
@@ -278,7 +278,7 @@
       <dependency>
         <groupId>org.onap.oparent</groupId>
         <artifactId>dependencies</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.2.0-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -424,7 +424,7 @@
           <dependency>
             <groupId>org.onap.oparent</groupId>
             <artifactId>checkstyle</artifactId>
-            <version>2.1.0-SNAPSHOT</version>
+            <version>2.2.0-SNAPSHOT</version>
           </dependency>
         </dependencies>
         <executions>
diff --git a/pom.xml b/pom.xml
index 9eda9e0..894e4c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
   <name>oparent</name>
   <groupId>org.onap.oparent</groupId>
   <artifactId>version</artifactId>
-  <version>2.1.0-SNAPSHOT</version>
+  <version>2.2.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <modules>
     <!-- oparent tools -->
diff --git a/version.properties b/version.properties
index ec3a66d..cd49622 100644
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
 # because they are used in Jenkins, whose plug-in doesn't support
 
 major_version=2
-minor_version=1
+minor_version=2
 patch_version=0
 
 base_version=${major_version}.${minor_version}.${patch_version}
-- 
2.16.6


From c2cdc2a06dba09a00bfa1b47fcc0e26c6a744a89 Mon Sep 17 00:00:00 2001
From: Brian Freeman <bf1936@att.com>
Date: Wed, 4 Sep 2019 13:06:41 -0500
Subject: [PATCH 07/16] Update onap_oparent_ptl refernces

correct morgan id

Issue-ID: INT-1214
Change-Id: I7f3badd8df78e4e346a0a39cd11f2c1d9df8b387
Signed-off-by: Brian Freeman <bf1936@att.com>
---
 INFO.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/INFO.yaml b/INFO.yaml
index ac15a93..52c02e0 100644
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -3,13 +3,13 @@ project: 'oparent'
 project_creation_date: '2017-02-10'
 lifecycle_state: 'Incubation'
 project_category: ''
-project_lead: &onap_releng_ptl
+project_lead: &onap_oparent_ptl
     name: 'Yang Xu'
     email: 'yang.xu3@huawei.com'
     id: 'xuyang11'
     company: 'Huawei'
     timezone: 'America/New_York'
-primary_contact: *onap_releng_ptl
+primary_contact: *onap_oparent_ptl
 issue_tracking:
     type: 'jira'
     url: 'https://jira.onap.org/projects/INT'
@@ -30,7 +30,7 @@ meetings:
 repositories:
     - 'oparent'
 committers:
-    - <<: *onap_releng_ptl
+    - <<: *onap_oparent_ptl
     - name: 'Christophe Closset'
       email: 'cc697w@intl.att.com'
       company: 'ATT'
@@ -49,7 +49,7 @@ committers:
     - name: 'Morgan Richomme'
       email: 'morgan.richomme@orange.com'
       company: 'Orange'
-      id: 'umry8364'
+      id: 'mrichomme'
       timezone: 'Europe/Paris'
 tsc:
     approval: 'https://lists.onap.org/pipermail/onap-tsc'
-- 
2.16.6


From bedb48489ecbe5204169b5f566de53b27f340c1b Mon Sep 17 00:00:00 2001
From: Brian Freeman <bf1936@att.com>
Date: Fri, 1 Nov 2019 08:48:01 -0500
Subject: [PATCH 08/16] Uprev to 3.0.0 for Java 11

Update copyright modifications

Issue-ID: INT-1352
Change-Id: I7a574c52398990ac38e6e5da287dc424933babfb
Signed-off-by: Brian Freeman <bf1936@att.com>
---
 README.md                |  6 ++++++
 checkstyle/pom.xml       |  3 ++-
 dependencies-clm/pom.xml |  4 ++--
 dependencies/pom.xml     |  4 ++--
 license/pom.xml          |  3 ++-
 oparent-python/pom.xml   | 18 +++++++++++++++++-
 oparent/pom.xml          |  7 ++++---
 pom.xml                  |  4 ++--
 version.properties       |  4 ++--
 9 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index a507773..848f933 100644
--- a/README.md
+++ b/README.md
@@ -12,3 +12,9 @@ ONAP O-Parent provides common default settings for all the projects participatin
 
 All projects participating in simultaneous release will inherit defaults from O-Parent.
 
+
+elalto branch 2.X will continue to be used for Java 8/Java 9 dependencies
+master branch 3.X will be used for JAva 11 dependencies
+
+Projects should refer to either the 2.X  release Java 8/9 or 3.X release as appropriate.
+
diff --git a/checkstyle/pom.xml b/checkstyle/pom.xml
index ff71c36..3e367da 100644
--- a/checkstyle/pom.xml
+++ b/checkstyle/pom.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
    Copyright (c) 2016-2017 Huawei Technologies Co., Ltd.
+   Modifications copyright (C) 2019 AT&T Intellectual Property
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -19,7 +20,7 @@
   <parent>
     <groupId>org.onap.oparent</groupId>
     <artifactId>version</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>checkstyle</artifactId>
diff --git a/dependencies-clm/pom.xml b/dependencies-clm/pom.xml
index 5965479..c8ba954 100644
--- a/dependencies-clm/pom.xml
+++ b/dependencies-clm/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (c) 2018 AT&T Technologies and others.
+   Copyright (c) 2018-2019 AT&T Technologies and others.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.onap.oparent</groupId>
     <artifactId>oparent</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
     <relativePath>../oparent</relativePath>
   </parent>
   <artifactId>dependencies-clm</artifactId>
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index f82c5e1..0acfb6c 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (c) 2018 AT&T Technologies and others.
+   Copyright (c) 2018-2019 AT&T Technologies and others.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.onap.oparent</groupId>
     <artifactId>version</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>dependencies</artifactId>
diff --git a/license/pom.xml b/license/pom.xml
index b01b991..108fc07 100644
--- a/license/pom.xml
+++ b/license/pom.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
    Copyright (c) 2016-2017 Huawei Technologies Co., Ltd.
+   Modifications copyright (C) 2019 AT&T Intellectual Property
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -19,7 +20,7 @@
   <parent>
     <groupId>org.onap.oparent</groupId>
     <artifactId>version</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>onap-license</artifactId>
diff --git a/oparent-python/pom.xml b/oparent-python/pom.xml
index 5b7b3b6..e44df8f 100644
--- a/oparent-python/pom.xml
+++ b/oparent-python/pom.xml
@@ -1,10 +1,26 @@
 <?xml version="1.0"?>
+<!--
+   Copyright (c) 2016-2018 Huawei Technologies Co., Ltd.
+   Modifications copyright (C) 2017-2019 AT&T Intellectual Property
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.onap.oparent</groupId>
     <artifactId>oparent</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
     <relativePath>../oparent</relativePath>
   </parent>
   <packaging>pom</packaging>
diff --git a/oparent/pom.xml b/oparent/pom.xml
index ea5a479..ec1c865 100644
--- a/oparent/pom.xml
+++ b/oparent/pom.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
    Copyright (c) 2016-2017 Huawei Technologies Co., Ltd.
+   Modifications copyright (C) 2019 AT&T Intellectual Property
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -19,7 +20,7 @@
   <parent>
     <groupId>org.onap.oparent</groupId>
     <artifactId>version</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>oparent</artifactId>
@@ -278,7 +279,7 @@
       <dependency>
         <groupId>org.onap.oparent</groupId>
         <artifactId>dependencies</artifactId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -424,7 +425,7 @@
           <dependency>
             <groupId>org.onap.oparent</groupId>
             <artifactId>checkstyle</artifactId>
-            <version>2.2.0-SNAPSHOT</version>
+            <version>3.0.0-SNAPSHOT</version>
           </dependency>
         </dependencies>
         <executions>
diff --git a/pom.xml b/pom.xml
index 894e4c0..5366244 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
    Copyright (c) 2016-2018 Huawei Technologies Co., Ltd.
-   Modifications copyright (C) 2017 AT&T Intellectual Property
+   Modifications copyright (C) 2017-2019 AT&T Intellectual Property
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
   <name>oparent</name>
   <groupId>org.onap.oparent</groupId>
   <artifactId>version</artifactId>
-  <version>2.2.0-SNAPSHOT</version>
+  <version>3.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <modules>
     <!-- oparent tools -->
diff --git a/version.properties b/version.properties
index cd49622..ddc6dd8 100644
--- a/version.properties
+++ b/version.properties
@@ -3,8 +3,8 @@
 # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
 # because they are used in Jenkins, whose plug-in doesn't support
 
-major_version=2
-minor_version=2
+major_version=3
+minor_version=0
 patch_version=0
 
 base_version=${major_version}.${minor_version}.${patch_version}
-- 
2.16.6


From fcd164ac91e84e98af66e7f3bb285a4ae35723ec Mon Sep 17 00:00:00 2001
From: Brian Freeman <bf1936@att.com>
Date: Thu, 7 Nov 2019 15:56:25 -0500
Subject: [PATCH 09/16] Add compiler-plugin example

Issue-ID: INT-1352
Change-Id: I299e39577c76e6cd699049ea06165ce1961da81a
Signed-off-by: Brian Freeman <bf1936@att.com>
---
 pom.xml | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5366244..c85ecaa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,13 +32,17 @@
     <module>dependencies-clm</module>
   </modules>
   <properties>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <!-- sitePath may be overridden in the inheriting POM if desired -->
     <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
-
+    <maven.compiler.release>11</maven.compiler.release>
+    <!-- 
+       In the java 8 version of oparent there were two variables defined for 1.8 source and target. These are no longer
+       applicable in Java 11 but you may be referencing them in your child poms so review and update as appropriate.
+         <maven.compiler.source>1.8</maven.compiler.source>
+         <maven.compiler.target>1.8</maven.compiler.target>
+    -->
     <!--
         The following properties should be defined in your own ~/.m2/settings.xml based on your own build infastructure setup.
         See the settings.xml in this directory for default settings based on the Linux Foundation ONAP infrastructure.
@@ -66,6 +70,22 @@
   <build>
     <pluginManagement>
       <plugins>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <version>3.8.0</version>
+            <configuration>
+               <release>${maven.compiler.release}</release>
+            </configuration>
+        </plugin>
+        <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>versions-maven-plugin</artifactId>
+            <version>2.7</version>
+            <configuration>
+               <generateBackupPoms>false</generateBackupPoms>
+            </configuration>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-deploy-plugin</artifactId>
@@ -146,6 +166,5 @@
         <artifactId>maven-enforcer-plugin</artifactId>
       </plugin>
     </plugins>
-
   </build>
 </project>
-- 
2.16.6


From 6a2d8c71aa39a6f47a683c38267c07cd9a00dfeb Mon Sep 17 00:00:00 2001
From: "John J. Franey" <john.franey@att.com>
Date: Thu, 19 Sep 2019 12:27:10 -0400
Subject: [PATCH 10/16] update version of checkstyle for latest google style
 and jdk 8

Upgrade to use the latest google style (plus onap style).
This latest style adds rules for jdk 8 source level.

Upgrade the version of checkstyle to 8.24.  The latest google
style rules are compatible with 8.24 and later.

Upgrade checkstyle maven plugin to 3.1.0 (from 2.17).

This jdk8 version of checkstyle is active only when the build-time
java runtime is jdk8 or later, otherwise, the original checkstyle
is active.

Issue-ID: INT-1271
Change-Id: Ib190b39efc5a6028ab4874301e6a813f0a36b138
Signed-off-by: John J. Franey <john.franey@att.com>
---
 .../onap-checkstyle/onap-java-style1.8.xml         | 268 +++++++++++++++++++++
 oparent/pom.xml                                    |  54 +++++
 2 files changed, 322 insertions(+)
 create mode 100644 checkstyle/src/main/resources/onap-checkstyle/onap-java-style1.8.xml

diff --git a/checkstyle/src/main/resources/onap-checkstyle/onap-java-style1.8.xml b/checkstyle/src/main/resources/onap-checkstyle/onap-java-style1.8.xml
new file mode 100644
index 0000000..514e75f
--- /dev/null
+++ b/checkstyle/src/main/resources/onap-checkstyle/onap-java-style1.8.xml
@@ -0,0 +1,268 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+          "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+          "https://checkstyle.org/dtds/configuration_1_3.dtd">
+
+<!--
+    Checkstyle configuration that checks the Google coding conventions from Google Java Style
+    that can be found at https://google.github.io/styleguide/javaguide.html
+
+    Checkstyle is very configurable. Be sure to read the documentation at
+    http://checkstyle.sf.net (or in your downloaded distribution).
+
+    To completely disable a check, just comment it out or delete it from the file.
+
+    Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov.
+ -->
+
+<module name = "Checker">
+    <property name="charset" value="UTF-8"/>
+
+    <property name="severity" value="warning"/>
+
+    <property name="fileExtensions" value="java, properties, xml"/>
+    <!-- Excludes all 'module-info.java' files              -->
+    <!-- See https://checkstyle.org/config_filefilters.html -->
+    <module name="BeforeExecutionExclusionFileFilter">
+        <property name="fileNamePattern" value="module\-info\.java$"/>
+    </module>
+    <!-- Checks for whitespace                               -->
+    <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+    <module name="FileTabCharacter">
+        <property name="eachLine" value="true"/>
+    </module>
+
+    <module name="LineLength">
+        <property name="fileExtensions" value="java"/>
+        <property name="max" value="120"/>
+        <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+    </module>
+
+    <module name="TreeWalker">
+        <module name="OuterTypeFilename"/>
+        <module name="IllegalTokenText">
+            <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
+            <property name="format"
+             value="\\u00(09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
+            <property name="message"
+             value="Consider using special escape sequence instead of octal value or Unicode escaped value."/>
+        </module>
+        <module name="AvoidEscapedUnicodeCharacters">
+            <property name="allowEscapesForControlCharacters" value="true"/>
+            <property name="allowByTailComment" value="true"/>
+            <property name="allowNonPrintableEscapes" value="true"/>
+        </module>
+        <module name="AvoidStarImport"/>
+        <module name="OneTopLevelClass"/>
+        <module name="NoLineWrap"/>
+        <module name="EmptyBlock">
+            <property name="option" value="TEXT"/>
+            <property name="tokens"
+             value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
+        </module>
+        <module name="NeedBraces"/>
+        <module name="LeftCurly"/>
+        <module name="RightCurly">
+            <property name="id" value="RightCurlySame"/>
+            <property name="tokens"
+             value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE,
+                    LITERAL_DO"/>
+        </module>
+        <module name="RightCurly">
+            <property name="id" value="RightCurlyAlone"/>
+            <property name="option" value="alone"/>
+            <property name="tokens"
+             value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT,
+                    INSTANCE_INIT"/>
+        </module>
+        <module name="WhitespaceAround">
+            <property name="allowEmptyConstructors" value="true"/>
+            <property name="allowEmptyLambdas" value="true"/>
+            <property name="allowEmptyMethods" value="true"/>
+            <property name="allowEmptyTypes" value="true"/>
+            <property name="allowEmptyLoops" value="true"/>
+            <message key="ws.notFollowed"
+             value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
+            <message key="ws.notPreceded"
+             value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
+        </module>
+        <module name="OneStatementPerLine"/>
+        <module name="MultipleVariableDeclarations"/>
+        <module name="ArrayTypeStyle"/>
+        <module name="MissingSwitchDefault"/>
+        <module name="FallThrough"/>
+        <module name="UpperEll"/>
+        <module name="ModifierOrder"/>
+        <module name="EmptyLineSeparator">
+            <property name="allowNoEmptyLineBetweenFields" value="true"/>
+        </module>
+        <module name="SeparatorWrap">
+            <property name="id" value="SeparatorWrapDot"/>
+            <property name="tokens" value="DOT"/>
+            <property name="option" value="nl"/>
+        </module>
+        <module name="SeparatorWrap">
+            <property name="id" value="SeparatorWrapComma"/>
+            <property name="tokens" value="COMMA"/>
+            <property name="option" value="EOL"/>
+        </module>
+        <module name="SeparatorWrap">
+            <!-- ELLIPSIS is EOL until https://github.com/google/styleguide/issues/258 -->
+            <property name="id" value="SeparatorWrapEllipsis"/>
+            <property name="tokens" value="ELLIPSIS"/>
+            <property name="option" value="EOL"/>
+        </module>
+        <module name="SeparatorWrap">
+            <!-- ARRAY_DECLARATOR is EOL until https://github.com/google/styleguide/issues/259 -->
+            <property name="id" value="SeparatorWrapArrayDeclarator"/>
+            <property name="tokens" value="ARRAY_DECLARATOR"/>
+            <property name="option" value="EOL"/>
+        </module>
+        <module name="SeparatorWrap">
+            <property name="id" value="SeparatorWrapMethodRef"/>
+            <property name="tokens" value="METHOD_REF"/>
+            <property name="option" value="nl"/>
+        </module>
+        <module name="PackageName">
+            <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
+            <message key="name.invalidPattern"
+             value="Package name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="TypeName">
+            <message key="name.invalidPattern"
+             value="Type name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="MemberName">
+            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
+            <message key="name.invalidPattern"
+             value="Member name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="ParameterName">
+            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
+            <message key="name.invalidPattern"
+             value="Parameter name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="LambdaParameterName">
+            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
+            <message key="name.invalidPattern"
+                     value="Lambda parameter name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="CatchParameterName">
+            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
+            <message key="name.invalidPattern"
+             value="Catch parameter name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="LocalVariableName">
+            <property name="tokens" value="VARIABLE_DEF"/>
+            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
+            <message key="name.invalidPattern"
+             value="Local variable name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="ClassTypeParameterName">
+            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
+            <message key="name.invalidPattern"
+             value="Class type name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="MethodTypeParameterName">
+            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
+            <message key="name.invalidPattern"
+             value="Method type name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="InterfaceTypeParameterName">
+            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
+            <message key="name.invalidPattern"
+             value="Interface type name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="NoFinalizer"/>
+        <module name="GenericWhitespace">
+            <message key="ws.followed"
+             value="GenericWhitespace ''{0}'' is followed by whitespace."/>
+            <message key="ws.preceded"
+             value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
+            <message key="ws.illegalFollow"
+             value="GenericWhitespace ''{0}'' should followed by whitespace."/>
+            <message key="ws.notPreceded"
+             value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
+        </module>
+        <module name="Indentation">
+            <property name="basicOffset" value="4"/>
+            <property name="braceAdjustment" value="0"/>
+            <property name="caseIndent" value="4"/>
+            <property name="throwsIndent" value="4"/>
+            <property name="lineWrappingIndentation" value="4"/>
+            <property name="arrayInitIndent" value="4"/>
+        </module>
+        <module name="AbbreviationAsWordInName">
+            <property name="ignoreFinal" value="false"/>
+            <property name="allowedAbbreviationLength" value="1"/>
+        </module>
+        <module name="OverloadMethodsDeclarationOrder"/>
+        <module name="VariableDeclarationUsageDistance"/>
+        <module name="CustomImportOrder">
+            <property name="sortImportsInGroupAlphabetically" value="true"/>
+            <property name="separateLineBetweenGroups" value="true"/>
+            <property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>
+        </module>
+        <module name="MethodParamPad"/>
+        <module name="NoWhitespaceBefore">
+            <property name="tokens"
+             value="COMMA, SEMI, POST_INC, POST_DEC, DOT, ELLIPSIS, METHOD_REF"/>
+            <property name="allowLineBreaks" value="true"/>
+        </module>
+        <module name="ParenPad"/>
+        <module name="OperatorWrap">
+            <property name="option" value="NL"/>
+            <property name="tokens"
+             value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR,
+                    LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR, METHOD_REF "/>
+        </module>
+        <module name="AnnotationLocation">
+            <property name="id" value="AnnotationLocationMostCases"/>
+            <property name="tokens"
+             value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF"/>
+        </module>
+        <module name="AnnotationLocation">
+            <property name="id" value="AnnotationLocationVariables"/>
+            <property name="tokens" value="VARIABLE_DEF"/>
+            <property name="allowSamelineMultipleAnnotations" value="true"/>
+        </module>
+        <module name="NonEmptyAtclauseDescription"/>
+        <module name="InvalidJavadocPosition"/>
+        <module name="JavadocTagContinuationIndentation"/>
+        <module name="SummaryJavadoc">
+            <property name="forbiddenSummaryFragments"
+             value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
+        </module>
+        <module name="JavadocParagraph"/>
+        <module name="AtclauseOrder">
+            <property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
+            <property name="target"
+             value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
+        </module>
+        <module name="JavadocMethod">
+            <property name="scope" value="public"/>
+            <property name="allowMissingParamTags" value="true"/>
+            <property name="allowMissingThrowsTags" value="true"/>
+            <property name="allowMissingReturnTag" value="true"/>
+            <property name="allowedAnnotations" value="Override, Test"/>
+            <property name="allowThrowsTagsForSubclasses" value="true"/>
+        </module>
+        <module name="MissingJavadocMethod">
+            <property name="scope" value="public"/>
+            <property name="minLineCount" value="2"/>
+            <property name="allowedAnnotations" value="Override, Test"/>
+        </module>
+        <module name="MethodName">
+            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
+            <message key="name.invalidPattern"
+             value="Method name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="SingleLineJavadoc">
+            <property name="ignoreInlineTags" value="false"/>
+        </module>
+        <module name="EmptyCatchBlock">
+            <property name="exceptionVariableName" value="expected"/>
+        </module>
+        <module name="CommentsIndentation"/>
+    </module>
+</module>
diff --git a/oparent/pom.xml b/oparent/pom.xml
index ec1c865..6fc37e3 100644
--- a/oparent/pom.xml
+++ b/oparent/pom.xml
@@ -273,6 +273,60 @@
         </dependency>
       </dependencies>
     </profile>
+    <profile>
+      <activation>
+        <jdk>[1.8,)</jdk>
+      </activation>
+      <!-- overrides oparent's existing checkstyle to check java 8 code -->
+      <id>checkstyle-jdk8</id>
+      <build>
+        <plugins>
+          <plugin>
+            <!--
+              - override the original oparent checkstyle configuration to
+              - use a later version of checkstyle which is jdk8 aware, and
+              - use an updated checkstyle config that conforms to onap style and the later checkstyle format.
+              -->
+            <artifactId>maven-checkstyle-plugin</artifactId>
+            <version>3.1.0</version>
+            <dependencies>
+              <dependency>
+                <!-- because google's latest style is not supported by plugin's default  version-->
+                <groupId>com.puppycrawl.tools</groupId>
+                <artifactId>checkstyle</artifactId>
+                <version>8.24</version>
+              </dependency>
+            </dependencies>
+            <executions>
+              <execution>
+                <id>onap-license</id>
+                <configuration>
+                  <!-- this config not supported by checkstyle any more -->
+                  <sourceDirectory combine.self="override"/>
+                  <sourceDirectories>
+                    <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+                  </sourceDirectories>
+                </configuration>
+              </execution>
+              <execution>
+                <id>onap-java-style</id>
+                <configuration>
+                  <!-- Use Google Java Style Guide:
+                     https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
+                     with minor changes -->
+                  <configLocation>onap-checkstyle/onap-java-style${maven.compiler.source}.xml</configLocation>
+                  <!-- this config not supported by checkstyle any more -->
+                  <sourceDirectory combine.self="override"/>
+                  <sourceDirectories>
+                    <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+                  </sourceDirectories>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
   <dependencyManagement>
     <dependencies>
-- 
2.16.6


From 91f393bedd2707db123895546367f7faa59ebe00 Mon Sep 17 00:00:00 2001
From: Brian Freeman <bf1936@att.com>
Date: Mon, 18 Nov 2019 17:10:40 +0000
Subject: [PATCH 11/16] Revert "update version of checkstyle for latest google
 style and jdk 8"

This reverts commit 6a2d8c71aa39a6f47a683c38267c07cd9a00dfeb.

Revert until we fix the jjb verify and master

Issue-ID: INT-1271
Change-Id: I11da29bee4f17c40ae96ab647d1517572a20b864
Signed-off-by: Brian Freeman <bf1936@att.com>
---
 .../onap-checkstyle/onap-java-style1.8.xml         | 268 ---------------------
 oparent/pom.xml                                    |  54 -----
 2 files changed, 322 deletions(-)
 delete mode 100644 checkstyle/src/main/resources/onap-checkstyle/onap-java-style1.8.xml

diff --git a/checkstyle/src/main/resources/onap-checkstyle/onap-java-style1.8.xml b/checkstyle/src/main/resources/onap-checkstyle/onap-java-style1.8.xml
deleted file mode 100644
index 514e75f..0000000
--- a/checkstyle/src/main/resources/onap-checkstyle/onap-java-style1.8.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
-          "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
-          "https://checkstyle.org/dtds/configuration_1_3.dtd">
-
-<!--
-    Checkstyle configuration that checks the Google coding conventions from Google Java Style
-    that can be found at https://google.github.io/styleguide/javaguide.html
-
-    Checkstyle is very configurable. Be sure to read the documentation at
-    http://checkstyle.sf.net (or in your downloaded distribution).
-
-    To completely disable a check, just comment it out or delete it from the file.
-
-    Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov.
- -->
-
-<module name = "Checker">
-    <property name="charset" value="UTF-8"/>
-
-    <property name="severity" value="warning"/>
-
-    <property name="fileExtensions" value="java, properties, xml"/>
-    <!-- Excludes all 'module-info.java' files              -->
-    <!-- See https://checkstyle.org/config_filefilters.html -->
-    <module name="BeforeExecutionExclusionFileFilter">
-        <property name="fileNamePattern" value="module\-info\.java$"/>
-    </module>
-    <!-- Checks for whitespace                               -->
-    <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-    <module name="FileTabCharacter">
-        <property name="eachLine" value="true"/>
-    </module>
-
-    <module name="LineLength">
-        <property name="fileExtensions" value="java"/>
-        <property name="max" value="120"/>
-        <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
-    </module>
-
-    <module name="TreeWalker">
-        <module name="OuterTypeFilename"/>
-        <module name="IllegalTokenText">
-            <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
-            <property name="format"
-             value="\\u00(09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
-            <property name="message"
-             value="Consider using special escape sequence instead of octal value or Unicode escaped value."/>
-        </module>
-        <module name="AvoidEscapedUnicodeCharacters">
-            <property name="allowEscapesForControlCharacters" value="true"/>
-            <property name="allowByTailComment" value="true"/>
-            <property name="allowNonPrintableEscapes" value="true"/>
-        </module>
-        <module name="AvoidStarImport"/>
-        <module name="OneTopLevelClass"/>
-        <module name="NoLineWrap"/>
-        <module name="EmptyBlock">
-            <property name="option" value="TEXT"/>
-            <property name="tokens"
-             value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
-        </module>
-        <module name="NeedBraces"/>
-        <module name="LeftCurly"/>
-        <module name="RightCurly">
-            <property name="id" value="RightCurlySame"/>
-            <property name="tokens"
-             value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE,
-                    LITERAL_DO"/>
-        </module>
-        <module name="RightCurly">
-            <property name="id" value="RightCurlyAlone"/>
-            <property name="option" value="alone"/>
-            <property name="tokens"
-             value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT,
-                    INSTANCE_INIT"/>
-        </module>
-        <module name="WhitespaceAround">
-            <property name="allowEmptyConstructors" value="true"/>
-            <property name="allowEmptyLambdas" value="true"/>
-            <property name="allowEmptyMethods" value="true"/>
-            <property name="allowEmptyTypes" value="true"/>
-            <property name="allowEmptyLoops" value="true"/>
-            <message key="ws.notFollowed"
-             value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
-            <message key="ws.notPreceded"
-             value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
-        </module>
-        <module name="OneStatementPerLine"/>
-        <module name="MultipleVariableDeclarations"/>
-        <module name="ArrayTypeStyle"/>
-        <module name="MissingSwitchDefault"/>
-        <module name="FallThrough"/>
-        <module name="UpperEll"/>
-        <module name="ModifierOrder"/>
-        <module name="EmptyLineSeparator">
-            <property name="allowNoEmptyLineBetweenFields" value="true"/>
-        </module>
-        <module name="SeparatorWrap">
-            <property name="id" value="SeparatorWrapDot"/>
-            <property name="tokens" value="DOT"/>
-            <property name="option" value="nl"/>
-        </module>
-        <module name="SeparatorWrap">
-            <property name="id" value="SeparatorWrapComma"/>
-            <property name="tokens" value="COMMA"/>
-            <property name="option" value="EOL"/>
-        </module>
-        <module name="SeparatorWrap">
-            <!-- ELLIPSIS is EOL until https://github.com/google/styleguide/issues/258 -->
-            <property name="id" value="SeparatorWrapEllipsis"/>
-            <property name="tokens" value="ELLIPSIS"/>
-            <property name="option" value="EOL"/>
-        </module>
-        <module name="SeparatorWrap">
-            <!-- ARRAY_DECLARATOR is EOL until https://github.com/google/styleguide/issues/259 -->
-            <property name="id" value="SeparatorWrapArrayDeclarator"/>
-            <property name="tokens" value="ARRAY_DECLARATOR"/>
-            <property name="option" value="EOL"/>
-        </module>
-        <module name="SeparatorWrap">
-            <property name="id" value="SeparatorWrapMethodRef"/>
-            <property name="tokens" value="METHOD_REF"/>
-            <property name="option" value="nl"/>
-        </module>
-        <module name="PackageName">
-            <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
-            <message key="name.invalidPattern"
-             value="Package name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="TypeName">
-            <message key="name.invalidPattern"
-             value="Type name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="MemberName">
-            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
-            <message key="name.invalidPattern"
-             value="Member name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="ParameterName">
-            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
-            <message key="name.invalidPattern"
-             value="Parameter name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="LambdaParameterName">
-            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
-            <message key="name.invalidPattern"
-                     value="Lambda parameter name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="CatchParameterName">
-            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
-            <message key="name.invalidPattern"
-             value="Catch parameter name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="LocalVariableName">
-            <property name="tokens" value="VARIABLE_DEF"/>
-            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
-            <message key="name.invalidPattern"
-             value="Local variable name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="ClassTypeParameterName">
-            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
-            <message key="name.invalidPattern"
-             value="Class type name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="MethodTypeParameterName">
-            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
-            <message key="name.invalidPattern"
-             value="Method type name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="InterfaceTypeParameterName">
-            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
-            <message key="name.invalidPattern"
-             value="Interface type name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="NoFinalizer"/>
-        <module name="GenericWhitespace">
-            <message key="ws.followed"
-             value="GenericWhitespace ''{0}'' is followed by whitespace."/>
-            <message key="ws.preceded"
-             value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
-            <message key="ws.illegalFollow"
-             value="GenericWhitespace ''{0}'' should followed by whitespace."/>
-            <message key="ws.notPreceded"
-             value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
-        </module>
-        <module name="Indentation">
-            <property name="basicOffset" value="4"/>
-            <property name="braceAdjustment" value="0"/>
-            <property name="caseIndent" value="4"/>
-            <property name="throwsIndent" value="4"/>
-            <property name="lineWrappingIndentation" value="4"/>
-            <property name="arrayInitIndent" value="4"/>
-        </module>
-        <module name="AbbreviationAsWordInName">
-            <property name="ignoreFinal" value="false"/>
-            <property name="allowedAbbreviationLength" value="1"/>
-        </module>
-        <module name="OverloadMethodsDeclarationOrder"/>
-        <module name="VariableDeclarationUsageDistance"/>
-        <module name="CustomImportOrder">
-            <property name="sortImportsInGroupAlphabetically" value="true"/>
-            <property name="separateLineBetweenGroups" value="true"/>
-            <property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>
-        </module>
-        <module name="MethodParamPad"/>
-        <module name="NoWhitespaceBefore">
-            <property name="tokens"
-             value="COMMA, SEMI, POST_INC, POST_DEC, DOT, ELLIPSIS, METHOD_REF"/>
-            <property name="allowLineBreaks" value="true"/>
-        </module>
-        <module name="ParenPad"/>
-        <module name="OperatorWrap">
-            <property name="option" value="NL"/>
-            <property name="tokens"
-             value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR,
-                    LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR, METHOD_REF "/>
-        </module>
-        <module name="AnnotationLocation">
-            <property name="id" value="AnnotationLocationMostCases"/>
-            <property name="tokens"
-             value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF"/>
-        </module>
-        <module name="AnnotationLocation">
-            <property name="id" value="AnnotationLocationVariables"/>
-            <property name="tokens" value="VARIABLE_DEF"/>
-            <property name="allowSamelineMultipleAnnotations" value="true"/>
-        </module>
-        <module name="NonEmptyAtclauseDescription"/>
-        <module name="InvalidJavadocPosition"/>
-        <module name="JavadocTagContinuationIndentation"/>
-        <module name="SummaryJavadoc">
-            <property name="forbiddenSummaryFragments"
-             value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
-        </module>
-        <module name="JavadocParagraph"/>
-        <module name="AtclauseOrder">
-            <property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
-            <property name="target"
-             value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
-        </module>
-        <module name="JavadocMethod">
-            <property name="scope" value="public"/>
-            <property name="allowMissingParamTags" value="true"/>
-            <property name="allowMissingThrowsTags" value="true"/>
-            <property name="allowMissingReturnTag" value="true"/>
-            <property name="allowedAnnotations" value="Override, Test"/>
-            <property name="allowThrowsTagsForSubclasses" value="true"/>
-        </module>
-        <module name="MissingJavadocMethod">
-            <property name="scope" value="public"/>
-            <property name="minLineCount" value="2"/>
-            <property name="allowedAnnotations" value="Override, Test"/>
-        </module>
-        <module name="MethodName">
-            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
-            <message key="name.invalidPattern"
-             value="Method name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="SingleLineJavadoc">
-            <property name="ignoreInlineTags" value="false"/>
-        </module>
-        <module name="EmptyCatchBlock">
-            <property name="exceptionVariableName" value="expected"/>
-        </module>
-        <module name="CommentsIndentation"/>
-    </module>
-</module>
diff --git a/oparent/pom.xml b/oparent/pom.xml
index 6fc37e3..ec1c865 100644
--- a/oparent/pom.xml
+++ b/oparent/pom.xml
@@ -273,60 +273,6 @@
         </dependency>
       </dependencies>
     </profile>
-    <profile>
-      <activation>
-        <jdk>[1.8,)</jdk>
-      </activation>
-      <!-- overrides oparent's existing checkstyle to check java 8 code -->
-      <id>checkstyle-jdk8</id>
-      <build>
-        <plugins>
-          <plugin>
-            <!--
-              - override the original oparent checkstyle configuration to
-              - use a later version of checkstyle which is jdk8 aware, and
-              - use an updated checkstyle config that conforms to onap style and the later checkstyle format.
-              -->
-            <artifactId>maven-checkstyle-plugin</artifactId>
-            <version>3.1.0</version>
-            <dependencies>
-              <dependency>
-                <!-- because google's latest style is not supported by plugin's default  version-->
-                <groupId>com.puppycrawl.tools</groupId>
-                <artifactId>checkstyle</artifactId>
-                <version>8.24</version>
-              </dependency>
-            </dependencies>
-            <executions>
-              <execution>
-                <id>onap-license</id>
-                <configuration>
-                  <!-- this config not supported by checkstyle any more -->
-                  <sourceDirectory combine.self="override"/>
-                  <sourceDirectories>
-                    <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
-                  </sourceDirectories>
-                </configuration>
-              </execution>
-              <execution>
-                <id>onap-java-style</id>
-                <configuration>
-                  <!-- Use Google Java Style Guide:
-                     https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
-                     with minor changes -->
-                  <configLocation>onap-checkstyle/onap-java-style${maven.compiler.source}.xml</configLocation>
-                  <!-- this config not supported by checkstyle any more -->
-                  <sourceDirectory combine.self="override"/>
-                  <sourceDirectories>
-                    <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
-                  </sourceDirectories>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
   <dependencyManagement>
     <dependencies>
-- 
2.16.6


From 5a4892d3f1842b80ac5d28f035a6d1e151b9897d Mon Sep 17 00:00:00 2001
From: liamfallon <liam.fallon@est.tech>
Date: Fri, 6 Dec 2019 13:21:21 +0000
Subject: [PATCH 12/16] Upgrade oparent to checkstyle 8.27

Checkstyle 8.27 introduces incompatible changes in the checkstyle rule
definition xml file. The latest Eclipse checkstyle plugin (version 8.26)
uses this new checkstyle xml rule format.

This change brings in the checkstyle 8.27 rule formats into oparent.

Issue-ID: INT-1395
Change-Id: I453120e5cc95fa2e30a5d2f24083fd030e960a01
Signed-off-by: liamfallon <liam.fallon@est.tech>
---
 .../resources/onap-checkstyle/onap-java-style.xml    | 14 +++++++++-----
 oparent/pom.xml                                      | 20 ++++++++++++++++----
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/checkstyle/src/main/resources/onap-checkstyle/onap-java-style.xml b/checkstyle/src/main/resources/onap-checkstyle/onap-java-style.xml
index 77ef3ae..e6b249d 100644
--- a/checkstyle/src/main/resources/onap-checkstyle/onap-java-style.xml
+++ b/checkstyle/src/main/resources/onap-checkstyle/onap-java-style.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <!--
    Copyright (c) 2016 Huawei Technologies Co., Ltd.
+   Modifications Copyright (C) 2019 Nordix Foundation.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -48,6 +49,11 @@
             <property name="eachLine" value="true"/>
         </module>
 
+    <module name="LineLength">
+        <property name="max" value="120"/>
+        <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+    </module>
+
     <module name="TreeWalker">
         <module name="OuterTypeFilename"/>
         <module name="IllegalTokenText">
@@ -60,10 +66,6 @@
             <property name="allowByTailComment" value="true"/>
             <property name="allowNonPrintableEscapes" value="true"/>
         </module>
-        <module name="LineLength">
-            <property name="max" value="120"/>
-            <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
-        </module>
         <module name="AvoidStarImport"/>
         <module name="OneTopLevelClass"/>
         <module name="NoLineWrap"/>
@@ -199,10 +201,12 @@
             <property name="allowMissingParamTags" value="true"/>
             <property name="allowMissingThrowsTags" value="true"/>
             <property name="allowMissingReturnTag" value="true"/>
-            <property name="minLineCount" value="2"/>
             <property name="allowedAnnotations" value="Override, Test"/>
             <property name="allowThrowsTagsForSubclasses" value="true"/>
         </module>
+        <module name="MissingJavadocMethod">
+            <property name="minLineCount" value="2"/>
+        </module>
         <module name="MethodName">
             <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
             <message key="name.invalidPattern"
diff --git a/oparent/pom.xml b/oparent/pom.xml
index ec1c865..7e5f274 100644
--- a/oparent/pom.xml
+++ b/oparent/pom.xml
@@ -2,6 +2,7 @@
 <!--
    Copyright (c) 2016-2017 Huawei Technologies Co., Ltd.
    Modifications copyright (C) 2019 AT&T Intellectual Property
+   Modifications Copyright (C) 2019 Nordix Foundation.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -415,12 +416,23 @@
           <artifactId>sonar-maven-plugin</artifactId>
           <version>3.2</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-checkstyle-plugin</artifactId>
+          <version>3.1.0</version>
+          <dependencies>
+            <dependency>
+              <groupId>com.puppycrawl.tools</groupId>
+              <artifactId>checkstyle</artifactId>
+              <version>8.27</version>
+            </dependency>
+          </dependencies>
+        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
       <plugin>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.17</version>
         <dependencies>
           <dependency>
             <groupId>org.onap.oparent</groupId>
@@ -440,7 +452,7 @@
               <includeResources>false</includeResources>
               <includeTestSourceDirectory>true</includeTestSourceDirectory>
               <includeTestResources>false</includeTestResources>
-              <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+              <sourceDirectories>${project.build.sourceDirectory}</sourceDirectories>
               <excludes>
               </excludes>
               <consoleOutput>true</consoleOutput>
@@ -458,8 +470,8 @@
                    https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
                    with minor changes -->
               <configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
-              <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory -->
-              <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+              <!-- <sourceDirectories> is needed so that checkstyle ignores the generated sources directory -->
+              <sourceDirectories>${project.build.sourceDirectory}</sourceDirectories>
               <includeResources>true</includeResources>
               <includeTestSourceDirectory>true</includeTestSourceDirectory>
               <includeTestResources>true</includeTestResources>
-- 
2.16.6


From b080421073ed777fa4246a7a9d419bbc748741f2 Mon Sep 17 00:00:00 2001
From: liamfallon <liam.fallon@est.tech>
Date: Mon, 9 Dec 2019 16:20:24 +0000
Subject: [PATCH 13/16] Update checkstyle rules to exclude methods

Checkstyle rules updated to:
1) allow getters and setters not to have javadoc
2) allow methods with less than 2 lines to not have javadoc
3) allow protected and private methods not to have javadoc
4) allow methods with names beginning with test|before|after not to have
javaodc

Issue-ID: INT-1395
Change-Id: I570cd90034c7b20d45a7e5a6ecacacdef80876a1
Signed-off-by: liamfallon <liam.fallon@est.tech>
---
 checkstyle/src/main/resources/onap-checkstyle/onap-java-style.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/checkstyle/src/main/resources/onap-checkstyle/onap-java-style.xml b/checkstyle/src/main/resources/onap-checkstyle/onap-java-style.xml
index e6b249d..de1316f 100644
--- a/checkstyle/src/main/resources/onap-checkstyle/onap-java-style.xml
+++ b/checkstyle/src/main/resources/onap-checkstyle/onap-java-style.xml
@@ -205,7 +205,10 @@
             <property name="allowThrowsTagsForSubclasses" value="true"/>
         </module>
         <module name="MissingJavadocMethod">
+            <property name="scope" value="public"/>
             <property name="minLineCount" value="2"/>
+            <property name="allowMissingPropertyJavadoc" value="true"/>
+            <property name="ignoreMethodNamesRegex" value="^(test|before|after)[a-zA-Z0-9_]*$"/>
         </module>
         <module name="MethodName">
             <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
-- 
2.16.6


From 81f6ddbadbfb35ade23aa69570551e1d7758f13f Mon Sep 17 00:00:00 2001
From: Pamela Dragosh <pdragosh@research.att.com>
Date: Thu, 9 Jan 2020 20:21:59 -0500
Subject: [PATCH 14/16] Update sonar configuration

Sonarcloud upgrade exposed missing configuration variable.
Also removed deprecated properties
Used properties for versions of plugins
Upgraded all the plugins to the latest

Issue-ID: INT-1411
Change-Id: I75cb459f387a32230920987913d174dbc751e9f2
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
---
 oparent/pom.xml | 11 +++++------
 pom.xml         |  4 +++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/oparent/pom.xml b/oparent/pom.xml
index 7e5f274..af6c025 100644
--- a/oparent/pom.xml
+++ b/oparent/pom.xml
@@ -34,12 +34,11 @@
     <url>https://wiki.onap.org/display/DW/Integration+Project</url>
   </scm>
   <properties>
-    <jacoco.version>0.8.2</jacoco.version>
+    <jacoco.version>0.8.5</jacoco.version>
     <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
     <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
     <!-- Default Sonar configuration -->
-    <sonar.jacoco.reportPath>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
-    <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
+    <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
     <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
     <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
     <!-- If following file exist, auto-generation of swagger.json will be done -->
@@ -378,7 +377,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.22.0</version>
+          <version>3.0.0-M4</version>
           <configuration>
             <!-- Sets the VM argument line used when unit tests are run. -->
             <argLine>${surefireArgLine}</argLine>
@@ -391,7 +390,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-failsafe-plugin</artifactId>
-          <version>2.22.0</version>
+          <version>3.0.0-M4</version>
           <executions>
             <!--
         Ensures that both integration-test and verify goals of the Failsafe Maven
@@ -414,7 +413,7 @@
         <plugin>
           <groupId>org.sonarsource.scanner.maven</groupId>
           <artifactId>sonar-maven-plugin</artifactId>
-          <version>3.2</version>
+          <version>${sonar.scanner.version}</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
diff --git a/pom.xml b/pom.xml
index c85ecaa..7003823 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,6 +37,8 @@
     <!-- sitePath may be overridden in the inheriting POM if desired -->
     <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
     <maven.compiler.release>11</maven.compiler.release>
+    <sonar.scanner.version>3.7.0.1746</sonar.scanner.version>
+
     <!-- 
        In the java 8 version of oparent there were two variables defined for 1.8 source and target. These are no longer
        applicable in Java 11 but you may be referencing them in your child poms so review and update as appropriate.
@@ -148,7 +150,7 @@
         <plugin>
           <groupId>org.sonarsource.scanner.maven</groupId>
           <artifactId>sonar-maven-plugin</artifactId>
-          <version>3.2</version>
+          <version>${sonar.scanner.version}</version>
         </plugin>
       </plugins>
     </pluginManagement>
-- 
2.16.6


From dde95949b1050c276c2b7366bd1716eb8c9d3912 Mon Sep 17 00:00:00 2001
From: Pamela Dragosh <pdragosh@research.att.com>
Date: Mon, 20 Jan 2020 10:31:25 -0500
Subject: [PATCH 15/16] Update settings.xml to use https maven

Switch from http to https to remove warnings during
compilation.

Issue-ID: INT-1416
Change-Id: I775e8127962af4d5c82c7874f991483b87c53042
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
---
 settings.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/settings.xml b/settings.xml
index edfbba7..0f3a0e0 100644
--- a/settings.xml
+++ b/settings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
    Copyright (c) 2016-2018 Huawei Technologies Co., Ltd. and others.  All rights reserved.
+   Modifications Copyright (c) 2020 AT&T Technologies.  All rights reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -97,7 +98,7 @@
       <repositories>
         <repository>
           <id>central</id>
-          <url>http://repo1.maven.org/maven2/</url>
+          <url>https://repo1.maven.org/maven2/</url>
         </repository>
         <repository>
           <id>onap-public</id>
@@ -114,7 +115,7 @@
       <pluginRepositories>
         <pluginRepository>
           <id>central</id>
-          <url>http://repo1.maven.org/maven2/</url>
+          <url>https://repo1.maven.org/maven2/</url>
         </pluginRepository>
         <pluginRepository>
           <id>onap-public</id>
-- 
2.16.6


From d8ac119de7fc1b33a2d7a53686591f3d2abe3b25 Mon Sep 17 00:00:00 2001
From: Pamela Dragosh <pdragosh@research.att.com>
Date: Mon, 20 Jan 2020 16:05:29 -0500
Subject: [PATCH 16/16] Update latest security dependencies

Tested with most of the policy projects (compilation only).

Issue-ID: INT-1417
Change-Id: I0013dd1b2fb5996700bace81e68ef79ddfb6e17d
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
---
 dependencies/pom.xml | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 0acfb6c..afff5e5 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (c) 2018-2019 AT&T Technologies and others.
+   Copyright (c) 2018-2020 AT&T Technologies and others.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -26,15 +26,15 @@
   <name>oparent/dependencies</name>
   <packaging>pom</packaging>
   <properties>
-    <spring.version>5.1.2.RELEASE</spring.version>
-    <jetty.version>9.4.20.v20190813</jetty.version>
+    <spring.version>5.2.1.RELEASE</spring.version>
+    <jetty.version>9.4.24.v20191120</jetty.version>
   </properties>
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
-        <version>27.0-jre</version>
+        <version>28.1-jre</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
@@ -79,7 +79,7 @@
       <dependency>
         <groupId>org.apache.tomcat.embed</groupId>
         <artifactId>tomcat-embed-core</artifactId>
-        <version>9.0.24</version>
+        <version>9.0.29</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.jackson</groupId>
@@ -89,12 +89,17 @@
       <dependency>
         <groupId>org.webjars</groupId>
         <artifactId>bootstrap</artifactId>
-        <version>4.2.1</version>
+        <version>4.3.1</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-core</artifactId>
-        <version>2.9.8</version>
+        <version>2.10.1</version>
+      </dependency>
+      <dependency>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-databind</artifactId>
+        <version>2.10.1</version>
       </dependency>
       <dependency>
         <groupId>org.webjars</groupId>
@@ -104,12 +109,12 @@
       <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-classic</artifactId>
-        <version>1.2.3</version>
+        <version>1.3.0-alpha5</version>
       </dependency>
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpclient</artifactId>
-        <version>4.5.7</version>
+        <version>4.5.10</version>
       </dependency>
       <dependency>
         <groupId>xerces</groupId>
-- 
2.16.6