Migrate to Jakarta EE / Java 21 compatibility

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 <noreply@anthropic.com>

diff --git a/pom.xml b/pom.xml
index 1f1cab8038437ebc279417a48f02ba343db8283c..ea005427e0f8bc3e2a3401071646252f7877e7d2 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -20,8 +20,8 @@
                <aspectj.version>1.7.4</aspectj.version>
                <chemistry.opencmis.version.nx>0.12.0-NX2</chemistry.opencmis.version.nx>
                <jackson.version>2.14.3</jackson.version>
-               <jaxb.version>2.2.11</jaxb.version>
-               <jaxb2-basics.version>0.6.2</jaxb2-basics.version>
+               <jaxb.version>4.0.0</jaxb.version>
+               <jaxb2-basics.version>4.0.12</jaxb2-basics.version>
                <log4j.version>2.17.1</log4j.version>
                <nuxeo.general.release>9.10-HF30</nuxeo.general.release>
                <nuxeo.shell.version>${nuxeo.general.release}</nuxeo.shell.version>
@@ -1132,8 +1132,8 @@
                                <version>2.0.2</version>
                        </dependency>
                        <dependency>
-                               <groupId>org.jvnet.jaxb2_commons</groupId>
-                               <artifactId>jaxb2-basics</artifactId>
+                               <groupId>org.jvnet.jaxb</groupId>
+                               <artifactId>jaxb-plugins</artifactId>
                                <version>${jaxb2-basics.version}</version>
                        </dependency>
                        <dependency>
@@ -1142,8 +1142,8 @@
                                <version>1.0</version>
                        </dependency>
                        <dependency>
-                               <groupId>org.jvnet.jaxb2_commons</groupId>
-                               <artifactId>jaxb2-basics-runtime</artifactId>
+                               <groupId>org.jvnet.jaxb</groupId>
+                               <artifactId>jaxb-plugins-runtime</artifactId>
                                <version>${jaxb2-basics.version}</version>
                        </dependency>
                        <dependency>
@@ -1187,24 +1187,24 @@
                                <version>1.2</version>
                        </dependency>
                        <dependency>
-                               <groupId>com.sun.xml.bind</groupId>
+                               <groupId>org.glassfish.jaxb</groupId>
                                <artifactId>jaxb-core</artifactId>
                                <version>${jaxb.version}</version>
                        </dependency>
                        <dependency>
-                               <groupId>com.sun.xml.bind</groupId>
-                               <artifactId>jaxb-impl</artifactId>
+                               <groupId>org.glassfish.jaxb</groupId>
+                               <artifactId>jaxb-runtime</artifactId>
                                <version>${jaxb.version}</version>
                        </dependency>
                        <dependency>
-                               <groupId>javax.xml.bind</groupId>
-                               <artifactId>jaxb-api</artifactId>
+                               <groupId>jakarta.xml.bind</groupId>
+                               <artifactId>jakarta.xml.bind-api</artifactId>
                                <version>${jaxb.version}</version>
                        </dependency>
                        <dependency>
-                               <groupId>javax.persistence</groupId>
-                               <artifactId>persistence-api</artifactId>
-                               <version>1.0</version>
+                               <groupId>jakarta.persistence</groupId>
+                               <artifactId>jakarta.persistence-api</artifactId>
+                               <version>3.1.0</version>
                        </dependency>
                        <dependency>
                                <groupId>org.hibernate</groupId>
@@ -1224,10 +1224,10 @@
                                <version>3.6.10.Final</version>
                        </dependency>
                        <dependency>
-                               <groupId>org.jvnet.hyperjaxb3</groupId>
+                               <groupId>org.jvnet.jaxb</groupId>
                                <!-- for time type adapters -->
                                <artifactId>hyperjaxb3-ejb-runtime</artifactId>
-                               <version>0.6.0</version>
+                               <version>4.0.12</version>
                        </dependency>
                        <dependency>
                                <groupId>org.postgresql</groupId>

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 1fa2515c7756b75e422f70dd30486e305be9e98a..4326b2c9f7156b00d0a9cea4c17a0b2710e94560 100644 (file)
--- 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 6c174f5db7a11ef4f617daf2a9dd279a2bcf2552..a68ffa4d649b77e6a6d50bfe90d47651ec854e0e 100644 (file)
--- 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 48f278dbdc82b1e237ae9472c8445166d35d7182..127046b035d554cd3005eafbbf374f9c3c893457 100644 (file)
--- 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 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ns:document xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+<ns:document xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
     xmlns:ns="http://collectionspace.org/services/batch"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://collectionspace.org/services/batch file:../../../../../../../batch/jaxb/src/main/resources/batch_common_document.xsd">
-    <batch_common xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:ns="http://collectionspace.org/services/batch" 
+    <batch_common xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" xmlns:ns="http://collectionspace.org/services/batch" 
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
         <name>name0</name>
         <notes>notes0</notes>

diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml
index 25221eaf1ada83b15fd560e2b31c68a976db2218..6252e950adeb2cf32b1bf21aa8f9a6cf6459b1b8 100644 (file)
--- a/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/pom.xml
@@ -87,8 +87,8 @@
                                        <groupId>org.mortbay.jetty</groupId>
                                </exclusion>
                                <exclusion>
-                                       <artifactId>jaxb-impl</artifactId>
-                                       <groupId>com.sun.xml.bind</groupId>
+                                       <artifactId>jaxb-runtime</artifactId>
+                                       <groupId>org.glassfish.jaxb</groupId>
                                </exclusion>
                        </exclusions>
         </dependency>
@@ -149,8 +149,8 @@
                                        <groupId>org.mortbay.jetty</groupId>
                                </exclusion>
                                <exclusion>
-                                       <artifactId>jaxb-impl</artifactId>
-                                       <groupId>com.sun.xml.bind</groupId>
+                                       <artifactId>jaxb-runtime</artifactId>
+                                       <groupId>org.glassfish.jaxb</groupId>
                                </exclusion>
                                <exclusion>
                                        <groupId>javassist</groupId>
@@ -490,8 +490,8 @@
             <artifactId>resteasy-jaxb-provider</artifactId>
             <exclusions>
                <exclusion>
-                       <artifactId>jaxb-impl</artifactId>
-                       <groupId>com.sun.xml.bind</groupId>
+                       <artifactId>jaxb-runtime</artifactId>
+                       <groupId>org.glassfish.jaxb</groupId>
                </exclusion>
             </exclusions>
         </dependency>
@@ -830,7 +830,7 @@
                        </exclusion>
                        <exclusion>
                                <artifactId>jaxb-xjc</artifactId>
-                               <groupId>com.sun.xml.bind</groupId>
+                               <groupId>org.glassfish.jaxb</groupId>
                        </exclusion>
                </exclusions>
         </dependency>

diff --git a/services/JaxRsServiceProvider/src/main/resources/META-INF/persistence.xml b/services/JaxRsServiceProvider/src/main/resources/META-INF/persistence.xml
index a01685418cd1aeaf129eac4667fb74630da7eae1..d7a2be3f8eb921fb14fa17f9ace1c15b5f4e859b 100644 (file)
--- a/services/JaxRsServiceProvider/src/main/resources/META-INF/persistence.xml
+++ b/services/JaxRsServiceProvider/src/main/resources/META-INF/persistence.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<persistence version="1.0" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd
-       http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd"
-       xmlns="http://java.sun.com/xml/ns/persistence" 
-       xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
+<persistence version="1.0" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_1_0.xsd
+       https://jakarta.ee/xml/ns/persistence/orm https://jakarta.ee/xml/ns/persistence/orm_1_0.xsd"
+       xmlns="https://jakarta.ee/xml/ns/persistence" 
+       xmlns:orm="https://jakarta.ee/xml/ns/persistence/orm"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 <persistence-unit name="org.collectionspace.services">
         <provider>org.hibernate.ejb.HibernatePersistence</provider>

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 77c13bdc3c28f62ad9086673e8f1ea60ffdb8080..7e3c487d28329ab17a12916d928447a6e09b383b 100644 (file)
--- 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 c2db6ee442735d1d2bdde07362a913b7fdc91963..be051348a9be6cfb107bcb06a007cb422c3b580e 100644 (file)
--- 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 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<persistence version="1.0" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd
-             http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<persistence version="1.0" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_1_0.xsd
+             https://jakarta.ee/xml/ns/persistence/orm https://jakarta.ee/xml/ns/persistence/orm_1_0.xsd" xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:orm="https://jakarta.ee/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <persistence-unit name="org.collectionspace.services.account">
         <class>org.collectionspace.services.account.AccountsCommon</class>
         <class>org.collectionspace.services.account.AccountsCommonList</class>

diff --git a/services/account/jaxb/pom.xml b/services/account/jaxb/pom.xml
index 9e5bcc4d40481104bed6458cfa9fc877e1a17139..0f4b2f544fa2b25f0212fb50c0d0054531fdaa7f 100644 (file)
--- a/services/account/jaxb/pom.xml
+++ b/services/account/jaxb/pom.xml
@@ -15,7 +15,7 @@
     <dependencies>
 
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
+            <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-core</artifactId>
         </dependency>
         <dependency>
@@ -23,8 +23,8 @@
             <artifactId>property-listener-injector</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.persistence</groupId>
-            <artifactId>persistence-api</artifactId>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
@@ -36,7 +36,7 @@
             <artifactId>dom4j</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.jvnet.hyperjaxb3</groupId>
+            <groupId>org.jvnet.jaxb</groupId>
             <artifactId>hyperjaxb3-ejb-runtime</artifactId>
         </dependency>
         <dependency>
@@ -56,9 +56,9 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <!-- maven-hyperjaxb3-plugin generates jaxb + jpa bindings -->
-                <groupId>org.jvnet.hyperjaxb3</groupId>
-                <artifactId>maven-hyperjaxb3-plugin</artifactId>
+                <!-- hyperjaxb3-maven-plugin generates jaxb + jpa bindings -->
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>hyperjaxb3-maven-plugin</artifactId>
             </plugin>
         </plugins>
     </build>

diff --git a/services/account/jaxb/src/main/resources/accounts_common.xsd b/services/account/jaxb/src/main/resources/accounts_common.xsd
index 7caba18ecc9b74c315a94814268b886361ffbf2c..0d0ead2e234b77e4a3732732e81ba1c108c26a50 100644 (file)
--- a/services/account/jaxb/src/main/resources/accounts_common.xsd
+++ b/services/account/jaxb/src/main/resources/accounts_common.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <xs:schema
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-    jaxb:version="2.1" elementFormDefault="unqualified"
+    xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+    jaxb:version="3.0" elementFormDefault="unqualified"
     xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
-    xmlns:hj="http://hyperjaxb3.jvnet.org/ejb/schemas/customizations"
-    xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
+    xmlns:hj="urn:hyperjaxb3.jvnet.org:ejb:schemas:customizations"
+    xmlns:orm="https://jakarta.ee/xml/ns/persistence/orm"
     xmlns:ns="http://collectionspace.org/services/account"
     xmlns="http://collectionspace.org/services/account"
     targetNamespace="http://collectionspace.org/services/account"

diff --git a/services/account/jaxb/src/main/resources/accounts_common_list.xsd b/services/account/jaxb/src/main/resources/accounts_common_list.xsd
index 02131abe138d0ae53b804f6257119f1bb2b674a9..4d954fd18193ade3914b71e1c777f99c92eb149e 100644 (file)
--- a/services/account/jaxb/src/main/resources/accounts_common_list.xsd
+++ b/services/account/jaxb/src/main/resources/accounts_common_list.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <xs:schema
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-    jaxb:version="2.1" elementFormDefault="unqualified"
+    xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+    jaxb:version="3.0" elementFormDefault="unqualified"
     xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
-    xmlns:hj="http://hyperjaxb3.jvnet.org/ejb/schemas/customizations"
-    xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
+    xmlns:hj="urn:hyperjaxb3.jvnet.org:ejb:schemas:customizations"
+    xmlns:orm="https://jakarta.ee/xml/ns/persistence/orm"
     xmlns:ns="http://collectionspace.org/services/account"
     xmlns="http://collectionspace.org/services/account"
     targetNamespace="http://collectionspace.org/services/account"

diff --git a/services/account/jaxb/src/main/resources/bindings.xml b/services/account/jaxb/src/main/resources/bindings.xml
index 72e1e094ba75a6b79cfc4baf6795ba14822e3c95..3ab541070589fdbc2e3604752f02e13951996acd 100644 (file)
--- a/services/account/jaxb/src/main/resources/bindings.xml
+++ b/services/account/jaxb/src/main/resources/bindings.xml
@@ -1,17 +1,5 @@
 <?xml version="1.0"?>
-<jxb:bindings version="1.0"
-    xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:namespace="http://jaxb2-commons.dev.java.net/namespace-prefix"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd
-    http://jaxb2-commons.dev.java.net/namespace-prefix https://raw.githubusercontent.com/Siggen/jaxb2-namespace-prefix/master/src/main/resources/prefix-namespace-schema.xsd">
-
-    <jxb:bindings schemaLocation="accounts_common.xsd">
-        <jxb:bindings>
-            <namespace:prefix name="act" />
-            <!-- Additional @XmlNs prefix declarations to take effect for this schema/package -->
-            <namespace:prefix name="xsi" namespaceURI="http://www.w3.org/2001/XMLSchema-instance" />
-        </jxb:bindings>
-    </jxb:bindings>
-
-</jxb:bindings>
\ No newline at end of file
+<jxb:bindings version="3.0"
+    xmlns:jxb="https://jakarta.ee/xml/ns/jaxb"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+</jxb:bindings>

diff --git a/services/account/jaxb/src/main/resources/instance1.xml b/services/account/jaxb/src/main/resources/instance1.xml
index 90c47c8eb4c7130075a1abdc50c8d08bb0a15a28..e48e7d40d545ab2466ca81ee72b4744cd5760185 100644 (file)
--- a/services/account/jaxb/src/main/resources/instance1.xml
+++ b/services/account/jaxb/src/main/resources/instance1.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ns:accounts_common xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+<ns:accounts_common xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
  xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
- xmlns:hj="http://hyperjaxb3.jvnet.org/ejb/schemas/customizations"
- xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
+ xmlns:hj="urn:hyperjaxb3.jvnet.org:ejb:schemas:customizations"
+ xmlns:orm="https://jakarta.ee/xml/ns/persistence/orm"
  xmlns:ns="http://collectionspace.org/services/account"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://collectionspace.org/services/account file:/Users/remillet/dev/src/cspace/services/services/account/jaxb/src/main/resources/accounts_common.xsd" csid="csid0">

diff --git a/services/account/pstore/pom.xml b/services/account/pstore/pom.xml
index ff9b8f050d363d7840d07e3ac9df315274e46f93..1939df4c2c4743bbc39a9dc33203bfc27ec3863f 100644 (file)
--- a/services/account/pstore/pom.xml
+++ b/services/account/pstore/pom.xml
@@ -18,7 +18,7 @@
 
        <dependencies>
                <dependency>
-                       <groupId>com.sun.xml.bind</groupId>
+                       <groupId>org.glassfish.jaxb</groupId>
                        <artifactId>jaxb-core</artifactId>
                </dependency>
                <dependency>

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 f6e45ccfefbeb647b61fea135fa36bf17bd41ae2..6f8ddf0902cd4e81a202c287dbb12ea18a0e5f29 100644 (file)
--- 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 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<persistence version="1.0" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd
-             http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<persistence version="1.0" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_1_0.xsd
+             https://jakarta.ee/xml/ns/persistence/orm https://jakarta.ee/xml/ns/persistence/orm_1_0.xsd" xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:orm="https://jakarta.ee/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <persistence-unit name="org.collectionspace.services.account">
         <class>org.collectionspace.services.account.AccountsCommon</class>
         <class>org.collectionspace.services.account.Tenant</class>

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 27f1c6e0ef3df34f8b68c269fceb4700b10a259b..6c4c7e27116e111648d7c2bbbf891779f725b8e4 100644 (file)
--- 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 6cfb2412d216e570b1ee68e5a32641bdad1e49d3..37ab609f37a99ed6ff89311f4e1f74cf8d510355 100644 (file)
--- a/services/acquisition/jaxb/pom.xml
+++ b/services/acquisition/jaxb/pom.xml
@@ -25,8 +25,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
index 76587655f203434614cd13f55a1abd7db6c27aec..06740d030ea2707a3e4951dff5abe6edae65d95b 100644 (file)
--- a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
+++ b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
@@ -13,8 +13,8 @@
 
 <xs:schema 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="1.0" elementFormDefault="unqualified"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns:ns="http://collectionspace.org/services/acquisition"
   xmlns="http://collectionspace.org/services/acquisition"
   targetNamespace="http://collectionspace.org/services/acquisition"

diff --git a/services/advancedsearch/jaxb/pom.xml b/services/advancedsearch/jaxb/pom.xml
index 110fcc0bb64f8e2bb309efe402ddaf0c9f6207d3..7c8174b48e1d4cf8b8e66d08b2350142719d4ecc 100644 (file)
--- a/services/advancedsearch/jaxb/pom.xml
+++ b/services/advancedsearch/jaxb/pom.xml
@@ -35,8 +35,8 @@
     <defaultGoal>install</defaultGoal>
     <plugins>
       <plugin>
-        <groupId>org.jvnet.jaxb2.maven2</groupId>
-        <artifactId>maven-jaxb2-plugin</artifactId>
+        <groupId>org.jvnet.jaxb</groupId>
+        <artifactId>jaxb-maven-plugin</artifactId>
       </plugin>
     </plugins>
   </build>

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 f6b28889f95a0defaf6ba8a80b10eb5caa63544b..8c81557dc3bdb9829e1c8246295d11dc8fb24f08 100644 (file)
--- 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 @@
 
 <xs:schema
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="2.0"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0"
   xmlns="http://collectionspace.org/services/advancedsearch"
   targetNamespace="http://collectionspace.org/services/advancedsearch"
   version="0.1"

diff --git a/services/advancedsearch/service/src/main/java/org/collectionspace/services/advancedsearch/AdvancedSearch.java b/services/advancedsearch/service/src/main/java/org/collectionspace/services/advancedsearch/AdvancedSearch.java
index 13042ca62aedfdd33e97597751df70a4bb97e90d..6104dc5bc9bd5822d4a07407f41c846aeee5e13e 100644 (file)
--- a/services/advancedsearch/service/src/main/java/org/collectionspace/services/advancedsearch/AdvancedSearch.java
+++ b/services/advancedsearch/service/src/main/java/org/collectionspace/services/advancedsearch/AdvancedSearch.java
@@ -12,8 +12,8 @@ import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.Request;
 import javax.ws.rs.core.UriInfo;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
 
 import org.collectionspace.services.MediaJAXBSchema;
 import org.collectionspace.services.advancedsearch.AdvancedsearchCommonList.AdvancedsearchListItem;

diff --git a/services/advancedsearch/service/src/main/java/org/collectionspace/services/advancedsearch/AdvancedSearchJAXBContext.java b/services/advancedsearch/service/src/main/java/org/collectionspace/services/advancedsearch/AdvancedSearchJAXBContext.java
index 9a1bb24d94ca2054989d1db083e8873d6213d74b..9f565566e344999cebb7f0687c36ba6d76082aa4 100644 (file)
--- a/services/advancedsearch/service/src/main/java/org/collectionspace/services/advancedsearch/AdvancedSearchJAXBContext.java
+++ b/services/advancedsearch/service/src/main/java/org/collectionspace/services/advancedsearch/AdvancedSearchJAXBContext.java
@@ -1,7 +1,7 @@
 package org.collectionspace.services.advancedsearch;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
 
 import org.collectionspace.collectionspace_core.CollectionSpaceCore;
 import org.collectionspace.services.collectionobject.CollectionobjectsCommon;

