Skip to content

Commit

Permalink
Refresh plugin for April 2023
Browse files Browse the repository at this point in the history
  • Loading branch information
basil committed Apr 27, 2023
1 parent 1a6c1e5 commit 64100e4
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .mvn/extensions.xml
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.4</version>
<version>1.6</version>
</extension>
</extensions>
5 changes: 2 additions & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
buildPlugin(useContainerAgent: true, configurations: [
[ platform: "linux", jdk: "8", jenkins: null ],
[ platform: "linux", jdk: "11", jenkins: null ]
[platform: 'linux', jdk: 17],
[platform: 'windows', jdk: 11],
])

21 changes: 4 additions & 17 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.50</version>
<version>4.61</version>
<relativePath />
</parent>

Expand Down Expand Up @@ -141,10 +141,9 @@ THE SOFTWARE.
<revision>2.17.2</revision>
<changelist>-SNAPSHOT</changelist>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
<jenkins.version>2.332.1</jenkins.version>
<jenkins.version>2.361.4</jenkins.version>
<no-test-jar>false</no-test-jar>
<spotbugs.threshold>High</spotbugs.threshold> <!-- TODO some violations remaining -->
<powermock.version>2.0.9</powermock.version>
</properties>

<repositories>
Expand All @@ -164,8 +163,8 @@ THE SOFTWARE.
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.332.x</artifactId>
<version>1289.v5c4b_1c43511b_</version>
<artifactId>bom-2.361.x</artifactId>
<version>2025.v816d28f1e04f</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand Down Expand Up @@ -251,18 +250,6 @@ THE SOFTWARE.
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<version>${powermock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito2</artifactId>
<version>${powermock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>envinject</artifactId>
Expand Down
2 changes: 2 additions & 0 deletions src/test/java/hudson/scm/SubversionSCMTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,8 @@ public void taggingPermission() throws Exception {
r.assertBuildStatus(Result.SUCCESS,b);

final SubversionTagAction action = b.getAction(SubversionTagAction.class);
// Avoid https://github.com/jenkinsci/plugin-pom/pull/693
r.jenkins.setSecurityRealm(r.createDummySecurityRealm());
r.executeOnServer(() -> {
assertFalse("Shouldn't be accessible to anonymous user",b.hasPermission(action.getPermission()));
return null;
Expand Down

0 comments on commit 64100e4

Please sign in to comment.