From 3138967ec1fa47a55cf03c4a1f03840dd0612580 Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Tue, 16 Jan 2024 17:46:50 -0800
Subject: [PATCH] Fixes #134: update JDK baseline to Java 8 (from Java 6)
 (#192)

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

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7bff82dc..b9cb5258 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -19,8 +19,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # Alas, JDK14 can't be yet used as Woodstox builds for Java 6
-        java_version: ['8', '11']
+        # With Woodstox 7.0 can finally test versions past 11
+        java_version: ['8', '11', '17', '21']
         os: ['ubuntu-20.04']
     env:
       JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
diff --git a/pom.xml b/pom.xml
index a1821136..fdf6c83e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,9 +41,9 @@ SAX2 and Stax2 APIs
       <version.msv>2022.7</version.msv>
       <version.plugin.javadoc>3.1.1</version.plugin.javadoc>
 
-      <!-- Woodstox 5.0 is 1.6+ -->
-      <javac.src.version>1.6</javac.src.version>
-      <javac.target.version>1.6</javac.target.version>
+      <!-- Woodstox 7.0 is Java 8+ -->
+      <javac.src.version>1.8</javac.src.version>
+      <javac.target.version>1.8</javac.target.version>
 
       <!-- Since our groupId is NOT the same as Java package id, need to explicitly define.
            And due to number of packages, let's just include all.
@@ -204,7 +204,7 @@ SAX2 and Stax2 APIs
 	<plugin>
             <groupId>org.sonatype.plugins</groupId>
             <artifactId>nexus-staging-maven-plugin</artifactId>
-            <version>1.6.6</version>
+            <version>1.6.13</version>
             <extensions>true</extensions>
             <configuration>
               <serverId>sonatype-nexus-staging</serverId>
@@ -217,8 +217,8 @@ SAX2 and Stax2 APIs
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
 <!--
                     <excludes>
                         <exclude>test/**</exclude>
@@ -339,7 +339,7 @@ SAX2 and Stax2 APIs
                       <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                         <manifestEntries>
                           <Require-Capability>
-                            osgi.extender;filter:="(&amp;(osgi.extender=osgi.serviceloader.registrar)(version&gt;=1.0.0)(!(version&gt;=2.0.0)))";resolution:=optional,osgi.ee;filter:="(&amp;(osgi.ee=JavaSE)(version=1.6))"
+                            osgi.extender;filter:="(&amp;(osgi.extender=osgi.serviceloader.registrar)(version&gt;=1.0.0)(!(version&gt;=2.0.0)))";resolution:=optional,osgi.ee;filter:="(&amp;(osgi.ee=JavaSE)(version=1.8))"
                           </Require-Capability>
                         </manifestEntries>
                       </transformer>
diff --git a/release-notes/VERSION b/release-notes/VERSION
index b5da6344..1e65c971 100644
--- a/release-notes/VERSION
+++ b/release-notes/VERSION
@@ -4,6 +4,10 @@ Project: woodstox
 === Releases ===
 ------------------------------------------------------------------------
 
+7.0.0 (not yet released)
+
+#134: Increase JDK baseline to Java 8
+
 6.6.0 (15-Jan-2024)
 
 #67: Wrong line for XML event location in elements following DTD