diff --git a/services/advancedsearch/service/src/main/java/org/collectionspace/services/advancedsearch/mapper/CollectionObjectMapper.java b/services/advancedsearch/service/src/main/java/org/collectionspace/services/advancedsearch/mapper/CollectionObjectMapper.java
index 08c0311f9aaa74180d4a8d7bb42fe6adeb129849..b0d99b3aa7867d9cd1cedf7fbd40b85757acb094 100644 (file)
--- a/services/advancedsearch/service/src/main/java/org/collectionspace/services/advancedsearch/mapper/CollectionObjectMapper.java
+++ b/services/advancedsearch/service/src/main/java/org/collectionspace/services/advancedsearch/mapper/CollectionObjectMapper.java
@@ -7,8 +7,8 @@ import static org.collectionspace.services.client.CollectionSpaceClient.PART_COM
 import static org.collectionspace.services.client.CollectionSpaceClient.PART_LABEL_SEPARATOR;
 
 import java.util.Map;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
 import org.collectionspace.collectionspace_core.CollectionSpaceCore;
 import org.collectionspace.services.MediaJAXBSchema;
 import org.collectionspace.services.advancedsearch.AdvancedsearchCommonList.AdvancedsearchListItem;

diff --git a/services/authentication/client/src/test/resources/META-INF/persistence.xml b/services/authentication/client/src/test/resources/META-INF/persistence.xml
index 9577e73190cfd08e94cb5c4ecc781c974a9a1111..27653a27b0ff6dd531d55419cd1d2fa353005186 100644 (file)
--- a/services/authentication/client/src/test/resources/META-INF/persistence.xml
+++ b/services/authentication/client/src/test/resources/META-INF/persistence.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<persistence version="1.0" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd
-http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<persistence version="1.0" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_1_0.xsd
+https://jakarta.ee/xml/ns/persistence/orm https://jakarta.ee/xml/ns/persistence/orm_1_0.xsd" xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:orm="https://jakarta.ee/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <persistence-unit name="org.collectionspace.services.authentication">
         <class>org.collectionspace.services.authentication.User</class>
         <class>org.collectionspace.services.authorization.Role</class>

diff --git a/services/authentication/jaxb/pom.xml b/services/authentication/jaxb/pom.xml
index 0bb200657ec05937066dddf1dd6ec3c32f330f0d..46cb1d2ceabcd176e12ca814485174272db1c22a 100644 (file)
--- a/services/authentication/jaxb/pom.xml
+++ b/services/authentication/jaxb/pom.xml
@@ -20,7 +20,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
+            <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-core</artifactId>
         </dependency>
         <dependency>
@@ -28,8 +28,8 @@
             <artifactId>property-listener-injector</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.persistence</groupId>
-            <artifactId>persistence-api</artifactId>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
@@ -41,7 +41,7 @@
             <artifactId>dom4j</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.jvnet.hyperjaxb3</groupId>
+            <groupId>org.jvnet.jaxb</groupId>
             <artifactId>hyperjaxb3-ejb-runtime</artifactId>
         </dependency>
 
@@ -52,9 +52,9 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <!-- maven-hyperjaxb3-plugin generates jaxb + jpa bindings -->
-                <groupId>org.jvnet.hyperjaxb3</groupId>
-                <artifactId>maven-hyperjaxb3-plugin</artifactId>
+                <!-- hyperjaxb3-maven-plugin generates jaxb + jpa bindings -->
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>hyperjaxb3-maven-plugin</artifactId>
             </plugin>
 
         </plugins>

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 6971c27157ee24b7fc15630a7fbbfeb89c304f83..d1ad0d939ba755300a0bc2fbe35f9ddf4dcb1cdb 100644 (file)
--- 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 @@
 
 <xs:schema 
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-    xmlns:hj="http://hyperjaxb3.jvnet.org/ejb/schemas/customizations"
-    xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
+    xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+    xmlns:hj="urn:hyperjaxb3.jvnet.org:ejb:schemas:customizations"
+    xmlns:orm="https://jakarta.ee/xml/ns/persistence/orm"
     xmlns:ns="http://collectionspace.org/services/authentication"
     xmlns="http://collectionspace.org/services/authentication"
     targetNamespace="http://collectionspace.org/services/authentication"

diff --git a/services/authentication/jaxb/src/test/resources/META-INF/persistence.xml b/services/authentication/jaxb/src/test/resources/META-INF/persistence.xml
index a9564d02da408c4ae0a56b6ffbe7a3e4b0b867e0..4a3a1ae87212b06633be800951a407ce47f4283f 100644 (file)
--- a/services/authentication/jaxb/src/test/resources/META-INF/persistence.xml
+++ b/services/authentication/jaxb/src/test/resources/META-INF/persistence.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<persistence version="1.0" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd
-http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<persistence version="1.0" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_1_0.xsd
+https://jakarta.ee/xml/ns/persistence/orm https://jakarta.ee/xml/ns/persistence/orm_1_0.xsd" xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:orm="https://jakarta.ee/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <persistence-unit name="org.collectionspace.services.authentication">
     <class>org.collectionspace.services.authentication.User</class>
         <properties>

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 2844198043b96983f0c62a86f9b0cf660223fc95..8abd6a28a624eb9cbb34672db05658bc914990bd 100644 (file)
--- 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 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<persistence version="1.0" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd
-http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<persistence version="1.0" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_1_0.xsd
+https://jakarta.ee/xml/ns/persistence/orm https://jakarta.ee/xml/ns/persistence/orm_1_0.xsd" xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:orm="https://jakarta.ee/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <persistence-unit name="org.collectionspace.services.authentication">
         <class>org.collectionspace.services.authentication.User</class>
         <class>org.collectionspace.services.authentication.Token</class>

diff --git a/services/authority/jaxb/pom.xml b/services/authority/jaxb/pom.xml
index cd38021b2f185f9737a00fdfae6f47c450659c42..36663e7f8c404565ab8e81e4412d0d7563a36b56 100644 (file)
--- a/services/authority/jaxb/pom.xml
+++ b/services/authority/jaxb/pom.xml
@@ -14,7 +14,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
+            <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-core</artifactId>
         </dependency>
         <dependency>

diff --git a/services/authority/pom.xml b/services/authority/pom.xml
index 62f9ec0bb853003746cb2db894b1ec8a9c496dd0..be4a823aa7a850eb14aeb19e3b7cf151dae57277 100644 (file)
--- a/services/authority/pom.xml
+++ b/services/authority/pom.xml
@@ -50,8 +50,8 @@
                                                <artifactId>postgresql</artifactId>
                                </dependency>
          <dependency>
-            <groupId>javax.persistence</groupId>
-            <artifactId>persistence-api</artifactId>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
         </dependency>
 
         <!-- jboss -->

diff --git a/services/authority/service/pom.xml b/services/authority/service/pom.xml
index d0ec4e86bacdb50f347fefffb844f624de5276d3..7a31297ed195f0d83fdd33f8489eb810a9516924 100644 (file)
--- a/services/authority/service/pom.xml
+++ b/services/authority/service/pom.xml
@@ -141,12 +141,12 @@
                        <artifactId>postgresql</artifactId>
                </dependency>
                <dependency>
-                       <groupId>javax.persistence</groupId>
-                       <artifactId>persistence-api</artifactId>
+                       <groupId>jakarta.persistence</groupId>
+                       <artifactId>jakarta.persistence-api</artifactId>
                </dependency>
 
                <dependency>
-                       <groupId>com.sun.xml.bind</groupId>
+                       <groupId>org.glassfish.jaxb</groupId>
                        <artifactId>jaxb-core</artifactId>
                </dependency>
                <dependency>

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 51c722f65e076984299c8722a5fa2beaf0dd0b4a..1341fc4e6ef42ae3b6f49582028dc21ee9f7ad66 100644 (file)
--- 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 7ac92c819254fe45ca8d38b3e773f9520df88347..30079397ce7c8f0342bf7306185f50ccd4ad7381 100644 (file)
--- 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 b694ab8554b9b700919adde8a87ab1274cf91162..dab58b100c08d60f441f38ee66c9dcd207af512c 100644 (file)
--- 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 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<persistence version="1.0" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd
-             http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<persistence version="1.0" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_1_0.xsd
+             https://jakarta.ee/xml/ns/persistence/orm https://jakarta.ee/xml/ns/persistence/orm_1_0.xsd" xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:orm="https://jakarta.ee/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <persistence-unit name="org.collectionspace.services.authorization">
         <class>org.collectionspace.services.authorization.perms.Permission</class>
         <class>org.collectionspace.services.authorization.perms.PermissionAction</class>

diff --git a/services/authorization-mgt/jaxb/pom.xml b/services/authorization-mgt/jaxb/pom.xml
index 866b1c95c80e71650ab27eda39396d7c13368deb..f748cfc0845f6ffd9851f337ef7800f9e7f37ade 100644 (file)
--- a/services/authorization-mgt/jaxb/pom.xml
+++ b/services/authorization-mgt/jaxb/pom.xml
@@ -15,7 +15,7 @@
     <dependencies>
 
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
+            <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-core</artifactId>
         </dependency>
         <dependency>
@@ -23,8 +23,8 @@
             <artifactId>property-listener-injector</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.persistence</groupId>
-            <artifactId>persistence-api</artifactId>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
@@ -36,7 +36,7 @@
             <artifactId>dom4j</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.jvnet.hyperjaxb3</groupId>
+            <groupId>org.jvnet.jaxb</groupId>
             <artifactId>hyperjaxb3-ejb-runtime</artifactId>
         </dependency>
         <dependency>
@@ -56,9 +56,9 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <!-- maven-hyperjaxb3-plugin generates jaxb + jpa bindings -->
-                <groupId>org.jvnet.hyperjaxb3</groupId>
-                <artifactId>maven-hyperjaxb3-plugin</artifactId>
+                <!-- hyperjaxb3-maven-plugin generates jaxb + jpa bindings -->
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>hyperjaxb3-maven-plugin</artifactId>
             </plugin>
         </plugins>
     </build>

diff --git a/services/authorization-mgt/service/pom.xml b/services/authorization-mgt/service/pom.xml
index 2cd2f0886606dad31f453231071e565353ab09fd..1ce9ae52e6eb20e0bf8a8013d9aa746055ccfc89 100644 (file)
--- a/services/authorization-mgt/service/pom.xml
+++ b/services/authorization-mgt/service/pom.xml
@@ -133,8 +133,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>

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 0e453481389793a346db045d7c868a9e922fba42..835b7c893977fa60515b13398296e1c6d2103c0e 100644 (file)
--- 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 f6d096318967c8ef6e1adfe3840b2ec8d1844249..8fad571641e118a5bc6fcd6d8fcfd290aa6eb86a 100644 (file)
--- a/services/authorization/jaxb/pom.xml
+++ b/services/authorization/jaxb/pom.xml
@@ -14,20 +14,20 @@
     </properties>
     <dependencies>
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
+            <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jvnet.jaxb2-commons</groupId>
             <artifactId>property-listener-injector</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.persistence</groupId>
-            <artifactId>persistence-api</artifactId>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
@@ -43,7 +43,7 @@
             <artifactId>hibernate-c3p0</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.jvnet.hyperjaxb3</groupId>
+            <groupId>org.jvnet.jaxb</groupId>
             <artifactId>hyperjaxb3-ejb-runtime</artifactId>
         </dependency>
         <dependency>
@@ -52,16 +52,16 @@
                        <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
         </dependency>
 <!--
         <dependency>
-            <groupId>javax.persistence</groupId>
-            <artifactId>persistence-api</artifactId>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.jvnet.hyperjaxb3</groupId>
+            <groupId>org.jvnet.jaxb</groupId>
             <artifactId>hyperjaxb3-ejb-runtime</artifactId>
         </dependency>
         <dependency>
@@ -74,8 +74,8 @@
                        <version>${project.version}</version>
                        <exclusions>
                                <exclusion>
-                                       <artifactId>jaxb-impl</artifactId>
-                                       <groupId>com.sun.xml.bind</groupId>
+                                       <artifactId>jaxb-runtime</artifactId>
+                                       <groupId>org.glassfish.jaxb</groupId>
                                </exclusion>
                        </exclusions>
         </dependency>
@@ -87,8 +87,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.hyperjaxb3</groupId>
-                <artifactId>maven-hyperjaxb3-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>hyperjaxb3-maven-plugin</artifactId>
             </plugin>
         </plugins>
     </build>

diff --git a/services/authorization/jaxb/src/main/resources/accounts_permissions.xsd b/services/authorization/jaxb/src/main/resources/accounts_permissions.xsd
index 9617f0827820f8cf19c0a897a673614b572678df..3f70ec4e2f43abb36c2f89a16ce4de1230c69dde 100644 (file)
--- a/services/authorization/jaxb/src/main/resources/accounts_permissions.xsd
+++ b/services/authorization/jaxb/src/main/resources/accounts_permissions.xsd
@@ -9,11 +9,11 @@
 
 <xs:schema
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-    jaxb:version="1.0" elementFormDefault="unqualified"
+    xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+    jaxb:version="3.0" elementFormDefault="unqualified"
     xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
-    xmlns:hj="http://hyperjaxb3.jvnet.org/ejb/schemas/customizations"
-    xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
+    xmlns:hj="urn:hyperjaxb3.jvnet.org:ejb:schemas:customizations"
+    xmlns:orm="https://jakarta.ee/xml/ns/persistence/orm"
     xmlns:ns="http://collectionspace.org/services/authorization"
     xmlns="http://collectionspace.org/services/authorization"
     targetNamespace="http://collectionspace.org/services/authorization"

diff --git a/services/authorization/jaxb/src/main/resources/accounts_roles.xsd b/services/authorization/jaxb/src/main/resources/accounts_roles.xsd
index 58af0e53d03f8a028ffd74a42602348e4cc07d3c..3fca48aee19048a3d8fd237b840acbe2eaefd0f9 100644 (file)
--- a/services/authorization/jaxb/src/main/resources/accounts_roles.xsd
+++ b/services/authorization/jaxb/src/main/resources/accounts_roles.xsd
@@ -12,11 +12,11 @@
 
 <xs:schema
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-    jaxb:version="1.0" elementFormDefault="unqualified"
+    xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+    jaxb:version="3.0" elementFormDefault="unqualified"
     xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
-    xmlns:hj="http://hyperjaxb3.jvnet.org/ejb/schemas/customizations"
-    xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
+    xmlns:hj="urn:hyperjaxb3.jvnet.org:ejb:schemas:customizations"
+    xmlns:orm="https://jakarta.ee/xml/ns/persistence/orm"
     xmlns:ns="http://collectionspace.org/services/authorization"
     xmlns="http://collectionspace.org/services/authorization"
     targetNamespace="http://collectionspace.org/services/authorization"

diff --git a/services/authorization/jaxb/src/main/resources/authorization_common.xsd b/services/authorization/jaxb/src/main/resources/authorization_common.xsd
index 9eb30df733a8389d80529ec0614ffeb04eff6b24..59c133969660bd409f9c5832eabc529bf9687fc7 100644 (file)
--- a/services/authorization/jaxb/src/main/resources/authorization_common.xsd
+++ b/services/authorization/jaxb/src/main/resources/authorization_common.xsd
@@ -12,11 +12,11 @@
 
 <xs:schema 
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-    jaxb:version="1.0" elementFormDefault="unqualified"
+    xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+    jaxb:version="3.0" elementFormDefault="unqualified"
     xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
-    xmlns:hj="http://hyperjaxb3.jvnet.org/ejb/schemas/customizations"
-    xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
+    xmlns:hj="urn:hyperjaxb3.jvnet.org:ejb:schemas:customizations"
+    xmlns:orm="https://jakarta.ee/xml/ns/persistence/orm"
     xmlns:ans="http://collectionspace.org/services/authorization"
     xmlns="http://collectionspace.org/services/authorization"
     targetNamespace="http://collectionspace.org/services/authorization"

diff --git a/services/authorization/jaxb/src/main/resources/bindings.xjb b/services/authorization/jaxb/src/main/resources/bindings.xjb
index 8dbc3efffb11cd77c95ab10d425285b78df7dcf8..7423fac38007ada6d1b770fada5667a72647a10d 100644 (file)
--- a/services/authorization/jaxb/src/main/resources/bindings.xjb
+++ b/services/authorization/jaxb/src/main/resources/bindings.xjb
@@ -1,5 +1,5 @@
-<jaxb:bindings version="1.0"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+<jaxb:bindings version="3.0"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
   xmlns:xsd="http://www.w3.org/2001/XMLSchema"
   xmlns:annox="http://annox.dev.java.net"
   xmlns:xs="http://www.w3.org/2001/XMLSchema">
@@ -7,21 +7,21 @@
     <jaxb:bindings schemaLocation="permissions_roles.xsd" node="/xs:schema">
         <jaxb:bindings node="xs:complexType[@name='permission_role']">
             <annox:annotate>
-                <annox:annotate annox:class="javax.xml.bind.annotation.XmlRootElement" name="permission_role" />
+                <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="permission_role" />
             </annox:annotate>
         </jaxb:bindings>
     </jaxb:bindings>
        <jaxb:bindings schemaLocation="accounts_roles.xsd" node="/xs:schema">
         <jaxb:bindings node="xs:complexType[@name='account_role']">
             <annox:annotate>
-                <annox:annotate annox:class="javax.xml.bind.annotation.XmlRootElement" name="account_role" />
+                <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="account_role" />
             </annox:annotate>
         </jaxb:bindings>
     </jaxb:bindings>
        <jaxb:bindings schemaLocation="accounts_permissions.xsd" node="/xs:schema">
         <jaxb:bindings node="xs:complexType[@name='account_permission']">
             <annox:annotate>
-                <annox:annotate annox:class="javax.xml.bind.annotation.XmlRootElement" name="account_permission" />
+                <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="account_permission" />
             </annox:annotate>
         </jaxb:bindings>
     </jaxb:bindings>

diff --git a/services/authorization/jaxb/src/main/resources/permissions_roles.xsd b/services/authorization/jaxb/src/main/resources/permissions_roles.xsd
index 00a7e9646179877ad50d7b9520badb59c5d6e9cf..ed3820b0e16b95001e45d58936df34ec0dc5aab2 100644 (file)
--- a/services/authorization/jaxb/src/main/resources/permissions_roles.xsd
+++ b/services/authorization/jaxb/src/main/resources/permissions_roles.xsd
@@ -12,11 +12,11 @@
 
 <xs:schema
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-    jaxb:version="1.0" elementFormDefault="unqualified"
+    xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+    jaxb:version="3.0" elementFormDefault="unqualified"
     xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
-    xmlns:hj="http://hyperjaxb3.jvnet.org/ejb/schemas/customizations"
-    xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
+    xmlns:hj="urn:hyperjaxb3.jvnet.org:ejb:schemas:customizations"
+    xmlns:orm="https://jakarta.ee/xml/ns/persistence/orm"
     xmlns:ns="http://collectionspace.org/services/authorization"
     xmlns="http://collectionspace.org/services/authorization"
     targetNamespace="http://collectionspace.org/services/authorization"

