Merge pull request #18 from yrodiere/develocity-1.21

Upgrade to Develocity extension 1.21

Author: yrodiere

pom.xml

@@ -3,15 +3,15 @@
     <groupId>org.hibernate.search.develocity</groupId>
     <artifactId>hibernate-search-develocity-extension</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.14-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <name>Hibernate Search Develocity extension</name>
     <description>A Maven extension to configure the Develocity build cache for the Hibernate Search project</description>
     <url>https://github.com/hibernate/hibernate-search-develocity-extension</url>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <gradle-enterprise-maven-extension.version>1.20.1</gradle-enterprise-maven-extension.version>
+        <develocity-maven-extension.version>1.21</develocity-maven-extension.version>
         <maven-core.version>3.9.6</maven-core.version>
         <plexus-component.version>2.2.0</plexus-component.version>
         <sisu-inject.version>0.3.5</sisu-inject.version>
@@ -69,8 +69,8 @@
         </dependency>
         <dependency>
             <groupId>com.gradle</groupId>
-            <artifactId>gradle-enterprise-maven-extension</artifactId>
-            <version>${gradle-enterprise-maven-extension.version}</version>
+            <artifactId>develocity-maven-extension</artifactId>
+            <version>${develocity-maven-extension.version}</version>
             <scope>provided</scope>
         </dependency>
 

src/main/java/org/hibernate/search/develocity/ConfiguredPlugin.java

@@ -2,10 +2,10 @@
 
 import org.apache.maven.execution.MavenSession;
 
-import com.gradle.maven.extension.api.GradleEnterpriseApi;
+import com.gradle.develocity.agent.maven.api.DevelocityApi;
 
 public interface ConfiguredPlugin {
 
-    void configureBuildCache(GradleEnterpriseApi gradleEnterpriseApi, MavenSession mavenSession);
+    void configureBuildCache(DevelocityApi develocityApi, MavenSession mavenSession);
 
 }

src/main/java/org/hibernate/search/develocity/GoalMetadataProvider.java

@@ -13,8 +13,8 @@
 import org.hibernate.search.develocity.util.MavenMojoExecutionConfig;
 import org.hibernate.search.develocity.util.MavenProperties;
 
