From bd706ddd865a22aae9319fa246d802c23f6d384b Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Mon, 3 Jan 2022 13:21:33 -0500
Subject: Upgrade to log4j2 2.17.1

Update to use version 2.17.1 to resolve log4shell vulnerability

Issue-ID: CCSDK-3556
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: Idc804f353a7271e5c324fb5660d6f4a71328eec2
---
 plugins/artifacts/pom.xml                        |  2 +-
 plugins/features/ccsdk-gr-toolkit/pom.xml        |  2 +-
 plugins/features/ccsdk-properties-node/pom.xml   |  2 +-
 plugins/features/ccsdk-restapi-call-node/pom.xml |  2 +-
 plugins/features/ccsdk-restconf-client/pom.xml   |  2 +-
 plugins/features/ccsdk-sli-plugins-all/pom.xml   |  2 +-
 plugins/features/ccsdk-sshapi-call-node/pom.xml  |  2 +-
 plugins/features/ccsdk-template-node/pom.xml     |  2 +-
 plugins/features/features-sli-plugins/pom.xml    |  2 +-
 plugins/features/installer/pom.xml               |  2 +-
 plugins/features/pom.xml                         |  2 +-
 plugins/grToolkit/installer/pom.xml              |  2 +-
 plugins/grToolkit/model/pom.xml                  |  2 +-
 plugins/grToolkit/pom.xml                        |  2 +-
 plugins/grToolkit/provider/pom.xml               | 27 +++++++++++++++++++++++-
 plugins/pom.xml                                  |  2 +-
 plugins/properties-node/installer/pom.xml        |  2 +-
 plugins/properties-node/pom.xml                  |  2 +-
 plugins/properties-node/provider/pom.xml         |  2 +-
 plugins/restapi-call-node/installer/pom.xml      |  2 +-
 plugins/restapi-call-node/pom.xml                |  2 +-
 plugins/restapi-call-node/provider/pom.xml       |  2 +-
 plugins/restconf-client/installer/pom.xml        |  2 +-
 plugins/restconf-client/pom.xml                  |  2 +-
 plugins/restconf-client/provider/pom.xml         |  2 +-
 plugins/sshapi-call-node/installer/pom.xml       |  2 +-
 plugins/sshapi-call-node/pom.xml                 |  2 +-
 plugins/sshapi-call-node/provider/pom.xml        |  2 +-
 plugins/template-node/installer/pom.xml          |  2 +-
 plugins/template-node/pom.xml                    |  2 +-
 plugins/template-node/provider/pom.xml           |  2 +-
 31 files changed, 56 insertions(+), 31 deletions(-)

(limited to 'plugins')

diff --git a/plugins/artifacts/pom.xml b/plugins/artifacts/pom.xml
index 795c9cc58..e78e37afa 100755
--- a/plugins/artifacts/pom.xml
+++ b/plugins/artifacts/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.3.1</version>
+        <version>2.3.2</version>
         <relativePath/>
     </parent>
 
diff --git a/plugins/features/ccsdk-gr-toolkit/pom.xml b/plugins/features/ccsdk-gr-toolkit/pom.xml
index 68246a66d..926004a38 100644
--- a/plugins/features/ccsdk-gr-toolkit/pom.xml
+++ b/plugins/features/ccsdk-gr-toolkit/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.3.1</version>
+        <version>2.3.2</version>
         <relativePath/>
     </parent>
 
diff --git a/plugins/features/ccsdk-properties-node/pom.xml b/plugins/features/ccsdk-properties-node/pom.xml
index bf657b328..19e742c8c 100644
--- a/plugins/features/ccsdk-properties-node/pom.xml
+++ b/plugins/features/ccsdk-properties-node/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.3.1</version>
+        <version>2.3.2</version>
         <relativePath/>
     </parent>
 
diff --git a/plugins/features/ccsdk-restapi-call-node/pom.xml b/plugins/features/ccsdk-restapi-call-node/pom.xml
index c58a2b70b..0b25869c9 100644
--- a/plugins/features/ccsdk-restapi-call-node/pom.xml
+++ b/plugins/features/ccsdk-restapi-call-node/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.3.1</version>
+        <version>2.3.2</version>
         <relativePath/>
     </parent>
 