diff --git a/services/authorization/jaxb/src/main/resources/roles.xsd b/services/authorization/jaxb/src/main/resources/roles.xsd
index ee8cc7caf3427bf3dfd5193fbd8a36afff033703..4dd5bf7fc04101b8f3ae8405ca2733e57eccc646 100644 (file)
--- a/services/authorization/jaxb/src/main/resources/roles.xsd
+++ b/services/authorization/jaxb/src/main/resources/roles.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <xs:schema 
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-    jaxb:version="2.1" elementFormDefault="unqualified"
+    xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+    jaxb:version="3.0" elementFormDefault="unqualified"
     xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
-    xmlns:hj="http://hyperjaxb3.jvnet.org/ejb/schemas/customizations"
-    xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
+    xmlns:hj="urn:hyperjaxb3.jvnet.org:ejb:schemas:customizations"
+    xmlns:orm="https://jakarta.ee/xml/ns/persistence/orm"
     xmlns:ns="http://collectionspace.org/services/authorization"
     xmlns="http://collectionspace.org/services/authorization"
     targetNamespace="http://collectionspace.org/services/authorization"

diff --git a/services/authorization/jaxb/src/main/resources/roles_list.xsd b/services/authorization/jaxb/src/main/resources/roles_list.xsd
index b83b3dcb988b5c5cada5fdb6130f09c8405e0e90..4200affde847d1ee397ac79dedf9099784e274c2 100644 (file)
--- a/services/authorization/jaxb/src/main/resources/roles_list.xsd
+++ b/services/authorization/jaxb/src/main/resources/roles_list.xsd
@@ -12,10 +12,10 @@
 
 <xs:schema 
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-    jaxb:version="1.0" elementFormDefault="unqualified"
-    xmlns:hj="http://hyperjaxb3.jvnet.org/ejb/schemas/customizations"
-    xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
+    xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+    jaxb:version="3.0" elementFormDefault="unqualified"
+    xmlns:hj="urn:hyperjaxb3.jvnet.org:ejb:schemas:customizations"
+    xmlns:orm="https://jakarta.ee/xml/ns/persistence/orm"
     xmlns:ns="http://collectionspace.org/services/authorization"
     xmlns="http://collectionspace.org/services/authorization"
     targetNamespace="http://collectionspace.org/services/authorization"

diff --git a/services/authorization/pstore/src/test/resources/META-INF/persistence.xml b/services/authorization/pstore/src/test/resources/META-INF/persistence.xml
index 52fe747e8647b69fe4eafed0b4873db127cb1b4e..748decd5bf8d83c719230523e9441797afe26c58 100644 (file)
--- a/services/authorization/pstore/src/test/resources/META-INF/persistence.xml
+++ b/services/authorization/pstore/src/test/resources/META-INF/persistence.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<persistence version="1.0" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd
-             http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<persistence version="1.0" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_1_0.xsd
+             https://jakarta.ee/xml/ns/persistence/orm https://jakarta.ee/xml/ns/persistence/orm_1_0.xsd" xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:orm="https://jakarta.ee/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <persistence-unit name="org.collectionspace.services.authorization">
         <class>org.collectionspace.services.authorization.perms.Permission</class>
         <class>org.collectionspace.services.authorization.perms.PermissionAction</class>

diff --git a/services/batch/3rdparty/nuxeo-platform-cs-batch/src/main/resources/schemas/batch_common-template.xml b/services/batch/3rdparty/nuxeo-platform-cs-batch/src/main/resources/schemas/batch_common-template.xml
index 53890a8fce8897c44f47b6e9d0ab467b35dfa45f..1dab62230a224ae2534e46eb0a1bfad562f0cfbc 100644 (file)
--- a/services/batch/3rdparty/nuxeo-platform-cs-batch/src/main/resources/schemas/batch_common-template.xml
+++ b/services/batch/3rdparty/nuxeo-platform-cs-batch/src/main/resources/schemas/batch_common-template.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ns:batch_common xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" 
+<ns:batch_common xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" 
     xmlns:ns="http://collectionspace.org/services/batch" 
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://collectionspace.org/services/batch file:batch_common.xsd">

diff --git a/services/batch/jaxb/pom.xml b/services/batch/jaxb/pom.xml
index 2fa0df460c2203077c390ffb1e62184ec82920fc..cb2204591fff2ec0f0ecff28ea2473fb74fc7394 100644 (file)
--- a/services/batch/jaxb/pom.xml
+++ b/services/batch/jaxb/pom.xml
@@ -30,8 +30,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/batch/jaxb/src/main/resources/batch_common-template.xml b/services/batch/jaxb/src/main/resources/batch_common-template.xml
index 53890a8fce8897c44f47b6e9d0ab467b35dfa45f..1dab62230a224ae2534e46eb0a1bfad562f0cfbc 100644 (file)
--- a/services/batch/jaxb/src/main/resources/batch_common-template.xml
+++ b/services/batch/jaxb/src/main/resources/batch_common-template.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ns:batch_common xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" 
+<ns:batch_common xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" 
     xmlns:ns="http://collectionspace.org/services/batch" 
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://collectionspace.org/services/batch file:batch_common.xsd">

diff --git a/services/batch/jaxb/src/main/resources/batch_common.xsd b/services/batch/jaxb/src/main/resources/batch_common.xsd
index dd1437fa59ea63a8a0385569a901cc48a1a1306b..308bbc8095c4b615d37e52b37c7b7e73459a2337 100644 (file)
--- a/services/batch/jaxb/src/main/resources/batch_common.xsd
+++ b/services/batch/jaxb/src/main/resources/batch_common.xsd
@@ -2,8 +2,8 @@
 
 <xs:schema 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="1.0" elementFormDefault="unqualified"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns:ns="http://collectionspace.org/services/batch"
   xmlns="http://collectionspace.org/services/batch"
   targetNamespace="http://collectionspace.org/services/batch"

diff --git a/services/batch/jaxb/src/main/resources/instance1.xml b/services/batch/jaxb/src/main/resources/instance1.xml
index aa3a12cb811a18e71de5e33859df02d3b006baf3..e56a736e6c03158592fcc6d7105dcff4d294e4bb 100644 (file)
--- a/services/batch/jaxb/src/main/resources/instance1.xml
+++ b/services/batch/jaxb/src/main/resources/instance1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ns:document xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+<ns:document xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
  xmlns:ns="http://collectionspace.org/services/batch"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://collectionspace.org/services/batch file:/C:/dev/src/cspace/services/services/batch/jaxb/src/main/resources/batch_common_document.xsd">

diff --git a/services/blob/jaxb/pom.xml b/services/blob/jaxb/pom.xml
index 3782e8678db4a078a7a93a46281157ca7302a04f..55997ae7a609d9b650cf6cc3acc6012f293234d5 100644 (file)
--- a/services/blob/jaxb/pom.xml
+++ b/services/blob/jaxb/pom.xml
@@ -26,8 +26,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/chronology/jaxb/pom.xml b/services/chronology/jaxb/pom.xml
index 18f1d76d1db7f6d4289be915959de80f74915b7c..8d16dbd940d0232ce5e46394ad4937e906ac916e 100644 (file)
--- a/services/chronology/jaxb/pom.xml
+++ b/services/chronology/jaxb/pom.xml
@@ -31,8 +31,8 @@
     <defaultGoal>install</defaultGoal>
     <plugins>
       <plugin>
-        <groupId>org.jvnet.jaxb2.maven2</groupId>
-        <artifactId>maven-jaxb2-plugin</artifactId>
+        <groupId>org.jvnet.jaxb</groupId>
+        <artifactId>jaxb-maven-plugin</artifactId>
       </plugin>
     </plugins>
   </build>

diff --git a/services/chronology/jaxb/src/main/resources/chronology_common.xsd b/services/chronology/jaxb/src/main/resources/chronology_common.xsd
index 20c3d4d7407f10b72218510a5b6c656766ad6a5f..8a96944bdb4b799881d3bc1f8ae0510d9833adc9 100644 (file)
--- a/services/chronology/jaxb/src/main/resources/chronology_common.xsd
+++ b/services/chronology/jaxb/src/main/resources/chronology_common.xsd
@@ -10,8 +10,8 @@
 
 <xs:schema
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="1.0" elementFormDefault="unqualified"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns="http://collectionspace.org/services/chronology"
   targetNamespace="http://collectionspace.org/services/chronology"
   version="0.1"

diff --git a/services/chronology/jaxb/src/main/resources/chronologyauthority_common.xsd b/services/chronology/jaxb/src/main/resources/chronologyauthority_common.xsd
index 3faef2bf3fd297b30297b5327159eb0fb6c9bb14..a767662da2d61b188dfde8bc11c899c55364ffba 100644 (file)
--- a/services/chronology/jaxb/src/main/resources/chronologyauthority_common.xsd
+++ b/services/chronology/jaxb/src/main/resources/chronologyauthority_common.xsd
@@ -10,8 +10,8 @@
 
 <xs:schema
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="1.0" elementFormDefault="unqualified"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns="http://collectionspace.org/services/chronology"
   targetNamespace="http://collectionspace.org/services/chronology"
   version="0.1"

diff --git a/services/citation/jaxb/pom.xml b/services/citation/jaxb/pom.xml
index 52784c552bf474d15792162d1c5668ae2810398b..cf16f0f6fec25b032688a55b3bbd1913a0485121 100644 (file)
--- a/services/citation/jaxb/pom.xml
+++ b/services/citation/jaxb/pom.xml
@@ -35,8 +35,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/citation/jaxb/src/main/resources/citation_common.xsd b/services/citation/jaxb/src/main/resources/citation_common.xsd
index 056629752e00049074ce56e600c89bed7cf38052..85afcb94114410b7b91d0254f8346f9e8fdbadb4 100644 (file)
--- a/services/citation/jaxb/src/main/resources/citation_common.xsd
+++ b/services/citation/jaxb/src/main/resources/citation_common.xsd
@@ -10,8 +10,8 @@
 
 <xs:schema 
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-    jaxb:version="1.0" elementFormDefault="unqualified"
+    xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+    jaxb:version="3.0" elementFormDefault="unqualified"
     xmlns:ns="http://collectionspace.org/services/citation"
     xmlns="http://collectionspace.org/services/citation"
     targetNamespace="http://collectionspace.org/services/citation"

diff --git a/services/citation/jaxb/src/main/resources/citationauthority_common.xsd b/services/citation/jaxb/src/main/resources/citationauthority_common.xsd
index 0c7b36d666f31f63ae9475b8eb8082f42f971566..c2716530f3ab2c40627c95c1c0dba5d13dc0d6a6 100644 (file)
--- a/services/citation/jaxb/src/main/resources/citationauthority_common.xsd
+++ b/services/citation/jaxb/src/main/resources/citationauthority_common.xsd
@@ -11,8 +11,8 @@
 
 <xs:schema 
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-    jaxb:version="1.0" elementFormDefault="unqualified"
+    xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+    jaxb:version="3.0" elementFormDefault="unqualified"
     xmlns:ns="http://collectionspace.org/services/citation"
     xmlns="http://collectionspace.org/services/citation"
     targetNamespace="http://collectionspace.org/services/citation"

diff --git a/services/claim/jaxb/pom.xml b/services/claim/jaxb/pom.xml
index eb8396a4a16318038580b0666ad20368a33ca75d..311d141b9985cee5a14abab1474d9aeb1fc26b93 100644 (file)
--- a/services/claim/jaxb/pom.xml
+++ b/services/claim/jaxb/pom.xml
@@ -26,8 +26,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/claim/jaxb/src/main/resources/claims-common.xsd b/services/claim/jaxb/src/main/resources/claims-common.xsd
index 41577046ecf2c1496d0dbb213f616257f7ab2c01..e337376edf54f0112ac4b306a7649a7a54312cea 100644 (file)
--- a/services/claim/jaxb/src/main/resources/claims-common.xsd
+++ b/services/claim/jaxb/src/main/resources/claims-common.xsd
@@ -13,8 +13,8 @@
 
 <xs:schema 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="1.0" elementFormDefault="unqualified"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns:ns="http://collectionspace.org/services/claim"
   xmlns="http://collectionspace.org/services/claim"
   targetNamespace="http://collectionspace.org/services/claim"

diff --git a/services/client/pom.xml b/services/client/pom.xml
index ed12dbd0f0fbff6093afaf4b34ee4c0b8e9a90bb..ac7582d0b87a780747ed43ab042f0a2082921b24 100644 (file)
--- a/services/client/pom.xml
+++ b/services/client/pom.xml
@@ -79,7 +79,7 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-                   <groupId>com.sun.xml.bind</groupId>
+                   <groupId>org.glassfish.jaxb</groupId>
                    <artifactId>jaxb-core</artifactId>
                    <type>jar</type>
                    <scope>compile</scope>

diff --git a/services/client/src/main/java/org/collectionspace/services/client/AbstractServiceClientImpl.java b/services/client/src/main/java/org/collectionspace/services/client/AbstractServiceClientImpl.java
index e2adcb7da97f16fa6734bbbd9238c5de609b197e..dbd124f3b0e59dc3d5f250b4a685a00e607788a0 100644 (file)
--- a/services/client/src/main/java/org/collectionspace/services/client/AbstractServiceClientImpl.java
+++ b/services/client/src/main/java/org/collectionspace/services/client/AbstractServiceClientImpl.java
@@ -33,7 +33,7 @@ import javax.ws.rs.client.ClientRequestContext;
 import javax.ws.rs.client.ClientRequestFilter;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.Response;
-import javax.xml.bind.DatatypeConverter;
+import jakarta.xml.bind.DatatypeConverter;
 
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.UsernamePasswordCredentials;

diff --git a/services/client/src/main/java/org/collectionspace/services/client/CollectionSpaceClientUtils.java b/services/client/src/main/java/org/collectionspace/services/client/CollectionSpaceClientUtils.java
index 7202e56542c58491e432b46c29833bffa8243ce2..842ade0289174d36c1fabec70e490a01f3f8eb8d 100644 (file)
--- a/services/client/src/main/java/org/collectionspace/services/client/CollectionSpaceClientUtils.java
+++ b/services/client/src/main/java/org/collectionspace/services/client/CollectionSpaceClientUtils.java
@@ -31,10 +31,10 @@ 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.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.Unmarshaller;
 import javax.xml.parsers.DocumentBuilderFactory;
 
 import org.apache.commons.io.FileUtils;

diff --git a/services/client/src/main/java/org/collectionspace/services/client/PoxPayload.java b/services/client/src/main/java/org/collectionspace/services/client/PoxPayload.java
index 609c12430d9c12186e7e5da4310bfee5c98ef58c..bb63b06dfe2151a60c81dcb22df009f12001fc3d 100644 (file)
--- a/services/client/src/main/java/org/collectionspace/services/client/PoxPayload.java
+++ b/services/client/src/main/java/org/collectionspace/services/client/PoxPayload.java
@@ -11,10 +11,10 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.Unmarshaller;
 import javax.xml.transform.stream.StreamSource;
 
 import com.sun.xml.bind.api.impl.NameConverter;

diff --git a/services/client/src/main/java/org/collectionspace/services/client/test/BaseServiceTest.java b/services/client/src/main/java/org/collectionspace/services/client/test/BaseServiceTest.java
index 035f164cf592fba85d87e293504ffb3f8d90e1f5..1e9a5dc73dcba98bc57f93234da3b56a158f8b3b 100644 (file)
--- a/services/client/src/main/java/org/collectionspace/services/client/test/BaseServiceTest.java
+++ b/services/client/src/main/java/org/collectionspace/services/client/test/BaseServiceTest.java
@@ -36,12 +36,12 @@ import java.util.Random;
 import javax.activation.MimetypesFileTypeMap;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.Response;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.MarshalException;
-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.MarshalException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.Unmarshaller;
 import javax.xml.namespace.QName;
 import javax.xml.parsers.DocumentBuilderFactory;
 

diff --git a/services/collectionobject/jaxb/pom.xml b/services/collectionobject/jaxb/pom.xml
index c6a6292eee5b1c2bada9be5ee6b36783881d553d..73b93545ddb78671093a4f47f8a978911478432f 100644 (file)
--- a/services/collectionobject/jaxb/pom.xml
+++ b/services/collectionobject/jaxb/pom.xml
@@ -25,8 +25,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>             
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>             
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
index 818ea1ace42a89fb3c8f98d173bacc88d4a1a401..5190cb33aea19fab11c49ce489cb50f2657ccf04 100644 (file)
--- a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
+++ b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
@@ -13,8 +13,8 @@
 
 <xs:schema
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="1.0" elementFormDefault="unqualified"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns:ns="http://collectionspace.org/services/collectionobject"
   xmlns="http://collectionspace.org/services/collectionobject"
   targetNamespace="http://collectionspace.org/services/collectionobject"

diff --git a/services/collectionobject/jaxb/src/main/resources/collectionobjects_nagpra.xsd b/services/collectionobject/jaxb/src/main/resources/collectionobjects_nagpra.xsd
index bfc3b8d2a89afe17cab62d50ee298c778d1733ed..6b7b6bd1c70d976929ae1ed7e556ae1a26289d19 100644 (file)
--- a/services/collectionobject/jaxb/src/main/resources/collectionobjects_nagpra.xsd
+++ b/services/collectionobject/jaxb/src/main/resources/collectionobjects_nagpra.xsd
@@ -9,8 +9,8 @@
 -->
 
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-           jaxb:version="2.0"
+           xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+           jaxb:version="3.0"
            xmlns:common="http://collectionspace.org/services/collectionobject"
            xmlns:nagpra="http://collectionspace.org/services/collectionobject/domain/nagpra"
            targetNamespace="http://collectionspace.org/services/collectionobject/domain/nagpra"

diff --git a/services/collectionobject/jaxb/src/main/resources/collectionobjects_naturalhistory.xsd b/services/collectionobject/jaxb/src/main/resources/collectionobjects_naturalhistory.xsd
index 6830cc54249b77079dd7af948c39fd2673693960..d5502d6447d95854ef28df7fae24ca844191bc21 100644 (file)
--- a/services/collectionobject/jaxb/src/main/resources/collectionobjects_naturalhistory.xsd
+++ b/services/collectionobject/jaxb/src/main/resources/collectionobjects_naturalhistory.xsd
@@ -12,8 +12,8 @@
 -->
 
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="2.0"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0"
   xmlns="http://collectionspace.org/services/collectionobject/domain/naturalhistory_extension"
   targetNamespace="http://collectionspace.org/services/collectionobject/domain/naturalhistory_extension"
   version="0.1"

diff --git a/services/common-api/pom.xml b/services/common-api/pom.xml
index 38741f2089fcd0273a997b72fb0b4518817496c1..5eda79ed4af0e36361144557087233e2f0606c54 100644 (file)
--- a/services/common-api/pom.xml
+++ b/services/common-api/pom.xml
@@ -34,6 +34,11 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+        </dependency>
+
         <!-- Required for XPath processing using dom4j in XmlTools class -->
         <dependency>
             <groupId>jaxen</groupId>

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 95fa0a83b0349ee3d1e7e25a6364fdbac7414b16..b0943c235b3d01e1cf876d55a8d35c936ac7c0e8 100644 (file)
--- 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 7dc3204024d30092652a69539ea54fd8d70aaf70..7b9c995de7fbbfe35486bade745dc12bf6906032 100644 (file)
--- a/services/common/pom.xml
+++ b/services/common/pom.xml
@@ -173,8 +173,8 @@
                        <scope>provided</scope>
                </dependency>
                <dependency>
