Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ on:

jobs:
ci:
uses: killbill/gh-actions-shared/.github/workflows/ci.yml@main
uses: killbill/gh-actions-shared/.github/workflows/ci.yml@java21
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ on:

jobs:
analyze:
uses: killbill/gh-actions-shared/.github/workflows/codeql-analysis.yml@main
uses: killbill/gh-actions-shared/.github/workflows/codeql-analysis.yml@java21
13 changes: 7 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ jobs:
steps:
- name: Checkout code
if: github.event.inputs.perform_version == ''
uses: actions/checkout@v2
uses: actions/checkout@v6
- name: Checkout full repository
# Required when performing an existing release.
if: github.event.inputs.perform_version != ''
uses: actions/checkout@v2
uses: actions/checkout@v6
with:
fetch-depth: '0'
- name: Setup git user
Expand All @@ -43,9 +43,10 @@ jobs:
git config --global user.name "Kill Bill core team"
git config --global url."https://${BUILD_USER}:${BUILD_TOKEN}@github.com/".insteadOf "git@github.com:"
- name: Configure Java
uses: actions/setup-java@v1
uses: actions/setup-java@v5
with:
java-version: 11
java-version: 21
distribution: temurin
- name: Download Java dependencies
# We do as much as we can, but it may not be enough (https://issues.apache.org/jira/browse/MDEP-82)
run: |
Expand All @@ -64,9 +65,9 @@ jobs:
# Will be pushed as part of the release process, only if the release is successful
git commit -m "pom.xml: update killbill-oss-parent to ${{ github.event.inputs.parent_version }}"
- name: Configure settings.xml for release
uses: actions/setup-java@v3
uses: actions/setup-java@v5
with:
java-version: 11
java-version: 21
distribution: temurin
server-id: central
server-username: MAVEN_USERNAME
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
snapshot:
uses: killbill/gh-actions-shared/.github/workflows/snapshot.yml@main
uses: killbill/gh-actions-shared/.github/workflows/snapshot.yml@java21
secrets:
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
27 changes: 3 additions & 24 deletions .github/workflows/sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,6 @@ on:

jobs:
sync:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
ref: work-for-release-0.23.x
ssh-key: ${{ secrets.CREATE_PULL_REQUEST_SSH_KEY }}
- name: Setup git user
env:
BUILD_USER: ${{ secrets.BUILD_USER }}
BUILD_TOKEN: ${{ secrets.BUILD_TOKEN }}
run: |
git config --global user.email "contact@killbill.io"
git config --global user.name "Kill Bill core team"
git config --global url."https://${BUILD_USER}:${BUILD_TOKEN}@github.com/".insteadOf "git@github.com:"
- name: Merge master branch
run: |
git merge origin/master
- name: Create Pull Request
uses: peter-evans/create-pull-request@v3
with:
branch: work-for-release-0.23.x-promotion
title: 'Sync master into work-for-release-0.23.x'
body: 'Merge latest master into work-for-release-0.23.x'
uses: killbill/gh-actions-shared/.github/workflows/sync.yml@java21
secrets:
CREATE_PULL_REQUEST_SSH_KEY: ${{ secrets.CREATE_PULL_REQUEST_SSH_KEY }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -223,3 +223,4 @@ Temporary Items
*.tmproj
*.tmproject
tmtags
/.codex
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.kill-bill.billing</groupId>
<artifactId>killbill-oss-parent</artifactId>
<version>0.146.76</version>
<version>0.147.5</version>
</parent>
<artifactId>killbill-client-java</artifactId>
<version>1.4.1-SNAPSHOT</version>
Expand Down
15 changes: 15 additions & 0 deletions spotbugs-exclude.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,21 @@
-->

<FindBugsFilter>
<Match>
<Class name="org.killbill.billing.client.KillBillHttpClient"/>
<Method name="&lt;init&gt;" params="java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.Integer,java.lang.Integer,java.lang.Integer" returns="void"/>
<Bug pattern="CT_CONSTRUCTOR_THROW"/>
</Match>
<Match>
<Class name="org.killbill.billing.client.KillBillHttpClient"/>
<Method name="&lt;init&gt;" params="java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.Integer,java.lang.Integer,java.lang.Integer,java.lang.Boolean,java.lang.String" returns="void"/>
<Bug pattern="CT_CONSTRUCTOR_THROW"/>
</Match>
<Match>
<Class name="org.killbill.billing.client.SslUtils"/>
<Method name="&lt;init&gt;" params="" returns="void"/>
<Bug pattern="CT_CONSTRUCTOR_THROW"/>
</Match>
<Match>
<Or>
<Class name="~org\.killbill\.billing\.client\.api\.gen.*"/>
Expand Down
Loading