Merge pull request #229 from basil/refresh

Refresh plugin
jenkinsci · Nov 4, 2022 · ef013b1 · ef013b1
2 parents f964570 + 9f360cb
commit ef013b1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 38 deletions.
diff --git a/pom.xml b/pom.xml
@@ -1,11 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.48</version>
+        <version>4.49</version>
         <relativePath />
     </parent>
 
@@ -14,7 +15,7 @@
 
     <packaging>hpi</packaging>
 
-    <url>https://github.com/jenkinsci/config-file-provider-plugin</url>
+    <url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
 
     <scm>
         <connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
@@ -30,7 +31,6 @@
         <revision>3.12.0</revision>
         <changelist>-SNAPSHOT</changelist>
         <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
-        <maven.javadoc.skip>true</maven.javadoc.skip>
         <jenkins.version>2.346.1</jenkins.version>
         <hpi.compatibleSinceVersion>2.15</hpi.compatibleSinceVersion>
     </properties>
@@ -56,17 +56,11 @@
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.303.x</artifactId>
+                <artifactId>bom-2.346.x</artifactId>
                 <version>1500.ve4d05cd32975</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
-            <!-- versions required by enforcer -->
-            <dependency>
-                <groupId>org.jenkins-ci</groupId>
-                <artifactId>symbol-annotation</artifactId>
-                <version>1.23</version>
-            </dependency>  
             </dependencies>
     </dependencyManagement>
 
@@ -84,11 +78,6 @@
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>credentials</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.github.stephenc.findbugs</groupId>
-            <artifactId>findbugs-annotations</artifactId>
-            <version>1.3.9-1</version>
-        </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>plain-credentials</artifactId>
@@ -100,12 +89,6 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>script-security</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.google.errorprone</groupId>
-                    <artifactId>error_prone_annotations</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
@@ -191,7 +174,6 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>subversion</artifactId>
-            <version>2.16.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -209,18 +191,6 @@
             <artifactId>test-harness</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>commons-net</groupId>
-            <artifactId>commons-net</artifactId>
-            <version>3.8.0</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.12.0</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>email-ext</artifactId>

diff --git a/src/findbugs/excludesFilter.xml b/src/findbugs/excludesFilter.xml
diff --git a/src/main/java/org/jenkinsci/lib/configprovider/ConfigProvider.java b/src/main/java/org/jenkinsci/lib/configprovider/ConfigProvider.java
@@ -181,7 +181,7 @@ public boolean configExists(String configId) {
     }
 
     /**
-     * @deprecated Use <tt>GlobalConfigFiles.get().remove(String)</tt> instead.
+     * @deprecated Use @{code GlobalConfigFiles.get().remove(String)} instead.
      */
     @Deprecated
     public void remove(String configId) {
@@ -190,7 +190,7 @@ public void remove(String configId) {
     }
 
     /**
-     * @deprecated Use <tt>GlobalConfigFiles.get().save(Config)</tt> instead.
+     * @deprecated Use {@code GlobalConfigFiles.get().save(Config)} instead.
      */
     @Deprecated
     public void save(Config config) {