From b52f9b9670b5bef16cc6b7f7a306862d250ec56a Mon Sep 17 00:00:00 2001
From: Oliver Bertuch <o.bertuch@fz-juelich.de>
Date: Fri, 18 Oct 2024 12:13:10 +0200
Subject: [PATCH 1/5] doc: add note about maven parent to 5.2.2 release notes

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index b318afbb..ee8f9f38 100644
--- a/README.md
+++ b/README.md
@@ -78,6 +78,7 @@ mvn spotless:check
 
 #### 🏹 BUG FIXES
 - Catch invalid Base64 encodings for resumption tokens (#272) - a community contribution by @bumann-sbb 💫
+- Switch to [GDCC Maven Parent POM](https://github.com/gdcc/maven-parent)
 
 ### v5.2.1
 

From 47d3bcec0788d9300dec21e025d571d3be265c77 Mon Sep 17 00:00:00 2001
From: Oliver Bertuch <o.bertuch@fz-juelich.de>
Date: Fri, 18 Oct 2024 12:14:09 +0200
Subject: [PATCH 2/5] build: introduce GDCC Maven Parent POM

---
 pom.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 890d045f..94790fa2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,6 +10,12 @@
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
+    <parent>
+        <groupId>io.gdcc</groupId>
+        <artifactId>parent</artifactId>
+        <version>0.10.0</version>
+    </parent>
+
     <modules>
         <module>xoai-common</module>
         <module>xoai-data-provider</module>
@@ -19,7 +25,6 @@
         <module>xoai-data-provider-tck</module>
     </modules>
 
-    <groupId>io.gdcc</groupId>
     <artifactId>xoai</artifactId>
     <version>5.2.2-SNAPSHOT</version>
 
@@ -29,7 +34,7 @@
     </organization>
 
     <name>XOAI : OAI-PMH Java Toolkit</name>
-    <url>https://github.com/gdcc/xoai</url>
+    <!--<url>https://github.com/gdcc/xoai</url>-->
     <description>An OAI-PMH data and/or service provider implementation, integration ready for your service.</description>
 
     <properties>

From 2485a13367c75063b2c685ecb6b466937bc5b80e Mon Sep 17 00:00:00 2001
From: Oliver Bertuch <o.bertuch@fz-juelich.de>
Date: Fri, 18 Oct 2024 12:36:35 +0200
Subject: [PATCH 3/5] build: remove POM elements inherited from Parent POM

---
 pom.xml | 34 ----------------------------------
 1 file changed, 34 deletions(-)

diff --git a/pom.xml b/pom.xml
index 94790fa2..117a2ff0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,11 +28,6 @@
     <artifactId>xoai</artifactId>
     <version>5.2.2-SNAPSHOT</version>
 
-    <organization>
-        <name>Global Dataverse Community Consortium</name>
-        <url>https://dataversecommunity.global</url>
-    </organization>
-
     <name>XOAI : OAI-PMH Java Toolkit</name>
     <!--<url>https://github.com/gdcc/xoai</url>-->
     <description>An OAI-PMH data and/or service provider implementation, integration ready for your service.</description>
@@ -103,39 +98,10 @@
         </license>
     </licenses>
 
-    <issueManagement>
-        <url>https://github.com/gdcc/xoai/issues</url>
-        <system>GitHub Issues</system>
-    </issueManagement>
-
     <scm>
-        <connection>scm:git:git@github.com:gdcc/xoai.git</connection>
-        <developerConnection>scm:git:git@github.com:gdcc/xoai.git</developerConnection>
-        <url>git@github.com:gdcc/xoai.git</url>
         <tag>xoai-5.2.1</tag>
     </scm>
 
-    <ciManagement>
-        <url>https://github.com/gdcc/xoai/actions</url>
-        <system>github</system>
-        <notifiers>
-            <notifier>
-                <address>dataversebot@gdcc.io</address>
-            </notifier>
-        </notifiers>
-    </ciManagement>
-
-    <distributionManagement>
-        <snapshotRepository>
-            <id>ossrh</id>
-            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-        <repository>
-            <id>ossrh</id>
-            <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-        </repository>
-    </distributionManagement>
-
     <build>
         <pluginManagement>
             <plugins>

From 2c14107a74aea658d9f80ef7e32cfbb7a6b98b9e Mon Sep 17 00:00:00 2001
From: Oliver Bertuch <o.bertuch@fz-juelich.de>
Date: Fri, 18 Oct 2024 15:00:07 +0200
Subject: [PATCH 4/5] build: refactor POMs due to new GDCC Parent POM

---
 pom.xml                        | 352 +--------------------------------
 xoai-data-provider-tck/pom.xml |  11 --
 xoai-data-provider/pom.xml     |   1 -
 3 files changed, 2 insertions(+), 362 deletions(-)

diff --git a/pom.xml b/pom.xml
index 117a2ff0..8cf04ac0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>io.gdcc</groupId>
         <artifactId>parent</artifactId>
-        <version>0.10.0</version>
+        <version>0.10.1</version>
     </parent>
 
     <modules>
@@ -34,57 +34,16 @@
 
     <properties>
         <jdk.version>11</jdk.version>
-
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <javadoc.lint>none</javadoc.lint>
-        <!-- Needed to avoid IDEA IDE compilation failures. See commits in GH #5059 -->
-        <compilerArgument />
-        <project.timezone>UTC</project.timezone>
-        <project.language>en</project.language>
-        <project.region>US</project.region>
-        <argLine>-Duser.timezone=${project.timezone} -Dfile.encoding=${project.build.sourceEncoding} -Duser.language=${project.language} -Duser.region=${project.region}</argLine>
-        <skipUT>false</skipUT>
-        <skipIT>false</skipIT>
+        <project.github.repo>xoai</project.github.repo>
 
         <!-- Dependencies -->
         <jakarta.jaxb.version>4.0.1</jakarta.jaxb.version>
         <jakarta.jaxb-impl.version>4.0.4</jakarta.jaxb-impl.version>
-        <hamcrest.version>3.0</hamcrest.version>
-        <xmlunit.version>2.10.0</xmlunit.version>
         <stax2.api.version>4.2.2</stax2.api.version>
         <woodstox.version>7.0.0</woodstox.version>
-        <slf4j.version>2.0.16</slf4j.version>
 
         <!-- Testing dependencies -->
-        <junit.jupiter.version>5.11.0</junit.jupiter.version>
-
-        <!-- Official Maven Plugins -->
-        <maven-plugin-api.version>3.8.2</maven-plugin-api.version>
-        <maven-plugin-annotations.version>3.6.4</maven-plugin-annotations.version>
-        <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
-        <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
-        <maven-dependency-plugin.version>3.8.0</maven-dependency-plugin.version>
-        <maven-surefire-plugin.version>3.5.0</maven-surefire-plugin.version>
-        <maven-failsafe-plugin.version>3.5.0</maven-failsafe-plugin.version>
-        <maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
-        <maven-plugin-plugin.version>3.15.0</maven-plugin-plugin.version>
-        <maven-site-plugin.version>4.0.0-M16</maven-site-plugin.version>
-        <maven-source-plugin.version>3.3.1</maven-source-plugin.version>
-        <maven-javadoc-plugin.version>3.10.0</maven-javadoc-plugin.version>
-        <maven-flatten-plugin.version>1.6.0</maven-flatten-plugin.version>
-        <maven-gpg-plugin.version>3.2.5</maven-gpg-plugin.version>
-        <maven-release-plugin.version>3.1.1</maven-release-plugin.version>
-        <maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
-
-        <pomchecker-maven-plugin.version>1.7.0</pomchecker-maven-plugin.version>
-        <nexus-staging-plugin.version>1.7.0</nexus-staging-plugin.version>
-        <checkstyle-maven-plugin.version>3.5.0</checkstyle-maven-plugin.version>
-        <checkstyle.version>10.18.1</checkstyle.version>
-        <spotbugs-maven-plugin.version>4.8.6.3</spotbugs-maven-plugin.version>
         <dependency-check-maven.version>10.0.4</dependency-check-maven.version>
-        <jacoco.version>0.8.12</jacoco.version>
-        <sonar.version>4.0.0.4121</sonar.version>
-        <spotless.version>2.43.0</spotless.version>
     </properties>
 
     <licenses>
@@ -103,189 +62,8 @@
     </scm>
 
     <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>${maven-compiler-plugin.version}</version>
-                    <configuration>
-                        <release>${jdk.version}</release>
-                        <compilerArgument>${compilerArgument}</compilerArgument>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <version>${maven-jar-plugin.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <version>${maven-dependency-plugin.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>${maven-surefire-plugin.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>${maven-failsafe-plugin.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-plugin-plugin</artifactId>
-                    <version>${maven-plugin-plugin.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-site-plugin</artifactId>
-                    <version>${maven-site-plugin.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-source-plugin</artifactId>
-                    <version>${maven-source-plugin.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>${maven-javadoc-plugin.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-gpg-plugin</artifactId>
-                    <version>${maven-gpg-plugin.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>flatten-maven-plugin</artifactId>
-                    <version>${maven-flatten-plugin.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.kordamp.maven</groupId>
-                    <artifactId>pomchecker-maven-plugin</artifactId>
-                    <version>${pomchecker-maven-plugin.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.sonatype.plugins</groupId>
-                    <artifactId>nexus-staging-maven-plugin</artifactId>
-                    <version>${nexus-staging-plugin.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-release-plugin</artifactId>
-                    <version>${maven-release-plugin.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>${checkstyle-maven-plugin.version}</version>
-                    <dependencies>
-                        <dependency>
-                            <groupId>com.puppycrawl.tools</groupId>
-                            <artifactId>checkstyle</artifactId>
-                            <version>${checkstyle.version}</version>
-                        </dependency>
-                    </dependencies>
-                </plugin>
-                <plugin>
-                    <groupId>com.github.spotbugs</groupId>
-                    <artifactId>spotbugs-maven-plugin</artifactId>
-                    <version>${spotbugs-maven-plugin.version}</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
         <plugins>
-            <!-- TESTING -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
-                <configuration>
-                    <skipTests>${skipUT}</skipTests>
-                </configuration>
-            </plugin>
-
-            <!-- RELEASING -->
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <serverId>ossrh</serverId>
-                    <nexusUrl>https://s01.oss.sonatype.org</nexusUrl>
-                    <autoReleaseAfterClose>true</autoReleaseAfterClose>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.kordamp.maven</groupId>
-                <artifactId>pomchecker-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-                <configuration>
-                    <useReleaseProfile>false</useReleaseProfile>
-                    <releaseProfiles>release</releaseProfiles>
-                    <autoVersionSubmodules>true</autoVersionSubmodules>
-                    <goals>deploy</goals>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>flatten-maven-plugin</artifactId>
-                <configuration>
-                    <updatePomFile>true</updatePomFile>
-                    <flattenMode>oss</flattenMode>
-                    <pomElements>
-                        <distributionManagement>remove</distributionManagement>
-                        <repositories>remove</repositories>
-                    </pomElements>
-                </configuration>
-                <executions>
-                    <!-- enable flattening -->
-                    <execution>
-                        <id>flatten</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>flatten</goal>
-                        </goals>
-                    </execution>
-                    <!-- ensure proper cleanup -->
-                    <execution>
-                        <id>flatten.clean</id>
-                        <phase>clean</phase>
-                        <goals>
-                            <goal>clean</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
             <!-- META -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>${maven-enforcer-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>enforce-maven</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireMavenVersion>
-                                    <version>3.6.3</version>
-                                </requireMavenVersion>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>com.diffplug.spotless</groupId>
                 <artifactId>spotless-maven-plugin</artifactId>
@@ -376,57 +154,11 @@
                 <version>${stax2.api.version}</version>
             </dependency>
 
-            <!-- This library is not just used within tests, we also use it to match within real code! -->
-            <dependency>
-                <groupId>org.hamcrest</groupId>
-                <artifactId>hamcrest</artifactId>
-                <version>${hamcrest.version}</version>
-            </dependency>
             <dependency>
                 <groupId>io.gdcc</groupId>
                 <artifactId>xoai-xmlio</artifactId>
                 <version>${project.version}</version>
             </dependency>
-
-            <!-- Logging facade -->
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>${slf4j.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-simple</artifactId>
-                <version>${slf4j.version}</version>
-            </dependency>
-
-            <!-- TESTING DEPENDENCIES -->
-            <dependency>
-                <groupId>org.junit.jupiter</groupId>
-                <artifactId>junit-jupiter</artifactId>
-                <version>${junit.jupiter.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.xmlunit</groupId>
-                <artifactId>xmlunit-core</artifactId>
-                <version>${xmlunit.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.xmlunit</groupId>
-                <artifactId>xmlunit-matchers</artifactId>
-                <version>${xmlunit.version}</version>
-                <!--
-                This library relies on the outdated hamcrest 1.3. As hamcrest changed the artifactId from hamcrest-core
-                to just hamcrest and the API is the very same, we simply exclude it here and let it pick up the newer
-                hamcrest library on the classpath.
-                 -->
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.hamcrest</groupId>
-                        <artifactId>hamcrest-core</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -450,39 +182,8 @@
         <profile>
             <id>coverage</id>
             <properties>
-                <sonar.host.url>https://sonarcloud.io</sonar.host.url>
-                <sonar.organization>gdcc</sonar.organization>
-                <sonar.projectKey>gdcc_xoai</sonar.projectKey>
-                <sonar.moduleKey>${project.groupId}:${project.artifactId}</sonar.moduleKey>
-                <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
                 <sonar.coverage.jacoco.xmlReportPaths>${maven.multiModuleProjectDirectory}/report/target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
             </properties>
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.sonarsource.scanner.maven</groupId>
-                            <artifactId>sonar-maven-plugin</artifactId>
-                            <version>${sonar.version}</version>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-                <plugins>
-                    <plugin>
-                        <groupId>org.jacoco</groupId>
-                        <artifactId>jacoco-maven-plugin</artifactId>
-                        <version>${jacoco.version}</version>
-                        <executions>
-                            <execution>
-                                <id>prepare-agent</id>
-                                <goals>
-                                    <goal>prepare-agent</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
         </profile>
         <profile>
             <id>benchmark</id>
@@ -503,55 +204,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>sign-artifacts</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-javadocs</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <source>${jdk.version}</source>
-                            <detectJavaApiLink>false</detectJavaApiLink>
-                            <doclint>${javadoc.lint}</doclint>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-sources</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <id>owasp</id>
             <build>
diff --git a/xoai-data-provider-tck/pom.xml b/xoai-data-provider-tck/pom.xml
index 95244ed7..44372600 100644
--- a/xoai-data-provider-tck/pom.xml
+++ b/xoai-data-provider-tck/pom.xml
@@ -25,7 +25,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>${maven-jar-plugin.version}</version>
                 <executions>
                     <execution>
                         <goals>
@@ -34,19 +33,9 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <skip>${skipUT}</skip>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <configuration>
-                    <skipITs>${skipIT}</skipITs>
-                </configuration>
                 <executions>
                     <execution>
                         <phase>integration-test</phase>
diff --git a/xoai-data-provider/pom.xml b/xoai-data-provider/pom.xml
index e66f754f..269589d2 100644
--- a/xoai-data-provider/pom.xml
+++ b/xoai-data-provider/pom.xml
@@ -25,7 +25,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>${maven-jar-plugin.version}</version>
                 <executions>
                     <execution>
                         <goals>

From 7e1dafd5e991c8c429c28a16fca7e93506f28ed1 Mon Sep 17 00:00:00 2001
From: Oliver Bertuch <o.bertuch@fz-juelich.de>
Date: Fri, 18 Oct 2024 15:44:05 +0200
Subject: [PATCH 5/5] build(tck): allow JUnit4 to enable Testcontainers

---
 xoai-data-provider-tck/pom.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/xoai-data-provider-tck/pom.xml b/xoai-data-provider-tck/pom.xml
index 44372600..a7caecc1 100644
--- a/xoai-data-provider-tck/pom.xml
+++ b/xoai-data-provider-tck/pom.xml
@@ -20,6 +20,16 @@
     <artifactId>xoai-data-provider-tck</artifactId>
     <description>Technology Compatibility Kit for Spec Conformance of Data Provider</description>
 
+    <properties>
+        <!--
+            This is necessary to allow Testcontainers to use JUnit4 TestRule.
+            We cannot exclude the dependency, as it is hardcoded.
+            See also https://github.com/testcontainers/testcontainers-java/issues/970
+            At least we enforce it for the other modules - it's probably alright for this TCK.
+        -->
+        <skipEnforce.junit5>true</skipEnforce.junit5>
+    </properties>
+
     <build>
         <plugins>
             <plugin>