Skip to content

[JENKINS-67912] Maven HPI plugin does not compile with Java 11 #310

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
basil merged 3 commits into from
Mar 22, 2022
Merged

[JENKINS-67912] Maven HPI plugin does not compile with Java 11 #310

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
108bed5
[JENKINS-67912] Maven HPI plugin does not compile with Java 11
basil Mar 22, 2022
fc9ae1e
Improve performance
basil Mar 22, 2022
dcccb32
Restore accidentally deleted line break
basil Mar 22, 2022
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
50 changes: 21 additions & 29 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.level>8</java.level>
<gitHubRepo>jenkinsci/${project.artifactId}</gitHubRepo>
<aether.version>1.1.0</aether.version>
<maven.version>3.8.5</maven.version>
<maven-plugin-tools.version>3.6.4</maven-plugin-tools.version>
<plexus-containers.version>2.1.1</plexus-containers.version>
Expand Down Expand Up @@ -92,6 +93,16 @@
<artifactId>maven-shared-utils</artifactId>
<version>3.3.4</version>
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-api</artifactId>
<version>${aether.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-util</artifactId>
<version>${aether.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand All @@ -113,6 +124,11 @@
<version>70.1</version>
<!-- stapler plugin pulls jaxen pulls ancient ver that blows up annotation processing -->
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>31.1-jre</version>
</dependency>
<dependency>
<groupId>com.sun.codemodel</groupId>
<artifactId>codemodel</artifactId>
Expand All @@ -128,6 +144,11 @@
<artifactId>sezpoz</artifactId>
<version>1.13</version>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.10.12</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
Expand Down Expand Up @@ -187,23 +208,6 @@
<artifactId>version-number</artifactId>
<version>1.9</version>
</dependency>
<!-- for using annotation processor -->
<dependency>
<groupId>org.kohsuke.stapler</groupId>
<artifactId>maven-stapler-plugin</artifactId>
<version>1.17</version>
<!-- make sure to exclude servlet so that the one in Jetty (which has different groupId) will win -->
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.kohsuke.stapler</groupId>
<artifactId>stapler</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.kohsuke.stapler</groupId>
<artifactId>stapler-groovy</artifactId>
Expand Down Expand Up @@ -284,25 +288,13 @@
<rules>
<requireUpperBoundDeps>
<excludes combine.children="append">
<exclude>com.google.guava:guava</exclude>
<exclude>com.google.inject:guice</exclude>
<exclude>commons-beanutils:commons-beanutils</exclude>
<exclude>commons-codec:commons-codec</exclude>
<exclude>commons-io:commons-io</exclude>
<exclude>commons-lang:commons-lang</exclude>
<exclude>org.apache.commons:commons-compress</exclude>
<exclude>org.apache.commons:commons-lang3</exclude>
<exclude>org.apache.httpcomponents:httpclient</exclude>
<exclude>org.apache.httpcomponents:httpcore</exclude>
<exclude>org.apache.maven.doxia:doxia-decoration-model</exclude>
<exclude>org.apache.maven:maven-project</exclude>
<exclude>org.apache.maven.wagon:wagon-provider-api</exclude>
<exclude>org.codehaus.plexus:plexus-container-default</exclude>
<exclude>org.eclipse.aether:aether-util</exclude>
<exclude>org.ow2.asm:asm</exclude>
<exclude>org.slf4j:slf4j-api</exclude>
<exclude>xerces:xercesImpl</exclude>
<exclude>xml-apis:xml-apis</exclude>
</excludes>
</requireUpperBoundDeps>
</rules>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/jenkinsci/maven/plugins/hpi/AbstractJenkinsMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.MavenProjectHelper;
import org.apache.maven.project.ProjectBuilder;
import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;

import java.util.List;
Expand Down Expand Up @@ -68,7 +68,7 @@ public abstract class AbstractJenkinsMojo extends AbstractMojo {
protected ArtifactResolver artifactResolver;

@Component
protected MavenProjectBuilder projectBuilder;
protected ProjectBuilder projectBuilder;

@Component
protected MavenProjectHelper projectHelper;
Expand Down
14 changes: 9 additions & 5 deletions src/main/java/org/jenkinsci/maven/plugins/hpi/MavenArtifact.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.ProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
Expand All @@ -32,7 +32,7 @@
*/
public class MavenArtifact implements Comparable<MavenArtifact> {
public final ArtifactFactory artifactFactory;
public final MavenProjectBuilder builder;
public final ProjectBuilder builder;
public final List<ArtifactRepository> remoteRepositories;
public final ArtifactRepository localRepository;
public final Artifact artifact;
Expand All @@ -43,7 +43,7 @@ public MavenArtifact(
Artifact artifact,
ArtifactResolver resolver,
ArtifactFactory artifactFactory,
MavenProjectBuilder builder,
ProjectBuilder builder,
List<ArtifactRepository> remoteRepositories,
ArtifactRepository localRepository,
MavenSession session) {
Expand All @@ -57,7 +57,12 @@ public MavenArtifact(
}

public MavenProject resolvePom() throws ProjectBuildingException {
return builder.buildFromRepository(artifact,remoteRepositories,localRepository);
ProjectBuildingRequest buildingRequest =
new DefaultProjectBuildingRequest(session.getProjectBuildingRequest());
buildingRequest.setRemoteRepositories(remoteRepositories);
buildingRequest.setLocalRepository(localRepository);
buildingRequest.setProcessPlugins(false); // improve performance
Copy link
Member Author

@basil basil Mar 22, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Disabling the processing of plugins has a significant effect on performance. I noticed build times had doubled compared to before this PR. Investigating further, I suspected the the Maven 2 APIs we were using before this PR never processed plugins. When I disabled plugin processing in fc9ae1e, performance went back to its old levels. You can see the difference between build 1 and build 2 of this PR. Build 1 took 29 minutes; build 2 took 12 minutes. Builds of the main branch typically take 15 minutes. So this PR keeps performance at similar levels. I repeated the manual testing I had done in core and plugins, and processing plugins didn't seem to have any noticeable effect.

return builder.build(artifact, buildingRequest).getProject();
}

/**
Expand Down Expand Up @@ -134,7 +139,6 @@ public File getFile() {
}
return artifact.getFile();
}

/**
* Returns {@link MavenArtifact} for the hpi variant of this artifact.
*/
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/jenkinsci/maven/plugins/hpi/RunMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
import org.apache.maven.project.DependencyResolutionRequest;
import org.apache.maven.project.DependencyResolutionResult;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.ProjectBuilder;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.project.ProjectDependenciesResolver;
import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
Expand Down Expand Up @@ -196,7 +196,7 @@ public class RunMojo extends AbstractJettyMojo {
protected boolean consoleForceReload;

@Component
protected MavenProjectBuilder projectBuilder;
protected ProjectBuilder projectBuilder;

/**
* Optional string that represents "groupId:artifactId" of Jenkins core jar.
Expand Down