Bump plexus-utils from 3.4.2 to 3.5.0

.github/dependabot.yml

@@ -1,6 +1,18 @@
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
 version: 2
 updates:
-- package-ecosystem: "maven"
-  directory: "/"
-  schedule:
-    interval: "weekly"
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    ignore:
+      # Must remain within Jetty 9.x until Java 8 support is removed
+      - dependency-name: "org.eclipse.jetty:jetty-maven-plugin"
+        versions: [">=10.0.0"]
+      # Requires Java 11 starting with version 1711.v5b_1b_03f0fcf2.
+      - dependency-name: "org.kohsuke.stapler:stapler-groovy"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/release-drafter.yml

@@ -1,2 +1,4 @@
+# https://github.com/jenkinsci/.github/blob/master/.github/release-drafter.adoc
+
 _extends: .github
 tag-template: maven-hpi-plugin-$NEXT_MINOR_VERSION

.github/workflows/release-drafter.yml

@@ -0,0 +1,16 @@
+# Automates creation of Release Drafts using Release Drafter
+# More Info: https://github.com/jenkinsci/.github/blob/master/.github/release-drafter.adoc
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  update_release_draft:
+    runs-on: ubuntu-latest
+    steps:
+      # Drafts your next Release notes as Pull Requests are merged into "master"
+      - uses: release-drafter/release-drafter@v5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.mvn/extensions.xml

@@ -0,0 +1,7 @@
+<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
+  <extension>
+    <groupId>io.jenkins.tools.incrementals</groupId>
+    <artifactId>git-changelist-maven-extension</artifactId>
+    <version>1.4</version>
+  </extension>
+</extensions>

.mvn/maven.config

@@ -0,0 +1,2 @@
+-Pconsume-incrementals
+-Pmight-produce-incrementals

Jenkinsfile

