From 632948c2e6bcf245b501e7410c98049d535f2622 Mon Sep 17 00:00:00 2001
From: Simon Schrottner <simon.schrottner@dynatrace.com>
Date: Tue, 11 Feb 2025 10:03:57 +0100
Subject: [PATCH] chore: update build and tooling to utilize new java version

Signed-off-by: Simon Schrottner <simon.schrottner@dynatrace.com>
---
 .github/workflows/merge.yml   | 2 +-
 .github/workflows/release.yml | 4 ++--
 release-please-config.json    | 2 --
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index 7c7878a8..65fa6742 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -20,7 +20,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2
-    - name: Set up JDK 8
+    - name: Set up JDK 17
       uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12
       with:
         java-version: '17'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ee798442..3e491447 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -5,7 +5,7 @@
 on:
   push:
     branches:
-      - beta/new_java_build
+      - main
 name: Run Release Please
 permissions:  # added using https://github.com/step-security/secure-workflows
   contents: read
@@ -23,7 +23,7 @@ jobs:
         id: release
         with:
           token: ${{secrets.GITHUB_TOKEN}}
-          target-branch: beta/new_java_build
+          target-branch: main
 
       # These steps are only run if this was a merged release-please PR
       - name: checkout
diff --git a/release-please-config.json b/release-please-config.json
index 69efbe9d..564374ce 100644
--- a/release-please-config.json
+++ b/release-please-config.json
@@ -8,8 +8,6 @@
       "include-component-in-tag": false,
       "bump-minor-pre-major": true,
       "bump-patch-for-minor-pre-major": true,
-      "versioning": "prerelease",
-      "prerelease-type": "beta",
       "extra-files": [
         "pom.xml",
         "README.md"