pom: update datanucleus (and deps) to 6.0 release

Motivation: For an eventual move to java17 (dcache-10.0?) we need to update the bytecode based tool to their actual releases. Modification: Update datanucleus-core to 6.0.5. Update dependencies to their corresponding latest versions. Result: up-to-date version of datanucleus Acked-by: Dmitry Litvintsev Target: master Require-book: no Require-notes: no
dCache · Feb 2, 2024 · af5ea1c · af5ea1c
1 parent c0d5c07
commit af5ea1c
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 32 deletions.
diff --git a/modules/dcache/src/main/resources/META-INF/persistence.xml b/modules/dcache/src/main/resources/META-INF/persistence.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
-                        http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
-                        version="1.0">
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence
+        https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" version="3.1">
 
     <persistence-unit name="AlarmsXML">
       <mapping-file>org/dcache/alarms/dao/package.jdo</mapping-file>

diff --git a/modules/dcache/src/main/resources/diskCacheV111/services/package.jdo b/modules/dcache/src/main/resources/diskCacheV111/services/package.jdo
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo
-        http://java.sun.com/xml/ns/jdo/jdo_2_0.xsd">
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
      <package name="diskCacheV111.services">
         <class name="TransferManagerHandler" detachable="true" identity-type="application" table="remotetransfers">
             <field name="id" primary-key="true" null-value="exception">

diff --git a/modules/dcache/src/main/resources/diskCacheV111/services/transfer-manager.xml b/modules/dcache/src/main/resources/diskCacheV111/services/transfer-manager.xml
@@ -116,7 +116,7 @@
             destroy-method="close">
         <constructor-arg>
             <map>
-                <entry key="datanucleus.PersistenceUnitName" value="TransferManager"/>
+                <entry key="datanucleus.persistenceunitname" value="TransferManager"/>
             </map>
         </constructor-arg>
         <property name="connectionFactory" ref="dataSource"/>

diff --git a/modules/dcache/src/main/resources/org/dcache/alarms/dao/package.jdo b/modules/dcache/src/main/resources/org/dcache/alarms/dao/package.jdo
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo
-        http://java.sun.com/xml/ns/jdo/jdo_2_0.xsd">
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
     <package name="org.dcache.alarms">
         <class name="LogEntry" detachable="true" >
             <field name="key" primary-key="true"/>

diff --git a/modules/dcache/src/main/resources/org/dcache/alarms/logback/alarms.xml b/modules/dcache/src/main/resources/org/dcache/alarms/logback/alarms.xml
@@ -94,7 +94,7 @@
             <description>Database persistence manager</description>
             <constructor-arg>
                 <map>
-                    <entry key="datanucleus.PersistenceUnitName" value="AlarmsXML"/>
+                    <entry key="datanucleus.persistenceunitname" value="AlarmsXML"/>
                     <entry key="datanucleus.ConnectionURL" value="${alarms.db.url}"/>
                 </map>
             </constructor-arg>
@@ -144,7 +144,7 @@
             <description>Database persistence manager</description>
             <constructor-arg>
                  <map>
-                    <entry key="datanucleus.PersistenceUnitName" value="AlarmsRDBMS"/>
+                    <entry key="datanucleus.persistenceunitname" value="AlarmsRDBMS"/>
                 </map>
             </constructor-arg>
             <property name="connectionFactory" ref="dataSource"/>

diff --git a/modules/dcache/src/main/resources/org/dcache/services/billing/cells/billing.xml b/modules/dcache/src/main/resources/org/dcache/services/billing/cells/billing.xml
@@ -89,7 +89,7 @@
           <description>Database persistence manager</description>
           <constructor-arg>
               <map>
-                  <entry key="datanucleus.PersistenceUnitName" value="Billing"/>
+                  <entry key="datanucleus.persistenceunitname" value="Billing"/>
               </map>
           </constructor-arg>
           <property name="connectionFactory" ref="data-source"/>

diff --git a/modules/dcache/src/main/resources/org/dcache/services/billing/db/data/package.jdo b/modules/dcache/src/main/resources/org/dcache/services/billing/db/data/package.jdo
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo
-        http://java.sun.com/xml/ns/jdo/jdo_2_0.xsd">
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
     <package name="org.dcache.services.billing.db.data">
         <class name="PnfsBaseInfo"  identity-type="nondurable">
             <inheritance strategy="complete-table"/>

diff --git a/pom.xml b/pom.xml
@@ -119,8 +119,8 @@
         <bouncycastle.bcprov>bcprov-jdk15on</bouncycastle.bcprov>
         <bouncycastle.bcpkix>bcpkix-jdk15on</bouncycastle.bcpkix>
         <bouncycastle.version>1.67</bouncycastle.version>
-        <datanucleus-core.version>5.2.2</datanucleus-core.version>
-        <datanucleus.plugin.version>5.2.1</datanucleus.plugin.version>
+        <datanucleus-core.version>6.0.6</datanucleus-core.version>
+        <datanucleus.plugin.version>6.0.0-release</datanucleus.plugin.version>
         <asm.version>9.5</asm.version>
         <asm-tools.version>5.0.3</asm-tools.version>
     </properties>
@@ -451,37 +451,32 @@
             <dependency>
                 <groupId>org.datanucleus</groupId>
                 <artifactId>datanucleus-api-jdo</artifactId>
-                <version>5.2.2</version>
+                <version>6.0.1</version>
             </dependency>
             <dependency>
                 <groupId>org.datanucleus</groupId>
                 <artifactId>datanucleus-jdo-query</artifactId>
-                <version>5.0.9</version>
+                <version>6.0.1</version>
             </dependency>
             <dependency>
                 <groupId>org.datanucleus</groupId>
                 <artifactId>javax.jdo</artifactId>
-                <version>3.2.0-m12</version>
+                <version>3.2.0-release</version>
             </dependency>
             <dependency>
                 <groupId>org.datanucleus</groupId>
                 <artifactId>datanucleus-rdbms</artifactId>
-                <version>5.2.1</version>
-            </dependency>
-            <dependency>
-               <groupId>org.datanucleus</groupId>
-               <artifactId>datanucleus-accessplatform-jdo-rdbms</artifactId>
-               <version>5.2.2</version>
+                <version>${datanucleus-core.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.datanucleus</groupId>
                 <artifactId>datanucleus-xml</artifactId>
-                <version>5.1.0-release</version>
+                <version>6.0.0-release</version>
             </dependency>
             <dependency>
                 <groupId>org.datanucleus</groupId>
                 <artifactId>datanucleus-cache</artifactId>
-                <version>5.1.1</version>
+                <version>6.0.0-release</version>
             </dependency>
             <dependency>
                 <groupId>net.sf.saxon</groupId>
@@ -1186,7 +1181,7 @@
                         <dependency>
                             <groupId>org.slf4j</groupId>
                             <artifactId>log4j-over-slf4j</artifactId>
-			    <version>${version.slf4j}</version>
+                            <version>${version.slf4j}</version>
                         </dependency>
                         <dependency>
                             <groupId>org.dcache</groupId>