@@ -1,12 +1,43 @@
-properties([buildDiscarder(logRotator(numToKeepStr: '20'))])
-node('maven') {
-    checkout scm
-    timeout(time: 1, unit: 'HOURS') {
-        // TODO Azure mirror
-        ansiColor('xterm') {
-            withEnv(['MAVEN_OPTS=-Djansi.force=true']) {
-                sh 'mvn -B -Dstyle.color=always -ntp -Prun-its clean install site'
+properties([
+  buildDiscarder(logRotator(numToKeepStr: '20')),
+  disableConcurrentBuilds(abortPrevious: true)
+])
+
+def runTests(Map params = [:]) {
+  return {
+    def agentContainerLabel = params['jdk'] == 8 ? 'maven' : 'maven-' + params['jdk']
+    boolean publishing = params['jdk'] == 8
+    node(agentContainerLabel) {
+      timeout(time: 1, unit: 'HOURS') {
+        def stageIdentifier = params['platform'] + '-' + params['jdk']
+        stage("Checkout (${stageIdentifier})") {
+          checkout scm
+        }
+        stage("Build (${stageIdentifier})") {
+          ansiColor('xterm') {
+            def args = ['-Dstyle.color=always', '-Prun-its', '-Dmaven.test.failure.ignore', 'clean', 'install', 'site']
+            if (publishing) {
+              args += '-Dset.changelist'
+            }
+            // Needed for correct computation of JenkinsHome in RunMojo#execute.
+            withEnv(['JENKINS_HOME=', 'HUDSON_HOME=']) {
+              infra.runMaven(args, params['jdk'])
             }
+          }
+        }
+        stage("Archive (${stageIdentifier})") {
+          junit 'target/invoker-reports/TEST-*.xml'
+          if (publishing) {
+            infra.prepareToPublishIncrementals()
+          }
         }
+      }
     }
+  }
 }
+
+parallel(
+    'linux-8': runTests(platform: 'linux', jdk: 8),
+    'linux-11': runTests(platform: 'linux', jdk: 11)
+)
+infra.maybePublishIncrementals()

README.md

@@ -3,101 +3,17 @@
 Maven plugin to build Jenkins plugins.
 See the [developer guide](https://jenkins.io/doc/developer/plugin-development/) for details.
 
-[Mojo documentation](http://jenkinsci.github.io/maven-hpi-plugin/)
+[Mojo documentation](https://jenkinsci.github.io/maven-hpi-plugin/)
 
 ## Changelog
 
 ### Newer versions
 
 See [GitHub Releases](https://github.com/jenkinsci/maven-hpi-plugin/releases)
 
-### 3.5 (2019-03-28)
+### Older versions
 
-* Treat POM loading errors in dependencies as nonfatal.
-
-### 3.3 (2019-01-31)
-
-* [JENKINS-54807](https://issues.jenkins-ci.org/browse/JENKINS-54807) -
-Fix classloading of Java-internal modules when running `hpi:run` with Java 11
-
-### 3.2 (2019-01-16)
-
-* [PR #90](https://github.com/jenkinsci/maven-hpi-plugin/pull/90) -
-Introduce a new `hpi.compatibleSinceVersion` property to support
-[marking plugins as incompatible](https://wiki.jenkins.io/display/JENKINS/Marking+a+new+plugin+version+as+incompatible+with+older+versions)
-without the plugin configuration override
-  * Prevents issues like [JENKINS-55562](https://issues.jenkins-ci.org/browse/JENKINS-55562)
-* [JENKINS-54949](https://issues.jenkins-ci.org/browse/JENKINS-54949) -
-Add support of adding the current pom.xml to the custom WAR 
-in the `hpi:custom-war` mojo
-
-### 3.1 (2018-12-14)
-
-* `hpi:run` was broken since 3.0 since `minimumJavaVersion` was not being properly propagated.
-
-### 3.0 (2018-12-05)
-
-* [JENKINS-20679](https://issues.jenkins-ci.org/browse/JENKINS-20679) - 
-Inject `Minimum-Java-Version` into the manifest.
-  * It is set by a new mandatory `minimumJavaVersion` parameter in `hpi:hpi`, `hpi:jar` and `hpi:hpl`
-  * Format: `java.specification.version` according to [Java JEP-223](https://openjdk.java.net/jeps/223). 
-    Examples: `1.6`, `1.7`, `1.8`, `6`, `7`, `8`, `9`, `11`, ...
-* [PR #83](https://github.com/jenkinsci/maven-hpi-plugin/pull/83) -
-Improve the error message when an improper JAR file is passed 
-* Internal: Move manifest-related parameters and logic to `AbstractJenkinsManifestMojo`
-
-### 2.7 (2018-10-30)
-
-* Delete `work/plugins/*.jpl` where the current `test`-scoped dependency is not in fact a snapshot.
-* Use a more specific temp dir for Jetty.
-
-### 2.6 (2018 Jun 01)
-
-* Bugs in the dependency copy of `mvn hpi:run` could lead to anomalies such as `work/plugins/null.jpi`.
-
-### 2.5 (2018 May 11)
-
-* Option to override a snapshot plugin version with a more informative string.
-
-### 2.3 (2018 Apr 19)
-
-* Using a newer standard `VersionNumber` that precisely matches the behavior of the Jenkins plugin manager.
-
-### 2.2 (2018 Jan 30)
-
-* Fix `mvn clean hpi:run` and some similar special goal sequences.
-
-### 2.1 (2017 Sep 26)
-
-* Jenkins plugin archetypes are no longer bundled with this Maven plugin. Instead use the [new project](https://github.com/jenkinsci/archetypes/blob/master/README.md#introduction).
-* Making `-DwebAppFile=…` work.
-* Fixing unchecked/rawtypes warnings in `InjectedTest`.
-* No more special handling of artifacts with `-ea` in the version.
-
-### 2.0 (2017 May 25)
-
-* Updated integrated Jetty server to 9.x. This means that JDK 8 is now required at build time. (Plugins may continue to target older Java baselines using the `java.level` property in the 2.x parent POM.)
-* [JENKINS-24064](https://issues.jenkins-ci.org/browse/JENKINS-24064) Added `executable-war` artifact type, permitting Jenkins to stop deploying the wasteful `jenkins-war-*-war-for-test.jar` artifact, which was identical to `jenkins-war-*.war`.
-
-### 1.122 (2017 Apr 12)
-
-* Fixed HTML escaping for Javadoc created for taglibs so it can be processed by JDK 8.
-* Logging the current artifact for `InjectedTest`.
-* More fixes to mojos that assumed that plugin artifacts used a short name identical to the `artifactId`.
-* Minor archetype updates.
-
-### 1.121 (2016 Dec 16)
-
-* Fixing a problem with plugin dependency resolution affecting users of jitpack.io.
-
-### 1.120 (2016 Sep 26)
-
-* Allowing `hpi:run` to pick up compiled classes & saved resources from core or plugin snapshot dependencies in addition to the plugin under test itself.
-* Ensuring `Plugin-Dependencies` appears in a consistent order from build to build.
-
-### 1.119 and earlier
-
-Not recorded.
+See [archive](https://github.com/jenkinsci/maven-hpi-plugin/tree/24b27178f4dbdb9eeb395f35fc94774d514c980a#35-2019-03-28).
 
 ## For maintainers