-                       <groupId>javax.xml.bind</groupId>
-                       <artifactId>jaxb-api</artifactId>
+                       <groupId>jakarta.xml.bind</groupId>
+                       <artifactId>jakarta.xml.bind-api</artifactId>
                </dependency>
                <dependency>
                        <groupId>javax.security</groupId>
@@ -194,8 +194,8 @@
                        <scope>provided</scope>
                </dependency>
                <dependency>
-                       <groupId>javax.persistence</groupId>
-                       <artifactId>persistence-api</artifactId>
+                       <groupId>jakarta.persistence</groupId>
+                       <artifactId>jakarta.persistence-api</artifactId>
                </dependency>
 
                <!-- jboss -->
@@ -419,8 +419,8 @@
                <defaultGoal>install</defaultGoal>
                <plugins>
                        <plugin>
-                               <groupId>org.jvnet.jaxb2.maven2</groupId>
-                               <artifactId>maven-jaxb2-plugin</artifactId>
+                               <groupId>org.jvnet.jaxb</groupId>
+                               <artifactId>jaxb-maven-plugin</artifactId>
                        </plugin>
                        <plugin>
                                <groupId>org.codehaus.mojo</groupId>

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 366634d278e870dfc7efabf6e52fafe8b7d817d4..44355691ac0dbefa890eb27e4306008a96763424 100644 (file)
--- 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 65e18063cd00167d871f448f87155111a07936db..c6bbc4ee51b2e2678175982eafc65b3919550142 100644 (file)
--- 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 b096964a910659248a63b7b76ed601258ffe2f98..db034c0eba54b682a05216d7cdd03947eb19508b 100644 (file)
--- 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 ec1d553baebdd31239bdf901811d8551f1b06b8e..3d35a6167415600a4d2c601aac7545576d9811ea 100644 (file)
--- 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 eb6b0158caa76635b20b6674f6c5d5ba841ecb08..0139e468d7d6d4d11e90886822f586ec9fc1a922 100644 (file)
--- 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 648de4f715cfc9cf0d8eab2f7283898d5a501c4a..5b29334bd0680e5361f1bc3fe3f8814c7f66964f 100644 (file)
--- 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 2fdd5da6ed11ee4321d712340c86fa4804fa091e..2ec195f5a90f07b0164d9495bb27892e2436f961 100644 (file)
--- 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 22b6fc62b7175c2f4dfa0b7dd122a5dae47f0a09..debac3a76ee57d0eda0e6516241e8fea9e7ef117 100644 (file)
--- 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 af24038e3b4c3b32a7cf1b34600b313ad0535b40..50dbcad4a015b95577c84ec2ed32217609be4ea3 100644 (file)
--- a/services/concept/jaxb/pom.xml
+++ b/services/concept/jaxb/pom.xml
@@ -35,8 +35,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/concept/jaxb/src/main/resources/concept_common.xsd b/services/concept/jaxb/src/main/resources/concept_common.xsd
index 505f955bbd3273a845830f872af9464df77828f7..5a3a849ffc247b09a8258f3d977cb5ed3a32e289 100644 (file)
--- a/services/concept/jaxb/src/main/resources/concept_common.xsd
+++ b/services/concept/jaxb/src/main/resources/concept_common.xsd
@@ -10,8 +10,8 @@
 
 <xs:schema 
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-    jaxb:version="1.0" elementFormDefault="unqualified"
+    xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+    jaxb:version="3.0" elementFormDefault="unqualified"
     xmlns:ns="http://collectionspace.org/services/concept"
     xmlns="http://collectionspace.org/services/concept"
     targetNamespace="http://collectionspace.org/services/concept"

diff --git a/services/concept/jaxb/src/main/resources/conceptauthority_common.xsd b/services/concept/jaxb/src/main/resources/conceptauthority_common.xsd
index c319b93fcb927def4388acbd89efcd615326fecd..483de321a589de4eda95deedcbaa0998ef351e7b 100644 (file)
--- a/services/concept/jaxb/src/main/resources/conceptauthority_common.xsd
+++ b/services/concept/jaxb/src/main/resources/conceptauthority_common.xsd
@@ -11,8 +11,8 @@
 
 <xs:schema 
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-    jaxb:version="1.0" elementFormDefault="unqualified"
+    xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+    jaxb:version="3.0" elementFormDefault="unqualified"
     xmlns:ns="http://collectionspace.org/services/concept"
     xmlns="http://collectionspace.org/services/concept"
     targetNamespace="http://collectionspace.org/services/concept"

diff --git a/services/conditioncheck/jaxb/pom.xml b/services/conditioncheck/jaxb/pom.xml
index 0682c762d4459488ba33094ffb35a7b4bdbd501a..514631edd0ca5971e3d70b827f78f753d26bcb49 100644 (file)
--- a/services/conditioncheck/jaxb/pom.xml
+++ b/services/conditioncheck/jaxb/pom.xml
@@ -25,8 +25,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/conditioncheck/jaxb/src/main/resources/conditionchecks-common.xsd b/services/conditioncheck/jaxb/src/main/resources/conditionchecks-common.xsd
index 41a18e46ce337986a4152197aed3bde2e30ff3a0..b2211a86d35692684fb59a7320d0d1c6a157df45 100644 (file)
--- a/services/conditioncheck/jaxb/src/main/resources/conditionchecks-common.xsd
+++ b/services/conditioncheck/jaxb/src/main/resources/conditionchecks-common.xsd
@@ -10,8 +10,8 @@
 
 <xs:schema 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="1.0" elementFormDefault="unqualified"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns:ns="http://collectionspace.org/services/conditioncheck"
   xmlns="http://collectionspace.org/services/conditioncheck"
   targetNamespace="http://collectionspace.org/services/conditioncheck"

diff --git a/services/config/pom.xml b/services/config/pom.xml
index 71136d895106352e553f3128c52402226cc6b61b..288de73f025b54e806fffa8c3daf5c0acab103bf 100644 (file)
--- a/services/config/pom.xml
+++ b/services/config/pom.xml
@@ -27,11 +27,11 @@
             <artifactId>commons-io</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
         </dependency>
         <dependency>
-               <groupId>com.sun.xml.bind</groupId>
+               <groupId>org.glassfish.jaxb</groupId>
                <artifactId>jaxb-core</artifactId>
                <scope>test</scope>
                </dependency>
@@ -42,16 +42,16 @@
                        <scope>test</scope>
                </dependency>
                <dependency>
-                       <groupId>org.jvnet.jaxb2_commons</groupId>
-                       <artifactId>jaxb2-basics</artifactId>
+                       <groupId>org.jvnet.jaxb</groupId>
+                       <artifactId>jaxb-plugins</artifactId>
                </dependency>
         <dependency>
             <groupId>org.jvnet.jaxb2-commons</groupId>
             <artifactId>property-listener-injector</artifactId>
         </dependency>
                <dependency>
-                       <groupId>org.jvnet.jaxb2_commons</groupId>
-                       <artifactId>jaxb2-basics-runtime</artifactId>
+                       <groupId>org.jvnet.jaxb</groupId>
+                       <artifactId>jaxb-plugins-runtime</artifactId>
                </dependency>
                <dependency>
                    <groupId>org.collectionspace.services</groupId>
@@ -65,8 +65,8 @@
        <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

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 a03e118f3555339d3222635d90ce371d86c5c091..8c501ee788f2449fe477a89ef12c1084fc782150 100644 (file)
--- 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 73c612ccf0d86df8da7fc95ecfc8e1ab71f15c3c..6f9b858e57f9d04b75e79b5bbec8268d75b8b5dc 100644 (file)
--- 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 22d256ddd2db09fd9f28c9cbf80399534b429f20..09ba21df646ebd072278e79a7f3c865a3c4f1790 100644 (file)
--- a/services/conservation/jaxb/pom.xml
+++ b/services/conservation/jaxb/pom.xml
@@ -25,8 +25,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/conservation/jaxb/src/main/resources/conservation-common.xsd b/services/conservation/jaxb/src/main/resources/conservation-common.xsd
index cc9a996c6aa56e5e5e217cf7f27ff3aec6dcf5e5..85d00cec4bee953328d00610bc85eda3fb3b5737 100644 (file)
--- a/services/conservation/jaxb/src/main/resources/conservation-common.xsd
+++ b/services/conservation/jaxb/src/main/resources/conservation-common.xsd
@@ -13,8 +13,8 @@
 
 <xs:schema 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="1.0" elementFormDefault="unqualified"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns:ns="http://collectionspace.org/services/conservation"
   xmlns="http://collectionspace.org/services/conservation"
   targetNamespace="http://collectionspace.org/services/conservation"

diff --git a/services/consultation/jaxb/pom.xml b/services/consultation/jaxb/pom.xml
index 98cc8555837fb3075183b0257dfe67b7af6dc463..f3470d4a34f3947de76be1d31b8213f34ecfd2c0 100644 (file)
--- a/services/consultation/jaxb/pom.xml
+++ b/services/consultation/jaxb/pom.xml
@@ -25,8 +25,8 @@
     <defaultGoal>install</defaultGoal>
     <plugins>
       <plugin>
-        <groupId>org.jvnet.jaxb2.maven2</groupId>
-        <artifactId>maven-jaxb2-plugin</artifactId>
+        <groupId>org.jvnet.jaxb</groupId>
+        <artifactId>jaxb-maven-plugin</artifactId>
       </plugin>
     </plugins>
   </build>

diff --git a/services/consultation/jaxb/src/main/resources/consultations_common.xsd b/services/consultation/jaxb/src/main/resources/consultations_common.xsd
index 0f1af8bb802ea0b27f8f099ea788e164d216fbb8..f570f4f1b8d3da77ef044ef47833537a9eb7d67f 100644 (file)
--- a/services/consultation/jaxb/src/main/resources/consultations_common.xsd
+++ b/services/consultation/jaxb/src/main/resources/consultations_common.xsd
@@ -10,8 +10,8 @@
 
 <xs:schema
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="2.0" elementFormDefault="unqualified"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns="http://collectionspace.org/services/consultation"
   targetNamespace="http://collectionspace.org/services/consultation"
   version="0.1"

diff --git a/services/contact/jaxb/pom.xml b/services/contact/jaxb/pom.xml
index 8e1b6f9503f48742b12caa6294a2d8f86d43bb61..7d5065187e061f14d0070385702728b87ef2e0c0 100644 (file)
--- a/services/contact/jaxb/pom.xml
+++ b/services/contact/jaxb/pom.xml
@@ -25,8 +25,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>               
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>               
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/contact/jaxb/src/main/resources/contacts-common.xsd b/services/contact/jaxb/src/main/resources/contacts-common.xsd
index 81ca5500888ee30be42abe3917cf4d2332924ac1..b114bebb7ba20793f3e77eb2986e1a6c08953938 100644 (file)
--- a/services/contact/jaxb/src/main/resources/contacts-common.xsd
+++ b/services/contact/jaxb/src/main/resources/contacts-common.xsd
@@ -13,8 +13,8 @@
 
 <xs:schema 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="1.0" elementFormDefault="unqualified"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns:ns="http://collectionspace.org/services/contact"
   xmlns="http://collectionspace.org/services/contact"
   targetNamespace="http://collectionspace.org/services/contact"

diff --git a/services/deaccession/jaxb/pom.xml b/services/deaccession/jaxb/pom.xml
index 610d5f0388da5fc6acea707db720c4bfdb8a08e5..12e088969c9c8e2cc56730a0b3bf6d3bf90c8a76 100644 (file)
--- a/services/deaccession/jaxb/pom.xml
+++ b/services/deaccession/jaxb/pom.xml
@@ -25,8 +25,8 @@
     <defaultGoal>install</defaultGoal>
     <plugins>
       <plugin>
-        <groupId>org.jvnet.jaxb2.maven2</groupId>
-        <artifactId>maven-jaxb2-plugin</artifactId>
+        <groupId>org.jvnet.jaxb</groupId>
+        <artifactId>jaxb-maven-plugin</artifactId>
       </plugin>
     </plugins>
   </build>

diff --git a/services/deaccession/jaxb/src/main/resources/deaccessions_common.xsd b/services/deaccession/jaxb/src/main/resources/deaccessions_common.xsd
index 0515b12769b32655e1b1cf28910171d267af2ee4..5d06ad4b30f1a341d3156f744a801e473423c001 100644 (file)
--- a/services/deaccession/jaxb/src/main/resources/deaccessions_common.xsd
+++ b/services/deaccession/jaxb/src/main/resources/deaccessions_common.xsd
@@ -9,8 +9,8 @@
 -->
 <xs:schema
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="2.0"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0"
   xmlns="http://collectionspace.org/services/deaccession"
   targetNamespace="http://collectionspace.org/services/deaccession"
   version="0.1"

diff --git a/services/dimension/jaxb/pom.xml b/services/dimension/jaxb/pom.xml
index 50d13aa8baf82895110a73f0dfff62496afdfe75..6881ce79b366e5e7e1d468f9b06d3fc8caf20b4f 100644 (file)
--- a/services/dimension/jaxb/pom.xml
+++ b/services/dimension/jaxb/pom.xml
@@ -31,8 +31,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/dimension/jaxb/src/main/resources/dimensions-common.xsd b/services/dimension/jaxb/src/main/resources/dimensions-common.xsd
index 40fd310b68ce4af1b1569246c474cf429fb63e9e..8cae4f504b43f85c289dd8ff74c81575ffb8dc3f 100644 (file)
--- a/services/dimension/jaxb/src/main/resources/dimensions-common.xsd
+++ b/services/dimension/jaxb/src/main/resources/dimensions-common.xsd
@@ -13,7 +13,7 @@
 
 <xs:schema 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" jaxb:version="2.0"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" jaxb:version="3.0"
   elementFormDefault="unqualified"
   xmlns:ns="http://collectionspace.org/services/dimension"
   xmlns="http://collectionspace.org/services/dimension"

diff --git a/services/dutyofcare/jaxb/pom.xml b/services/dutyofcare/jaxb/pom.xml
index 1b85ef8b85682dfd460124b93d346819a769a745..b96297fc2004e34e74a3367d89dfc418b61a7f17 100644 (file)
--- a/services/dutyofcare/jaxb/pom.xml
+++ b/services/dutyofcare/jaxb/pom.xml
@@ -25,8 +25,8 @@
     <defaultGoal>install</defaultGoal>
     <plugins>
       <plugin>
-        <groupId>org.jvnet.jaxb2.maven2</groupId>
-        <artifactId>maven-jaxb2-plugin</artifactId>
+        <groupId>org.jvnet.jaxb</groupId>
+        <artifactId>jaxb-maven-plugin</artifactId>
       </plugin>
     </plugins>
   </build>

diff --git a/services/dutyofcare/jaxb/src/main/resources/dutiesofcare_common.xsd b/services/dutyofcare/jaxb/src/main/resources/dutiesofcare_common.xsd
index 46517dc65bbcd6619742112d560376b6ac283b72..b51021b130e6a46a7640b5b5d9f1150d6729f0e0 100644 (file)
--- a/services/dutyofcare/jaxb/src/main/resources/dutiesofcare_common.xsd
+++ b/services/dutyofcare/jaxb/src/main/resources/dutiesofcare_common.xsd
@@ -9,8 +9,8 @@
 
 <xs:schema
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="1.0" elementFormDefault="unqualified"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns="http://collectionspace.org/services/dutyofcare"
   targetNamespace="http://collectionspace.org/services/dutyofcare"
   version="0.1"

diff --git a/services/exhibition/jaxb/pom.xml b/services/exhibition/jaxb/pom.xml
index 93624fd486efb85c9fdef6419dccdca70334c131..5b65d46c5cabab7a8ac0ceaf12a8e8183d01420f 100644 (file)
--- a/services/exhibition/jaxb/pom.xml
+++ b/services/exhibition/jaxb/pom.xml
@@ -26,8 +26,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/exhibition/jaxb/src/main/resources/exhibitions-common.xsd b/services/exhibition/jaxb/src/main/resources/exhibitions-common.xsd
index f1a7bed01edeb764d3e4ff127ff7e777b949517b..e47e4b5aa47b3703e782fd606d140531de2838b7 100644 (file)
--- a/services/exhibition/jaxb/src/main/resources/exhibitions-common.xsd
+++ b/services/exhibition/jaxb/src/main/resources/exhibitions-common.xsd
@@ -10,8 +10,8 @@
 
 <xs:schema 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="1.0" elementFormDefault="unqualified"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns:ns="http://collectionspace.org/services/exhibition"
   xmlns="http://collectionspace.org/services/exhibition"
   targetNamespace="http://collectionspace.org/services/exhibition"

diff --git a/services/exit/jaxb/pom.xml b/services/exit/jaxb/pom.xml
index e61c843374a79293309e4232f96e44b6bc61a16b..6d73984760ea29b3fd65ec338bc33e376e6b062a 100644 (file)
--- a/services/exit/jaxb/pom.xml
+++ b/services/exit/jaxb/pom.xml
@@ -25,8 +25,8 @@
     <defaultGoal>install</defaultGoal>
     <plugins>
       <plugin>
-        <groupId>org.jvnet.jaxb2.maven2</groupId>
-        <artifactId>maven-jaxb2-plugin</artifactId>
+        <groupId>org.jvnet.jaxb</groupId>
+        <artifactId>jaxb-maven-plugin</artifactId>
       </plugin>
     </plugins>
   </build>

diff --git a/services/exit/jaxb/src/main/resources/exits_common.xsd b/services/exit/jaxb/src/main/resources/exits_common.xsd
index 3dd9096e00fa9f38cd78626633df015dbb1583b8..5603d4e60f2b70fd49fd699f06f331309a58f1ed 100644 (file)
--- a/services/exit/jaxb/src/main/resources/exits_common.xsd
+++ b/services/exit/jaxb/src/main/resources/exits_common.xsd
@@ -10,8 +10,8 @@
 
 <xs:schema
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="2.0"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0"
   xmlns:ns="http://collectionspace.org/services/exit"
   xmlns="http://collectionspace.org/services/exit"
   targetNamespace="http://collectionspace.org/services/exit"

diff --git a/services/export/jaxb/pom.xml b/services/export/jaxb/pom.xml
index b5cea75ccf1f50f9d28c3fee8ed36c1ecd9f74ca..f83692326acde7cf78683ddbc734aff42cb4b562 100644 (file)
--- a/services/export/jaxb/pom.xml
+++ b/services/export/jaxb/pom.xml
@@ -25,8 +25,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
         </plugins>
     </build>

diff --git a/services/export/jaxb/src/main/resources/exports-common.xsd b/services/export/jaxb/src/main/resources/exports-common.xsd
index 95e981c61cb1586d33ebd819b9f24df491aed022..9bb96048993bdf8ff70773dbba4e9d2beeffa052 100644 (file)
--- a/services/export/jaxb/src/main/resources/exports-common.xsd
+++ b/services/export/jaxb/src/main/resources/exports-common.xsd
@@ -13,8 +13,8 @@
 
 <xs:schema
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="1.0" elementFormDefault="unqualified"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns:ns="http://collectionspace.org/services/export"
   xmlns="http://collectionspace.org/services/export"
   targetNamespace="http://collectionspace.org/services/export"

