From fda298f08b336c3526be6b63ec06e4662dc07494 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leonard=20Br=C3=BCnings?= <leonard.bruenings@gradle.com>
Date: Thu, 26 Jan 2023 11:37:17 +0100
Subject: [PATCH] Update to Gradle 7.6 ...

Apply local fix for https://github.com/spring-io/nohttp/issues/55
Update io.spring.nohttp to version 0.0.11
Update com.gradle.enterprise to version 3.12.2
Update com.github.ben-manes.to versions to version 0.44.0
Update biz.aQute.bnd.builder to version 6.4.0
Remove org.gradle.test-retry as it is integrated into gradle-enterprise
---
 config/nohttp/checkstyle.xml             | 14 ++++++++++++++
 gradle/wrapper/gradle-wrapper.properties |  4 ++--
 settings.gradle                          |  9 ++++-----
 spock-specs/specs.gradle                 |  1 -
 4 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 config/nohttp/checkstyle.xml

diff --git a/config/nohttp/checkstyle.xml b/config/nohttp/checkstyle.xml
new file mode 100644
index 0000000000..52e62b0a61
--- /dev/null
+++ b/config/nohttp/checkstyle.xml
@@ -0,0 +1,14 @@
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+  "https://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+<module name="Checker">
+  <property name="charset" value="UTF-8"/>
+  <property name="fileExtensions" value=""/>
+  <module name="io.spring.nohttp.checkstyle.check.NoHttpCheck">
+    <property name="allowlistFileName" value="${config_loc}/allowlist.lines" default=""/>
+  </module>
+  <module name="SuppressionFilter">
+    <property name="file" value="${config_loc}/suppressions.xml" default=""/>
+    <property name="optional" value="true"/>
+  </module>
+  <module name="SuppressWithPlainTextCommentFilter"/>
+</module>
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b9c57a29e6..7bba3af74c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 # https://gradle.org/release-checksums/
-distributionSha256Sum=29e49b10984e585d8118b7d0bc452f944e386458df27371b49b4ac1dec4b7fda
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionSha256Sum=7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
index a39c4b74c7..cb3c55009c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,15 +2,14 @@ import com.gradle.enterprise.gradleplugin.internal.extension.BuildScanExtensionW
 
 pluginManagement {
   plugins {
-    id "com.gradle.enterprise" version "3.11.2"
+    id "com.gradle.enterprise" version "3.12.2"
     id "com.gradle.common-custom-user-data-gradle-plugin" version "1.8.2"
     id "org.asciidoctor.jvm.convert" version "3.3.2"
     id "net.nemerosa.versioning" version "3.0.0"
     id "io.github.gradle-nexus.publish-plugin" version "1.1.0"
-    id "com.github.ben-manes.versions" version "0.43.0"
-    id "biz.aQute.bnd.builder" version "6.3.1"
-    id "org.gradle.test-retry" version "1.4.1"
-    id "io.spring.nohttp" version "0.0.10"
+    id "com.github.ben-manes.versions" version "0.44.0"
+    id "biz.aQute.bnd.builder" version "6.4.0"
+    id "io.spring.nohttp" version "0.0.11"
   }
 }
 
diff --git a/spock-specs/specs.gradle b/spock-specs/specs.gradle
index e66c9f4c5e..b76dd0a8eb 100755
--- a/spock-specs/specs.gradle
+++ b/spock-specs/specs.gradle
@@ -1,6 +1,5 @@
 plugins {
   id 'org.spockframework.base'
-  id "org.gradle.test-retry"
 }
 
 ext.displayName = "Spock Framework - Specs for Core Module"