Skip to content

Commit 0d5e62b

Browse files
authored
Fix #105: JDK baseline to Java 8 (#106)
1 parent c1308c5 commit 0d5e62b

File tree

3 files changed

+15
-11
lines changed

3 files changed

+15
-11
lines changed

.github/workflows/main.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
# 01-May-2022, tatu: Until we require Java 8, cannot test against JDK 17 or above
23-
java_version: ['8', '11']
22+
java_version: ['8', '11', '17', '21']
2423
env:
2524
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
2625
steps:
@@ -31,7 +30,7 @@ jobs:
3130
distribution: 'temurin'
3231
java-version: ${{ matrix.java_version }}
3332
cache: 'maven'
34-
server-id: sonatype-nexus-snapshots
33+
server-id: central-snapshots
3534
server-username: CI_DEPLOY_USERNAME
3635
server-password: CI_DEPLOY_PASSWORD
3736
- name: Build
@@ -42,8 +41,8 @@ jobs:
4241
- name: Deploy snapshot
4342
if: ${{ github.event_name != 'pull_request' && matrix.java_version == '8' && endsWith(steps.projectVersion.outputs.version, '-SNAPSHOT') }}
4443
env:
45-
CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
46-
CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
44+
CI_DEPLOY_USERNAME: ${{ secrets.CENTRAL_DEPLOY_USERNAME }}
45+
CI_DEPLOY_PASSWORD: ${{ secrets.CENTRAL_DEPLOY_PASSWORD }}
4746
# MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
4847
run: ./mvnw -B -q -ff -DskipTests -ntp source:jar deploy
4948
- name: Generate code coverage

pom.xml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</parent>
99

1010
<artifactId>aalto-xml</artifactId>
11-
<version>1.3.5-SNAPSHOT</version>
11+
<version>1.4.0-SNAPSHOT</version>
1212
<packaging>bundle</packaging>
1313
<licenses>
1414
<license>
@@ -34,8 +34,9 @@
3434
<!-- 05-Mar-2019, tatu: We can still produce JDK 1.6 compatible jar, but must
3535
build with JDK 8. This for Aalto 1.2.
3636
Will probably raise minimum JDK to JDK 8 relatively soon.
37-
-->
38-
<java.version>1.6</java.version>
37+
-->
38+
<!-- 26-Sep-2025, tatu: "relatively soon"... is today -->
39+
<java.version>1.8</java.version>
3940

4041
<javac.src.version>${java.version}</javac.src.version>
4142
<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>
6061
<dependencies>
6162
<!--
6263
| Not much; just APIs we implement
63-
| note: we do need Stax2 api (javax.xml.stream); but
64-
| it comes with JDK 1.6, which is baseline for Aalto
64+
| note: we do need Stax2 api (extension above plain Stax, javax.xml.stream)
65+
| (note: plain Stax comes with JDKs 1.6+)
6566
-->
6667
<dependency>
6768
<groupId>org.codehaus.woodstox</groupId>
@@ -82,7 +83,7 @@ org.xml.sax, org.xml.sax.ext, org.xml.sax.helpers</osgi.import>
8283
<dependency>
8384
<groupId>com.fasterxml.woodstox</groupId>
8485
<artifactId>woodstox-core</artifactId>
85-
<version>6.7.0</version>
86+
<version>7.1.1</version>
8687
<scope>test</scope>
8788
</dependency>
8889
</dependencies>

release-notes/VERSION

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ Project: aalto-xml
44
= Releases
55
------------------------------------------------------------------------
66

7+
1.4.0 (not yet released:
8+
9+
#105: Change JDK baseline to Java 8 (from 1.6)
10+
711
1.3.4 (26-Sep-2025)
812

913
- Branch "master" renamed as "main"

0 commit comments

Comments
 (0)