diff --git a/services/group/jaxb/pom.xml b/services/group/jaxb/pom.xml
index 5ac3e2e1fc73b111e9c8f4c6caa06f9d55f89d45..580ec512bc1e78551eb33a9ad95f54c2245658d9 100644 (file)
--- a/services/group/jaxb/pom.xml
+++ b/services/group/jaxb/pom.xml
@@ -25,8 +25,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/group/jaxb/src/main/resources/groups_common.xsd b/services/group/jaxb/src/main/resources/groups_common.xsd
index 5e23c3e08f7a8bc5f05e95ef1f9314d311987a10..acdb8a986846f7b83154a9ccbe1efb4c6aa1c7f1 100644 (file)
--- a/services/group/jaxb/src/main/resources/groups_common.xsd
+++ b/services/group/jaxb/src/main/resources/groups_common.xsd
@@ -13,8 +13,8 @@
 
 <xs:schema 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="1.0" elementFormDefault="unqualified"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns:ns="http://collectionspace.org/services/group"
   xmlns="http://collectionspace.org/services/group"
   targetNamespace="http://collectionspace.org/services/group"

diff --git a/services/heldintrust/jaxb/pom.xml b/services/heldintrust/jaxb/pom.xml
index f68d6c04f06505f2ba7369244b743dc319f91d58..73e736717710616c51c8b82f594e7d071eda5071 100644 (file)
--- a/services/heldintrust/jaxb/pom.xml
+++ b/services/heldintrust/jaxb/pom.xml
@@ -25,8 +25,8 @@
     <defaultGoal>install</defaultGoal>
     <plugins>
       <plugin>
-        <groupId>org.jvnet.jaxb2.maven2</groupId>
-        <artifactId>maven-jaxb2-plugin</artifactId>
+        <groupId>org.jvnet.jaxb</groupId>
+        <artifactId>jaxb-maven-plugin</artifactId>
       </plugin>
     </plugins>
   </build>

diff --git a/services/heldintrust/jaxb/src/main/resources/heldintrusts_common.xsd b/services/heldintrust/jaxb/src/main/resources/heldintrusts_common.xsd
index 85065a41a5deb271c6d0d06f8522743a4364bfa6..4d46892a707d8527babeba22ba47f908ff86af2b 100644 (file)
--- a/services/heldintrust/jaxb/src/main/resources/heldintrusts_common.xsd
+++ b/services/heldintrust/jaxb/src/main/resources/heldintrusts_common.xsd
@@ -9,8 +9,8 @@
 -->
 <xs:schema
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="1.0" elementFormDefault="unqualified"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns="http://collectionspace.org/services/heldintrust"
   targetNamespace="http://collectionspace.org/services/heldintrust"
   version="0.1"

diff --git a/services/hyperjaxb/pom.xml b/services/hyperjaxb/pom.xml
index e5da60c0cf9a0a0c53604f7064e6905477c70b91..b482540fdc9637a4bc1518f60e9af8aef4c01872 100644 (file)
--- a/services/hyperjaxb/pom.xml
+++ b/services/hyperjaxb/pom.xml
@@ -36,26 +36,26 @@
   <dependencies>
   <!--
                <dependency>
-                 <groupId>com.sun.xml.bind</groupId>
-                 <artifactId>jaxb-impl</artifactId>
+                 <groupId>org.glassfish.jaxb</groupId>
+                 <artifactId>jaxb-runtime</artifactId>
                </dependency>
                <dependency>
                  <groupId>org.jvnet.jaxb2-commons</groupId>
                  <artifactId>property-listener-injector</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.jvnet.jaxb2_commons</groupId>
-                       <artifactId>jaxb2-basics-runtime</artifactId>
+                       <groupId>org.jvnet.jaxb</groupId>
+                       <artifactId>jaxb-plugins-runtime</artifactId>
                </dependency>
                 -->
                <dependency>
-                       <groupId>javax.xml.bind</groupId>
-                       <artifactId>jaxb-api</artifactId>
+                       <groupId>jakarta.xml.bind</groupId>
+                       <artifactId>jakarta.xml.bind-api</artifactId>
                </dependency>
     <!-- Dependencies for HyperJaxB -->
                <dependency>
-                   <groupId>javax.persistence</groupId>
-                   <artifactId>persistence-api</artifactId>
+                   <groupId>jakarta.persistence</groupId>
+                   <artifactId>jakarta.persistence-api</artifactId>
                </dependency>
                <dependency>
                    <groupId>org.hibernate</groupId>
@@ -67,7 +67,7 @@
                        <artifactId>dom4j</artifactId>
                </dependency>
                <dependency>
-                   <groupId>org.jvnet.hyperjaxb3</groupId>
+                   <groupId>org.jvnet.jaxb</groupId>
                    <artifactId>hyperjaxb3-ejb-runtime</artifactId>
                </dependency>
   </dependencies>
@@ -78,8 +78,8 @@
 
     <plugins>
                <plugin>
-                   <groupId>org.jvnet.hyperjaxb3</groupId>
-                   <artifactId>maven-hyperjaxb3-plugin</artifactId>
+                   <groupId>org.jvnet.jaxb</groupId>
+                   <artifactId>hyperjaxb3-maven-plugin</artifactId>
                </plugin>
     </plugins>
   </build>

diff --git a/services/hyperjaxb/src/main/resources/bindings.xjb b/services/hyperjaxb/src/main/resources/bindings.xjb
index ce5cc40c49c3594e28562c501db31b9e9d21d35f..a410b39d11a105602ba4e3365b4fb58949ce36f6 100644 (file)
--- a/services/hyperjaxb/src/main/resources/bindings.xjb
+++ b/services/hyperjaxb/src/main/resources/bindings.xjb
@@ -1,5 +1,5 @@
-<jaxb:bindings version="1.0" 
-       xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+<jaxb:bindings version="3.0" 
+       xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
        xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
        xmlns:annox="http://annox.dev.java.net"
        xmlns:xs="http://www.w3.org/2001/XMLSchema">
@@ -10,7 +10,7 @@
                <!--
                <jaxb:bindings node="xs:complexType[@name='permission']">
                        <annox:annotate>
-                               <annox:annotate annox:class="javax.xml.bind.annotation.XmlRootElement" name="permission" />
+                               <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="permission" />
                        </annox:annotate>
                </jaxb:bindings>
                -->

diff --git a/services/hyperjaxb/src/main/resources/permissions.xsd b/services/hyperjaxb/src/main/resources/permissions.xsd
index 1bb5fd50fea7adeea21589fdf70a05a50f2bdc6a..a0fb2df6bfcb9ac619749a73966413459cbbc665 100644 (file)
--- a/services/hyperjaxb/src/main/resources/permissions.xsd
+++ b/services/hyperjaxb/src/main/resources/permissions.xsd
@@ -6,10 +6,10 @@
 
 <xs:schema
        xmlns:xs="http://www.w3.org/2001/XMLSchema"
-       xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-       jaxb:version="2.1" elementFormDefault="unqualified"
-       xmlns:hj="http://hyperjaxb3.jvnet.org/ejb/schemas/customizations"
-       xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
+       xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+       jaxb:version="3.0" elementFormDefault="unqualified"
+       xmlns:hj="urn:hyperjaxb3.jvnet.org:ejb:schemas:customizations"
+       xmlns:orm="https://jakarta.ee/xml/ns/persistence/orm"
        xmlns:ns="http://collectionspace.org/services/authorization/perms"
        xmlns="http://collectionspace.org/services/authorization/perms"
        targetNamespace="http://collectionspace.org/services/authorization/perms"

diff --git a/services/hyperjaxb/src/main/resources/permissions_list.xsd b/services/hyperjaxb/src/main/resources/permissions_list.xsd
index f45fe2c535a9357ae78a536aef80fa55d227ed42..ef321140b84891e2b28151b4ca8be7f7a109cd22 100644 (file)
--- a/services/hyperjaxb/src/main/resources/permissions_list.xsd
+++ b/services/hyperjaxb/src/main/resources/permissions_list.xsd
@@ -12,10 +12,10 @@
 
 <xs:schema 
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-    jaxb:version="2.1" elementFormDefault="unqualified"
-    xmlns:hj="http://hyperjaxb3.jvnet.org/ejb/schemas/customizations"
-    xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
+    xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+    jaxb:version="3.0" elementFormDefault="unqualified"
+    xmlns:hj="urn:hyperjaxb3.jvnet.org:ejb:schemas:customizations"
+    xmlns:orm="https://jakarta.ee/xml/ns/persistence/orm"
     xmlns:ns="http://collectionspace.org/services/authorization/perms"
     xmlns="http://collectionspace.org/services/authorization/perms"
     targetNamespace="http://collectionspace.org/services/authorization/perms"

diff --git a/services/id/jaxb/pom.xml b/services/id/jaxb/pom.xml
index 0f1712e467dc3b3b6824986a8c20fd5dfe02b9fd..ef68404a835b84593e410003fc30a091e82bcdca 100644 (file)
--- a/services/id/jaxb/pom.xml
+++ b/services/id/jaxb/pom.xml
@@ -35,8 +35,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.jvnet.jaxb2_commons</groupId>
-               <artifactId>jaxb2-basics-runtime</artifactId>
+      <groupId>org.jvnet.jaxb</groupId>
+               <artifactId>jaxb-plugins-runtime</artifactId>
     </dependency>
   </dependencies>
 
@@ -45,8 +45,8 @@
     <defaultGoal>install</defaultGoal>
     <plugins>
       <plugin>
-        <groupId>org.jvnet.jaxb2.maven2</groupId>
-        <artifactId>maven-jaxb2-plugin</artifactId>
+        <groupId>org.jvnet.jaxb</groupId>
+        <artifactId>jaxb-maven-plugin</artifactId>
       </plugin>
       <plugin>
            <groupId>org.codehaus.mojo</groupId>

diff --git a/services/imports/jaxb/pom.xml b/services/imports/jaxb/pom.xml
index 358d9efd84da42401383ff33c4e6fb1ed6e6bc76..a41be8abd726abfe683cd180f71bf90873b4f60c 100644 (file)
--- a/services/imports/jaxb/pom.xml
+++ b/services/imports/jaxb/pom.xml
@@ -25,8 +25,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/imports/jaxb/src/main/resources/imports_common.xsd b/services/imports/jaxb/src/main/resources/imports_common.xsd
index c9008afff240726d19335f464b2bcefb26b2beb2..c2fe60d3f913436c354dddf42f671e81b50868dd 100644 (file)
--- a/services/imports/jaxb/src/main/resources/imports_common.xsd
+++ b/services/imports/jaxb/src/main/resources/imports_common.xsd
@@ -13,8 +13,8 @@
 
 <xs:schema 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="1.0" elementFormDefault="unqualified"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns:ns="http://collectionspace.org/services/imports"
   xmlns="http://collectionspace.org/services/imports"
   targetNamespace="http://collectionspace.org/services/imports"

diff --git a/services/index/jaxb/pom.xml b/services/index/jaxb/pom.xml
index 932d01f50c3536f302856952db275bbe10b1104d..2b721fb1cc7ef7e4e78b5fc009f5f336a7d0972d 100644 (file)
--- a/services/index/jaxb/pom.xml
+++ b/services/index/jaxb/pom.xml
@@ -25,8 +25,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/index/jaxb/src/main/resources/index-common.xsd b/services/index/jaxb/src/main/resources/index-common.xsd
index ef50d16a955ab454f8862e0054c6d5c6cb725f97..0bbe163c0741b457317ba181638d2562fbe9e413 100644 (file)
--- a/services/index/jaxb/src/main/resources/index-common.xsd
+++ b/services/index/jaxb/src/main/resources/index-common.xsd
@@ -13,8 +13,8 @@
 
 <xs:schema 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="1.0" elementFormDefault="unqualified"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns:ns="http://collectionspace.org/services/index"
   xmlns="http://collectionspace.org/services/index"
   targetNamespace="http://collectionspace.org/services/index"

diff --git a/services/insurance/jaxb/pom.xml b/services/insurance/jaxb/pom.xml
index b28112b95c6603bc9300430c759b1da42809e3c3..eb853ab5d3fe6b8f8a39a0947b43e419ba8d7b82 100644 (file)
--- a/services/insurance/jaxb/pom.xml
+++ b/services/insurance/jaxb/pom.xml
@@ -25,8 +25,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
         </plugins>
     </build>

diff --git a/services/insurance/jaxb/src/main/resources/insurances_common.xsd b/services/insurance/jaxb/src/main/resources/insurances_common.xsd
index fc43a34cc236027e6c8b93027616dd3eb9e3e12a..1b1c0b87f37985db65ae2f71aa60b7133dae2f6c 100644 (file)
--- a/services/insurance/jaxb/src/main/resources/insurances_common.xsd
+++ b/services/insurance/jaxb/src/main/resources/insurances_common.xsd
@@ -10,8 +10,8 @@
 
 <xs:schema
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="1.0" elementFormDefault="unqualified"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns:ns="http://collectionspace.org/services/insurance"
   xmlns="http://collectionspace.org/services/insurance"
   targetNamespace="http://collectionspace.org/services/insurance"

diff --git a/services/intake/jaxb/pom.xml b/services/intake/jaxb/pom.xml
index d79d575ef69a6edf9033764f0e58c03b4ea6ece8..4acd3c23c7fc646625a49ab640222c770def452f 100644 (file)
--- a/services/intake/jaxb/pom.xml
+++ b/services/intake/jaxb/pom.xml
@@ -25,8 +25,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/intake/jaxb/src/main/resources/intakes-common.xsd b/services/intake/jaxb/src/main/resources/intakes-common.xsd
index cde240b5463da60135b9087039c1f1202c9a74e0..41b451ffad3dbfb2e978df823987f790572abfbf 100644 (file)
--- a/services/intake/jaxb/src/main/resources/intakes-common.xsd
+++ b/services/intake/jaxb/src/main/resources/intakes-common.xsd
@@ -13,8 +13,8 @@
 
 <xs:schema
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="1.0" elementFormDefault="unqualified"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns:ns="http://collectionspace.org/services/intake"
   xmlns="http://collectionspace.org/services/intake"
   targetNamespace="http://collectionspace.org/services/intake"

diff --git a/services/iterationreport/jaxb/pom.xml b/services/iterationreport/jaxb/pom.xml
index 9a38c72b9f825d6e615b4f85cddef26813769b3a..14865270d60efa475441764d67bf4fedcb2c5ad4 100644 (file)
--- a/services/iterationreport/jaxb/pom.xml
+++ b/services/iterationreport/jaxb/pom.xml
@@ -25,8 +25,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
         </plugins>
     </build>

diff --git a/services/iterationreport/jaxb/src/main/resources/iterationreports_common.xsd b/services/iterationreport/jaxb/src/main/resources/iterationreports_common.xsd
index d41204cc83548e30a6590472feb1a2cb8ce50432..ab8532121ff9c3805223cb692f1533bd50fd2f36 100644 (file)
--- a/services/iterationreport/jaxb/src/main/resources/iterationreports_common.xsd
+++ b/services/iterationreport/jaxb/src/main/resources/iterationreports_common.xsd
@@ -10,8 +10,8 @@
 
 <xs:schema
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="1.0" elementFormDefault="unqualified"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns:ns="http://collectionspace.org/services/iterationreport"
   xmlns="http://collectionspace.org/services/iterationreport"
   targetNamespace="http://collectionspace.org/services/iterationreport"

diff --git a/services/jaxb/pom.xml b/services/jaxb/pom.xml
index 8905e189e4d2169d285e1c16d183f725974303d0..254256fdf019977a4aeb7baa82e3ef9c00acc007 100644 (file)
--- a/services/jaxb/pom.xml
+++ b/services/jaxb/pom.xml
@@ -23,12 +23,12 @@
 
        <dependencies>
                <dependency>
-                       <groupId>com.sun.xml.bind</groupId>
+                       <groupId>org.glassfish.jaxb</groupId>
                        <artifactId>jaxb-core</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.jvnet.jaxb2_commons</groupId>
-                       <artifactId>jaxb2-basics</artifactId>
+                       <groupId>org.jvnet.jaxb</groupId>
+                       <artifactId>jaxb-plugins</artifactId>
                </dependency>
        </dependencies>
 
@@ -37,8 +37,8 @@
                <defaultGoal>install</defaultGoal>
                <plugins>
                        <plugin>
-                               <groupId>org.jvnet.jaxb2.maven2</groupId>
-                               <artifactId>maven-jaxb2-plugin</artifactId>
+                               <groupId>org.jvnet.jaxb</groupId>
+                               <artifactId>jaxb-maven-plugin</artifactId>
                        </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/jaxb/src/main/resources/authorityref.xsd b/services/jaxb/src/main/resources/authorityref.xsd
index 68c1d4dcd6bd64c913287e485a0a47b946b280b5..0399bda5dfd77c6485015f4dad238265933b8554 100644 (file)
--- a/services/jaxb/src/main/resources/authorityref.xsd
+++ b/services/jaxb/src/main/resources/authorityref.xsd
@@ -17,8 +17,8 @@
 -->
 <xs:schema
        xmlns:xs="http://www.w3.org/2001/XMLSchema"
-       xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-       jaxb:version="1.0" elementFormDefault="unqualified"
+       xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+       jaxb:version="3.0" elementFormDefault="unqualified"
        xmlns="http://collectionspace.org/services/common/authorityref"
        targetNamespace="http://collectionspace.org/services/common/authorityref"
        version="0.1"

diff --git a/services/jaxb/src/main/resources/authorityrefdocs.xsd b/services/jaxb/src/main/resources/authorityrefdocs.xsd
index f3706653b882946da911ab885c0170ce40298e82..d4bf916e2f15ca2c8e922e2fca6806ca97949620 100644 (file)
--- a/services/jaxb/src/main/resources/authorityrefdocs.xsd
+++ b/services/jaxb/src/main/resources/authorityrefdocs.xsd
@@ -17,8 +17,8 @@
 -->
 <xs:schema
        xmlns:xs="http://www.w3.org/2001/XMLSchema"
-       xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-       jaxb:version="1.0" elementFormDefault="unqualified"
+       xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+       jaxb:version="3.0" elementFormDefault="unqualified"
        xmlns="http://collectionspace.org/services/common/authorityref"
        targetNamespace="http://collectionspace.org/services/common/authorityref"
        version="0.1"

diff --git a/services/jaxb/src/main/resources/bindings.xml b/services/jaxb/src/main/resources/bindings.xml
index 76f7b6ad0f12d497c4e7dc2bd0e8b06b8bba5f24..3ab541070589fdbc2e3604752f02e13951996acd 100644 (file)
--- a/services/jaxb/src/main/resources/bindings.xml
+++ b/services/jaxb/src/main/resources/bindings.xml
@@ -1,17 +1,5 @@
 <?xml version="1.0"?>
-<jxb:bindings version="1.0"
-    xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:namespace="http://jaxb2-commons.dev.java.net/namespace-prefix"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd
-    http://jaxb2-commons.dev.java.net/namespace-prefix https://raw.githubusercontent.com/Siggen/jaxb2-namespace-prefix/master/src/main/resources/prefix-namespace-schema.xsd">
-
-    <jxb:bindings schemaLocation="relations_common.xsd">
-        <jxb:bindings>
-            <namespace:prefix name="rel" />
-            <!-- Additional @XmlNs prefix declarations to take effect for this schema/package -->
-            <namespace:prefix name="xsi" namespaceURI="http://www.w3.org/2001/XMLSchema-instance" />
-        </jxb:bindings>
-    </jxb:bindings>
-    
-</jxb:bindings>
\ No newline at end of file
+<jxb:bindings version="3.0"
+    xmlns:jxb="https://jakarta.ee/xml/ns/jaxb"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+</jxb:bindings>

