Skip to content

Commit

Permalink
warn
Browse files Browse the repository at this point in the history
log4j

java-version: ${{ matrix.java }}

<version>4.75</version>

2543.vfb_1a_5fb_9496d
  • Loading branch information
damianszczepanik committed Dec 30, 2023
1 parent e14c2aa commit 2df9368
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 11 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ jobs:
build:
strategy:
matrix:
java: [ '11', '17' ]
os: [ 'ubuntu-latest', 'windows-latest', 'macos-latest' ]

runs-on: ${{ matrix.os }}
Expand All @@ -23,7 +24,7 @@ jobs:

- uses: actions/setup-java@v3
with:
java-version: 11
java-version: ${{ matrix.java }}
distribution: adopt

- run: mvn --batch-mode verify
9 changes: 5 additions & 4 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// `buildPlugin` step provided by: https://github.com/jenkins-infra/pipeline-library

buildPlugin(
useContainerAgent: true,
failFast: false,
configurations: [
[platform: 'linux', jdk: 11],
[platform: 'windows', jdk: 11],
])
platforms: ['linux', 'windows'],
jdkVersions: [11]
)
9 changes: 5 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
</dependencies>
</dependencyManagement>

<!-- This name and URL are added by the Jenkins when displaying help.html file -->
<name>Build History Manager</name>
<description>
Jenkins plugin that allows to build complex rules to decide when and which builds should be removed from the
Expand Down Expand Up @@ -53,7 +54,7 @@
<tag>HEAD</tag>
</scm>
<ciManagement>
<system>jenkins</system>
<system>Jenkins</system>
<url>https://ci.jenkins.io/job/Plugins/job/build-history-manager-plugin/</url>
</ciManagement>

Expand Down Expand Up @@ -167,14 +168,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.3</version>
<version>3.0.1</version>
</plugin>
</plugins>
</pluginManagement>
</build>

<dependencies>
<dependency>
<dependencies>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>token-macro</artifactId>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
import pl.damianszczepanik.jenkins.buildhistorymanager.model.ConditionBuilder;
import pl.damianszczepanik.jenkins.buildhistorymanager.model.ConditionBuilder.NegativeCondition;
import pl.damianszczepanik.jenkins.buildhistorymanager.model.Rule;
import pl.damianszczepanik.jenkins.buildhistorymanager.model.RuleBuilder;
import pl.damianszczepanik.jenkins.buildhistorymanager.model.RuleConfiguration;
Expand Down Expand Up @@ -72,7 +72,7 @@ public void getRules_ReturnsRules() {
public void perform_InitializesRule() throws IOException, InterruptedException {

// given
Rule rule = new Rule(Arrays.asList(new ConditionBuilder.NegativeCondition()), null);
Rule rule = new Rule(List.of(new NegativeCondition()), null);
Deencapsulation.setField(rule, "matchedTimes", 1);
BuildHistoryManager discarder = new BuildHistoryManager(Arrays.asList(rule));
Job<?, ?> job = JobBuilder.buildSampleJob();
Expand Down

0 comments on commit 2df9368

Please sign in to comment.