Tidy pom.xml and .gitignore (#384)

jenkinsci · Dec 15, 2024 · be76cd0 · be76cd0
2 parents 9781123 + 6972d4a
commit be76cd0
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 66 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,43 +1,15 @@
 target
+
+# mvn hpi:run
 work
 
+# IntelliJ IDEA project files
+*.iml
+*.iws
+*.ipr
+.idea
+
 # Eclipse project files
-.checkstyle
 .settings
 .classpath
 .project
-/nb-configuration.xml
-
-# From https://github.com/github/gitignore/blob/master/Global/JetBrains.gitignore
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm
-
-## Directory-based project format
-.idea/
-# if you remove the above rule, at least ignore user-specific stuff:
-# .idea/workspace.xml
-# .idea/tasks.xml
-# and these sensitive or high-churn files:
-# .idea/dataSources.ids
-# .idea/dataSources.xml
-# .idea/sqlDataSources.xml
-# .idea/dynamic.xml
-
-## File-based project format
-*.ipr
-*.iws
-*.iml
-
-## Additional for IntelliJ
-out/
-
-# generated by mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# generated by JIRA plugin
-atlassian-ide-plugin.xml
-
-# generated by Crashlytics plugin (for Android Studio and Intellij)
-com_crashlytics_export_strings.xml
-
-# JMH benchmark reports
-jmh-report.json
diff --git a/pom.xml b/pom.xml
@@ -5,16 +5,16 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.86</version>
-    <relativePath/>
+    <version>4.88</version>
+    <relativePath />
   </parent>
 
   <artifactId>role-strategy</artifactId>
   <version>${changelist}</version>
   <packaging>hpi</packaging>
 
   <name>Role-based Authorization Strategy</name>
-  <url>https://github.com/jenkinsci/role-strategy-plugin</url>
+  <url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
   <licenses>
     <license>
       <name>MIT License</name>
@@ -35,24 +35,25 @@
       <timezone>+1</timezone>
     </developer>
     <developer>
-      <name>Oleg Nenashev</name>
       <id>oleg_nenashev</id>
+      <name>Oleg Nenashev</name>
       <email>[email protected]</email>
     </developer>
   </developers>
 
   <scm>
-    <connection>scm:git:https://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
-    <developerConnection>scm:git:[email protected]:jenkinsci/${project.artifactId}-plugin.git</developerConnection>
-    <url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
+    <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>
 
   <properties>
     <jenkins.base>2.440</jenkins.base>
     <changelist>999999-SNAPSHOT</changelist>
     <jenkins.version>${jenkins.base}.3</jenkins.version>
-    <checkstyle.version>10.17.0</checkstyle.version>
+    <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
+    <checkstyle.version>10.20.1</checkstyle.version>
     <hpi.compatibleSinceVersion>640</hpi.compatibleSinceVersion>
   </properties>
 
@@ -69,8 +70,9 @@
   </dependencyManagement>
   <dependencies>
     <dependency>
-      <groupId>io.jenkins.plugins</groupId>
-      <artifactId>ionicons-api</artifactId>
+      <groupId>io.jenkins</groupId>
+      <artifactId>configuration-as-code</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
@@ -81,9 +83,8 @@
       <artifactId>commons-lang3-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>io.jenkins</groupId>
-      <artifactId>configuration-as-code</artifactId>
-      <optional>true</optional>
+      <groupId>io.jenkins.plugins</groupId>
+      <artifactId>ionicons-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
@@ -95,30 +96,30 @@
       <artifactId>workflow-step-api</artifactId>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>io.jenkins.configuration-as-code</groupId>
-      <artifactId>test-harness</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>com.synopsys.jenkinsci</groupId>
       <artifactId>ownership</artifactId>
       <version>0.13.0</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>io.jenkins.configuration-as-code</groupId>
+      <artifactId>test-harness</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>authorize-project</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins.workflow</groupId>
-      <artifactId>workflow-job</artifactId>
+      <artifactId>workflow-basic-steps</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins.workflow</groupId>
-      <artifactId>workflow-basic-steps</artifactId>
+      <artifactId>workflow-job</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -145,31 +146,31 @@
         <executions>
           <execution>
             <id>validate</id>
-            <phase>validate</phase>
             <goals>
               <goal>check</goal>
             </goals>
+            <phase>validate</phase>
           </execution>
         </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>3.4.0</version>
-        <dependencies>
-          <dependency>
-            <groupId>com.puppycrawl.tools</groupId>
-            <artifactId>checkstyle</artifactId>
-            <version>${checkstyle.version}</version>
-          </dependency>
-        </dependencies>
+        <version>3.6.0</version>
         <configuration>
           <configLocation>${project.basedir}/.build-config/checkstyle.xml</configLocation>
           <suppressionsLocation>${project.basedir}/.build-config/checkstyle-suppressions.xml</suppressionsLocation>
           <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
           <includeTestSourceDirectory>true</includeTestSourceDirectory>
           <consoleOutput>true</consoleOutput>
         </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>com.puppycrawl.tools</groupId>
+            <artifactId>checkstyle</artifactId>
+            <version>${checkstyle.version}</version>
+          </dependency>
+        </dependencies>
         <executions>
           <execution>
             <id>compile-checkstyle</id>

diff --git a/src/main/java/org/jenkinsci/plugins/rolestrategy/permissions/PermissionHelper.java b/src/main/java/org/jenkinsci/plugins/rolestrategy/permissions/PermissionHelper.java
@@ -154,7 +154,7 @@ public static String findPermissionId(String id) {
   }
 
   /**
-   * Attempt to match a given permission to what is defined in the UI or from the ID representation used in the config.xml
+   * Attempt to match a given permission to what is defined in the UI or from the ID representation used in the config.xml.
    *
    * @param id String of the form "Title/Permission" (Look in the UI) for a particular permission or in the form used in the config.xml
    * @return a matched permission, null if permission couldn't be resolved or is dangerous