-import com.gradle.maven.extension.api.cache.MojoMetadataProvider;
-import com.gradle.maven.extension.api.scan.BuildScanApi;
+import com.gradle.develocity.agent.maven.api.cache.MojoMetadataProvider;
+import com.gradle.develocity.agent.maven.api.scan.BuildScanApi;
 
 @FunctionalInterface
 public interface GoalMetadataProvider {

src/main/java/org/hibernate/search/develocity/HibernateSearchProjectDevelocityListener.java

@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import com.gradle.develocity.agent.maven.api.scan.BuildScanPublishing;
 import org.apache.maven.execution.MavenSession;
 import org.codehaus.plexus.component.annotations.Component;
 import org.hibernate.search.develocity.normalization.Normalization;
@@ -11,24 +12,23 @@
 import org.hibernate.search.develocity.plugins.SurefireConfiguredPlugin;
 import org.hibernate.search.develocity.scan.BuildScanMetadata;
 
-import com.gradle.maven.extension.api.GradleEnterpriseApi;
-import com.gradle.maven.extension.api.GradleEnterpriseListener;
-import com.gradle.maven.scan.extension.internal.api.BuildScanApiInternal;
+import com.gradle.develocity.agent.maven.api.DevelocityApi;
+import com.gradle.develocity.agent.maven.api.DevelocityListener;
 
 @SuppressWarnings("deprecation")
-@Component(role = GradleEnterpriseListener.class, hint = "hibernate-search-build-cache",
+@Component(role = DevelocityListener.class, hint = "hibernate-search-build-cache",
         description = "Configures Develocity for the Hibernate Search project")
-public class HibernateSearchProjectDevelocityListener implements GradleEnterpriseListener {
+public class HibernateSearchProjectDevelocityListener implements DevelocityListener {
 
 
     @Override
-    public void configure(GradleEnterpriseApi gradleEnterpriseApi, MavenSession mavenSession) {
-        gradleEnterpriseApi.getBuildScan().publishAlways();
-        ((BuildScanApiInternal) gradleEnterpriseApi.getBuildScan()).publishIfAuthenticated();
+    public void configure(DevelocityApi develocityApi, MavenSession mavenSession) {
+        develocityApi.getBuildScan().getPublishing()
+                .onlyIf( BuildScanPublishing.PublishingContext::isAuthenticated );
 
-        BuildScanMetadata.addMainMetadata(gradleEnterpriseApi.getBuildScan());
+        BuildScanMetadata.addMainMetadata(develocityApi.getBuildScan());
 
-        Normalization.configureNormalization(gradleEnterpriseApi.getBuildCache());
+        Normalization.configureNormalization(develocityApi.getBuildCache());
 
         List<ConfiguredPlugin> configuredGoals = List.of(
                 new CompilerConfiguredPlugin(),
@@ -38,7 +38,7 @@ public void configure(GradleEnterpriseApi gradleEnterpriseApi, MavenSession mave
         );
 
         for (ConfiguredPlugin configuredGoal : configuredGoals) {
-            configuredGoal.configureBuildCache(gradleEnterpriseApi, mavenSession);
+            configuredGoal.configureBuildCache(develocityApi, mavenSession);
         }
     }
 }

src/main/java/org/hibernate/search/develocity/SimpleConfiguredPlugin.java

@@ -8,17 +8,17 @@
 import org.hibernate.search.develocity.scan.BuildScanMetadata;
 import org.hibernate.search.develocity.util.JavaVersions;
 
-import com.gradle.maven.extension.api.GradleEnterpriseApi;
-import com.gradle.maven.extension.api.cache.MojoMetadataProvider;
+import com.gradle.develocity.agent.maven.api.DevelocityApi;
+import com.gradle.develocity.agent.maven.api.cache.MojoMetadataProvider;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.project.MavenProject;
 
 
 public abstract class SimpleConfiguredPlugin implements ConfiguredPlugin {
 
     @Override
-    public void configureBuildCache(GradleEnterpriseApi gradleEnterpriseApi, MavenSession mavenSession) {
-        gradleEnterpriseApi.getBuildCache().registerMojoMetadataProvider(context -> {
+    public void configureBuildCache(DevelocityApi develocityApi, MavenSession mavenSession) {
+		develocityApi.getBuildCache().registerMojoMetadataProvider(context -> {
             context.withPlugin(getPluginName(), () -> {
                 if (!isBuildCacheEnabled(context.getProject())) {
                     Log.debug(getPluginName(), "Build cache is disabled.");
@@ -33,7 +33,7 @@ public void configureBuildCache(GradleEnterpriseApi gradleEnterpriseApi, MavenSe
 				for ( Entry<String, GoalMetadataProvider> goalMetadataProviderEntry : goalMetadataProviders.entrySet() ) {
 					if ( goalMetadataProviderEntry.getKey().equalsIgnoreCase( context.getMojoExecution().getGoal() ) ) {
 						goalMetadataProviderEntry.getValue()
-								.configure( new GoalMetadataProvider.Context( gradleEnterpriseApi.getBuildScan(), context ) );
+								.configure( new GoalMetadataProvider.Context( develocityApi.getBuildScan(), context ) );
 					}
 				}
             });

src/main/java/org/hibernate/search/develocity/normalization/Normalization.java

@@ -1,6 +1,6 @@
 package org.hibernate.search.develocity.normalization;
 
-import com.gradle.maven.extension.api.cache.BuildCacheApi;
+import com.gradle.develocity.agent.maven.api.cache.BuildCacheApi;
 
 public final class Normalization {
 

src/main/java/org/hibernate/search/develocity/plugins/FailsafeConfiguredPlugin.java

@@ -5,7 +5,7 @@
 import org.hibernate.search.develocity.GoalMetadataProvider;
 import org.hibernate.search.develocity.scan.BuildScanMetadata;
 
-import com.gradle.maven.extension.api.cache.MojoMetadataProvider;
+import com.gradle.develocity.agent.maven.api.cache.MojoMetadataProvider;
 
 public class FailsafeConfiguredPlugin extends SurefireConfiguredPlugin {
 

src/main/java/org/hibernate/search/develocity/plugins/ForbiddenApisConfiguredPlugin.java

@@ -6,7 +6,7 @@
 import org.hibernate.search.develocity.GoalMetadataProvider;
 import org.hibernate.search.develocity.SimpleConfiguredPlugin;
 
-import com.gradle.maven.extension.api.cache.MojoMetadataProvider.Context.FileSet.NormalizationStrategy;
+import com.gradle.develocity.agent.maven.api.cache.MojoMetadataProvider.Context.FileSet.NormalizationStrategy;
 
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.DefaultArtifact;

src/main/java/org/hibernate/search/develocity/plugins/SurefireConfiguredPlugin.java

@@ -7,7 +7,7 @@
 import org.hibernate.search.develocity.SimpleConfiguredPlugin;
 import org.hibernate.search.develocity.util.JavaVersions;
 
-import com.gradle.maven.extension.api.cache.MojoMetadataProvider;
+import com.gradle.develocity.agent.maven.api.cache.MojoMetadataProvider;
 
 public class SurefireConfiguredPlugin extends SimpleConfiguredPlugin {
 

src/main/java/org/hibernate/search/develocity/scan/BuildScanMetadata.java

@@ -14,7 +14,7 @@
 import org.hibernate.search.develocity.util.MavenProperties;
 import org.hibernate.search.develocity.util.Strings;
 
-import com.gradle.maven.extension.api.scan.BuildScanApi;
+import com.gradle.develocity.agent.maven.api.scan.BuildScanApi;
 
 public final class BuildScanMetadata {