From bcd23519181edf729ddc470e10d85c1c4308dc28 Mon Sep 17 00:00:00 2001 From: fmendezh Date: Mon, 3 May 2021 11:23:52 +0200 Subject: [PATCH 01/19] changing the Object class to be the component class --- pom.xml | 2 +- .../org/gbif/registry/events/MessageSendingEventListener.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 95a9fb8b92..b84ef1ef16 100644 --- a/pom.xml +++ b/pom.xml @@ -94,7 +94,7 @@ 0.10 1.0 0.36 - 0.45 + 1.1-SNAPSHOT 4.1.0-gbif-4 diff --git a/registry-events/src/main/java/org/gbif/registry/events/MessageSendingEventListener.java b/registry-events/src/main/java/org/gbif/registry/events/MessageSendingEventListener.java index c7d9060c75..ce479831e7 100644 --- a/registry-events/src/main/java/org/gbif/registry/events/MessageSendingEventListener.java +++ b/registry-events/src/main/java/org/gbif/registry/events/MessageSendingEventListener.java @@ -157,8 +157,8 @@ public void sendDeletedEvent(final DeleteEvent event) { public final void updatedComponent(ChangedComponentEvent event) { final Message message = new RegistryChangeMessage( - RegistryChangeMessage.ChangeType.UPDATED, - event.getTargetClass(), + RegistryChangeMessage.ChangeType.UPDATE_COMPONENT, + event.getComponentClass(), event.getTargetEntityKey(), null); LOG.debug( From 69599a25d730def2c45887e4d7ece007e0b595d2 Mon Sep 17 00:00:00 2001 From: fmendezh Date: Mon, 3 May 2021 11:52:06 +0200 Subject: [PATCH 02/19] matching postal service guava version --- registry-cli/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/registry-cli/pom.xml b/registry-cli/pom.xml index 71ad2a8260..70a56de5f7 100644 --- a/registry-cli/pom.xml +++ b/registry-cli/pom.xml @@ -26,6 +26,7 @@ 1.5 1.19.3 1.4.7 + 18.0 ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml From 15090e0518a892cbebc3f115dcbd2136d8598a4c Mon Sep 17 00:00:00 2001 From: fmendezh Date: Mon, 3 May 2021 15:52:45 +0200 Subject: [PATCH 03/19] upgrading version before releasing --- pom.xml | 12 +++++++++--- registry-service/pom.xml | 6 ++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index b84ef1ef16..4829e9148d 100644 --- a/pom.xml +++ b/pom.xml @@ -84,8 +84,8 @@ 2.0.1 - 0.144-SNAPSHOT - 0.40 + 0.144 + 0.50 1.1 1.15 1.10 @@ -94,7 +94,7 @@ 0.10 1.0 0.36 - 1.1-SNAPSHOT + 1.1 4.1.0-gbif-4 @@ -124,6 +124,7 @@ 1.7.30 4.4.1 3.4.14 + 20200713.1 5.6.3 @@ -521,6 +522,11 @@ ${okio.version} runtime + + com.googlecode.owasp-java-html-sanitizer + owasp-java-html-sanitizer + ${owasp-java-html-sanitizer.version} + janino diff --git a/registry-service/pom.xml b/registry-service/pom.xml index e13203f30e..5512b9bac9 100644 --- a/registry-service/pom.xml +++ b/registry-service/pom.xml @@ -43,6 +43,12 @@ gbif-api + + + com.googlecode.owasp-java-html-sanitizer + owasp-java-html-sanitizer + + org.junit.jupiter From 72453cf877a677863f0b8f4079c1cd6a580a3f41 Mon Sep 17 00:00:00 2001 From: github-actions <> Date: Mon, 3 May 2021 13:58:18 +0000 Subject: [PATCH 04/19] Google Java Format --- .../datasetindex/DatasetBatchIndexerIT.java | 11 +- .../org/gbif/registry/events/CreateEvent.java | 3 +- .../org/gbif/registry/events/DeleteEvent.java | 4 +- .../events/MessageSendingEventListener.java | 46 ++++---- .../org/gbif/registry/events/UpdateEvent.java | 3 +- .../registry/events/VarnishPurgeListener.java | 21 ++-- .../search/DatasetIndexUpdateListener.java | 18 +-- .../database/RegistryDatabaseInitializer.java | 36 +++--- .../database/TestCaseDatabaseInitializer.java | 104 +++++++++++++----- .../search/SearchTestConfiguration.java | 9 +- .../DatasetElasticsearchConfiguration.java | 33 +++--- .../search/test/ElasticsearchInitializer.java | 2 +- .../org/gbif/registry/ws/it/BaseItTest.java | 24 ++-- .../gbif/registry/ws/it/DerivedDatasetIT.java | 21 ++-- .../org/gbif/registry/ws/it/NetworkIT.java | 5 +- .../java/org/gbif/registry/ws/it/NodeIT.java | 1 - .../ws/it/OrganizationCreationIT.java | 3 +- ...RegistryIntegrationTestsConfiguration.java | 7 +- .../java/org/gbif/registry/ws/it/UserIT.java | 3 +- .../gbif/registry/ws/it/UserManagementIT.java | 3 +- .../ExtendedCollectionEntityIT.java | 11 +- .../ws/it/collections/LookupServiceIT.java | 2 +- .../registry/ws/it/collections/PersonIT.java | 2 +- .../ws/it/oaipmh/OaipmhGetRecordIT.java | 19 ++-- .../ws/it/oaipmh/OaipmhIdentifyIT.java | 21 ++-- .../oaipmh/OaipmhListMetadataFormatsIT.java | 21 ++-- .../ws/it/oaipmh/OaipmhListRecordsIT.java | 19 ++-- .../ws/it/oaipmh/OaipmhListSetsIT.java | 19 ++-- .../mapper/CollectionMapperIT.java | 3 +- .../mapper/DerivedDatasetMapperIT.java | 4 +- .../ws/it/persistence/mapper/DoiMapperIT.java | 1 - .../mapper/DuplicatesMapperIT.java | 4 +- .../persistence/mapper/IDigBioMapperIT.java | 9 +- .../mapper/InstitutionMapperIT.java | 13 ++- .../mapper/MachineTagMapperIT.java | 5 +- .../it/persistence/mapper/PersonMapperIT.java | 5 +- .../mapper/PipelineProcessMapperIT.java | 9 +- ...gistryPipelinesHistoryTrackingService.java | 31 +++--- ...gistryPipelinesHistoryTrackingService.java | 3 +- .../dataset/DatasetSearchResultConverter.java | 6 +- .../indexing/DatasetJsonConverter.java | 15 ++- .../indexing/EsDatasetRealtimeIndexer.java | 22 ++-- .../dataset/indexing/ws/GbifWsClient.java | 3 +- .../indexing/ws/GbifWsRetrofitClient.java | 3 +- .../registry/search/test/EsManageServer.java | 4 +- .../RegistryDerivedDatasetServiceImpl.java | 4 +- .../ws/client/collections/CrudClient.java | 6 +- .../ws/resources/DerivedDatasetResource.java | 11 +- .../ExtendedCollectionEntityResource.java | 4 +- .../pipelines/PipelinesHistoryResource.java | 16 +-- 50 files changed, 357 insertions(+), 295 deletions(-) diff --git a/registry-cli/src/test/java/org/gbif/registry/cli/datasetindex/DatasetBatchIndexerIT.java b/registry-cli/src/test/java/org/gbif/registry/cli/datasetindex/DatasetBatchIndexerIT.java index 5416d0164e..0d50544ec3 100644 --- a/registry-cli/src/test/java/org/gbif/registry/cli/datasetindex/DatasetBatchIndexerIT.java +++ b/registry-cli/src/test/java/org/gbif/registry/cli/datasetindex/DatasetBatchIndexerIT.java @@ -53,7 +53,7 @@ public class DatasetBatchIndexerIT { private static final String INDEX_NAME = IndexingConstants.ALIAS + '_' + new Date().getTime(); - private static final String INDEX_ALIAS = INDEX_NAME + "_a" ; + private static final String INDEX_ALIAS = INDEX_NAME + "_a"; @RegisterExtension public static SingleInstancePostgresExtension database = @@ -124,12 +124,9 @@ public void indexTests() throws IOException { RestHighLevelClient restHighLevelClient = buildRestClient(); SearchResponse searchResponse = - restHighLevelClient - .search( - new SearchRequest() - .indices(INDEX_ALIAS) - .source(new SearchSourceBuilder().size(0)), - RequestOptions.DEFAULT); + restHighLevelClient.search( + new SearchRequest().indices(INDEX_ALIAS).source(new SearchSourceBuilder().size(0)), + RequestOptions.DEFAULT); Assertions.assertEquals( DATASETS_TO_INDEX, diff --git a/registry-events/src/main/java/org/gbif/registry/events/CreateEvent.java b/registry-events/src/main/java/org/gbif/registry/events/CreateEvent.java index 236e1b5932..a63b1d83a8 100644 --- a/registry-events/src/main/java/org/gbif/registry/events/CreateEvent.java +++ b/registry-events/src/main/java/org/gbif/registry/events/CreateEvent.java @@ -23,8 +23,7 @@ public class CreateEvent { private final T newObject; private final Class objectClass; - public static CreateEvent newInstance( - T newObject, Class objectClass) { + public static CreateEvent newInstance(T newObject, Class objectClass) { return new CreateEvent<>(newObject, objectClass); } diff --git a/registry-events/src/main/java/org/gbif/registry/events/DeleteEvent.java b/registry-events/src/main/java/org/gbif/registry/events/DeleteEvent.java index 941f24e861..9da0f1e474 100644 --- a/registry-events/src/main/java/org/gbif/registry/events/DeleteEvent.java +++ b/registry-events/src/main/java/org/gbif/registry/events/DeleteEvent.java @@ -15,15 +15,13 @@ */ package org.gbif.registry.events; - /** This event is fired after a new network entity has been successfully deleted. */ public class DeleteEvent { private final T oldObject; private final Class objectClass; - public static DeleteEvent newInstance( - T oldObject, Class objectClass) { + public static DeleteEvent newInstance(T oldObject, Class objectClass) { return new DeleteEvent<>(oldObject, objectClass); } diff --git a/registry-events/src/main/java/org/gbif/registry/events/MessageSendingEventListener.java b/registry-events/src/main/java/org/gbif/registry/events/MessageSendingEventListener.java index ce479831e7..66a8d51668 100644 --- a/registry-events/src/main/java/org/gbif/registry/events/MessageSendingEventListener.java +++ b/registry-events/src/main/java/org/gbif/registry/events/MessageSendingEventListener.java @@ -156,31 +156,31 @@ public void sendDeletedEvent(final DeleteEvent event) { @Subscribe public final void updatedComponent(ChangedComponentEvent event) { final Message message = - new RegistryChangeMessage( - RegistryChangeMessage.ChangeType.UPDATE_COMPONENT, - event.getComponentClass(), - event.getTargetEntityKey(), - null); + new RegistryChangeMessage( + RegistryChangeMessage.ChangeType.UPDATE_COMPONENT, + event.getComponentClass(), + event.getTargetEntityKey(), + null); LOG.debug( - "Scheduling notification of UpdateEvent [{}] with an embargo durations of {} seconds", - event.getTargetClass().getSimpleName(), - embargoSeconds); + "Scheduling notification of UpdateEvent [{}] with an embargo durations of {} seconds", + event.getTargetClass().getSimpleName(), + embargoSeconds); scheduler.schedule( - () -> { - try { - LOG.debug( - "Broadcasting to postal service UpdateEvent [{}]", - event.getTargetClass().getSimpleName()); - messagePublisher.send(message); - } catch (IOException e) { - LOG.warn( - "Failed sending RegistryChangeMessage for UpdateEvent [{}]", - event.getTargetClass().getSimpleName(), - e); - } - }, - embargoSeconds, - TimeUnit.SECONDS); + () -> { + try { + LOG.debug( + "Broadcasting to postal service UpdateEvent [{}]", + event.getTargetClass().getSimpleName()); + messagePublisher.send(message); + } catch (IOException e) { + LOG.warn( + "Failed sending RegistryChangeMessage for UpdateEvent [{}]", + event.getTargetClass().getSimpleName(), + e); + } + }, + embargoSeconds, + TimeUnit.SECONDS); } } diff --git a/registry-events/src/main/java/org/gbif/registry/events/UpdateEvent.java b/registry-events/src/main/java/org/gbif/registry/events/UpdateEvent.java index 7e8ea4a966..665f7131b3 100644 --- a/registry-events/src/main/java/org/gbif/registry/events/UpdateEvent.java +++ b/registry-events/src/main/java/org/gbif/registry/events/UpdateEvent.java @@ -22,8 +22,7 @@ public class UpdateEvent { private final T oldObject; private final Class objectClass; - public static UpdateEvent newInstance( - T newObject, T oldObject, Class objectClass) { + public static UpdateEvent newInstance(T newObject, T oldObject, Class objectClass) { return new UpdateEvent<>(newObject, oldObject, objectClass); } diff --git a/registry-events/src/main/java/org/gbif/registry/events/VarnishPurgeListener.java b/registry-events/src/main/java/org/gbif/registry/events/VarnishPurgeListener.java index 055bd447bc..1cd52dad90 100644 --- a/registry-events/src/main/java/org/gbif/registry/events/VarnishPurgeListener.java +++ b/registry-events/src/main/java/org/gbif/registry/events/VarnishPurgeListener.java @@ -148,7 +148,8 @@ public VarnishPurgeListener( @Subscribe public final void created(CreateEvent event) { if (NetworkEntity.class.isAssignableFrom(event.getObjectClass())) { - purgeEntityAndBanLists(event.getObjectClass(), ((NetworkEntity)event.getNewObject()).getKey()); + purgeEntityAndBanLists( + event.getObjectClass(), ((NetworkEntity) event.getNewObject()).getKey()); } if (event.getObjectClass().equals(Organization.class)) { @@ -158,15 +159,15 @@ public final void created(CreateEvent event) { } else if (event.getObjectClass().equals(Installation.class)) { cascadeInstallationChange((Installation) event.getNewObject()); } else if (event.getObjectClass().equals(DerivedDataset.class)) { - cascadeDerivedDatasetChange((DerivedDataset)event.getNewObject()); + cascadeDerivedDatasetChange((DerivedDataset) event.getNewObject()); } - } @Subscribe public final void updated(UpdateEvent event) { if (NetworkEntity.class.isAssignableFrom(event.getObjectClass())) { - purgeEntityAndBanLists(event.getObjectClass(), ((NetworkEntity)event.getOldObject()).getKey()); + purgeEntityAndBanLists( + event.getObjectClass(), ((NetworkEntity) event.getOldObject()).getKey()); } if (event.getObjectClass().equals(Organization.class)) { @@ -178,14 +179,15 @@ public final void updated(UpdateEvent event) { cascadeInstallationChange( (Installation) event.getOldObject(), (Installation) event.getNewObject()); } else if (event.getObjectClass().equals(DerivedDataset.class)) { - cascadeDerivedDatasetChange((DerivedDataset)event.getNewObject()); + cascadeDerivedDatasetChange((DerivedDataset) event.getNewObject()); } } @Subscribe public final void deleted(DeleteEvent event) { if (NetworkEntity.class.isAssignableFrom(event.getObjectClass())) { - purgeEntityAndBanLists(event.getObjectClass(), ((NetworkEntity)event.getOldObject()).getKey()); + purgeEntityAndBanLists( + event.getObjectClass(), ((NetworkEntity) event.getOldObject()).getKey()); } if (event.getObjectClass().equals(Organization.class)) { @@ -195,7 +197,7 @@ public final void deleted(DeleteEvent event) { } else if (event.getObjectClass().equals(Installation.class)) { cascadeInstallationChange((Installation) event.getOldObject()); } else if (event.getObjectClass().equals(DerivedDataset.class)) { - cascadeDerivedDatasetChange((DerivedDataset)event.getOldObject()); + cascadeDerivedDatasetChange((DerivedDataset) event.getOldObject()); } } @@ -346,7 +348,10 @@ private void cascadePersonChange(Person... persons) { } private void cascadeDerivedDatasetChange(DerivedDataset derivedDataset) { - purger.ban(String.format("derivedDataset/%s/%s/*", derivedDataset.getDoi().getPrefix(), derivedDataset.getDoi().getSuffix())); + purger.ban( + String.format( + "derivedDataset/%s/%s/*", + derivedDataset.getDoi().getPrefix(), derivedDataset.getDoi().getSuffix())); purger.ban(String.format("derivedDataset/user/%s", derivedDataset.getCreatedBy())); purger.ban("derivedDataset/dataset/*"); } diff --git a/registry-events/src/main/java/org/gbif/registry/search/DatasetIndexUpdateListener.java b/registry-events/src/main/java/org/gbif/registry/search/DatasetIndexUpdateListener.java index 5367772cb4..6526918615 100644 --- a/registry-events/src/main/java/org/gbif/registry/search/DatasetIndexUpdateListener.java +++ b/registry-events/src/main/java/org/gbif/registry/search/DatasetIndexUpdateListener.java @@ -73,8 +73,8 @@ public final void updated(UpdateEvent event) { // we only care about title & country changes Organization org1 = (Organization) event.getOldObject(); Organization org2 = (Organization) event.getNewObject(); - if (!Objects.equals(org1.getTitle(), org2.getTitle()) || - !Objects.equals(org1.getCountry(), org2.getCountry())) { + if (!Objects.equals(org1.getTitle(), org2.getTitle()) + || !Objects.equals(org1.getCountry(), org2.getCountry())) { indexService.index(org2); } @@ -82,14 +82,14 @@ public final void updated(UpdateEvent event) { // we only care about the hosting organization Installation i1 = (Installation) event.getOldObject(); Installation i2 = (Installation) event.getNewObject(); - if (!Objects.equals(i1.getOrganizationKey(), (i2.getOrganizationKey())) || - !Objects.equals(i1.getTitle(), i2.getTitle())) { + if (!Objects.equals(i1.getOrganizationKey(), (i2.getOrganizationKey())) + || !Objects.equals(i1.getTitle(), i2.getTitle())) { indexService.index(i2); } } else if (event.getObjectClass().equals(Network.class)) { // we only care about title changes - Network network1 = (Network)event.getOldObject(); - Network network2 = (Network)event.getNewObject(); + Network network1 = (Network) event.getOldObject(); + Network network2 = (Network) event.getNewObject(); if (!Objects.equals(network1.getTitle(), network2.getTitle())) { indexService.index(network2); } @@ -110,8 +110,10 @@ public final void deleted(DeleteEvent event) { @Subscribe public final void updatedComponent(ChangedComponentEvent event) { // only fire in case of tagged datasets - if ((event.getTargetClass().equals(Dataset.class) && event.getComponentClass().equals(Tag.class)) || - (event.getTargetClass().equals(Network.class) && event.getComponentClass().equals(Dataset.class))) { + if ((event.getTargetClass().equals(Dataset.class) + && event.getComponentClass().equals(Tag.class)) + || (event.getTargetClass().equals(Network.class) + && event.getComponentClass().equals(Dataset.class))) { // we only put tagged datasets onto the queue for this event type! UUID key = event.getTargetEntityKey(); try { diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/database/RegistryDatabaseInitializer.java b/registry-integration-tests/src/test/java/org/gbif/registry/database/RegistryDatabaseInitializer.java index 3276eb81b4..232bffae3c 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/database/RegistryDatabaseInitializer.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/database/RegistryDatabaseInitializer.java @@ -20,11 +20,13 @@ import javax.sql.DataSource; -import com.google.common.base.Throwables; -import lombok.experimental.UtilityClass; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.base.Throwables; + +import lombok.experimental.UtilityClass; + /** * A Rule that initializes a database for All test cases in a Test class or in test suite. * @@ -38,23 +40,23 @@ public class RegistryDatabaseInitializer { private static final Logger LOG = LoggerFactory.getLogger(RegistryDatabaseInitializer.class); public static void init(DataSource dataSource) { - LOG.info("Create test users"); - try (Connection connection = dataSource.getConnection()) { - connection.setAutoCommit(false); - - connection.prepareStatement( - "INSERT INTO public.\"user\" (key, username, email, password, first_name, last_name, roles, settings, system_settings, created, last_login, deleted, challenge_code_key) " - + "VALUES " - + "(-1, 'gbif.app.it2', 'gbif.app.it2@mailinator.com', '$S$DSLeulP5GbaEzGpqDSJJVG8mFUisQP.Bmy/S15VVbG9aadZQ6KNp', null, null, '{GRSCICOLL_ADMIN,REGISTRY_ADMIN}', 'country => DK', '', '2019-05-08 13:30:04.833025', '2020-04-04 23:20:30.330778', null, null)," - + "(-2, 'editor', 'editor2@mailinator.com', '$S$DIU6YGMU7aKb0rISEEqtePk.PwJPU.z.f5G0Au426gIJVd5RS8xs', null, null, '{USER,REGISTRY_EDITOR}', 'country => DK', '', '2019-05-08 13:30:04.833025', '2020-04-04 23:20:30.330778', null, null)") + LOG.info("Create test users"); + try (Connection connection = dataSource.getConnection()) { + connection.setAutoCommit(false); + + connection + .prepareStatement( + "INSERT INTO public.\"user\" (key, username, email, password, first_name, last_name, roles, settings, system_settings, created, last_login, deleted, challenge_code_key) " + + "VALUES " + + "(-1, 'gbif.app.it2', 'gbif.app.it2@mailinator.com', '$S$DSLeulP5GbaEzGpqDSJJVG8mFUisQP.Bmy/S15VVbG9aadZQ6KNp', null, null, '{GRSCICOLL_ADMIN,REGISTRY_ADMIN}', 'country => DK', '', '2019-05-08 13:30:04.833025', '2020-04-04 23:20:30.330778', null, null)," + + "(-2, 'editor', 'editor2@mailinator.com', '$S$DIU6YGMU7aKb0rISEEqtePk.PwJPU.z.f5G0Au426gIJVd5RS8xs', null, null, '{USER,REGISTRY_EDITOR}', 'country => DK', '', '2019-05-08 13:30:04.833025', '2020-04-04 23:20:30.330778', null, null)") .executeUpdate(); - connection.commit(); + connection.commit(); - } catch (SQLException e) { - Throwables.propagate(e); - } - LOG.info("Initial test data loaded"); + } catch (SQLException e) { + Throwables.propagate(e); + } + LOG.info("Initial test data loaded"); } - } diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/database/TestCaseDatabaseInitializer.java b/registry-integration-tests/src/test/java/org/gbif/registry/database/TestCaseDatabaseInitializer.java index afd7da1ab2..e785f03eae 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/database/TestCaseDatabaseInitializer.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/database/TestCaseDatabaseInitializer.java @@ -23,14 +23,15 @@ import javax.sql.DataSource; -import lombok.Data; import org.junit.jupiter.api.extension.BeforeEachCallback; import org.junit.jupiter.api.extension.ExtensionContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.test.context.junit.jupiter.SpringExtension; import com.google.common.base.Throwables; -import org.springframework.test.context.junit.jupiter.SpringExtension; + +import lombok.Data; /** * A Rule that will truncate the tables ready for a new test. It is expected to do this before each @@ -45,27 +46,74 @@ public class TestCaseDatabaseInitializer implements BeforeEachCallback { private static final Logger LOG = LoggerFactory.getLogger(TestCaseDatabaseInitializer.class); - private List tables = Arrays.asList("contact", "endpoint", "tag", "identifier", "comment", "node_identifier", - "node_identifier", "node_identifier", "node_machine_tag", "node_tag", "node_comment", - "occurrence_download", "organization_contact", "organization_endpoint", "organization_machine_tag", - "organization_tag", "organization_identifier", "organization_comment", "installation_contact", - "installation_endpoint", "installation_machine_tag", "installation_tag", "installation_comment", - "dataset_contact", "dataset_endpoint", "dataset_machine_tag", "dataset_tag", - "dataset_identifier", "dataset_comment", "dataset_network", "network_contact", - "network_endpoint", "network_machine_tag", "network_tag", "network_comment", - "machine_tag, metadata", "editor_rights", "network", "dataset", "installation", - "organization, node", "collection_person", "collection_collection_person", "collection_identifier", - "collection_tag", "institution_collection_person", "institution_identifier", - "institution_tag", "institution_occurrence_mapping", "collection_occurrence_mapping", - "collection_person", "collection", "institution", "address", "gbif_doi", "pipeline_step", - "pipeline_process", "pipeline_execution", "derived_dataset"); + private List tables = + Arrays.asList( + "contact", + "endpoint", + "tag", + "identifier", + "comment", + "node_identifier", + "node_identifier", + "node_identifier", + "node_machine_tag", + "node_tag", + "node_comment", + "occurrence_download", + "organization_contact", + "organization_endpoint", + "organization_machine_tag", + "organization_tag", + "organization_identifier", + "organization_comment", + "installation_contact", + "installation_endpoint", + "installation_machine_tag", + "installation_tag", + "installation_comment", + "dataset_contact", + "dataset_endpoint", + "dataset_machine_tag", + "dataset_tag", + "dataset_identifier", + "dataset_comment", + "dataset_network", + "network_contact", + "network_endpoint", + "network_machine_tag", + "network_tag", + "network_comment", + "machine_tag, metadata", + "editor_rights", + "network", + "dataset", + "installation", + "organization, node", + "collection_person", + "collection_collection_person", + "collection_identifier", + "collection_tag", + "institution_collection_person", + "institution_identifier", + "institution_tag", + "institution_occurrence_mapping", + "collection_occurrence_mapping", + "collection_person", + "collection", + "institution", + "address", + "gbif_doi", + "pipeline_step", + "pipeline_process", + "pipeline_execution", + "derived_dataset"); - public TestCaseDatabaseInitializer() { - } + public TestCaseDatabaseInitializer() {} - public TestCaseDatabaseInitializer(String...tables) { + public TestCaseDatabaseInitializer(String... tables) { this.tables = Arrays.asList(tables); } + private void truncateTables(DataSource dataSource) throws Exception { LOG.info("Truncating registry tables"); try (Connection connection = dataSource.getConnection()) { @@ -73,12 +121,17 @@ private void truncateTables(DataSource dataSource) throws Exception { List tablesNotChallengeCode = new ArrayList<>(tables); if (tables.contains("challenge_code") && tables.contains("public.user")) { tablesNotChallengeCode.remove("challenge_code"); - //Only challenge codes created for organization are deleted - connection.prepareStatement("DELETE FROM challenge_code WHERE key IN " - + "(SELECT challenge_code_key FROM organization" - + " WHERE challenge_code_key IS NOT NULL)").execute(); + // Only challenge codes created for organization are deleted + connection + .prepareStatement( + "DELETE FROM challenge_code WHERE key IN " + + "(SELECT challenge_code_key FROM organization" + + " WHERE challenge_code_key IS NOT NULL)") + .execute(); } - connection.prepareStatement("TRUNCATE " + String.join(",", tablesNotChallengeCode) + " CASCADE").execute(); + connection + .prepareStatement("TRUNCATE " + String.join(",", tablesNotChallengeCode) + " CASCADE") + .execute(); connection.commit(); @@ -106,6 +159,7 @@ private void truncateTables(DataSource dataSource) throws Exception { @Override public void beforeEach(ExtensionContext extensionContext) throws Exception { - truncateTables(SpringExtension.getApplicationContext(extensionContext).getBean(DataSource.class)); + truncateTables( + SpringExtension.getApplicationContext(extensionContext).getBean(DataSource.class)); } } diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/search/SearchTestConfiguration.java b/registry-integration-tests/src/test/java/org/gbif/registry/search/SearchTestConfiguration.java index cae868fc98..53925cf3f0 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/search/SearchTestConfiguration.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/search/SearchTestConfiguration.java @@ -44,11 +44,10 @@ public class SearchTestConfiguration { @Bean @Primary public GbifWsClient gbifWsClient( - InstallationService installationService, - OrganizationService organizationService, - DatasetService datasetService, - NetworkService networkService - ) { + InstallationService installationService, + OrganizationService organizationService, + DatasetService datasetService, + NetworkService networkService) { return new GbifWsRetrofitClient( gbifApiService(), installationService, organizationService, datasetService, networkService); } diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/search/test/DatasetElasticsearchConfiguration.java b/registry-integration-tests/src/test/java/org/gbif/registry/search/test/DatasetElasticsearchConfiguration.java index 08bd525f6d..cf992c0d8b 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/search/test/DatasetElasticsearchConfiguration.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/search/test/DatasetElasticsearchConfiguration.java @@ -33,13 +33,16 @@ public class DatasetElasticsearchConfiguration { @Autowired private ResourceLoader resourceLoader; @Bean("datasetElasticCluster") - public EsManageServer esManageServer(@Value("${elasticsearch.registry.index}") String indexName, - @Value("${elasticsearch.mock}") boolean mockEs) { + public EsManageServer esManageServer( + @Value("${elasticsearch.registry.index}") String indexName, + @Value("${elasticsearch.mock}") boolean mockEs) { try { - return mockEs? Mockito.mock(EsManageServer.class): - new EsManageServer(resourceLoader.getResource("classpath:dataset-es-mapping.json"), - resourceLoader.getResource("classpath:dataset-es-settings.json"), - indexName); + return mockEs + ? Mockito.mock(EsManageServer.class) + : new EsManageServer( + resourceLoader.getResource("classpath:dataset-es-mapping.json"), + resourceLoader.getResource("classpath:dataset-es-settings.json"), + indexName); } catch (Exception ex) { throw new RuntimeException(ex); } @@ -65,17 +68,19 @@ public EsClient.EsClientConfiguration registryRestHighLevelClient(EsManageServer @Bean @Primary public RestHighLevelClient restHighLevelClient( - @Qualifier("registryEsClientConfig") EsClient.EsClientConfiguration esClientConfiguration, - @Value("${elasticsearch.mock}") boolean mockEs) { - return mockEs ? Mockito.mock(RestHighLevelClient.class) : - EsClient.provideEsClient(esClientConfiguration); + @Qualifier("registryEsClientConfig") EsClient.EsClientConfiguration esClientConfiguration, + @Value("${elasticsearch.mock}") boolean mockEs) { + return mockEs + ? Mockito.mock(RestHighLevelClient.class) + : EsClient.provideEsClient(esClientConfiguration); } @Bean(name = "occurrenceEsClient") public RestHighLevelClient occurrenceRestHighLevelClient( - @Qualifier("esOccurrenceClientConfig") EsClient.EsClientConfiguration esClientConfiguration, - @Value("${elasticsearch.mock}") boolean mockEs) { - return mockEs ? Mockito.mock(RestHighLevelClient.class) : - EsClient.provideEsClient(esClientConfiguration); + @Qualifier("esOccurrenceClientConfig") EsClient.EsClientConfiguration esClientConfiguration, + @Value("${elasticsearch.mock}") boolean mockEs) { + return mockEs + ? Mockito.mock(RestHighLevelClient.class) + : EsClient.provideEsClient(esClientConfiguration); } } diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/search/test/ElasticsearchInitializer.java b/registry-integration-tests/src/test/java/org/gbif/registry/search/test/ElasticsearchInitializer.java index 9e1a81488c..be4f84c5b9 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/search/test/ElasticsearchInitializer.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/search/test/ElasticsearchInitializer.java @@ -32,7 +32,7 @@ public ElasticsearchInitializer(EsManageServer esServer) { @Override public void beforeEach(ExtensionContext extensionContext) throws Exception { - //Method name must contain search in it + // Method name must contain search in it if (extensionContext.getRequiredTestMethod().getName().toLowerCase().contains("search")) { esServer.reCreateIndex(); } diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/BaseItTest.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/BaseItTest.java index f6dbffdb29..0a7eda1022 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/BaseItTest.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/BaseItTest.java @@ -33,10 +33,6 @@ import javax.sql.DataSource; -import io.zonky.test.db.postgres.embedded.ConnectionInfo; -import io.zonky.test.db.postgres.embedded.DatabasePreparer; -import io.zonky.test.db.postgres.embedded.EmbeddedPostgres; -import io.zonky.test.db.postgres.embedded.PreparedDbProvider; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; @@ -53,7 +49,11 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit.jupiter.SpringExtension; +import io.zonky.test.db.postgres.embedded.ConnectionInfo; +import io.zonky.test.db.postgres.embedded.DatabasePreparer; +import io.zonky.test.db.postgres.embedded.EmbeddedPostgres; import io.zonky.test.db.postgres.embedded.LiquibasePreparer; +import io.zonky.test.db.postgres.embedded.PreparedDbProvider; import static org.gbif.registry.ws.it.fixtures.TestConstants.IT_APP_KEY2; @@ -69,23 +69,24 @@ public class BaseItTest { public static class EsContainerContextInitializer - implements ApplicationContextInitializer { + implements ApplicationContextInitializer { @Override public void initialize(ConfigurableApplicationContext configurableApplicationContext) { TestPropertyValues.of("elasticsearch.mock=false") - .applyTo(configurableApplicationContext.getEnvironment()); + .applyTo(configurableApplicationContext.getEnvironment()); } } /** * Prepares a Tests database using an embedded Postgres instance. */ - public static class EmbeddedDataBaseInitializer { + public static class EmbeddedDataBaseInitializer { private final DataSource dataSource; private final PreparedDbProvider provider; private final ConnectionInfo connectionInfo; - private final List> builderCustomizers = new CopyOnWriteArrayList(); + private final List> builderCustomizers = + new CopyOnWriteArrayList(); public EmbeddedDataBaseInitializer(DatabasePreparer preparer) { try { @@ -113,8 +114,9 @@ public static class ContextInitializer @Override public void initialize(ConfigurableApplicationContext configurableApplicationContext) { - EmbeddedDataBaseInitializer database = new EmbeddedDataBaseInitializer( - LiquibasePreparer.forClasspathLocation(TestConstants.LIQUIBASE_MASTER_FILE)); + EmbeddedDataBaseInitializer database = + new EmbeddedDataBaseInitializer( + LiquibasePreparer.forClasspathLocation(TestConstants.LIQUIBASE_MASTER_FILE)); RegistryDatabaseInitializer.init(database.getDataSource()); @@ -123,7 +125,7 @@ public void initialize(ConfigurableApplicationContext configurableApplicationCon .applyTo(configurableApplicationContext.getEnvironment()); TestPropertyValues.of("elasticsearch.mock=true") - .applyTo(configurableApplicationContext.getEnvironment()); + .applyTo(configurableApplicationContext.getEnvironment()); } /** diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/DerivedDatasetIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/DerivedDatasetIT.java index b5e98cc9d5..7a65ec25b7 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/DerivedDatasetIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/DerivedDatasetIT.java @@ -159,7 +159,8 @@ public void testDerivedDatasetDatasetUsages() { DerivedDatasetCreationRequest requestData1 = newDerivedDatasetCreationRequest(occurrenceDownload.getDoi(), new HashMap<>()); String str = secondDataset.getKey() + ",1\n" + firstDataset.getDoi() + ",2"; - MultipartFile relatedDatasetsFile = new MockMultipartFile("file.csv", str.getBytes(StandardCharsets.UTF_8)); + MultipartFile relatedDatasetsFile = + new MockMultipartFile("file.csv", str.getBytes(StandardCharsets.UTF_8)); DerivedDatasetCreationRequest requestData2 = newDerivedDatasetCreationRequest( @@ -213,12 +214,12 @@ public void testDerivedDatasetListByUser() { prepareDerivedDataset("10.21373/dd.abcd4", "james"); // get derived datasets - PagingResponse johnDerivedDatasets - = derivedDatasetResource.listByUser("john", REGULAR_PAGE); - PagingResponse jamesDerivedDatasets - = derivedDatasetResource.listByUser("james", REGULAR_PAGE); - PagingResponse randomUserDerivedDatasets - = derivedDatasetResource.listByUser("random", REGULAR_PAGE); + PagingResponse johnDerivedDatasets = + derivedDatasetResource.listByUser("john", REGULAR_PAGE); + PagingResponse jamesDerivedDatasets = + derivedDatasetResource.listByUser("james", REGULAR_PAGE); + PagingResponse randomUserDerivedDatasets = + derivedDatasetResource.listByUser("random", REGULAR_PAGE); assertNotNull(johnDerivedDatasets); assertEquals(1, johnDerivedDatasets.getCount()); @@ -237,8 +238,7 @@ public void testGetCitationTextDoiUrlEncoded() throws Exception { .getRequest(new URI("/derivedDataset/10.21373%2Fdd.abcd1/citation")) .andExpect(status().isOk()); - String response = - requestTestFixture.extractResponse(actions); + String response = requestTestFixture.extractResponse(actions); assertEquals("Derived dataset GBIF.org", response); } @@ -252,8 +252,7 @@ public void testGetDerivedDatasetDoiUrlEncoded() throws Exception { .getRequest(new URI("/derivedDataset/10.21373%2Fdd.abcd1")) .andExpect(status().isOk()); - DerivedDataset response = - requestTestFixture.extractJsonResponse(actions, DerivedDataset.class); + DerivedDataset response = requestTestFixture.extractJsonResponse(actions, DerivedDataset.class); assertEquals(new DOI("10.21373/dd.abcd1"), response.getDoi()); } diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/NetworkIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/NetworkIT.java index 23b2eb3445..c828c83cdd 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/NetworkIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/NetworkIT.java @@ -124,8 +124,9 @@ public void testAddAndDeleteConstituentAsEditor() throws Exception { Dataset datasetFromDb = datasetResource.get(dataset.getKey()); - assertTrue(datasetFromDb.getNetworkKeys().contains(network.getKey()), - "Network key not present in dataset networkKeys"); + assertTrue( + datasetFromDb.getNetworkKeys().contains(network.getKey()), + "Network key not present in dataset networkKeys"); // delete constituent requestTestFixture diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/NodeIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/NodeIT.java index aac2bcb720..76df9d442c 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/NodeIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/NodeIT.java @@ -42,7 +42,6 @@ import org.gbif.ws.security.KeyStore; import java.util.List; -import java.util.Map; import java.util.UUID; import javax.annotation.Nullable; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/OrganizationCreationIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/OrganizationCreationIT.java index 05e85126e9..3936e925cf 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/OrganizationCreationIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/OrganizationCreationIT.java @@ -351,7 +351,8 @@ public void testSetEndorsementsByNonAdmin(ServiceType serviceType) { createdOrganization.setEndorsementApproved(true); if (serviceType == ServiceType.RESOURCE) { - // we use the resource class directly to use the update method of the API, which is the one that is secured + // we use the resource class directly to use the update method of the API, which is the one + // that is secured OrganizationResource userServiceResource = (OrganizationResource) getService(serviceType, organizationResource, userOrganizationClient); diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/RegistryIntegrationTestsConfiguration.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/RegistryIntegrationTestsConfiguration.java index e10a725454..6b9071908a 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/RegistryIntegrationTestsConfiguration.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/RegistryIntegrationTestsConfiguration.java @@ -66,8 +66,11 @@ import com.zaxxer.hikari.HikariDataSource; @TestConfiguration -@SpringBootApplication(exclude = {RabbitAutoConfiguration.class, - ElasticSearchRestHealthContributorAutoConfiguration.class}) +@SpringBootApplication( + exclude = { + RabbitAutoConfiguration.class, + ElasticSearchRestHealthContributorAutoConfiguration.class + }) @MapperScan("org.gbif.registry.persistence.mapper") @ComponentScan( basePackages = { diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/UserIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/UserIT.java index 65ad3a3455..ed10af0f1c 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/UserIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/UserIT.java @@ -52,7 +52,8 @@ public class UserIT extends BaseItTest { @RegisterExtension - protected TestCaseDatabaseInitializer databaseRule = new TestCaseDatabaseInitializer("public.user"); + protected TestCaseDatabaseInitializer databaseRule = + new TestCaseDatabaseInitializer("public.user"); private final UserTestFixture userTestFixture; private final RequestTestFixture requestTestFixture; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/UserManagementIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/UserManagementIT.java index 75c34dbecc..8ad42be399 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/UserManagementIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/UserManagementIT.java @@ -60,7 +60,8 @@ public class UserManagementIT extends BaseItTest { @RegisterExtension - protected TestCaseDatabaseInitializer databaseRule = new TestCaseDatabaseInitializer("public.user"); + protected TestCaseDatabaseInitializer databaseRule = + new TestCaseDatabaseInitializer("public.user"); private static final String CHANGED_PASSWORD = "123456"; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/ExtendedCollectionEntityIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/ExtendedCollectionEntityIT.java index c9eb9aec97..492123da39 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/ExtendedCollectionEntityIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/ExtendedCollectionEntityIT.java @@ -118,15 +118,20 @@ public static class MaterializedViewInitializer implements BeforeAllCallback { @Override public void beforeAll(ExtensionContext extensionContext) throws Exception { - Connection connection = SpringExtension.getApplicationContext(extensionContext).getBean(DataSource.class).getConnection(); + Connection connection = + SpringExtension.getApplicationContext(extensionContext) + .getBean(DataSource.class) + .getConnection(); // create materialized view for testing ScriptUtils.executeSqlScript( - connection, new ClassPathResource("/scripts/create_duplicates_views.sql")); + connection, new ClassPathResource("/scripts/create_duplicates_views.sql")); connection.close(); } } - @RegisterExtension static MaterializedViewInitializer materializedViewInitializer = new MaterializedViewInitializer(); + @RegisterExtension + static MaterializedViewInitializer materializedViewInitializer = + new MaterializedViewInitializer(); @ParameterizedTest @EnumSource(ServiceType.class) diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/LookupServiceIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/LookupServiceIT.java index 5d62068f93..5ced181080 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/LookupServiceIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/LookupServiceIT.java @@ -15,8 +15,8 @@ */ package org.gbif.registry.ws.it.collections; -import org.gbif.api.model.collections.Address; import org.gbif.api.model.collections.*; +import org.gbif.api.model.collections.Address; import org.gbif.api.model.collections.lookup.*; import org.gbif.api.model.registry.*; import org.gbif.api.service.collections.CollectionService; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/PersonIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/PersonIT.java index b443fcfcb9..a417dfafa7 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/PersonIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/PersonIT.java @@ -44,8 +44,8 @@ import org.springframework.boot.web.server.LocalServerPort; import static org.gbif.registry.ws.it.fixtures.TestConstants.WS_TEST; -import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/OaipmhGetRecordIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/OaipmhGetRecordIT.java index e9ee015685..fa1afe4232 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/OaipmhGetRecordIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/OaipmhGetRecordIT.java @@ -58,16 +58,15 @@ public class OaipmhGetRecordIT extends AbstractOaipmhEndpointIT { @Autowired public OaipmhGetRecordIT( - SimplePrincipalProvider principalProvider, - Environment environment, - NodeService nodeService, - OrganizationService organizationService, - InstallationService installationService, - DatasetService datasetService, - TestDataFactory testDataFactory, - EsManageServer esServer, - DataSource dataSource - ) { + SimplePrincipalProvider principalProvider, + Environment environment, + NodeService nodeService, + OrganizationService organizationService, + InstallationService installationService, + DatasetService datasetService, + TestDataFactory testDataFactory, + EsManageServer esServer, + DataSource dataSource) { super( principalProvider, environment, diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/OaipmhIdentifyIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/OaipmhIdentifyIT.java index 98087f8933..6834b833d3 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/OaipmhIdentifyIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/OaipmhIdentifyIT.java @@ -34,24 +34,23 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static org.junit.jupiter.api.Assertions.assertEquals; import static org.hamcrest.text.IsEmptyString.emptyOrNullString; +import static org.junit.jupiter.api.Assertions.assertEquals; /** Test the Identify verb of the OAI-PMH endpoint. */ public class OaipmhIdentifyIT extends AbstractOaipmhEndpointIT { @Autowired public OaipmhIdentifyIT( - SimplePrincipalProvider principalProvider, - Environment environment, - NodeService nodeService, - OrganizationService organizationService, - InstallationService installationService, - DatasetService datasetService, - TestDataFactory testDataFactory, - EsManageServer esServer, - DataSource dataSource - ) { + SimplePrincipalProvider principalProvider, + Environment environment, + NodeService nodeService, + OrganizationService organizationService, + InstallationService installationService, + DatasetService datasetService, + TestDataFactory testDataFactory, + EsManageServer esServer, + DataSource dataSource) { super( principalProvider, environment, diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/OaipmhListMetadataFormatsIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/OaipmhListMetadataFormatsIT.java index 01cc3feb89..ffd532c252 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/OaipmhListMetadataFormatsIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/OaipmhListMetadataFormatsIT.java @@ -42,9 +42,9 @@ import com.google.common.collect.Lists; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.samePropertyValuesAs; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -54,16 +54,15 @@ public class OaipmhListMetadataFormatsIT extends AbstractOaipmhEndpointIT { @Autowired public OaipmhListMetadataFormatsIT( - SimplePrincipalProvider principalProvider, - Environment environment, - NodeService nodeService, - OrganizationService organizationService, - InstallationService installationService, - DatasetService datasetService, - TestDataFactory testDataFactory, - EsManageServer esServer, - DataSource dataSource - ) { + SimplePrincipalProvider principalProvider, + Environment environment, + NodeService nodeService, + OrganizationService organizationService, + InstallationService installationService, + DatasetService datasetService, + TestDataFactory testDataFactory, + EsManageServer esServer, + DataSource dataSource) { super( principalProvider, environment, diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/OaipmhListRecordsIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/OaipmhListRecordsIT.java index ea2fc3dcd8..2eff8678d9 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/OaipmhListRecordsIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/OaipmhListRecordsIT.java @@ -60,16 +60,15 @@ public class OaipmhListRecordsIT extends AbstractOaipmhEndpointIT { @Autowired public OaipmhListRecordsIT( - SimplePrincipalProvider principalProvider, - Environment environment, - NodeService nodeService, - OrganizationService organizationService, - InstallationService installationService, - DatasetService datasetService, - TestDataFactory testDataFactory, - EsManageServer esServer, - DataSource dataSource - ) { + SimplePrincipalProvider principalProvider, + Environment environment, + NodeService nodeService, + OrganizationService organizationService, + InstallationService installationService, + DatasetService datasetService, + TestDataFactory testDataFactory, + EsManageServer esServer, + DataSource dataSource) { super( principalProvider, environment, diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/OaipmhListSetsIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/OaipmhListSetsIT.java index 81a51b44eb..e32e0b9c7b 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/OaipmhListSetsIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/oaipmh/OaipmhListSetsIT.java @@ -57,16 +57,15 @@ public class OaipmhListSetsIT extends AbstractOaipmhEndpointIT { @Autowired public OaipmhListSetsIT( - SimplePrincipalProvider principalProvider, - Environment environment, - NodeService nodeService, - OrganizationService organizationService, - InstallationService installationService, - DatasetService datasetService, - TestDataFactory testDataFactory, - EsManageServer esServer, - DataSource dataSource - ) { + SimplePrincipalProvider principalProvider, + Environment environment, + NodeService nodeService, + OrganizationService organizationService, + InstallationService installationService, + DatasetService datasetService, + TestDataFactory testDataFactory, + EsManageServer esServer, + DataSource dataSource) { super( principalProvider, environment, diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/CollectionMapperIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/CollectionMapperIT.java index e2809e9d90..61433a41b2 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/CollectionMapperIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/CollectionMapperIT.java @@ -55,7 +55,8 @@ public class CollectionMapperIT extends BaseItTest { @RegisterExtension - protected TestCaseDatabaseInitializer databaseRule = new TestCaseDatabaseInitializer("collection"); + protected TestCaseDatabaseInitializer databaseRule = + new TestCaseDatabaseInitializer("collection"); private CollectionMapper collectionMapper; private AddressMapper addressMapper; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/DerivedDatasetMapperIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/DerivedDatasetMapperIT.java index f75907746f..1398d30f2c 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/DerivedDatasetMapperIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/DerivedDatasetMapperIT.java @@ -32,7 +32,6 @@ import java.time.Month; import java.time.ZoneId; import java.util.ArrayList; -import java.util.Arrays; import java.util.Date; import java.util.List; @@ -46,7 +45,8 @@ public class DerivedDatasetMapperIT extends BaseItTest { @RegisterExtension - protected TestCaseDatabaseInitializer databaseRule = new TestCaseDatabaseInitializer("derived_dataset", "dataset"); + protected TestCaseDatabaseInitializer databaseRule = + new TestCaseDatabaseInitializer("derived_dataset", "dataset"); private final DerivedDatasetMapper mapper; private final TestDataFactory testDataFactory; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/DoiMapperIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/DoiMapperIT.java index bfa42736fc..7dcd7d930b 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/DoiMapperIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/DoiMapperIT.java @@ -26,7 +26,6 @@ import org.gbif.ws.client.filter.SimplePrincipalProvider; import java.net.URI; -import java.util.Collections; import java.util.List; import java.util.Map; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/DuplicatesMapperIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/DuplicatesMapperIT.java index 0cca66849b..f70b979cda 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/DuplicatesMapperIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/DuplicatesMapperIT.java @@ -49,8 +49,8 @@ public class DuplicatesMapperIT extends BaseItTest { @RegisterExtension - protected TestCaseDatabaseInitializer databaseRule = new TestCaseDatabaseInitializer("collection", - "institution"); + protected TestCaseDatabaseInitializer databaseRule = + new TestCaseDatabaseInitializer("collection", "institution"); private DuplicatesMapper duplicatesMapper; private InstitutionMapper institutionMapper; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/IDigBioMapperIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/IDigBioMapperIT.java index ea445dfc30..362c038c39 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/IDigBioMapperIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/IDigBioMapperIT.java @@ -40,7 +40,6 @@ import org.gbif.ws.client.filter.SimplePrincipalProvider; import java.math.BigDecimal; -import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Set; @@ -57,11 +56,9 @@ public class IDigBioMapperIT extends BaseItTest { @RegisterExtension - protected TestCaseDatabaseInitializer databaseRule = new TestCaseDatabaseInitializer("collection_person", - "collection", - "institution", - "address", - "identifier"); + protected TestCaseDatabaseInitializer databaseRule = + new TestCaseDatabaseInitializer( + "collection_person", "collection", "institution", "address", "identifier"); private IDigBioMapper iDigBioMapper; private CollectionMapper collectionMapper; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/InstitutionMapperIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/InstitutionMapperIT.java index e8fa500109..ffb79bfc58 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/InstitutionMapperIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/InstitutionMapperIT.java @@ -36,7 +36,6 @@ import java.net.URI; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.UUID; @@ -54,11 +53,13 @@ public class InstitutionMapperIT extends BaseItTest { @RegisterExtension - protected TestCaseDatabaseInitializer databaseRule = new TestCaseDatabaseInitializer("institution_collection_person", - "institution_identifier", - "institution_tag", - "institution_occurrence_mapping", - "institution"); + protected TestCaseDatabaseInitializer databaseRule = + new TestCaseDatabaseInitializer( + "institution_collection_person", + "institution_identifier", + "institution_tag", + "institution_occurrence_mapping", + "institution"); private InstitutionMapper institutionMapper; private AddressMapper addressMapper; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/MachineTagMapperIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/MachineTagMapperIT.java index db12bbaf80..623d62cc87 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/MachineTagMapperIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/MachineTagMapperIT.java @@ -22,8 +22,6 @@ import org.gbif.registry.ws.it.BaseItTest; import org.gbif.ws.client.filter.SimplePrincipalProvider; -import java.util.Collections; - import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.springframework.beans.factory.annotation.Autowired; @@ -33,7 +31,8 @@ public class MachineTagMapperIT extends BaseItTest { @RegisterExtension - protected TestCaseDatabaseInitializer databaseRule = new TestCaseDatabaseInitializer("machine_tag"); + protected TestCaseDatabaseInitializer databaseRule = + new TestCaseDatabaseInitializer("machine_tag"); private final MachineTagMapper mapper; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/PersonMapperIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/PersonMapperIT.java index 140c83ad70..4d1308e26b 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/PersonMapperIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/PersonMapperIT.java @@ -25,7 +25,6 @@ import org.gbif.registry.ws.it.BaseItTest; import org.gbif.ws.client.filter.SimplePrincipalProvider; -import java.util.Arrays; import java.util.List; import java.util.UUID; @@ -42,8 +41,8 @@ public class PersonMapperIT extends BaseItTest { @RegisterExtension - protected TestCaseDatabaseInitializer databaseRule = new TestCaseDatabaseInitializer("collection_person", - "address"); + protected TestCaseDatabaseInitializer databaseRule = + new TestCaseDatabaseInitializer("collection_person", "address"); private PersonMapper personMapper; private AddressMapper addressMapper; diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/PipelineProcessMapperIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/PipelineProcessMapperIT.java index b9aedd8843..44a637f4cc 100644 --- a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/PipelineProcessMapperIT.java +++ b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/persistence/mapper/PipelineProcessMapperIT.java @@ -42,7 +42,6 @@ import org.gbif.ws.client.filter.SimplePrincipalProvider; import java.time.LocalDateTime; -import java.util.Arrays; import java.util.Collections; import java.util.UUID; @@ -61,11 +60,9 @@ public class PipelineProcessMapperIT extends BaseItTest { @RegisterExtension - protected TestCaseDatabaseInitializer databaseRule = new TestCaseDatabaseInitializer("pipeline_process", - "dataset", - "installation", - "organization", - "node"); + protected TestCaseDatabaseInitializer databaseRule = + new TestCaseDatabaseInitializer( + "pipeline_process", "dataset", "installation", "organization", "node"); private static final String TEST_USER = "test"; private static final String UPDATER_USER = "updater"; diff --git a/registry-pipelines/src/main/java/org/gbif/registry/pipelines/DefaultRegistryPipelinesHistoryTrackingService.java b/registry-pipelines/src/main/java/org/gbif/registry/pipelines/DefaultRegistryPipelinesHistoryTrackingService.java index 732a5545ce..86d450dc63 100644 --- a/registry-pipelines/src/main/java/org/gbif/registry/pipelines/DefaultRegistryPipelinesHistoryTrackingService.java +++ b/registry-pipelines/src/main/java/org/gbif/registry/pipelines/DefaultRegistryPipelinesHistoryTrackingService.java @@ -15,12 +15,6 @@ */ package org.gbif.registry.pipelines; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; -import com.google.common.collect.Ordering; -import org.apache.commons.lang3.StringUtils; import org.gbif.api.model.common.paging.Pageable; import org.gbif.api.model.common.paging.PagingRequest; import org.gbif.api.model.common.paging.PagingResponse; @@ -36,15 +30,7 @@ import org.gbif.common.messaging.api.messages.*; import org.gbif.registry.persistence.mapper.pipelines.PipelineProcessMapper; import org.gbif.registry.pipelines.util.PredicateUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Lazy; -import org.springframework.stereotype.Service; -import javax.annotation.Nullable; import java.io.IOException; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; @@ -55,6 +41,23 @@ import java.util.function.Consumer; import java.util.stream.Collectors; +import javax.annotation.Nullable; + +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Service; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; +import com.google.common.collect.Ordering; + /** Service that allows to re-run pipeline steps on an specific attempt. */ @Service public class DefaultRegistryPipelinesHistoryTrackingService diff --git a/registry-pipelines/src/main/java/org/gbif/registry/pipelines/RegistryPipelinesHistoryTrackingService.java b/registry-pipelines/src/main/java/org/gbif/registry/pipelines/RegistryPipelinesHistoryTrackingService.java index 3395f50430..d5fe8f3932 100644 --- a/registry-pipelines/src/main/java/org/gbif/registry/pipelines/RegistryPipelinesHistoryTrackingService.java +++ b/registry-pipelines/src/main/java/org/gbif/registry/pipelines/RegistryPipelinesHistoryTrackingService.java @@ -20,12 +20,13 @@ import org.gbif.api.model.pipelines.*; import org.gbif.api.model.pipelines.ws.SearchResult; -import javax.annotation.Nullable; import java.time.LocalDateTime; import java.util.List; import java.util.Set; import java.util.UUID; +import javax.annotation.Nullable; + /** Service to provide the history and re-execute previous attempts of Pipelines. */ public interface RegistryPipelinesHistoryTrackingService { diff --git a/registry-search/src/main/java/org/gbif/registry/search/dataset/DatasetSearchResultConverter.java b/registry-search/src/main/java/org/gbif/registry/search/dataset/DatasetSearchResultConverter.java index 4bca16f258..3f7b436b9e 100644 --- a/registry-search/src/main/java/org/gbif/registry/search/dataset/DatasetSearchResultConverter.java +++ b/registry-search/src/main/java/org/gbif/registry/search/dataset/DatasetSearchResultConverter.java @@ -140,9 +140,9 @@ private static Optional getUuidValue(Map fields, String es private static Optional> getUUIDListValue(Map fields, String esField) { return Optional.ofNullable(fields.get(esField)) - .map(v -> (List) v) - .filter(v -> !v.isEmpty()) - .map(v -> v.stream().map(UUID::fromString).collect(Collectors.toList())); + .map(v -> (List) v) + .filter(v -> !v.isEmpty()) + .map(v -> v.stream().map(UUID::fromString).collect(Collectors.toList())); } private static Optional getStringValue(Map fields, String esField) { diff --git a/registry-search/src/main/java/org/gbif/registry/search/dataset/indexing/DatasetJsonConverter.java b/registry-search/src/main/java/org/gbif/registry/search/dataset/indexing/DatasetJsonConverter.java index 05f767aec0..6e57bf31bf 100644 --- a/registry-search/src/main/java/org/gbif/registry/search/dataset/indexing/DatasetJsonConverter.java +++ b/registry-search/src/main/java/org/gbif/registry/search/dataset/indexing/DatasetJsonConverter.java @@ -184,14 +184,13 @@ public void addNetworks(Dataset dataset, ObjectNode datasetJsonNode) { if (networks != null) { ArrayNode networkKeys = mapper.createArrayNode(); ArrayNode networkTitles = mapper.createArrayNode(); - networks.forEach(network -> { - networkKeys.add(new TextNode(network.getKey().toString())); - networkTitles.add(new TextNode(network.getTitle())); - }); - datasetJsonNode - .putArray("networkKeys").addAll(networkKeys); - datasetJsonNode - .putArray("networkTitles").addAll(networkTitles); + networks.forEach( + network -> { + networkKeys.add(new TextNode(network.getKey().toString())); + networkTitles.add(new TextNode(network.getTitle())); + }); + datasetJsonNode.putArray("networkKeys").addAll(networkKeys); + datasetJsonNode.putArray("networkTitles").addAll(networkTitles); } } diff --git a/registry-search/src/main/java/org/gbif/registry/search/dataset/indexing/EsDatasetRealtimeIndexer.java b/registry-search/src/main/java/org/gbif/registry/search/dataset/indexing/EsDatasetRealtimeIndexer.java index 13c1bcc45d..3c54a35dbb 100644 --- a/registry-search/src/main/java/org/gbif/registry/search/dataset/indexing/EsDatasetRealtimeIndexer.java +++ b/registry-search/src/main/java/org/gbif/registry/search/dataset/indexing/EsDatasetRealtimeIndexer.java @@ -58,10 +58,10 @@ public class EsDatasetRealtimeIndexer implements DatasetRealtimeIndexer { @Autowired public EsDatasetRealtimeIndexer( - RestHighLevelClient restHighLevelClient, - DatasetJsonConverter datasetJsonConverter, - GbifWsClient gbifWsClient, - @Value ("${elasticsearch.registry.index}") String index) { + RestHighLevelClient restHighLevelClient, + DatasetJsonConverter datasetJsonConverter, + GbifWsClient gbifWsClient, + @Value("${elasticsearch.registry.index}") String index) { this.restHighLevelClient = restHighLevelClient; this.datasetJsonConverter = datasetJsonConverter; this.gbifWsClient = gbifWsClient; @@ -207,9 +207,7 @@ public void index(Installation installation) { public void delete(Dataset dataset) { pendingUpdates.incrementAndGet(); DeleteRequest deleteRequest = - new DeleteRequest() - .id(dataset.getKey().toString()) - .index(IndexingConstants.ALIAS); + new DeleteRequest().id(dataset.getKey().toString()).index(IndexingConstants.ALIAS); try { restHighLevelClient.deleteAsync( deleteRequest, @@ -239,14 +237,14 @@ public void index(Network network) { try { log.debug("Updating hosted datasets for installation {}", network.getKey()); Iterable datasets = - Iterables.datasetsIterable( - page -> gbifWsClient.getNetworkDatasets(network.getKey().toString(), page)); + Iterables.datasetsIterable( + page -> gbifWsClient.getNetworkDatasets(network.getKey().toString(), page)); index(datasets); } catch (Exception e) { log.error( - "Unable to update hosted datasets for network {} - index is now out of sync", - network.getKey(), - e); + "Unable to update hosted datasets for network {} - index is now out of sync", + network.getKey(), + e); } } diff --git a/registry-search/src/main/java/org/gbif/registry/search/dataset/indexing/ws/GbifWsClient.java b/registry-search/src/main/java/org/gbif/registry/search/dataset/indexing/ws/GbifWsClient.java index 8fc560fdbb..6392e77fcf 100644 --- a/registry-search/src/main/java/org/gbif/registry/search/dataset/indexing/ws/GbifWsClient.java +++ b/registry-search/src/main/java/org/gbif/registry/search/dataset/indexing/ws/GbifWsClient.java @@ -55,8 +55,7 @@ PagingResponse getOrganizationHostedDatasets( PagingResponse getOrganizationPublishedDataset( String organizationKey, PagingRequest pagingRequest); - PagingResponse getNetworkDatasets( - String networkKey, PagingRequest pagingRequest); + PagingResponse getNetworkDatasets(String networkKey, PagingRequest pagingRequest); InputStream getMetadataDocument(UUID datasetKey); diff --git a/registry-search/src/main/java/org/gbif/registry/search/dataset/indexing/ws/GbifWsRetrofitClient.java b/registry-search/src/main/java/org/gbif/registry/search/dataset/indexing/ws/GbifWsRetrofitClient.java index c50782f4fe..0bc8a748f7 100644 --- a/registry-search/src/main/java/org/gbif/registry/search/dataset/indexing/ws/GbifWsRetrofitClient.java +++ b/registry-search/src/main/java/org/gbif/registry/search/dataset/indexing/ws/GbifWsRetrofitClient.java @@ -123,7 +123,6 @@ public PagingResponse listDatasets(PagingRequest pagingRequest) { return datasetService.list(pagingRequest); } - @Override public Installation getInstallation(String installationKey) { return installationCache.get(installationKey); @@ -162,7 +161,7 @@ public PagingResponse getOrganizationPublishedDataset( @Override public PagingResponse getNetworkDatasets( - String networkKey, PagingRequest pagingRequest) { + String networkKey, PagingRequest pagingRequest) { return networkService.listConstituents(UUID.fromString(networkKey), pagingRequest); } diff --git a/registry-search/src/test/java/org/gbif/registry/search/test/EsManageServer.java b/registry-search/src/test/java/org/gbif/registry/search/test/EsManageServer.java index a623c8e234..edab85f24d 100644 --- a/registry-search/src/test/java/org/gbif/registry/search/test/EsManageServer.java +++ b/registry-search/src/test/java/org/gbif/registry/search/test/EsManageServer.java @@ -54,8 +54,7 @@ public class EsManageServer implements InitializingBean, DisposableBean { // needed to assert results against ES server directly private RestHighLevelClient restClient; - public EsManageServer( - Resource mappingFile, Resource settingsFile, String indexName) { + public EsManageServer(Resource mappingFile, Resource settingsFile, String indexName) { this.mappingFile = mappingFile; this.settingsFile = settingsFile; this.indexName = indexName; @@ -133,6 +132,7 @@ public RestHighLevelClient getRestClient() { public String getServerAddress() { return "http://localhost:" + embeddedElastic.getMappedPort(9200); } + public void refresh() { try { RefreshRequest refreshRequest = new RefreshRequest(); diff --git a/registry-service/src/main/java/org/gbif/registry/service/RegistryDerivedDatasetServiceImpl.java b/registry-service/src/main/java/org/gbif/registry/service/RegistryDerivedDatasetServiceImpl.java index 0c5688c126..9ed7aee644 100644 --- a/registry-service/src/main/java/org/gbif/registry/service/RegistryDerivedDatasetServiceImpl.java +++ b/registry-service/src/main/java/org/gbif/registry/service/RegistryDerivedDatasetServiceImpl.java @@ -185,9 +185,7 @@ public List listRelatedDatasets(DOI derivedDatasetDoi) { @Override public PagingResponse listByUser(String user, Pageable page) { return new PagingResponse<>( - page, - derivedDatasetMapper.countByUser(user), - derivedDatasetMapper.listByUser(user, page)); + page, derivedDatasetMapper.countByUser(user), derivedDatasetMapper.listByUser(user, page)); } @Scheduled(cron = "${derivedDataset.cronPattern}") diff --git a/registry-ws-client/src/main/java/org/gbif/registry/ws/client/collections/CrudClient.java b/registry-ws-client/src/main/java/org/gbif/registry/ws/client/collections/CrudClient.java index 773631f098..10214a9070 100644 --- a/registry-ws-client/src/main/java/org/gbif/registry/ws/client/collections/CrudClient.java +++ b/registry-ws-client/src/main/java/org/gbif/registry/ws/client/collections/CrudClient.java @@ -51,8 +51,8 @@ default void update(@RequestBody T entity) { } @RequestMapping( - method = RequestMethod.PUT, - value = "{key}", - consumes = MediaType.APPLICATION_JSON_VALUE) + method = RequestMethod.PUT, + value = "{key}", + consumes = MediaType.APPLICATION_JSON_VALUE) void updateResource(@PathVariable("key") UUID key, @RequestBody T entity); } diff --git a/registry-ws/src/main/java/org/gbif/registry/ws/resources/DerivedDatasetResource.java b/registry-ws/src/main/java/org/gbif/registry/ws/resources/DerivedDatasetResource.java index 6a0bbbd6e5..ae6a1952a1 100644 --- a/registry-ws/src/main/java/org/gbif/registry/ws/resources/DerivedDatasetResource.java +++ b/registry-ws/src/main/java/org/gbif/registry/ws/resources/DerivedDatasetResource.java @@ -144,8 +144,9 @@ private DerivedDataset createDerivedDataset( "Invalid related datasets identifiers: " + e.getMessage(), HttpStatus.BAD_REQUEST); } - DerivedDataset derivedDataset = derivedDatasetService.create( - toDerivedDataset(request, nameFromContext), derivedDatasetUsages); + DerivedDataset derivedDataset = + derivedDatasetService.create( + toDerivedDataset(request, nameFromContext), derivedDatasetUsages); eventManager.post(CreateEvent.newInstance(derivedDataset, DerivedDataset.class)); return derivedDataset; } @@ -191,7 +192,8 @@ && checkIsNotAdmin(authentication)) { Optional.ofNullable(request.getTitle()).ifPresent(derivedDataset::setTitle); derivedDataset.setModifiedBy(nameFromContext); derivedDatasetService.update(derivedDataset); - eventManager.post(UpdateEvent.newInstance(derivedDataset, derivedDataset, DerivedDataset.class)); + eventManager.post( + UpdateEvent.newInstance(derivedDataset, derivedDataset, DerivedDataset.class)); } catch (IllegalStateException e) { LOG.error(e.getMessage()); throw new WebApplicationException(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR); @@ -220,7 +222,8 @@ public PagingResponse getDerivedDatasets( } @GetMapping("user/{user}") - public PagingResponse listByUser(@PathVariable("user") String user, Pageable page) { + public PagingResponse listByUser( + @PathVariable("user") String user, Pageable page) { return derivedDatasetService.listByUser(user, page); } diff --git a/registry-ws/src/main/java/org/gbif/registry/ws/resources/collections/ExtendedCollectionEntityResource.java b/registry-ws/src/main/java/org/gbif/registry/ws/resources/collections/ExtendedCollectionEntityResource.java index 811046a16e..66f3774336 100644 --- a/registry-ws/src/main/java/org/gbif/registry/ws/resources/collections/ExtendedCollectionEntityResource.java +++ b/registry-ws/src/main/java/org/gbif/registry/ws/resources/collections/ExtendedCollectionEntityResource.java @@ -16,9 +16,9 @@ package org.gbif.registry.ws.resources.collections; import org.gbif.api.annotation.Trim; +import org.gbif.api.model.collections.*; import org.gbif.api.model.collections.Address; import org.gbif.api.model.collections.Contactable; -import org.gbif.api.model.collections.*; import org.gbif.api.model.registry.*; import org.gbif.api.service.collections.ContactService; import org.gbif.api.service.collections.OccurrenceMappingService; @@ -56,10 +56,10 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import static com.google.common.base.Preconditions.checkArgument; import static org.gbif.registry.security.UserRoles.GRSCICOLL_ADMIN_ROLE; import static org.gbif.registry.security.UserRoles.GRSCICOLL_EDITOR_ROLE; import static org.gbif.registry.security.UserRoles.IDIGBIO_GRSCICOLL_EDITOR_ROLE; -import static com.google.common.base.Preconditions.checkArgument; /** * Base class to implement the main methods of {@link CollectionEntity} that are also @link diff --git a/registry-ws/src/main/java/org/gbif/registry/ws/resources/pipelines/PipelinesHistoryResource.java b/registry-ws/src/main/java/org/gbif/registry/ws/resources/pipelines/PipelinesHistoryResource.java index 643f1b460e..abe95c07bf 100644 --- a/registry-ws/src/main/java/org/gbif/registry/ws/resources/pipelines/PipelinesHistoryResource.java +++ b/registry-ws/src/main/java/org/gbif/registry/ws/resources/pipelines/PipelinesHistoryResource.java @@ -25,6 +25,14 @@ import org.gbif.api.service.pipelines.PipelinesHistoryService; import org.gbif.registry.pipelines.RegistryPipelinesHistoryTrackingService; import org.gbif.registry.ws.util.DateUtils; + +import java.time.LocalDateTime; +import java.util.*; +import java.util.stream.Collectors; + +import javax.annotation.Nullable; +import javax.validation.ConstraintViolationException; + import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -35,12 +43,6 @@ import org.springframework.web.bind.MissingServletRequestParameterException; import org.springframework.web.bind.annotation.*; -import javax.annotation.Nullable; -import javax.validation.ConstraintViolationException; -import java.time.LocalDateTime; -import java.util.*; -import java.util.stream.Collectors; - import static org.gbif.registry.security.UserRoles.ADMIN_ROLE; import static org.gbif.registry.security.UserRoles.EDITOR_ROLE; @@ -227,7 +229,7 @@ public RunPipelineResponse runPipelineAttempt( authentication.getName(), null, markPreviousAttemptAsFailed, - interpretTypes); + interpretTypes); } @GetMapping("search") From 01453679901693d772605aed9da32ade5e5542d4 Mon Sep 17 00:00:00 2001 From: gbif-jenkins Date: Mon, 3 May 2021 14:40:00 +0000 Subject: [PATCH 05/19] [maven-release-plugin] prepare release registry-parent-3.56 --- 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 | 4 ++-- registry-identity/pom.xml | 2 +- registry-integration-tests/pom.xml | 2 +- registry-mail/pom.xml | 2 +- registry-messaging/pom.xml | 2 +- registry-metadata/pom.xml | 2 +- registry-metasync/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 +- 22 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pom.xml b/pom.xml index 4829e9148d..6f5e2fb2d2 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.gbif.registry registry-parent - 3.56-SNAPSHOT + 3.56 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.56 diff --git a/registry-cli/pom.xml b/registry-cli/pom.xml index 70a56de5f7..87fd14951d 100644 --- a/registry-cli/pom.xml +++ b/registry-cli/pom.xml @@ -4,7 +4,7 @@ org.gbif.registry registry-parent - 3.56-SNAPSHOT + 3.56 registry-cli diff --git a/registry-directory/pom.xml b/registry-directory/pom.xml index c71a847595..475f456588 100644 --- a/registry-directory/pom.xml +++ b/registry-directory/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-doi/pom.xml b/registry-doi/pom.xml index cff2a881d5..79aa40d71a 100644 --- a/registry-doi/pom.xml +++ b/registry-doi/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-domain/pom.xml b/registry-domain/pom.xml index 1efa42b9a3..88dd510fbd 100644 --- a/registry-domain/pom.xml +++ b/registry-domain/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-events/pom.xml b/registry-events/pom.xml index b9f6e4f67f..566e7f05e4 100644 --- a/registry-events/pom.xml +++ b/registry-events/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-examples/pom.xml b/registry-examples/pom.xml index 83724abd82..1ca37060e4 100644 --- a/registry-examples/pom.xml +++ b/registry-examples/pom.xml @@ -3,12 +3,12 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 registry-examples - 3.56-SNAPSHOT + 3.56 jar diff --git a/registry-identity/pom.xml b/registry-identity/pom.xml index ab0e5f8cbf..ad2fc7d281 100644 --- a/registry-identity/pom.xml +++ b/registry-identity/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-integration-tests/pom.xml b/registry-integration-tests/pom.xml index 786a30b83a..604926ca7a 100644 --- a/registry-integration-tests/pom.xml +++ b/registry-integration-tests/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-mail/pom.xml b/registry-mail/pom.xml index 168ec01e6e..ad09f7f1b7 100644 --- a/registry-mail/pom.xml +++ b/registry-mail/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-messaging/pom.xml b/registry-messaging/pom.xml index 879783a275..beca0803c3 100644 --- a/registry-messaging/pom.xml +++ b/registry-messaging/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-metadata/pom.xml b/registry-metadata/pom.xml index 039df5c7cd..afddc8f1a4 100644 --- a/registry-metadata/pom.xml +++ b/registry-metadata/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-metasync/pom.xml b/registry-metasync/pom.xml index 975bd5af47..abddb0083e 100644 --- a/registry-metasync/pom.xml +++ b/registry-metasync/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-oaipmh/pom.xml b/registry-oaipmh/pom.xml index 17b357580a..9178cf1a86 100644 --- a/registry-oaipmh/pom.xml +++ b/registry-oaipmh/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-persistence/pom.xml b/registry-persistence/pom.xml index 19259884bb..5e771cddb0 100644 --- a/registry-persistence/pom.xml +++ b/registry-persistence/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-pipelines/pom.xml b/registry-pipelines/pom.xml index c488400902..8770b598c6 100644 --- a/registry-pipelines/pom.xml +++ b/registry-pipelines/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-search/pom.xml b/registry-search/pom.xml index 12bfa1c00a..834aa112ee 100644 --- a/registry-search/pom.xml +++ b/registry-search/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-security/pom.xml b/registry-security/pom.xml index d857a7027d..3d0b4e6e47 100644 --- a/registry-security/pom.xml +++ b/registry-security/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-service/pom.xml b/registry-service/pom.xml index 5512b9bac9..8d54133ed5 100644 --- a/registry-service/pom.xml +++ b/registry-service/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-surety/pom.xml b/registry-surety/pom.xml index 256ad5d5e7..ce48866a17 100644 --- a/registry-surety/pom.xml +++ b/registry-surety/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-ws-client/pom.xml b/registry-ws-client/pom.xml index 6bf0090395..6be75d15ef 100644 --- a/registry-ws-client/pom.xml +++ b/registry-ws-client/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-ws/pom.xml b/registry-ws/pom.xml index b202ab18dc..2df6dcbc27 100644 --- a/registry-ws/pom.xml +++ b/registry-ws/pom.xml @@ -4,7 +4,7 @@ org.gbif.registry registry-parent - 3.56-SNAPSHOT + 3.56 registry-ws GBIF Registry Webservices From 303c9883467e444710a20c3dd9298b626780f70d Mon Sep 17 00:00:00 2001 From: gbif-jenkins Date: Mon, 3 May 2021 14:40:09 +0000 Subject: [PATCH 06/19] [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 | 4 ++-- registry-identity/pom.xml | 2 +- registry-integration-tests/pom.xml | 2 +- registry-mail/pom.xml | 2 +- registry-messaging/pom.xml | 2 +- registry-metadata/pom.xml | 2 +- registry-metasync/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 +- 22 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pom.xml b/pom.xml index 6f5e2fb2d2..4c525fdfac 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.gbif.registry registry-parent - 3.56 + 3.57-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.56 + HEAD diff --git a/registry-cli/pom.xml b/registry-cli/pom.xml index 87fd14951d..a46b0ed396 100644 --- a/registry-cli/pom.xml +++ b/registry-cli/pom.xml @@ -4,7 +4,7 @@ org.gbif.registry registry-parent - 3.56 + 3.57-SNAPSHOT registry-cli diff --git a/registry-directory/pom.xml b/registry-directory/pom.xml index 475f456588..6a5c95aaf6 100644 --- a/registry-directory/pom.xml +++ b/registry-directory/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-doi/pom.xml b/registry-doi/pom.xml index 79aa40d71a..ca6967c136 100644 --- a/registry-doi/pom.xml +++ b/registry-doi/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-domain/pom.xml b/registry-domain/pom.xml index 88dd510fbd..a63c1763dd 100644 --- a/registry-domain/pom.xml +++ b/registry-domain/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-events/pom.xml b/registry-events/pom.xml index 566e7f05e4..74af14816b 100644 --- a/registry-events/pom.xml +++ b/registry-events/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-examples/pom.xml b/registry-examples/pom.xml index 1ca37060e4..a459a7d090 100644 --- a/registry-examples/pom.xml +++ b/registry-examples/pom.xml @@ -3,12 +3,12 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 registry-examples - 3.56 + 3.57-SNAPSHOT jar diff --git a/registry-identity/pom.xml b/registry-identity/pom.xml index ad2fc7d281..b0c2ce81c5 100644 --- a/registry-identity/pom.xml +++ b/registry-identity/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-integration-tests/pom.xml b/registry-integration-tests/pom.xml index 604926ca7a..f2f627f386 100644 --- a/registry-integration-tests/pom.xml +++ b/registry-integration-tests/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-mail/pom.xml b/registry-mail/pom.xml index ad09f7f1b7..f6a0dfcfb0 100644 --- a/registry-mail/pom.xml +++ b/registry-mail/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-messaging/pom.xml b/registry-messaging/pom.xml index beca0803c3..634ac9270e 100644 --- a/registry-messaging/pom.xml +++ b/registry-messaging/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-metadata/pom.xml b/registry-metadata/pom.xml index afddc8f1a4..4a5730151a 100644 --- a/registry-metadata/pom.xml +++ b/registry-metadata/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-metasync/pom.xml b/registry-metasync/pom.xml index abddb0083e..1c1757afc7 100644 --- a/registry-metasync/pom.xml +++ b/registry-metasync/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-oaipmh/pom.xml b/registry-oaipmh/pom.xml index 9178cf1a86..9f56874a81 100644 --- a/registry-oaipmh/pom.xml +++ b/registry-oaipmh/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-persistence/pom.xml b/registry-persistence/pom.xml index 5e771cddb0..8c00080cc8 100644 --- a/registry-persistence/pom.xml +++ b/registry-persistence/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-pipelines/pom.xml b/registry-pipelines/pom.xml index 8770b598c6..0fd689fadc 100644 --- a/registry-pipelines/pom.xml +++ b/registry-pipelines/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-search/pom.xml b/registry-search/pom.xml index 834aa112ee..f78783525f 100644 --- a/registry-search/pom.xml +++ b/registry-search/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-security/pom.xml b/registry-security/pom.xml index 3d0b4e6e47..7fb148dc01 100644 --- a/registry-security/pom.xml +++ b/registry-security/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-service/pom.xml b/registry-service/pom.xml index 8d54133ed5..a973045647 100644 --- a/registry-service/pom.xml +++ b/registry-service/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-surety/pom.xml b/registry-surety/pom.xml index ce48866a17..b3c6a7f067 100644 --- a/registry-surety/pom.xml +++ b/registry-surety/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-ws-client/pom.xml b/registry-ws-client/pom.xml index 6be75d15ef..19f9e1a64a 100644 --- a/registry-ws-client/pom.xml +++ b/registry-ws-client/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-ws/pom.xml b/registry-ws/pom.xml index 2df6dcbc27..37bcab70cd 100644 --- a/registry-ws/pom.xml +++ b/registry-ws/pom.xml @@ -4,7 +4,7 @@ org.gbif.registry registry-parent - 3.56 + 3.57-SNAPSHOT registry-ws GBIF Registry Webservices From b281b14882b89f24050a1a047210bc8bc7cf69d0 Mon Sep 17 00:00:00 2001 From: gbif-jenkins Date: Mon, 3 May 2021 15:03:44 +0000 Subject: [PATCH 07/19] [maven-release-plugin] prepare release registry-parent-3.57 --- 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 | 4 ++-- registry-identity/pom.xml | 2 +- registry-integration-tests/pom.xml | 2 +- registry-mail/pom.xml | 2 +- registry-messaging/pom.xml | 2 +- registry-metadata/pom.xml | 2 +- registry-metasync/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 +- 22 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pom.xml b/pom.xml index 4c525fdfac..4c245bab99 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.gbif.registry registry-parent - 3.57-SNAPSHOT + 3.57 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.57 diff --git a/registry-cli/pom.xml b/registry-cli/pom.xml index a46b0ed396..9e0ea59bdc 100644 --- a/registry-cli/pom.xml +++ b/registry-cli/pom.xml @@ -4,7 +4,7 @@ org.gbif.registry registry-parent - 3.57-SNAPSHOT + 3.57 registry-cli diff --git a/registry-directory/pom.xml b/registry-directory/pom.xml index 6a5c95aaf6..52ce0bf5c3 100644 --- a/registry-directory/pom.xml +++ b/registry-directory/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.57 4.0.0 diff --git a/registry-doi/pom.xml b/registry-doi/pom.xml index ca6967c136..f8d09f398f 100644 --- a/registry-doi/pom.xml +++ b/registry-doi/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.57 4.0.0 diff --git a/registry-domain/pom.xml b/registry-domain/pom.xml index a63c1763dd..e32ed5e5eb 100644 --- a/registry-domain/pom.xml +++ b/registry-domain/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.57 4.0.0 diff --git a/registry-events/pom.xml b/registry-events/pom.xml index 74af14816b..d7a95c186e 100644 --- a/registry-events/pom.xml +++ b/registry-events/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.57 4.0.0 diff --git a/registry-examples/pom.xml b/registry-examples/pom.xml index a459a7d090..0ca6cd9b4b 100644 --- a/registry-examples/pom.xml +++ b/registry-examples/pom.xml @@ -3,12 +3,12 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.57 4.0.0 registry-examples - 3.57-SNAPSHOT + 3.57 jar diff --git a/registry-identity/pom.xml b/registry-identity/pom.xml index b0c2ce81c5..c6b1aa790b 100644 --- a/registry-identity/pom.xml +++ b/registry-identity/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.57 4.0.0 diff --git a/registry-integration-tests/pom.xml b/registry-integration-tests/pom.xml index f2f627f386..04b2192648 100644 --- a/registry-integration-tests/pom.xml +++ b/registry-integration-tests/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.57 4.0.0 diff --git a/registry-mail/pom.xml b/registry-mail/pom.xml index f6a0dfcfb0..06c3ac006d 100644 --- a/registry-mail/pom.xml +++ b/registry-mail/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.57 4.0.0 diff --git a/registry-messaging/pom.xml b/registry-messaging/pom.xml index 634ac9270e..b993a62133 100644 --- a/registry-messaging/pom.xml +++ b/registry-messaging/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.57 4.0.0 diff --git a/registry-metadata/pom.xml b/registry-metadata/pom.xml index 4a5730151a..e0fbb81908 100644 --- a/registry-metadata/pom.xml +++ b/registry-metadata/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.57 4.0.0 diff --git a/registry-metasync/pom.xml b/registry-metasync/pom.xml index 1c1757afc7..4f5fcec997 100644 --- a/registry-metasync/pom.xml +++ b/registry-metasync/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.57 4.0.0 diff --git a/registry-oaipmh/pom.xml b/registry-oaipmh/pom.xml index 9f56874a81..f468d21e9f 100644 --- a/registry-oaipmh/pom.xml +++ b/registry-oaipmh/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.57 4.0.0 diff --git a/registry-persistence/pom.xml b/registry-persistence/pom.xml index 8c00080cc8..b54768ad19 100644 --- a/registry-persistence/pom.xml +++ b/registry-persistence/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.57 4.0.0 diff --git a/registry-pipelines/pom.xml b/registry-pipelines/pom.xml index 0fd689fadc..6c33e8380b 100644 --- a/registry-pipelines/pom.xml +++ b/registry-pipelines/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.57 4.0.0 diff --git a/registry-search/pom.xml b/registry-search/pom.xml index f78783525f..dc665632ed 100644 --- a/registry-search/pom.xml +++ b/registry-search/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.57 4.0.0 diff --git a/registry-security/pom.xml b/registry-security/pom.xml index 7fb148dc01..7e9f054057 100644 --- a/registry-security/pom.xml +++ b/registry-security/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.57 4.0.0 diff --git a/registry-service/pom.xml b/registry-service/pom.xml index a973045647..b39fbef691 100644 --- a/registry-service/pom.xml +++ b/registry-service/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.57 4.0.0 diff --git a/registry-surety/pom.xml b/registry-surety/pom.xml index b3c6a7f067..6d21d386e4 100644 --- a/registry-surety/pom.xml +++ b/registry-surety/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.57 4.0.0 diff --git a/registry-ws-client/pom.xml b/registry-ws-client/pom.xml index 19f9e1a64a..751946ea29 100644 --- a/registry-ws-client/pom.xml +++ b/registry-ws-client/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.57 4.0.0 diff --git a/registry-ws/pom.xml b/registry-ws/pom.xml index 37bcab70cd..38c9b2f39c 100644 --- a/registry-ws/pom.xml +++ b/registry-ws/pom.xml @@ -4,7 +4,7 @@ org.gbif.registry registry-parent - 3.57-SNAPSHOT + 3.57 registry-ws GBIF Registry Webservices From 7e96a0b66552c2377ed0b369e2984a2eeb61eb3d Mon Sep 17 00:00:00 2001 From: gbif-jenkins Date: Mon, 3 May 2021 15:03:50 +0000 Subject: [PATCH 08/19] [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 | 4 ++-- registry-identity/pom.xml | 2 +- registry-integration-tests/pom.xml | 2 +- registry-mail/pom.xml | 2 +- registry-messaging/pom.xml | 2 +- registry-metadata/pom.xml | 2 +- registry-metasync/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 +- 22 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pom.xml b/pom.xml index 4c245bab99..4ad9f40b91 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.gbif.registry registry-parent - 3.57 + 3.58-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.57 + HEAD diff --git a/registry-cli/pom.xml b/registry-cli/pom.xml index 9e0ea59bdc..2bab2fea8c 100644 --- a/registry-cli/pom.xml +++ b/registry-cli/pom.xml @@ -4,7 +4,7 @@ org.gbif.registry registry-parent - 3.57 + 3.58-SNAPSHOT registry-cli diff --git a/registry-directory/pom.xml b/registry-directory/pom.xml index 52ce0bf5c3..2001bef286 100644 --- a/registry-directory/pom.xml +++ b/registry-directory/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57 + 3.58-SNAPSHOT 4.0.0 diff --git a/registry-doi/pom.xml b/registry-doi/pom.xml index f8d09f398f..be2639a854 100644 --- a/registry-doi/pom.xml +++ b/registry-doi/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57 + 3.58-SNAPSHOT 4.0.0 diff --git a/registry-domain/pom.xml b/registry-domain/pom.xml index e32ed5e5eb..7bfa734914 100644 --- a/registry-domain/pom.xml +++ b/registry-domain/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57 + 3.58-SNAPSHOT 4.0.0 diff --git a/registry-events/pom.xml b/registry-events/pom.xml index d7a95c186e..b292e8a1f9 100644 --- a/registry-events/pom.xml +++ b/registry-events/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57 + 3.58-SNAPSHOT 4.0.0 diff --git a/registry-examples/pom.xml b/registry-examples/pom.xml index 0ca6cd9b4b..258f3a2790 100644 --- a/registry-examples/pom.xml +++ b/registry-examples/pom.xml @@ -3,12 +3,12 @@ registry-parent org.gbif.registry - 3.57 + 3.58-SNAPSHOT 4.0.0 registry-examples - 3.57 + 3.58-SNAPSHOT jar diff --git a/registry-identity/pom.xml b/registry-identity/pom.xml index c6b1aa790b..b60bc3ad22 100644 --- a/registry-identity/pom.xml +++ b/registry-identity/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57 + 3.58-SNAPSHOT 4.0.0 diff --git a/registry-integration-tests/pom.xml b/registry-integration-tests/pom.xml index 04b2192648..a39ed06553 100644 --- a/registry-integration-tests/pom.xml +++ b/registry-integration-tests/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57 + 3.58-SNAPSHOT 4.0.0 diff --git a/registry-mail/pom.xml b/registry-mail/pom.xml index 06c3ac006d..0528f1a66e 100644 --- a/registry-mail/pom.xml +++ b/registry-mail/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57 + 3.58-SNAPSHOT 4.0.0 diff --git a/registry-messaging/pom.xml b/registry-messaging/pom.xml index b993a62133..317646d9a2 100644 --- a/registry-messaging/pom.xml +++ b/registry-messaging/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57 + 3.58-SNAPSHOT 4.0.0 diff --git a/registry-metadata/pom.xml b/registry-metadata/pom.xml index e0fbb81908..d5da61eb7c 100644 --- a/registry-metadata/pom.xml +++ b/registry-metadata/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57 + 3.58-SNAPSHOT 4.0.0 diff --git a/registry-metasync/pom.xml b/registry-metasync/pom.xml index 4f5fcec997..7a68ef4479 100644 --- a/registry-metasync/pom.xml +++ b/registry-metasync/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57 + 3.58-SNAPSHOT 4.0.0 diff --git a/registry-oaipmh/pom.xml b/registry-oaipmh/pom.xml index f468d21e9f..a4215a8a40 100644 --- a/registry-oaipmh/pom.xml +++ b/registry-oaipmh/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57 + 3.58-SNAPSHOT 4.0.0 diff --git a/registry-persistence/pom.xml b/registry-persistence/pom.xml index b54768ad19..95a1a38a1a 100644 --- a/registry-persistence/pom.xml +++ b/registry-persistence/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57 + 3.58-SNAPSHOT 4.0.0 diff --git a/registry-pipelines/pom.xml b/registry-pipelines/pom.xml index 6c33e8380b..33691d7a97 100644 --- a/registry-pipelines/pom.xml +++ b/registry-pipelines/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57 + 3.58-SNAPSHOT 4.0.0 diff --git a/registry-search/pom.xml b/registry-search/pom.xml index dc665632ed..453706b301 100644 --- a/registry-search/pom.xml +++ b/registry-search/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57 + 3.58-SNAPSHOT 4.0.0 diff --git a/registry-security/pom.xml b/registry-security/pom.xml index 7e9f054057..66429dc3f3 100644 --- a/registry-security/pom.xml +++ b/registry-security/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57 + 3.58-SNAPSHOT 4.0.0 diff --git a/registry-service/pom.xml b/registry-service/pom.xml index b39fbef691..c0b311ed0f 100644 --- a/registry-service/pom.xml +++ b/registry-service/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57 + 3.58-SNAPSHOT 4.0.0 diff --git a/registry-surety/pom.xml b/registry-surety/pom.xml index 6d21d386e4..63b38468ec 100644 --- a/registry-surety/pom.xml +++ b/registry-surety/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57 + 3.58-SNAPSHOT 4.0.0 diff --git a/registry-ws-client/pom.xml b/registry-ws-client/pom.xml index 751946ea29..ce33744922 100644 --- a/registry-ws-client/pom.xml +++ b/registry-ws-client/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57 + 3.58-SNAPSHOT 4.0.0 diff --git a/registry-ws/pom.xml b/registry-ws/pom.xml index 38c9b2f39c..e5d81e283e 100644 --- a/registry-ws/pom.xml +++ b/registry-ws/pom.xml @@ -4,7 +4,7 @@ org.gbif.registry registry-parent - 3.57 + 3.58-SNAPSHOT registry-ws GBIF Registry Webservices From c3dacf28318d303011455afea9c6ef8c236a67da Mon Sep 17 00:00:00 2001 From: fmendezh Date: Mon, 3 May 2021 18:08:24 +0200 Subject: [PATCH 09/19] fixing wrong release --- pom.xml | 2 +- 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 | 4 ++-- registry-identity/pom.xml | 2 +- registry-integration-tests/pom.xml | 2 +- registry-mail/pom.xml | 2 +- registry-messaging/pom.xml | 2 +- registry-metadata/pom.xml | 2 +- registry-metasync/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 +- 22 files changed, 23 insertions(+), 23 deletions(-) diff --git a/pom.xml b/pom.xml index 4ad9f40b91..4829e9148d 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.gbif.registry registry-parent - 3.58-SNAPSHOT + 3.56-SNAPSHOT GBIF Registry Parent GBIF Registry project diff --git a/registry-cli/pom.xml b/registry-cli/pom.xml index 2bab2fea8c..70a56de5f7 100644 --- a/registry-cli/pom.xml +++ b/registry-cli/pom.xml @@ -4,7 +4,7 @@ org.gbif.registry registry-parent - 3.58-SNAPSHOT + 3.56-SNAPSHOT registry-cli diff --git a/registry-directory/pom.xml b/registry-directory/pom.xml index 2001bef286..c71a847595 100644 --- a/registry-directory/pom.xml +++ b/registry-directory/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.58-SNAPSHOT + 3.56-SNAPSHOT 4.0.0 diff --git a/registry-doi/pom.xml b/registry-doi/pom.xml index be2639a854..cff2a881d5 100644 --- a/registry-doi/pom.xml +++ b/registry-doi/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.58-SNAPSHOT + 3.56-SNAPSHOT 4.0.0 diff --git a/registry-domain/pom.xml b/registry-domain/pom.xml index 7bfa734914..1efa42b9a3 100644 --- a/registry-domain/pom.xml +++ b/registry-domain/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.58-SNAPSHOT + 3.56-SNAPSHOT 4.0.0 diff --git a/registry-events/pom.xml b/registry-events/pom.xml index b292e8a1f9..b9f6e4f67f 100644 --- a/registry-events/pom.xml +++ b/registry-events/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.58-SNAPSHOT + 3.56-SNAPSHOT 4.0.0 diff --git a/registry-examples/pom.xml b/registry-examples/pom.xml index 258f3a2790..83724abd82 100644 --- a/registry-examples/pom.xml +++ b/registry-examples/pom.xml @@ -3,12 +3,12 @@ registry-parent org.gbif.registry - 3.58-SNAPSHOT + 3.56-SNAPSHOT 4.0.0 registry-examples - 3.58-SNAPSHOT + 3.56-SNAPSHOT jar diff --git a/registry-identity/pom.xml b/registry-identity/pom.xml index b60bc3ad22..ab0e5f8cbf 100644 --- a/registry-identity/pom.xml +++ b/registry-identity/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.58-SNAPSHOT + 3.56-SNAPSHOT 4.0.0 diff --git a/registry-integration-tests/pom.xml b/registry-integration-tests/pom.xml index a39ed06553..786a30b83a 100644 --- a/registry-integration-tests/pom.xml +++ b/registry-integration-tests/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.58-SNAPSHOT + 3.56-SNAPSHOT 4.0.0 diff --git a/registry-mail/pom.xml b/registry-mail/pom.xml index 0528f1a66e..168ec01e6e 100644 --- a/registry-mail/pom.xml +++ b/registry-mail/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.58-SNAPSHOT + 3.56-SNAPSHOT 4.0.0 diff --git a/registry-messaging/pom.xml b/registry-messaging/pom.xml index 317646d9a2..879783a275 100644 --- a/registry-messaging/pom.xml +++ b/registry-messaging/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.58-SNAPSHOT + 3.56-SNAPSHOT 4.0.0 diff --git a/registry-metadata/pom.xml b/registry-metadata/pom.xml index d5da61eb7c..039df5c7cd 100644 --- a/registry-metadata/pom.xml +++ b/registry-metadata/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.58-SNAPSHOT + 3.56-SNAPSHOT 4.0.0 diff --git a/registry-metasync/pom.xml b/registry-metasync/pom.xml index 7a68ef4479..975bd5af47 100644 --- a/registry-metasync/pom.xml +++ b/registry-metasync/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.58-SNAPSHOT + 3.56-SNAPSHOT 4.0.0 diff --git a/registry-oaipmh/pom.xml b/registry-oaipmh/pom.xml index a4215a8a40..17b357580a 100644 --- a/registry-oaipmh/pom.xml +++ b/registry-oaipmh/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.58-SNAPSHOT + 3.56-SNAPSHOT 4.0.0 diff --git a/registry-persistence/pom.xml b/registry-persistence/pom.xml index 95a1a38a1a..19259884bb 100644 --- a/registry-persistence/pom.xml +++ b/registry-persistence/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.58-SNAPSHOT + 3.56-SNAPSHOT 4.0.0 diff --git a/registry-pipelines/pom.xml b/registry-pipelines/pom.xml index 33691d7a97..c488400902 100644 --- a/registry-pipelines/pom.xml +++ b/registry-pipelines/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.58-SNAPSHOT + 3.56-SNAPSHOT 4.0.0 diff --git a/registry-search/pom.xml b/registry-search/pom.xml index 453706b301..12bfa1c00a 100644 --- a/registry-search/pom.xml +++ b/registry-search/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.58-SNAPSHOT + 3.56-SNAPSHOT 4.0.0 diff --git a/registry-security/pom.xml b/registry-security/pom.xml index 66429dc3f3..d857a7027d 100644 --- a/registry-security/pom.xml +++ b/registry-security/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.58-SNAPSHOT + 3.56-SNAPSHOT 4.0.0 diff --git a/registry-service/pom.xml b/registry-service/pom.xml index c0b311ed0f..5512b9bac9 100644 --- a/registry-service/pom.xml +++ b/registry-service/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.58-SNAPSHOT + 3.56-SNAPSHOT 4.0.0 diff --git a/registry-surety/pom.xml b/registry-surety/pom.xml index 63b38468ec..256ad5d5e7 100644 --- a/registry-surety/pom.xml +++ b/registry-surety/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.58-SNAPSHOT + 3.56-SNAPSHOT 4.0.0 diff --git a/registry-ws-client/pom.xml b/registry-ws-client/pom.xml index ce33744922..6bf0090395 100644 --- a/registry-ws-client/pom.xml +++ b/registry-ws-client/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.58-SNAPSHOT + 3.56-SNAPSHOT 4.0.0 diff --git a/registry-ws/pom.xml b/registry-ws/pom.xml index e5d81e283e..b202ab18dc 100644 --- a/registry-ws/pom.xml +++ b/registry-ws/pom.xml @@ -4,7 +4,7 @@ org.gbif.registry registry-parent - 3.58-SNAPSHOT + 3.56-SNAPSHOT registry-ws GBIF Registry Webservices From 47990e8d662509ffe3e069bbf0d3f204b1091a74 Mon Sep 17 00:00:00 2001 From: gbif-jenkins Date: Mon, 3 May 2021 16:36:11 +0000 Subject: [PATCH 10/19] [maven-release-plugin] prepare release registry-parent-3.56 --- 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 | 4 ++-- registry-identity/pom.xml | 2 +- registry-integration-tests/pom.xml | 2 +- registry-mail/pom.xml | 2 +- registry-messaging/pom.xml | 2 +- registry-metadata/pom.xml | 2 +- registry-metasync/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 +- 22 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pom.xml b/pom.xml index 4829e9148d..6f5e2fb2d2 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.gbif.registry registry-parent - 3.56-SNAPSHOT + 3.56 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.56 diff --git a/registry-cli/pom.xml b/registry-cli/pom.xml index 70a56de5f7..87fd14951d 100644 --- a/registry-cli/pom.xml +++ b/registry-cli/pom.xml @@ -4,7 +4,7 @@ org.gbif.registry registry-parent - 3.56-SNAPSHOT + 3.56 registry-cli diff --git a/registry-directory/pom.xml b/registry-directory/pom.xml index c71a847595..475f456588 100644 --- a/registry-directory/pom.xml +++ b/registry-directory/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-doi/pom.xml b/registry-doi/pom.xml index cff2a881d5..79aa40d71a 100644 --- a/registry-doi/pom.xml +++ b/registry-doi/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-domain/pom.xml b/registry-domain/pom.xml index 1efa42b9a3..88dd510fbd 100644 --- a/registry-domain/pom.xml +++ b/registry-domain/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-events/pom.xml b/registry-events/pom.xml index b9f6e4f67f..566e7f05e4 100644 --- a/registry-events/pom.xml +++ b/registry-events/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-examples/pom.xml b/registry-examples/pom.xml index 83724abd82..1ca37060e4 100644 --- a/registry-examples/pom.xml +++ b/registry-examples/pom.xml @@ -3,12 +3,12 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 registry-examples - 3.56-SNAPSHOT + 3.56 jar diff --git a/registry-identity/pom.xml b/registry-identity/pom.xml index ab0e5f8cbf..ad2fc7d281 100644 --- a/registry-identity/pom.xml +++ b/registry-identity/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-integration-tests/pom.xml b/registry-integration-tests/pom.xml index 786a30b83a..604926ca7a 100644 --- a/registry-integration-tests/pom.xml +++ b/registry-integration-tests/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-mail/pom.xml b/registry-mail/pom.xml index 168ec01e6e..ad09f7f1b7 100644 --- a/registry-mail/pom.xml +++ b/registry-mail/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-messaging/pom.xml b/registry-messaging/pom.xml index 879783a275..beca0803c3 100644 --- a/registry-messaging/pom.xml +++ b/registry-messaging/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-metadata/pom.xml b/registry-metadata/pom.xml index 039df5c7cd..afddc8f1a4 100644 --- a/registry-metadata/pom.xml +++ b/registry-metadata/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-metasync/pom.xml b/registry-metasync/pom.xml index 975bd5af47..abddb0083e 100644 --- a/registry-metasync/pom.xml +++ b/registry-metasync/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-oaipmh/pom.xml b/registry-oaipmh/pom.xml index 17b357580a..9178cf1a86 100644 --- a/registry-oaipmh/pom.xml +++ b/registry-oaipmh/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-persistence/pom.xml b/registry-persistence/pom.xml index 19259884bb..5e771cddb0 100644 --- a/registry-persistence/pom.xml +++ b/registry-persistence/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-pipelines/pom.xml b/registry-pipelines/pom.xml index c488400902..8770b598c6 100644 --- a/registry-pipelines/pom.xml +++ b/registry-pipelines/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-search/pom.xml b/registry-search/pom.xml index 12bfa1c00a..834aa112ee 100644 --- a/registry-search/pom.xml +++ b/registry-search/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-security/pom.xml b/registry-security/pom.xml index d857a7027d..3d0b4e6e47 100644 --- a/registry-security/pom.xml +++ b/registry-security/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-service/pom.xml b/registry-service/pom.xml index 5512b9bac9..8d54133ed5 100644 --- a/registry-service/pom.xml +++ b/registry-service/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-surety/pom.xml b/registry-surety/pom.xml index 256ad5d5e7..ce48866a17 100644 --- a/registry-surety/pom.xml +++ b/registry-surety/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-ws-client/pom.xml b/registry-ws-client/pom.xml index 6bf0090395..6be75d15ef 100644 --- a/registry-ws-client/pom.xml +++ b/registry-ws-client/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-ws/pom.xml b/registry-ws/pom.xml index b202ab18dc..2df6dcbc27 100644 --- a/registry-ws/pom.xml +++ b/registry-ws/pom.xml @@ -4,7 +4,7 @@ org.gbif.registry registry-parent - 3.56-SNAPSHOT + 3.56 registry-ws GBIF Registry Webservices From 52fcdac72763a30caa9a64f1c1a5b54b9c1b1d05 Mon Sep 17 00:00:00 2001 From: gbif-jenkins Date: Mon, 3 May 2021 16:36:18 +0000 Subject: [PATCH 11/19] [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 | 4 ++-- registry-identity/pom.xml | 2 +- registry-integration-tests/pom.xml | 2 +- registry-mail/pom.xml | 2 +- registry-messaging/pom.xml | 2 +- registry-metadata/pom.xml | 2 +- registry-metasync/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 +- 22 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pom.xml b/pom.xml index 6f5e2fb2d2..4c525fdfac 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.gbif.registry registry-parent - 3.56 + 3.57-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.56 + HEAD diff --git a/registry-cli/pom.xml b/registry-cli/pom.xml index 87fd14951d..a46b0ed396 100644 --- a/registry-cli/pom.xml +++ b/registry-cli/pom.xml @@ -4,7 +4,7 @@ org.gbif.registry registry-parent - 3.56 + 3.57-SNAPSHOT registry-cli diff --git a/registry-directory/pom.xml b/registry-directory/pom.xml index 475f456588..6a5c95aaf6 100644 --- a/registry-directory/pom.xml +++ b/registry-directory/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-doi/pom.xml b/registry-doi/pom.xml index 79aa40d71a..ca6967c136 100644 --- a/registry-doi/pom.xml +++ b/registry-doi/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-domain/pom.xml b/registry-domain/pom.xml index 88dd510fbd..a63c1763dd 100644 --- a/registry-domain/pom.xml +++ b/registry-domain/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-events/pom.xml b/registry-events/pom.xml index 566e7f05e4..74af14816b 100644 --- a/registry-events/pom.xml +++ b/registry-events/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-examples/pom.xml b/registry-examples/pom.xml index 1ca37060e4..a459a7d090 100644 --- a/registry-examples/pom.xml +++ b/registry-examples/pom.xml @@ -3,12 +3,12 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 registry-examples - 3.56 + 3.57-SNAPSHOT jar diff --git a/registry-identity/pom.xml b/registry-identity/pom.xml index ad2fc7d281..b0c2ce81c5 100644 --- a/registry-identity/pom.xml +++ b/registry-identity/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-integration-tests/pom.xml b/registry-integration-tests/pom.xml index 604926ca7a..f2f627f386 100644 --- a/registry-integration-tests/pom.xml +++ b/registry-integration-tests/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-mail/pom.xml b/registry-mail/pom.xml index ad09f7f1b7..f6a0dfcfb0 100644 --- a/registry-mail/pom.xml +++ b/registry-mail/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-messaging/pom.xml b/registry-messaging/pom.xml index beca0803c3..634ac9270e 100644 --- a/registry-messaging/pom.xml +++ b/registry-messaging/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-metadata/pom.xml b/registry-metadata/pom.xml index afddc8f1a4..4a5730151a 100644 --- a/registry-metadata/pom.xml +++ b/registry-metadata/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-metasync/pom.xml b/registry-metasync/pom.xml index abddb0083e..1c1757afc7 100644 --- a/registry-metasync/pom.xml +++ b/registry-metasync/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-oaipmh/pom.xml b/registry-oaipmh/pom.xml index 9178cf1a86..9f56874a81 100644 --- a/registry-oaipmh/pom.xml +++ b/registry-oaipmh/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-persistence/pom.xml b/registry-persistence/pom.xml index 5e771cddb0..8c00080cc8 100644 --- a/registry-persistence/pom.xml +++ b/registry-persistence/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-pipelines/pom.xml b/registry-pipelines/pom.xml index 8770b598c6..0fd689fadc 100644 --- a/registry-pipelines/pom.xml +++ b/registry-pipelines/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-search/pom.xml b/registry-search/pom.xml index 834aa112ee..f78783525f 100644 --- a/registry-search/pom.xml +++ b/registry-search/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-security/pom.xml b/registry-security/pom.xml index 3d0b4e6e47..7fb148dc01 100644 --- a/registry-security/pom.xml +++ b/registry-security/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-service/pom.xml b/registry-service/pom.xml index 8d54133ed5..a973045647 100644 --- a/registry-service/pom.xml +++ b/registry-service/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-surety/pom.xml b/registry-surety/pom.xml index ce48866a17..b3c6a7f067 100644 --- a/registry-surety/pom.xml +++ b/registry-surety/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-ws-client/pom.xml b/registry-ws-client/pom.xml index 6be75d15ef..19f9e1a64a 100644 --- a/registry-ws-client/pom.xml +++ b/registry-ws-client/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-ws/pom.xml b/registry-ws/pom.xml index 2df6dcbc27..37bcab70cd 100644 --- a/registry-ws/pom.xml +++ b/registry-ws/pom.xml @@ -4,7 +4,7 @@ org.gbif.registry registry-parent - 3.56 + 3.57-SNAPSHOT registry-ws GBIF Registry Webservices From 355ae1c0ee3eaaccb9bd8f47349e22fc5e7a5e27 Mon Sep 17 00:00:00 2001 From: fmendezh Date: Tue, 4 May 2021 08:22:43 +0200 Subject: [PATCH 12/19] fixing wrong release --- pom.xml | 2 +- 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 | 4 ++-- registry-identity/pom.xml | 2 +- registry-integration-tests/pom.xml | 2 +- registry-mail/pom.xml | 2 +- registry-messaging/pom.xml | 2 +- registry-metadata/pom.xml | 2 +- registry-metasync/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 +- 22 files changed, 23 insertions(+), 23 deletions(-) diff --git a/pom.xml b/pom.xml index 4c525fdfac..4829e9148d 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.gbif.registry registry-parent - 3.57-SNAPSHOT + 3.56-SNAPSHOT GBIF Registry Parent GBIF Registry project diff --git a/registry-cli/pom.xml b/registry-cli/pom.xml index a46b0ed396..70a56de5f7 100644 --- a/registry-cli/pom.xml +++ b/registry-cli/pom.xml @@ -4,7 +4,7 @@ org.gbif.registry registry-parent - 3.57-SNAPSHOT + 3.56-SNAPSHOT registry-cli diff --git a/registry-directory/pom.xml b/registry-directory/pom.xml index 6a5c95aaf6..c71a847595 100644 --- a/registry-directory/pom.xml +++ b/registry-directory/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.56-SNAPSHOT 4.0.0 diff --git a/registry-doi/pom.xml b/registry-doi/pom.xml index ca6967c136..cff2a881d5 100644 --- a/registry-doi/pom.xml +++ b/registry-doi/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.56-SNAPSHOT 4.0.0 diff --git a/registry-domain/pom.xml b/registry-domain/pom.xml index a63c1763dd..1efa42b9a3 100644 --- a/registry-domain/pom.xml +++ b/registry-domain/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.56-SNAPSHOT 4.0.0 diff --git a/registry-events/pom.xml b/registry-events/pom.xml index 74af14816b..b9f6e4f67f 100644 --- a/registry-events/pom.xml +++ b/registry-events/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.56-SNAPSHOT 4.0.0 diff --git a/registry-examples/pom.xml b/registry-examples/pom.xml index a459a7d090..83724abd82 100644 --- a/registry-examples/pom.xml +++ b/registry-examples/pom.xml @@ -3,12 +3,12 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.56-SNAPSHOT 4.0.0 registry-examples - 3.57-SNAPSHOT + 3.56-SNAPSHOT jar diff --git a/registry-identity/pom.xml b/registry-identity/pom.xml index b0c2ce81c5..ab0e5f8cbf 100644 --- a/registry-identity/pom.xml +++ b/registry-identity/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.56-SNAPSHOT 4.0.0 diff --git a/registry-integration-tests/pom.xml b/registry-integration-tests/pom.xml index f2f627f386..786a30b83a 100644 --- a/registry-integration-tests/pom.xml +++ b/registry-integration-tests/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.56-SNAPSHOT 4.0.0 diff --git a/registry-mail/pom.xml b/registry-mail/pom.xml index f6a0dfcfb0..168ec01e6e 100644 --- a/registry-mail/pom.xml +++ b/registry-mail/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.56-SNAPSHOT 4.0.0 diff --git a/registry-messaging/pom.xml b/registry-messaging/pom.xml index 634ac9270e..879783a275 100644 --- a/registry-messaging/pom.xml +++ b/registry-messaging/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.56-SNAPSHOT 4.0.0 diff --git a/registry-metadata/pom.xml b/registry-metadata/pom.xml index 4a5730151a..039df5c7cd 100644 --- a/registry-metadata/pom.xml +++ b/registry-metadata/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.56-SNAPSHOT 4.0.0 diff --git a/registry-metasync/pom.xml b/registry-metasync/pom.xml index 1c1757afc7..975bd5af47 100644 --- a/registry-metasync/pom.xml +++ b/registry-metasync/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.56-SNAPSHOT 4.0.0 diff --git a/registry-oaipmh/pom.xml b/registry-oaipmh/pom.xml index 9f56874a81..17b357580a 100644 --- a/registry-oaipmh/pom.xml +++ b/registry-oaipmh/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.56-SNAPSHOT 4.0.0 diff --git a/registry-persistence/pom.xml b/registry-persistence/pom.xml index 8c00080cc8..19259884bb 100644 --- a/registry-persistence/pom.xml +++ b/registry-persistence/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.56-SNAPSHOT 4.0.0 diff --git a/registry-pipelines/pom.xml b/registry-pipelines/pom.xml index 0fd689fadc..c488400902 100644 --- a/registry-pipelines/pom.xml +++ b/registry-pipelines/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.56-SNAPSHOT 4.0.0 diff --git a/registry-search/pom.xml b/registry-search/pom.xml index f78783525f..12bfa1c00a 100644 --- a/registry-search/pom.xml +++ b/registry-search/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.56-SNAPSHOT 4.0.0 diff --git a/registry-security/pom.xml b/registry-security/pom.xml index 7fb148dc01..d857a7027d 100644 --- a/registry-security/pom.xml +++ b/registry-security/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.56-SNAPSHOT 4.0.0 diff --git a/registry-service/pom.xml b/registry-service/pom.xml index a973045647..5512b9bac9 100644 --- a/registry-service/pom.xml +++ b/registry-service/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.56-SNAPSHOT 4.0.0 diff --git a/registry-surety/pom.xml b/registry-surety/pom.xml index b3c6a7f067..256ad5d5e7 100644 --- a/registry-surety/pom.xml +++ b/registry-surety/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.56-SNAPSHOT 4.0.0 diff --git a/registry-ws-client/pom.xml b/registry-ws-client/pom.xml index 19f9e1a64a..6bf0090395 100644 --- a/registry-ws-client/pom.xml +++ b/registry-ws-client/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.56-SNAPSHOT 4.0.0 diff --git a/registry-ws/pom.xml b/registry-ws/pom.xml index 37bcab70cd..b202ab18dc 100644 --- a/registry-ws/pom.xml +++ b/registry-ws/pom.xml @@ -4,7 +4,7 @@ org.gbif.registry registry-parent - 3.57-SNAPSHOT + 3.56-SNAPSHOT registry-ws GBIF Registry Webservices From 83143932afe80b5fb7462209f82e38d18130c484 Mon Sep 17 00:00:00 2001 From: fmendezh Date: Tue, 4 May 2021 08:23:15 +0200 Subject: [PATCH 13/19] using latest motherpom --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4829e9148d..efe89a6fc4 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.gbif motherpom - 51 + 52 org.gbif.registry From c70376c7d2eaed1454ea99a442d33b2392f16f30 Mon Sep 17 00:00:00 2001 From: fmendezh Date: Tue, 4 May 2021 08:49:21 +0200 Subject: [PATCH 14/19] using motherpom 53 which ignores javadoc errors with none --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index efe89a6fc4..cc03ee5977 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.gbif motherpom - 52 + 53 org.gbif.registry From f4724518f6cb78fb15b05bee2a23534415514137 Mon Sep 17 00:00:00 2001 From: gbif-jenkins Date: Tue, 4 May 2021 07:21:44 +0000 Subject: [PATCH 15/19] [maven-release-plugin] prepare release registry-parent-3.56 --- 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 | 4 ++-- registry-identity/pom.xml | 2 +- registry-integration-tests/pom.xml | 2 +- registry-mail/pom.xml | 2 +- registry-messaging/pom.xml | 2 +- registry-metadata/pom.xml | 2 +- registry-metasync/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 +- 22 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pom.xml b/pom.xml index cc03ee5977..213dbb52b5 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.gbif.registry registry-parent - 3.56-SNAPSHOT + 3.56 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.56 diff --git a/registry-cli/pom.xml b/registry-cli/pom.xml index 70a56de5f7..87fd14951d 100644 --- a/registry-cli/pom.xml +++ b/registry-cli/pom.xml @@ -4,7 +4,7 @@ org.gbif.registry registry-parent - 3.56-SNAPSHOT + 3.56 registry-cli diff --git a/registry-directory/pom.xml b/registry-directory/pom.xml index c71a847595..475f456588 100644 --- a/registry-directory/pom.xml +++ b/registry-directory/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-doi/pom.xml b/registry-doi/pom.xml index cff2a881d5..79aa40d71a 100644 --- a/registry-doi/pom.xml +++ b/registry-doi/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-domain/pom.xml b/registry-domain/pom.xml index 1efa42b9a3..88dd510fbd 100644 --- a/registry-domain/pom.xml +++ b/registry-domain/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-events/pom.xml b/registry-events/pom.xml index b9f6e4f67f..566e7f05e4 100644 --- a/registry-events/pom.xml +++ b/registry-events/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-examples/pom.xml b/registry-examples/pom.xml index 83724abd82..1ca37060e4 100644 --- a/registry-examples/pom.xml +++ b/registry-examples/pom.xml @@ -3,12 +3,12 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 registry-examples - 3.56-SNAPSHOT + 3.56 jar diff --git a/registry-identity/pom.xml b/registry-identity/pom.xml index ab0e5f8cbf..ad2fc7d281 100644 --- a/registry-identity/pom.xml +++ b/registry-identity/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-integration-tests/pom.xml b/registry-integration-tests/pom.xml index 786a30b83a..604926ca7a 100644 --- a/registry-integration-tests/pom.xml +++ b/registry-integration-tests/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-mail/pom.xml b/registry-mail/pom.xml index 168ec01e6e..ad09f7f1b7 100644 --- a/registry-mail/pom.xml +++ b/registry-mail/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-messaging/pom.xml b/registry-messaging/pom.xml index 879783a275..beca0803c3 100644 --- a/registry-messaging/pom.xml +++ b/registry-messaging/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-metadata/pom.xml b/registry-metadata/pom.xml index 039df5c7cd..afddc8f1a4 100644 --- a/registry-metadata/pom.xml +++ b/registry-metadata/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-metasync/pom.xml b/registry-metasync/pom.xml index 975bd5af47..abddb0083e 100644 --- a/registry-metasync/pom.xml +++ b/registry-metasync/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-oaipmh/pom.xml b/registry-oaipmh/pom.xml index 17b357580a..9178cf1a86 100644 --- a/registry-oaipmh/pom.xml +++ b/registry-oaipmh/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-persistence/pom.xml b/registry-persistence/pom.xml index 19259884bb..5e771cddb0 100644 --- a/registry-persistence/pom.xml +++ b/registry-persistence/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-pipelines/pom.xml b/registry-pipelines/pom.xml index c488400902..8770b598c6 100644 --- a/registry-pipelines/pom.xml +++ b/registry-pipelines/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-search/pom.xml b/registry-search/pom.xml index 12bfa1c00a..834aa112ee 100644 --- a/registry-search/pom.xml +++ b/registry-search/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-security/pom.xml b/registry-security/pom.xml index d857a7027d..3d0b4e6e47 100644 --- a/registry-security/pom.xml +++ b/registry-security/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-service/pom.xml b/registry-service/pom.xml index 5512b9bac9..8d54133ed5 100644 --- a/registry-service/pom.xml +++ b/registry-service/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-surety/pom.xml b/registry-surety/pom.xml index 256ad5d5e7..ce48866a17 100644 --- a/registry-surety/pom.xml +++ b/registry-surety/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-ws-client/pom.xml b/registry-ws-client/pom.xml index 6bf0090395..6be75d15ef 100644 --- a/registry-ws-client/pom.xml +++ b/registry-ws-client/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56-SNAPSHOT + 3.56 4.0.0 diff --git a/registry-ws/pom.xml b/registry-ws/pom.xml index b202ab18dc..2df6dcbc27 100644 --- a/registry-ws/pom.xml +++ b/registry-ws/pom.xml @@ -4,7 +4,7 @@ org.gbif.registry registry-parent - 3.56-SNAPSHOT + 3.56 registry-ws GBIF Registry Webservices From 3f1775d755ff9aba0a83f6dfac5f838b7c70c19c Mon Sep 17 00:00:00 2001 From: gbif-jenkins Date: Tue, 4 May 2021 07:21:50 +0000 Subject: [PATCH 16/19] [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 | 4 ++-- registry-identity/pom.xml | 2 +- registry-integration-tests/pom.xml | 2 +- registry-mail/pom.xml | 2 +- registry-messaging/pom.xml | 2 +- registry-metadata/pom.xml | 2 +- registry-metasync/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 +- 22 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pom.xml b/pom.xml index 213dbb52b5..4fd3ad3d8a 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.gbif.registry registry-parent - 3.56 + 3.57-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.56 + HEAD diff --git a/registry-cli/pom.xml b/registry-cli/pom.xml index 87fd14951d..a46b0ed396 100644 --- a/registry-cli/pom.xml +++ b/registry-cli/pom.xml @@ -4,7 +4,7 @@ org.gbif.registry registry-parent - 3.56 + 3.57-SNAPSHOT registry-cli diff --git a/registry-directory/pom.xml b/registry-directory/pom.xml index 475f456588..6a5c95aaf6 100644 --- a/registry-directory/pom.xml +++ b/registry-directory/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-doi/pom.xml b/registry-doi/pom.xml index 79aa40d71a..ca6967c136 100644 --- a/registry-doi/pom.xml +++ b/registry-doi/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-domain/pom.xml b/registry-domain/pom.xml index 88dd510fbd..a63c1763dd 100644 --- a/registry-domain/pom.xml +++ b/registry-domain/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-events/pom.xml b/registry-events/pom.xml index 566e7f05e4..74af14816b 100644 --- a/registry-events/pom.xml +++ b/registry-events/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-examples/pom.xml b/registry-examples/pom.xml index 1ca37060e4..a459a7d090 100644 --- a/registry-examples/pom.xml +++ b/registry-examples/pom.xml @@ -3,12 +3,12 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 registry-examples - 3.56 + 3.57-SNAPSHOT jar diff --git a/registry-identity/pom.xml b/registry-identity/pom.xml index ad2fc7d281..b0c2ce81c5 100644 --- a/registry-identity/pom.xml +++ b/registry-identity/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-integration-tests/pom.xml b/registry-integration-tests/pom.xml index 604926ca7a..f2f627f386 100644 --- a/registry-integration-tests/pom.xml +++ b/registry-integration-tests/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-mail/pom.xml b/registry-mail/pom.xml index ad09f7f1b7..f6a0dfcfb0 100644 --- a/registry-mail/pom.xml +++ b/registry-mail/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-messaging/pom.xml b/registry-messaging/pom.xml index beca0803c3..634ac9270e 100644 --- a/registry-messaging/pom.xml +++ b/registry-messaging/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-metadata/pom.xml b/registry-metadata/pom.xml index afddc8f1a4..4a5730151a 100644 --- a/registry-metadata/pom.xml +++ b/registry-metadata/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-metasync/pom.xml b/registry-metasync/pom.xml index abddb0083e..1c1757afc7 100644 --- a/registry-metasync/pom.xml +++ b/registry-metasync/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-oaipmh/pom.xml b/registry-oaipmh/pom.xml index 9178cf1a86..9f56874a81 100644 --- a/registry-oaipmh/pom.xml +++ b/registry-oaipmh/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-persistence/pom.xml b/registry-persistence/pom.xml index 5e771cddb0..8c00080cc8 100644 --- a/registry-persistence/pom.xml +++ b/registry-persistence/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-pipelines/pom.xml b/registry-pipelines/pom.xml index 8770b598c6..0fd689fadc 100644 --- a/registry-pipelines/pom.xml +++ b/registry-pipelines/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-search/pom.xml b/registry-search/pom.xml index 834aa112ee..f78783525f 100644 --- a/registry-search/pom.xml +++ b/registry-search/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-security/pom.xml b/registry-security/pom.xml index 3d0b4e6e47..7fb148dc01 100644 --- a/registry-security/pom.xml +++ b/registry-security/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-service/pom.xml b/registry-service/pom.xml index 8d54133ed5..a973045647 100644 --- a/registry-service/pom.xml +++ b/registry-service/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-surety/pom.xml b/registry-surety/pom.xml index ce48866a17..b3c6a7f067 100644 --- a/registry-surety/pom.xml +++ b/registry-surety/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-ws-client/pom.xml b/registry-ws-client/pom.xml index 6be75d15ef..19f9e1a64a 100644 --- a/registry-ws-client/pom.xml +++ b/registry-ws-client/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.56 + 3.57-SNAPSHOT 4.0.0 diff --git a/registry-ws/pom.xml b/registry-ws/pom.xml index 2df6dcbc27..37bcab70cd 100644 --- a/registry-ws/pom.xml +++ b/registry-ws/pom.xml @@ -4,7 +4,7 @@ org.gbif.registry registry-parent - 3.56 + 3.57-SNAPSHOT registry-ws GBIF Registry Webservices From 6fe4daaed910871fa0c58c7fafee7b119a2b45ae Mon Sep 17 00:00:00 2001 From: fmendezh Date: Tue, 4 May 2021 13:05:03 +0200 Subject: [PATCH 17/19] =?UTF-8?q?dataDescriptions=20indexing=20failed=20wi?= =?UTF-8?q?th=20[ElasticsearchException[Elasticsearch=20exception=20[type?= =?UTF-8?q?=3Dmapper=5Fparsing=5Fexception,=20reason=3Dfailed=20to=20parse?= =?UTF-8?q?=20field=20[dataDescriptions.formatVersion]=20of=20type=20[date?= =?UTF-8?q?]=20in=20document=20with=20id=20'10cb9850-c9ca-4cc1-a041-a43cf6?= =?UTF-8?q?634d36'.=20Preview=20of=20field's=20value:=20'Versi=C3=B3n=201?= =?UTF-8?q?=20(2015-09-27)']];=20nested:=20ElasticsearchException[Elastics?= =?UTF-8?q?earch=20exception=20[type=3Dillegal=5Fargument=5Fexception,=20r?= =?UTF-8?q?eason=3Dfailed=20to=20parse=20date=20field=20[Versi=C3=B3n=201?= =?UTF-8?q?=20(2015-09-27)]=20with=20format=20[strict=5Fdate=5Foptional=5F?= =?UTF-8?q?time||epoch=5Fmillis]]]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- registry-search/src/main/resources/dataset-es-mapping.json | 1 - 1 file changed, 1 deletion(-) diff --git a/registry-search/src/main/resources/dataset-es-mapping.json b/registry-search/src/main/resources/dataset-es-mapping.json index 6ba04a1020..852217e28e 100644 --- a/registry-search/src/main/resources/dataset-es-mapping.json +++ b/registry-search/src/main/resources/dataset-es-mapping.json @@ -68,7 +68,6 @@ { "dataDescriptions": { "path_match": "dataDescriptions.*", - "match_mapping_type": "string", "mapping": { "type": "keyword", "copy_to": "all" From 6b42d84c7f19c571f4f899c498d1f3a089d330c9 Mon Sep 17 00:00:00 2001 From: gbif-jenkins Date: Tue, 4 May 2021 11:50:19 +0000 Subject: [PATCH 18/19] [maven-release-plugin] prepare release registry-parent-3.57 --- 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 | 4 ++-- registry-identity/pom.xml | 2 +- registry-integration-tests/pom.xml | 2 +- registry-mail/pom.xml | 2 +- registry-messaging/pom.xml | 2 +- registry-metadata/pom.xml | 2 +- registry-metasync/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 +- 22 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pom.xml b/pom.xml index 4fd3ad3d8a..26b90c21bb 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.gbif.registry registry-parent - 3.57-SNAPSHOT + 3.57 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.57 diff --git a/registry-cli/pom.xml b/registry-cli/pom.xml index a46b0ed396..9e0ea59bdc 100644 --- a/registry-cli/pom.xml +++ b/registry-cli/pom.xml @@ -4,7 +4,7 @@ org.gbif.registry registry-parent - 3.57-SNAPSHOT + 3.57 registry-cli diff --git a/registry-directory/pom.xml b/registry-directory/pom.xml index 6a5c95aaf6..52ce0bf5c3 100644 --- a/registry-directory/pom.xml +++ b/registry-directory/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.57 4.0.0 diff --git a/registry-doi/pom.xml b/registry-doi/pom.xml index ca6967c136..f8d09f398f 100644 --- a/registry-doi/pom.xml +++ b/registry-doi/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.57 4.0.0 diff --git a/registry-domain/pom.xml b/registry-domain/pom.xml index a63c1763dd..e32ed5e5eb 100644 --- a/registry-domain/pom.xml +++ b/registry-domain/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.57 4.0.0 diff --git a/registry-events/pom.xml b/registry-events/pom.xml index 74af14816b..d7a95c186e 100644 --- a/registry-events/pom.xml +++ b/registry-events/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.57 4.0.0 diff --git a/registry-examples/pom.xml b/registry-examples/pom.xml index a459a7d090..0ca6cd9b4b 100644 --- a/registry-examples/pom.xml +++ b/registry-examples/pom.xml @@ -3,12 +3,12 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.57 4.0.0 registry-examples - 3.57-SNAPSHOT + 3.57 jar diff --git a/registry-identity/pom.xml b/registry-identity/pom.xml index b0c2ce81c5..c6b1aa790b 100644 --- a/registry-identity/pom.xml +++ b/registry-identity/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.57 4.0.0 diff --git a/registry-integration-tests/pom.xml b/registry-integration-tests/pom.xml index f2f627f386..04b2192648 100644 --- a/registry-integration-tests/pom.xml +++ b/registry-integration-tests/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.57 4.0.0 diff --git a/registry-mail/pom.xml b/registry-mail/pom.xml index f6a0dfcfb0..06c3ac006d 100644 --- a/registry-mail/pom.xml +++ b/registry-mail/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.57 4.0.0 diff --git a/registry-messaging/pom.xml b/registry-messaging/pom.xml index 634ac9270e..b993a62133 100644 --- a/registry-messaging/pom.xml +++ b/registry-messaging/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.57 4.0.0 diff --git a/registry-metadata/pom.xml b/registry-metadata/pom.xml index 4a5730151a..e0fbb81908 100644 --- a/registry-metadata/pom.xml +++ b/registry-metadata/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.57 4.0.0 diff --git a/registry-metasync/pom.xml b/registry-metasync/pom.xml index 1c1757afc7..4f5fcec997 100644 --- a/registry-metasync/pom.xml +++ b/registry-metasync/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.57 4.0.0 diff --git a/registry-oaipmh/pom.xml b/registry-oaipmh/pom.xml index 9f56874a81..f468d21e9f 100644 --- a/registry-oaipmh/pom.xml +++ b/registry-oaipmh/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.57 4.0.0 diff --git a/registry-persistence/pom.xml b/registry-persistence/pom.xml index 8c00080cc8..b54768ad19 100644 --- a/registry-persistence/pom.xml +++ b/registry-persistence/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.57 4.0.0 diff --git a/registry-pipelines/pom.xml b/registry-pipelines/pom.xml index 0fd689fadc..6c33e8380b 100644 --- a/registry-pipelines/pom.xml +++ b/registry-pipelines/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.57 4.0.0 diff --git a/registry-search/pom.xml b/registry-search/pom.xml index f78783525f..dc665632ed 100644 --- a/registry-search/pom.xml +++ b/registry-search/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.57 4.0.0 diff --git a/registry-security/pom.xml b/registry-security/pom.xml index 7fb148dc01..7e9f054057 100644 --- a/registry-security/pom.xml +++ b/registry-security/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.57 4.0.0 diff --git a/registry-service/pom.xml b/registry-service/pom.xml index a973045647..b39fbef691 100644 --- a/registry-service/pom.xml +++ b/registry-service/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.57 4.0.0 diff --git a/registry-surety/pom.xml b/registry-surety/pom.xml index b3c6a7f067..6d21d386e4 100644 --- a/registry-surety/pom.xml +++ b/registry-surety/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.57 4.0.0 diff --git a/registry-ws-client/pom.xml b/registry-ws-client/pom.xml index 19f9e1a64a..751946ea29 100644 --- a/registry-ws-client/pom.xml +++ b/registry-ws-client/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57-SNAPSHOT + 3.57 4.0.0 diff --git a/registry-ws/pom.xml b/registry-ws/pom.xml index 37bcab70cd..38c9b2f39c 100644 --- a/registry-ws/pom.xml +++ b/registry-ws/pom.xml @@ -4,7 +4,7 @@ org.gbif.registry registry-parent - 3.57-SNAPSHOT + 3.57 registry-ws GBIF Registry Webservices From 1f194473e51f4c1f6e5b859adc6aa7766bd41efe Mon Sep 17 00:00:00 2001 From: gbif-jenkins Date: Tue, 4 May 2021 11:50:25 +0000 Subject: [PATCH 19/19] [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 | 4 ++-- registry-identity/pom.xml | 2 +- registry-integration-tests/pom.xml | 2 +- registry-mail/pom.xml | 2 +- registry-messaging/pom.xml | 2 +- registry-metadata/pom.xml | 2 +- registry-metasync/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 +- 22 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pom.xml b/pom.xml index 26b90c21bb..8b9cb1fdfb 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.gbif.registry registry-parent - 3.57 + 3.58-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.57 + HEAD diff --git a/registry-cli/pom.xml b/registry-cli/pom.xml index 9e0ea59bdc..2bab2fea8c 100644 --- a/registry-cli/pom.xml +++ b/registry-cli/pom.xml @@ -4,7 +4,7 @@ org.gbif.registry registry-parent - 3.57 + 3.58-SNAPSHOT registry-cli diff --git a/registry-directory/pom.xml b/registry-directory/pom.xml index 52ce0bf5c3..2001bef286 100644 --- a/registry-directory/pom.xml +++ b/registry-directory/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57 + 3.58-SNAPSHOT 4.0.0 diff --git a/registry-doi/pom.xml b/registry-doi/pom.xml index f8d09f398f..be2639a854 100644 --- a/registry-doi/pom.xml +++ b/registry-doi/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57 + 3.58-SNAPSHOT 4.0.0 diff --git a/registry-domain/pom.xml b/registry-domain/pom.xml index e32ed5e5eb..7bfa734914 100644 --- a/registry-domain/pom.xml +++ b/registry-domain/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57 + 3.58-SNAPSHOT 4.0.0 diff --git a/registry-events/pom.xml b/registry-events/pom.xml index d7a95c186e..b292e8a1f9 100644 --- a/registry-events/pom.xml +++ b/registry-events/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57 + 3.58-SNAPSHOT 4.0.0 diff --git a/registry-examples/pom.xml b/registry-examples/pom.xml index 0ca6cd9b4b..258f3a2790 100644 --- a/registry-examples/pom.xml +++ b/registry-examples/pom.xml @@ -3,12 +3,12 @@ registry-parent org.gbif.registry - 3.57 + 3.58-SNAPSHOT 4.0.0 registry-examples - 3.57 + 3.58-SNAPSHOT jar diff --git a/registry-identity/pom.xml b/registry-identity/pom.xml index c6b1aa790b..b60bc3ad22 100644 --- a/registry-identity/pom.xml +++ b/registry-identity/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57 + 3.58-SNAPSHOT 4.0.0 diff --git a/registry-integration-tests/pom.xml b/registry-integration-tests/pom.xml index 04b2192648..a39ed06553 100644 --- a/registry-integration-tests/pom.xml +++ b/registry-integration-tests/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57 + 3.58-SNAPSHOT 4.0.0 diff --git a/registry-mail/pom.xml b/registry-mail/pom.xml index 06c3ac006d..0528f1a66e 100644 --- a/registry-mail/pom.xml +++ b/registry-mail/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57 + 3.58-SNAPSHOT 4.0.0 diff --git a/registry-messaging/pom.xml b/registry-messaging/pom.xml index b993a62133..317646d9a2 100644 --- a/registry-messaging/pom.xml +++ b/registry-messaging/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57 + 3.58-SNAPSHOT 4.0.0 diff --git a/registry-metadata/pom.xml b/registry-metadata/pom.xml index e0fbb81908..d5da61eb7c 100644 --- a/registry-metadata/pom.xml +++ b/registry-metadata/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57 + 3.58-SNAPSHOT 4.0.0 diff --git a/registry-metasync/pom.xml b/registry-metasync/pom.xml index 4f5fcec997..7a68ef4479 100644 --- a/registry-metasync/pom.xml +++ b/registry-metasync/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57 + 3.58-SNAPSHOT 4.0.0 diff --git a/registry-oaipmh/pom.xml b/registry-oaipmh/pom.xml index f468d21e9f..a4215a8a40 100644 --- a/registry-oaipmh/pom.xml +++ b/registry-oaipmh/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57 + 3.58-SNAPSHOT 4.0.0 diff --git a/registry-persistence/pom.xml b/registry-persistence/pom.xml index b54768ad19..95a1a38a1a 100644 --- a/registry-persistence/pom.xml +++ b/registry-persistence/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57 + 3.58-SNAPSHOT 4.0.0 diff --git a/registry-pipelines/pom.xml b/registry-pipelines/pom.xml index 6c33e8380b..33691d7a97 100644 --- a/registry-pipelines/pom.xml +++ b/registry-pipelines/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57 + 3.58-SNAPSHOT 4.0.0 diff --git a/registry-search/pom.xml b/registry-search/pom.xml index dc665632ed..453706b301 100644 --- a/registry-search/pom.xml +++ b/registry-search/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57 + 3.58-SNAPSHOT 4.0.0 diff --git a/registry-security/pom.xml b/registry-security/pom.xml index 7e9f054057..66429dc3f3 100644 --- a/registry-security/pom.xml +++ b/registry-security/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57 + 3.58-SNAPSHOT 4.0.0 diff --git a/registry-service/pom.xml b/registry-service/pom.xml index b39fbef691..c0b311ed0f 100644 --- a/registry-service/pom.xml +++ b/registry-service/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57 + 3.58-SNAPSHOT 4.0.0 diff --git a/registry-surety/pom.xml b/registry-surety/pom.xml index 6d21d386e4..63b38468ec 100644 --- a/registry-surety/pom.xml +++ b/registry-surety/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57 + 3.58-SNAPSHOT 4.0.0 diff --git a/registry-ws-client/pom.xml b/registry-ws-client/pom.xml index 751946ea29..ce33744922 100644 --- a/registry-ws-client/pom.xml +++ b/registry-ws-client/pom.xml @@ -3,7 +3,7 @@ registry-parent org.gbif.registry - 3.57 + 3.58-SNAPSHOT 4.0.0 diff --git a/registry-ws/pom.xml b/registry-ws/pom.xml index 38c9b2f39c..e5d81e283e 100644 --- a/registry-ws/pom.xml +++ b/registry-ws/pom.xml @@ -4,7 +4,7 @@ org.gbif.registry registry-parent - 3.57 + 3.58-SNAPSHOT registry-ws GBIF Registry Webservices