diff --git a/services/jaxb/src/main/resources/blobs_common.xsd b/services/jaxb/src/main/resources/blobs_common.xsd
index 5b973959df91b93314fe5bde410af679d4613f5d..5b367409a2393f39854dd59e5bff60e2f3cd2257 100644 (file)
--- a/services/jaxb/src/main/resources/blobs_common.xsd
+++ b/services/jaxb/src/main/resources/blobs_common.xsd
@@ -13,8 +13,8 @@
 
 <xs:schema 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="1.0" elementFormDefault="unqualified"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns:ns="http://collectionspace.org/services/blob"
   xmlns="http://collectionspace.org/services/blob"
   targetNamespace="http://collectionspace.org/services/blob"

diff --git a/services/jaxb/src/main/resources/collectionspace_core.xsd b/services/jaxb/src/main/resources/collectionspace_core.xsd
index 44ca1ae29e1138aee43692ccc62e901e64e498ad..4c6da6abb0a69ef50489f65f70a6b22e1d392dfa 100644 (file)
--- a/services/jaxb/src/main/resources/collectionspace_core.xsd
+++ b/services/jaxb/src/main/resources/collectionspace_core.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-           jaxb:version="1.0"
+           xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+           jaxb:version="3.0"
            targetNamespace="http://collectionspace.org/collectionspace_core/"
            version="4.0">
   <xs:element name="collectionspace_core">

diff --git a/services/jaxb/src/main/resources/index_common.xsd b/services/jaxb/src/main/resources/index_common.xsd
index e250df2d12c2ef43f49b7172fe2f369bfebad1fd..fd41c2f67cb96647ea337014a9ffd17be8fcbe9b 100644 (file)
--- a/services/jaxb/src/main/resources/index_common.xsd
+++ b/services/jaxb/src/main/resources/index_common.xsd
@@ -13,8 +13,8 @@
 
 <xs:schema 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="1.0" elementFormDefault="unqualified"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns:ns="http://collectionspace.org/services/index"
   xmlns="http://collectionspace.org/services/index"
   targetNamespace="http://collectionspace.org/services/index"

diff --git a/services/jaxb/src/main/resources/invocationContext.xsd b/services/jaxb/src/main/resources/invocationContext.xsd
index 3f7a85bc0e7001609e12576ed616953ad7899664..9308bda20f86a650c50e4edc5f58edacb5ede637 100644 (file)
--- a/services/jaxb/src/main/resources/invocationContext.xsd
+++ b/services/jaxb/src/main/resources/invocationContext.xsd
@@ -8,7 +8,7 @@
     $LastChangedRevision: 2316 $
     $LastChangedDate: 2010-06-02 16:03:51 -0700 (Wed, 02 Jun 2010) $
 -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" jaxb:version="1.0" elementFormDefault="unqualified" xmlns:ns="http://collectionspace.org/services/common/invocable" xmlns="http://collectionspace.org/services/common/invocable" targetNamespace="http://collectionspace.org/services/common/invocable" version="0.1">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" jaxb:version="3.0" elementFormDefault="unqualified" xmlns:ns="http://collectionspace.org/services/common/invocable" xmlns="http://collectionspace.org/services/common/invocable" targetNamespace="http://collectionspace.org/services/common/invocable" version="0.1">
 
     <xs:element name="invocationContext">
         <xs:complexType>

diff --git a/services/jaxb/src/main/resources/invocationResults.xsd b/services/jaxb/src/main/resources/invocationResults.xsd
index 7f7b732c09b85991f5c57514b7503a3c913b39ac..b668cdc819de167e577a04a98c478707187e8bfe 100644 (file)
--- a/services/jaxb/src/main/resources/invocationResults.xsd
+++ b/services/jaxb/src/main/resources/invocationResults.xsd
@@ -10,8 +10,8 @@
 -->
 <xs:schema 
                xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-               xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" 
-               jaxb:version="1.0" elementFormDefault="unqualified" 
+               xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" 
+               jaxb:version="3.0" elementFormDefault="unqualified" 
                xmlns:ns="http://collectionspace.org/services/common/invocable" 
                xmlns="http://collectionspace.org/services/common/invocable" 
                targetNamespace="http://collectionspace.org/services/common/invocable" version="0.1">

diff --git a/services/jaxb/src/main/resources/lifecycle.xsd b/services/jaxb/src/main/resources/lifecycle.xsd
index b7a41ea67401b626bbc786d87e4cc4e9ce604479..cd5cfbbaaa5f89a7fa8311c9595c01fd16427e00 100644 (file)
--- a/services/jaxb/src/main/resources/lifecycle.xsd
+++ b/services/jaxb/src/main/resources/lifecycle.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="2.0" elementFormDefault="unqualified"
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns:ns="http://collectionspace.org/services/lifecycle"
   xmlns="http://collectionspace.org/services/lifecycle"
   targetNamespace="http://collectionspace.org/services/lifecycle" version="2.0">

diff --git a/services/jaxb/src/main/resources/relations_common.xsd b/services/jaxb/src/main/resources/relations_common.xsd
index 923d1d3fd57e144c73ab1caddb3282b93e8687d9..305736b48c6634a5af78cecc704ae24f996ebe4f 100644 (file)
--- a/services/jaxb/src/main/resources/relations_common.xsd
+++ b/services/jaxb/src/main/resources/relations_common.xsd
@@ -13,8 +13,8 @@
 
 <xs:schema
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-    jaxb:version="1.0" elementFormDefault="unqualified"
+    xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+    jaxb:version="3.0" elementFormDefault="unqualified"
     xmlns="http://collectionspace.org/services/relation"
     xmlns:rel="http://collectionspace.org/services/relation"
     targetNamespace="http://collectionspace.org/services/relation">

diff --git a/services/jaxb/src/main/resources/service_description.xsd b/services/jaxb/src/main/resources/service_description.xsd
index c586bb37882ce72b3c4c91ccc85fde725daf8680..f5d35ebb50ffde983ace5e98761c83804eeb5432 100644 (file)
--- a/services/jaxb/src/main/resources/service_description.xsd
+++ b/services/jaxb/src/main/resources/service_description.xsd
@@ -9,8 +9,8 @@
 
 <xs:schema 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="1.0" elementFormDefault="unqualified"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns:ns="http://collectionspace.org/services/description"
   xmlns="http://collectionspace.org/services/description"
   targetNamespace="http://collectionspace.org/services/description"

diff --git a/services/jaxb/src/main/resources/workflow_common.xsd b/services/jaxb/src/main/resources/workflow_common.xsd
index 3ba78d7d4fab00f8bfb0c282337fca5eb3c773ae..c5fc3cd38fba64b5bbd27e95a2a4e96823557883 100644 (file)
--- a/services/jaxb/src/main/resources/workflow_common.xsd
+++ b/services/jaxb/src/main/resources/workflow_common.xsd
@@ -13,8 +13,8 @@
 
 <xs:schema 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="1.0" elementFormDefault="unqualified"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns:ns="http://collectionspace.org/services/workflow"
   xmlns="http://collectionspace.org/services/workflow"
   targetNamespace="http://collectionspace.org/services/workflow"

diff --git a/services/loanin/jaxb/pom.xml b/services/loanin/jaxb/pom.xml
index 764068b5dbccd7a1930df521a0c4353ed055349e..8457935b205a0c2658e82d95fcce75df461e7c6a 100644 (file)
--- a/services/loanin/jaxb/pom.xml
+++ b/services/loanin/jaxb/pom.xml
@@ -25,8 +25,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/loanin/jaxb/src/main/resources/loansin-common.xsd b/services/loanin/jaxb/src/main/resources/loansin-common.xsd
index 65c9e6df8a3a2dfaed0a4ccf4a18c8f25c4efa49..8be90dbdb16559ff9d1ada9a632142f4e52c7e40 100644 (file)
--- a/services/loanin/jaxb/src/main/resources/loansin-common.xsd
+++ b/services/loanin/jaxb/src/main/resources/loansin-common.xsd
@@ -13,8 +13,8 @@
 
 <xs:schema 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="1.0" elementFormDefault="unqualified"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns:ns="http://collectionspace.org/services/loanin"
   xmlns="http://collectionspace.org/services/loanin"
   targetNamespace="http://collectionspace.org/services/loanin"

diff --git a/services/loanout/jaxb/pom.xml b/services/loanout/jaxb/pom.xml
index 99f53bbfcbceb9b5538f54a7aac7f8527eb43ada..72814f07a97cb7b5e429330312daac8f14d8e9dd 100644 (file)
--- a/services/loanout/jaxb/pom.xml
+++ b/services/loanout/jaxb/pom.xml
@@ -25,8 +25,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/loanout/jaxb/src/main/resources/loansout-common.xsd b/services/loanout/jaxb/src/main/resources/loansout-common.xsd
index 0bbb9b50e24e74a6f56e6e1e46d2f3df61309a47..9ca0593dbf9756ac2df253bc64f5be1d84064dce 100644 (file)
--- a/services/loanout/jaxb/src/main/resources/loansout-common.xsd
+++ b/services/loanout/jaxb/src/main/resources/loansout-common.xsd
@@ -13,8 +13,8 @@
 
 <xs:schema 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="1.0" elementFormDefault="unqualified"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns:ns="http://collectionspace.org/services/loanout"
   xmlns="http://collectionspace.org/services/loanout"
   targetNamespace="http://collectionspace.org/services/loanout"

diff --git a/services/location/jaxb/pom.xml b/services/location/jaxb/pom.xml
index 94bc73f7f3b896be698ccb1e5649112a75e7dac7..229e0cce98eaab108eb3a82dbac300e925db864b 100644 (file)
--- a/services/location/jaxb/pom.xml
+++ b/services/location/jaxb/pom.xml
@@ -35,8 +35,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/location/jaxb/src/main/resources/location_common.xsd b/services/location/jaxb/src/main/resources/location_common.xsd
index c2b6115e7c3d60dec21b81e204af1137c93c0c2d..48baa5e584e721554cfa7e0fa07c32ac604f1080 100644 (file)
--- a/services/location/jaxb/src/main/resources/location_common.xsd
+++ b/services/location/jaxb/src/main/resources/location_common.xsd
@@ -10,8 +10,8 @@
 
 <xs:schema 
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-    jaxb:version="1.0" elementFormDefault="unqualified"
+    xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+    jaxb:version="3.0" elementFormDefault="unqualified"
     xmlns:ns="http://collectionspace.org/services/location"
     xmlns="http://collectionspace.org/services/location"
     targetNamespace="http://collectionspace.org/services/location"

diff --git a/services/location/jaxb/src/main/resources/locationauthority_common.xsd b/services/location/jaxb/src/main/resources/locationauthority_common.xsd
index 513788fc55d92d3f312b12300c59c8f89e4f7ee2..fa7ca8fc19dd252254916f9761e0240fb4a24147 100644 (file)
--- a/services/location/jaxb/src/main/resources/locationauthority_common.xsd
+++ b/services/location/jaxb/src/main/resources/locationauthority_common.xsd
@@ -11,8 +11,8 @@
 
 <xs:schema 
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-    jaxb:version="1.0" elementFormDefault="unqualified"
+    xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+    jaxb:version="3.0" elementFormDefault="unqualified"
     xmlns:ns="http://collectionspace.org/services/location"
     xmlns="http://collectionspace.org/services/location"
     targetNamespace="http://collectionspace.org/services/location"

diff --git a/services/material/jaxb/pom.xml b/services/material/jaxb/pom.xml
index d0a9a4cd7cc99b31b93a63fe6d5abe08d5c211b1..2824d0985df2f02cc398f1dd41f69273a2f443bd 100644 (file)
--- a/services/material/jaxb/pom.xml
+++ b/services/material/jaxb/pom.xml
@@ -18,7 +18,7 @@
             <artifactId>org.collectionspace.services.common</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
+            <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-core</artifactId>
         </dependency>
                 <!--
@@ -27,7 +27,7 @@
             <artifactId>property-listener-injector</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.jvnet.jaxb2_commons</groupId>
+            <groupId>org.jvnet.jaxb</groupId>
             <artifactId>runtime</artifactId>
                 </dependency>
                 -->
@@ -49,8 +49,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/material/jaxb/src/main/resources/material_common.xsd b/services/material/jaxb/src/main/resources/material_common.xsd
index 1a3448ba68ef31b9778b03a91eacf2463210c951..b98033690e00fc0a6f2e51691d2ee7ce98180902 100644 (file)
--- a/services/material/jaxb/src/main/resources/material_common.xsd
+++ b/services/material/jaxb/src/main/resources/material_common.xsd
@@ -10,8 +10,8 @@
 
 <xs:schema 
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-    jaxb:version="1.0" elementFormDefault="unqualified"
+    xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+    jaxb:version="3.0" elementFormDefault="unqualified"
     xmlns:ns="http://collectionspace.org/services/material"
     xmlns="http://collectionspace.org/services/material"
     targetNamespace="http://collectionspace.org/services/material"

diff --git a/services/material/jaxb/src/main/resources/materialauthority_common.xsd b/services/material/jaxb/src/main/resources/materialauthority_common.xsd
index 2c54d79e6602150a88e74d5f08a3925ac42c10f6..e9ea62337411e0b3f48adbf868246e8b88c3e325 100644 (file)
--- a/services/material/jaxb/src/main/resources/materialauthority_common.xsd
+++ b/services/material/jaxb/src/main/resources/materialauthority_common.xsd
@@ -11,8 +11,8 @@
 
 <xs:schema 
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-    jaxb:version="1.0" elementFormDefault="unqualified"
+    xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+    jaxb:version="3.0" elementFormDefault="unqualified"
     xmlns:ns="http://collectionspace.org/services/material"
     xmlns="http://collectionspace.org/services/material"
     targetNamespace="http://collectionspace.org/services/material"

diff --git a/services/media/jaxb/pom.xml b/services/media/jaxb/pom.xml
index 83334c7526c2f8fc4d12ae03f7095dd60e156beb..57c1fd86d89fbfd3dbacd3be0713cf52bec99a1a 100644 (file)
--- a/services/media/jaxb/pom.xml
+++ b/services/media/jaxb/pom.xml
@@ -25,8 +25,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/media/jaxb/src/main/resources/media_common.xsd b/services/media/jaxb/src/main/resources/media_common.xsd
index bab3194f40aba078f37ce2d240b832c01436b368..49c3e93151120fa8650b90847d8d3185c45d84ff 100644 (file)
--- a/services/media/jaxb/src/main/resources/media_common.xsd
+++ b/services/media/jaxb/src/main/resources/media_common.xsd
@@ -13,8 +13,8 @@
 
 <xs:schema 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="1.0" elementFormDefault="unqualified"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns:ns="http://collectionspace.org/services/media"
   xmlns="http://collectionspace.org/services/media"
   targetNamespace="http://collectionspace.org/services/media"

diff --git a/services/movement/jaxb/pom.xml b/services/movement/jaxb/pom.xml
index 5c87d329352fe71c1f1af37a7d6f2a641bf36c1b..fdb32163a9e0a970dcbae45b2a086ee6dacd33f8 100644 (file)
--- a/services/movement/jaxb/pom.xml
+++ b/services/movement/jaxb/pom.xml
@@ -25,8 +25,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/movement/jaxb/src/main/resources/movements-common.xsd b/services/movement/jaxb/src/main/resources/movements-common.xsd
index ea729d27be727a68cc4e726992ad2f0d890d655b..0d996d917dbe064d23b0375b578d284661d1ef99 100644 (file)
--- a/services/movement/jaxb/src/main/resources/movements-common.xsd
+++ b/services/movement/jaxb/src/main/resources/movements-common.xsd
@@ -13,8 +13,8 @@
 
 <xs:schema 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="1.0" elementFormDefault="unqualified"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns:ns="http://collectionspace.org/services/movement"
   xmlns="http://collectionspace.org/services/movement"
   targetNamespace="http://collectionspace.org/services/movement"

diff --git a/services/nagpra-jaxb/pom.xml b/services/nagpra-jaxb/pom.xml
index 86f1003d1eb17af7a24a5a47c5c598cc91754016..ccfb65bafaf4b0f9a7062bfb3491dae1cfa806c1 100644 (file)
--- a/services/nagpra-jaxb/pom.xml
+++ b/services/nagpra-jaxb/pom.xml
@@ -20,6 +20,10 @@
             <artifactId>org.collectionspace.services.jaxb</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -27,8 +31,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
         </plugins>
     </build>

diff --git a/services/nagpra-jaxb/src/main/resources/nagpra_common.xsd b/services/nagpra-jaxb/src/main/resources/nagpra_common.xsd
index 0f0a775ddd92e9113390813082684a1846052422..03e98aaf0d307bf3688eeff5307c3c2b8887c16e 100644 (file)
--- a/services/nagpra-jaxb/src/main/resources/nagpra_common.xsd
+++ b/services/nagpra-jaxb/src/main/resources/nagpra_common.xsd
@@ -5,8 +5,8 @@
 -->
 <xs:schema
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="2.0"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0"
   xmlns="http://collectionspace.org/services/nagpra"
   targetNamespace="http://collectionspace.org/services/nagpra"
   version="0.1"

diff --git a/services/nagprainventory/jaxb/pom.xml b/services/nagprainventory/jaxb/pom.xml
index c8606bcbefa18f5c0a6dbd2b89074fe08253fcc1..0c3bc316b06e8e039445220cd9bfd2e4254d4194 100644 (file)
--- a/services/nagprainventory/jaxb/pom.xml
+++ b/services/nagprainventory/jaxb/pom.xml
@@ -25,8 +25,8 @@
     <defaultGoal>install</defaultGoal>
     <plugins>
       <plugin>
-        <groupId>org.jvnet.jaxb2.maven2</groupId>
-        <artifactId>maven-jaxb2-plugin</artifactId>
+        <groupId>org.jvnet.jaxb</groupId>
+        <artifactId>jaxb-maven-plugin</artifactId>
       </plugin>
     </plugins>
   </build>

diff --git a/services/nagprainventory/jaxb/src/main/resources/nagprainventory_common.xsd b/services/nagprainventory/jaxb/src/main/resources/nagprainventory_common.xsd
index c17f9b9ade713f4212c22ccd76bcd54eddc64aa0..93c3ffe50c5d9e72575a5e8ae328a8b45f296b5a 100644 (file)
--- a/services/nagprainventory/jaxb/src/main/resources/nagprainventory_common.xsd
+++ b/services/nagprainventory/jaxb/src/main/resources/nagprainventory_common.xsd
@@ -10,8 +10,8 @@
 
 <xs:schema
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="1.0" elementFormDefault="unqualified"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns:ns="http://collectionspace.org/services/nagprainventory"
   xmlns="http://collectionspace.org/services/nagprainventory"
   targetNamespace="http://collectionspace.org/services/nagprainventory"

