From b6a3b71fff6d25039eb78b0ffc6cc4ddb2ef6b4f Mon Sep 17 00:00:00 2001
From: Marc Nuri <marc@marcnuri.com>
Date: Fri, 4 Aug 2023 11:21:18 +0200
Subject: [PATCH] feat: gradle base API based on v8.2.1

Signed-off-by: Marc Nuri <marc@marcnuri.com>
---
 CHANGELOG.md                                  |  1 +
 java-generator/gradle-plugin/pom.xml          | 69 ++++---------
 java-generator/it/pom.xml                     | 33 ++-----
 .../generator/testing/GradleProperties.java   |  2 +-
 .../generator/gradle/plugin/SimpleIT.java     |  2 +-
 java-generator/pom.xml                        | 97 +++----------------
 kubernetes-model-generator/pom.xml            |  2 +-
 pom.xml                                       | 35 +++++--
 8 files changed, 68 insertions(+), 173 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d81b320a1f..da10225c7dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 * Fix #5368: added support for additional ListOptions fields
 
 #### Dependency Upgrade
+* Fix #5373: Gradle base API based on v8.2.1
 
 #### New Features
 
diff --git a/java-generator/gradle-plugin/pom.xml b/java-generator/gradle-plugin/pom.xml
index 1acd1d68dda..83d1f56a7d9 100644
--- a/java-generator/gradle-plugin/pom.xml
+++ b/java-generator/gradle-plugin/pom.xml
@@ -45,33 +45,28 @@
       <artifactId>java-generator-core</artifactId>
     </dependency>
 
+
     <dependency>
-      <groupId>org.codehaus.groovy</groupId>
+      <groupId>org.apache.groovy</groupId>
       <artifactId>groovy-all</artifactId>
+      <version>${groovy-api.version}</version>
+      <type>pom</type>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.groovy</groupId>
+          <artifactId>groovy-test</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.groovy</groupId>
+          <artifactId>groovy-test-junit5</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.gradle</groupId>
-      <artifactId>gradle-base-services</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.gradle</groupId>
-      <artifactId>gradle-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.gradle</groupId>
-      <artifactId>gradle-core-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.gradle</groupId>
-      <artifactId>gradle-logging</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.gradle</groupId>
-      <artifactId>gradle-plugins</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.gradle</groupId>
-      <artifactId>gradle-model-core</artifactId>
+      <artifactId>gradle-all</artifactId>
+      <scope>provided</scope>
     </dependency>
 
     <dependency>
@@ -82,36 +77,6 @@
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
     </dependency>
-
-  <!-- Gradle plugin test -->
-  <dependency>
-    <groupId>org.gradle</groupId>
-    <artifactId>gradle-base-services-groovy</artifactId>
-  </dependency>
-  <dependency>
-    <groupId>org.gradle</groupId>
-    <artifactId>gradle-messaging</artifactId>
-  </dependency>
-  <dependency>
-    <groupId>org.gradle</groupId>
-    <artifactId>gradle-native</artifactId>
-  </dependency>
-  <dependency>
-    <groupId>org.gradle</groupId>
-    <artifactId>gradle-platform-jvm</artifactId>
-  </dependency>
-  <dependency>
-    <groupId>org.gradle</groupId>
-    <artifactId>gradle-process-services</artifactId>
-  </dependency>
-  <dependency>
-    <groupId>org.gradle</groupId>
-    <artifactId>gradle-tooling-api</artifactId>
-  </dependency>
-  <dependency>
-    <groupId>org.gradle</groupId>
-    <artifactId>gradle-test-kit</artifactId>
-  </dependency>
   </dependencies>
 
 </project>
diff --git a/java-generator/it/pom.xml b/java-generator/it/pom.xml
index 130101f0074..b9991ae8f0e 100644
--- a/java-generator/it/pom.xml
+++ b/java-generator/it/pom.xml
@@ -69,36 +69,21 @@
     <!-- Gradle plugin test -->
     <dependency>
       <groupId>org.gradle</groupId>
