Skip to content

Commit

Permalink
Refresh plugin for June 2023 (#313)
Browse files Browse the repository at this point in the history
  • Loading branch information
@basil
basil authored Jun 26, 2023
1 parent 77bbf5e commit 17ebe89
Show file tree
Hide file tree
Showing 20 changed files with 120 additions and 82 deletions.
2 changes: 1 addition & 1 deletion .mvn/extensions.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<extension>
<groupId>io.jenkins.tools.incrementals</groupId>
<artifactId>git-changelist-maven-extension</artifactId>
<version>1.3</version>
<version>1.6</version>
</extension>
</extensions>
7 changes: 2 additions & 5 deletions Jenkinsfile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
buildPlugin(useContainerAgent: true, configurations: [
[ platform: "linux", jdk: "8" ],
[ platform: "windows", jdk: "8" ],
[ platform: "linux", jdk: "11" ]
[platform: 'linux', jdk: 17],
[platform: 'windows', jdk: 11],
])

// [ platform: 'linux', jdk: '17', jenkins: '2.342' ]
143 changes: 78 additions & 65 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.47</version>
<version>4.67</version>
<relativePath />
</parent>

Expand All @@ -46,7 +46,7 @@ THE SOFTWARE.
<revision>3.23</revision>
<changelist>-SNAPSHOT</changelist>
<gitHubRepo>jenkinsci/${project.artifactId}</gitHubRepo>
<jenkins.version>2.332.1</jenkins.version>
<jenkins.version>2.387.3</jenkins.version>
<mavenInterceptorsVersion>1.14</mavenInterceptorsVersion>
<!--
Minimal supported version of Maven.
Expand All @@ -56,11 +56,9 @@ THE SOFTWARE.
<mavenMinimalVersion>3.8.3</mavenMinimalVersion>
<resolverVersion>1.7.3</resolverVersion>
<sisuInjectVersion>0.3.5</sisuInjectVersion>
<wagonVersion>3.5.2</wagonVersion>
<!--TODO: change to true after the code cleanup-->
<spotbugs.failOnError>false</spotbugs.failOnError>
<!-- well the parent pom could defined an empty one instead of causing failure!! -->
<argLine />
<wagonVersion>3.5.3</wagonVersion>
<!-- TODO fix existing violatiosn -->
<spotbugs.threshold>High</spotbugs.threshold>
</properties>

<issueManagement>
Expand All @@ -78,8 +76,8 @@ THE SOFTWARE.
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.332.x</artifactId>
<version>1370.vfa_e23fe119c3</version>
<artifactId>bom-2.387.x</artifactId>
<version>2163.v2d916d90c305</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand All @@ -95,13 +93,6 @@ THE SOFTWARE.
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>javadoc</artifactId>
<version>217.v905b_86277a_2a_</version>
<exclusions>
<exclusion>
<groupId>org.jenkins-ci</groupId>
<artifactId>symbol-annotation</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand All @@ -110,13 +101,6 @@ THE SOFTWARE.
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>junit</artifactId>
<version>1119.va_a_5e9068da_d7</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down Expand Up @@ -414,6 +398,11 @@ THE SOFTWARE.
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</exclusion>
<!-- Provided by Jenkins core -->
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down Expand Up @@ -453,6 +442,11 @@ THE SOFTWARE.
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</exclusion>
<!-- Provided by Jenkins core -->
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>

Expand Down Expand Up @@ -483,6 +477,11 @@ THE SOFTWARE.
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</exclusion>
<!-- Provided by Jenkins core -->
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand All @@ -499,11 +498,25 @@ THE SOFTWARE.
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-transport-wagon</artifactId>
<version>${resolverVersion}</version>
<exclusions>
<!-- Provided by Jenkins core -->
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-connector-basic</artifactId>
<version>${resolverVersion}</version>
<exclusions>
<!-- Provided by Jenkins core -->
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down Expand Up @@ -531,10 +544,12 @@ THE SOFTWARE.
<artifactId>wagon-http</artifactId>
<version>${wagonVersion}</version>
<exclusions>
<!-- Provided by Jenkins core -->
<exclusion>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</exclusion>
<!-- Provided by apache-httpcomponents-client-4-api plugin -->
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
Expand All @@ -543,6 +558,15 @@ THE SOFTWARE.
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</exclusion>
<!-- Provided by Jenkins core -->
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand All @@ -568,10 +592,16 @@ THE SOFTWARE.
<artifactId>wagon-ftp</artifactId>
<version>${wagonVersion}</version>
<exclusions>
<!-- Provided by Jenkins core -->
<exclusion>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</exclusion>
<!-- Provided by Jenkins core -->
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down Expand Up @@ -599,7 +629,7 @@ THE SOFTWARE.
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
<version>3.0</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Expand Down Expand Up @@ -633,7 +663,7 @@ THE SOFTWARE.
<artifactId>commons-cli</artifactId>
</exclusion>
<exclusion>
<!-- Excluded to pull in the version from Jenkins core -->
<!-- Provided by Jenkins core -->
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</exclusion>
Expand Down Expand Up @@ -668,10 +698,15 @@ THE SOFTWARE.
<artifactId>wagon-webdav-jackrabbit</artifactId>
<version>${wagonVersion}</version>
<exclusions>
<exclusion><!-- jcl-over-slf4j version needs to match with slf4j-api version, which makes this fragile. let's not try to intercept jcl calls -->
<!-- Provided by Jenkins core -->
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<!-- SECURITY-61: unused -->
<exclusion>
<groupId>nekohtml</groupId>
Expand All @@ -681,6 +716,7 @@ THE SOFTWARE.
<groupId>nekohtml</groupId>
<artifactId>xercesMinimal</artifactId>
</exclusion>
<!-- Provided by Jenkins core -->
<exclusion>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
Expand All @@ -705,7 +741,6 @@ THE SOFTWARE.
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>commons-lang3-api</artifactId>
<version>3.12.0-36.vd97de6465d5b_</version>
</dependency>

<dependency>
Expand All @@ -722,27 +757,32 @@ THE SOFTWARE.
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jvnet.mock-javamail</groupId>
<artifactId>mock-javamail</artifactId>
<version>1.12</version>
<version>2.1</version>
<scope>test</scope>
<exclusions>
<!-- Provided by jakarta-activation-api plugin -->
<exclusion>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
</exclusion>
<!-- Provided by jakarta-mail-api plugin -->
<exclusion>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<groupId>com.sun.mail</groupId>
<artifactId>jakarta.mail</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>jakarta-mail-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.test</groupId>
<artifactId>sample-plexus-component</artifactId>
Expand All @@ -752,25 +792,13 @@ THE SOFTWARE.
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>promoted-builds</artifactId>
<version>3.10.1</version>
<version>892.vd6219fc0a_efb</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>maven-plugin</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>jenkins-test-harness</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand All @@ -787,25 +815,10 @@ THE SOFTWARE.
<artifactId>credentials-binding</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci</groupId>
<artifactId>annotation-indexer</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.jenkins.configuration-as-code</groupId>
<artifactId>test-harness</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

Expand Down
2 changes: 2 additions & 0 deletions src/main/java/hudson/maven/AbstractMavenProcessFactory.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package hudson.maven;

import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import hudson.AbortException;
import hudson.EnvVars;
import hudson.Extension;
Expand Down Expand Up @@ -149,6 +150,7 @@ static final class Connection implements Serializable {
// only used on the sender side that was Socket object locally
private transient Socket socket;

@SuppressFBWarnings(value = "SE_BAD_FIELD_STORE", justification = "TODO needs triage")
Connection(Socket socket) throws IOException {
this.in = new SocketInputStream(socket);
this.out = new SocketOutputStream(socket);
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/hudson/maven/Maven3Builder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
package hudson.maven;

import edu.umd.cs.findbugs.annotations.CheckForNull;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import hudson.maven.MavenBuild.ProxyImpl2;
import hudson.maven.reporters.TestFailureDetector;
import hudson.maven.util.ExecutionEventLogger;
Expand Down Expand Up @@ -360,6 +361,7 @@ private static class MavenExecutionListener extends AbstractExecutionListener im

private final Map<ModuleName, Long> currentMojoStartPerModuleName = new ConcurrentHashMap<>();

@SuppressFBWarnings(value = "SE_BAD_FIELD", justification = "TODO needs triage")
protected ExecutionEventLogger eventLogger;

MavenExecutionListener(Maven3Builder maven3Builder) {
Expand Down Expand Up @@ -737,5 +739,6 @@ private String mojoExec(ExecutionEvent event) {

private static final Logger LOGGER = Logger.getLogger(Maven3Builder.class.getName());

@SuppressFBWarnings(value = "MS_SHOULD_BE_FINAL", justification = "TODO needs triage")
public static boolean DUMP_PERFORMANCE_COUNTERS = Boolean.getBoolean(Maven3Builder.class.getName()+".dumpPerformanceCounters");
}
2 changes: 2 additions & 0 deletions src/main/java/hudson/maven/MavenBuild.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
*/
package hudson.maven;

import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import hudson.EnvVars;
import hudson.ExtensionList;
import hudson.FilePath;
Expand Down Expand Up @@ -448,6 +449,7 @@ public boolean hasBuildFailures() {
/**
* {@link MavenBuildProxy} implementation.
*/
@SuppressFBWarnings(value = "SE_BAD_FIELD_INNER_CLASS", justification = "TODO needs triage")
class ProxyImpl implements MavenBuildProxy, Serializable {
private static final long serialVersionUID = 8865133776526671879L;

Expand Down
Loading

0 comments on commit 17ebe89

Please sign in to comment.