From cbacc392b769fe5756ce76b537a8b35145ee4efb Mon Sep 17 00:00:00 2001 From: 07794S744 <07794S744@DESKTOP-LVL254R> Date: Thu, 16 Dec 2021 09:31:44 +0530 Subject: [PATCH 1/6] fixed log4j upgrade version to log4j2.16 (cherry picked from commit 70617c78b74164b7b2db1e90c2ddd9cc2f107d0d) --- csv-parser-core/pom.xml | 27 ++++++++++++++++++++++++++ pom.xml | 2 +- provider/csv-parser-ibm/pom.xml | 34 ++++++++++++++++++++++++++++++++- 3 files changed, 61 insertions(+), 2 deletions(-) diff --git a/csv-parser-core/pom.xml b/csv-parser-core/pom.xml index 18bbc6f4f..13db7cc73 100644 --- a/csv-parser-core/pom.xml +++ b/csv-parser-core/pom.xml @@ -32,6 +32,8 @@ <spring-retry.version>1.2.5.RELEASE</spring-retry.version> <spring-aspects.version>5.2.8.RELEASE</spring-aspects.version> <json-flattener.version>0.12.0</json-flattener.version> + <log4j2.version>2.16.0</log4j2.version> + </properties> @@ -42,7 +44,20 @@ <groupId>org.opengroup.osdu</groupId> <artifactId>os-core-common</artifactId> <version>${os-core-common.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <version>${log4j2.version}</version> + </dependency> + <!-- Spring Boot --> <dependency> @@ -60,6 +75,18 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-to-slf4j</artifactId> + <version>${log4j2.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>org.springframework.retry</groupId> <artifactId>spring-retry</artifactId> diff --git a/pom.xml b/pom.xml index e11f598e8..c46f9a82a 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ <javax.inject.version>1</javax.inject.version> <org.mapstruct.version>1.3.1.Final</org.mapstruct.version> <maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version> - <os-core-common.version>0.12.0</os-core-common.version> + <os-core-common.version>0.13.0-rc3</os-core-common.version> <springfox.version>2.9.2</springfox.version> <snakeyaml.csv-parser.version>1.26</snakeyaml.csv-parser.version> <netty.csv-parser.version>4.1.46.Final</netty.csv-parser.version> diff --git a/provider/csv-parser-ibm/pom.xml b/provider/csv-parser-ibm/pom.xml index ba10ebd4d..463c06a4b 100644 --- a/provider/csv-parser-ibm/pom.xml +++ b/provider/csv-parser-ibm/pom.xml @@ -16,7 +16,9 @@ <description>IBM Cloud implementation of CSV parser service</description> <properties> - <os-core-lib-ibm.version>0.12.0</os-core-lib-ibm.version> + <os-core-lib-ibm.version>0.13.0-rc4</os-core-lib-ibm.version> + <log4j2.version>2.16.0</log4j2.version> + </properties> <dependencies> @@ -39,9 +41,39 @@ <groupId>org.amqphub.spring</groupId> <artifactId>amqp-10-jms-spring-boot-starter</artifactId> <version>2.3.0</version> + <exclusions> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-to-slf4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-to-slf4j</artifactId> + <version>${log4j2.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <version>${log4j2.version}</version> + </dependency> + </dependencies> + <build> <plugins> -- GitLab From ecfdfc3c0a3ca4d5ead84f0ae07d6a2fb6b5c3d6 Mon Sep 17 00:00:00 2001 From: 07794S744 <07794S744@DESKTOP-LVL254R> Date: Thu, 16 Dec 2021 12:19:27 +0530 Subject: [PATCH 2/6] fixed log4j upgrade to log4j 2.16.0 (cherry picked from commit 8369bc9e34138aaa0b159f65e50982e4721a636a) --- csv-parser-core/pom.xml | 32 ++--------------------------- pom.xml | 13 ++++++++++++ provider/csv-parser-aws/pom.xml | 2 +- provider/csv-parser-azure/pom.xml | 4 ++-- provider/csv-parser-gcp/pom.xml | 2 +- provider/csv-parser-ibm/pom.xml | 34 +------------------------------ 6 files changed, 20 insertions(+), 67 deletions(-) diff --git a/csv-parser-core/pom.xml b/csv-parser-core/pom.xml index 13db7cc73..b31962a31 100644 --- a/csv-parser-core/pom.xml +++ b/csv-parser-core/pom.xml @@ -43,20 +43,8 @@ <dependency> <groupId>org.opengroup.osdu</groupId> <artifactId>os-core-common</artifactId> - <version>${os-core-common.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - </exclusion> - </exclusions> - + <version>${os-core-common.version}</version> </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <version>${log4j2.version}</version> - </dependency> <!-- Spring Boot --> @@ -68,24 +56,8 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> - <exclusions> - <exclusion> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-to-slf4j</artifactId> - </exclusion> - </exclusions> + </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-to-slf4j</artifactId> - <version>${log4j2.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - </exclusion> - </exclusions> - </dependency> <dependency> <groupId>org.springframework.retry</groupId> diff --git a/pom.xml b/pom.xml index c46f9a82a..0081796fa 100644 --- a/pom.xml +++ b/pom.xml @@ -52,6 +52,7 @@ <tomcat-coyote.version>9.0.37</tomcat-coyote.version> <elasticsearch.version>7.9.0</elasticsearch.version> <spring-web.version>5.2.8.RELEASE</spring-web.version> + <log4j2.version>2.16.0</log4j2.version> </properties> <licenses> @@ -133,6 +134,18 @@ <groupId>org.springframework</groupId> <version>${spring-web.version}</version> </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-to-slf4j</artifactId> + <version>${log4j2.version}</version> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <version>${log4j2.version}</version> + </dependency> + </dependencies> </dependencyManagement> diff --git a/provider/csv-parser-aws/pom.xml b/provider/csv-parser-aws/pom.xml index 01f2699dd..1ad1d6372 100644 --- a/provider/csv-parser-aws/pom.xml +++ b/provider/csv-parser-aws/pom.xml @@ -42,7 +42,7 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-to-slf4j</artifactId> - <version>2.8.2</version> + <version>2.16.0</version> </dependency> </dependencies> <build> diff --git a/provider/csv-parser-azure/pom.xml b/provider/csv-parser-azure/pom.xml index 75d6e6e51..e426e26d0 100644 --- a/provider/csv-parser-azure/pom.xml +++ b/provider/csv-parser-azure/pom.xml @@ -23,7 +23,7 @@ <properties> <azure.version>2.3.5</azure.version> - <os-core-common.version>0.12.0</os-core-common.version> + <os-core-common.version>0.13.0-rc3</os-core-common.version> <azure.identity.version>1.2.1</azure.identity.version> <azure.storage.version>12.9.0</azure.storage.version> @@ -34,7 +34,7 @@ <dependency> <groupId>org.opengroup.osdu</groupId> <artifactId>core-lib-azure</artifactId> - <version>0.12.0</version> + <version>0.13.0-rc5</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/provider/csv-parser-gcp/pom.xml b/provider/csv-parser-gcp/pom.xml index 95517363c..f6c957a64 100644 --- a/provider/csv-parser-gcp/pom.xml +++ b/provider/csv-parser-gcp/pom.xml @@ -48,7 +48,7 @@ <dependency> <groupId>org.opengroup.osdu</groupId> <artifactId>core-lib-gcp</artifactId> - <version>0.12.0</version> + <version>0.13.0-rc3</version> </dependency> <dependency> <groupId>ch.qos.logback.contrib</groupId> diff --git a/provider/csv-parser-ibm/pom.xml b/provider/csv-parser-ibm/pom.xml index 463c06a4b..f607b0356 100644 --- a/provider/csv-parser-ibm/pom.xml +++ b/provider/csv-parser-ibm/pom.xml @@ -17,8 +17,6 @@ <properties> <os-core-lib-ibm.version>0.13.0-rc4</os-core-lib-ibm.version> - <log4j2.version>2.16.0</log4j2.version> - </properties> <dependencies> @@ -41,37 +39,7 @@ <groupId>org.amqphub.spring</groupId> <artifactId>amqp-10-jms-spring-boot-starter</artifactId> <version>2.3.0</version> - <exclusions> - <exclusion> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-to-slf4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - </exclusion> - </exclusions> - - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-to-slf4j</artifactId> - <version>${log4j2.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <version>${log4j2.version}</version> - </dependency> - - + </dependency> </dependencies> -- GitLab From 893ae01d58c0c9ac40f023e3d65e05032ab7b32a Mon Sep 17 00:00:00 2001 From: 07794S744 <07794S744@DESKTOP-LVL254R> Date: Thu, 16 Dec 2021 13:01:05 +0530 Subject: [PATCH 3/6] Fixed log4j upgrade to log4j 2.1.6.0 (cherry picked from commit 62b1006d9eadd45845eccbaa648899c73fefb312) --- csv-parser-core/pom.xml | 3 +-- pom.xml | 13 +------------ 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/csv-parser-core/pom.xml b/csv-parser-core/pom.xml index b31962a31..7320857d4 100644 --- a/csv-parser-core/pom.xml +++ b/csv-parser-core/pom.xml @@ -32,8 +32,7 @@ <spring-retry.version>1.2.5.RELEASE</spring-retry.version> <spring-aspects.version>5.2.8.RELEASE</spring-aspects.version> <json-flattener.version>0.12.0</json-flattener.version> - <log4j2.version>2.16.0</log4j2.version> - + </properties> diff --git a/pom.xml b/pom.xml index 0081796fa..7a868391b 100644 --- a/pom.xml +++ b/pom.xml @@ -134,18 +134,7 @@ <groupId>org.springframework</groupId> <version>${spring-web.version}</version> </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-to-slf4j</artifactId> - <version>${log4j2.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <version>${log4j2.version}</version> - </dependency> - + </dependencies> </dependencyManagement> -- GitLab From ec62df4758679c22902bb77d9c00f4143f91e698 Mon Sep 17 00:00:00 2001 From: 07794S744 <07794S744@DESKTOP-LVL254R> Date: Thu, 16 Dec 2021 13:10:01 +0530 Subject: [PATCH 4/6] fixed log4j version to log4j 2.16.0 (cherry picked from commit 518b9c83b9493f0618bcf16821fed1893e286174) --- csv-parser-core/pom.xml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/csv-parser-core/pom.xml b/csv-parser-core/pom.xml index 7320857d4..9cfbbbaa7 100644 --- a/csv-parser-core/pom.xml +++ b/csv-parser-core/pom.xml @@ -31,8 +31,7 @@ <org-json.version>20200518</org-json.version> <spring-retry.version>1.2.5.RELEASE</spring-retry.version> <spring-aspects.version>5.2.8.RELEASE</spring-aspects.version> - <json-flattener.version>0.12.0</json-flattener.version> - + <json-flattener.version>0.12.0</json-flattener.version> </properties> @@ -55,6 +54,12 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-to-slf4j</artifactId> + </exclusion> + </exclusions> </dependency> -- GitLab From 90a6a7daa810f641a1c40dd9bdf34b5694736edf Mon Sep 17 00:00:00 2001 From: David Diederich <d.diederich@opengroup.org> Date: Thu, 16 Dec 2021 04:05:14 -1000 Subject: [PATCH 5/6] Use release patches instead of upcoming rc libraries --- pom.xml | 2 +- provider/csv-parser-azure/pom.xml | 4 ++-- provider/csv-parser-gcp/pom.xml | 2 +- provider/csv-parser-ibm/pom.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 7a868391b..c66efc8d5 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ <javax.inject.version>1</javax.inject.version> <org.mapstruct.version>1.3.1.Final</org.mapstruct.version> <maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version> - <os-core-common.version>0.13.0-rc3</os-core-common.version> + <os-core-common.version>0.12.2</os-core-common.version> <springfox.version>2.9.2</springfox.version> <snakeyaml.csv-parser.version>1.26</snakeyaml.csv-parser.version> <netty.csv-parser.version>4.1.46.Final</netty.csv-parser.version> diff --git a/provider/csv-parser-azure/pom.xml b/provider/csv-parser-azure/pom.xml index e426e26d0..f2188e8e0 100644 --- a/provider/csv-parser-azure/pom.xml +++ b/provider/csv-parser-azure/pom.xml @@ -23,7 +23,7 @@ <properties> <azure.version>2.3.5</azure.version> - <os-core-common.version>0.13.0-rc3</os-core-common.version> + <os-core-common.version>0.12.2</os-core-common.version> <azure.identity.version>1.2.1</azure.identity.version> <azure.storage.version>12.9.0</azure.storage.version> @@ -34,7 +34,7 @@ <dependency> <groupId>org.opengroup.osdu</groupId> <artifactId>core-lib-azure</artifactId> - <version>0.13.0-rc5</version> + <version>0.12.3</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/provider/csv-parser-gcp/pom.xml b/provider/csv-parser-gcp/pom.xml index f6c957a64..1fa99f0c3 100644 --- a/provider/csv-parser-gcp/pom.xml +++ b/provider/csv-parser-gcp/pom.xml @@ -48,7 +48,7 @@ <dependency> <groupId>org.opengroup.osdu</groupId> <artifactId>core-lib-gcp</artifactId> - <version>0.13.0-rc3</version> + <version>0.12.1</version> </dependency> <dependency> <groupId>ch.qos.logback.contrib</groupId> diff --git a/provider/csv-parser-ibm/pom.xml b/provider/csv-parser-ibm/pom.xml index f607b0356..525046ab7 100644 --- a/provider/csv-parser-ibm/pom.xml +++ b/provider/csv-parser-ibm/pom.xml @@ -16,7 +16,7 @@ <description>IBM Cloud implementation of CSV parser service</description> <properties> - <os-core-lib-ibm.version>0.13.0-rc4</os-core-lib-ibm.version> + <os-core-lib-ibm.version>0.12.1</os-core-lib-ibm.version> </properties> <dependencies> -- GitLab From a10faada5047dcfc8ef2e6f994cdb19729cf929f Mon Sep 17 00:00:00 2001 From: David Diederich <d.diederich@opengroup.org> Date: Thu, 16 Dec 2021 04:27:03 -1000 Subject: [PATCH 6/6] Updating internal links to be consistent --- testing/csv-parser-aws-test/pom.xml | 2 +- testing/csv-parser-azure-test/pom.xml | 2 +- testing/csv-parser-core-test/pom.xml | 4 ++-- testing/csv-parser-gcp-test/pom.xml | 2 +- testing/csv-parser-ibm-test/pom.xml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/testing/csv-parser-aws-test/pom.xml b/testing/csv-parser-aws-test/pom.xml index efd7c36e3..a64e7747d 100644 --- a/testing/csv-parser-aws-test/pom.xml +++ b/testing/csv-parser-aws-test/pom.xml @@ -34,7 +34,7 @@ <dependency> <groupId>org.opengroup.osdu</groupId> <artifactId>csv-parser-aws</artifactId> - <version>0.12.0-SNAPSHOT</version> + <version>0.12.1-SNAPSHOT</version> <exclusions> <exclusion> <groupId>org.springframework.boot</groupId> diff --git a/testing/csv-parser-azure-test/pom.xml b/testing/csv-parser-azure-test/pom.xml index e21e18756..71ef26ceb 100644 --- a/testing/csv-parser-azure-test/pom.xml +++ b/testing/csv-parser-azure-test/pom.xml @@ -20,7 +20,7 @@ <dependency> <groupId>org.opengroup.osdu</groupId> <artifactId>csv-parser-azure</artifactId> - <version>0.12.0-SNAPSHOT</version> + <version>0.12.1-SNAPSHOT</version> <exclusions> <exclusion> <groupId>org.springframework.boot</groupId> diff --git a/testing/csv-parser-core-test/pom.xml b/testing/csv-parser-core-test/pom.xml index cd3dec350..8d9b4072e 100644 --- a/testing/csv-parser-core-test/pom.xml +++ b/testing/csv-parser-core-test/pom.xml @@ -27,12 +27,12 @@ <groupId>org.opengroup.osdu</groupId> <artifactId>csv-parser-core</artifactId> <classifier>tests</classifier> - <version>0.12.0-SNAPSHOT</version> + <version>0.12.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.opengroup.osdu</groupId> <artifactId>csv-parser-core</artifactId> - <version>0.12.0-SNAPSHOT</version> + <version>0.12.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.opengroup.osdu</groupId> diff --git a/testing/csv-parser-gcp-test/pom.xml b/testing/csv-parser-gcp-test/pom.xml index 436bcf523..a35f814c5 100644 --- a/testing/csv-parser-gcp-test/pom.xml +++ b/testing/csv-parser-gcp-test/pom.xml @@ -15,7 +15,7 @@ <dependency> <groupId>org.opengroup.osdu</groupId> <artifactId>csv-parser-gcp</artifactId> - <version>0.12.0-SNAPSHOT</version> + <version>0.12.1-SNAPSHOT</version> <exclusions> <exclusion> <groupId>org.springframework.boot</groupId> diff --git a/testing/csv-parser-ibm-test/pom.xml b/testing/csv-parser-ibm-test/pom.xml index c31f41137..14dc78522 100644 --- a/testing/csv-parser-ibm-test/pom.xml +++ b/testing/csv-parser-ibm-test/pom.xml @@ -41,7 +41,7 @@ <dependency> <groupId>org.opengroup.osdu</groupId> <artifactId>csv-parser-ibm</artifactId> - <version>0.12.0-SNAPSHOT</version> + <version>0.12.1-SNAPSHOT</version> <exclusions> <exclusion> <groupId>org.springframework.boot</groupId> -- GitLab