From 725a554546499a6a86083a5c0e83f39823ffdf0b Mon Sep 17 00:00:00 2001 From: Thorsten Date: Fri, 20 Mar 2026 15:13:27 +0100 Subject: [PATCH] Migrate to Jakarta EE / Java 21 compatibility MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Replace javax.xml.bind with jakarta.xml.bind across all Java source files, XSD/XJB binding files, and Maven POMs. Upgrade the entire JAXB toolchain: - javax.xml.bind:jaxb-api → jakarta.xml.bind:jakarta.xml.bind-api 4.0.0 - com.sun.xml.bind → org.glassfish.jaxb (jaxb-core, jaxb-runtime) 4.0.0 - maven-hyperjaxb3-plugin 0.6.0 → org.jvnet.jaxb:hyperjaxb3-maven-plugin 4.0.12 - maven-jaxb2-plugin 0.13.3 → org.jvnet.jaxb:jaxb-maven-plugin 4.0.12 - jaxb2-basics 0.6.2 → org.jvnet.jaxb:jaxb-plugins/jaxb-plugins-runtime 4.0.12 - javax.persistence:persistence-api → jakarta.persistence:jakarta.persistence-api 3.1.0 - Update all JAXB namespace URIs in XSD/XJB files to jakarta.ee equivalents - Add MAVEN_OPTS --add-opens for Java module system compatibility Co-Authored-By: Claude Sonnet 4.6 --- pom.xml | 32 +++++++-------- .../test/CollectionSpaceIntegrationTest.java | 4 +- .../test/RelationIntegrationTest.java | 4 +- .../xmlreplay/batch/batch-create-Template.xml | 4 +- services/JaxRsServiceProvider/pom.xml | 14 +++---- .../main/resources/META-INF/persistence.xml | 8 ++-- .../test/CollectionSpacePerformanceTest.java | 4 +- .../test/resources/META-INF/persistence.xml | 4 +- services/account/jaxb/pom.xml | 14 +++---- .../src/main/resources/accounts_common.xsd | 8 ++-- .../main/resources/accounts_common_list.xsd | 8 ++-- .../jaxb/src/main/resources/bindings.xml | 20 ++-------- .../jaxb/src/main/resources/instance1.xml | 6 +-- services/account/pstore/pom.xml | 2 +- .../test/resources/META-INF/persistence.xml | 4 +- .../services/account/AccountResource.java | 2 +- services/acquisition/jaxb/pom.xml | 4 +- .../main/resources/acquisitions_common.xsd | 4 +- services/advancedsearch/jaxb/pom.xml | 4 +- .../main/resources/advanced-search_common.xsd | 4 +- .../advancedsearch/AdvancedSearch.java | 4 +- .../AdvancedSearchJAXBContext.java | 4 +- .../mapper/CollectionObjectMapper.java | 4 +- .../test/resources/META-INF/persistence.xml | 4 +- services/authentication/jaxb/pom.xml | 14 +++---- .../authentication_identity_provider.xsd | 6 +-- .../test/resources/META-INF/persistence.xml | 4 +- .../test/resources/META-INF/persistence.xml | 4 +- services/authority/jaxb/pom.xml | 2 +- services/authority/pom.xml | 4 +- services/authority/service/pom.xml | 6 +-- .../importer/AuthorizationGen.java | 4 +- .../importer/AuthorizationSeed.java | 4 +- .../main/resources/META-INF/persistence.xml | 4 +- services/authorization-mgt/jaxb/pom.xml | 14 +++---- services/authorization-mgt/service/pom.xml | 4 +- .../storage/PermissionValidatorHandler.java | 2 +- services/authorization/jaxb/pom.xml | 30 +++++++------- .../main/resources/accounts_permissions.xsd | 8 ++-- .../src/main/resources/accounts_roles.xsd | 8 ++-- .../main/resources/authorization_common.xsd | 8 ++-- .../jaxb/src/main/resources/bindings.xjb | 10 ++--- .../src/main/resources/permissions_roles.xsd | 8 ++-- .../jaxb/src/main/resources/roles.xsd | 8 ++-- .../jaxb/src/main/resources/roles_list.xsd | 8 ++-- .../test/resources/META-INF/persistence.xml | 4 +- .../schemas/batch_common-template.xml | 2 +- services/batch/jaxb/pom.xml | 4 +- .../main/resources/batch_common-template.xml | 2 +- .../jaxb/src/main/resources/batch_common.xsd | 4 +- .../jaxb/src/main/resources/instance1.xml | 2 +- services/blob/jaxb/pom.xml | 4 +- services/chronology/jaxb/pom.xml | 4 +- .../src/main/resources/chronology_common.xsd | 4 +- .../resources/chronologyauthority_common.xsd | 4 +- services/citation/jaxb/pom.xml | 4 +- .../src/main/resources/citation_common.xsd | 4 +- .../resources/citationauthority_common.xsd | 4 +- services/claim/jaxb/pom.xml | 4 +- .../jaxb/src/main/resources/claims-common.xsd | 4 +- services/client/pom.xml | 2 +- .../client/AbstractServiceClientImpl.java | 2 +- .../client/CollectionSpaceClientUtils.java | 8 ++-- .../services/client/PoxPayload.java | 8 ++-- .../services/client/test/BaseServiceTest.java | 12 +++--- services/collectionobject/jaxb/pom.xml | 4 +- .../resources/collectionobjects_common.xsd | 4 +- .../resources/collectionobjects_nagpra.xsd | 4 +- .../collectionobjects_naturalhistory.xsd | 4 +- services/common-api/pom.xml | 5 +++ .../services/common/api/FileTools.java | 4 +- services/common/pom.xml | 12 +++--- .../services/common/document/JaxbUtils.java | 12 +++--- .../client/handler/CSDocumentModelList.java | 6 +-- .../nuxeo/client/java/CommonList.java | 8 ++-- .../nuxeo/client/java/ObjectFactory.java | 2 +- .../java/RemoteDocumentModelHandlerImpl.java | 2 +- .../nuxeo/client/java/package-info.java | 2 +- .../common/test/AbstractSecurityTestBase.java | 2 +- .../common/test/SecurityUtilsTest.java | 2 +- services/concept/jaxb/pom.xml | 4 +- .../src/main/resources/concept_common.xsd | 4 +- .../resources/conceptauthority_common.xsd | 4 +- services/conditioncheck/jaxb/pom.xml | 4 +- .../main/resources/conditionchecks-common.xsd | 4 +- services/config/pom.xml | 18 ++++----- .../config/AbstractConfigReaderImpl.java | 6 +-- .../config/ServicesConfigReaderImplTest.java | 2 +- services/conservation/jaxb/pom.xml | 4 +- .../main/resources/conservation-common.xsd | 4 +- services/consultation/jaxb/pom.xml | 4 +- .../main/resources/consultations_common.xsd | 4 +- services/contact/jaxb/pom.xml | 4 +- .../src/main/resources/contacts-common.xsd | 4 +- services/deaccession/jaxb/pom.xml | 4 +- .../main/resources/deaccessions_common.xsd | 4 +- services/dimension/jaxb/pom.xml | 4 +- .../src/main/resources/dimensions-common.xsd | 2 +- services/dutyofcare/jaxb/pom.xml | 4 +- .../main/resources/dutiesofcare_common.xsd | 4 +- services/exhibition/jaxb/pom.xml | 4 +- .../src/main/resources/exhibitions-common.xsd | 4 +- services/exit/jaxb/pom.xml | 4 +- .../jaxb/src/main/resources/exits_common.xsd | 4 +- services/export/jaxb/pom.xml | 4 +- .../src/main/resources/exports-common.xsd | 4 +- services/group/jaxb/pom.xml | 4 +- .../jaxb/src/main/resources/groups_common.xsd | 4 +- services/heldintrust/jaxb/pom.xml | 4 +- .../main/resources/heldintrusts_common.xsd | 4 +- services/hyperjaxb/pom.xml | 22 +++++------ .../hyperjaxb/src/main/resources/bindings.xjb | 6 +-- .../src/main/resources/permissions.xsd | 8 ++-- .../src/main/resources/permissions_list.xsd | 8 ++-- services/id/jaxb/pom.xml | 8 ++-- services/imports/jaxb/pom.xml | 4 +- .../src/main/resources/imports_common.xsd | 4 +- services/index/jaxb/pom.xml | 4 +- .../jaxb/src/main/resources/index-common.xsd | 4 +- services/insurance/jaxb/pom.xml | 4 +- .../src/main/resources/insurances_common.xsd | 4 +- services/intake/jaxb/pom.xml | 4 +- .../src/main/resources/intakes-common.xsd | 4 +- services/iterationreport/jaxb/pom.xml | 4 +- .../resources/iterationreports_common.xsd | 4 +- services/jaxb/pom.xml | 10 ++--- .../jaxb/src/main/resources/authorityref.xsd | 4 +- .../src/main/resources/authorityrefdocs.xsd | 4 +- services/jaxb/src/main/resources/bindings.xml | 20 ++-------- .../jaxb/src/main/resources/blobs_common.xsd | 4 +- .../main/resources/collectionspace_core.xsd | 4 +- .../jaxb/src/main/resources/index_common.xsd | 4 +- .../src/main/resources/invocationContext.xsd | 2 +- .../src/main/resources/invocationResults.xsd | 4 +- .../jaxb/src/main/resources/lifecycle.xsd | 4 +- .../src/main/resources/relations_common.xsd | 4 +- .../main/resources/service_description.xsd | 4 +- .../src/main/resources/workflow_common.xsd | 4 +- services/loanin/jaxb/pom.xml | 4 +- .../src/main/resources/loansin-common.xsd | 4 +- services/loanout/jaxb/pom.xml | 4 +- .../src/main/resources/loansout-common.xsd | 4 +- services/location/jaxb/pom.xml | 4 +- .../src/main/resources/location_common.xsd | 4 +- .../resources/locationauthority_common.xsd | 4 +- services/material/jaxb/pom.xml | 8 ++-- .../src/main/resources/material_common.xsd | 4 +- .../resources/materialauthority_common.xsd | 4 +- services/media/jaxb/pom.xml | 4 +- .../jaxb/src/main/resources/media_common.xsd | 4 +- services/movement/jaxb/pom.xml | 4 +- .../src/main/resources/movements-common.xsd | 4 +- services/nagpra-jaxb/pom.xml | 8 +++- .../src/main/resources/nagpra_common.xsd | 4 +- services/nagprainventory/jaxb/pom.xml | 4 +- .../main/resources/nagprainventory_common.xsd | 4 +- services/note/jaxb/pom.xml | 4 +- .../jaxb/src/main/resources/notes-common.xsd | 2 +- services/objectexit/jaxb/pom.xml | 4 +- .../src/main/resources/objectexit_common.xsd | 4 +- services/organization/jaxb/pom.xml | 4 +- .../main/resources/organization_common.xsd | 4 +- .../main/resources/orgauthority_common.xsd | 4 +- services/osteology/jaxb/pom.xml | 4 +- .../src/main/resources/osteology-common.xsd | 4 +- services/person/jaxb/pom.xml | 4 +- .../jaxb/src/main/resources/person_common.xsd | 4 +- .../main/resources/personauthority_common.xsd | 4 +- services/place/jaxb/pom.xml | 6 +-- .../jaxb/src/main/resources/place_common.xsd | 4 +- .../main/resources/placeauthority_common.xsd | 4 +- services/pom.xml | 39 +++++-------------- services/pottag/jaxb/pom.xml | 4 +- .../src/main/resources/pottags-common.xsd | 4 +- services/propagation/jaxb/pom.xml | 4 +- .../main/resources/propagations-common.xsd | 4 +- services/publicitem/jaxb/pom.xml | 4 +- .../src/main/resources/publicitems-common.xsd | 2 +- services/repatriationrequest/jaxb/pom.xml | 4 +- .../resources/repatriationrequests_common.xsd | 4 +- services/report/jaxb/pom.xml | 4 +- .../src/main/resources/reports-common.xsd | 4 +- .../main/resources/reports-output-mime.xsd | 4 +- services/restrictedmedia/jaxb/pom.xml | 4 +- .../main/resources/restrictedmedia_common.xsd | 4 +- .../test/resources/META-INF/persistence.xml | 4 +- services/servicegroup/jaxb/pom.xml | 4 +- .../main/resources/servicegroup_common.xsd | 4 +- services/structureddate/jaxb/pom.xml | 4 +- .../main/resources/structureddate-common.xsd | 4 +- services/summarydocumentation/jaxb/pom.xml | 4 +- .../summarydocumentations_common.xsd | 4 +- services/systeminfo/jaxb/pom.xml | 4 +- .../src/main/resources/systeminfo-common.xsd | 4 +- services/taxonomy/jaxb/pom.xml | 4 +- .../jaxb/src/main/resources/taxon_common.xsd | 4 +- .../resources/taxonomyauthority_common.xsd | 4 +- services/transport/jaxb/pom.xml | 4 +- .../src/main/resources/transports-common.xsd | 4 +- services/uoc/jaxb/pom.xml | 4 +- .../jaxb/src/main/resources/uoc-common.xsd | 4 +- services/valuationcontrol/jaxb/pom.xml | 4 +- .../resources/Valuationcontrols-common.xsd | 4 +- services/vocabulary/jaxb/pom.xml | 4 +- .../src/main/resources/vocabulary_common.xsd | 4 +- .../main/resources/vocabularyitem_common.xsd | 4 +- .../vocabulary/VocabularyResource.java | 2 +- services/work/jaxb/pom.xml | 6 +-- .../jaxb/src/main/resources/work_common.xsd | 4 +- .../main/resources/workauthority_common.xsd | 4 +- services/workflow/jaxb/pom.xml | 4 +- 211 files changed, 541 insertions(+), 577 deletions(-) diff --git a/pom.xml b/pom.xml index 1f1cab803..ea005427e 100644 --- a/pom.xml +++ b/pom.xml @@ -20,8 +20,8 @@ 1.7.4 0.12.0-NX2 2.14.3 - 2.2.11 - 0.6.2 + 4.0.0 + 4.0.12 2.17.1 9.10-HF30 ${nuxeo.general.release} @@ -1132,8 +1132,8 @@ 2.0.2 - org.jvnet.jaxb2_commons - jaxb2-basics + org.jvnet.jaxb + jaxb-plugins ${jaxb2-basics.version} @@ -1142,8 +1142,8 @@ 1.0 - org.jvnet.jaxb2_commons - jaxb2-basics-runtime + org.jvnet.jaxb + jaxb-plugins-runtime ${jaxb2-basics.version} @@ -1187,24 +1187,24 @@ 1.2 - com.sun.xml.bind + org.glassfish.jaxb jaxb-core ${jaxb.version} - com.sun.xml.bind - jaxb-impl + org.glassfish.jaxb + jaxb-runtime ${jaxb.version} - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api ${jaxb.version} - javax.persistence - persistence-api - 1.0 + jakarta.persistence + jakarta.persistence-api + 3.1.0 org.hibernate @@ -1224,10 +1224,10 @@ 3.6.10.Final - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-runtime - 0.6.0 + 4.0.12 org.postgresql diff --git a/services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/CollectionSpaceIntegrationTest.java b/services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/CollectionSpaceIntegrationTest.java index 1fa2515c7..4326b2c9f 100644 --- a/services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/CollectionSpaceIntegrationTest.java +++ b/services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/CollectionSpaceIntegrationTest.java @@ -31,8 +31,8 @@ import java.util.List; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.Marshaller; import org.collectionspace.services.client.PayloadInputPart; import org.collectionspace.services.client.PoxPayloadIn; diff --git a/services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/RelationIntegrationTest.java b/services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/RelationIntegrationTest.java index 6c174f5db..a68ffa4d6 100644 --- a/services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/RelationIntegrationTest.java +++ b/services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/RelationIntegrationTest.java @@ -29,8 +29,8 @@ import java.util.List; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.Marshaller; import org.testng.Assert; import org.testng.annotations.AfterClass; diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/batch-create-Template.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/batch-create-Template.xml index 48f278dbd..127046b03 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/batch-create-Template.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/batch-create-Template.xml @@ -1,9 +1,9 @@ - - name0 notes0 diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml index 25221eaf1..6252e950a 100644 --- a/services/JaxRsServiceProvider/pom.xml +++ b/services/JaxRsServiceProvider/pom.xml @@ -87,8 +87,8 @@ org.mortbay.jetty - jaxb-impl - com.sun.xml.bind + jaxb-runtime + org.glassfish.jaxb @@ -149,8 +149,8 @@ org.mortbay.jetty - jaxb-impl - com.sun.xml.bind + jaxb-runtime + org.glassfish.jaxb javassist @@ -490,8 +490,8 @@ resteasy-jaxb-provider - jaxb-impl - com.sun.xml.bind + jaxb-runtime + org.glassfish.jaxb @@ -830,7 +830,7 @@ jaxb-xjc - com.sun.xml.bind + org.glassfish.jaxb diff --git a/services/JaxRsServiceProvider/src/main/resources/META-INF/persistence.xml b/services/JaxRsServiceProvider/src/main/resources/META-INF/persistence.xml index a01685418..d7a2be3f8 100644 --- a/services/JaxRsServiceProvider/src/main/resources/META-INF/persistence.xml +++ b/services/JaxRsServiceProvider/src/main/resources/META-INF/persistence.xml @@ -1,8 +1,8 @@ - org.hibernate.ejb.HibernatePersistence diff --git a/services/PerformanceTests/src/test/java/org/collectionspace/services/PerformanceTests/test/CollectionSpacePerformanceTest.java b/services/PerformanceTests/src/test/java/org/collectionspace/services/PerformanceTests/test/CollectionSpacePerformanceTest.java index 77c13bdc3..7e3c487d2 100644 --- a/services/PerformanceTests/src/test/java/org/collectionspace/services/PerformanceTests/test/CollectionSpacePerformanceTest.java +++ b/services/PerformanceTests/src/test/java/org/collectionspace/services/PerformanceTests/test/CollectionSpacePerformanceTest.java @@ -32,8 +32,8 @@ import java.util.Random; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.Marshaller; import org.collectionspace.services.collectionobject.CollectionobjectsCommon; import org.collectionspace.services.collectionobject.TitleGroup; diff --git a/services/account/client/src/test/resources/META-INF/persistence.xml b/services/account/client/src/test/resources/META-INF/persistence.xml index c2db6ee44..be051348a 100644 --- a/services/account/client/src/test/resources/META-INF/persistence.xml +++ b/services/account/client/src/test/resources/META-INF/persistence.xml @@ -1,6 +1,6 @@ - + org.collectionspace.services.account.AccountsCommon org.collectionspace.services.account.AccountsCommonList diff --git a/services/account/jaxb/pom.xml b/services/account/jaxb/pom.xml index 9e5bcc4d4..0f4b2f544 100644 --- a/services/account/jaxb/pom.xml +++ b/services/account/jaxb/pom.xml @@ -15,7 +15,7 @@ - com.sun.xml.bind + org.glassfish.jaxb jaxb-core @@ -23,8 +23,8 @@ property-listener-injector - javax.persistence - persistence-api + jakarta.persistence + jakarta.persistence-api org.hibernate @@ -36,7 +36,7 @@ dom4j - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-runtime @@ -56,9 +56,9 @@ install - - org.jvnet.hyperjaxb3 - maven-hyperjaxb3-plugin + + org.jvnet.jaxb + hyperjaxb3-maven-plugin diff --git a/services/account/jaxb/src/main/resources/accounts_common.xsd b/services/account/jaxb/src/main/resources/accounts_common.xsd index 7caba18ec..0d0ead2e2 100644 --- a/services/account/jaxb/src/main/resources/accounts_common.xsd +++ b/services/account/jaxb/src/main/resources/accounts_common.xsd @@ -1,11 +1,11 @@ - - - - - - - - - - - \ No newline at end of file + + diff --git a/services/account/jaxb/src/main/resources/instance1.xml b/services/account/jaxb/src/main/resources/instance1.xml index 90c47c8eb..e48e7d40d 100644 --- a/services/account/jaxb/src/main/resources/instance1.xml +++ b/services/account/jaxb/src/main/resources/instance1.xml @@ -1,8 +1,8 @@ - diff --git a/services/account/pstore/pom.xml b/services/account/pstore/pom.xml index ff9b8f050..1939df4c2 100644 --- a/services/account/pstore/pom.xml +++ b/services/account/pstore/pom.xml @@ -18,7 +18,7 @@ - com.sun.xml.bind + org.glassfish.jaxb jaxb-core diff --git a/services/account/pstore/src/test/resources/META-INF/persistence.xml b/services/account/pstore/src/test/resources/META-INF/persistence.xml index f6e45ccfe..6f8ddf090 100644 --- a/services/account/pstore/src/test/resources/META-INF/persistence.xml +++ b/services/account/pstore/src/test/resources/META-INF/persistence.xml @@ -1,6 +1,6 @@ - + org.collectionspace.services.account.AccountsCommon org.collectionspace.services.account.Tenant diff --git a/services/account/service/src/main/java/org/collectionspace/services/account/AccountResource.java b/services/account/service/src/main/java/org/collectionspace/services/account/AccountResource.java index 27f1c6e0e..6c4c7e271 100644 --- a/services/account/service/src/main/java/org/collectionspace/services/account/AccountResource.java +++ b/services/account/service/src/main/java/org/collectionspace/services/account/AccountResource.java @@ -106,7 +106,7 @@ import javax.ws.rs.core.PathSegment; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriInfo; -import javax.xml.bind.DatatypeConverter; +import jakarta.xml.bind.DatatypeConverter; /** AccountResource provides RESTful interface to the account service */ diff --git a/services/acquisition/jaxb/pom.xml b/services/acquisition/jaxb/pom.xml index 6cfb2412d..37ab609f3 100644 --- a/services/acquisition/jaxb/pom.xml +++ b/services/acquisition/jaxb/pom.xml @@ -25,8 +25,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo diff --git a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd index 76587655f..06740d030 100644 --- a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd +++ b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd @@ -13,8 +13,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/services/advancedsearch/jaxb/src/main/resources/advanced-search_common.xsd b/services/advancedsearch/jaxb/src/main/resources/advanced-search_common.xsd index f6b28889f..8c81557dc 100644 --- a/services/advancedsearch/jaxb/src/main/resources/advanced-search_common.xsd +++ b/services/advancedsearch/jaxb/src/main/resources/advanced-search_common.xsd @@ -10,8 +10,8 @@ - + org.collectionspace.services.authentication.User org.collectionspace.services.authorization.Role diff --git a/services/authentication/jaxb/pom.xml b/services/authentication/jaxb/pom.xml index 0bb200657..46cb1d2ce 100644 --- a/services/authentication/jaxb/pom.xml +++ b/services/authentication/jaxb/pom.xml @@ -20,7 +20,7 @@ - com.sun.xml.bind + org.glassfish.jaxb jaxb-core @@ -28,8 +28,8 @@ property-listener-injector - javax.persistence - persistence-api + jakarta.persistence + jakarta.persistence-api org.hibernate @@ -41,7 +41,7 @@ dom4j - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-runtime @@ -52,9 +52,9 @@ install - - org.jvnet.hyperjaxb3 - maven-hyperjaxb3-plugin + + org.jvnet.jaxb + hyperjaxb3-maven-plugin diff --git a/services/authentication/jaxb/src/main/resources/authentication_identity_provider.xsd b/services/authentication/jaxb/src/main/resources/authentication_identity_provider.xsd index 6971c2715..d1ad0d939 100644 --- a/services/authentication/jaxb/src/main/resources/authentication_identity_provider.xsd +++ b/services/authentication/jaxb/src/main/resources/authentication_identity_provider.xsd @@ -12,9 +12,9 @@ - + org.collectionspace.services.authentication.User diff --git a/services/authentication/pstore/src/test/resources/META-INF/persistence.xml b/services/authentication/pstore/src/test/resources/META-INF/persistence.xml index 284419804..8abd6a28a 100644 --- a/services/authentication/pstore/src/test/resources/META-INF/persistence.xml +++ b/services/authentication/pstore/src/test/resources/META-INF/persistence.xml @@ -1,6 +1,6 @@ - + org.collectionspace.services.authentication.User org.collectionspace.services.authentication.Token diff --git a/services/authority/jaxb/pom.xml b/services/authority/jaxb/pom.xml index cd38021b2..36663e7f8 100644 --- a/services/authority/jaxb/pom.xml +++ b/services/authority/jaxb/pom.xml @@ -14,7 +14,7 @@ - com.sun.xml.bind + org.glassfish.jaxb jaxb-core diff --git a/services/authority/pom.xml b/services/authority/pom.xml index 62f9ec0bb..be4a823aa 100644 --- a/services/authority/pom.xml +++ b/services/authority/pom.xml @@ -50,8 +50,8 @@ postgresql - javax.persistence - persistence-api + jakarta.persistence + jakarta.persistence-api diff --git a/services/authority/service/pom.xml b/services/authority/service/pom.xml index d0ec4e86b..7a31297ed 100644 --- a/services/authority/service/pom.xml +++ b/services/authority/service/pom.xml @@ -141,12 +141,12 @@ postgresql - javax.persistence - persistence-api + jakarta.persistence + jakarta.persistence-api - com.sun.xml.bind + org.glassfish.jaxb jaxb-core diff --git a/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationGen.java b/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationGen.java index 51c722f65..1341fc4e6 100644 --- a/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationGen.java +++ b/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationGen.java @@ -30,8 +30,8 @@ import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.Hashtable; import java.util.List; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.Marshaller; import org.collectionspace.services.client.TenantClient; import org.collectionspace.authentication.AuthN; diff --git a/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationSeed.java b/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationSeed.java index 7ac92c819..30079397c 100644 --- a/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationSeed.java +++ b/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationSeed.java @@ -28,8 +28,8 @@ import java.io.InputStream; import java.util.List; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.Unmarshaller; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/services/authorization-mgt/import/src/main/resources/META-INF/persistence.xml b/services/authorization-mgt/import/src/main/resources/META-INF/persistence.xml index b694ab855..dab58b100 100644 --- a/services/authorization-mgt/import/src/main/resources/META-INF/persistence.xml +++ b/services/authorization-mgt/import/src/main/resources/META-INF/persistence.xml @@ -1,6 +1,6 @@ - + org.collectionspace.services.authorization.perms.Permission org.collectionspace.services.authorization.perms.PermissionAction diff --git a/services/authorization-mgt/jaxb/pom.xml b/services/authorization-mgt/jaxb/pom.xml index 866b1c95c..f748cfc08 100644 --- a/services/authorization-mgt/jaxb/pom.xml +++ b/services/authorization-mgt/jaxb/pom.xml @@ -15,7 +15,7 @@ - com.sun.xml.bind + org.glassfish.jaxb jaxb-core @@ -23,8 +23,8 @@ property-listener-injector - javax.persistence - persistence-api + jakarta.persistence + jakarta.persistence-api org.hibernate @@ -36,7 +36,7 @@ dom4j - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-runtime @@ -56,9 +56,9 @@ install - - org.jvnet.hyperjaxb3 - maven-hyperjaxb3-plugin + + org.jvnet.jaxb + hyperjaxb3-maven-plugin diff --git a/services/authorization-mgt/service/pom.xml b/services/authorization-mgt/service/pom.xml index 2cd2f0886..1ce9ae52e 100644 --- a/services/authorization-mgt/service/pom.xml +++ b/services/authorization-mgt/service/pom.xml @@ -133,8 +133,8 @@ provided - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api org.collectionspace.services diff --git a/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionValidatorHandler.java b/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionValidatorHandler.java index 0e4534813..835b7c893 100644 --- a/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionValidatorHandler.java +++ b/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionValidatorHandler.java @@ -26,7 +26,7 @@ package org.collectionspace.services.authorization.storage; import java.util.List; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import org.collectionspace.services.authorization.perms.Permission; import org.collectionspace.services.authorization.perms.PermissionAction; diff --git a/services/authorization/jaxb/pom.xml b/services/authorization/jaxb/pom.xml index f6d096318..8fad57164 100644 --- a/services/authorization/jaxb/pom.xml +++ b/services/authorization/jaxb/pom.xml @@ -14,20 +14,20 @@ - com.sun.xml.bind + org.glassfish.jaxb jaxb-core - com.sun.xml.bind - jaxb-impl + org.glassfish.jaxb + jaxb-runtime org.jvnet.jaxb2-commons property-listener-injector - javax.persistence - persistence-api + jakarta.persistence + jakarta.persistence-api org.hibernate @@ -43,7 +43,7 @@ hibernate-c3p0 - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-runtime @@ -52,16 +52,16 @@ ${project.version} - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api provided + + jakarta.xml.bind + jakarta.xml.bind-api + + jaxen diff --git a/services/common-api/src/main/java/org/collectionspace/services/common/api/FileTools.java b/services/common-api/src/main/java/org/collectionspace/services/common/api/FileTools.java index 95fa0a83b..b0943c235 100644 --- a/services/common-api/src/main/java/org/collectionspace/services/common/api/FileTools.java +++ b/services/common-api/src/main/java/org/collectionspace/services/common/api/FileTools.java @@ -38,8 +38,8 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.Unmarshaller; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/services/common/pom.xml b/services/common/pom.xml index 7dc320402..7b9c995de 100644 --- a/services/common/pom.xml +++ b/services/common/pom.xml @@ -173,8 +173,8 @@ provided - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api javax.security @@ -194,8 +194,8 @@ provided - javax.persistence - persistence-api + jakarta.persistence + jakarta.persistence-api @@ -419,8 +419,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo diff --git a/services/common/src/main/java/org/collectionspace/services/common/document/JaxbUtils.java b/services/common/src/main/java/org/collectionspace/services/common/document/JaxbUtils.java index 366634d27..44355691a 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/document/JaxbUtils.java +++ b/services/common/src/main/java/org/collectionspace/services/common/document/JaxbUtils.java @@ -31,11 +31,11 @@ import java.io.InputStream; import java.io.StringWriter; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import javax.xml.namespace.QName; import org.slf4j.Logger; @@ -63,7 +63,7 @@ public class JaxbUtils { Marshaller m = jc.createMarshaller(); m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE); m.marshal(o, sw); - } catch (javax.xml.bind.MarshalException e) { + } catch (jakarta.xml.bind.MarshalException e) { // // If the JAX-B object we're trying to marshal doesn't have an @XmlRootElement, then we need another // approach. diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/handler/CSDocumentModelList.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/handler/CSDocumentModelList.java index 65e18063c..c6bbc4ee5 100644 --- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/handler/CSDocumentModelList.java +++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/handler/CSDocumentModelList.java @@ -3,9 +3,9 @@ package org.collectionspace.services.nuxeo.client.handler; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; import org.collectionspace.services.client.PoxPayloadOut; import org.collectionspace.services.jaxb.AbstractCommonList; diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/CommonList.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/CommonList.java index b096964a9..db034c0eb 100644 --- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/CommonList.java +++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/CommonList.java @@ -37,10 +37,10 @@ import org.slf4j.LoggerFactory; import org.w3c.dom.Document; import org.w3c.dom.Element; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * This class allows us to generically represent and marshall a set of list diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/ObjectFactory.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/ObjectFactory.java index ec1d553ba..3d35a6167 100644 --- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/ObjectFactory.java +++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/ObjectFactory.java @@ -23,7 +23,7 @@ */ package org.collectionspace.services.nuxeo.client.java; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.annotation.XmlRegistry; /** * ObjectFactory for CommonList diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java index eb6b0158c..0139e468d 100644 --- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java +++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java @@ -37,7 +37,7 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import org.collectionspace.authentication.AuthN; import org.collectionspace.services.authorization.AccountPermission; diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/package-info.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/package-info.java index 648de4f71..5b29334bd 100644 --- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/package-info.java +++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/package-info.java @@ -1,3 +1,3 @@ // We make the CommonList act like an AbstractCommonList, by setting its namespace -@javax.xml.bind.annotation.XmlSchema(namespace = "http://collectionspace.org/services/jaxb") +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://collectionspace.org/services/jaxb") package org.collectionspace.services.nuxeo.client.java; diff --git a/services/common/src/test/java/org/collectionspace/services/common/test/AbstractSecurityTestBase.java b/services/common/src/test/java/org/collectionspace/services/common/test/AbstractSecurityTestBase.java index 2fdd5da6e..2ec195f5a 100644 --- a/services/common/src/test/java/org/collectionspace/services/common/test/AbstractSecurityTestBase.java +++ b/services/common/src/test/java/org/collectionspace/services/common/test/AbstractSecurityTestBase.java @@ -2,7 +2,7 @@ package org.collectionspace.services.common.test; import java.io.ByteArrayInputStream; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import javax.xml.namespace.QName; import org.collectionspace.services.common.config.ServicesConfigReaderImpl; diff --git a/services/common/src/test/java/org/collectionspace/services/common/test/SecurityUtilsTest.java b/services/common/src/test/java/org/collectionspace/services/common/test/SecurityUtilsTest.java index 22b6fc62b..debac3a76 100644 --- a/services/common/src/test/java/org/collectionspace/services/common/test/SecurityUtilsTest.java +++ b/services/common/src/test/java/org/collectionspace/services/common/test/SecurityUtilsTest.java @@ -2,7 +2,7 @@ package org.collectionspace.services.common.test; import java.util.Set; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import org.collectionspace.services.common.security.SecurityUtils; import org.collectionspace.services.config.AssertionProbesType; diff --git a/services/concept/jaxb/pom.xml b/services/concept/jaxb/pom.xml index af24038e3..50dbcad4a 100644 --- a/services/concept/jaxb/pom.xml +++ b/services/concept/jaxb/pom.xml @@ -35,8 +35,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo diff --git a/services/concept/jaxb/src/main/resources/concept_common.xsd b/services/concept/jaxb/src/main/resources/concept_common.xsd index 505f955bb..5a3a849ff 100644 --- a/services/concept/jaxb/src/main/resources/concept_common.xsd +++ b/services/concept/jaxb/src/main/resources/concept_common.xsd @@ -10,8 +10,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo diff --git a/services/conditioncheck/jaxb/src/main/resources/conditionchecks-common.xsd b/services/conditioncheck/jaxb/src/main/resources/conditionchecks-common.xsd index 41a18e46c..b2211a86d 100644 --- a/services/conditioncheck/jaxb/src/main/resources/conditionchecks-common.xsd +++ b/services/conditioncheck/jaxb/src/main/resources/conditionchecks-common.xsd @@ -10,8 +10,8 @@ commons-io - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api - com.sun.xml.bind + org.glassfish.jaxb jaxb-core test @@ -42,16 +42,16 @@ test - org.jvnet.jaxb2_commons - jaxb2-basics + org.jvnet.jaxb + jaxb-plugins org.jvnet.jaxb2-commons property-listener-injector - org.jvnet.jaxb2_commons - jaxb2-basics-runtime + org.jvnet.jaxb + jaxb-plugins-runtime org.collectionspace.services @@ -65,8 +65,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo diff --git a/services/config/src/main/java/org/collectionspace/services/common/config/AbstractConfigReaderImpl.java b/services/config/src/main/java/org/collectionspace/services/common/config/AbstractConfigReaderImpl.java index a03e118f3..8c501ee78 100644 --- a/services/config/src/main/java/org/collectionspace/services/common/config/AbstractConfigReaderImpl.java +++ b/services/config/src/main/java/org/collectionspace/services/common/config/AbstractConfigReaderImpl.java @@ -31,9 +31,9 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import org.collectionspace.services.common.api.JEEServerDeployment; import org.slf4j.Logger; diff --git a/services/config/src/test/java/org/collectionspace/services/common/config/ServicesConfigReaderImplTest.java b/services/config/src/test/java/org/collectionspace/services/common/config/ServicesConfigReaderImplTest.java index 73c612ccf..6f9b858e5 100644 --- a/services/config/src/test/java/org/collectionspace/services/common/config/ServicesConfigReaderImplTest.java +++ b/services/config/src/test/java/org/collectionspace/services/common/config/ServicesConfigReaderImplTest.java @@ -4,7 +4,7 @@ import java.io.ByteArrayInputStream; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import org.collectionspace.services.config.AssertionAttributeProbeType; import org.collectionspace.services.config.SAMLRelyingPartyType; diff --git a/services/conservation/jaxb/pom.xml b/services/conservation/jaxb/pom.xml index 22d256ddd..09ba21df6 100644 --- a/services/conservation/jaxb/pom.xml +++ b/services/conservation/jaxb/pom.xml @@ -25,8 +25,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo diff --git a/services/conservation/jaxb/src/main/resources/conservation-common.xsd b/services/conservation/jaxb/src/main/resources/conservation-common.xsd index cc9a996c6..85d00cec4 100644 --- a/services/conservation/jaxb/src/main/resources/conservation-common.xsd +++ b/services/conservation/jaxb/src/main/resources/conservation-common.xsd @@ -13,8 +13,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/services/consultation/jaxb/src/main/resources/consultations_common.xsd b/services/consultation/jaxb/src/main/resources/consultations_common.xsd index 0f1af8bb8..f570f4f1b 100644 --- a/services/consultation/jaxb/src/main/resources/consultations_common.xsd +++ b/services/consultation/jaxb/src/main/resources/consultations_common.xsd @@ -10,8 +10,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo diff --git a/services/contact/jaxb/src/main/resources/contacts-common.xsd b/services/contact/jaxb/src/main/resources/contacts-common.xsd index 81ca55008..b114bebb7 100644 --- a/services/contact/jaxb/src/main/resources/contacts-common.xsd +++ b/services/contact/jaxb/src/main/resources/contacts-common.xsd @@ -13,8 +13,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/services/deaccession/jaxb/src/main/resources/deaccessions_common.xsd b/services/deaccession/jaxb/src/main/resources/deaccessions_common.xsd index 0515b1276..5d06ad4b3 100644 --- a/services/deaccession/jaxb/src/main/resources/deaccessions_common.xsd +++ b/services/deaccession/jaxb/src/main/resources/deaccessions_common.xsd @@ -9,8 +9,8 @@ --> install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo diff --git a/services/dimension/jaxb/src/main/resources/dimensions-common.xsd b/services/dimension/jaxb/src/main/resources/dimensions-common.xsd index 40fd310b6..8cae4f504 100644 --- a/services/dimension/jaxb/src/main/resources/dimensions-common.xsd +++ b/services/dimension/jaxb/src/main/resources/dimensions-common.xsd @@ -13,7 +13,7 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/services/dutyofcare/jaxb/src/main/resources/dutiesofcare_common.xsd b/services/dutyofcare/jaxb/src/main/resources/dutiesofcare_common.xsd index 46517dc65..b51021b13 100644 --- a/services/dutyofcare/jaxb/src/main/resources/dutiesofcare_common.xsd +++ b/services/dutyofcare/jaxb/src/main/resources/dutiesofcare_common.xsd @@ -9,8 +9,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo diff --git a/services/exhibition/jaxb/src/main/resources/exhibitions-common.xsd b/services/exhibition/jaxb/src/main/resources/exhibitions-common.xsd index f1a7bed01..e47e4b5aa 100644 --- a/services/exhibition/jaxb/src/main/resources/exhibitions-common.xsd +++ b/services/exhibition/jaxb/src/main/resources/exhibitions-common.xsd @@ -10,8 +10,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/services/exit/jaxb/src/main/resources/exits_common.xsd b/services/exit/jaxb/src/main/resources/exits_common.xsd index 3dd9096e0..5603d4e60 100644 --- a/services/exit/jaxb/src/main/resources/exits_common.xsd +++ b/services/exit/jaxb/src/main/resources/exits_common.xsd @@ -10,8 +10,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/services/export/jaxb/src/main/resources/exports-common.xsd b/services/export/jaxb/src/main/resources/exports-common.xsd index 95e981c61..9bb960489 100644 --- a/services/export/jaxb/src/main/resources/exports-common.xsd +++ b/services/export/jaxb/src/main/resources/exports-common.xsd @@ -13,8 +13,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo diff --git a/services/group/jaxb/src/main/resources/groups_common.xsd b/services/group/jaxb/src/main/resources/groups_common.xsd index 5e23c3e08..acdb8a986 100644 --- a/services/group/jaxb/src/main/resources/groups_common.xsd +++ b/services/group/jaxb/src/main/resources/groups_common.xsd @@ -13,8 +13,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/services/heldintrust/jaxb/src/main/resources/heldintrusts_common.xsd b/services/heldintrust/jaxb/src/main/resources/heldintrusts_common.xsd index 85065a41a..4d46892a7 100644 --- a/services/heldintrust/jaxb/src/main/resources/heldintrusts_common.xsd +++ b/services/heldintrust/jaxb/src/main/resources/heldintrusts_common.xsd @@ -9,8 +9,8 @@ --> - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api - javax.persistence - persistence-api + jakarta.persistence + jakarta.persistence-api org.hibernate @@ -67,7 +67,7 @@ dom4j - org.jvnet.hyperjaxb3 + org.jvnet.jaxb hyperjaxb3-ejb-runtime @@ -78,8 +78,8 @@ - org.jvnet.hyperjaxb3 - maven-hyperjaxb3-plugin + org.jvnet.jaxb + hyperjaxb3-maven-plugin diff --git a/services/hyperjaxb/src/main/resources/bindings.xjb b/services/hyperjaxb/src/main/resources/bindings.xjb index ce5cc40c4..a410b39d1 100644 --- a/services/hyperjaxb/src/main/resources/bindings.xjb +++ b/services/hyperjaxb/src/main/resources/bindings.xjb @@ -1,5 +1,5 @@ - @@ -10,7 +10,7 @@ diff --git a/services/hyperjaxb/src/main/resources/permissions.xsd b/services/hyperjaxb/src/main/resources/permissions.xsd index 1bb5fd50f..a0fb2df6b 100644 --- a/services/hyperjaxb/src/main/resources/permissions.xsd +++ b/services/hyperjaxb/src/main/resources/permissions.xsd @@ -6,10 +6,10 @@ - org.jvnet.jaxb2_commons - jaxb2-basics-runtime + org.jvnet.jaxb + jaxb-plugins-runtime @@ -45,8 +45,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo diff --git a/services/imports/jaxb/pom.xml b/services/imports/jaxb/pom.xml index 358d9efd8..a41be8abd 100644 --- a/services/imports/jaxb/pom.xml +++ b/services/imports/jaxb/pom.xml @@ -25,8 +25,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo diff --git a/services/imports/jaxb/src/main/resources/imports_common.xsd b/services/imports/jaxb/src/main/resources/imports_common.xsd index c9008afff..c2fe60d3f 100644 --- a/services/imports/jaxb/src/main/resources/imports_common.xsd +++ b/services/imports/jaxb/src/main/resources/imports_common.xsd @@ -13,8 +13,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo diff --git a/services/index/jaxb/src/main/resources/index-common.xsd b/services/index/jaxb/src/main/resources/index-common.xsd index ef50d16a9..0bbe163c0 100644 --- a/services/index/jaxb/src/main/resources/index-common.xsd +++ b/services/index/jaxb/src/main/resources/index-common.xsd @@ -13,8 +13,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/services/insurance/jaxb/src/main/resources/insurances_common.xsd b/services/insurance/jaxb/src/main/resources/insurances_common.xsd index fc43a34cc..1b1c0b87f 100644 --- a/services/insurance/jaxb/src/main/resources/insurances_common.xsd +++ b/services/insurance/jaxb/src/main/resources/insurances_common.xsd @@ -10,8 +10,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo diff --git a/services/intake/jaxb/src/main/resources/intakes-common.xsd b/services/intake/jaxb/src/main/resources/intakes-common.xsd index cde240b54..41b451ffa 100644 --- a/services/intake/jaxb/src/main/resources/intakes-common.xsd +++ b/services/intake/jaxb/src/main/resources/intakes-common.xsd @@ -13,8 +13,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/services/iterationreport/jaxb/src/main/resources/iterationreports_common.xsd b/services/iterationreport/jaxb/src/main/resources/iterationreports_common.xsd index d41204cc8..ab8532121 100644 --- a/services/iterationreport/jaxb/src/main/resources/iterationreports_common.xsd +++ b/services/iterationreport/jaxb/src/main/resources/iterationreports_common.xsd @@ -10,8 +10,8 @@ - com.sun.xml.bind + org.glassfish.jaxb jaxb-core - org.jvnet.jaxb2_commons - jaxb2-basics + org.jvnet.jaxb + jaxb-plugins @@ -37,8 +37,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo diff --git a/services/jaxb/src/main/resources/authorityref.xsd b/services/jaxb/src/main/resources/authorityref.xsd index 68c1d4dcd..0399bda5d 100644 --- a/services/jaxb/src/main/resources/authorityref.xsd +++ b/services/jaxb/src/main/resources/authorityref.xsd @@ -17,8 +17,8 @@ --> - - - - - - - - - - - \ No newline at end of file + + diff --git a/services/jaxb/src/main/resources/blobs_common.xsd b/services/jaxb/src/main/resources/blobs_common.xsd index 5b973959d..5b367409a 100644 --- a/services/jaxb/src/main/resources/blobs_common.xsd +++ b/services/jaxb/src/main/resources/blobs_common.xsd @@ -13,8 +13,8 @@ diff --git a/services/jaxb/src/main/resources/index_common.xsd b/services/jaxb/src/main/resources/index_common.xsd index e250df2d1..fd41c2f67 100644 --- a/services/jaxb/src/main/resources/index_common.xsd +++ b/services/jaxb/src/main/resources/index_common.xsd @@ -13,8 +13,8 @@ - + diff --git a/services/jaxb/src/main/resources/invocationResults.xsd b/services/jaxb/src/main/resources/invocationResults.xsd index 7f7b732c0..b668cdc81 100644 --- a/services/jaxb/src/main/resources/invocationResults.xsd +++ b/services/jaxb/src/main/resources/invocationResults.xsd @@ -10,8 +10,8 @@ --> diff --git a/services/jaxb/src/main/resources/lifecycle.xsd b/services/jaxb/src/main/resources/lifecycle.xsd index b7a41ea67..cd5cfbbaa 100644 --- a/services/jaxb/src/main/resources/lifecycle.xsd +++ b/services/jaxb/src/main/resources/lifecycle.xsd @@ -1,6 +1,6 @@ - diff --git a/services/jaxb/src/main/resources/relations_common.xsd b/services/jaxb/src/main/resources/relations_common.xsd index 923d1d3fd..305736b48 100644 --- a/services/jaxb/src/main/resources/relations_common.xsd +++ b/services/jaxb/src/main/resources/relations_common.xsd @@ -13,8 +13,8 @@ diff --git a/services/jaxb/src/main/resources/service_description.xsd b/services/jaxb/src/main/resources/service_description.xsd index c586bb378..f5d35ebb5 100644 --- a/services/jaxb/src/main/resources/service_description.xsd +++ b/services/jaxb/src/main/resources/service_description.xsd @@ -9,8 +9,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo diff --git a/services/loanin/jaxb/src/main/resources/loansin-common.xsd b/services/loanin/jaxb/src/main/resources/loansin-common.xsd index 65c9e6df8..8be90dbdb 100644 --- a/services/loanin/jaxb/src/main/resources/loansin-common.xsd +++ b/services/loanin/jaxb/src/main/resources/loansin-common.xsd @@ -13,8 +13,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo diff --git a/services/loanout/jaxb/src/main/resources/loansout-common.xsd b/services/loanout/jaxb/src/main/resources/loansout-common.xsd index 0bbb9b50e..9ca0593db 100644 --- a/services/loanout/jaxb/src/main/resources/loansout-common.xsd +++ b/services/loanout/jaxb/src/main/resources/loansout-common.xsd @@ -13,8 +13,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo diff --git a/services/location/jaxb/src/main/resources/location_common.xsd b/services/location/jaxb/src/main/resources/location_common.xsd index c2b6115e7..48baa5e58 100644 --- a/services/location/jaxb/src/main/resources/location_common.xsd +++ b/services/location/jaxb/src/main/resources/location_common.xsd @@ -10,8 +10,8 @@ org.collectionspace.services.common - com.sun.xml.bind + org.glassfish.jaxb jaxb-core @@ -49,8 +49,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo diff --git a/services/material/jaxb/src/main/resources/material_common.xsd b/services/material/jaxb/src/main/resources/material_common.xsd index 1a3448ba6..b98033690 100644 --- a/services/material/jaxb/src/main/resources/material_common.xsd +++ b/services/material/jaxb/src/main/resources/material_common.xsd @@ -10,8 +10,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo diff --git a/services/media/jaxb/src/main/resources/media_common.xsd b/services/media/jaxb/src/main/resources/media_common.xsd index bab3194f4..49c3e9315 100644 --- a/services/media/jaxb/src/main/resources/media_common.xsd +++ b/services/media/jaxb/src/main/resources/media_common.xsd @@ -13,8 +13,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo diff --git a/services/movement/jaxb/src/main/resources/movements-common.xsd b/services/movement/jaxb/src/main/resources/movements-common.xsd index ea729d27b..0d996d917 100644 --- a/services/movement/jaxb/src/main/resources/movements-common.xsd +++ b/services/movement/jaxb/src/main/resources/movements-common.xsd @@ -13,8 +13,8 @@ org.collectionspace.services.jaxb ${project.version} + + jakarta.xml.bind + jakarta.xml.bind-api + @@ -27,8 +31,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/services/nagpra-jaxb/src/main/resources/nagpra_common.xsd b/services/nagpra-jaxb/src/main/resources/nagpra_common.xsd index 0f0a775dd..03e98aaf0 100644 --- a/services/nagpra-jaxb/src/main/resources/nagpra_common.xsd +++ b/services/nagpra-jaxb/src/main/resources/nagpra_common.xsd @@ -5,8 +5,8 @@ --> install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/services/nagprainventory/jaxb/src/main/resources/nagprainventory_common.xsd b/services/nagprainventory/jaxb/src/main/resources/nagprainventory_common.xsd index c17f9b9ad..93c3ffe50 100644 --- a/services/nagprainventory/jaxb/src/main/resources/nagprainventory_common.xsd +++ b/services/nagprainventory/jaxb/src/main/resources/nagprainventory_common.xsd @@ -10,8 +10,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo diff --git a/services/note/jaxb/src/main/resources/notes-common.xsd b/services/note/jaxb/src/main/resources/notes-common.xsd index 5a0f38a46..307d9f6bc 100644 --- a/services/note/jaxb/src/main/resources/notes-common.xsd +++ b/services/note/jaxb/src/main/resources/notes-common.xsd @@ -5,7 +5,7 @@ 2010-04-28 01:50:27 -0700 (Wed, 28 Apr 2010) $ --> install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo diff --git a/services/objectexit/jaxb/src/main/resources/objectexit_common.xsd b/services/objectexit/jaxb/src/main/resources/objectexit_common.xsd index f6aad8a48..de4550dc3 100644 --- a/services/objectexit/jaxb/src/main/resources/objectexit_common.xsd +++ b/services/objectexit/jaxb/src/main/resources/objectexit_common.xsd @@ -13,8 +13,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo diff --git a/services/organization/jaxb/src/main/resources/organization_common.xsd b/services/organization/jaxb/src/main/resources/organization_common.xsd index 37976cefd..0197c520e 100644 --- a/services/organization/jaxb/src/main/resources/organization_common.xsd +++ b/services/organization/jaxb/src/main/resources/organization_common.xsd @@ -10,8 +10,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo diff --git a/services/osteology/jaxb/src/main/resources/osteology-common.xsd b/services/osteology/jaxb/src/main/resources/osteology-common.xsd index 5f6ca87d8..f94997454 100644 --- a/services/osteology/jaxb/src/main/resources/osteology-common.xsd +++ b/services/osteology/jaxb/src/main/resources/osteology-common.xsd @@ -10,8 +10,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo diff --git a/services/person/jaxb/src/main/resources/person_common.xsd b/services/person/jaxb/src/main/resources/person_common.xsd index 11941acbb..199fb32a9 100644 --- a/services/person/jaxb/src/main/resources/person_common.xsd +++ b/services/person/jaxb/src/main/resources/person_common.xsd @@ -13,8 +13,8 @@ org.collectionspace.services.common - com.sun.xml.bind + org.glassfish.jaxb jaxb-core @@ -39,8 +39,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo diff --git a/services/place/jaxb/src/main/resources/place_common.xsd b/services/place/jaxb/src/main/resources/place_common.xsd index fa0f791bc..72d0fea6d 100644 --- a/services/place/jaxb/src/main/resources/place_common.xsd +++ b/services/place/jaxb/src/main/resources/place_common.xsd @@ -1,8 +1,8 @@ 0.5.0 - 0.13.3 + 4.0.12 cs_default generate-sources @@ -183,9 +183,9 @@ - org.jvnet.hyperjaxb3 - maven-hyperjaxb3-plugin - 0.6.0 + org.jvnet.jaxb + hyperjaxb3-maven-plugin + 4.0.12 @@ -201,14 +201,14 @@ -Xannotate true - true + false garbage - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin ${maven-jaxb2-plugin.version} @@ -229,41 +229,20 @@ -extension - -Xnamespace-prefix - -Xannotate -verbose - -Xequals -XhashCode - - javax.xml.bind - jaxb-api - ${jaxb.version} - - - org.jvnet.jaxb2_commons - jaxb2-basics-annotate - ${jaxb2-basics.version} - - - org.jvnet.jaxb2_commons - jaxb2-basics + org.jvnet.jaxb + jaxb-plugins ${jaxb2-basics.version} - - - org.jvnet.jaxb2_commons - jaxb2-namespace-prefix - 1.4-SNAPSHOT - - org.codehaus.mojo diff --git a/services/pottag/jaxb/pom.xml b/services/pottag/jaxb/pom.xml index 6e23a4054..d75e887a0 100644 --- a/services/pottag/jaxb/pom.xml +++ b/services/pottag/jaxb/pom.xml @@ -26,8 +26,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo diff --git a/services/pottag/jaxb/src/main/resources/pottags-common.xsd b/services/pottag/jaxb/src/main/resources/pottags-common.xsd index 711ddc27d..2ecd2d2cc 100644 --- a/services/pottag/jaxb/src/main/resources/pottags-common.xsd +++ b/services/pottag/jaxb/src/main/resources/pottags-common.xsd @@ -13,8 +13,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo diff --git a/services/propagation/jaxb/src/main/resources/propagations-common.xsd b/services/propagation/jaxb/src/main/resources/propagations-common.xsd index 2b98fec5e..9205a61db 100644 --- a/services/propagation/jaxb/src/main/resources/propagations-common.xsd +++ b/services/propagation/jaxb/src/main/resources/propagations-common.xsd @@ -13,8 +13,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo diff --git a/services/publicitem/jaxb/src/main/resources/publicitems-common.xsd b/services/publicitem/jaxb/src/main/resources/publicitems-common.xsd index c6d874b7a..8c1910f0e 100644 --- a/services/publicitem/jaxb/src/main/resources/publicitems-common.xsd +++ b/services/publicitem/jaxb/src/main/resources/publicitems-common.xsd @@ -4,7 +4,7 @@ binding between XML and Java objects $LastChangedRevision$ $LastChangedDate$ --> diff --git a/services/repatriationrequest/jaxb/pom.xml b/services/repatriationrequest/jaxb/pom.xml index d61ef620d..b74a788a3 100644 --- a/services/repatriationrequest/jaxb/pom.xml +++ b/services/repatriationrequest/jaxb/pom.xml @@ -30,8 +30,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/services/repatriationrequest/jaxb/src/main/resources/repatriationrequests_common.xsd b/services/repatriationrequest/jaxb/src/main/resources/repatriationrequests_common.xsd index 58c864617..ae0981383 100644 --- a/services/repatriationrequest/jaxb/src/main/resources/repatriationrequests_common.xsd +++ b/services/repatriationrequest/jaxb/src/main/resources/repatriationrequests_common.xsd @@ -10,8 +10,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo diff --git a/services/report/jaxb/src/main/resources/reports-common.xsd b/services/report/jaxb/src/main/resources/reports-common.xsd index c3ee01df5..9f0ac59ca 100644 --- a/services/report/jaxb/src/main/resources/reports-common.xsd +++ b/services/report/jaxb/src/main/resources/reports-common.xsd @@ -13,8 +13,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/services/restrictedmedia/jaxb/src/main/resources/restrictedmedia_common.xsd b/services/restrictedmedia/jaxb/src/main/resources/restrictedmedia_common.xsd index aed21ba74..a98206a50 100644 --- a/services/restrictedmedia/jaxb/src/main/resources/restrictedmedia_common.xsd +++ b/services/restrictedmedia/jaxb/src/main/resources/restrictedmedia_common.xsd @@ -9,8 +9,8 @@ --> - + org.collectionspace.services.authentication.User org.collectionspace.services.authorization.Role diff --git a/services/servicegroup/jaxb/pom.xml b/services/servicegroup/jaxb/pom.xml index cc8e9c51a..68c9d5626 100644 --- a/services/servicegroup/jaxb/pom.xml +++ b/services/servicegroup/jaxb/pom.xml @@ -26,8 +26,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo diff --git a/services/servicegroup/jaxb/src/main/resources/servicegroup_common.xsd b/services/servicegroup/jaxb/src/main/resources/servicegroup_common.xsd index 42a669551..96fbcc5f1 100644 --- a/services/servicegroup/jaxb/src/main/resources/servicegroup_common.xsd +++ b/services/servicegroup/jaxb/src/main/resources/servicegroup_common.xsd @@ -13,8 +13,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo diff --git a/services/structureddate/jaxb/src/main/resources/structureddate-common.xsd b/services/structureddate/jaxb/src/main/resources/structureddate-common.xsd index 7d05df2e9..58ed8859b 100644 --- a/services/structureddate/jaxb/src/main/resources/structureddate-common.xsd +++ b/services/structureddate/jaxb/src/main/resources/structureddate-common.xsd @@ -10,8 +10,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/services/summarydocumentation/jaxb/src/main/resources/summarydocumentations_common.xsd b/services/summarydocumentation/jaxb/src/main/resources/summarydocumentations_common.xsd index 0855f2e30..6b6747482 100644 --- a/services/summarydocumentation/jaxb/src/main/resources/summarydocumentations_common.xsd +++ b/services/summarydocumentation/jaxb/src/main/resources/summarydocumentations_common.xsd @@ -10,8 +10,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo diff --git a/services/systeminfo/jaxb/src/main/resources/systeminfo-common.xsd b/services/systeminfo/jaxb/src/main/resources/systeminfo-common.xsd index d35336f9e..4fcc923b4 100644 --- a/services/systeminfo/jaxb/src/main/resources/systeminfo-common.xsd +++ b/services/systeminfo/jaxb/src/main/resources/systeminfo-common.xsd @@ -11,8 +11,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo diff --git a/services/taxonomy/jaxb/src/main/resources/taxon_common.xsd b/services/taxonomy/jaxb/src/main/resources/taxon_common.xsd index 74b460741..5c84dfbdf 100644 --- a/services/taxonomy/jaxb/src/main/resources/taxon_common.xsd +++ b/services/taxonomy/jaxb/src/main/resources/taxon_common.xsd @@ -1,8 +1,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin diff --git a/services/transport/jaxb/src/main/resources/transports-common.xsd b/services/transport/jaxb/src/main/resources/transports-common.xsd index 5084ed8c5..9bbd4f85c 100644 --- a/services/transport/jaxb/src/main/resources/transports-common.xsd +++ b/services/transport/jaxb/src/main/resources/transports-common.xsd @@ -10,8 +10,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo diff --git a/services/uoc/jaxb/src/main/resources/uoc-common.xsd b/services/uoc/jaxb/src/main/resources/uoc-common.xsd index e82423553..81e153151 100644 --- a/services/uoc/jaxb/src/main/resources/uoc-common.xsd +++ b/services/uoc/jaxb/src/main/resources/uoc-common.xsd @@ -13,8 +13,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo diff --git a/services/valuationcontrol/jaxb/src/main/resources/Valuationcontrols-common.xsd b/services/valuationcontrol/jaxb/src/main/resources/Valuationcontrols-common.xsd index 71764e02c..b5a674757 100644 --- a/services/valuationcontrol/jaxb/src/main/resources/Valuationcontrols-common.xsd +++ b/services/valuationcontrol/jaxb/src/main/resources/Valuationcontrols-common.xsd @@ -10,8 +10,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo diff --git a/services/vocabulary/jaxb/src/main/resources/vocabulary_common.xsd b/services/vocabulary/jaxb/src/main/resources/vocabulary_common.xsd index 48b543328..b39d7d399 100644 --- a/services/vocabulary/jaxb/src/main/resources/vocabulary_common.xsd +++ b/services/vocabulary/jaxb/src/main/resources/vocabulary_common.xsd @@ -11,8 +11,8 @@ org.collectionspace.services.common - com.sun.xml.bind + org.glassfish.jaxb jaxb-core @@ -39,8 +39,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo diff --git a/services/work/jaxb/src/main/resources/work_common.xsd b/services/work/jaxb/src/main/resources/work_common.xsd index cfa95363b..4c94fbab6 100644 --- a/services/work/jaxb/src/main/resources/work_common.xsd +++ b/services/work/jaxb/src/main/resources/work_common.xsd @@ -1,8 +1,8 @@ install - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin + org.jvnet.jaxb + jaxb-maven-plugin org.codehaus.mojo -- 2.47.3