From a94a4a818ca2a42d12e4144bb517fc59b9ccff41 Mon Sep 17 00:00:00 2001
From: JohT <7671054+JohT@users.noreply.github.com>
Date: Tue, 17 Mar 2026 20:01:31 +0100
Subject: [PATCH] Migrate non-library packages to Java 21

---
 .github/workflows/codeql-analysis.yml         |  7 ++
 .github/workflows/continuous-integration.yml  |  9 +-
 pom.xml                                       | 82 +++++++++----------
 .../pom.xml                                   | 15 ++--
 type-alias-axon-serializer/pom.xml            |  2 +-
 5 files changed, 54 insertions(+), 61 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index dab0a11..c7f567b 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -71,6 +71,13 @@ jobs:
         # Prefix the list here with "+" to use these queries and those in the config file.
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
+    - name: Setup Java Development Kit (JDK) 21
+      uses: actions/setup-java@v5
+      with:
+        distribution: 'adopt'
+        java-version: 21
+        cache: 'maven'
+
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index cbe603f..3571670 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -32,7 +32,7 @@ jobs:
     env: 
       CI_COMMIT_CHANGELOG_MESSAGE: Update Changelog
       CI_COMMIT_CHANGELOG_AUTHOR: ${{ github.event.repository.name }} Changelog Generator
-      JAVA_VERSION: 11
+      JAVA_VERSION: 21
     steps:
     - name: (GIT) Checkout code
       uses: actions/checkout@v6
@@ -50,13 +50,6 @@ jobs:
     - name: (Maven) Build
       run: mvn --batch-mode install --file pom.xml
       
-    - name: (Setup) Java Development Kit (JDK) 8 for integration tests
-      uses: actions/setup-java@v5
-      with:
-        distribution: 'adopt'
-        java-version: 8
-        cache: 'maven'
-
     - name: (Maven) Build and run integration tests
       working-directory: type-alias-axon-serializer-integration-test
       run: mvn --batch-mode package --file pom.xml
diff --git a/pom.xml b/pom.xml
index a4a17b8..29ce8e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
 	<properties>
 		<project.scm.id>GitHub</project.scm.id>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<java.version>11</java.version>
+		<java.version>21</java.version>
 		<library.java.version>1.8</library.java.version>
 		
 		<maven.compiler.version>3.15.0</maven.compiler.version>
@@ -73,7 +73,7 @@
 		<!-- Test libraries -->
 		<junit-jupiter.version>5.14.3</junit-jupiter.version>
 		<hamcrest.version>3.0</hamcrest.version>
-		<mockito.version>1.10.19</mockito.version>
+		<mockito.version>5.5.0</mockito.version>
 	</properties>
 
 	<modules>
@@ -97,7 +97,7 @@
 			</dependency>
 			<dependency>
 				<groupId>org.mockito</groupId>
-				<artifactId>mockito-all</artifactId>
+				<artifactId>mockito-core</artifactId>
 				<version>${mockito.version}</version>
 			</dependency>
 		</dependencies>
@@ -155,6 +155,34 @@
 							</execution>
 						</executions>
 					</plugin>
+
+						<!-- Changelog generation runs only for releases -->
+						<plugin>
+							<groupId>se.bjurr.gitchangelog</groupId>
+							<artifactId>git-changelog-maven-plugin</artifactId>
+							<version>${git-changelog-maven-plugin.version}</version>
+							<inherited>false</inherited>
+							<executions>
+								<execution>
+									<id>GenerateGitChangelog</id>
+									<phase>generate-sources</phase>
+									<goals>
+										<goal>git-changelog</goal>
+									</goals>
+									<configuration>
+										<file>CHANGELOG.md</file>
+										<templateFile>changelogTemplate.mustache</templateFile>
+										<gitHubEnabled>true</gitHubEnabled>
+										<useIntegrations>true</useIntegrations>
+										<gitHubIssuePattern>#([0-9]+)</gitHubIssuePattern>
+										<removeIssueFromMessage>true</removeIssueFromMessage>
+										<untaggedName>Next release</untaggedName>
+										<toRef>refs/heads/main</toRef>
+										<ignoreCommitsOlderThan>2019-08-01 00:00:00</ignoreCommitsOlderThan>
+									</configuration>
+								</execution>
+							</executions>
+						</plugin>
 				</plugins>
 			</build>
 		</profile>
