From 51d7688e67a290341bb34fac49dba90c8181fa28 Mon Sep 17 00:00:00 2001 From: gbif-jenkins Date: Wed, 28 Feb 2024 18:43:43 +0000 Subject: [PATCH 01/13] [maven-release-plugin] prepare release registry-parent-3.96.0 --- pom.xml | 4 ++-- registry-cli/pom.xml | 2 +- registry-directory/pom.xml | 2 +- registry-doi/pom.xml | 2 +- registry-domain/pom.xml | 2 +- registry-events/pom.xml | 2 +- registry-examples/pom.xml | 2 +- registry-identity/pom.xml | 2 +- registry-integration-tests/pom.xml | 2 +- registry-mail/pom.xml | 2 +- registry-messaging/pom.xml | 2 +- registry-oaipmh/pom.xml | 2 +- registry-persistence/pom.xml | 2 +- registry-pipelines/pom.xml | 2 +- registry-search/pom.xml | 2 +- registry-security/pom.xml | 2 +- registry-service/pom.xml | 2 +- registry-surety/pom.xml | 2 +- registry-ws-client/pom.xml | 2 +- registry-ws/pom.xml | 2 +- 20 files changed, 21 insertions(+), 21 deletions(-) diff --git a/pom.xml b/pom.xml index a133f0f09..292cf10dc 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.gbif.registry registry-parent - 3.96.0-SNAPSHOT + 3.96.0 GBIF Registry Parent GBIF Registry project @@ -19,7 +19,7 @@ scm:git:git@github.com:gbif/registry.git https://github.com/gbif/registry scm:git:git@github.com:gbif/registry.git - HEAD + registry-parent-3.96.0 diff --git a/registry-cli/pom.xml b/registry-cli/pom.xml index 23ea49c91..22ea84b05 100644 --- a/registry-cli/pom.xml +++ b/registry-cli/pom.xml @@ -4,7 +4,7 @@ org.gbif.registry registry-parent - 3.96.0-SNAPSHOT + 3.96.0 registry-cli diff --git a/registry-directory/pom.xml b/registry-directory/pom.xml index b0be4e61d..6ba9e01b7 100644 --- a/registry-directory/pom.xml +++ b/registry-directory/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.0-SNAPSHOT + 3.96.0 4.0.0 diff --git a/registry-doi/pom.xml b/registry-doi/pom.xml index 82cadd768..1f4e46ebc 100644 --- a/registry-doi/pom.xml +++ b/registry-doi/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.0-SNAPSHOT + 3.96.0 4.0.0 diff --git a/registry-domain/pom.xml b/registry-domain/pom.xml index 543d6eef7..c70e6d06b 100644 --- a/registry-domain/pom.xml +++ b/registry-domain/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.0-SNAPSHOT + 3.96.0 4.0.0 diff --git a/registry-events/pom.xml b/registry-events/pom.xml index 95547ff28..f1d0080d8 100644 --- a/registry-events/pom.xml +++ b/registry-events/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.0-SNAPSHOT + 3.96.0 4.0.0 diff --git a/registry-examples/pom.xml b/registry-examples/pom.xml index 0581e8060..5201c9872 100644 --- a/registry-examples/pom.xml +++ b/registry-examples/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.0-SNAPSHOT + 3.96.0 4.0.0 diff --git a/registry-identity/pom.xml b/registry-identity/pom.xml index c56018a6a..0ea54f171 100644 --- a/registry-identity/pom.xml +++ b/registry-identity/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.0-SNAPSHOT + 3.96.0 4.0.0 diff --git a/registry-integration-tests/pom.xml b/registry-integration-tests/pom.xml index 7cb5194b3..f5e723b77 100644 --- a/registry-integration-tests/pom.xml +++ b/registry-integration-tests/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.0-SNAPSHOT + 3.96.0 4.0.0 diff --git a/registry-mail/pom.xml b/registry-mail/pom.xml index df86be53b..6977cf3ff 100644 --- a/registry-mail/pom.xml +++ b/registry-mail/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.0-SNAPSHOT + 3.96.0 4.0.0 diff --git a/registry-messaging/pom.xml b/registry-messaging/pom.xml index d76a36a07..feefd8be4 100644 --- a/registry-messaging/pom.xml +++ b/registry-messaging/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.0-SNAPSHOT + 3.96.0 4.0.0 diff --git a/registry-oaipmh/pom.xml b/registry-oaipmh/pom.xml index 7c24f2760..9df3b5606 100644 --- a/registry-oaipmh/pom.xml +++ b/registry-oaipmh/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.0-SNAPSHOT + 3.96.0 4.0.0 diff --git a/registry-persistence/pom.xml b/registry-persistence/pom.xml index 093d63594..bbc14233f 100644 --- a/registry-persistence/pom.xml +++ b/registry-persistence/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.0-SNAPSHOT + 3.96.0 4.0.0 diff --git a/registry-pipelines/pom.xml b/registry-pipelines/pom.xml index f61933a09..7ab50bb47 100644 --- a/registry-pipelines/pom.xml +++ b/registry-pipelines/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.0-SNAPSHOT + 3.96.0 4.0.0 diff --git a/registry-search/pom.xml b/registry-search/pom.xml index 62f4ee2bc..12b67983c 100644 --- a/registry-search/pom.xml +++ b/registry-search/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.0-SNAPSHOT + 3.96.0 4.0.0 diff --git a/registry-security/pom.xml b/registry-security/pom.xml index 192c0331d..2a32d9e73 100644 --- a/registry-security/pom.xml +++ b/registry-security/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.0-SNAPSHOT + 3.96.0 4.0.0 diff --git a/registry-service/pom.xml b/registry-service/pom.xml index 8e3b8de2d..bb023cd31 100644 --- a/registry-service/pom.xml +++ b/registry-service/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.0-SNAPSHOT + 3.96.0 4.0.0 diff --git a/registry-surety/pom.xml b/registry-surety/pom.xml index a3ab5ebcb..7695dc7fa 100644 --- a/registry-surety/pom.xml +++ b/registry-surety/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.0-SNAPSHOT + 3.96.0 4.0.0 diff --git a/registry-ws-client/pom.xml b/registry-ws-client/pom.xml index 0cb8ca828..a285f4498 100644 --- a/registry-ws-client/pom.xml +++ b/registry-ws-client/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.0-SNAPSHOT + 3.96.0 4.0.0 diff --git a/registry-ws/pom.xml b/registry-ws/pom.xml index cd96f32c1..e1fd1b903 100644 --- a/registry-ws/pom.xml +++ b/registry-ws/pom.xml @@ -4,7 +4,7 @@ org.gbif.registry registry-parent - 3.96.0-SNAPSHOT + 3.96.0 registry-ws GBIF Registry Webservices From 0fd8cbe4cf5016f3f5968bcdf000d68e3654405a Mon Sep 17 00:00:00 2001 From: gbif-jenkins Date: Wed, 28 Feb 2024 18:43:48 +0000 Subject: [PATCH 02/13] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- registry-cli/pom.xml | 2 +- registry-directory/pom.xml | 2 +- registry-doi/pom.xml | 2 +- registry-domain/pom.xml | 2 +- registry-events/pom.xml | 2 +- registry-examples/pom.xml | 2 +- registry-identity/pom.xml | 2 +- registry-integration-tests/pom.xml | 2 +- registry-mail/pom.xml | 2 +- registry-messaging/pom.xml | 2 +- registry-oaipmh/pom.xml | 2 +- registry-persistence/pom.xml | 2 +- registry-pipelines/pom.xml | 2 +- registry-search/pom.xml | 2 +- registry-security/pom.xml | 2 +- registry-service/pom.xml | 2 +- registry-surety/pom.xml | 2 +- registry-ws-client/pom.xml | 2 +- registry-ws/pom.xml | 2 +- 20 files changed, 21 insertions(+), 21 deletions(-) diff --git a/pom.xml b/pom.xml index 292cf10dc..3481c0f89 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.gbif.registry registry-parent - 3.96.0 + 3.96.1-SNAPSHOT GBIF Registry Parent GBIF Registry project @@ -19,7 +19,7 @@ scm:git:git@github.com:gbif/registry.git https://github.com/gbif/registry scm:git:git@github.com:gbif/registry.git - registry-parent-3.96.0 + HEAD diff --git a/registry-cli/pom.xml b/registry-cli/pom.xml index 22ea84b05..683e4511b 100644 --- a/registry-cli/pom.xml +++ b/registry-cli/pom.xml @@ -4,7 +4,7 @@ org.gbif.registry registry-parent - 3.96.0 + 3.96.1-SNAPSHOT registry-cli diff --git a/registry-directory/pom.xml b/registry-directory/pom.xml index 6ba9e01b7..6416a89c1 100644 --- a/registry-directory/pom.xml +++ b/registry-directory/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.0 + 3.96.1-SNAPSHOT 4.0.0 diff --git a/registry-doi/pom.xml b/registry-doi/pom.xml index 1f4e46ebc..5ba4c5d2b 100644 --- a/registry-doi/pom.xml +++ b/registry-doi/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.0 + 3.96.1-SNAPSHOT 4.0.0 diff --git a/registry-domain/pom.xml b/registry-domain/pom.xml index c70e6d06b..c64291ec5 100644 --- a/registry-domain/pom.xml +++ b/registry-domain/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.0 + 3.96.1-SNAPSHOT 4.0.0 diff --git a/registry-events/pom.xml b/registry-events/pom.xml index f1d0080d8..f421897b8 100644 --- a/registry-events/pom.xml +++ b/registry-events/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.0 + 3.96.1-SNAPSHOT 4.0.0 diff --git a/registry-examples/pom.xml b/registry-examples/pom.xml index 5201c9872..106b74f1a 100644 --- a/registry-examples/pom.xml +++ b/registry-examples/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.0 + 3.96.1-SNAPSHOT 4.0.0 diff --git a/registry-identity/pom.xml b/registry-identity/pom.xml index 0ea54f171..b546cd48a 100644 --- a/registry-identity/pom.xml +++ b/registry-identity/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.0 + 3.96.1-SNAPSHOT 4.0.0 diff --git a/registry-integration-tests/pom.xml b/registry-integration-tests/pom.xml index f5e723b77..81af59917 100644 --- a/registry-integration-tests/pom.xml +++ b/registry-integration-tests/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.0 + 3.96.1-SNAPSHOT 4.0.0 diff --git a/registry-mail/pom.xml b/registry-mail/pom.xml index 6977cf3ff..279fed844 100644 --- a/registry-mail/pom.xml +++ b/registry-mail/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.0 + 3.96.1-SNAPSHOT 4.0.0 diff --git a/registry-messaging/pom.xml b/registry-messaging/pom.xml index feefd8be4..b50f3beae 100644 --- a/registry-messaging/pom.xml +++ b/registry-messaging/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.0 + 3.96.1-SNAPSHOT 4.0.0 diff --git a/registry-oaipmh/pom.xml b/registry-oaipmh/pom.xml index 9df3b5606..2cba0638a 100644 --- a/registry-oaipmh/pom.xml +++ b/registry-oaipmh/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.0 + 3.96.1-SNAPSHOT 4.0.0 diff --git a/registry-persistence/pom.xml b/registry-persistence/pom.xml index bbc14233f..4c4eee071 100644 --- a/registry-persistence/pom.xml +++ b/registry-persistence/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.0 + 3.96.1-SNAPSHOT 4.0.0 diff --git a/registry-pipelines/pom.xml b/registry-pipelines/pom.xml index 7ab50bb47..905525111 100644 --- a/registry-pipelines/pom.xml +++ b/registry-pipelines/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.0 + 3.96.1-SNAPSHOT 4.0.0 diff --git a/registry-search/pom.xml b/registry-search/pom.xml index 12b67983c..200a34522 100644 --- a/registry-search/pom.xml +++ b/registry-search/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.0 + 3.96.1-SNAPSHOT 4.0.0 diff --git a/registry-security/pom.xml b/registry-security/pom.xml index 2a32d9e73..475055c57 100644 --- a/registry-security/pom.xml +++ b/registry-security/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.0 + 3.96.1-SNAPSHOT 4.0.0 diff --git a/registry-service/pom.xml b/registry-service/pom.xml index bb023cd31..7f4c47cbd 100644 --- a/registry-service/pom.xml +++ b/registry-service/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.0 + 3.96.1-SNAPSHOT 4.0.0 diff --git a/registry-surety/pom.xml b/registry-surety/pom.xml index 7695dc7fa..0011f2002 100644 --- a/registry-surety/pom.xml +++ b/registry-surety/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.0 + 3.96.1-SNAPSHOT 4.0.0 diff --git a/registry-ws-client/pom.xml b/registry-ws-client/pom.xml index a285f4498..d3d8f0811 100644 --- a/registry-ws-client/pom.xml +++ b/registry-ws-client/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.0 + 3.96.1-SNAPSHOT 4.0.0 diff --git a/registry-ws/pom.xml b/registry-ws/pom.xml index e1fd1b903..31978c628 100644 --- a/registry-ws/pom.xml +++ b/registry-ws/pom.xml @@ -4,7 +4,7 @@ org.gbif.registry registry-parent - 3.96.0 + 3.96.1-SNAPSHOT registry-ws GBIF Registry Webservices From 3faf5f2ab39795f4f1ed38dadeeeef0428f4dadb Mon Sep 17 00:00:00 2001 From: Matthew Blissett Date: Thu, 29 Feb 2024 15:18:13 +0100 Subject: [PATCH 03/13] Update API (new INVITED_TESTER role). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3481c0f89..732c2f63e 100644 --- a/pom.xml +++ b/pom.xml @@ -84,7 +84,7 @@ 2.2.8.RELEASE - 1.14.0 + 1.14.2 0.59 1.3 1.26 From 183210e343fbde51120c69e8cb3cbe406cbba77f Mon Sep 17 00:00:00 2001 From: gbif-jenkins Date: Thu, 29 Feb 2024 15:06:37 +0000 Subject: [PATCH 04/13] [maven-release-plugin] prepare release registry-parent-3.96.1 --- pom.xml | 4 ++-- registry-cli/pom.xml | 2 +- registry-directory/pom.xml | 2 +- registry-doi/pom.xml | 2 +- registry-domain/pom.xml | 2 +- registry-events/pom.xml | 2 +- registry-examples/pom.xml | 2 +- registry-identity/pom.xml | 2 +- registry-integration-tests/pom.xml | 2 +- registry-mail/pom.xml | 2 +- registry-messaging/pom.xml | 2 +- registry-oaipmh/pom.xml | 2 +- registry-persistence/pom.xml | 2 +- registry-pipelines/pom.xml | 2 +- registry-search/pom.xml | 2 +- registry-security/pom.xml | 2 +- registry-service/pom.xml | 2 +- registry-surety/pom.xml | 2 +- registry-ws-client/pom.xml | 2 +- registry-ws/pom.xml | 2 +- 20 files changed, 21 insertions(+), 21 deletions(-) diff --git a/pom.xml b/pom.xml index 732c2f63e..f2d979bef 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.gbif.registry registry-parent - 3.96.1-SNAPSHOT + 3.96.1 GBIF Registry Parent GBIF Registry project @@ -19,7 +19,7 @@ scm:git:git@github.com:gbif/registry.git https://github.com/gbif/registry scm:git:git@github.com:gbif/registry.git - HEAD + registry-parent-3.96.1 diff --git a/registry-cli/pom.xml b/registry-cli/pom.xml index 683e4511b..bb6eb61d0 100644 --- a/registry-cli/pom.xml +++ b/registry-cli/pom.xml @@ -4,7 +4,7 @@ org.gbif.registry registry-parent - 3.96.1-SNAPSHOT + 3.96.1 registry-cli diff --git a/registry-directory/pom.xml b/registry-directory/pom.xml index 6416a89c1..a4dcc1837 100644 --- a/registry-directory/pom.xml +++ b/registry-directory/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.1-SNAPSHOT + 3.96.1 4.0.0 diff --git a/registry-doi/pom.xml b/registry-doi/pom.xml index 5ba4c5d2b..3713c0f1f 100644 --- a/registry-doi/pom.xml +++ b/registry-doi/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.1-SNAPSHOT + 3.96.1 4.0.0 diff --git a/registry-domain/pom.xml b/registry-domain/pom.xml index c64291ec5..c9d9acbd8 100644 --- a/registry-domain/pom.xml +++ b/registry-domain/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.1-SNAPSHOT + 3.96.1 4.0.0 diff --git a/registry-events/pom.xml b/registry-events/pom.xml index f421897b8..ae3524d0c 100644 --- a/registry-events/pom.xml +++ b/registry-events/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.1-SNAPSHOT + 3.96.1 4.0.0 diff --git a/registry-examples/pom.xml b/registry-examples/pom.xml index 106b74f1a..87b229233 100644 --- a/registry-examples/pom.xml +++ b/registry-examples/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.1-SNAPSHOT + 3.96.1 4.0.0 diff --git a/registry-identity/pom.xml b/registry-identity/pom.xml index b546cd48a..65fba7e0c 100644 --- a/registry-identity/pom.xml +++ b/registry-identity/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.1-SNAPSHOT + 3.96.1 4.0.0 diff --git a/registry-integration-tests/pom.xml b/registry-integration-tests/pom.xml index 81af59917..bd75851cc 100644 --- a/registry-integration-tests/pom.xml +++ b/registry-integration-tests/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.1-SNAPSHOT + 3.96.1 4.0.0 diff --git a/registry-mail/pom.xml b/registry-mail/pom.xml index 279fed844..2777b2899 100644 --- a/registry-mail/pom.xml +++ b/registry-mail/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.1-SNAPSHOT + 3.96.1 4.0.0 diff --git a/registry-messaging/pom.xml b/registry-messaging/pom.xml index b50f3beae..3b3a71b8e 100644 --- a/registry-messaging/pom.xml +++ b/registry-messaging/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.1-SNAPSHOT + 3.96.1 4.0.0 diff --git a/registry-oaipmh/pom.xml b/registry-oaipmh/pom.xml index 2cba0638a..7f608f5b1 100644 --- a/registry-oaipmh/pom.xml +++ b/registry-oaipmh/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.1-SNAPSHOT + 3.96.1 4.0.0 diff --git a/registry-persistence/pom.xml b/registry-persistence/pom.xml index 4c4eee071..b90f0cf60 100644 --- a/registry-persistence/pom.xml +++ b/registry-persistence/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.1-SNAPSHOT + 3.96.1 4.0.0 diff --git a/registry-pipelines/pom.xml b/registry-pipelines/pom.xml index 905525111..75e575da3 100644 --- a/registry-pipelines/pom.xml +++ b/registry-pipelines/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.1-SNAPSHOT + 3.96.1 4.0.0 diff --git a/registry-search/pom.xml b/registry-search/pom.xml index 200a34522..4b9fdca47 100644 --- a/registry-search/pom.xml +++ b/registry-search/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.1-SNAPSHOT + 3.96.1 4.0.0 diff --git a/registry-security/pom.xml b/registry-security/pom.xml index 475055c57..77230033e 100644 --- a/registry-security/pom.xml +++ b/registry-security/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.1-SNAPSHOT + 3.96.1 4.0.0 diff --git a/registry-service/pom.xml b/registry-service/pom.xml index 7f4c47cbd..2bfa6c4d4 100644 --- a/registry-service/pom.xml +++ b/registry-service/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.1-SNAPSHOT + 3.96.1 4.0.0 diff --git a/registry-surety/pom.xml b/registry-surety/pom.xml index 0011f2002..69c9604e5 100644 --- a/registry-surety/pom.xml +++ b/registry-surety/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.1-SNAPSHOT + 3.96.1 4.0.0 diff --git a/registry-ws-client/pom.xml b/registry-ws-client/pom.xml index d3d8f0811..fbcdb0bb5 100644 --- a/registry-ws-client/pom.xml +++ b/registry-ws-client/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.1-SNAPSHOT + 3.96.1 4.0.0 diff --git a/registry-ws/pom.xml b/registry-ws/pom.xml index 31978c628..bab563b32 100644 --- a/registry-ws/pom.xml +++ b/registry-ws/pom.xml @@ -4,7 +4,7 @@ org.gbif.registry registry-parent - 3.96.1-SNAPSHOT + 3.96.1 registry-ws GBIF Registry Webservices From d1b2df3d80bf98d5118af4efd982214c7e6bf8ca Mon Sep 17 00:00:00 2001 From: gbif-jenkins Date: Thu, 29 Feb 2024 15:06:41 +0000 Subject: [PATCH 05/13] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- registry-cli/pom.xml | 2 +- registry-directory/pom.xml | 2 +- registry-doi/pom.xml | 2 +- registry-domain/pom.xml | 2 +- registry-events/pom.xml | 2 +- registry-examples/pom.xml | 2 +- registry-identity/pom.xml | 2 +- registry-integration-tests/pom.xml | 2 +- registry-mail/pom.xml | 2 +- registry-messaging/pom.xml | 2 +- registry-oaipmh/pom.xml | 2 +- registry-persistence/pom.xml | 2 +- registry-pipelines/pom.xml | 2 +- registry-search/pom.xml | 2 +- registry-security/pom.xml | 2 +- registry-service/pom.xml | 2 +- registry-surety/pom.xml | 2 +- registry-ws-client/pom.xml | 2 +- registry-ws/pom.xml | 2 +- 20 files changed, 21 insertions(+), 21 deletions(-) diff --git a/pom.xml b/pom.xml index f2d979bef..64d84f00e 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.gbif.registry registry-parent - 3.96.1 + 3.96.2-SNAPSHOT GBIF Registry Parent GBIF Registry project @@ -19,7 +19,7 @@ scm:git:git@github.com:gbif/registry.git https://github.com/gbif/registry scm:git:git@github.com:gbif/registry.git - registry-parent-3.96.1 + HEAD diff --git a/registry-cli/pom.xml b/registry-cli/pom.xml index bb6eb61d0..723f7ef68 100644 --- a/registry-cli/pom.xml +++ b/registry-cli/pom.xml @@ -4,7 +4,7 @@ org.gbif.registry registry-parent - 3.96.1 + 3.96.2-SNAPSHOT registry-cli diff --git a/registry-directory/pom.xml b/registry-directory/pom.xml index a4dcc1837..29fdb2085 100644 --- a/registry-directory/pom.xml +++ b/registry-directory/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.1 + 3.96.2-SNAPSHOT 4.0.0 diff --git a/registry-doi/pom.xml b/registry-doi/pom.xml index 3713c0f1f..ff066db3d 100644 --- a/registry-doi/pom.xml +++ b/registry-doi/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.1 + 3.96.2-SNAPSHOT 4.0.0 diff --git a/registry-domain/pom.xml b/registry-domain/pom.xml index c9d9acbd8..3ccd8f4d9 100644 --- a/registry-domain/pom.xml +++ b/registry-domain/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.1 + 3.96.2-SNAPSHOT 4.0.0 diff --git a/registry-events/pom.xml b/registry-events/pom.xml index ae3524d0c..9d66ea0bd 100644 --- a/registry-events/pom.xml +++ b/registry-events/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.1 + 3.96.2-SNAPSHOT 4.0.0 diff --git a/registry-examples/pom.xml b/registry-examples/pom.xml index 87b229233..eae1df3fa 100644 --- a/registry-examples/pom.xml +++ b/registry-examples/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.1 + 3.96.2-SNAPSHOT 4.0.0 diff --git a/registry-identity/pom.xml b/registry-identity/pom.xml index 65fba7e0c..f050fe1b6 100644 --- a/registry-identity/pom.xml +++ b/registry-identity/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.1 + 3.96.2-SNAPSHOT 4.0.0 diff --git a/registry-integration-tests/pom.xml b/registry-integration-tests/pom.xml index bd75851cc..a60294ab5 100644 --- a/registry-integration-tests/pom.xml +++ b/registry-integration-tests/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.1 + 3.96.2-SNAPSHOT 4.0.0 diff --git a/registry-mail/pom.xml b/registry-mail/pom.xml index 2777b2899..1b3f7bd7c 100644 --- a/registry-mail/pom.xml +++ b/registry-mail/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.1 + 3.96.2-SNAPSHOT 4.0.0 diff --git a/registry-messaging/pom.xml b/registry-messaging/pom.xml index 3b3a71b8e..0a3c25038 100644 --- a/registry-messaging/pom.xml +++ b/registry-messaging/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.1 + 3.96.2-SNAPSHOT 4.0.0 diff --git a/registry-oaipmh/pom.xml b/registry-oaipmh/pom.xml index 7f608f5b1..d805f9d7f 100644 --- a/registry-oaipmh/pom.xml +++ b/registry-oaipmh/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.1 + 3.96.2-SNAPSHOT 4.0.0 diff --git a/registry-persistence/pom.xml b/registry-persistence/pom.xml index b90f0cf60..b23f5c328 100644 --- a/registry-persistence/pom.xml +++ b/registry-persistence/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.1 + 3.96.2-SNAPSHOT 4.0.0 diff --git a/registry-pipelines/pom.xml b/registry-pipelines/pom.xml index 75e575da3..bc085f724 100644 --- a/registry-pipelines/pom.xml +++ b/registry-pipelines/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.1 + 3.96.2-SNAPSHOT 4.0.0 diff --git a/registry-search/pom.xml b/registry-search/pom.xml index 4b9fdca47..517470f72 100644 --- a/registry-search/pom.xml +++ b/registry-search/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.1 + 3.96.2-SNAPSHOT 4.0.0 diff --git a/registry-security/pom.xml b/registry-security/pom.xml index 77230033e..e3e61923a 100644 --- a/registry-security/pom.xml +++ b/registry-security/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.1 + 3.96.2-SNAPSHOT 4.0.0 diff --git a/registry-service/pom.xml b/registry-service/pom.xml index 2bfa6c4d4..3fa29e3b8 100644 --- a/registry-service/pom.xml +++ b/registry-service/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.1 + 3.96.2-SNAPSHOT 4.0.0 diff --git a/registry-surety/pom.xml b/registry-surety/pom.xml index 69c9604e5..84a7fafc2 100644 --- a/registry-surety/pom.xml +++ b/registry-surety/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.1 + 3.96.2-SNAPSHOT 4.0.0 diff --git a/registry-ws-client/pom.xml b/registry-ws-client/pom.xml index fbcdb0bb5..861871295 100644 --- a/registry-ws-client/pom.xml +++ b/registry-ws-client/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.96.1 + 3.96.2-SNAPSHOT 4.0.0 diff --git a/registry-ws/pom.xml b/registry-ws/pom.xml index bab563b32..ae1b10a43 100644 --- a/registry-ws/pom.xml +++ b/registry-ws/pom.xml @@ -4,7 +4,7 @@ org.gbif.registry registry-parent - 3.96.1 + 3.96.2-SNAPSHOT registry-ws GBIF Registry Webservices From 76861a17cc457666c69d7a9543913b0fd16682d1 Mon Sep 17 00:00:00 2001 From: Mikhail Podolskiy Date: Wed, 6 Mar 2024 09:43:23 +0100 Subject: [PATCH 06/13] Update jacoco configuration --- pom.xml | 2 +- registry-cli/pom.xml | 4 ---- registry-directory/pom.xml | 4 ---- registry-doi/pom.xml | 4 ---- registry-domain/pom.xml | 4 ---- registry-events/pom.xml | 4 ---- registry-identity/pom.xml | 4 ---- registry-integration-tests/pom.xml | 9 +++++++++ registry-mail/pom.xml | 4 ---- registry-messaging/pom.xml | 4 ---- registry-oaipmh/pom.xml | 4 ---- registry-persistence/pom.xml | 4 ---- registry-pipelines/pom.xml | 4 ---- registry-search/pom.xml | 4 ---- registry-security/pom.xml | 4 ---- registry-service/pom.xml | 4 ---- registry-surety/pom.xml | 4 ---- registry-ws-client/pom.xml | 4 ---- 18 files changed, 10 insertions(+), 65 deletions(-) diff --git a/pom.xml b/pom.xml index 64d84f00e..237f5a759 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.gbif motherpom - 56 + 57-SNAPSHOT org.gbif.registry diff --git a/registry-cli/pom.xml b/registry-cli/pom.xml index 723f7ef68..bc72adadf 100644 --- a/registry-cli/pom.xml +++ b/registry-cli/pom.xml @@ -27,10 +27,6 @@ 1.19.3 1.4.7 18.0 - - - ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml - diff --git a/registry-directory/pom.xml b/registry-directory/pom.xml index 29fdb2085..eeb826dac 100644 --- a/registry-directory/pom.xml +++ b/registry-directory/pom.xml @@ -12,10 +12,6 @@ ${project.parent.basedir} - - - ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml - diff --git a/registry-doi/pom.xml b/registry-doi/pom.xml index ff066db3d..0726b76d9 100644 --- a/registry-doi/pom.xml +++ b/registry-doi/pom.xml @@ -13,10 +13,6 @@ ${project.parent.basedir} - - - ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml - diff --git a/registry-domain/pom.xml b/registry-domain/pom.xml index 3ccd8f4d9..705030531 100644 --- a/registry-domain/pom.xml +++ b/registry-domain/pom.xml @@ -12,10 +12,6 @@ ${project.parent.basedir} - - - ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml - diff --git a/registry-events/pom.xml b/registry-events/pom.xml index 9d66ea0bd..966db00bc 100644 --- a/registry-events/pom.xml +++ b/registry-events/pom.xml @@ -12,10 +12,6 @@ ${project.parent.basedir} - - - ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml - diff --git a/registry-identity/pom.xml b/registry-identity/pom.xml index f050fe1b6..c18a89b87 100644 --- a/registry-identity/pom.xml +++ b/registry-identity/pom.xml @@ -12,10 +12,6 @@ ${project.parent.basedir} - - - ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml - diff --git a/registry-integration-tests/pom.xml b/registry-integration-tests/pom.xml index a60294ab5..7b6497b4f 100644 --- a/registry-integration-tests/pom.xml +++ b/registry-integration-tests/pom.xml @@ -167,6 +167,15 @@ org.jacoco jacoco-maven-plugin + + + report + + report-aggregate + + verify + + org.apache.maven.plugins diff --git a/registry-mail/pom.xml b/registry-mail/pom.xml index 1b3f7bd7c..1c41eb507 100644 --- a/registry-mail/pom.xml +++ b/registry-mail/pom.xml @@ -12,10 +12,6 @@ ${project.parent.basedir} - - - ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml - diff --git a/registry-messaging/pom.xml b/registry-messaging/pom.xml index 0a3c25038..001895d3f 100644 --- a/registry-messaging/pom.xml +++ b/registry-messaging/pom.xml @@ -12,10 +12,6 @@ ${project.parent.basedir} - - - ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml - diff --git a/registry-oaipmh/pom.xml b/registry-oaipmh/pom.xml index d805f9d7f..60d7ce084 100644 --- a/registry-oaipmh/pom.xml +++ b/registry-oaipmh/pom.xml @@ -12,10 +12,6 @@ ${project.parent.basedir} - - - ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml - diff --git a/registry-persistence/pom.xml b/registry-persistence/pom.xml index b23f5c328..595b0356c 100644 --- a/registry-persistence/pom.xml +++ b/registry-persistence/pom.xml @@ -12,10 +12,6 @@ ${project.parent.basedir} - - - ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml - diff --git a/registry-pipelines/pom.xml b/registry-pipelines/pom.xml index bc085f724..85a40613e 100644 --- a/registry-pipelines/pom.xml +++ b/registry-pipelines/pom.xml @@ -12,10 +12,6 @@ ${project.parent.basedir} - - - ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml - diff --git a/registry-search/pom.xml b/registry-search/pom.xml index 517470f72..3ab98fbea 100644 --- a/registry-search/pom.xml +++ b/registry-search/pom.xml @@ -13,10 +13,6 @@ ${project.parent.basedir} - - - ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml - diff --git a/registry-security/pom.xml b/registry-security/pom.xml index e3e61923a..96c068cfb 100644 --- a/registry-security/pom.xml +++ b/registry-security/pom.xml @@ -12,10 +12,6 @@ ${project.parent.basedir} - - - ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml - diff --git a/registry-service/pom.xml b/registry-service/pom.xml index 3fa29e3b8..4d40f435b 100644 --- a/registry-service/pom.xml +++ b/registry-service/pom.xml @@ -12,10 +12,6 @@ ${project.parent.basedir} - - - ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml - diff --git a/registry-surety/pom.xml b/registry-surety/pom.xml index 84a7fafc2..17b8e7fd7 100644 --- a/registry-surety/pom.xml +++ b/registry-surety/pom.xml @@ -14,10 +14,6 @@ ${project.parent.basedir} - - - ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml - diff --git a/registry-ws-client/pom.xml b/registry-ws-client/pom.xml index 861871295..0b85e034a 100644 --- a/registry-ws-client/pom.xml +++ b/registry-ws-client/pom.xml @@ -12,10 +12,6 @@ ${project.parent.basedir} - - - ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml - From 4c0f473a48e0bd99a00d67b8ab23817b6a90ddb6 Mon Sep 17 00:00:00 2001 From: Mikhail Podolskiy Date: Wed, 6 Mar 2024 10:23:03 +0100 Subject: [PATCH 07/13] Revert "Update jacoco configuration" This reverts commit 76861a17cc457666c69d7a9543913b0fd16682d1. --- pom.xml | 2 +- registry-cli/pom.xml | 4 ++++ registry-directory/pom.xml | 4 ++++ registry-doi/pom.xml | 4 ++++ registry-domain/pom.xml | 4 ++++ registry-events/pom.xml | 4 ++++ registry-identity/pom.xml | 4 ++++ registry-integration-tests/pom.xml | 9 --------- registry-mail/pom.xml | 4 ++++ registry-messaging/pom.xml | 4 ++++ registry-oaipmh/pom.xml | 4 ++++ registry-persistence/pom.xml | 4 ++++ registry-pipelines/pom.xml | 4 ++++ registry-search/pom.xml | 4 ++++ registry-security/pom.xml | 4 ++++ registry-service/pom.xml | 4 ++++ registry-surety/pom.xml | 4 ++++ registry-ws-client/pom.xml | 4 ++++ 18 files changed, 65 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 237f5a759..64d84f00e 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.gbif motherpom - 57-SNAPSHOT + 56 org.gbif.registry diff --git a/registry-cli/pom.xml b/registry-cli/pom.xml index bc72adadf..723f7ef68 100644 --- a/registry-cli/pom.xml +++ b/registry-cli/pom.xml @@ -27,6 +27,10 @@ 1.19.3 1.4.7 18.0 + + + ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml + diff --git a/registry-directory/pom.xml b/registry-directory/pom.xml index eeb826dac..29fdb2085 100644 --- a/registry-directory/pom.xml +++ b/registry-directory/pom.xml @@ -12,6 +12,10 @@ ${project.parent.basedir} + + + ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml + diff --git a/registry-doi/pom.xml b/registry-doi/pom.xml index 0726b76d9..ff066db3d 100644 --- a/registry-doi/pom.xml +++ b/registry-doi/pom.xml @@ -13,6 +13,10 @@ ${project.parent.basedir} + + + ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml + diff --git a/registry-domain/pom.xml b/registry-domain/pom.xml index 705030531..3ccd8f4d9 100644 --- a/registry-domain/pom.xml +++ b/registry-domain/pom.xml @@ -12,6 +12,10 @@ ${project.parent.basedir} + + + ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml + diff --git a/registry-events/pom.xml b/registry-events/pom.xml index 966db00bc..9d66ea0bd 100644 --- a/registry-events/pom.xml +++ b/registry-events/pom.xml @@ -12,6 +12,10 @@ ${project.parent.basedir} + + + ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml + diff --git a/registry-identity/pom.xml b/registry-identity/pom.xml index c18a89b87..f050fe1b6 100644 --- a/registry-identity/pom.xml +++ b/registry-identity/pom.xml @@ -12,6 +12,10 @@ ${project.parent.basedir} + + + ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml + diff --git a/registry-integration-tests/pom.xml b/registry-integration-tests/pom.xml index 7b6497b4f..a60294ab5 100644 --- a/registry-integration-tests/pom.xml +++ b/registry-integration-tests/pom.xml @@ -167,15 +167,6 @@ org.jacoco jacoco-maven-plugin - - - report - - report-aggregate - - verify - - org.apache.maven.plugins diff --git a/registry-mail/pom.xml b/registry-mail/pom.xml index 1c41eb507..1b3f7bd7c 100644 --- a/registry-mail/pom.xml +++ b/registry-mail/pom.xml @@ -12,6 +12,10 @@ ${project.parent.basedir} + + + ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml + diff --git a/registry-messaging/pom.xml b/registry-messaging/pom.xml index 001895d3f..0a3c25038 100644 --- a/registry-messaging/pom.xml +++ b/registry-messaging/pom.xml @@ -12,6 +12,10 @@ ${project.parent.basedir} + + + ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml + diff --git a/registry-oaipmh/pom.xml b/registry-oaipmh/pom.xml index 60d7ce084..d805f9d7f 100644 --- a/registry-oaipmh/pom.xml +++ b/registry-oaipmh/pom.xml @@ -12,6 +12,10 @@ ${project.parent.basedir} + + + ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml + diff --git a/registry-persistence/pom.xml b/registry-persistence/pom.xml index 595b0356c..b23f5c328 100644 --- a/registry-persistence/pom.xml +++ b/registry-persistence/pom.xml @@ -12,6 +12,10 @@ ${project.parent.basedir} + + + ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml + diff --git a/registry-pipelines/pom.xml b/registry-pipelines/pom.xml index 85a40613e..bc085f724 100644 --- a/registry-pipelines/pom.xml +++ b/registry-pipelines/pom.xml @@ -12,6 +12,10 @@ ${project.parent.basedir} + + + ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml + diff --git a/registry-search/pom.xml b/registry-search/pom.xml index 3ab98fbea..517470f72 100644 --- a/registry-search/pom.xml +++ b/registry-search/pom.xml @@ -13,6 +13,10 @@ ${project.parent.basedir} + + + ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml + diff --git a/registry-security/pom.xml b/registry-security/pom.xml index 96c068cfb..e3e61923a 100644 --- a/registry-security/pom.xml +++ b/registry-security/pom.xml @@ -12,6 +12,10 @@ ${project.parent.basedir} + + + ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml + diff --git a/registry-service/pom.xml b/registry-service/pom.xml index 4d40f435b..3fa29e3b8 100644 --- a/registry-service/pom.xml +++ b/registry-service/pom.xml @@ -12,6 +12,10 @@ ${project.parent.basedir} + + + ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml + diff --git a/registry-surety/pom.xml b/registry-surety/pom.xml index 17b8e7fd7..84a7fafc2 100644 --- a/registry-surety/pom.xml +++ b/registry-surety/pom.xml @@ -14,6 +14,10 @@ ${project.parent.basedir} + + + ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml + diff --git a/registry-ws-client/pom.xml b/registry-ws-client/pom.xml index 0b85e034a..861871295 100644 --- a/registry-ws-client/pom.xml +++ b/registry-ws-client/pom.xml @@ -12,6 +12,10 @@ ${project.parent.basedir} + + + ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml + From d90dfcd44f16abfcb2de788cb92da55dba7817c2 Mon Sep 17 00:00:00 2001 From: Mikhail Podolskiy Date: Wed, 6 Mar 2024 10:25:24 +0100 Subject: [PATCH 08/13] Try sonar.coverage.jacoco.xmlReportPaths property --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 64d84f00e..1031b8154 100644 --- a/pom.xml +++ b/pom.xml @@ -163,6 +163,7 @@ **/*Stub.java **/*Stub.java **/*Stub.java + ${coverage.report.ut.dir}/jacoco.xml ${spring-boot.version} From 410169cf24399744cea5b2e387e60d441dcecfcb Mon Sep 17 00:00:00 2001 From: Mikhail Podolskiy Date: Wed, 6 Mar 2024 10:47:27 +0100 Subject: [PATCH 09/13] Change sonar.coverage.jacoco.xmlReportPaths property --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1031b8154..80c4de629 100644 --- a/pom.xml +++ b/pom.xml @@ -163,7 +163,7 @@ **/*Stub.java **/*Stub.java **/*Stub.java - ${coverage.report.ut.dir}/jacoco.xml + ${project.basedir}/target/site/jacoco-it/jacoco.xml,${project.basedir}/target/site/jacoco-ut/jacoco.xml ${spring-boot.version} From ac4e5d6fcb12e39d6e9631a54ee264d02a717fa9 Mon Sep 17 00:00:00 2001 From: Mikhail Podolskiy Date: Wed, 6 Mar 2024 13:59:50 +0100 Subject: [PATCH 10/13] Change sonar.coverage.jacoco.xmlReportPaths property --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 80c4de629..0ce53a1e9 100644 --- a/pom.xml +++ b/pom.xml @@ -163,7 +163,7 @@ **/*Stub.java **/*Stub.java **/*Stub.java - ${project.basedir}/target/site/jacoco-it/jacoco.xml,${project.basedir}/target/site/jacoco-ut/jacoco.xml + ${project.basedir}/../target/site/jacoco-it/jacoco.xml,${project.basedir}/../target/site/jacoco-ut/jacoco.xml ${spring-boot.version} From 43ed312c48ff0824ed82beaeff1f1848161e4215 Mon Sep 17 00:00:00 2001 From: Mikhail Podolskiy Date: Wed, 6 Mar 2024 14:28:38 +0100 Subject: [PATCH 11/13] Change sonar.coverage.jacoco.xmlReportPaths in sub-poms --- pom.xml | 1 - registry-cli/pom.xml | 2 +- registry-directory/pom.xml | 4 +--- registry-doi/pom.xml | 2 +- registry-domain/pom.xml | 2 +- registry-events/pom.xml | 2 +- registry-identity/pom.xml | 2 +- registry-mail/pom.xml | 2 +- registry-messaging/pom.xml | 2 +- registry-oaipmh/pom.xml | 2 +- registry-persistence/pom.xml | 2 +- registry-pipelines/pom.xml | 2 +- registry-search/pom.xml | 2 +- registry-security/pom.xml | 2 +- registry-service/pom.xml | 2 +- registry-surety/pom.xml | 2 +- registry-ws-client/pom.xml | 2 +- registry-ws/pom.xml | 4 ++++ 18 files changed, 20 insertions(+), 19 deletions(-) diff --git a/pom.xml b/pom.xml index 0ce53a1e9..64d84f00e 100644 --- a/pom.xml +++ b/pom.xml @@ -163,7 +163,6 @@ **/*Stub.java **/*Stub.java **/*Stub.java - ${project.basedir}/../target/site/jacoco-it/jacoco.xml,${project.basedir}/../target/site/jacoco-ut/jacoco.xml ${spring-boot.version} diff --git a/registry-cli/pom.xml b/registry-cli/pom.xml index 723f7ef68..cf9367942 100644 --- a/registry-cli/pom.xml +++ b/registry-cli/pom.xml @@ -29,7 +29,7 @@ 18.0 - ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml + ${project.basedir}/../target/site/jacoco-it/jacoco.xml,${project.basedir}/../target/site/jacoco-ut/jacoco.xml diff --git a/registry-directory/pom.xml b/registry-directory/pom.xml index 29fdb2085..d15aff1e0 100644 --- a/registry-directory/pom.xml +++ b/registry-directory/pom.xml @@ -13,9 +13,7 @@ ${project.parent.basedir} - - ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml - + ${project.basedir}/../target/site/jacoco-it/jacoco.xml,${project.basedir}/../target/site/jacoco-ut/jacoco.xml diff --git a/registry-doi/pom.xml b/registry-doi/pom.xml index ff066db3d..1f4fbdf8a 100644 --- a/registry-doi/pom.xml +++ b/registry-doi/pom.xml @@ -15,7 +15,7 @@ ${project.parent.basedir} - ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml + ${project.basedir}/../target/site/jacoco-it/jacoco.xml,${project.basedir}/../target/site/jacoco-ut/jacoco.xml diff --git a/registry-domain/pom.xml b/registry-domain/pom.xml index 3ccd8f4d9..d4f695279 100644 --- a/registry-domain/pom.xml +++ b/registry-domain/pom.xml @@ -14,7 +14,7 @@ ${project.parent.basedir} - ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml + ${project.basedir}/../target/site/jacoco-it/jacoco.xml,${project.basedir}/../target/site/jacoco-ut/jacoco.xml diff --git a/registry-events/pom.xml b/registry-events/pom.xml index 9d66ea0bd..0d9925018 100644 --- a/registry-events/pom.xml +++ b/registry-events/pom.xml @@ -14,7 +14,7 @@ ${project.parent.basedir} - ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml + ${project.basedir}/../target/site/jacoco-it/jacoco.xml,${project.basedir}/../target/site/jacoco-ut/jacoco.xml diff --git a/registry-identity/pom.xml b/registry-identity/pom.xml index f050fe1b6..08df60a10 100644 --- a/registry-identity/pom.xml +++ b/registry-identity/pom.xml @@ -14,7 +14,7 @@ ${project.parent.basedir} - ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml + ${project.basedir}/../target/site/jacoco-it/jacoco.xml,${project.basedir}/../target/site/jacoco-ut/jacoco.xml diff --git a/registry-mail/pom.xml b/registry-mail/pom.xml index 1b3f7bd7c..5da0b9f97 100644 --- a/registry-mail/pom.xml +++ b/registry-mail/pom.xml @@ -14,7 +14,7 @@ ${project.parent.basedir} - ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml + ${project.basedir}/../target/site/jacoco-it/jacoco.xml,${project.basedir}/../target/site/jacoco-ut/jacoco.xml diff --git a/registry-messaging/pom.xml b/registry-messaging/pom.xml index 0a3c25038..b729d147a 100644 --- a/registry-messaging/pom.xml +++ b/registry-messaging/pom.xml @@ -14,7 +14,7 @@ ${project.parent.basedir} - ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml + ${project.basedir}/../target/site/jacoco-it/jacoco.xml,${project.basedir}/../target/site/jacoco-ut/jacoco.xml diff --git a/registry-oaipmh/pom.xml b/registry-oaipmh/pom.xml index d805f9d7f..8344b42f8 100644 --- a/registry-oaipmh/pom.xml +++ b/registry-oaipmh/pom.xml @@ -14,7 +14,7 @@ ${project.parent.basedir} - ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml + ${project.basedir}/../target/site/jacoco-it/jacoco.xml,${project.basedir}/../target/site/jacoco-ut/jacoco.xml diff --git a/registry-persistence/pom.xml b/registry-persistence/pom.xml index b23f5c328..bfdc04753 100644 --- a/registry-persistence/pom.xml +++ b/registry-persistence/pom.xml @@ -14,7 +14,7 @@ ${project.parent.basedir} - ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml + ${project.basedir}/../target/site/jacoco-it/jacoco.xml,${project.basedir}/../target/site/jacoco-ut/jacoco.xml diff --git a/registry-pipelines/pom.xml b/registry-pipelines/pom.xml index bc085f724..c05ba596f 100644 --- a/registry-pipelines/pom.xml +++ b/registry-pipelines/pom.xml @@ -14,7 +14,7 @@ ${project.parent.basedir} - ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml + ${project.basedir}/../target/site/jacoco-it/jacoco.xml,${project.basedir}/../target/site/jacoco-ut/jacoco.xml diff --git a/registry-search/pom.xml b/registry-search/pom.xml index 517470f72..2b1af57fd 100644 --- a/registry-search/pom.xml +++ b/registry-search/pom.xml @@ -15,7 +15,7 @@ ${project.parent.basedir} - ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml + ${project.basedir}/../target/site/jacoco-it/jacoco.xml,${project.basedir}/../target/site/jacoco-ut/jacoco.xml diff --git a/registry-security/pom.xml b/registry-security/pom.xml index e3e61923a..0bf261a96 100644 --- a/registry-security/pom.xml +++ b/registry-security/pom.xml @@ -14,7 +14,7 @@ ${project.parent.basedir} - ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml + ${project.basedir}/../target/site/jacoco-it/jacoco.xml,${project.basedir}/../target/site/jacoco-ut/jacoco.xml diff --git a/registry-service/pom.xml b/registry-service/pom.xml index 3fa29e3b8..4178b7b24 100644 --- a/registry-service/pom.xml +++ b/registry-service/pom.xml @@ -14,7 +14,7 @@ ${project.parent.basedir} - ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml + ${project.basedir}/../target/site/jacoco-it/jacoco.xml,${project.basedir}/../target/site/jacoco-ut/jacoco.xml diff --git a/registry-surety/pom.xml b/registry-surety/pom.xml index 84a7fafc2..bf1b39616 100644 --- a/registry-surety/pom.xml +++ b/registry-surety/pom.xml @@ -16,7 +16,7 @@ ${project.parent.basedir} - ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml + ${project.basedir}/../target/site/jacoco-it/jacoco.xml,${project.basedir}/../target/site/jacoco-ut/jacoco.xml diff --git a/registry-ws-client/pom.xml b/registry-ws-client/pom.xml index 861871295..7403737c5 100644 --- a/registry-ws-client/pom.xml +++ b/registry-ws-client/pom.xml @@ -14,7 +14,7 @@ ${project.parent.basedir} - ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml + ${project.basedir}/../target/site/jacoco-it/jacoco.xml,${project.basedir}/../target/site/jacoco-ut/jacoco.xml diff --git a/registry-ws/pom.xml b/registry-ws/pom.xml index ae1b10a43..8d8298857 100644 --- a/registry-ws/pom.xml +++ b/registry-ws/pom.xml @@ -12,6 +12,10 @@ ${project.parent.basedir} org.gbif.registry.ws.RegistryWsApplication + + + ${project.basedir}/../target/site/jacoco-it/jacoco.xml,${project.basedir}/../target/site/jacoco-ut/jacoco.xml + From b769059780102284b74238381a7d74926c6ad07d Mon Sep 17 00:00:00 2001 From: Matthew Blissett Date: Thu, 29 Feb 2024 19:10:54 +0100 Subject: [PATCH 12/13] Add additional enumerations. --- .../ws/resources/EnumerationResource.java | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/registry-ws/src/main/java/org/gbif/registry/ws/resources/EnumerationResource.java b/registry-ws/src/main/java/org/gbif/registry/ws/resources/EnumerationResource.java index 96d88670b..17ad633e0 100644 --- a/registry-ws/src/main/java/org/gbif/registry/ws/resources/EnumerationResource.java +++ b/registry-ws/src/main/java/org/gbif/registry/ws/resources/EnumerationResource.java @@ -14,8 +14,15 @@ package org.gbif.registry.ws.resources; import org.gbif.api.annotation.NullToNotFound; +import org.gbif.api.model.checklistbank.search.NameUsageSearchParameter; import org.gbif.api.model.literature.LiteratureType; +import org.gbif.api.model.literature.search.LiteratureSearchParameter; +import org.gbif.api.model.occurrence.DownloadFormat; +import org.gbif.api.model.occurrence.geo.DistanceUnit; +import org.gbif.api.model.occurrence.search.OccurrenceSearchParameter; import org.gbif.api.model.pipelines.PipelineStep; +import org.gbif.api.model.registry.EndorsementStatus; +import org.gbif.api.model.registry.search.DatasetSearchParameter; import org.gbif.api.util.VocabularyUtils; import org.gbif.api.vocabulary.Country; import org.gbif.api.vocabulary.Extension; @@ -188,8 +195,19 @@ private static Map[]> enumerations() { new CachingMetadataReaderFactory(resourcePatternResolver); List> classes = - Arrays.asList( - Country.class, PreservationType.class, PipelineStep.class, LiteratureType.class); + Arrays.asList( + Country.class, // org.gbif.api.vocabulary + PreservationType.class, // org.gbif.api.vocabulary.collections + PipelineStep.class, // org.gbif.api.model.pipelines + LiteratureType.class, // org.gbif.api.model.literature + LiteratureSearchParameter.class, // org.gbif.api.model.literature.search + OccurrenceSearchParameter.class, // org.gbif.api.model.occurrence.search + DownloadFormat.class, // org.gbif.api.model.occurrence + DistanceUnit.class, // org.gbif.api.model.occurrence.geo + DatasetSearchParameter.class, // org.gbif.api.model.registry.search + EndorsementStatus.class, // org.gbif.api.model.registry + NameUsageSearchParameter.class // org.gbif.api.model.checklistbank.search + ); ImmutableSortedMap[]> result; try { From 60c3147a378bff46362d7f21452fc7954da0736b Mon Sep 17 00:00:00 2001 From: Matthew Blissett Date: Tue, 12 Mar 2024 15:31:23 +0100 Subject: [PATCH 13/13] Avoid DOS route with authentication of extremely long passwords. --- .../registry/identity/service/IdentityServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/registry-identity/src/main/java/org/gbif/registry/identity/service/IdentityServiceImpl.java b/registry-identity/src/main/java/org/gbif/registry/identity/service/IdentityServiceImpl.java index 8565fb8fc..65b9d0e37 100644 --- a/registry-identity/src/main/java/org/gbif/registry/identity/service/IdentityServiceImpl.java +++ b/registry-identity/src/main/java/org/gbif/registry/identity/service/IdentityServiceImpl.java @@ -208,7 +208,12 @@ public PagingResponse search( @Override @Nullable public GbifUser authenticate(String username, String password) { - if (Strings.isNullOrEmpty(username) || password == null) { + if (Strings.isNullOrEmpty(username) || Strings.isNullOrEmpty(password)) { + return null; + } + + // Avoid DOS route with an attacker trying extremely long passwords. + if (!PASSWORD_LENGTH_RANGE.contains(password.length())) { return null; }