From a516ed873952dee48a43a5ad8062e1231e495f1a Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Tue, 10 Jan 2023 09:10:59 +0100
Subject: [PATCH] Upgrade Gradle Enterprise & Conventions plugins

---
 .../main/java/org/springframework/build/TestConventions.java  | 3 +--
 settings.gradle                                               | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/buildSrc/src/main/java/org/springframework/build/TestConventions.java b/buildSrc/src/main/java/org/springframework/build/TestConventions.java
index 42f710cf7833..b47cda51c132 100644
--- a/buildSrc/src/main/java/org/springframework/build/TestConventions.java
+++ b/buildSrc/src/main/java/org/springframework/build/TestConventions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,7 +40,6 @@ void apply(Project project) {
 	}
 
 	private void configureTestConventions(Project project) {
-		project.getPlugins().apply(TestRetryPlugin.class);
 		project.getTasks().withType(Test.class,
 				(test) -> project.getPlugins().withType(TestRetryPlugin.class, (testRetryPlugin) -> {
 					TestRetryTaskExtension testRetry = test.getExtensions().getByType(TestRetryTaskExtension.class);
diff --git a/settings.gradle b/settings.gradle
index c2bb70b3472a..a2e45c6b15bc 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -7,8 +7,8 @@ pluginManagement {
 }
 
 plugins {
-	id "com.gradle.enterprise" version "3.11.1"
-	id "io.spring.ge.conventions" version "0.0.11"
+	id "com.gradle.enterprise" version "3.12.1"
+	id "io.spring.ge.conventions" version "0.0.13"
 }
 
 include "spring-aop"