@@ -179,6 +207,12 @@
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
 					<version>${maven.surefire.version}</version>
+					<configuration>
+						<systemPropertyVariables>
+							<user.language>en</user.language>
+							<user.country>US</user.country>
+						</systemPropertyVariables>
+					</configuration>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -251,47 +285,7 @@
 				<artifactId>git-changelog-maven-plugin</artifactId>
 				<version>${git-changelog-maven-plugin.version}</version>
 				<inherited>false</inherited>
-				<executions>
-					<execution>
-						<id>GenerateGitChangelog</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>git-changelog</goal>
-						</goals>
-						<!-- Template for the contents of the CHANGELOG.md file-->
-						<configuration>
-                            <file>CHANGELOG.md</file>
-                            <templateFile>changelogTemplate.mustache</templateFile>
-							<gitHubEnabled>true</gitHubEnabled>
-							<useIntegrations>true</useIntegrations>
-							<gitHubIssuePattern>#([0-9]+)</gitHubIssuePattern>
-							<removeIssueFromMessage>true</removeIssueFromMessage>
-							<untaggedName>Next release</untaggedName>
-							<toRef>refs/heads/main</toRef>
-							<ignoreCommitsOlderThan>2019-08-01 00:00:00</ignoreCommitsOlderThan>
-<!-- Handlebar.java doesn't seem to work with Java 11, see https://github.com/tomasbjerre/git-changelog-maven-plugin/issues/43 -->
-<!--
-							<javascriptHelper>
-<![CDATA[
-Handlebars.registerHelper('startsWith', function(messageTitle, options) {
-	const s = options.hash['s']
-	if (new RegExp('^' + s + '.*').test(messageTitle)) {
-		return options.fn(this);
-	} else {
-		return options.inverse(this);
-	}
-});
-Handlebars.registerHelper('firstLetters', function(from, options) {
-	const num = parseInt(options.hash['number'])
-	return from.substring(0,num)
-});
-]]>
-							</javascriptHelper>
--->
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>		
+			</plugin>
 		</plugins>
 		
 	</build>
diff --git a/type-alias-axon-serializer-integration-test/pom.xml b/type-alias-axon-serializer-integration-test/pom.xml
index e773293..cd104ed 100644
--- a/type-alias-axon-serializer-integration-test/pom.xml
+++ b/type-alias-axon-serializer-integration-test/pom.xml
@@ -1,9 +1,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>io.github.joht.alias</groupId>
+	<parent>
+		<groupId>io.github.joht.alias</groupId>
+		<artifactId>alias-parent</artifactId>
+		<version>2.0.1-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
 	<artifactId>type-alias-axon-serializer-integration-test</artifactId>
-	<version>2.0.1-SNAPSHOT</version>
 
 	<name>type-alias-axon-serializer-integration-test</name>
 	<description>Contains the integration test for the type alias aware axon serializer including a fully working demo configuration for axon using JavaEE 8.</description>
@@ -25,7 +30,6 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<java.version>1.8</java.version>
 
 		<axon.version>4.12.3</axon.version>
 
@@ -51,13 +55,8 @@
 		<equalsverifier.version>3.19.4</equalsverifier.version>
 		<junit-jupiter.version>5.14.3</junit-jupiter.version>
 		<hamcrest.version>2.2</hamcrest.version>
-		<mockito.version>1.10.19</mockito.version>
 
 		<!-- Maven Plugins -->
-		<maven.compiler.version>3.15.0</maven.compiler.version>
-		<maven.surefire.version>3.5.5</maven.surefire.version>
-		<maven.failsafe.version>3.5.5</maven.failsafe.version>
-		<maven.assembly.version>3.3.0</maven.assembly.version>
 		<maven.dependency.version>3.10.0</maven.dependency.version>
 		<maven.resources.plugin.version>3.5.0</maven.resources.plugin.version>
 		<eclipse.lifecycle.mapping.version>1.0.0</eclipse.lifecycle.mapping.version>
diff --git a/type-alias-axon-serializer/pom.xml b/type-alias-axon-serializer/pom.xml
index 6bea1c5..b475cc0 100644
--- a/type-alias-axon-serializer/pom.xml
+++ b/type-alias-axon-serializer/pom.xml
@@ -39,7 +39,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
+			<artifactId>mockito-core</artifactId>
 			<scope>test</scope>
 		</dependency>