diff --git a/plugins/features/ccsdk-restconf-client/pom.xml b/plugins/features/ccsdk-restconf-client/pom.xml
index 5d3d86c9f..e686c8a00 100644
--- a/plugins/features/ccsdk-restconf-client/pom.xml
+++ b/plugins/features/ccsdk-restconf-client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.3.1</version>
+        <version>2.3.2</version>
         <relativePath/>
     </parent>
 
diff --git a/plugins/features/ccsdk-sli-plugins-all/pom.xml b/plugins/features/ccsdk-sli-plugins-all/pom.xml
index 8a559bc15..6b1aed529 100644
--- a/plugins/features/ccsdk-sli-plugins-all/pom.xml
+++ b/plugins/features/ccsdk-sli-plugins-all/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.3.1</version>
+        <version>2.3.2</version>
         <relativePath/>
     </parent>
 
diff --git a/plugins/features/ccsdk-sshapi-call-node/pom.xml b/plugins/features/ccsdk-sshapi-call-node/pom.xml
index d000bb275..61326265e 100644
--- a/plugins/features/ccsdk-sshapi-call-node/pom.xml
+++ b/plugins/features/ccsdk-sshapi-call-node/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.3.1</version>
+        <version>2.3.2</version>
         <relativePath/>
     </parent>
 
diff --git a/plugins/features/ccsdk-template-node/pom.xml b/plugins/features/ccsdk-template-node/pom.xml
index fb2f7a5e0..40eaae0b7 100644
--- a/plugins/features/ccsdk-template-node/pom.xml
+++ b/plugins/features/ccsdk-template-node/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.3.1</version>
+        <version>2.3.2</version>
         <relativePath/>
     </parent>
 
diff --git a/plugins/features/features-sli-plugins/pom.xml b/plugins/features/features-sli-plugins/pom.xml
index 417bdc288..0098e5a1c 100644
--- a/plugins/features/features-sli-plugins/pom.xml
+++ b/plugins/features/features-sli-plugins/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>2.3.1</version>
+        <version>2.3.2</version>
         <relativePath/>
     </parent>
 
diff --git a/plugins/features/installer/pom.xml b/plugins/features/installer/pom.xml
index 4b1752d0d..6af48deb0 100755
--- a/plugins/features/installer/pom.xml
+++ b/plugins/features/installer/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.3.1</version>
+        <version>2.3.2</version>
         <relativePath/>
     </parent>
 
diff --git a/plugins/features/pom.xml b/plugins/features/pom.xml
index e4484287e..9f187b11b 100755
--- a/plugins/features/pom.xml
+++ b/plugins/features/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.3.1</version>
+        <version>2.3.2</version>
         <relativePath/>
     </parent>
 
diff --git a/plugins/grToolkit/installer/pom.xml b/plugins/grToolkit/installer/pom.xml
index ad76c2746..f09c7c0af 100755
--- a/plugins/grToolkit/installer/pom.xml
+++ b/plugins/grToolkit/installer/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.3.1</version>
+        <version>2.3.2</version>
         <relativePath/>
     </parent>
 
diff --git a/plugins/grToolkit/model/pom.xml b/plugins/grToolkit/model/pom.xml
index 30ae415b3..1d3c680b5 100755
--- a/plugins/grToolkit/model/pom.xml
+++ b/plugins/grToolkit/model/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.3.1</version>
+        <version>2.3.2</version>
         <relativePath/>
     </parent>
 
diff --git a/plugins/grToolkit/pom.xml b/plugins/grToolkit/pom.xml
index 6cfa7e4c4..10f4204df 100755
--- a/plugins/grToolkit/pom.xml
+++ b/plugins/grToolkit/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.3.1</version>
+        <version>2.3.2</version>
         <relativePath/>
     </parent>
 
diff --git a/plugins/grToolkit/provider/pom.xml b/plugins/grToolkit/provider/pom.xml
index 707862fe0..b770cd6d4 100755
--- a/plugins/grToolkit/provider/pom.xml
+++ b/plugins/grToolkit/provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.3.1</version>
+        <version>2.3.2</version>
         <relativePath/>
     </parent>
 
@@ -83,6 +83,31 @@
             <version>1.2.4.RELEASE</version>
             <scope>test</scope>
         </dependency>
