Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #134: update JDK baseline to Java 8 (from Java 6) #192

Merged
merged 2 commits into from
Jan 17, 2024
Merged

Fixes #134: update JDK baseline to Java 8 (from Java 6) #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c484a1
Fixes #134: update JDK baseline to Java 8 (from Java 6)
cowtowncoder Jan 17, 2024
137fb22
Try enabling JDKs 17 and 21 for CI
cowtowncoder Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
14 changes: 7 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
4 changes: 4 additions & 0 deletions release-notes/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down