From 10ce05e06d4669c6c7d4c496de9f80bd40378a51 Mon Sep 17 00:00:00 2001 From: Markus Ofterdinger Date: Mon, 2 Dec 2024 16:56:54 +0100 Subject: [PATCH 01/11] exclude commons-lang3 --- cds-feature-attachments/pom.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/cds-feature-attachments/pom.xml b/cds-feature-attachments/pom.xml index a37c9f2a..c4fb8b96 100644 --- a/cds-feature-attachments/pom.xml +++ b/cds-feature-attachments/pom.xml @@ -24,6 +24,12 @@ com.sap.cds cds-integration-cloud-sdk + + + org.apache.commons + commons-lang3 + + @@ -32,6 +38,12 @@ cds-services-impl test + + org.apache.commons + commons-lang3 + 3.12.0 + test + com.github.spotbugs spotbugs-annotations From afa1d0587a70d910c961eb8678f469e84e95ad3d Mon Sep 17 00:00:00 2001 From: Markus Ofterdinger Date: Mon, 2 Dec 2024 16:59:36 +0100 Subject: [PATCH 02/11] update commons-lang3 --- cds-feature-attachments/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cds-feature-attachments/pom.xml b/cds-feature-attachments/pom.xml index c4fb8b96..1f36cc60 100644 --- a/cds-feature-attachments/pom.xml +++ b/cds-feature-attachments/pom.xml @@ -41,7 +41,7 @@ org.apache.commons commons-lang3 - 3.12.0 + 3.17.0 test From f7c870092875962799f299d58767fb7d7c99ab7d Mon Sep 17 00:00:00 2001 From: Markus Ofterdinger Date: Mon, 2 Dec 2024 17:06:24 +0100 Subject: [PATCH 03/11] exclude com.sap.cloud.mt:tools --- cds-feature-attachments/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cds-feature-attachments/pom.xml b/cds-feature-attachments/pom.xml index 1f36cc60..4c43d296 100644 --- a/cds-feature-attachments/pom.xml +++ b/cds-feature-attachments/pom.xml @@ -29,6 +29,10 @@ org.apache.commons commons-lang3 + + com.sap.cloud.mt + tools + From 7a88b26e7a30b7aca4db763a7088ec0b7a5e3fad Mon Sep 17 00:00:00 2001 From: Markus Ofterdinger Date: Mon, 2 Dec 2024 17:08:21 +0100 Subject: [PATCH 04/11] exclude com.sap.cds:cds-adapter-api --- cds-feature-attachments/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cds-feature-attachments/pom.xml b/cds-feature-attachments/pom.xml index 4c43d296..e8fd7572 100644 --- a/cds-feature-attachments/pom.xml +++ b/cds-feature-attachments/pom.xml @@ -33,6 +33,10 @@ com.sap.cloud.mt tools + + com.sap.cds + cds-adapter-api + From ec90c6d558933e63d0a431972ac07768f1e86728 Mon Sep 17 00:00:00 2001 From: Markus Ofterdinger Date: Mon, 2 Dec 2024 17:23:07 +0100 Subject: [PATCH 05/11] exclude com.google.guava:guava --- cds-feature-attachments/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cds-feature-attachments/pom.xml b/cds-feature-attachments/pom.xml index e8fd7572..1d032e3c 100644 --- a/cds-feature-attachments/pom.xml +++ b/cds-feature-attachments/pom.xml @@ -29,6 +29,10 @@ org.apache.commons commons-lang3 + + com.google.guava + guava + com.sap.cloud.mt tools From 00e84c8082f79c04b0a39d365ca94f39267058f8 Mon Sep 17 00:00:00 2001 From: Markus Ofterdinger Date: Mon, 2 Dec 2024 17:33:17 +0100 Subject: [PATCH 06/11] exclude com.fasterxml.jackson:jackson-databind --- cds-feature-attachments/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cds-feature-attachments/pom.xml b/cds-feature-attachments/pom.xml index 1d032e3c..f0a392c8 100644 --- a/cds-feature-attachments/pom.xml +++ b/cds-feature-attachments/pom.xml @@ -33,6 +33,10 @@ com.google.guava guava + + com.fasterxml.jackson + jackson-databind + com.sap.cloud.mt tools From 599acc9461f6ddc0bfdf6cca770888f8bb29a5e9 Mon Sep 17 00:00:00 2001 From: Markus Ofterdinger Date: Mon, 2 Dec 2024 17:40:57 +0100 Subject: [PATCH 07/11] fixed com.fasterxml.jackson.core --- cds-feature-attachments/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cds-feature-attachments/pom.xml b/cds-feature-attachments/pom.xml index f0a392c8..85ce31f4 100644 --- a/cds-feature-attachments/pom.xml +++ b/cds-feature-attachments/pom.xml @@ -34,7 +34,7 @@ guava - com.fasterxml.jackson + com.fasterxml.jackson.core jackson-databind From ab94ac5b54ddae414159b7f40894d5d97b583936 Mon Sep 17 00:00:00 2001 From: Markus Ofterdinger Date: Mon, 2 Dec 2024 18:07:23 +0100 Subject: [PATCH 08/11] exclude com.sap.cds:cds4j-core and keep jackson-databind --- cds-feature-attachments/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cds-feature-attachments/pom.xml b/cds-feature-attachments/pom.xml index 85ce31f4..68f3b28d 100644 --- a/cds-feature-attachments/pom.xml +++ b/cds-feature-attachments/pom.xml @@ -33,10 +33,6 @@ com.google.guava guava - - com.fasterxml.jackson.core - jackson-databind - com.sap.cloud.mt tools @@ -45,6 +41,10 @@ com.sap.cds cds-adapter-api + + com.sap.cds + cds4j-core + From f4f2e93fc8f99819aa8a147a899722031412e383 Mon Sep 17 00:00:00 2001 From: Markus Ofterdinger Date: Tue, 3 Dec 2024 09:40:20 +0100 Subject: [PATCH 09/11] exclude org.apache.commons:commons-io --- cds-feature-attachments/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cds-feature-attachments/pom.xml b/cds-feature-attachments/pom.xml index 68f3b28d..33a02091 100644 --- a/cds-feature-attachments/pom.xml +++ b/cds-feature-attachments/pom.xml @@ -29,6 +29,10 @@ org.apache.commons commons-lang3 + + org.apache.commons + commons-io + com.google.guava guava From a8aeef9d2c9ab390514eaa0f43849b8bd829415d Mon Sep 17 00:00:00 2001 From: Markus Ofterdinger Date: Tue, 3 Dec 2024 09:42:11 +0100 Subject: [PATCH 10/11] fixed wrong groupId of commons-io --- cds-feature-attachments/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cds-feature-attachments/pom.xml b/cds-feature-attachments/pom.xml index 33a02091..7f1af78c 100644 --- a/cds-feature-attachments/pom.xml +++ b/cds-feature-attachments/pom.xml @@ -30,7 +30,7 @@ commons-lang3 - org.apache.commons + commons-io commons-io From 30b8c6480ca8fc6230e501198aba1c09e2d609cb Mon Sep 17 00:00:00 2001 From: Markus Ofterdinger Date: Tue, 3 Dec 2024 09:51:56 +0100 Subject: [PATCH 11/11] added test dependency to commons-io --- cds-feature-attachments/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cds-feature-attachments/pom.xml b/cds-feature-attachments/pom.xml index 7f1af78c..50c5db84 100644 --- a/cds-feature-attachments/pom.xml +++ b/cds-feature-attachments/pom.xml @@ -64,6 +64,12 @@ 3.17.0 test + + commons-io + commons-io + 2.18.0 + test + com.github.spotbugs spotbugs-annotations