Skip to content

Commit

Permalink
Merge branch '2.18'
Browse files Browse the repository at this point in the history
  • Loading branch information
cowtowncoder committed Apr 29, 2024
2 parents caf5a9c + 262529d commit f028f0c
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 10 deletions.
25 changes: 18 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,22 @@ on:
paths-ignore:
- "README.md"
- "release-notes/*"
env:
JODA_DEFAULT: '2.12.7'
JODA_MIN: '2.9'
JODA_MAX: '2.12.7'
jobs:
build:
runs-on: ${{ matrix.os }}
runs-on: 'ubuntu-20.04'
strategy:
fail-fast: false
matrix:
java_version: ['8', '11', '17', '21']
joda_version: ['2.9', '2.10.14', '2.12.7']
os: ['ubuntu-20.04']
java_version: ['8', '17', '21']
joda_version: [$JODA_DEFAULT, $JODA_MIN, $JODA_MAX]
include:
- java_version: '8'
joda_version: $JODA_DEFAULT
snapshot: 1
env:
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
steps:
Expand All @@ -41,6 +48,10 @@ jobs:
# See https://github.com/actions/setup-java/blob/v2/docs/advanced-usage.md#Publishing-using-Apache-Maven
# gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
# gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
- name: Debug snapshot publish
if: ${{ matrix.debug }}
# ^^^ only run if changed
run: echo "matrix.snapshot == ${{ matrix.snapshot }}, gitub.event_name == ${{ github.event_name }}"
- name: Build
# Note: build separately first with default joda
run: ./mvnw -B -q -ff -ntp -DskipTests clean package
Expand All @@ -51,17 +62,17 @@ jobs:
id: projectVersion
run: echo "version=$(./mvnw org.apache.maven.plugins:maven-help-plugin:3.3.0:evaluate -DforceStdout -Dexpression=project.version -q)" >> $GITHUB_OUTPUT
- name: Deploy snapshot
if: github.event_name != 'pull_request' && matrix.java_version == '8' && matrix.joda_version == '2.10.14' && endsWith(steps.projectVersion.outputs.version, '-SNAPSHOT')
if: ${{ github.event_name != 'pull_request' && matrix.snapshot && endsWith(steps.projectVersion.outputs.version, '-SNAPSHOT') }}
env:
CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
# MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
run: ./mvnw -B -q -ff -DskipTests -ntp source:jar deploy
- name: Generate code coverage
if: github.event_name != 'pull_request' && matrix.java_version == '8' && matrix.joda_version == '2.10.14' && endsWith(steps.projectVersion.outputs.version, '-SNAPSHOT')
if: ${{ github.event_name != 'pull_request' && matrix.snapshot && endsWith(steps.projectVersion.outputs.version, '-SNAPSHOT') }}
run: ./mvnw -B -q -ff -ntp test
- name: Publish code coverage
if: github.event_name != 'pull_request' && matrix.java_version == '8' && matrix.joda_version == '2.10.14' && endsWith(steps.projectVersion.outputs.version, '-SNAPSHOT')
if: ${{ github.event_name != 'pull_request' && matrix.snapshot && endsWith(steps.projectVersion.outputs.version, '-SNAPSHOT') }}
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ To use module on Maven-based projects, use following dependency:
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>
<version>2.14.2</version>
<version>2.17.1</version>
</dependency>
```

Expand Down Expand Up @@ -79,7 +79,8 @@ Assert.assertEquals(INPUT_JSON, json);

## Compatibility

Module works with Joda version 2.9 and higher (CI tests compatibility since module version 2.14)
Module works with Joda version 2.9 and higher (CI tests compatibility since module version 2.14), even if it declares dependency to a newer version.
This means that it is possible to use with older version by using Maven dependency override.

## More

Expand Down
2 changes: 1 addition & 1 deletion release-notes/VERSION-2.x
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Project: jackson-datatype-joda

2.18.0 (not yet released)

No changes since 2.17
- Joda dependency to 2.12.7

2.17.0 (12-Mar-2024)

Expand Down

0 comments on commit f028f0c

Please sign in to comment.