+        <!--  log4j dependencies are needed to override derived version in wiremock -->
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-to-slf4j</artifactId>
+            <scope>test</scope>
+            <version>${log4j2.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
+            <scope>test</scope>
+            <version>${log4j2.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <scope>test</scope>
+            <version>${log4j2.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <scope>test</scope>
+            <version>${log4j2.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 4c7f342f1..2aa88174d 100755
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.3.1</version>
+        <version>2.3.2</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/properties-node/installer/pom.xml b/plugins/properties-node/installer/pom.xml
index 098b4a810..ae8427d74 100755
--- a/plugins/properties-node/installer/pom.xml
+++ b/plugins/properties-node/installer/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.3.1</version>
+        <version>2.3.2</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/properties-node/pom.xml b/plugins/properties-node/pom.xml
index dfd1a7514..2e0f26d8a 100755
--- a/plugins/properties-node/pom.xml
+++ b/plugins/properties-node/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.3.1</version>
+        <version>2.3.2</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/properties-node/provider/pom.xml b/plugins/properties-node/provider/pom.xml
index 3d6c852ca..4aafd492e 100755
--- a/plugins/properties-node/provider/pom.xml
+++ b/plugins/properties-node/provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.3.1</version>
+        <version>2.3.2</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/restapi-call-node/installer/pom.xml b/plugins/restapi-call-node/installer/pom.xml
index d531cd770..55d829ecb 100755
--- a/plugins/restapi-call-node/installer/pom.xml
+++ b/plugins/restapi-call-node/installer/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.3.1</version>
+        <version>2.3.2</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/restapi-call-node/pom.xml b/plugins/restapi-call-node/pom.xml
index b20a09eb0..9f9ed138f 100755
--- a/plugins/restapi-call-node/pom.xml
+++ b/plugins/restapi-call-node/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.3.1</version>
+        <version>2.3.2</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/restapi-call-node/provider/pom.xml b/plugins/restapi-call-node/provider/pom.xml
index 856ca844b..9e240b047 100755
--- a/plugins/restapi-call-node/provider/pom.xml
+++ b/plugins/restapi-call-node/provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.3.1</version>
+        <version>2.3.2</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/restconf-client/installer/pom.xml b/plugins/restconf-client/installer/pom.xml
index eaddfe724..82448519a 100755
--- a/plugins/restconf-client/installer/pom.xml
+++ b/plugins/restconf-client/installer/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.3.1</version>
+        <version>2.3.2</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/restconf-client/pom.xml b/plugins/restconf-client/pom.xml
index 671e18117..9005c84ad 100755
--- a/plugins/restconf-client/pom.xml
+++ b/plugins/restconf-client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.3.1</version>
+        <version>2.3.2</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/restconf-client/provider/pom.xml b/plugins/restconf-client/provider/pom.xml
index a5b1635c8..ca1b28455 100755
--- a/plugins/restconf-client/provider/pom.xml
+++ b/plugins/restconf-client/provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.3.1</version>
+        <version>2.3.2</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/sshapi-call-node/installer/pom.xml b/plugins/sshapi-call-node/installer/pom.xml
index 6719fdf07..cde32749c 100755
--- a/plugins/sshapi-call-node/installer/pom.xml
+++ b/plugins/sshapi-call-node/installer/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.3.1</version>
+        <version>2.3.2</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/sshapi-call-node/pom.xml b/plugins/sshapi-call-node/pom.xml
index 584000ccf..0de677052 100755
--- a/plugins/sshapi-call-node/pom.xml
+++ b/plugins/sshapi-call-node/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.3.1</version>
+        <version>2.3.2</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/sshapi-call-node/provider/pom.xml b/plugins/sshapi-call-node/provider/pom.xml
index 6bdeb1dac..7df3a3e60 100755
--- a/plugins/sshapi-call-node/provider/pom.xml
+++ b/plugins/sshapi-call-node/provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.3.1</version>
+        <version>2.3.2</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/template-node/installer/pom.xml b/plugins/template-node/installer/pom.xml
index 729c74adc..8a2452dfa 100644
--- a/plugins/template-node/installer/pom.xml
+++ b/plugins/template-node/installer/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.3.1</version>
+        <version>2.3.2</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/template-node/pom.xml b/plugins/template-node/pom.xml
index c58801923..a790d5fb4 100644
--- a/plugins/template-node/pom.xml
+++ b/plugins/template-node/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.3.1</version>
+        <version>2.3.2</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/template-node/provider/pom.xml b/plugins/template-node/provider/pom.xml
index 8f8da3c29..c6c2e9d86 100644
--- a/plugins/template-node/provider/pom.xml
+++ b/plugins/template-node/provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.3.1</version>
+        <version>2.3.2</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
-- 
cgit 1.2.3-korg