From edd49923a3e0965bdae52e3ebc302e1ac93ec121 Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Tue, 31 Mar 2026 13:12:25 -0700
Subject: [PATCH 1/2] Fix CI deprecation warning

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index db43d1b..8b4d8cc 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -37,7 +37,7 @@ jobs:
       run: ./mvnw -B -q -ff -ntp test
     - name: Publish code coverage
       if: ${{ github.event_name != 'pull_request' && matrix.java_version == '8' }}
-      uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
+      uses: codecov/codecov-action@3f20e214133d0983f9a10f3d63b0faf9241a3daa # v6.0.0
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         files: ./target/site/jacoco/jacoco.xml

From e14a2056db4dfa78a281f2c87e8f4a005acc0b51 Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Tue, 31 Mar 2026 13:16:15 -0700
Subject: [PATCH 2/2] Fix #34: increase Java baseline to Java 8 (from 6)

---
 .github/workflows/main.yml |  3 +-
 pom.xml                    | 56 ++++----------------------------------
 release-notes/VERSION      |  1 +
 3 files changed, 8 insertions(+), 52 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8b4d8cc..b5378c3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -17,8 +17,9 @@ jobs:
     strategy:
       fail-fast: false
       # 07-Nov-2025, tatu: If Java 6 baseline, cannot build on post-Java-8
+      # 31-Mar-2026, tatu: Hence now Java 8 baseline
       matrix:
-        java_version: ['8']
+        java_version: ['8', '17', '21']
     steps:
     - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
     - name: Set up JDK
diff --git a/pom.xml b/pom.xml
index ae873ba..4199ca7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,8 +41,9 @@
 
   <properties>
       <!-- 1.6 baseline for 4.0 (earlier only required 1.5) -->
-      <javac.src.version>1.6</javac.src.version>
-      <javac.target.version>1.6</javac.target.version>
+      <!-- 4.3 finally increases to Java 8 -->
+      <javac.src.version>8</javac.src.version>
+      <javac.target.version>8</javac.target.version>
 
       <!-- 4.1 adds "Automatic-Module-Name" for JDK 9 -->
       <jdk.module.name>org.codehaus.stax2</jdk.module.name>
@@ -61,8 +62,8 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
           <configuration>
-            <source>1.6</source>
-            <target>1.6</target>
+            <source>8</source>
+            <target>8</target>
             <encoding>UTF-8</encoding>
             <links>
               <link>https://docs.oracle.com/javase/8/docs/api/</link>
@@ -142,51 +143,4 @@ org.codehaus.stax2
 	</plugin>
     </plugins>
   </build>
-
-  <profiles>
-    <profile>
-      <id>moditect</id>
-      <properties>
-        <!-- Not only do we need JDK 9+, must target later JDK too -->
-        <java.version>1.9</java.version>
-	<javac.src.version>1.9</javac.src.version>
-	<javac.target.version>1.9</javac.target.version>
-        <version.plugin.bundle>4.1.0</version.plugin.bundle>
-      </properties>
-      <build>
-	<plugins>
-	  <plugin>
-	    <groupId>org.moditect</groupId>
-	    <artifactId>moditect-maven-plugin</artifactId>
-	    <executions>
-	      <execution>
-		<id>generate-module-info</id>
-		<phase>generate-sources</phase>
-		<goals>
-		  <goal>generate-module-info</goal>
-		</goals>
-		<configuration>
-		  <modules>
-		    <module>
-		      <artifact>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>${project.artifactId}</artifactId>
-			<!-- 08-Mar-2019, tatu: Alas, due to JDK bug
-			     https://bugs.openjdk.java.net/browse/JDK-8207162
-			     this won't work...
-			     
-			<version>5.2.0</version>
-			     -->
-                        <version>${project.version}</version>
-		      </artifact>
-		    </module>
-		  </modules>
-		</configuration>
-	      </execution>
-	    </executions>
-	  </plugin>
-	</plugins>
-      </build>
-    </profile>
-  </profiles>
 </project>
diff --git a/release-notes/VERSION b/release-notes/VERSION
index c543bf2..7277972 100644
--- a/release-notes/VERSION
+++ b/release-notes/VERSION
@@ -16,6 +16,7 @@ Project: Stax2 API
  (contributed by @winfriedgerlach)
 #33: `ArrayDecoders` can run into `ArrayIndexOutOfBoundsException` when start != 0
  (contributed by @winfriedgerlach)
+#34: Change JDK baseline to 8 (from JDK 6)
 - Use Maven wrapper for builds
 - Update parent (oss-parent) 55->68