From bd4720c7592c2745b21f3d0ee86e016a05b4b145 Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Fri, 26 Sep 2025 16:25:28 -0700
Subject: [PATCH 1/2] Fix #105: JDK baseline to Java 8

---
 .github/workflows/main.yml |  5 ++---
 pom.xml                    | 13 +++++++------
 release-notes/VERSION      |  4 ++++
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e4d453a..7483597 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -19,8 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # 01-May-2022, tatu: Until we require Java 8, cannot test against JDK 17 or above
-        java_version: ['8', '11']
+        java_version: ['8', '11', '17', '21']
     env:
       JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
     steps:
@@ -31,7 +30,7 @@ jobs:
         distribution: 'temurin'
         java-version: ${{ matrix.java_version }}
         cache: 'maven'
-        server-id: sonatype-nexus-snapshots
+        server-id: central-snapshots
         server-username: CI_DEPLOY_USERNAME
         server-password: CI_DEPLOY_PASSWORD
     - name: Build
diff --git a/pom.xml b/pom.xml
index 86abc3a..16ccc74 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
   </parent>
 
   <artifactId>aalto-xml</artifactId>
-  <version>1.3.5-SNAPSHOT</version>
+  <version>1.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <licenses>
     <license>
@@ -34,8 +34,9 @@
     <!-- 05-Mar-2019, tatu: We can still produce JDK 1.6 compatible jar, but must
           build with JDK 8. This for Aalto 1.2.
           Will probably raise minimum JDK to JDK 8 relatively soon.
-      -->
-    <java.version>1.6</java.version>
+    -->
+    <!-- 26-Sep-2025, tatu: "relatively soon"... is today -->
+    <java.version>1.8</java.version>
     
     <javac.src.version>${java.version}</javac.src.version>
     <javac.target.version>${java.version}</javac.target.version>
@@ -60,8 +61,8 @@ org.xml.sax, org.xml.sax.ext, org.xml.sax.helpers</osgi.import>
   <dependencies>
     <!--
      | Not much; just APIs we implement
-     | note: we do need Stax2 api (javax.xml.stream); but
-     | it comes with JDK 1.6, which is baseline for Aalto
+     | note: we do need Stax2 api (extension above plain Stax, javax.xml.stream)
+     | (note: plain Stax comes with JDKs 1.6+)
     -->
     <dependency>
       <groupId>org.codehaus.woodstox</groupId>
@@ -82,7 +83,7 @@ org.xml.sax, org.xml.sax.ext, org.xml.sax.helpers</osgi.import>
     <dependency>
       <groupId>com.fasterxml.woodstox</groupId>
       <artifactId>woodstox-core</artifactId>
-      <version>6.7.0</version>
+      <version>7.1.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/release-notes/VERSION b/release-notes/VERSION
index cc1c2c3..150419e 100644
--- a/release-notes/VERSION
+++ b/release-notes/VERSION
@@ -4,6 +4,10 @@ Project: aalto-xml
 = Releases
 ------------------------------------------------------------------------
 
+1.4.0 (not yet released:
+
+#105: Change JDK baseline to Java 8 (from 1.6)
+
 1.3.4 (26-Sep-2025)
 
 - Branch "master" renamed as "main"

From aa8c6e6827b1cfdbf4528e7d844232493ba51879 Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Fri, 26 Sep 2025 16:29:36 -0700
Subject: [PATCH 2/2] Fix deploy credentials ref

---
 .github/workflows/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7483597..4b8e0a3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -41,8 +41,8 @@ jobs:
     - name: Deploy snapshot
       if: ${{ github.event_name != 'pull_request' && matrix.java_version == '8' && endsWith(steps.projectVersion.outputs.version, '-SNAPSHOT') }}
       env:
-        CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
-        CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
+        CI_DEPLOY_USERNAME: ${{ secrets.CENTRAL_DEPLOY_USERNAME }}
+        CI_DEPLOY_PASSWORD: ${{ secrets.CENTRAL_DEPLOY_PASSWORD }}
         # MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
       run: ./mvnw -B -q -ff -DskipTests -ntp source:jar deploy
     - name: Generate code coverage