From 8cd5379dcdd441ebbc99f46249ec4e936b529e3e Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Wed, 19 Apr 2023 16:46:46 +0200 Subject: [PATCH 01/12] Prepare new development branch release-4.8.x --- .github/workflows/test-analysis.yml | 2 +- commons-datastore/commons-datastore-core/pom.xml | 2 +- commons-datastore/commons-datastore-mongodb/pom.xml | 2 +- commons-datastore/commons-datastore-solr/pom.xml | 2 +- commons-datastore/pom.xml | 2 +- commons-lib/pom.xml | 2 +- pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test-analysis.yml b/.github/workflows/test-analysis.yml index 63810e67..84b68c79 100644 --- a/.github/workflows/test-analysis.yml +++ b/.github/workflows/test-analysis.yml @@ -20,7 +20,7 @@ on: type: string required: true env: - xb_version: "1.7.0" + xb_version: "1.6.1" jobs: test: name: Test and push Sonar analysis diff --git a/commons-datastore/commons-datastore-core/pom.xml b/commons-datastore/commons-datastore-core/pom.xml index cb43ba3e..08b93cba 100644 --- a/commons-datastore/commons-datastore-core/pom.xml +++ b/commons-datastore/commons-datastore-core/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons-datastore - 4.9.0-SNAPSHOT + 4.8.1-SNAPSHOT ../pom.xml diff --git a/commons-datastore/commons-datastore-mongodb/pom.xml b/commons-datastore/commons-datastore-mongodb/pom.xml index 01bbebad..c908027a 100644 --- a/commons-datastore/commons-datastore-mongodb/pom.xml +++ b/commons-datastore/commons-datastore-mongodb/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons-datastore - 4.9.0-SNAPSHOT + 4.8.1-SNAPSHOT ../pom.xml diff --git a/commons-datastore/commons-datastore-solr/pom.xml b/commons-datastore/commons-datastore-solr/pom.xml index 5658bbb4..341efb5e 100644 --- a/commons-datastore/commons-datastore-solr/pom.xml +++ b/commons-datastore/commons-datastore-solr/pom.xml @@ -22,7 +22,7 @@ org.opencb.commons commons-datastore - 4.9.0-SNAPSHOT + 4.8.1-SNAPSHOT ../pom.xml diff --git a/commons-datastore/pom.xml b/commons-datastore/pom.xml index 3e93d95f..35ef4a5b 100644 --- a/commons-datastore/pom.xml +++ b/commons-datastore/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons - 4.9.0-SNAPSHOT + 4.8.1-SNAPSHOT ../pom.xml diff --git a/commons-lib/pom.xml b/commons-lib/pom.xml index 78ee15c1..bfc377a5 100644 --- a/commons-lib/pom.xml +++ b/commons-lib/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons - 4.9.0-SNAPSHOT + 4.8.1-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 708c496a..522fc4e3 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons - 4.9.0-SNAPSHOT + 4.8.1-SNAPSHOT pom OpenCB commons project From 6c36dfdeb69844a1b5a46a4e6e13ee4fb7b92a2b Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Wed, 19 Apr 2023 16:51:47 +0200 Subject: [PATCH 02/12] Prepare release xb_version 1.7.0 --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f83c634b..42013c00 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,7 +10,7 @@ jobs: uses: ./.github/workflows/build-java-app-workflow.yml test: - uses: ./.github/workflows/test-analysis.yml@release-4.7.x + uses: ./.github/workflows/test-analysis.yml needs: build secrets: inherit with: From bf720428415b479f90e792b37b43fa162f96c742 Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Thu, 4 May 2023 15:31:51 +0200 Subject: [PATCH 03/12] Dependency analysis --- .../commons-datastore-core/pom.xml | 15 +++++---- .../commons-datastore-mongodb/pom.xml | 29 ++++++++++++++++- .../commons-datastore-solr/pom.xml | 20 ++++++++---- commons-lib/pom.xml | 12 ++++--- pom.xml | 32 +++++++++++++++++-- 5 files changed, 86 insertions(+), 22 deletions(-) diff --git a/commons-datastore/commons-datastore-core/pom.xml b/commons-datastore/commons-datastore-core/pom.xml index 08b93cba..b862bb79 100644 --- a/commons-datastore/commons-datastore-core/pom.xml +++ b/commons-datastore/commons-datastore-core/pom.xml @@ -22,19 +22,20 @@ org.apache.commons commons-lang3 - - org.slf4j - slf4j-api - + junit junit test - + \ No newline at end of file diff --git a/commons-datastore/commons-datastore-mongodb/pom.xml b/commons-datastore/commons-datastore-mongodb/pom.xml index c908027a..65db1dc9 100644 --- a/commons-datastore/commons-datastore-mongodb/pom.xml +++ b/commons-datastore/commons-datastore-mongodb/pom.xml @@ -31,9 +31,36 @@ org.slf4j - slf4j-simple + slf4j-api + + + org.apache.commons + commons-lang3 + ${apache.commons.lang3.version} + + + org.hamcrest + hamcrest-core + ${hamcrest.version} test + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + org.mongodb + bson + ${bson.version} + compile + + + org.mongodb + mongodb-driver-core + ${bson.version} + compile + \ No newline at end of file diff --git a/commons-datastore/commons-datastore-solr/pom.xml b/commons-datastore/commons-datastore-solr/pom.xml index 341efb5e..b06bfe35 100644 --- a/commons-datastore/commons-datastore-solr/pom.xml +++ b/commons-datastore/commons-datastore-solr/pom.xml @@ -34,21 +34,27 @@ org.opencb.commons commons-datastore-core - org.apache.solr solr-solrj 8.8.2 - junit - junit - test + org.slf4j + slf4j-api + compile - org.slf4j - slf4j-simple - test + org.apache.commons + commons-lang3 + ${apache.commons.lang3.version} + + + com.fasterxml.jackson.core + jackson-databind + + + diff --git a/commons-lib/pom.xml b/commons-lib/pom.xml index bfc377a5..b3d44098 100644 --- a/commons-lib/pom.xml +++ b/commons-lib/pom.xml @@ -28,6 +28,13 @@ com.fasterxml.jackson.core jackson-databind + test + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + test org.slf4j @@ -56,10 +63,5 @@ junit provided - - org.slf4j - slf4j-simple - test - diff --git a/pom.xml b/pom.xml index 522fc4e3..b700a72b 100644 --- a/pom.xml +++ b/pom.xml @@ -23,10 +23,10 @@ 3.12.0 1.7.32 1.7.7 - + 1.3 + 4.8.2 opencb https://sonarcloud.io - 1.8 UTF-8 @@ -110,6 +110,11 @@ jackson-databind ${jackson.version} + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + org.apache.commons commons-lang3 @@ -141,6 +146,13 @@ + + + com.fasterxml.jackson.core + jackson-core + + + src/main/java src/test/java @@ -223,6 +235,22 @@ + + org.apache.maven.plugins + maven-dependency-plugin + 3.5.0 + + + analyze + + analyze-only + + + true + + + + From c0ada4d2ce50f9c36bed60d938c720af485733bc Mon Sep 17 00:00:00 2001 From: imedina Date: Thu, 4 May 2023 15:00:44 +0100 Subject: [PATCH 04/12] pom: several cleanups --- .../commons-datastore-core/pom.xml | 17 +++---- .../commons-datastore-mongodb/pom.xml | 47 +++++++++---------- .../commons-datastore-solr/pom.xml | 15 +++--- commons-datastore/pom.xml | 9 ---- commons-lib/pom.xml | 18 ++++--- pom.xml | 36 +++++++------- 6 files changed, 63 insertions(+), 79 deletions(-) diff --git a/commons-datastore/commons-datastore-core/pom.xml b/commons-datastore/commons-datastore-core/pom.xml index b862bb79..15f79f58 100644 --- a/commons-datastore/commons-datastore-core/pom.xml +++ b/commons-datastore/commons-datastore-core/pom.xml @@ -14,6 +14,10 @@ jar + + com.fasterxml.jackson.core + jackson-core + com.fasterxml.jackson.core jackson-databind @@ -22,20 +26,11 @@ org.apache.commons commons-lang3 - junit junit test - - \ No newline at end of file + + diff --git a/commons-datastore/commons-datastore-mongodb/pom.xml b/commons-datastore/commons-datastore-mongodb/pom.xml index 65db1dc9..6cccf7f6 100644 --- a/commons-datastore/commons-datastore-mongodb/pom.xml +++ b/commons-datastore/commons-datastore-mongodb/pom.xml @@ -19,48 +19,47 @@ commons-datastore-core + + org.mongodb + mongodb-driver-core + ${mongodb.version} + org.mongodb mongodb-driver-sync - 4.8.2 + ${mongodb.version} - junit - junit - test + org.mongodb + bson + ${mongodb.version} - org.slf4j - slf4j-api + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind org.apache.commons commons-lang3 - ${apache.commons.lang3.version} + + + org.slf4j + slf4j-api org.hamcrest hamcrest-core - ${hamcrest.version} test - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - org.mongodb - bson - ${bson.version} - compile - - - org.mongodb - mongodb-driver-core - ${bson.version} - compile + junit + junit + test - \ No newline at end of file + diff --git a/commons-datastore/commons-datastore-solr/pom.xml b/commons-datastore/commons-datastore-solr/pom.xml index b06bfe35..e5d4c781 100644 --- a/commons-datastore/commons-datastore-solr/pom.xml +++ b/commons-datastore/commons-datastore-solr/pom.xml @@ -34,27 +34,24 @@ org.opencb.commons commons-datastore-core + org.apache.solr solr-solrj - 8.8.2 + ${solr.version} - org.slf4j - slf4j-api - compile + com.fasterxml.jackson.core + jackson-databind org.apache.commons commons-lang3 - ${apache.commons.lang3.version} - com.fasterxml.jackson.core - jackson-databind + org.slf4j + slf4j-api - - diff --git a/commons-datastore/pom.xml b/commons-datastore/pom.xml index 35ef4a5b..964439c5 100644 --- a/commons-datastore/pom.xml +++ b/commons-datastore/pom.xml @@ -19,13 +19,4 @@ commons-datastore-solr - - - - org.opencb.commons - commons-datastore-core - ${project.parent.version} - - - diff --git a/commons-lib/pom.xml b/commons-lib/pom.xml index b3d44098..b4f0f121 100644 --- a/commons-lib/pom.xml +++ b/commons-lib/pom.xml @@ -17,25 +17,27 @@ org.opencb.commons commons-datastore-core - ${project.parent.version} - compile + com.beust jcommander - 1.69 + ${jcommander.version} com.fasterxml.jackson.core - jackson-databind + jackson-core test com.fasterxml.jackson.core - jackson-core - ${jackson.version} + jackson-databind test + + org.apache.commons + commons-lang3 + org.slf4j slf4j-api @@ -44,10 +46,6 @@ org.apache.avro avro - - org.apache.commons - commons-lang3 - org.apache.ant ant diff --git a/pom.xml b/pom.xml index b700a72b..44b51486 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,11 @@ 1.7.32 1.7.7 1.3 - 4.8.2 + 4.8.2 + 8.8.2 + 1.69 + 4.13.2 + opencb https://sonarcloud.io 1.8 @@ -83,11 +87,6 @@ Joaquin joaquintarraga@gmail.com - - julie-sullivan - Julie - julie.sullivan@gmail.com - juanfeSanahuja Juanfe @@ -105,14 +104,20 @@ + + org.opencb.commons + commons-datastore-core + ${project.version} + + com.fasterxml.jackson.core - jackson-databind + jackson-core ${jackson.version} com.fasterxml.jackson.core - jackson-core + jackson-databind ${jackson.version} @@ -137,22 +142,21 @@ avro ${avro.version} + + org.hamcrest + hamcrest-core + ${hamcrest.version} + test + junit junit - 4.13.2 + ${junit.version} test - - - com.fasterxml.jackson.core - jackson-core - - - src/main/java src/test/java From c3ce09785530e4d47b1d218de784562ec3448d77 Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Fri, 5 May 2023 00:01:13 +0200 Subject: [PATCH 05/12] pom: Dependency cleanups #TASK-2095 --- .../commons-datastore-mongodb/pom.xml | 3 -- .../commons-datastore-solr/pom.xml | 1 - commons-lib/pom.xml | 3 -- pom.xml | 43 +++++++++++++++++-- 4 files changed, 40 insertions(+), 10 deletions(-) diff --git a/commons-datastore/commons-datastore-mongodb/pom.xml b/commons-datastore/commons-datastore-mongodb/pom.xml index 6cccf7f6..958eefab 100644 --- a/commons-datastore/commons-datastore-mongodb/pom.xml +++ b/commons-datastore/commons-datastore-mongodb/pom.xml @@ -22,17 +22,14 @@ org.mongodb mongodb-driver-core - ${mongodb.version} org.mongodb mongodb-driver-sync - ${mongodb.version} org.mongodb bson - ${mongodb.version} com.fasterxml.jackson.core diff --git a/commons-datastore/commons-datastore-solr/pom.xml b/commons-datastore/commons-datastore-solr/pom.xml index e5d4c781..16bc0f9d 100644 --- a/commons-datastore/commons-datastore-solr/pom.xml +++ b/commons-datastore/commons-datastore-solr/pom.xml @@ -38,7 +38,6 @@ org.apache.solr solr-solrj - ${solr.version} com.fasterxml.jackson.core diff --git a/commons-lib/pom.xml b/commons-lib/pom.xml index b4f0f121..27bd809a 100644 --- a/commons-lib/pom.xml +++ b/commons-lib/pom.xml @@ -22,7 +22,6 @@ com.beust jcommander - ${jcommander.version} com.fasterxml.jackson.core @@ -49,12 +48,10 @@ org.apache.ant ant - 1.10.12 org.fusesource.jansi jansi - 2.4.0 junit diff --git a/pom.xml b/pom.xml index 44b51486..eaddcc84 100644 --- a/pom.xml +++ b/pom.xml @@ -17,8 +17,9 @@ commons-lib commons-datastore - + + 2.11.4 3.12.0 1.7.32 @@ -28,7 +29,9 @@ 8.8.2 1.69 4.13.2 - + 1.10.12 + 2.4.0 + opencb https://sonarcloud.io 1.8 @@ -109,7 +112,6 @@ commons-datastore-core ${project.version} - com.fasterxml.jackson.core jackson-core @@ -154,6 +156,41 @@ ${junit.version} test + + org.mongodb + mongodb-driver-core + ${mongodb.version} + + + org.mongodb + mongodb-driver-sync + ${mongodb.version} + + + org.mongodb + bson + ${mongodb.version} + + + org.apache.solr + solr-solrj + ${solr.version} + + + com.beust + jcommander + ${jcommander.version} + + + org.apache.ant + ant + ${ant.version} + + + org.fusesource.jansi + jansi + ${jansi.version} + From bced5325b02802986086cdd085f9efa6101c621b Mon Sep 17 00:00:00 2001 From: imedina Date: Fri, 5 May 2023 01:07:17 +0100 Subject: [PATCH 06/12] pom: minor style changes --- commons-lib/pom.xml | 1 + pom.xml | 35 ++++++++++++++++++++--------------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/commons-lib/pom.xml b/commons-lib/pom.xml index 27bd809a..4813285c 100644 --- a/commons-lib/pom.xml +++ b/commons-lib/pom.xml @@ -59,4 +59,5 @@ provided + diff --git a/pom.xml b/pom.xml index eaddcc84..43518c39 100644 --- a/pom.xml +++ b/pom.xml @@ -19,18 +19,18 @@ - + 2.11.4 3.12.0 1.7.32 1.7.7 - 1.3 4.8.2 8.8.2 1.69 - 4.13.2 1.10.12 2.4.0 + 1.3 + 4.13.2 opencb https://sonarcloud.io @@ -107,11 +107,14 @@ + org.opencb.commons commons-datastore-core ${project.version} + + com.fasterxml.jackson.core jackson-core @@ -144,18 +147,6 @@ avro ${avro.version} - - org.hamcrest - hamcrest-core - ${hamcrest.version} - test - - - junit - junit - ${junit.version} - test - org.mongodb mongodb-driver-core @@ -191,6 +182,20 @@ jansi ${jansi.version} + + + + org.hamcrest + hamcrest-core + ${hamcrest.version} + test + + + junit + junit + ${junit.version} + test + From 077c4e76b7f29e29c7d220fb21840e2f007d2531 Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Mon, 25 Sep 2023 12:01:39 +0200 Subject: [PATCH 07/12] Prepare merge with develop #TASK-2095 --- commons-datastore/commons-datastore-core/pom.xml | 2 +- commons-datastore/commons-datastore-mongodb/pom.xml | 2 +- commons-datastore/commons-datastore-solr/pom.xml | 2 +- commons-datastore/pom.xml | 2 +- commons-lib/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/commons-datastore/commons-datastore-core/pom.xml b/commons-datastore/commons-datastore-core/pom.xml index 15f79f58..0f8a7a3d 100644 --- a/commons-datastore/commons-datastore-core/pom.xml +++ b/commons-datastore/commons-datastore-core/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons-datastore - 4.8.1-SNAPSHOT + 2.12.0-SNAPSHOT ../pom.xml diff --git a/commons-datastore/commons-datastore-mongodb/pom.xml b/commons-datastore/commons-datastore-mongodb/pom.xml index 958eefab..e9b843ae 100644 --- a/commons-datastore/commons-datastore-mongodb/pom.xml +++ b/commons-datastore/commons-datastore-mongodb/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons-datastore - 4.8.1-SNAPSHOT + 2.12.0-SNAPSHOT ../pom.xml diff --git a/commons-datastore/commons-datastore-solr/pom.xml b/commons-datastore/commons-datastore-solr/pom.xml index 16bc0f9d..98e70a1f 100644 --- a/commons-datastore/commons-datastore-solr/pom.xml +++ b/commons-datastore/commons-datastore-solr/pom.xml @@ -22,7 +22,7 @@ org.opencb.commons commons-datastore - 4.8.1-SNAPSHOT + 2.12.0-SNAPSHOT ../pom.xml diff --git a/commons-datastore/pom.xml b/commons-datastore/pom.xml index 964439c5..1eb5e4ce 100644 --- a/commons-datastore/pom.xml +++ b/commons-datastore/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons - 4.8.1-SNAPSHOT + 2.12.0-SNAPSHOT ../pom.xml diff --git a/commons-lib/pom.xml b/commons-lib/pom.xml index 27bd809a..e8d19d1e 100644 --- a/commons-lib/pom.xml +++ b/commons-lib/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons - 4.8.1-SNAPSHOT + 2.12.0-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index eaddcc84..c68fe77a 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons - 4.8.1-SNAPSHOT + 2.12.0-SNAPSHOT pom OpenCB commons project From d769fdfbdd71bc35dc7a91801ff8ea3350ab01aa Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Mon, 25 Sep 2023 12:05:15 +0200 Subject: [PATCH 08/12] Prepare merge with develop #TASK-2095 --- commons-datastore/commons-datastore-core/pom.xml | 2 +- commons-datastore/commons-datastore-mongodb/pom.xml | 2 +- commons-datastore/commons-datastore-solr/pom.xml | 2 +- commons-datastore/pom.xml | 2 +- commons-lib/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/commons-datastore/commons-datastore-core/pom.xml b/commons-datastore/commons-datastore-core/pom.xml index 15f79f58..29e2fcae 100644 --- a/commons-datastore/commons-datastore-core/pom.xml +++ b/commons-datastore/commons-datastore-core/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons-datastore - 4.8.1-SNAPSHOT + 4.12.0-SNAPSHOT ../pom.xml diff --git a/commons-datastore/commons-datastore-mongodb/pom.xml b/commons-datastore/commons-datastore-mongodb/pom.xml index 958eefab..f1ad59d8 100644 --- a/commons-datastore/commons-datastore-mongodb/pom.xml +++ b/commons-datastore/commons-datastore-mongodb/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons-datastore - 4.8.1-SNAPSHOT + 4.12.0-SNAPSHOT ../pom.xml diff --git a/commons-datastore/commons-datastore-solr/pom.xml b/commons-datastore/commons-datastore-solr/pom.xml index 16bc0f9d..0b6d2c71 100644 --- a/commons-datastore/commons-datastore-solr/pom.xml +++ b/commons-datastore/commons-datastore-solr/pom.xml @@ -22,7 +22,7 @@ org.opencb.commons commons-datastore - 4.8.1-SNAPSHOT + 4.12.0-SNAPSHOT ../pom.xml diff --git a/commons-datastore/pom.xml b/commons-datastore/pom.xml index 964439c5..cace46f4 100644 --- a/commons-datastore/pom.xml +++ b/commons-datastore/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons - 4.8.1-SNAPSHOT + 4.12.0-SNAPSHOT ../pom.xml diff --git a/commons-lib/pom.xml b/commons-lib/pom.xml index 27bd809a..8b7195fa 100644 --- a/commons-lib/pom.xml +++ b/commons-lib/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons - 4.8.1-SNAPSHOT + 4.12.0-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index eaddcc84..fef37c33 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons - 4.8.1-SNAPSHOT + 4.12.0-SNAPSHOT pom OpenCB commons project From 08883b1095e3da220ba6e2b115bbf525ef9b308f Mon Sep 17 00:00:00 2001 From: imedina Date: Thu, 5 Oct 2023 12:29:23 +0100 Subject: [PATCH 09/12] pom: update maven-dependency-plugin version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8b5d337b..071472a7 100644 --- a/pom.xml +++ b/pom.xml @@ -284,7 +284,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.5.0 + 3.6.0 analyze From 7ca41da80dbfcb39a8f427c6ac52f1bb5fb23397 Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Wed, 18 Oct 2023 19:10:48 +0200 Subject: [PATCH 10/12] pom: Added old dependencies to check TODO Review #TASK-2095 --- .../commons-datastore-core/pom.xml | 14 +++++++++ .../commons-datastore-mongodb/pom.xml | 7 +++++ commons-datastore/pom.xml | 25 ++++++++++++++++ commons-lib/pom.xml | 30 +++++++++++++++++++ pom.xml | 3 ++ 5 files changed, 79 insertions(+) diff --git a/commons-datastore/commons-datastore-core/pom.xml b/commons-datastore/commons-datastore-core/pom.xml index 29e2fcae..6d51f911 100644 --- a/commons-datastore/commons-datastore-core/pom.xml +++ b/commons-datastore/commons-datastore-core/pom.xml @@ -31,6 +31,20 @@ junit test + + + + org.slf4j + slf4j-api + 1.7.32 + + + org.slf4j + slf4j-simple + 1.7.32 + test + + diff --git a/commons-datastore/commons-datastore-mongodb/pom.xml b/commons-datastore/commons-datastore-mongodb/pom.xml index f1ad59d8..bde81f7c 100644 --- a/commons-datastore/commons-datastore-mongodb/pom.xml +++ b/commons-datastore/commons-datastore-mongodb/pom.xml @@ -57,6 +57,13 @@ junit test + + + org.slf4j + slf4j-simple + 1.7.32 + test + diff --git a/commons-datastore/pom.xml b/commons-datastore/pom.xml index cace46f4..3cdfd19f 100644 --- a/commons-datastore/pom.xml +++ b/commons-datastore/pom.xml @@ -18,5 +18,30 @@ commons-datastore-mongodb commons-datastore-solr + + + + + + org.slf4j + slf4j-simple + 1.7.32 + test + + + + junit + junit + 4.13.2 + test + + + + org.hamcrest + hamcrest-core + 1.3 + test + + diff --git a/commons-lib/pom.xml b/commons-lib/pom.xml index ea51d725..d21cd6df 100644 --- a/commons-lib/pom.xml +++ b/commons-lib/pom.xml @@ -58,6 +58,36 @@ junit provided + + + org.slf4j + slf4j-simple + 1.7.32 + test + + + com.fasterxml.jackson.core + jackson-core + 2.11.4 + test + + + com.fasterxml.jackson.core + jackson-annotations + 2.11.4 + + + org.hamcrest + hamcrest-core + 1.3 + provided + + + com.fasterxml.jackson.core + jackson-databind + 2.11.4 + test + diff --git a/pom.xml b/pom.xml index 071472a7..7b6f317f 100644 --- a/pom.xml +++ b/pom.xml @@ -293,6 +293,9 @@ true + + * + From 82c262a9cec6a5e8541e6975d470e1da091448f1 Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Thu, 19 Oct 2023 11:40:52 +0200 Subject: [PATCH 11/12] pom: Revert transitive dependecies added TASK-2095 --- .../commons-datastore-core/pom.xml | 12 +------- .../commons-datastore-mongodb/pom.xml | 7 +---- commons-datastore/pom.xml | 27 +---------------- commons-lib/pom.xml | 30 +------------------ 4 files changed, 4 insertions(+), 72 deletions(-) diff --git a/commons-datastore/commons-datastore-core/pom.xml b/commons-datastore/commons-datastore-core/pom.xml index 6d51f911..4b8bf458 100644 --- a/commons-datastore/commons-datastore-core/pom.xml +++ b/commons-datastore/commons-datastore-core/pom.xml @@ -33,17 +33,7 @@ - - org.slf4j - slf4j-api - 1.7.32 - - - org.slf4j - slf4j-simple - 1.7.32 - test - + diff --git a/commons-datastore/commons-datastore-mongodb/pom.xml b/commons-datastore/commons-datastore-mongodb/pom.xml index bde81f7c..fd010b4c 100644 --- a/commons-datastore/commons-datastore-mongodb/pom.xml +++ b/commons-datastore/commons-datastore-mongodb/pom.xml @@ -58,12 +58,7 @@ test - - org.slf4j - slf4j-simple - 1.7.32 - test - + diff --git a/commons-datastore/pom.xml b/commons-datastore/pom.xml index 3cdfd19f..4f9bf0f6 100644 --- a/commons-datastore/pom.xml +++ b/commons-datastore/pom.xml @@ -18,30 +18,5 @@ commons-datastore-mongodb commons-datastore-solr - - - - - - org.slf4j - slf4j-simple - 1.7.32 - test - - - - junit - junit - 4.13.2 - test - - - - org.hamcrest - hamcrest-core - 1.3 - test - - - + diff --git a/commons-lib/pom.xml b/commons-lib/pom.xml index d21cd6df..3852a1a3 100644 --- a/commons-lib/pom.xml +++ b/commons-lib/pom.xml @@ -59,35 +59,7 @@ provided - - org.slf4j - slf4j-simple - 1.7.32 - test - - - com.fasterxml.jackson.core - jackson-core - 2.11.4 - test - - - com.fasterxml.jackson.core - jackson-annotations - 2.11.4 - - - org.hamcrest - hamcrest-core - 1.3 - provided - - - com.fasterxml.jackson.core - jackson-databind - 2.11.4 - test - + From fb09cafa167171df15f63832461b0d1e47b9d1b1 Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Thu, 19 Oct 2023 12:52:25 +0200 Subject: [PATCH 12/12] pom: Added develop dependencies to review #TASK-2095 --- commons-datastore/commons-datastore-core/pom.xml | 10 +++++++++- .../commons-datastore-mongodb/pom.xml | 6 +++++- commons-datastore/pom.xml | 14 +++++++++++++- commons-lib/pom.xml | 12 ++++++++++-- 4 files changed, 37 insertions(+), 5 deletions(-) diff --git a/commons-datastore/commons-datastore-core/pom.xml b/commons-datastore/commons-datastore-core/pom.xml index 4b8bf458..cdb526d9 100644 --- a/commons-datastore/commons-datastore-core/pom.xml +++ b/commons-datastore/commons-datastore-core/pom.xml @@ -33,7 +33,15 @@ - + + org.slf4j + slf4j-api + + + org.slf4j + slf4j-simple + test + diff --git a/commons-datastore/commons-datastore-mongodb/pom.xml b/commons-datastore/commons-datastore-mongodb/pom.xml index fd010b4c..730f8253 100644 --- a/commons-datastore/commons-datastore-mongodb/pom.xml +++ b/commons-datastore/commons-datastore-mongodb/pom.xml @@ -58,7 +58,11 @@ test - + + org.slf4j + slf4j-simple + test + diff --git a/commons-datastore/pom.xml b/commons-datastore/pom.xml index 4f9bf0f6..74a0f9fc 100644 --- a/commons-datastore/pom.xml +++ b/commons-datastore/pom.xml @@ -18,5 +18,17 @@ commons-datastore-mongodb commons-datastore-solr - + + + + org.slf4j + slf4j-simple + test + + + junit + junit + test + + diff --git a/commons-lib/pom.xml b/commons-lib/pom.xml index 3852a1a3..30be49f9 100644 --- a/commons-lib/pom.xml +++ b/commons-lib/pom.xml @@ -59,7 +59,15 @@ provided - + + org.slf4j + slf4j-simple + test + + + com.fasterxml.jackson.core + jackson-databind + test + -