Skip to content

Commit

Permalink
Merge branch 'master' into JENKINS-34502
Browse files Browse the repository at this point in the history
  • Loading branch information
strangelookingnerd authored Nov 7, 2024
2 parents c903e97 + 5af53dd commit f968ced
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
1 change: 0 additions & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,5 @@ buildPlugin(
useContainerAgent: true, // Set to `false` if you need to use Docker for containerized tests
configurations: [
[platform: 'linux', jdk: 21],
[platform: 'linux', jdk: 11],
[platform: 'windows', jdk: 17],
])
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.87</version>
<version>5.2</version>
<relativePath/>
</parent>

Expand All @@ -22,7 +22,7 @@
<changelist>999999-SNAPSHOT</changelist>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
<jenkins.baseline>2.462</jenkins.baseline>
<jenkins.baseline>2.479</jenkins.baseline>
<jenkins.version>${jenkins.baseline}.1</jenkins.version>
<no-test-jar>false</no-test-jar>
<hpi.compatibleSinceVersion>5.2</hpi.compatibleSinceVersion>
Expand Down Expand Up @@ -61,7 +61,7 @@
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-${jenkins.baseline}.x</artifactId>
<version>3276.vcd71db_867fb_2</version>
<version>3613.v584fca_12cf5c</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -957,7 +957,6 @@ public void onRenamed(I item, String oldName, String newName) throws IOException
for (View v : folderViews.getViews()) {
v.onJobRenamed(item, oldName, newName);
}
save();
}

/**
Expand All @@ -972,7 +971,6 @@ public void onDeleted(I item) throws IOException {
for (View v : folderViews.getViews()) {
v.onJobRenamed(item, item.getName(), null);
}
save();
}

/**
Expand Down

0 comments on commit f968ced

Please sign in to comment.