Skip to content

Commit

Permalink
Fix #272: bump minimum JDK to 17 (#273)
Browse files Browse the repository at this point in the history
  • Loading branch information
cowtowncoder authored Jan 11, 2025
1 parent 3b9c619 commit f183a99
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java_version: ['8', '17', '21', '23']
java_version: ['17', '21', '23']
env:
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
steps:
Expand All @@ -46,7 +46,7 @@ jobs:
id: projectVersion
run: echo "version=$(./mvnw org.apache.maven.plugins:maven-help-plugin:3.5.1:evaluate -DforceStdout -Dexpression=project.version -q)" >> $GITHUB_OUTPUT
- name: Deploy snapshot
if: github.event_name != 'pull_request' && matrix.java_version == '8' && endsWith(steps.projectVersion.outputs.version, '-SNAPSHOT')
if: github.event_name != 'pull_request' && matrix.java_version == '17' && endsWith(steps.projectVersion.outputs.version, '-SNAPSHOT')
env:
# 17-Jun-2024, tatu: Do NOT use v3 credentials since namespace still "com.fasterxml"
CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
Expand Down
10 changes: 5 additions & 5 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.1/maven-wrapper-3.3.1.jar
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@
</scm>

<properties>
<!-- 01-Dec-2024, tatu: [annotations#267] Retain Java 8 baseline
for annotations (up from Jackson 2.x Java 1.6 baselin)
<!-- 11-Jan-2025, tatu: [annotations#272] JDK 17 for Jackson 3.x
(up from Jackson 2.x Java 1.6 baseline for annotations)
-->
<javac.src.version>1.8</javac.src.version>
<javac.target.version>1.8</javac.target.version>
<javac.src.version>17</javac.src.version>
<javac.target.version>17</javac.target.version>

<osgi.export>com.fasterxml.jackson.annotation.*;version=${project.version}</osgi.export>

Expand Down
2 changes: 1 addition & 1 deletion release-notes/VERSION
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ mostly)

3.0 (not yet released)

#267: Raise minimum Java version for `jackson-annotations` to Java 8 for Jackson 3.x
#272: Require JDK17 for jackson-annotations 3.0 for proper `module-info.java`
- Change `JsonInclude.value`, `JsonInclude.content` to `USE_DEFAULTS` (from `ALWAYS`)

0 comments on commit f183a99

Please sign in to comment.