diff --git a/services/note/jaxb/pom.xml b/services/note/jaxb/pom.xml
index f05f71e18fff392d1a175f5300a560de8310cd93..d8598e0bb6b40d4a5320a764d815ab813e7a874f 100644 (file)
--- a/services/note/jaxb/pom.xml
+++ b/services/note/jaxb/pom.xml
@@ -30,8 +30,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>               
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>               
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/note/jaxb/src/main/resources/notes-common.xsd b/services/note/jaxb/src/main/resources/notes-common.xsd
index 5a0f38a4698ac916f973f6ece2439bd0518eaf79..307d9f6bc92f4b0d7d61b1ef207989e735154fdb 100644 (file)
--- 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) $ -->
 
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-       xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" jaxb:version="2.0"
+       xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" jaxb:version="3.0"
        elementFormDefault="unqualified"
        xmlns:ns="http://collectionspace.org/services/note"
        xmlns="http://collectionspace.org/services/note"

diff --git a/services/objectexit/jaxb/pom.xml b/services/objectexit/jaxb/pom.xml
index 20ace344de1012f171f8b1c64f7d8acb5638c1af..25c9d6cf5f98e5c34c83f6e3f19e0db55942ed91 100644 (file)
--- a/services/objectexit/jaxb/pom.xml
+++ b/services/objectexit/jaxb/pom.xml
@@ -25,8 +25,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/objectexit/jaxb/src/main/resources/objectexit_common.xsd b/services/objectexit/jaxb/src/main/resources/objectexit_common.xsd
index f6aad8a48c1fa34c541a88ef18166b3c4de93d4c..de4550dc3176c577872b2c1548487e8b9b5f9627 100644 (file)
--- a/services/objectexit/jaxb/src/main/resources/objectexit_common.xsd
+++ b/services/objectexit/jaxb/src/main/resources/objectexit_common.xsd
@@ -13,8 +13,8 @@
 
 <xs:schema 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="1.0" elementFormDefault="unqualified"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns:ns="http://collectionspace.org/services/objectexit"
   xmlns="http://collectionspace.org/services/objectexit"
   targetNamespace="http://collectionspace.org/services/objectexit"

diff --git a/services/organization/jaxb/pom.xml b/services/organization/jaxb/pom.xml
index db829b4bd9ba1d4b024dc2b278d8be81d091aabc..ed8c52b66199dc61c99489c11def292fa64d10cc 100644 (file)
--- a/services/organization/jaxb/pom.xml
+++ b/services/organization/jaxb/pom.xml
@@ -34,8 +34,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/organization/jaxb/src/main/resources/organization_common.xsd b/services/organization/jaxb/src/main/resources/organization_common.xsd
index 37976cefdf5b3e750b80ece5c90fa94f02100cde..0197c520eb2bb5335ed762346618b1f0fb2af18b 100644 (file)
--- a/services/organization/jaxb/src/main/resources/organization_common.xsd
+++ b/services/organization/jaxb/src/main/resources/organization_common.xsd
@@ -10,8 +10,8 @@
 
 <xs:schema
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-    jaxb:version="1.0" elementFormDefault="unqualified"
+    xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+    jaxb:version="3.0" elementFormDefault="unqualified"
     xmlns:ns="http://collectionspace.org/services/organization"
     xmlns="http://collectionspace.org/services/organization"
     targetNamespace="http://collectionspace.org/services/organization"

diff --git a/services/organization/jaxb/src/main/resources/orgauthority_common.xsd b/services/organization/jaxb/src/main/resources/orgauthority_common.xsd
index cb0a797ad47dc1ad16c1a845f61a8a04acf04433..adb3d9c3b1130a5225c48973ad7bb2d934ca84c4 100644 (file)
--- a/services/organization/jaxb/src/main/resources/orgauthority_common.xsd
+++ b/services/organization/jaxb/src/main/resources/orgauthority_common.xsd
@@ -11,8 +11,8 @@
 
 <xs:schema 
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-    jaxb:version="1.0" elementFormDefault="unqualified"
+    xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+    jaxb:version="3.0" elementFormDefault="unqualified"
     xmlns:ns="http://collectionspace.org/services/organization"
     xmlns="http://collectionspace.org/services/organization"
     targetNamespace="http://collectionspace.org/services/organization"

diff --git a/services/osteology/jaxb/pom.xml b/services/osteology/jaxb/pom.xml
index cad2f68a475983ad524ad13658b02b18d751471d..7718440f950bf8ac35490d35218d0449a684a178 100644 (file)
--- a/services/osteology/jaxb/pom.xml
+++ b/services/osteology/jaxb/pom.xml
@@ -25,8 +25,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/osteology/jaxb/src/main/resources/osteology-common.xsd b/services/osteology/jaxb/src/main/resources/osteology-common.xsd
index 5f6ca87d84b0d5bc97359529820ea04e3c263aa5..f949974548d0b414f2113d01149ac8cb597a2208 100644 (file)
--- a/services/osteology/jaxb/src/main/resources/osteology-common.xsd
+++ b/services/osteology/jaxb/src/main/resources/osteology-common.xsd
@@ -10,8 +10,8 @@
 
 <xs:schema
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="1.0" elementFormDefault="unqualified"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns:ns="http://collectionspace.org/services/osteology"
   xmlns="http://collectionspace.org/services/osteology"
   targetNamespace="http://collectionspace.org/services/osteology"

diff --git a/services/person/jaxb/pom.xml b/services/person/jaxb/pom.xml
index e1e10aa17e1f35168fd5a8af7b886647e411f3b6..7c2a051d884377273626983d5187d5a5c5ae67db 100644 (file)
--- a/services/person/jaxb/pom.xml
+++ b/services/person/jaxb/pom.xml
@@ -31,8 +31,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/person/jaxb/src/main/resources/person_common.xsd b/services/person/jaxb/src/main/resources/person_common.xsd
index 11941acbb1fdb5b17c727aaed09fcfc8a8b964b9..199fb32a987bf4d68228f17d7d64322492db9541 100644 (file)
--- a/services/person/jaxb/src/main/resources/person_common.xsd
+++ b/services/person/jaxb/src/main/resources/person_common.xsd
@@ -13,8 +13,8 @@
 
 <xs:schema 
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-    jaxb:version="1.0" elementFormDefault="unqualified"
+    xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+    jaxb:version="3.0" elementFormDefault="unqualified"
     xmlns:ns="http://collectionspace.org/services/person"
     xmlns="http://collectionspace.org/services/person"
     targetNamespace="http://collectionspace.org/services/person"

diff --git a/services/person/jaxb/src/main/resources/personauthority_common.xsd b/services/person/jaxb/src/main/resources/personauthority_common.xsd
index ec44739074387e89cfb64b80daa2c50880adcaed..70b11712bb3d1be68e6a72d1260b46d967dae0f7 100644 (file)
--- a/services/person/jaxb/src/main/resources/personauthority_common.xsd
+++ b/services/person/jaxb/src/main/resources/personauthority_common.xsd
@@ -11,8 +11,8 @@
 
 <xs:schema 
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-    jaxb:version="1.0" elementFormDefault="unqualified"
+    xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+    jaxb:version="3.0" elementFormDefault="unqualified"
     xmlns:ns="http://collectionspace.org/services/person"
     xmlns="http://collectionspace.org/services/person"
     targetNamespace="http://collectionspace.org/services/person"

diff --git a/services/place/jaxb/pom.xml b/services/place/jaxb/pom.xml
index 3e9dfb3865768f402106a1e6194136bcbfa3eb55..bee517c0cefed25b5d994a7ed25d3785a02b7610 100644 (file)
--- a/services/place/jaxb/pom.xml
+++ b/services/place/jaxb/pom.xml
@@ -18,7 +18,7 @@
             <artifactId>org.collectionspace.services.common</artifactId>
             </dependency>
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
+            <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-core</artifactId>
         </dependency>
         <dependency>
@@ -39,8 +39,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/place/jaxb/src/main/resources/place_common.xsd b/services/place/jaxb/src/main/resources/place_common.xsd
index fa0f791bc3e08200d7839c2a7893b4f25ae6975d..72d0fea6d1510311c15f18521d8a29a833eb795f 100644 (file)
--- a/services/place/jaxb/src/main/resources/place_common.xsd
+++ b/services/place/jaxb/src/main/resources/place_common.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <xs:schema 
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-    jaxb:version="1.0" elementFormDefault="unqualified"
+    xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+    jaxb:version="3.0" elementFormDefault="unqualified"
     xmlns:ns="http://collectionspace.org/services/place"
     xmlns="http://collectionspace.org/services/place"
     targetNamespace="http://collectionspace.org/services/place"

diff --git a/services/place/jaxb/src/main/resources/placeauthority_common.xsd b/services/place/jaxb/src/main/resources/placeauthority_common.xsd
index c9a497122040cf206875a55ef919532b5c0fda4e..719d7d12580f617ec72626a20cdb6717ebf42e33 100644 (file)
--- a/services/place/jaxb/src/main/resources/placeauthority_common.xsd
+++ b/services/place/jaxb/src/main/resources/placeauthority_common.xsd
@@ -11,8 +11,8 @@
 
 <xs:schema 
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-    jaxb:version="1.0" elementFormDefault="unqualified"
+    xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+    jaxb:version="3.0" elementFormDefault="unqualified"
     xmlns:ns="http://collectionspace.org/services/place"
     xmlns="http://collectionspace.org/services/place"
     targetNamespace="http://collectionspace.org/services/place"

diff --git a/services/pom.xml b/services/pom.xml
index 8f81baa9b4081b14831169a1f7bdb352194e3ee4..3eed1212fba4fbc93a1647d9dd6fb8aaddb6fc87 100644 (file)
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -14,7 +14,7 @@
 
        <properties>
                <annox.version>0.5.0</annox.version>
-               <maven-jaxb2-plugin.version>0.13.3</maven-jaxb2-plugin.version>
+               <maven-jaxb2-plugin.version>4.0.12</maven-jaxb2-plugin.version>
                <!-- The default life cycle policy for Nuxeo document types -->
                <Lifecycle>cs_default</Lifecycle>
                <jaxb.codegen.phase>generate-sources</jaxb.codegen.phase>
@@ -183,9 +183,9 @@
                                        </configuration>
                                </plugin>
                                <plugin>
-                                       <groupId>org.jvnet.hyperjaxb3</groupId>
-                                       <artifactId>maven-hyperjaxb3-plugin</artifactId>
-                                       <version>0.6.0</version>
+                                       <groupId>org.jvnet.jaxb</groupId>
+                                       <artifactId>hyperjaxb3-maven-plugin</artifactId>
+                                       <version>4.0.12</version>
                                        <executions>
                                                <execution>
                                                        <goals>
@@ -201,14 +201,14 @@
                                                        <arg>-Xannotate</arg>
                                                </args>
                                                <extension>true</extension>
-                                               <jdk5>true</jdk5>
+                                               
                                                <ejb3>false</ejb3>
                                                <persistenceUnitName>garbage</persistenceUnitName>
                                        </configuration>
                                </plugin>
                                <plugin>
-                                       <groupId>org.jvnet.jaxb2.maven2</groupId>
-                                       <artifactId>maven-jaxb2-plugin</artifactId>
+                                       <groupId>org.jvnet.jaxb</groupId>
+                                       <artifactId>jaxb-maven-plugin</artifactId>
                                        <version>${maven-jaxb2-plugin.version}</version>
                                        <executions>
                                                <execution>
@@ -229,41 +229,20 @@
                                                                </bindingIncludes>
                                                                <args>
                                                                        <arg>-extension</arg>
-                                                                       <arg>-Xnamespace-prefix</arg>
-                                                                       <arg>-Xannotate</arg>
                                                                        <arg>-verbose</arg>
-                                                                       <!-- <arg>-XtoString</arg> -->
                                                                        <arg>-Xequals</arg>
                                                                        <arg>-XhashCode</arg>
-                                                                       <!-- <arg>-Xcopyable</arg> -->
                                                                </args>
                                                                <plugins>
                                                                        <plugin>
-                                                                               <groupId>javax.xml.bind</groupId>
-                                                                               <artifactId>jaxb-api</artifactId>
-                                                                               <version>${jaxb.version}</version>
-                                                                       </plugin>
-                                                                       <plugin>
-                                                                               <groupId>org.jvnet.jaxb2_commons</groupId>
-                                                                               <artifactId>jaxb2-basics-annotate</artifactId>
-                                                                               <version>${jaxb2-basics.version}</version>
-                                                                       </plugin>
-                                                                       <plugin>
-                                                                               <groupId>org.jvnet.jaxb2_commons</groupId>
-                                                                               <artifactId>jaxb2-basics</artifactId>
+                                                                               <groupId>org.jvnet.jaxb</groupId>
+                                                                               <artifactId>jaxb-plugins</artifactId>
                                                                                <version>${jaxb2-basics.version}</version>
                                                                        </plugin>
                                                                </plugins>
                                                        </configuration>
                                                </execution>
                                        </executions>
-                                       <dependencies>
-                                               <dependency>
-                                                       <groupId>org.jvnet.jaxb2_commons</groupId>
-                                                       <artifactId>jaxb2-namespace-prefix</artifactId>                                                 <!-- Used to force a specific namespace prefix specified in src/main/resource/bindings.xml -->
-                                                       <version>1.4-SNAPSHOT</version>
-                                               </dependency>
-                                       </dependencies>
                                </plugin>
                                <plugin>
                                        <groupId>org.codehaus.mojo</groupId>

diff --git a/services/pottag/jaxb/pom.xml b/services/pottag/jaxb/pom.xml
index 6e23a40544ec24021d343956bf3accffb9e70170..d75e887a0c76771700afd0a9a0e8026010a4ed6c 100644 (file)
--- a/services/pottag/jaxb/pom.xml
+++ b/services/pottag/jaxb/pom.xml
@@ -26,8 +26,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/pottag/jaxb/src/main/resources/pottags-common.xsd b/services/pottag/jaxb/src/main/resources/pottags-common.xsd
index 711ddc27daa7e446096c524f613e4723d33fef58..2ecd2d2cc5d97b92324e32159102738538d448e8 100644 (file)
--- a/services/pottag/jaxb/src/main/resources/pottags-common.xsd
+++ b/services/pottag/jaxb/src/main/resources/pottags-common.xsd
@@ -13,8 +13,8 @@
 
 <xs:schema 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="1.0" elementFormDefault="unqualified"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns:ns="http://collectionspace.org/services/pottag"
   xmlns="http://collectionspace.org/services/pottag"
   targetNamespace="http://collectionspace.org/services/pottag"

diff --git a/services/propagation/jaxb/pom.xml b/services/propagation/jaxb/pom.xml
index b55be2de8b432d075c5a2616bc3466f9610af831..ef08245c091ac29b4e943866f11c56d122270b43 100644 (file)
--- a/services/propagation/jaxb/pom.xml
+++ b/services/propagation/jaxb/pom.xml
@@ -25,8 +25,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/propagation/jaxb/src/main/resources/propagations-common.xsd b/services/propagation/jaxb/src/main/resources/propagations-common.xsd
index 2b98fec5ef75e2c6fc975baaa4a336e0cce645e9..9205a61db201663131430510f5d09803e3f8f1c5 100644 (file)
--- a/services/propagation/jaxb/src/main/resources/propagations-common.xsd
+++ b/services/propagation/jaxb/src/main/resources/propagations-common.xsd
@@ -13,8 +13,8 @@
 
 <xs:schema 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="1.0" elementFormDefault="unqualified"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns:ns="http://collectionspace.org/services/propagation"
   xmlns="http://collectionspace.org/services/propagation"
   targetNamespace="http://collectionspace.org/services/propagation"

diff --git a/services/publicitem/jaxb/pom.xml b/services/publicitem/jaxb/pom.xml
index ab3f7d5e050d4103fb82269bd2eb460e6adbf1dc..e7c7da0803fc38d89af9c76401e8936edff8838d 100644 (file)
--- a/services/publicitem/jaxb/pom.xml
+++ b/services/publicitem/jaxb/pom.xml
@@ -25,8 +25,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/publicitem/jaxb/src/main/resources/publicitems-common.xsd b/services/publicitem/jaxb/src/main/resources/publicitems-common.xsd
index c6d874b7a141f3eb644d7c71099b19a4613ad5f8..8c1910f0e5cbe1956e21bdadc9531e08dc7ac1a0 100644 (file)
--- 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$ -->
 
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-       xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" jaxb:version="1.0"
+       xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" jaxb:version="3.0"
        elementFormDefault="unqualified" xmlns:ns="http://collectionspace.org/services/publicitem"
        xmlns="http://collectionspace.org/services/publicitem" targetNamespace="http://collectionspace.org/services/publicitem"
        version="0.1">

diff --git a/services/repatriationrequest/jaxb/pom.xml b/services/repatriationrequest/jaxb/pom.xml
index d61ef620da193fe9849762088385d7e07e088180..b74a788a3eede2154df39081e2b512115d276e76 100644 (file)
--- a/services/repatriationrequest/jaxb/pom.xml
+++ b/services/repatriationrequest/jaxb/pom.xml
@@ -30,8 +30,8 @@
     <defaultGoal>install</defaultGoal>
     <plugins>
       <plugin>
-        <groupId>org.jvnet.jaxb2.maven2</groupId>
-        <artifactId>maven-jaxb2-plugin</artifactId>
+        <groupId>org.jvnet.jaxb</groupId>
+        <artifactId>jaxb-maven-plugin</artifactId>
       </plugin>
     </plugins>
   </build>

diff --git a/services/repatriationrequest/jaxb/src/main/resources/repatriationrequests_common.xsd b/services/repatriationrequest/jaxb/src/main/resources/repatriationrequests_common.xsd
index 58c864617ee1063e81e93f6cef445d11e55902be..ae0981383cdbe629e28edcc283e7004be7dc3aa9 100644 (file)
--- a/services/repatriationrequest/jaxb/src/main/resources/repatriationrequests_common.xsd
+++ b/services/repatriationrequest/jaxb/src/main/resources/repatriationrequests_common.xsd
@@ -10,8 +10,8 @@
 
 <xs:schema
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="2.0"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0"
   xmlns:nagpra="http://collectionspace.org/services/nagpra"
   xmlns:ns="http://collectionspace.org/services/repatriationrequest"
   xmlns="http://collectionspace.org/services/repatriationrequest"

diff --git a/services/report/jaxb/pom.xml b/services/report/jaxb/pom.xml
index 6ee0189ac4c9231d3fe14947c64459b84cfb4476..06bebdfeeb0f707b4f6267ca2c23ceee4cd2f11c 100644 (file)
--- a/services/report/jaxb/pom.xml
+++ b/services/report/jaxb/pom.xml
@@ -25,8 +25,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/report/jaxb/src/main/resources/reports-common.xsd b/services/report/jaxb/src/main/resources/reports-common.xsd
index c3ee01df5b3312d95fb521a2c4ba60d9962e87bf..9f0ac59cac667dd654cfa8c3f47661d15d0c382c 100644 (file)
--- a/services/report/jaxb/src/main/resources/reports-common.xsd
+++ b/services/report/jaxb/src/main/resources/reports-common.xsd
@@ -13,8 +13,8 @@
 
 <xs:schema 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="1.0" elementFormDefault="unqualified"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns:ns="http://collectionspace.org/services/report"
   xmlns="http://collectionspace.org/services/report"
   targetNamespace="http://collectionspace.org/services/report"

