Merge pull request #664 from gradle/erichaagdev/clean-up-listeners

Listeners in bundled Maven extension are cleaned up and aligned with other Solutions repos

Author: erichaagdev

Diff for: components/configure-gradle-enterprise-maven-extension/build.gradle.kts

@@ -9,7 +9,6 @@ repositories {
 
 dependencies {
     compileOnly("org.apache.maven:maven-core:3.6.3")  // intentionally compiling against an older version to preserve compatibility with older versions of Maven
-    compileOnly("org.codehaus.plexus:plexus-component-annotations:2.2.0")
     compileOnly("com.gradle:develocity-maven-extension:1.22.1")
     implementation("com.gradle:develocity-maven-extension-adapters:1.0")
 }

Diff for: components/configure-gradle-enterprise-maven-extension/src/main/java/com/gradle/ConfigureDevelocity.java renamed to components/configure-gradle-enterprise-maven-extension/src/main/java/com/gradle/ConfigureDevelocityListener.java

@@ -7,17 +7,18 @@
 
 import javax.inject.Inject;
 
-public class ConfigureDevelocity implements DevelocityListener {
+public class ConfigureDevelocityListener implements DevelocityListener {
 
     private final ConfigureDevelocityAdaptor configureDevelocityAdaptor;
 
     @Inject
-    public ConfigureDevelocity(ConfigureDevelocityAdaptor configureDevelocityAdaptor, RootProjectExtractor rootProjectExtractor) {
+    public ConfigureDevelocityListener(ConfigureDevelocityAdaptor configureDevelocityAdaptor) {
         this.configureDevelocityAdaptor = configureDevelocityAdaptor;
     }
 
     @Override
     public void configure(DevelocityApi api, MavenSession session) {
         configureDevelocityAdaptor.configure(new DevelocityApiAdapter(api), session);
     }
+
 }

Diff for: components/configure-gradle-enterprise-maven-extension/src/main/java/com/gradle/ConfigureGradleEnterprise.java renamed to components/configure-gradle-enterprise-maven-extension/src/main/java/com/gradle/ConfigureGradleEnterpriseListener.java

@@ -6,18 +6,19 @@
 import javax.inject.Inject;
 
 // Using fully qualified class names to avoid deprecation warnings on import statements
-@SuppressWarnings({"deprecation"})
-public class ConfigureGradleEnterprise implements com.gradle.maven.extension.api.GradleEnterpriseListener {
+@SuppressWarnings("deprecation")
+public class ConfigureGradleEnterpriseListener implements com.gradle.maven.extension.api.GradleEnterpriseListener {
 
     private final ConfigureDevelocityAdaptor configureDevelocityAdaptor;
 
     @Inject
-    public ConfigureGradleEnterprise(ConfigureDevelocityAdaptor configureDevelocityAdaptor) {
+    public ConfigureGradleEnterpriseListener(ConfigureDevelocityAdaptor configureDevelocityAdaptor) {
         this.configureDevelocityAdaptor = configureDevelocityAdaptor;
     }
 
     @Override
     public void configure(com.gradle.maven.extension.api.GradleEnterpriseApi api, MavenSession session) {
         configureDevelocityAdaptor.configure(new GradleEnterpriseApiAdapter(api), session);
     }
+
 }

Diff for: components/configure-gradle-enterprise-maven-extension/src/main/resources/META-INF/plexus/components.xml

@@ -1,17 +1,18 @@
 <component-set>
   <components>
     <component>
+      <!--suppress DeprecatedClassUsageInspection -->
       <role>com.gradle.maven.extension.api.GradleEnterpriseListener</role>
-      <role-hint>configure-gradle-enterprise</role-hint>
-      <implementation>com.gradle.ConfigureGradleEnterprise</implementation>
-      <description>Configures Gradle Enterprise</description>
+      <role-hint>configure-gradle-enterprise-listener</role-hint>
+      <implementation>com.gradle.ConfigureGradleEnterpriseListener</implementation>
+      <description>Configures the Gradle Enterprise Maven extension</description>
       <isolated-realm>false</isolated-realm>
     </component>
     <component>
       <role>com.gradle.develocity.agent.maven.api.DevelocityListener</role>
-      <role-hint>configure-develocity</role-hint>
-      <implementation>com.gradle.ConfigureDevelocity</implementation>
-      <description>Configures Develocity</description>
+      <role-hint>configure-develocity-listener</role-hint>
+      <implementation>com.gradle.ConfigureDevelocityListener</implementation>
+      <description>Configures the Develocity Maven extension</description>
       <isolated-realm>false</isolated-realm>
     </component>
   </components>