From d1443702fbb50a0e3f7718156d4a14bc49eb862d Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Tue, 16 May 2023 12:10:43 +0200 Subject: [PATCH 01/10] pom: Clean dependencies #TASK-2095 --- .github/workflows/test-analysis.yml | 3 +- cellbase-app/pom.xml | 108 +++++++++++++- cellbase-client/pom.xml | 58 ++++++-- cellbase-core/pom.xml | 60 +++++--- cellbase-lib/pom.xml | 137 +++++++++++++---- cellbase-server/pom.xml | 77 +++++++--- pom.xml | 221 ++++++++++++++++++++++++---- 7 files changed, 548 insertions(+), 116 deletions(-) diff --git a/.github/workflows/test-analysis.yml b/.github/workflows/test-analysis.yml index 7795e5773..aec31781b 100644 --- a/.github/workflows/test-analysis.yml +++ b/.github/workflows/test-analysis.yml @@ -20,7 +20,8 @@ on: type: string required: true env: - xb_version: "1.6.1" + xb_version: "1.7.0" + jobs: test: name: Test and push Sonar analysis diff --git a/cellbase-app/pom.xml b/cellbase-app/pom.xml index 5c19ea43d..0f23b50d2 100644 --- a/cellbase-app/pom.xml +++ b/cellbase-app/pom.xml @@ -28,25 +28,121 @@ cellbase-server ${project.parent.version} + + org.opencb.biodata + biodata-formats + + + org.opencb.commons + commons-datastore-core + + + org.opencb.commons + commons-lib + + + org.opencb.cellbase + cellbase-core + + + org.opencb.biodata + biodata-tools + + + org.opencb.biodata + biodata-models + + + org.opencb.cellbase + cellbase-lib + org.apache.logging.log4j log4j-core - org.junit.jupiter - junit-jupiter-api + org.opencb.commons + commons-datastore-mongodb test + + - org.junit.platform - junit-platform-engine - test + org.slf4j + slf4j-api + + + com.fasterxml.jackson.core + jackson-annotations + + + io.jsonwebtoken + jjwt-api + + + commons-lang + commons-lang + + + io.jsonwebtoken + jjwt-impl + + org.apache.commons + commons-lang3 + + + jakarta.ws.rs + jakarta.ws.rs-api + + + commons-io + commons-io + + + com.fasterxml.jackson.core + jackson-core + + + org.apache.commons + commons-collections4 + + + org.rocksdb + rocksdbjni + + + com.beust + jcommander + + + org.mongodb + bson + + + org.eclipse.jetty + jetty-util-ajax + + + org.apache.logging.log4j + log4j-api + + + com.fasterxml.jackson.core + jackson-databind + + + com.github.samtools + htsjdk + + + org.junit.jupiter - junit-jupiter-engine + junit-jupiter-api test + diff --git a/cellbase-client/pom.xml b/cellbase-client/pom.xml index 4cb59a780..467907343 100644 --- a/cellbase-client/pom.xml +++ b/cellbase-client/pom.xml @@ -19,17 +19,22 @@ cellbase-core - org.glassfish.jersey.core - jersey-client + org.opencb.biodata + biodata-models - org.glassfish.jersey.inject - jersey-hk2 + org.opencb.commons + commons-datastore-core - org.glassfish.jersey.containers - jersey-container-servlet - test + org.opencb.biodata + biodata-formats + + + + + org.glassfish.jersey.core + jersey-client org.junit.jupiter @@ -42,19 +47,44 @@ test - org.junit.platform - junit-platform-engine - test + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml - org.junit.jupiter - junit-jupiter-engine - test + org.slf4j + slf4j-api + + + com.fasterxml.jackson.core + jackson-core + + com.fasterxml.jackson.core + jackson-annotations + + + org.apache.commons + commons-lang3 + + + com.fasterxml.jackson.core + jackson-databind + + + jakarta.ws.rs + jakarta.ws.rs-api + + + org.apache.avro + avro + + + org.hamcrest - hamcrest-all + hamcrest-core test + diff --git a/cellbase-core/pom.xml b/cellbase-core/pom.xml index ec34893f7..474c72c88 100644 --- a/cellbase-core/pom.xml +++ b/cellbase-core/pom.xml @@ -18,7 +18,24 @@ org.opencb.biodata biodata-tools + + org.opencb.commons + commons-lib + + + org.opencb.biodata + biodata-models + + + org.opencb.biodata + biodata-formats + + + org.opencb.commons + commons-datastore-core + + com.fasterxml.jackson.dataformat jackson-dataformat-yaml @@ -30,40 +47,49 @@ io.jsonwebtoken jjwt-api - ${jwt.version} io.jsonwebtoken jjwt-impl - ${jwt.version} - io.jsonwebtoken - jjwt-jackson - ${jwt.version} + com.google.guava + guava - org.apache.logging.log4j - log4j-slf4j-impl + org.slf4j + slf4j-api - org.junit.jupiter - junit-jupiter-api - test + com.fasterxml.jackson.core + jackson-annotations - org.junit.platform - junit-platform-engine - test + org.apache.commons + commons-collections4 - org.junit.jupiter - junit-jupiter-engine - test + org.apache.commons + commons-lang3 + + + com.fasterxml.jackson.core + jackson-databind + + + commons-lang + commons-lang + + org.hamcrest - hamcrest-all + hamcrest-core + test + + + org.junit.jupiter + junit-jupiter-api test diff --git a/cellbase-lib/pom.xml b/cellbase-lib/pom.xml index cc86b3d6d..7928d4e3c 100644 --- a/cellbase-lib/pom.xml +++ b/cellbase-lib/pom.xml @@ -18,63 +18,140 @@ org.opencb.cellbase cellbase-core - - - - - org.opencb.commons commons-datastore-mongodb - ${java-common-libs.version} - - - slf4j-simple - org.slf4j - - - - - - - - + - org.eclipse.jetty - jetty-util-ajax + org.opencb.biodata + biodata-formats + + + org.opencb.commons + commons-datastore-core + + + org.opencb.commons + commons-lib + + + org.opencb.biodata + biodata-tools - - org.glassfish.jersey.core - jersey-client + org.opencb.biodata + biodata-models + + org.apache.poi poi-ooxml - 4.1.2 org.apache.logging.log4j log4j-core - org.junit.jupiter - junit-jupiter-api + org.slf4j + slf4j-api + + + com.fasterxml.jackson.core + jackson-annotations + + + commons-lang + commons-lang + + + org.mongodb + mongodb-driver-core + + + org.apache.commons + commons-lang3 + + + jakarta.ws.rs + jakarta.ws.rs-api + + + org.mongodb + mongodb-driver-sync + + + com.google.guava + guava + + + commons-io + commons-io + + + com.fasterxml.jackson.core + jackson-core + + + org.apache.commons + commons-collections4 + + + org.rocksdb + rocksdbjni + + + com.beust + jcommander + + + commons-codec + commons-codec + + + org.mongodb + bson + + + org.apache.logging.log4j + log4j-api + + + jakarta.xml.bind + jakarta.xml.bind-api + + + com.fasterxml.jackson.core + jackson-databind + + + org.apache.poi + poi + + + com.github.samtools + htsjdk + + + + + org.eclipse.jetty + jetty-util-ajax test - org.junit.platform - junit-platform-engine + junit + junit test org.junit.jupiter - junit-jupiter-engine + junit-jupiter-api test org.hamcrest - hamcrest-all + hamcrest-core test diff --git a/cellbase-server/pom.xml b/cellbase-server/pom.xml index 10f0323b0..fc5910ae9 100644 --- a/cellbase-server/pom.xml +++ b/cellbase-server/pom.xml @@ -19,50 +19,89 @@ cellbase-lib ${project.parent.version} - - - com.fasterxml.jackson.module - jackson-module-jsonSchema - - org.glassfish.jersey.containers - jersey-container-servlet + org.opencb.biodata + biodata-formats - org.glassfish.jersey.inject - jersey-hk2 + org.opencb.commons + commons-datastore-core - org.glassfish.jersey.containers - jersey-container-servlet-core + org.opencb.cellbase + cellbase-core - org.glassfish.jersey.media - jersey-media-multipart + org.opencb.commons + commons-lib - org.glassfish.jersey.media - jersey-media-json-jackson + org.opencb.biodata + biodata-models + + - io.swagger - swagger-jersey2-jaxrs - 1.6.5 + com.fasterxml.jackson.module + jackson-module-jsonSchema javax.servlet javax.servlet-api - 3.1.0 provided org.eclipse.jetty jetty-server + + org.eclipse.jetty + jetty-util-ajax + org.eclipse.jetty jetty-webapp + + io.swagger + swagger-annotations + + + org.slf4j + slf4j-api + + + com.fasterxml.jackson.core + jackson-core + + + org.apache.commons + commons-collections4 + + + com.fasterxml.jackson.core + jackson-annotations + + + org.mongodb + bson + + + commons-lang + commons-lang + + + org.apache.commons + commons-lang3 + + + jakarta.ws.rs + jakarta.ws.rs-api + + + com.fasterxml.jackson.core + jackson-databind + diff --git a/pom.xml b/pom.xml index eb2297360..3742741e3 100644 --- a/pom.xml +++ b/pom.xml @@ -29,13 +29,31 @@ 2.11.4 2.30.1 1.7.32 - 2.17.2 + 2.17.2 1.5.2 5.5.2 0.8.8 9.4.17.v20190418 0.11.5 - + 1.6.5 + 3.1.0 + 4.1.2 + 4.8.2 + 4.12 + 1.13 + 2.3.3 + 22.0 + 1.9.1 + 1.3 + 2.23.0 + 1.48.0 + 2.4 + 2.4 + 0.11.5 + 3.12.0 + 2.1.6 + 4.4 + 1.69 cellbase checkstyle.xml @@ -127,31 +145,33 @@ org.opencb.biodata biodata-tools ${biodata.version} - - - slf4j-simple - org.slf4j - - - org.mortbay.jetty - servlet-api - - - log4j - log4j - - - org.apache.avro - avro-ipc - - + + + org.opencb.commons + commons-datastore-core + ${java-common-libs.version} + + + org.opencb.commons + commons-lib + ${java-common-libs.version} + + + org.opencb.biodata + biodata-formats + ${biodata.version} + + + org.opencb.biodata + biodata-models + ${biodata.version} io.grpc grpc-all - 1.48.0 + ${grpc.version} com.fasterxml.jackson.module @@ -231,42 +251,163 @@ org.apache.logging.log4j log4j-slf4j-impl - ${log4j2.version} + ${log4j.version} org.apache.logging.log4j log4j-core - ${log4j2.version} + ${log4j.version} + + + org.apache.logging.log4j + log4j-api + ${log4j.version} org.junit.jupiter junit-jupiter-api ${junit.jupiter.version} - test org.junit.platform junit-platform-engine ${junit.platform.version} - test org.junit.jupiter junit-jupiter-engine ${junit.jupiter.version} - test org.junit.jupiter junit-jupiter-params ${junit.jupiter.version} - test + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + io.jsonwebtoken + jjwt-api + ${jjwt.version} + + + io.jsonwebtoken + jjwt-impl + ${jjwt.version} + + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + + + org.apache.commons + commons-collections4 + ${commons-collections4.version} + + + jakarta.ws.rs + jakarta.ws.rs-api + ${jakarta.ws.rs-api.version} + + + commons-io + commons-io + ${commons-io.version} + + + commons-lang + commons-lang + ${commons-lang.version} + + + org.rocksdb + rocksdbjni + 4.5.1 + + + com.beust + jcommander + ${jcommander.version} + + + com.github.samtools + htsjdk + ${htsjdk.version} + + + org.hamcrest + hamcrest-core + ${hamcrest.version} org.hamcrest hamcrest-all - 1.3 - test + ${hamcrest.version} + + + org.apache.avro + avro + ${avro.version} + + + com.google.guava + guava + ${guava.version} + + + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta.xml.bind-api.version} + + + commons-codec + commons-codec + ${commons-codec.version} + + + junit + junit + ${junit.version} + + + org.mongodb + mongodb-driver-sync + ${mongodb.version} + + + org.mongodb + mongodb-driver-core + ${mongodb.version} + + + org.mongodb + bson + ${mongodb.version} + + + org.apache.poi + poi-ooxml + ${poi.version} + + + org.apache.poi + poi + ${poi.version} + + + javax.servlet + javax.servlet-api + ${javax.servlet-api.version} + + + io.swagger + swagger-annotations + ${swagger-annotations.version} @@ -276,6 +417,28 @@ src/test/java + + org.apache.maven.plugins + maven-dependency-plugin + 3.5.0 + + + analyze + + analyze-only + + + true + + org.eclipse.jetty:jetty-util-ajax + + + org.apache.avro:avro + + + + + org.apache.maven.plugins maven-compiler-plugin From 06194e281f1aee800fb14da57bb80e776269ff4a Mon Sep 17 00:00:00 2001 From: imedina Date: Tue, 16 May 2023 23:56:14 +0100 Subject: [PATCH 02/10] pom: minor improvement --- cellbase-lib/pom.xml | 1 - pom.xml | 8 +++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/cellbase-lib/pom.xml b/cellbase-lib/pom.xml index 7928d4e3c..0fc0516d0 100644 --- a/cellbase-lib/pom.xml +++ b/cellbase-lib/pom.xml @@ -43,7 +43,6 @@ biodata-models - org.apache.poi poi-ooxml diff --git a/pom.xml b/pom.xml index 3742741e3..2630e2455 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ 4.12 1.13 2.3.3 - 22.0 + 19.0 1.9.1 1.3 2.23.0 @@ -145,6 +145,12 @@ org.opencb.biodata biodata-tools ${biodata.version} + + + org.opencb.ga4gh + ga4gh + + org.opencb.commons From 9c405dc6ffa2641e80bfd318c51e0d90fce51840 Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Wed, 11 Oct 2023 16:16:13 +0200 Subject: [PATCH 03/10] Update version pom --- cellbase-app/pom.xml | 2 +- cellbase-client/pom.xml | 2 +- cellbase-core/pom.xml | 2 +- cellbase-lib/pom.xml | 2 +- cellbase-server/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cellbase-app/pom.xml b/cellbase-app/pom.xml index 0f23b50d2..5a0f3a0bf 100644 --- a/cellbase-app/pom.xml +++ b/cellbase-app/pom.xml @@ -6,7 +6,7 @@ org.opencb.cellbase cellbase - 5.4.1-SNAPSHOT + 5.8.0-SNAPSHOT ../pom.xml diff --git a/cellbase-client/pom.xml b/cellbase-client/pom.xml index 467907343..15ab96376 100644 --- a/cellbase-client/pom.xml +++ b/cellbase-client/pom.xml @@ -6,7 +6,7 @@ org.opencb.cellbase cellbase - 5.4.1-SNAPSHOT + 5.8.0-SNAPSHOT ../pom.xml diff --git a/cellbase-core/pom.xml b/cellbase-core/pom.xml index 474c72c88..dfe95b02c 100644 --- a/cellbase-core/pom.xml +++ b/cellbase-core/pom.xml @@ -6,7 +6,7 @@ org.opencb.cellbase cellbase - 5.4.1-SNAPSHOT + 5.8.0-SNAPSHOT ../pom.xml diff --git a/cellbase-lib/pom.xml b/cellbase-lib/pom.xml index 0fc0516d0..c2d97de7b 100644 --- a/cellbase-lib/pom.xml +++ b/cellbase-lib/pom.xml @@ -6,7 +6,7 @@ org.opencb.cellbase cellbase - 5.4.1-SNAPSHOT + 5.8.0-SNAPSHOT ../pom.xml diff --git a/cellbase-server/pom.xml b/cellbase-server/pom.xml index fc5910ae9..f50bf0bf0 100644 --- a/cellbase-server/pom.xml +++ b/cellbase-server/pom.xml @@ -6,7 +6,7 @@ org.opencb.cellbase cellbase - 5.4.1-SNAPSHOT + 5.8.0-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 2630e2455..b3c472f52 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.opencb.cellbase cellbase - 5.4.1-SNAPSHOT + 5.8.0-SNAPSHOT pom CellBase project From 276c9d648e08ffb28c3f8754f6d222f9c5fb97f8 Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Wed, 11 Oct 2023 16:21:26 +0200 Subject: [PATCH 04/10] Clean Poms TASK-2095 --- cellbase-lib/pom.xml | 2 -- cellbase-server/pom.xml | 1 - pom.xml | 4 ---- 3 files changed, 7 deletions(-) diff --git a/cellbase-lib/pom.xml b/cellbase-lib/pom.xml index c2d97de7b..a95967e58 100644 --- a/cellbase-lib/pom.xml +++ b/cellbase-lib/pom.xml @@ -131,8 +131,6 @@ com.github.samtools htsjdk - - org.eclipse.jetty jetty-util-ajax diff --git a/cellbase-server/pom.xml b/cellbase-server/pom.xml index f50bf0bf0..1f5fb9515 100644 --- a/cellbase-server/pom.xml +++ b/cellbase-server/pom.xml @@ -39,7 +39,6 @@ org.opencb.biodata biodata-models - com.fasterxml.jackson.module diff --git a/pom.xml b/pom.xml index 8caff8536..a3b15950c 100644 --- a/pom.xml +++ b/pom.xml @@ -57,10 +57,8 @@ cellbase checkstyle.xml - opencb https://sonarcloud.io - 1.8 UTF-8 @@ -172,7 +170,6 @@ biodata-models ${biodata.version} - io.grpc @@ -304,7 +301,6 @@ jjwt-impl ${jjwt.version} - org.apache.commons commons-lang3 From b5fe4da48195100cee415ef4dce3105b471d904d Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Fri, 13 Oct 2023 13:18:30 +0200 Subject: [PATCH 05/10] poms: update dependencies #TASK-2095 --- cellbase-app/pom.xml | 4 ---- cellbase-client/pom.xml | 4 ++++ cellbase-lib/pom.xml | 4 ++++ pom.xml | 6 ++++++ 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/cellbase-app/pom.xml b/cellbase-app/pom.xml index 5a0f3a0bf..a65df02b2 100644 --- a/cellbase-app/pom.xml +++ b/cellbase-app/pom.xml @@ -83,10 +83,6 @@ commons-lang commons-lang - - io.jsonwebtoken - jjwt-impl - org.apache.commons commons-lang3 diff --git a/cellbase-client/pom.xml b/cellbase-client/pom.xml index 15ab96376..02a4607eb 100644 --- a/cellbase-client/pom.xml +++ b/cellbase-client/pom.xml @@ -32,6 +32,10 @@ + + org.opencb.commons + commons-lib + org.glassfish.jersey.core jersey-client diff --git a/cellbase-lib/pom.xml b/cellbase-lib/pom.xml index a95967e58..aa3e2387e 100644 --- a/cellbase-lib/pom.xml +++ b/cellbase-lib/pom.xml @@ -131,6 +131,10 @@ com.github.samtools htsjdk + + org.codehaus.jackson + jackson-mapper-asl + org.eclipse.jetty jetty-util-ajax diff --git a/pom.xml b/pom.xml index a3b15950c..6a7fc1200 100644 --- a/pom.xml +++ b/pom.xml @@ -27,6 +27,7 @@ 2.12.0-SNAPSHOT 0.1.0 2.11.4 + 1.9.13 2.30.1 1.7.32 2.17.2 @@ -411,6 +412,11 @@ swagger-annotations ${swagger-annotations.version} + + org.codehaus.jackson + jackson-mapper-asl + ${jackson-asl.version} + From 647bfe1960853ad1d8ad296b7699cb02b164e023 Mon Sep 17 00:00:00 2001 From: imedina Date: Fri, 13 Oct 2023 16:33:44 +0100 Subject: [PATCH 06/10] pom: upgrade dependency plugin version --- cellbase-lib/pom.xml | 4 +++ pom.xml | 64 ++++++++++++++++---------------------------- 2 files changed, 27 insertions(+), 41 deletions(-) diff --git a/cellbase-lib/pom.xml b/cellbase-lib/pom.xml index aa3e2387e..0bc93eeff 100644 --- a/cellbase-lib/pom.xml +++ b/cellbase-lib/pom.xml @@ -135,6 +135,10 @@ org.codehaus.jackson jackson-mapper-asl + + io.jsonwebtoken + jjwt-api + org.eclipse.jetty jetty-util-ajax diff --git a/pom.xml b/pom.xml index 6a7fc1200..737612635 100644 --- a/pom.xml +++ b/pom.xml @@ -425,28 +425,6 @@ src/test/java - - org.apache.maven.plugins - maven-dependency-plugin - 3.5.0 - - - analyze - - analyze-only - - - true - - org.eclipse.jetty:jetty-util-ajax - - - org.apache.avro:avro - - - - - org.apache.maven.plugins maven-compiler-plugin @@ -524,25 +502,6 @@ - - - - - - - - - - - - - - - - - - - org.jacoco jacoco-maven-plugin @@ -582,6 +541,29 @@ + + org.apache.maven.plugins + maven-dependency-plugin + 3.6.0 + + + analyze + + analyze-only + + + true + + org.eclipse.jetty:jetty-util-ajax + + + org.apache.avro:avro + io.jsonwebtoken:jjwt-api + + + + + From f8dc56473fbff0ca6190d77d4e32be2c8f394eb7 Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Thu, 19 Oct 2023 12:58:22 +0200 Subject: [PATCH 07/10] pom: Added ignoredUnusedDeclaredDependency for all dependencies #TASK-2095 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6a7fc1200..714943789 100644 --- a/pom.xml +++ b/pom.xml @@ -438,7 +438,7 @@ true - org.eclipse.jetty:jetty-util-ajax + * org.apache.avro:avro From ff974bf9e6aa6c254ff59d0bd363dd0a1ee677ee Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Thu, 19 Oct 2023 13:30:44 +0200 Subject: [PATCH 08/10] pom: Added develop dependencies to review #TASK-2095 --- cellbase-app/pom.xml | 13 +++++++++++++ cellbase-client/pom.xml | 27 +++++++++++++++++++++++++++ cellbase-core/pom.xml | 25 +++++++++++++++++++++++++ cellbase-lib/pom.xml | 27 +++++++++++++++++++++++++++ cellbase-server/pom.xml | 27 +++++++++++++++++++++++++++ pom.xml | 14 ++++++++++++-- 6 files changed, 131 insertions(+), 2 deletions(-) diff --git a/cellbase-app/pom.xml b/cellbase-app/pom.xml index a65df02b2..e22c63e91 100644 --- a/cellbase-app/pom.xml +++ b/cellbase-app/pom.xml @@ -139,6 +139,19 @@ test + + + org.junit.jupiter + junit-jupiter-engine + test + + + org.junit.platform + junit-platform-engine + test + + + diff --git a/cellbase-client/pom.xml b/cellbase-client/pom.xml index 02a4607eb..63106b459 100644 --- a/cellbase-client/pom.xml +++ b/cellbase-client/pom.xml @@ -89,6 +89,33 @@ hamcrest-core test + + + + org.hamcrest + hamcrest-all + test + + + org.junit.jupiter + junit-jupiter-engine + test + + + org.glassfish.jersey.inject + jersey-hk2 + + + org.glassfish.jersey.containers + jersey-container-servlet + test + + + org.junit.platform + junit-platform-engine + test + + diff --git a/cellbase-core/pom.xml b/cellbase-core/pom.xml index dfe95b02c..62d86797c 100644 --- a/cellbase-core/pom.xml +++ b/cellbase-core/pom.xml @@ -92,6 +92,31 @@ junit-jupiter-api test + + + + org.hamcrest + hamcrest-all + test + + + org.junit.jupiter + junit-jupiter-engine + test + + + org.apache.logging.log4j + log4j-slf4j-impl + + + org.junit.platform + junit-platform-engine + test + + + io.jsonwebtoken + jjwt-jackson + diff --git a/cellbase-lib/pom.xml b/cellbase-lib/pom.xml index 0bc93eeff..72525f8fd 100644 --- a/cellbase-lib/pom.xml +++ b/cellbase-lib/pom.xml @@ -159,5 +159,32 @@ hamcrest-core test + + + + org.eclipse.jetty + jetty-util-ajax + test + + + org.glassfish.jersey.core + jersey-client + + + org.hamcrest + hamcrest-all + test + + + org.junit.jupiter + junit-jupiter-engine + test + + + org.junit.platform + junit-platform-engine + test + + diff --git a/cellbase-server/pom.xml b/cellbase-server/pom.xml index 1f5fb9515..5571e2282 100644 --- a/cellbase-server/pom.xml +++ b/cellbase-server/pom.xml @@ -101,6 +101,33 @@ com.fasterxml.jackson.core jackson-databind + + + + io.swagger + swagger-jersey2-jaxrs + + + org.glassfish.jersey.inject + jersey-hk2 + + + org.glassfish.jersey.media + jersey-media-json-jackson + + + org.glassfish.jersey.containers + jersey-container-servlet + + + org.glassfish.jersey.containers + jersey-container-servlet-core + + + org.glassfish.jersey.media + jersey-media-multipart + + diff --git a/pom.xml b/pom.xml index a6c41adac..ae1807958 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ 5.5.2 0.8.8 9.4.17.v20190418 - 0.11.5 + 0.11.5 1.6.5 3.1.0 4.1.2 @@ -50,7 +50,6 @@ 1.48.0 2.4 2.4 - 0.11.5 3.12.0 2.1.6 4.4 @@ -62,6 +61,7 @@ https://sonarcloud.io 1.8 UTF-8 + 1.6.5 https://github.com/opencb/cellbase @@ -417,6 +417,16 @@ jackson-mapper-asl ${jackson-asl.version} + + io.jsonwebtoken + jjwt-jackson + ${jjwt.version} + + + io.swagger + swagger-jersey2-jaxrs + ${swagger-jersey2-jaxrs.version} + From 768606f2ec74f6e8d28de092f1310ee83ad2fc72 Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Wed, 15 Nov 2023 13:00:04 +0100 Subject: [PATCH 09/10] pom: commons-datastore-mongodb not scoped test #2095 --- cellbase-app/pom.xml | 7 ++++++- cellbase-lib/pom.xml | 14 +++++++------- pom.xml | 3 +-- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/cellbase-app/pom.xml b/cellbase-app/pom.xml index e22c63e91..9933ed4aa 100644 --- a/cellbase-app/pom.xml +++ b/cellbase-app/pom.xml @@ -63,7 +63,12 @@ org.opencb.commons commons-datastore-mongodb - test + + + slf4j-simple + org.slf4j + + diff --git a/cellbase-lib/pom.xml b/cellbase-lib/pom.xml index 72525f8fd..d497d9325 100644 --- a/cellbase-lib/pom.xml +++ b/cellbase-lib/pom.xml @@ -21,6 +21,12 @@ org.opencb.commons commons-datastore-mongodb + + + slf4j-simple + org.slf4j + + org.opencb.biodata @@ -142,7 +148,6 @@ org.eclipse.jetty jetty-util-ajax - test junit @@ -161,12 +166,7 @@ - - org.eclipse.jetty - jetty-util-ajax - test - - + org.glassfish.jersey.core jersey-client diff --git a/pom.xml b/pom.xml index ae1807958..febb92564 100644 --- a/pom.xml +++ b/pom.xml @@ -567,8 +567,7 @@ * - org.apache.avro:avro - io.jsonwebtoken:jjwt-api + * From 35e2c3e7faf1e02208c7f9cf08146edc7e91dc45 Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Wed, 15 Nov 2023 16:07:47 +0100 Subject: [PATCH 10/10] pom: commons-collections4 added to client #2095 --- cellbase-client/pom.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cellbase-client/pom.xml b/cellbase-client/pom.xml index 63106b459..65aec2c9b 100644 --- a/cellbase-client/pom.xml +++ b/cellbase-client/pom.xml @@ -115,7 +115,10 @@ junit-platform-engine test - + + org.apache.commons + commons-collections4 +