From c6852935c0992ccdf892d685c0d4a30245e7877c Mon Sep 17 00:00:00 2001
From: Michael Bouschen <Michael.Bouschen@spree.de>
Date: Sun, 15 Feb 2026 15:41:43 +0100
Subject: [PATCH 1/3] JDO-858: added profile jdori-dn6 to run DataNucleus
 version 6

---
 tck/pom.xml | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 92 insertions(+), 1 deletion(-)

diff --git a/tck/pom.xml b/tck/pom.xml
index 1d86902a..6e9d710e 100644
--- a/tck/pom.xml
+++ b/tck/pom.xml
@@ -221,7 +221,7 @@
                 <dependency>
                     <groupId>org.datanucleus</groupId>
                     <artifactId>datanucleus-jdo-query</artifactId>
-                    <version>5.0.9</version>
+                    <version>5.0.10</version>
                 </dependency>
                 <dependency>
                     <groupId>org.datanucleus</groupId>
@@ -257,5 +257,96 @@
                 </dependency>
             </dependencies>
         </profile>
+        <profile>
+            <id>jdori-dn6</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+                <property>
+                    <name>jdo.tck.impl</name>
+                    <value>jdori</value>
+                </property>
+            </activation>
+            <properties>
+                <maven.compiler.target>11</maven.compiler.target>
+            </properties>
+            <dependencies>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-core</artifactId>
+                    <version>6.0.11</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-rdbms</artifactId>
+                    <version>6.0.10</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-api-jdo</artifactId>
+                    <version>6.0.5</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-jdo-query</artifactId>
+                    <version>6.0.2</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-api-jpa</artifactId>
+                    <version>6.0.2</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-api</artifactId>
+                    <version>2.25.3</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-core</artifactId>
+                    <version>2.25.3</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-jcl</artifactId>
+                    <version>2.25.3</version>
+                </dependency>
+                <dependency>
+                    <!-- License: CDDL + GPLv2 with classpath exception https://github.com/javaee/javax.annotation/blob/master/LICENSE -->
+                    <groupId>javax.annotation</groupId>
+                    <artifactId>javax.annotation-api</artifactId>
+                    <version>1.3.2</version>
+                </dependency>
+                <dependency>
+                    <!-- License: EDL 1.0 https://www.eclipse.org/org/documents/edl-v10.php -->
+                    <groupId>org.glassfish.corba</groupId>
+                    <artifactId>glassfish-corba-orb</artifactId>
+                    <version>5.0.0</version>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                    <!-- This plugin makes sure to run the profile with a JDK 11 or above -->
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-enforcer-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>enforce-versions</id>
+                                <goals>
+                                    <goal>enforce</goal>
+                                </goals>
+                                <configuration>
+                                    <rules>
+                                        <requireJavaVersion>
+                                            <version>[11,)</version>
+                                        </requireJavaVersion>
+                                    </rules>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 </project>

From 4fedc2d26c997edea97a4926999d0e3fb43862e3 Mon Sep 17 00:00:00 2001
From: Michael Bouschen <Michael.Bouschen@spree.de>
Date: Sun, 15 Feb 2026 16:21:49 +0100
Subject: [PATCH 2/3] Revert "JDO-858: added profile jdori-dn6 to run
 DataNucleus version 6"

This reverts commit c6852935c0992ccdf892d685c0d4a30245e7877c.
---
 tck/pom.xml | 93 +----------------------------------------------------
 1 file changed, 1 insertion(+), 92 deletions(-)

diff --git a/tck/pom.xml b/tck/pom.xml
index 6e9d710e..1d86902a 100644
--- a/tck/pom.xml
+++ b/tck/pom.xml
@@ -221,7 +221,7 @@
                 <dependency>
                     <groupId>org.datanucleus</groupId>
                     <artifactId>datanucleus-jdo-query</artifactId>
-                    <version>5.0.10</version>
+                    <version>5.0.9</version>
                 </dependency>
                 <dependency>
                     <groupId>org.datanucleus</groupId>
@@ -257,96 +257,5 @@
                 </dependency>
             </dependencies>
         </profile>
