Fork jenkins with winstone instead of jetty plugin (#862)

Co-authored-by: James Nord <jtnord@users.noreply.github.com>

Author: timja

pom.xml

@@ -55,20 +55,6 @@
 
   <dependencyManagement>
     <dependencies>
-      <dependency>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-bom</artifactId>
-        <version>${jetty.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.eclipse.jetty.ee9</groupId>
-        <artifactId>jetty-ee9-bom</artifactId>
-        <version>${jetty.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
       <dependency>
         <groupId>org.ow2.asm</groupId>
         <artifactId>asm-bom</artifactId>
@@ -187,55 +173,6 @@
       <artifactId>plexus-xml</artifactId>
       <version>3.0.2</version>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-maven</artifactId>
-      <version>${jetty.version}</version>
-      <exclusions>
-        <!-- Pulls in conflicting versions of Apache Commons Logging and Apache HttpComponents Client 4 -->
-        <exclusion>
-          <groupId>org.apache.maven.plugin-tools</groupId>
-          <artifactId>maven-plugin-tools-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.codehaus.plexus</groupId>
-          <artifactId>plexus-xml</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-server</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.ee9</groupId>
-      <artifactId>jetty-ee9-maven-plugin</artifactId>
-      <version>${jetty.version}</version>
-      <exclusions>
-        <!-- Pulls in conflicting versions of Apache Commons Logging and Apache HttpComponents Client 4 -->
-        <exclusion>
-          <groupId>org.apache.maven.plugin-tools</groupId>
-          <artifactId>maven-plugin-tools-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.codehaus.plexus</groupId>
-          <artifactId>plexus-xml</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.ee9</groupId>
-      <artifactId>jetty-ee9-servlet</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.ee9</groupId>
-      <artifactId>jetty-ee9-webapp</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.ee9.websocket</groupId>
-      <artifactId>jetty-ee9-websocket-jetty-server</artifactId>
-      <!-- or jetty-ee9-websocket-jakarta-server -->
-    </dependency>
     <dependency>
       <groupId>org.jenkins-ci</groupId>
       <artifactId>version-number</artifactId>

src/main/java/org/jenkinsci/maven/plugins/hpi/AbstractHpiMojo.java

@@ -30,6 +30,7 @@
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
@@ -38,13 +39,19 @@
 import net.java.sezpoz.Index;
 import net.java.sezpoz.IndexItem;
 import org.apache.commons.io.IOUtils;
+import org.apache.maven.RepositoryUtils;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
 import org.apache.maven.model.Resource;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.project.DefaultDependencyResolutionRequest;
+import org.apache.maven.project.DependencyResolutionException;
+import org.apache.maven.project.DependencyResolutionRequest;
+import org.apache.maven.project.DependencyResolutionResult;
 import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.ProjectDependenciesResolver;
 import org.apache.maven.shared.filtering.MavenFilteringException;
 import org.apache.maven.shared.filtering.MavenResourcesExecution;
 import org.apache.maven.shared.filtering.MavenResourcesFiltering;
@@ -55,6 +62,8 @@
 import org.codehaus.plexus.util.DirectoryScanner;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.StringUtils;
+import org.eclipse.aether.graph.DependencyFilter;
+import org.eclipse.aether.util.filter.ScopeDependencyFilter;
 import org.jenkinsci.maven.plugins.hpi.util.Utils;
 
 public abstract class AbstractHpiMojo extends AbstractJenkinsMojo {
@@ -162,6 +171,9 @@ public abstract class AbstractHpiMojo extends AbstractJenkinsMojo {
     @Component
     protected ArchiverManager archiverManager;
 
+    @Component
+    protected ProjectDependenciesResolver dependenciesResolver;
+
     private static final String WEB_INF = "WEB-INF";
 
     private static final String META_INF = "META-INF";
@@ -352,7 +364,7 @@ public void buildExplodedWebapp(File webappDirectory, File jarFile) throws MojoE
 
         try {
             List<Resource> webResources = this.webResources != null ? List.of(this.webResources) : null;
-            if (webResources != null && webResources.size() > 0) {
+            if (webResources != null && !webResources.isEmpty()) {
                 copyResourcesWithFiltering(webResources, webappDirectory);
             }
 
@@ -575,7 +587,7 @@ public void buildWebapp(MavenProject project, File webappDirectory) throws MojoE
             }
         }
 
-        if (dependentWarDirectories.size() > 0) {
+        if (!dependentWarDirectories.isEmpty()) {
             getLog().info("Overlaying " + dependentWarDirectories.size() + " war(s).");
 
             // overlay dependent wars
@@ -788,4 +800,44 @@ protected Boolean isSupportDynamicLoading() throws IOException {
             return Boolean.TRUE;
         }
     }
+
+    /**
+     * Performs the equivalent of "@requiresDependencyResolution" mojo attribute,
+     * so that we can choose the scope at runtime.
+     */
+    protected Set<Artifact> resolveDependencies(String scope) throws MojoExecutionException {
+        try {
+            DependencyResolutionRequest request =
+                    new DefaultDependencyResolutionRequest(project, session.getRepositorySession());
+            request.setResolutionFilter(getDependencyFilter(scope));
+            DependencyResolutionResult result = dependenciesResolver.resolve(request);
+
+            Set<Artifact> artifacts = new LinkedHashSet<>();
+            if (result.getDependencyGraph() != null
+                    && !result.getDependencyGraph().getChildren().isEmpty()) {
+                RepositoryUtils.toArtifacts(
+                        artifacts,
+                        result.getDependencyGraph().getChildren(),
+                        List.of(project.getArtifact().getId()),
+                        request.getResolutionFilter());
+            }
+            return artifacts;
+        } catch (DependencyResolutionException e) {
+            throw new MojoExecutionException("Unable to resolve dependencies", e);
+        }
+    }
+
+    /**
+     * Returns all the transitive plugin dependencies as MavenArtifact.
+     */
+    protected Set<MavenArtifact> getProjectArtifacts() {
+        return wrap(Artifacts.of(project));
+    }
+
+    protected DependencyFilter getDependencyFilter(String scope) {
+        if (scope == null || scope.isEmpty()) {
+            return null;
+        }
+        return new ScopeDependencyFilter(null, scope);
+    }
 }

src/main/java/org/jenkinsci/maven/plugins/hpi/AbstractJenkinsMojo.java

@@ -1,12 +1,17 @@
 package org.jenkinsci.maven.plugins.hpi;
 
+import edu.umd.cs.findbugs.annotations.CheckForNull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.util.VersionNumber;
 import io.jenkins.lib.versionnumber.JavaSpecificationVersion;
 import java.io.DataInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.jar.JarFile;
+import java.util.jar.Manifest;
 import java.util.zip.ZipEntry;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
@@ -136,6 +141,44 @@ private Artifact resolveJenkinsCore() throws MojoExecutionException {
         return MavenArtifact.resolveArtifact(artifact, project, session, repositorySystem);
     }
 
+    protected void setAddOpensProperty(Artifact artifact) throws MojoExecutionException {
+        String manifestEntry = getManifestEntry(wrap(artifact));
+        if (manifestEntry == null) {
+            getLog().warn("Add-Opens missing from MANIFEST.MF");
+            return;
+        }
+
+        String argLine = buildArgLine(manifestEntry);
+        getLog().info("Setting jenkins.addOpens to " + argLine);
+        project.getProperties().setProperty("jenkins.addOpens", argLine);
+    }
+
+    @NonNull
+    private static String buildArgLine(String manifestEntry) {
+        List<String> arguments = new ArrayList<>();
+        for (String module : manifestEntry.split("\\s+")) {
+            if (!module.isEmpty()) {
+                arguments.add("--add-opens");
+                arguments.add(module + "=ALL-UNNAMED");
+            }
+        }
+        return String.join(" ", arguments);
+    }
+
+    @CheckForNull
+    private static String getManifestEntry(MavenArtifact artifact) throws MojoExecutionException {
+        File war = artifact.getFile();
+        try (JarFile jarFile = new JarFile(war)) {
+            Manifest manifest = jarFile.getManifest();
+            if (manifest == null) {
+                throw new MojoExecutionException("No manifest found in " + war);
+            }
+            return manifest.getMainAttributes().getValue("Add-Opens");
+        } catch (IOException e) {
+            throw new MojoExecutionException("Failed to read MANIFEST.MF from " + war, e);
+        }
+    }
+
     protected MavenArtifact wrap(Artifact a) {
         return new MavenArtifact(a, repositorySystem, artifactFactory, projectBuilder, session, project);
     }