diff --git a/services/report/jaxb/src/main/resources/reports-output-mime.xsd b/services/report/jaxb/src/main/resources/reports-output-mime.xsd
index ccf4488108a187106a656bf26faedc2dc42f3867..debc2f5cecdf9cce01926da541aa40d3de2a7edd 100644 (file)
--- a/services/report/jaxb/src/main/resources/reports-output-mime.xsd
+++ b/services/report/jaxb/src/main/resources/reports-output-mime.xsd
@@ -10,8 +10,8 @@
 
 <xs:schema 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="1.0" elementFormDefault="unqualified"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns:ns="http://collectionspace.org/services/report"
   xmlns="http://collectionspace.org/services/report"
   targetNamespace="http://collectionspace.org/services/report"

diff --git a/services/restrictedmedia/jaxb/pom.xml b/services/restrictedmedia/jaxb/pom.xml
index b0acaec0974cc97b37aebe3f706712fd05aa5f51..e284792291d1ed8cdc57df46d62ddb1cbf480403 100644 (file)
--- a/services/restrictedmedia/jaxb/pom.xml
+++ b/services/restrictedmedia/jaxb/pom.xml
@@ -25,8 +25,8 @@
     <defaultGoal>install</defaultGoal>
     <plugins>
       <plugin>
-        <groupId>org.jvnet.jaxb2.maven2</groupId>
-        <artifactId>maven-jaxb2-plugin</artifactId>
+        <groupId>org.jvnet.jaxb</groupId>
+        <artifactId>jaxb-maven-plugin</artifactId>
       </plugin>
     </plugins>
   </build>

diff --git a/services/restrictedmedia/jaxb/src/main/resources/restrictedmedia_common.xsd b/services/restrictedmedia/jaxb/src/main/resources/restrictedmedia_common.xsd
index aed21ba74fa05ee7f6edb5ee88754ab1366208f7..a98206a5076d942067c2f68c5fcae499b25d9029 100644 (file)
--- a/services/restrictedmedia/jaxb/src/main/resources/restrictedmedia_common.xsd
+++ b/services/restrictedmedia/jaxb/src/main/resources/restrictedmedia_common.xsd
@@ -9,8 +9,8 @@
 -->
 <xs:schema
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="2.0"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0"
   xmlns="http://collectionspace.org/services/restrictedmedia"
   targetNamespace="http://collectionspace.org/services/restrictedmedia"
   version="0.1"

diff --git a/services/security/client/src/test/resources/META-INF/persistence.xml b/services/security/client/src/test/resources/META-INF/persistence.xml
index 9577e73190cfd08e94cb5c4ecc781c974a9a1111..27653a27b0ff6dd531d55419cd1d2fa353005186 100644 (file)
--- a/services/security/client/src/test/resources/META-INF/persistence.xml
+++ b/services/security/client/src/test/resources/META-INF/persistence.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<persistence version="1.0" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd
-http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<persistence version="1.0" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_1_0.xsd
+https://jakarta.ee/xml/ns/persistence/orm https://jakarta.ee/xml/ns/persistence/orm_1_0.xsd" xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:orm="https://jakarta.ee/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <persistence-unit name="org.collectionspace.services.authentication">
         <class>org.collectionspace.services.authentication.User</class>
         <class>org.collectionspace.services.authorization.Role</class>

diff --git a/services/servicegroup/jaxb/pom.xml b/services/servicegroup/jaxb/pom.xml
index cc8e9c51a0222bacf74d6974bc4da5c46176a879..68c9d5626cf623b0bd4694e1cfe754971503e1e1 100644 (file)
--- a/services/servicegroup/jaxb/pom.xml
+++ b/services/servicegroup/jaxb/pom.xml
@@ -26,8 +26,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/servicegroup/jaxb/src/main/resources/servicegroup_common.xsd b/services/servicegroup/jaxb/src/main/resources/servicegroup_common.xsd
index 42a66955141f55f2a2c525446a79885f908a7151..96fbcc5f138f46978a19da49e17670d1c159fb15 100644 (file)
--- a/services/servicegroup/jaxb/src/main/resources/servicegroup_common.xsd
+++ b/services/servicegroup/jaxb/src/main/resources/servicegroup_common.xsd
@@ -13,8 +13,8 @@
 
 <xs:schema
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="1.0" elementFormDefault="unqualified"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns="http://collectionspace.org/services/servicegroup"
   targetNamespace="http://collectionspace.org/services/servicegroup"
   version="0.1"

diff --git a/services/structureddate/jaxb/pom.xml b/services/structureddate/jaxb/pom.xml
index 2518f5bc22989f63c05b80a1e4b44cfa8792bdd2..ee6d09e9a5ca0b78b30e358eb490fb59cafcec32 100644 (file)
--- a/services/structureddate/jaxb/pom.xml
+++ b/services/structureddate/jaxb/pom.xml
@@ -25,8 +25,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/structureddate/jaxb/src/main/resources/structureddate-common.xsd b/services/structureddate/jaxb/src/main/resources/structureddate-common.xsd
index 7d05df2e9cf7589a083122ab29d9f671bc2902e9..58ed8859bc3e3bc8e898e3b41ffe6ea3f283a19b 100644 (file)
--- a/services/structureddate/jaxb/src/main/resources/structureddate-common.xsd
+++ b/services/structureddate/jaxb/src/main/resources/structureddate-common.xsd
@@ -10,8 +10,8 @@
 
 <xs:schema
        xmlns:xs="http://www.w3.org/2001/XMLSchema"
-       xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-       jaxb:version="1.0" elementFormDefault="unqualified"
+       xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+       jaxb:version="3.0" elementFormDefault="unqualified"
        xmlns:ns="http://collectionspace.org/services/structureddate"
        xmlns="http://collectionspace.org/services/structureddate"
        targetNamespace="http://collectionspace.org/services/structureddate"

diff --git a/services/summarydocumentation/jaxb/pom.xml b/services/summarydocumentation/jaxb/pom.xml
index 1e27981d804a23e2ccf46dfc8507c03a806daf68..4222286037e92b3e4171a8d2f3f84d5747836971 100644 (file)
--- a/services/summarydocumentation/jaxb/pom.xml
+++ b/services/summarydocumentation/jaxb/pom.xml
@@ -30,8 +30,8 @@
     <defaultGoal>install</defaultGoal>
     <plugins>
       <plugin>
-        <groupId>org.jvnet.jaxb2.maven2</groupId>
-        <artifactId>maven-jaxb2-plugin</artifactId>
+        <groupId>org.jvnet.jaxb</groupId>
+        <artifactId>jaxb-maven-plugin</artifactId>
       </plugin>
     </plugins>
   </build>

diff --git a/services/summarydocumentation/jaxb/src/main/resources/summarydocumentations_common.xsd b/services/summarydocumentation/jaxb/src/main/resources/summarydocumentations_common.xsd
index 0855f2e30bbb7c0917a385a08042a407a7b94116..6b67474824376d84a26991dce39d4268ce480c4e 100644 (file)
--- a/services/summarydocumentation/jaxb/src/main/resources/summarydocumentations_common.xsd
+++ b/services/summarydocumentation/jaxb/src/main/resources/summarydocumentations_common.xsd
@@ -10,8 +10,8 @@
 
 <xs:schema
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="2.0"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0"
   xmlns:nagpra="http://collectionspace.org/services/nagpra"
   xmlns="http://collectionspace.org/services/summarydocumentation"
   targetNamespace="http://collectionspace.org/services/summarydocumentation"

diff --git a/services/systeminfo/jaxb/pom.xml b/services/systeminfo/jaxb/pom.xml
index 8b91cc996a45ef3dab2a51a563c4224be554266d..e9d09109820bbfaa55a5c2bd5bc1949e6935d3b8 100644 (file)
--- a/services/systeminfo/jaxb/pom.xml
+++ b/services/systeminfo/jaxb/pom.xml
@@ -25,8 +25,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/systeminfo/jaxb/src/main/resources/systeminfo-common.xsd b/services/systeminfo/jaxb/src/main/resources/systeminfo-common.xsd
index d35336f9e07de82f4ccd73a8f074252583f163c9..4fcc923b4c8013e18cf9f9ccb7918bbfbe3a3629 100644 (file)
--- a/services/systeminfo/jaxb/src/main/resources/systeminfo-common.xsd
+++ b/services/systeminfo/jaxb/src/main/resources/systeminfo-common.xsd
@@ -11,8 +11,8 @@
 
 <xs:schema 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="1.0" elementFormDefault="unqualified"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns:ns="http://collectionspace.org/services/systeminfo"
   xmlns="http://collectionspace.org/services/systeminfo"
   targetNamespace="http://collectionspace.org/services/systeminfo"

diff --git a/services/taxonomy/jaxb/pom.xml b/services/taxonomy/jaxb/pom.xml
index e02ca10a6358e44556a9d91fedf5edb7ccc7a999..a1b6809ddd1c70d706315fb45b1434de21a52595 100644 (file)
--- a/services/taxonomy/jaxb/pom.xml
+++ b/services/taxonomy/jaxb/pom.xml
@@ -34,8 +34,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/taxonomy/jaxb/src/main/resources/taxon_common.xsd b/services/taxonomy/jaxb/src/main/resources/taxon_common.xsd
index 74b460741a67a73bab071db3cc55f1bff04343e5..5c84dfbdf05716eb3a1b4379b282738d4fad335e 100644 (file)
--- a/services/taxonomy/jaxb/src/main/resources/taxon_common.xsd
+++ b/services/taxonomy/jaxb/src/main/resources/taxon_common.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <xs:schema 
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-    jaxb:version="1.0" elementFormDefault="unqualified"
+    xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+    jaxb:version="3.0" elementFormDefault="unqualified"
     xmlns:ns="http://collectionspace.org/services/taxonomy"
     xmlns="http://collectionspace.org/services/taxonomy"
     targetNamespace="http://collectionspace.org/services/taxonomy"

diff --git a/services/taxonomy/jaxb/src/main/resources/taxonomyauthority_common.xsd b/services/taxonomy/jaxb/src/main/resources/taxonomyauthority_common.xsd
index 7417bedd4d3754c67c99f68969d5c8ddc3becf8d..42d4c3d8b83ff613930400805bd8f993a5137294 100644 (file)
--- a/services/taxonomy/jaxb/src/main/resources/taxonomyauthority_common.xsd
+++ b/services/taxonomy/jaxb/src/main/resources/taxonomyauthority_common.xsd
@@ -11,8 +11,8 @@
 
 <xs:schema 
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-    jaxb:version="1.0" elementFormDefault="unqualified"
+    xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+    jaxb:version="3.0" elementFormDefault="unqualified"
     xmlns:ns="http://collectionspace.org/services/taxonomy"
     xmlns="http://collectionspace.org/services/taxonomy"
     targetNamespace="http://collectionspace.org/services/taxonomy"

diff --git a/services/transport/jaxb/pom.xml b/services/transport/jaxb/pom.xml
index ba80ae541caa65328ddd699dbf6728b989317f65..9d2cb62210a03f368e724c35338d848b355375a0 100644 (file)
--- a/services/transport/jaxb/pom.xml
+++ b/services/transport/jaxb/pom.xml
@@ -25,8 +25,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
         </plugins>
     </build>

diff --git a/services/transport/jaxb/src/main/resources/transports-common.xsd b/services/transport/jaxb/src/main/resources/transports-common.xsd
index 5084ed8c5b945d7df997b5d5355268ab5983996c..9bbd4f85cb61a692fa4f1182f8599713c921f9e3 100644 (file)
--- a/services/transport/jaxb/src/main/resources/transports-common.xsd
+++ b/services/transport/jaxb/src/main/resources/transports-common.xsd
@@ -10,8 +10,8 @@
 
 <xs:schema
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="1.0" elementFormDefault="unqualified"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns:ns="http://collectionspace.org/services/transport"
   xmlns="http://collectionspace.org/services/transport"
   targetNamespace="http://collectionspace.org/services/transport"

diff --git a/services/uoc/jaxb/pom.xml b/services/uoc/jaxb/pom.xml
index 7da14c652a071b07088032fb3c866ebdf6898b9a..91fcb054c9daa93d4d7a69e38ea91b8df20230ef 100644 (file)
--- a/services/uoc/jaxb/pom.xml
+++ b/services/uoc/jaxb/pom.xml
@@ -25,8 +25,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/uoc/jaxb/src/main/resources/uoc-common.xsd b/services/uoc/jaxb/src/main/resources/uoc-common.xsd
index e82423553b2b95a58d7d718a4694b367cb70363c..81e15315116220f8ff1db8abe383e3b7a6028a4c 100644 (file)
--- a/services/uoc/jaxb/src/main/resources/uoc-common.xsd
+++ b/services/uoc/jaxb/src/main/resources/uoc-common.xsd
@@ -13,8 +13,8 @@
 
 <xs:schema 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="1.0" elementFormDefault="unqualified"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns:ns="http://collectionspace.org/services/uoc"
   xmlns="http://collectionspace.org/services/uoc"
   targetNamespace="http://collectionspace.org/services/uoc"

diff --git a/services/valuationcontrol/jaxb/pom.xml b/services/valuationcontrol/jaxb/pom.xml
index 8aacc9883d63fae0a6b5008172f96d7ea227e5a5..46a22c4f5d1a3ae24ddd39b88ecae284cbf7ce0d 100644 (file)
--- a/services/valuationcontrol/jaxb/pom.xml
+++ b/services/valuationcontrol/jaxb/pom.xml
@@ -26,8 +26,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/valuationcontrol/jaxb/src/main/resources/Valuationcontrols-common.xsd b/services/valuationcontrol/jaxb/src/main/resources/Valuationcontrols-common.xsd
index 71764e02cdac12f67419cb7ae91462573be1c5ee..b5a67475707b63312e6b94f59c4adaaa8387bd15 100644 (file)
--- a/services/valuationcontrol/jaxb/src/main/resources/Valuationcontrols-common.xsd
+++ b/services/valuationcontrol/jaxb/src/main/resources/Valuationcontrols-common.xsd
@@ -10,8 +10,8 @@
 
 <xs:schema 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-  jaxb:version="1.0" elementFormDefault="unqualified"
+  xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+  jaxb:version="3.0" elementFormDefault="unqualified"
   xmlns:ns="http://collectionspace.org/services/valuationcontrol"
   xmlns="http://collectionspace.org/services/valuationcontrol"
   targetNamespace="http://collectionspace.org/services/valuationcontrol"

diff --git a/services/vocabulary/jaxb/pom.xml b/services/vocabulary/jaxb/pom.xml
index 7f96d589c2fec4d6ed4c6462cecb9cd5fa8e1872..e3052902e728ccb5cb2bcc6ff59bd768e01c88b0 100644 (file)
--- a/services/vocabulary/jaxb/pom.xml
+++ b/services/vocabulary/jaxb/pom.xml
@@ -30,8 +30,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>                
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>                
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/vocabulary/jaxb/src/main/resources/vocabulary_common.xsd b/services/vocabulary/jaxb/src/main/resources/vocabulary_common.xsd
index 48b543328436f8905712ca27f6fba0e2e4394ece..b39d7d399d5a6d876e2f0d0d8ed7d3cf0ddd12fe 100644 (file)
--- a/services/vocabulary/jaxb/src/main/resources/vocabulary_common.xsd
+++ b/services/vocabulary/jaxb/src/main/resources/vocabulary_common.xsd
@@ -11,8 +11,8 @@
 
 <xs:schema 
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-    jaxb:version="1.0" elementFormDefault="unqualified"
+    xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+    jaxb:version="3.0" elementFormDefault="unqualified"
     xmlns:ns="http://collectionspace.org/services/vocabulary"
     xmlns="http://collectionspace.org/services/vocabulary"
     targetNamespace="http://collectionspace.org/services/vocabulary"

diff --git a/services/vocabulary/jaxb/src/main/resources/vocabularyitem_common.xsd b/services/vocabulary/jaxb/src/main/resources/vocabularyitem_common.xsd
index c4c04b9e4bf8337aaa08c62dfde5fe0d26c1f5f0..37a221bbb0e077348a50a8038050e03bdd128d56 100644 (file)
--- a/services/vocabulary/jaxb/src/main/resources/vocabularyitem_common.xsd
+++ b/services/vocabulary/jaxb/src/main/resources/vocabularyitem_common.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <xs:schema
         xmlns:xs="http://www.w3.org/2001/XMLSchema"
-        xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-        jaxb:version="1.0" elementFormDefault="unqualified"
+        xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+        jaxb:version="3.0" elementFormDefault="unqualified"
         xmlns:ns="http://collectionspace.org/services/vocabulary"
         xmlns="http://collectionspace.org/services/vocabulary"
         targetNamespace="http://collectionspace.org/services/vocabulary"

diff --git a/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/VocabularyResource.java b/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/VocabularyResource.java
index ae371b36a159e71f69ebcda21ff8e0351c29238e..22d83188d1df19ba5fcf9c07492c98216c64d028 100644 (file)
--- a/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/VocabularyResource.java
+++ b/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/VocabularyResource.java
@@ -76,7 +76,7 @@ import javax.ws.rs.core.Request;
 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;
 
 @Path("/" + VocabularyClient.SERVICE_PATH_COMPONENT)
 public class VocabularyResource extends

diff --git a/services/work/jaxb/pom.xml b/services/work/jaxb/pom.xml
index 487c989c2395b278f4baff42cfef1bbe038621e3..8aac9745b6122ba67ca187cc78bbf547270126ae 100644 (file)
--- a/services/work/jaxb/pom.xml
+++ b/services/work/jaxb/pom.xml
@@ -18,7 +18,7 @@
             <artifactId>org.collectionspace.services.common</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
+            <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-core</artifactId>
         </dependency>
         <dependency>
@@ -39,8 +39,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/services/work/jaxb/src/main/resources/work_common.xsd b/services/work/jaxb/src/main/resources/work_common.xsd
index cfa95363b0ccfcefd36df8b775e45a76690a1101..4c94fbab6da8bdd4911a05b0e1f577b2a2953b64 100644 (file)
--- a/services/work/jaxb/src/main/resources/work_common.xsd
+++ b/services/work/jaxb/src/main/resources/work_common.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <xs:schema 
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-    jaxb:version="1.0" elementFormDefault="unqualified"
+    xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+    jaxb:version="3.0" elementFormDefault="unqualified"
     xmlns:ns="http://collectionspace.org/services/work"
     xmlns="http://collectionspace.org/services/work"
     targetNamespace="http://collectionspace.org/services/work"

diff --git a/services/work/jaxb/src/main/resources/workauthority_common.xsd b/services/work/jaxb/src/main/resources/workauthority_common.xsd
index ce4beadad8c7477813c98d01dd82506f466d456a..6fd0e1262a7116e3b40fa684a400389be80a8936 100644 (file)
--- a/services/work/jaxb/src/main/resources/workauthority_common.xsd
+++ b/services/work/jaxb/src/main/resources/workauthority_common.xsd
@@ -11,8 +11,8 @@
 
 <xs:schema 
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-    jaxb:version="1.0" elementFormDefault="unqualified"
+    xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+    jaxb:version="3.0" elementFormDefault="unqualified"
     xmlns:ns="http://collectionspace.org/services/work"
     xmlns="http://collectionspace.org/services/work"
     targetNamespace="http://collectionspace.org/services/work"

diff --git a/services/workflow/jaxb/pom.xml b/services/workflow/jaxb/pom.xml
index a477e6518a3f75e2d35946e598e7a1ad67110052..61e70f3501e289f76b9f2bd9c0c60eaa71a7e17d 100644 (file)
--- a/services/workflow/jaxb/pom.xml
+++ b/services/workflow/jaxb/pom.xml
@@ -25,8 +25,8 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>