Skip to content

Commit

Permalink
Upgraded to Jenkins 2.462.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@dheid
dheid committed Oct 12, 2024
1 parent cad4923 commit f6d65b2
Show file tree
Hide file tree
Showing 53 changed files with 473 additions and 683 deletions.
3 changes: 3 additions & 0 deletions .editorconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,8 @@ insert_final_newline = true
indent_style = space
indent_size = 4

[*.xml]
indent_size = 2

[*.md]
trim_trailing_whitespace = false
1 change: 1 addition & 0 deletions .java-version
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
17
6 changes: 6 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,12 @@ the PR from the JIRA issue.

## Release Notes

### Version 3.4.0

* Upgraded to Jenkins Plugin POM 5.1
* Upgraded to Jenkins 2.462.3
* Reformatted source code with Spotless

### Version 3.3.0

* Upgraded to Jenkins 2.452
Expand Down
328 changes: 164 additions & 164 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,169 +1,169 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>5.1</version>
</parent>

<artifactId>postbuildscript</artifactId>
<packaging>hpi</packaging>
<name>Jenkins PostBuildScript Plugin</name>
<version>${revision}-${changelist}</version>
<url>https://plugins.jenkins.io/postbuildscript</url>
<inceptionYear>2011</inceptionYear>
<description>A plugin for the Jenkins CI to run several configurable actions after
a build, depending on the build result.
</description>

<properties>
<revision>3.3.0</revision>
<changelist>999999-SNAPSHOT</changelist>
<gitHubRepo>jenkinsci/postbuildscript-plugin</gitHubRepo>
<jenkins.version>2.452.2</jenkins.version>
<hpi.compatibleSinceVersion>3.0.0</hpi.compatibleSinceVersion>
</properties>

<issueManagement>
<system>jira</system>
<url>https://issues.jenkins-ci.org/browse</url>
</issueManagement>

<ciManagement>
<system>Jenkins</system>
<url>https://ci.jenkins.io/job/Plugins/job/postbuildscript-plugin/</url>
<notifiers>
<notifier>
<address>[email protected]</address>
</notifier>
</notifiers>
</ciManagement>

<distributionManagement>
<downloadUrl>https://updates.jenkins-ci.org/download/plugins/postbuildscript</downloadUrl>
</distributionManagement>

<licenses>
<license>
<name>MIT license</name>
<comments>All source code is under the MIT license.</comments>
<url>https://opensource.org/licenses/MIT</url>
</license>
</licenses>

<developers>
<developer>
<id>gbois</id>
<name>Gregory Boissinot</name>
<timezone>+1</timezone>
<roles>
<role>Initiator and previous maintainer (until 2015)</role>
</roles>
</developer>
<developer>
<id>dheid</id>
<name>Daniel Heid</name>
<email>[email protected]</email>
<url>https://www.daniel-heid.de/</url>
<roles>
<role>Maintainer (since 2017)</role>
</roles>
</developer>
</developers>

<contributors>
<contributor>
<name>Nicolas De loof</name>
<url>https://blog.loof.fr</url>
<organization>CloudBees</organization>
<organizationUrl>https://www.cloudbees.com/</organizationUrl>
</contributor>
<contributor>
<name>Simon Edwardsson</name>
</contributor>
<contributor>
<name>ChakaZulu</name>
</contributor>
<contributor>
<name>Rob Petti</name>
<url>http://robpetti.com</url>
<organization>OpenText</organization>
<organizationUrl>https://www.opentext.com/</organizationUrl>
</contributor>
<contributor>
<name>Markus Alexander Kuppe</name>
<url>https://www.lemmster.de/</url>
</contributor>
<contributor>
<name>Dan Clayton</name>
</contributor>
</contributors>

<scm>
<connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
<developerConnection>scm:git:[email protected]:${gitHubRepo}.git</developerConnection>
<url>https://github.com/${gitHubRepo}</url>
<tag>${scmTag}</tag>
</scm>

<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>5.1</version>
</parent>

<artifactId>postbuildscript</artifactId>
<version>${revision}-${changelist}</version>
<packaging>hpi</packaging>
<name>Jenkins PostBuildScript Plugin</name>
<description>A plugin for the Jenkins CI to run several configurable actions after
a build, depending on the build result.</description>
<url>https://plugins.jenkins.io/postbuildscript</url>
<inceptionYear>2011</inceptionYear>

<licenses>
<license>
<name>MIT license</name>
<url>https://opensource.org/licenses/MIT</url>
<comments>All source code is under the MIT license.</comments>
</license>
</licenses>