-        <profile>
-            <id>jdori-dn6</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-                <property>
-                    <name>jdo.tck.impl</name>
-                    <value>jdori</value>
-                </property>
-            </activation>
-            <properties>
-                <maven.compiler.target>11</maven.compiler.target>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-core</artifactId>
-                    <version>6.0.11</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-rdbms</artifactId>
-                    <version>6.0.10</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-api-jdo</artifactId>
-                    <version>6.0.5</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-jdo-query</artifactId>
-                    <version>6.0.2</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.datanucleus</groupId>
-                    <artifactId>datanucleus-api-jpa</artifactId>
-                    <version>6.0.2</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.logging.log4j</groupId>
-                    <artifactId>log4j-api</artifactId>
-                    <version>2.25.3</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.logging.log4j</groupId>
-                    <artifactId>log4j-core</artifactId>
-                    <version>2.25.3</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.logging.log4j</groupId>
-                    <artifactId>log4j-jcl</artifactId>
-                    <version>2.25.3</version>
-                </dependency>
-                <dependency>
-                    <!-- License: CDDL + GPLv2 with classpath exception https://github.com/javaee/javax.annotation/blob/master/LICENSE -->
-                    <groupId>javax.annotation</groupId>
-                    <artifactId>javax.annotation-api</artifactId>
-                    <version>1.3.2</version>
-                </dependency>
-                <dependency>
-                    <!-- License: EDL 1.0 https://www.eclipse.org/org/documents/edl-v10.php -->
-                    <groupId>org.glassfish.corba</groupId>
-                    <artifactId>glassfish-corba-orb</artifactId>
-                    <version>5.0.0</version>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                    <!-- This plugin makes sure to run the profile with a JDK 11 or above -->
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-enforcer-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>enforce-versions</id>
-                                <goals>
-                                    <goal>enforce</goal>
-                                </goals>
-                                <configuration>
-                                    <rules>
-                                        <requireJavaVersion>
-                                            <version>[11,)</version>
-                                        </requireJavaVersion>
-                                    </rules>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
 </project>

From dc9a2681383e862a8f49fd45b96d7efc74047531 Mon Sep 17 00:00:00 2001
From: Michael Bouschen <Michael.Bouschen@spree.de>
Date: Sun, 15 Feb 2026 16:37:04 +0100
Subject: [PATCH 3/3] Reapply "JDO-858: added profile jdori-dn6 to run
 DataNucleus version 6"

This reverts commit 4fedc2d26c997edea97a4926999d0e3fb43862e3.
---
 tck/pom.xml | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 92 insertions(+), 1 deletion(-)

diff --git a/tck/pom.xml b/tck/pom.xml
index 1d86902a..6e9d710e 100644
--- a/tck/pom.xml
+++ b/tck/pom.xml
@@ -221,7 +221,7 @@
                 <dependency>
                     <groupId>org.datanucleus</groupId>
                     <artifactId>datanucleus-jdo-query</artifactId>
-                    <version>5.0.9</version>
+                    <version>5.0.10</version>
                 </dependency>
                 <dependency>
                     <groupId>org.datanucleus</groupId>
@@ -257,5 +257,96 @@
                 </dependency>
             </dependencies>
         </profile>
+        <profile>
+            <id>jdori-dn6</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+                <property>
+                    <name>jdo.tck.impl</name>
+                    <value>jdori</value>
+                </property>
+            </activation>
+            <properties>
+                <maven.compiler.target>11</maven.compiler.target>
+            </properties>
+            <dependencies>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-core</artifactId>
+                    <version>6.0.11</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-rdbms</artifactId>
+                    <version>6.0.10</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-api-jdo</artifactId>
+                    <version>6.0.5</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-jdo-query</artifactId>
+                    <version>6.0.2</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.datanucleus</groupId>
+                    <artifactId>datanucleus-api-jpa</artifactId>
+                    <version>6.0.2</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-api</artifactId>
+                    <version>2.25.3</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-core</artifactId>
+                    <version>2.25.3</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-jcl</artifactId>
+                    <version>2.25.3</version>
+                </dependency>
+                <dependency>
+                    <!-- License: CDDL + GPLv2 with classpath exception https://github.com/javaee/javax.annotation/blob/master/LICENSE -->
+                    <groupId>javax.annotation</groupId>
+                    <artifactId>javax.annotation-api</artifactId>
+                    <version>1.3.2</version>
+                </dependency>
+                <dependency>
+                    <!-- License: EDL 1.0 https://www.eclipse.org/org/documents/edl-v10.php -->
+                    <groupId>org.glassfish.corba</groupId>
+                    <artifactId>glassfish-corba-orb</artifactId>
+                    <version>5.0.0</version>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                    <!-- This plugin makes sure to run the profile with a JDK 11 or above -->
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-enforcer-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>enforce-versions</id>
+                                <goals>
+                                    <goal>enforce</goal>
+                                </goals>
+                                <configuration>
+                                    <rules>
+                                        <requireJavaVersion>
+                                            <version>[11,)</version>
+                                        </requireJavaVersion>
+                                    </rules>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 </project>