Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 20, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion components/configure-gradle-enterprise-maven-extension/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down
5 changes: 3 additions & 2 deletions .../java/com/gradle/ConfigureDevelocity.java → ...m/gradle/ConfigureDevelocityListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

}
7 changes: 4 additions & 3 deletions ...com/gradle/ConfigureGradleEnterprise.java → ...le/ConfigureGradleEnterpriseListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

}
13 changes: 7 additions & 6 deletions ...igure-gradle-enterprise-maven-extension/src/main/resources/META-INF/plexus/components.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down