From 38c9175363f5f86c1277183ff62b1628be9f3a65 Mon Sep 17 00:00:00 2001
From: Philipp Schirmer <philipp.schirmer@bakdata.com>
Date: Wed, 22 Jan 2025 11:38:27 +0100
Subject: [PATCH] Upgrade to Gradle 8.4 (#28)

---
 .github/workflows/build-and-publish.yaml      |  3 +--
 .github/workflows/release.yaml                |  2 +-
 build.gradle.kts                              | 27 +++++--------------
 .../fusion/ConflictResolutionFusion.java      |  5 ++--
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 5 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/build-and-publish.yaml b/.github/workflows/build-and-publish.yaml
index d05d07b..1e72a23 100644
--- a/.github/workflows/build-and-publish.yaml
+++ b/.github/workflows/build-and-publish.yaml
@@ -8,7 +8,7 @@ on:
 jobs:
   build-and-publish:
     name: Java Gradle
-    uses: bakdata/ci-templates/.github/workflows/java-gradle-library.yaml@1.40.5
+    uses: bakdata/ci-templates/.github/workflows/java-gradle-library.yaml@1.55.0
     with:
       java-version: 17
     secrets:
@@ -19,5 +19,4 @@ jobs:
       signing-password: ${{ secrets.SONATYPE_SIGNING_PASSWORD }}
       ossrh-username: ${{ secrets.SONATYPE_OSSRH_USERNAME }}
       ossrh-password: ${{ secrets.SONATYPE_OSSRH_PASSWORD }}
-      github-username: ${{ secrets.GH_USERNAME }}
       github-token: ${{ secrets.GH_TOKEN }}
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index b139422..730d85d 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -16,7 +16,7 @@ on:
 jobs:
   java-gradle-release:
     name: Java Gradle
-    uses: bakdata/ci-templates/.github/workflows/java-gradle-release.yaml@1.40.5
+    uses: bakdata/ci-templates/.github/workflows/java-gradle-release.yaml@1.55.0
     with:
       java-version: 17
       release-type: "${{ inputs.release-type }}"
diff --git a/build.gradle.kts b/build.gradle.kts
index 195217a..a4363d0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,10 +1,8 @@
 plugins {
-    // release
-    id("net.researchgate.release") version "3.0.2"
-    id("com.bakdata.sonar") version "1.1.11"
-    id("com.bakdata.sonatype") version "1.1.11"
-    id("org.hildan.github.changelog") version "1.12.1"
-    id("io.freefair.lombok") version "6.6.3" apply false
+    id("com.bakdata.release") version "1.4.0"
+    id("com.bakdata.sonar") version "1.4.0"
+    id("com.bakdata.sonatype") version "1.4.1"
+    id("io.freefair.lombok") version "8.4" apply false
 }
 
 allprojects {
@@ -31,12 +29,6 @@ configure<com.bakdata.gradle.SonatypeSettings> {
     }
 }
 
-configure<org.hildan.github.changelog.plugin.GitHubChangelogExtension> {
-    githubUser = "bakdata"
-    futureVersionTag = findProperty("changelog.releaseVersion")?.toString()
-    sinceTag = findProperty("changelog.sinceTag")?.toString()
-}
-
 tasks.register<Javadoc>("javadoc") {
     description = "Generates a global javadoc from all the modules"
     options {
@@ -56,8 +48,9 @@ subprojects {
     apply(plugin = "io.freefair.lombok")
 
     configure<JavaPluginExtension> {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        toolchain {
+            languageVersion = JavaLanguageVersion.of(11)
+        }
     }
 
     tasks.withType<Javadoc> {
@@ -80,9 +73,3 @@ subprojects {
         "testImplementation"(group = "org.assertj", name = "assertj-core", version = "3.25.1")
     }
 }
-
-release {
-    git {
-        requireBranch.set("master")
-    }
-}
diff --git a/common/src/main/java/com/bakdata/dedupe/fusion/ConflictResolutionFusion.java b/common/src/main/java/com/bakdata/dedupe/fusion/ConflictResolutionFusion.java
index e23e96e..7041056 100644
--- a/common/src/main/java/com/bakdata/dedupe/fusion/ConflictResolutionFusion.java
+++ b/common/src/main/java/com/bakdata/dedupe/fusion/ConflictResolutionFusion.java
@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2019 bakdata GmbH
+ * Copyright (c) 2025 bakdata
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -68,7 +68,8 @@ public class ConflictResolutionFusion<R> implements Fusion<R> {
     @NonNull ConflictResolution<R, R> rootResolution;
 
     @Getter(value = AccessLevel.PRIVATE, lazy = true)
-    @NonNull Map<@NonNull String, @NonNull Source> sourceByName =
+    @NonNull
+    Map<String, Source> sourceByName =
             this.sources.stream().collect(Collectors.toMap(Source::getName, s -> s));
 
     @Override
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2b22d05..309b4e1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists