Merge pull request #28 from olivergondza/bump-core-dep

Fix #27: Bump core dependency to 2.235.1
jenkinsci · May 13, 2021 · d623611 · d623611
2 parents ff5258c + 85e10ea
commit d623611
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>3.50</version>
+    <version>4.18</version>
   </parent>
 
   <artifactId>cloud-stats</artifactId>
@@ -36,11 +36,6 @@
   </scm>
 
   <dependencies>
-    <dependency>
-      <groupId>org.jvnet.hudson.plugins</groupId>
-      <artifactId>extended-read-permission</artifactId>
-      <version>3.2</version>
-    </dependency>
     <dependency> <!-- Needed by JTH -->
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>matrix-auth</artifactId>
@@ -64,7 +59,7 @@
   </pluginRepositories>
 
   <properties>
-    <jenkins.version>2.138.4</jenkins.version>
+    <jenkins.version>2.235.1</jenkins.version>
     <java.level>8</java.level>
     <surefire.useFile>false</surefire.useFile>
     <useBeta>true</useBeta>

diff --git a/src/main/java/org/jenkinsci/plugins/cloudstats/CloudStatistics.java b/src/main/java/org/jenkinsci/plugins/cloudstats/CloudStatistics.java
@@ -37,7 +37,6 @@
 import hudson.model.PeriodicWork;
 import hudson.model.Saveable;
 import hudson.model.TaskListener;
-import hudson.plugins.extendedread.SystemReadPermission;
 import hudson.security.Permission;
 import hudson.slaves.AbstractCloudComputer;
 import hudson.slaves.Cloud;
@@ -147,8 +146,7 @@ public String getIconFileName() {
 
     @Override
     public @Nonnull Permission getRequiredPermission() {
-        //Move to Jenkins.SYSTEM_READ when baseline is above 2.222
-        return SystemReadPermission.SYSTEM_READ;
+        return Jenkins.SYSTEM_READ;
     }
 
     @Override

diff --git a/src/main/java/org/jenkinsci/plugins/cloudstats/StatsWidget.java b/src/main/java/org/jenkinsci/plugins/cloudstats/StatsWidget.java
@@ -37,7 +37,6 @@ public class StatsWidget extends Widget {
 
     public boolean isDisplayed() {
         Jenkins instance = Jenkins.get();
-        //Move to Jenkins.SYSTEM_READ when baseline is above 2.222
         return !instance.clouds.isEmpty() && instance.hasPermission(CloudStatistics.get().getRequiredPermission());
     }
 }