<developers>
<developer>
<id>gbois</id>
<name>Gregory Boissinot</name>
<roles>
<role>Initiator and previous maintainer (until 2015)</role>
</roles>
<timezone>+1</timezone>
</developer>
<developer>
<id>dheid</id>
<name>Daniel Heid</name>
<email>[email protected]</email>
<url>https://www.daniel-heid.de/</url>
<roles>
<role>Maintainer (since 2017)</role>
</roles>
</developer>
</developers>

<contributors>
<contributor>
<name>Nicolas De loof</name>
<url>https://blog.loof.fr</url>
<organization>CloudBees</organization>
<organizationUrl>https://www.cloudbees.com/</organizationUrl>
</contributor>
<contributor>
<name>Simon Edwardsson</name>
</contributor>
<contributor>
<name>ChakaZulu</name>
</contributor>
<contributor>
<name>Rob Petti</name>
<url>http://robpetti.com</url>
<organization>OpenText</organization>
<organizationUrl>https://www.opentext.com/</organizationUrl>
</contributor>
<contributor>
<name>Markus Alexander Kuppe</name>
<url>https://www.lemmster.de/</url>
</contributor>
<contributor>
<name>Dan Clayton</name>
</contributor>
</contributors>

<scm>
<connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
<developerConnection>scm:git:[email protected]:${gitHubRepo}.git</developerConnection>
<tag>${scmTag}</tag>
<url>https://github.com/${gitHubRepo}</url>
</scm>

<issueManagement>
<system>jira</system>
<url>https://issues.jenkins-ci.org/browse</url>
</issueManagement>

<ciManagement>
<system>Jenkins</system>
<url>https://ci.jenkins.io/job/Plugins/job/postbuildscript-plugin/</url>
<notifiers>
<notifier>
<address>[email protected]</address>
</notifier>
</notifiers>
</ciManagement>

<distributionManagement>
<downloadUrl>https://updates.jenkins-ci.org/download/plugins/postbuildscript</downloadUrl>
</distributionManagement>

<properties>
<revision>3.4.0</revision>
<changelist>999999-SNAPSHOT</changelist>
<gitHubRepo>jenkinsci/postbuildscript-plugin</gitHubRepo>
<jenkins.version>2.462.3</jenkins.version>
<jenkins-test-harness.version>2228.v919b_5883c444</jenkins-test-harness.version>
<hpi.compatibleSinceVersion>3.0.0</hpi.compatibleSinceVersion>
</properties>

<dependencyManagement>
<dependencies>

<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>matrix-project</artifactId>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.462.x</artifactId>
<version>3387.v0f2773fa_3200</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.452.x</artifactId>
<version>3435.v238d66a_043fb_</version>
<scope>import</scope>
<type>pom</type>
</dependency>
</dependencies>
</dependencyManagement>

<repositories>
<repository>
<id>repo.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/public/</url>
</repository>
</repositories>

<pluginRepositories>
<pluginRepository>
<id>repo.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/public/</url>
</pluginRepository>
</pluginRepositories>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</dependencyManagement>

<dependencies>

<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>matrix-project</artifactId>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>

</dependencies>

<repositories>
<repository>
<id>repo.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/public/</url>
</repository>
</repositories>

<pluginRepositories>
<pluginRepository>
<id>repo.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/public/</url>
</pluginRepository>
</pluginRepositories>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>

14 changes: 6 additions & 8 deletions src/main/java/org/jenkinsci/plugins/postbuildscript/ConfigurableMatrixAggregator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@
import hudson.matrix.MatrixBuild;
import hudson.matrix.MatrixRun;
import hudson.model.BuildListener;
import java.io.IOException;
import org.jenkinsci.plugins.postbuildscript.logging.Logger;
import org.jenkinsci.plugins.postbuildscript.processor.Processor;
import org.jenkinsci.plugins.postbuildscript.processor.ProcessorFactory;

import java.io.IOException;

public class ConfigurableMatrixAggregator extends MatrixAggregator {

private final Processor processor;
Expand All @@ -19,12 +18,11 @@ public class ConfigurableMatrixAggregator extends MatrixAggregator {
private final Logger logger;

public ConfigurableMatrixAggregator(
MatrixBuild build,
Launcher launcher,
BuildListener listener,
ProcessorFactory processorFactory,
Class<? extends PostBuildScript> initiator
) {
MatrixBuild build,
Launcher launcher,
BuildListener listener,
ProcessorFactory processorFactory,
Class<? extends PostBuildScript> initiator) {
super(build, launcher, listener);
this.initiator = initiator;
processor = processorFactory.createMatrixProcessor(build, launcher, listener);
Expand Down
Loading

0 comments on commit f6d65b2

Please sign in to comment.