-      <artifactId>gradle-base-services-groovy</artifactId>
+      <artifactId>gradle-all</artifactId>
+      <scope>test</scope>
     </dependency>
+    <!-- Gradle needs these on the classpath -->
     <dependency>
-      <groupId>org.gradle</groupId>
-      <artifactId>gradle-messaging</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.gradle</groupId>
-      <artifactId>gradle-native</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.gradle</groupId>
-      <artifactId>gradle-platform-jvm</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.gradle</groupId>
-      <artifactId>gradle-process-services</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.gradle</groupId>
-      <artifactId>gradle-tooling-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.gradle</groupId>
-      <artifactId>gradle-test-kit</artifactId>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>${guava.version}</version>
+      <scope>test</scope>
     </dependency>
-    <!-- Gradle execution will need these on the classpath -->
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
+      <version>${commons-io.version}</version>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 
diff --git a/java-generator/it/src/main/java-templates/io/fabric8/java/generator/testing/GradleProperties.java b/java-generator/it/src/main/java-templates/io/fabric8/java/generator/testing/GradleProperties.java
index 0f76d6efbaf..854da950ec9 100644
--- a/java-generator/it/src/main/java-templates/io/fabric8/java/generator/testing/GradleProperties.java
+++ b/java-generator/it/src/main/java-templates/io/fabric8/java/generator/testing/GradleProperties.java
@@ -17,7 +17,7 @@
 
 public final class GradleProperties {
   public static String binariesVersion() {
-    return "${gradle-binaries.version}";
+    return "${gradle-api.version}";
   }
 
   private GradleProperties() {
diff --git a/java-generator/it/src/test/java/io/fabric8/java/generator/gradle/plugin/SimpleIT.java b/java-generator/it/src/test/java/io/fabric8/java/generator/gradle/plugin/SimpleIT.java
index 1c1cb3fb2cc..bd167f86cd2 100644
--- a/java-generator/it/src/test/java/io/fabric8/java/generator/gradle/plugin/SimpleIT.java
+++ b/java-generator/it/src/test/java/io/fabric8/java/generator/gradle/plugin/SimpleIT.java
@@ -26,7 +26,7 @@
 class SimpleIT {
 
   @RegisterExtension
-  private final ITGradleRunnerExtension gradleRunner = new ITGradleRunnerExtension();
+  final ITGradleRunnerExtension gradleRunner = new ITGradleRunnerExtension();
 
   /**
    * Verify that the {@code crd2java} Gradle task is available
diff --git a/java-generator/pom.xml b/java-generator/pom.xml
index bd229ecb351..2210ec787b3 100644
--- a/java-generator/pom.xml
+++ b/java-generator/pom.xml
@@ -40,11 +40,7 @@
   </modules>
 
   <properties>
-    <gradle-binaries.version>8.1</gradle-binaries.version>
-    <gradle-api.version>6.1.1</gradle-api.version>
-    <groovy-api.version>2.4.21</groovy-api.version>
     <javax.inject.version>1</javax.inject.version>
-    <commons-io.version>2.13.0</commons-io.version>
   </properties>
 
   <repositories>
@@ -82,98 +78,27 @@
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.codehaus.groovy</groupId>
+        <groupId>org.apache.groovy</groupId>
         <artifactId>groovy-all</artifactId>
         <version>${groovy-api.version}</version>
+        <type>pom</type>
         <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.gradle</groupId>
-        <artifactId>gradle-base-services</artifactId>
+        <artifactId>gradle-all</artifactId>
         <version>${gradle-api.version}</version>
         <scope>provided</scope>
       </dependency>
-      <dependency>
-        <groupId>org.gradle</groupId>
-        <artifactId>gradle-core</artifactId>
-        <version>${gradle-api.version}</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.gradle</groupId>
-        <artifactId>gradle-core-api</artifactId>
-        <version>${gradle-api.version}</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.gradle</groupId>
-        <artifactId>gradle-logging</artifactId>
-        <version>${gradle-api.version}</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.gradle</groupId>
-        <artifactId>gradle-plugins</artifactId>
-        <version>${gradle-api.version}</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.gradle</groupId>
-        <artifactId>gradle-model-core</artifactId>
-        <version>${gradle-api.version}</version>
-        <scope>provided</scope>
-      </dependency>
-      <!-- Gradle plugin test-->
-      <dependency>
-        <groupId>org.gradle</groupId>
-        <artifactId>gradle-base-services-groovy</artifactId>
-        <version>${gradle-api.version}</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.gradle</groupId>
-        <artifactId>gradle-messaging</artifactId>
-        <version>${gradle-api.version}</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.gradle</groupId>
-        <artifactId>gradle-native</artifactId>
-        <version>${gradle-api.version}</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.gradle</groupId>
-        <artifactId>gradle-platform-jvm</artifactId>
-        <version>${gradle-api.version}</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.gradle</groupId>
-        <artifactId>gradle-process-services</artifactId>
-        <version>${gradle-api.version}</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.gradle</groupId>
-        <artifactId>gradle-test-kit</artifactId>
-        <version>${gradle-api.version}</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.gradle</groupId>
-        <artifactId>gradle-tooling-api</artifactId>
-        <version>${gradle-api.version}</version>
-        <scope>test</scope>
-      </dependency>
-      <!-- Gradle test execution will need these on the classpath -->
-      <dependency>
-        <groupId>commons-io</groupId>
-        <artifactId>commons-io</artifactId>
-        <version>${commons-io.version}</version>
-        <scope>test</scope>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.marcnuri.plugins</groupId>
+        <artifactId>gradle-api-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/kubernetes-model-generator/pom.xml b/kubernetes-model-generator/pom.xml
index 768bab3f973..93ef33867a2 100644
--- a/kubernetes-model-generator/pom.xml
+++ b/kubernetes-model-generator/pom.xml
@@ -252,7 +252,7 @@
         <jdk>[1.8,)</jdk>
       </activation>
       <properties>
-        <javadoc.opts>-Xdoclint:none</javadoc.opts>
+        <javadoc.doclint>none</javadoc.doclint>
       </properties>
     </profile>
   </profiles>
diff --git a/pom.xml b/pom.xml
index 1d074441c29..a264e960324 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,18 +28,18 @@
 
   <name>Fabric8 :: Kubernetes :: Project</name>
   <description>Java client for Kubernetes and OpenShift</description>
-  <url>http://fabric8.io/</url>
+  <url>https://github.com/fabric8io/kubernetes-client</url>
   <inceptionYear>2015</inceptionYear>
 
   <organization>
     <name>Red Hat</name>
-    <url>http://redhat.com</url>
+    <url>https://redhat.com</url>
   </organization>
 
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
       <distribution>repo</distribution>
     </license>
   </licenses>
@@ -51,14 +51,14 @@
       <id>geeks</id>
       <name>Fabric8 Development Team</name>
       <organization>fabric8</organization>
-      <organizationUrl>http://fabric8.io/</organizationUrl>
+      <organizationUrl>https://github.com/fabric8io/kubernetes-client</organizationUrl>
     </developer>
   </developers>
 
   <scm>
     <connection>scm:git:git@github.com:fabric8io/kubernetes-client.git</connection>
     <developerConnection>scm:git:git@github.com:fabric8io/kubernetes-client.git</developerConnection>
-    <url>http://github.com/fabric8io/kubernetes-client/</url>
+    <url>https://github.com/fabric8io/kubernetes-client/</url>
     <tag>${project.version}</tag>
   </scm>
 
@@ -104,6 +104,8 @@
 
     <!-- API versions -->
     <jsr305.version>3.0.2</jsr305.version>
+    <gradle-api.version>8.2.1</gradle-api.version>
+    <groovy-api.version>4.0.13</groovy-api.version>
 
     <!-- Testing versions -->
     <junit.version>5.10.0</junit.version>
@@ -126,6 +128,8 @@
     <snakeyaml.bundle.version>2.0</snakeyaml.bundle.version> <!-- Transitive Jackson -->
     <bouncycastle.version>1.76</bouncycastle.version>
     <commons-compress.version>1.23.0</commons-compress.version>
+    <commons-io.version>2.13.0</commons-io.version> <!-- Required by Gradle Testing Toolkit -->
+    <guava.version>32.1.2-jre</guava.version> <!-- Required by Gradle Testing Toolkit -->
     <scr.annotations.version>1.12.0</scr.annotations.version>
     <jsonschema2pojo.version>1.2.1</jsonschema2pojo.version>
     <properties.maven.plugin.version>1.0.0</properties.maven.plugin.version>
@@ -151,6 +155,7 @@
     <maven.install.plugin.version>3.1.1</maven.install.plugin.version>
     <maven.invoker.plugin.version>3.6.0</maven.invoker.plugin.version>
     <maven.plugin.plugin.version>3.9.0</maven.plugin.plugin.version>
+    <gradle-api-maven-plugin.version>0.0.2</gradle-api-maven-plugin.version>
     <jandex.plugin.version>1.2.3</jandex.plugin.version>
     <jandex.version>2.4.3.Final</jandex.version>
     <jacoco-maven-plugin.version>0.8.10</jacoco-maven-plugin.version>
@@ -161,11 +166,13 @@
     <!-- Other options -->
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
+    <skipTests>false</skipTests>
     <svc.version>1.1.1</svc.version>
     <generate.targetDirectory>${project.basedir}/src/generated/java</generate.targetDirectory>
 
     <exec.master>https://localhost:8443</exec.master>
 
+    <javadoc.doclint/>
     <javadoc.include.deps>false</javadoc.include.deps>
     <javadoc.source.includes />
     <javadoc.package.excludes />
@@ -262,6 +269,7 @@
       </dependency>
       <dependency>
         <groupId>io.fabric8</groupId>
+
         <artifactId>kubernetes-model-autoscaling</artifactId>
         <version>${project.version}</version>
       </dependency>
@@ -892,10 +900,12 @@
           </configuration>
         </plugin>
         <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
           <version>${maven.jar.plugin.version}</version>
         </plugin>
         <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
           <version>${maven.javadoc.plugin.version}</version>
           <executions>
@@ -908,6 +918,7 @@
           </executions>
         </plugin>
         <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-source-plugin</artifactId>
           <version>${maven.source.plugin.version}</version>
           <executions>
@@ -940,10 +951,12 @@
           <version>${maven.gpg.plugin.version}</version>
         </plugin>
         <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-deploy-plugin</artifactId>
           <version>${maven.deploy.plugin.version}</version>
         </plugin>
         <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-resources-plugin</artifactId>
           <version>${maven.resources.plugin.version}</version>
         </plugin>
@@ -1044,6 +1057,12 @@
             </dependency>
           </dependencies>
         </plugin>
+        <plugin>
+          <groupId>com.marcnuri.plugins</groupId>
+          <artifactId>gradle-api-maven-plugin</artifactId>
+          <version>${gradle-api-maven-plugin.version}</version>
+          <extensions>true</extensions>
+        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
@@ -1275,7 +1294,7 @@
                   <goal>jar</goal>
                 </goals>
                 <configuration>
-                  <additionalparam>${javadoc.opts}</additionalparam>
+                  <doclint>${javadoc.doclint}</doclint>
                 </configuration>
               </execution>
             </executions>
@@ -1324,7 +1343,7 @@
         <jdk>[1.8,)</jdk>
       </activation>
       <properties>
-        <javadoc.opts>-Xdoclint:none</javadoc.opts>
+        <javadoc.doclint>none</javadoc.doclint>
       </properties>
     </profile>
     <profile>
@@ -1475,7 +1494,7 @@
                   <goal>jar</goal>
                 </goals>
                 <configuration>
-                  <additionalparam>${javadoc.opts}</additionalparam>
+                  <doclint>${javadoc.doclint}</doclint>
                 </configuration>
               </execution>
             </executions>