Skip to content

Commit 2159941

Browse files
committed
chore: update build and tooling to utilize new java version
Signed-off-by: Simon Schrottner <[email protected]>
1 parent 3691b52 commit 2159941

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

.github/workflows/merge.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
steps:
2222
- uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2
23-
- name: Set up JDK 8
23+
- name: Set up JDK 17
2424
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12
2525
with:
2626
java-version: '17'

.github/workflows/release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
on:
66
push:
77
branches:
8-
- beta/new_java_build
8+
- main
99
name: Run Release Please
1010
permissions: # added using https://github.com/step-security/secure-workflows
1111
contents: read
@@ -23,7 +23,7 @@ jobs:
2323
id: release
2424
with:
2525
token: ${{secrets.GITHUB_TOKEN}}
26-
target-branch: beta/new_java_build
26+
target-branch: main
2727

2828
# These steps are only run if this was a merged release-please PR
2929
- name: checkout

release-please-config.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
"include-component-in-tag": false,
99
"bump-minor-pre-major": true,
1010
"bump-patch-for-minor-pre-major": true,
11-
"versioning": "prerelease",
12-
"prerelease-type": "beta",
11+
"versioning": "default",
1312
"extra-files": [
1413
"pom.xml",
1514
"README.md"

0 commit comments

Comments
 (0)