Merge branch 'master' into update-forms

janfaracik · Jan 2, 2022 · 8982741 · 8982741
2 parents 8b35b58 + 12ad7a8
commit 8982741
Show file tree

Hide file tree

Showing 275 changed files with 3,836 additions and 3,675 deletions.
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
@@ -2,6 +2,6 @@
   <extension>
     <groupId>io.jenkins.tools.incrementals</groupId>
     <artifactId>git-changelist-maven-extension</artifactId>
-    <version>1.2</version>
+    <version>1.3</version>
   </extension>
 </extensions>
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -37,7 +37,6 @@ THE SOFTWARE.
   <name>Jenkins BOM</name>
   <description>The module contains dependencies that are used by a specific Jenkins version</description>
 
-
   <properties>
     <asm.version>9.2</asm.version>
     <slf4jVersion>1.7.32</slf4jVersion>
@@ -47,7 +46,8 @@ THE SOFTWARE.
 
   <dependencyManagement>
     <dependencies>
-      <dependency> <!-- https://docs.spring.io/spring-security/site/docs/5.4.0-M1/reference/html5/#getting-maven-no-boot -->
+      <dependency>
+        <!-- https://docs.spring.io/spring-security/site/docs/5.5.4/reference/html5/#getting-maven-no-boot -->
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-bom</artifactId>
         <version>5.6.1</version>
@@ -119,21 +119,23 @@ THE SOFTWARE.
         <version>${slf4jVersion}</version>
       </dependency>
       <dependency>
+        <!-- provided by jcl-over-slf4j -->
         <groupId>commons-logging</groupId>
         <artifactId>commons-logging</artifactId>
         <version>1.2</version>
-        <scope>provided</scope><!-- by jcl-over-slf4j -->
+        <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>log4j-over-slf4j</artifactId>
         <version>${slf4jVersion}</version>
       </dependency>
       <dependency>
+        <!-- provided by log4j-over-slf4j -->
         <groupId>log4j</groupId>
         <artifactId>log4j</artifactId>
         <version>1.2.17</version>
-        <scope>provided</scope><!-- by log4j-over-slf4j -->
+        <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.samba.jcifs</groupId>
@@ -226,7 +228,8 @@ THE SOFTWARE.
         <artifactId>windows-package-checker</artifactId>
         <version>1.2</version>
       </dependency>
-      <dependency><!-- JENKINS-21160: remoting also depends on args4j, please update accordingly -->
+      <dependency>
+        <!-- JENKINS-21160: Remoting also depends on args4j; please update accordingly -->
         <groupId>args4j</groupId>
         <artifactId>args4j</artifactId>
         <version>2.33</version>
@@ -340,7 +343,8 @@ THE SOFTWARE.
         <artifactId>groovy-all</artifactId>
         <version>${groovy.version}</version>
       </dependency>
-      <dependency><!-- groovy shell uses this but it doesn't declare this dependency -->
+      <dependency>
+        <!-- Groovy shell uses this, but it doesn't declare the dependency -->
         <groupId>org.fusesource.jansi</groupId>
         <artifactId>jansi</artifactId>
         <version>1.11</version>
@@ -372,7 +376,7 @@ THE SOFTWARE.
         <artifactId>jenkins-stapler-support</artifactId>
         <version>1.1</version>
       </dependency>
-      <dependency><!-- until we get this version through Stapler -->
+      <dependency>
         <groupId>org.kohsuke.stapler</groupId>
         <artifactId>json-lib</artifactId>
         <version>2.4-jenkins-3</version>
@@ -464,10 +468,10 @@ THE SOFTWARE.
         <executions>
           <execution>
             <id>flatten</id>
-            <phase>process-resources</phase>
             <goals>
               <goal>flatten</goal>
             </goals>
+            <phase>process-resources</phase>
             <configuration>
               <flattenMode>bom</flattenMode>
             </configuration>

diff --git a/cli/pom.xml b/cli/pom.xml
@@ -130,10 +130,10 @@
         <version>3.2.4</version>
         <executions>
           <execution>
-            <phase>package</phase>
             <goals>
               <goal>shade</goal>
             </goals>
+            <phase>package</phase>
             <configuration>
               <createDependencyReducedPom>false</createDependencyReducedPom>
               <relocations>
@@ -187,10 +187,10 @@
         <executions>
           <execution>
             <id>add-source</id>
-            <phase>generate-sources</phase>
             <goals>
               <goal>add-source</goal>
             </goals>
+            <phase>generate-sources</phase>
             <configuration>
               <sources>
                 <source>${project.build.directory}/generated-sources/localizer</source>

diff --git a/cli/src/main/java/hudson/cli/CLI.java b/cli/src/main/java/hudson/cli/CLI.java
@@ -115,7 +115,7 @@ public static int _main(String[] _args) throws Exception {
 
         if (url==null)
             url = System.getenv("HUDSON_URL");
-        
+
         boolean noKeyAuth = false;
 
         // TODO perhaps allow mode to be defined by environment variable too (assuming $JENKINS_USER_ID can be used for -user)
@@ -189,9 +189,9 @@ public boolean verify(String s, SSLSession sslSession) {
                 continue;
             }
             if (head.equals("-noKeyAuth")) {
-            	noKeyAuth = true;
-            	args = args.subList(1,args.size());
-            	continue;
+                noKeyAuth = true;
+                args = args.subList(1,args.size());
+                continue;
             }
             if(head.equals("-i") && args.size()>=2) {
                 File f = getFileFromArguments(args);

diff --git a/cli/src/test/java/hudson/cli/PrivateKeyProviderTest.java b/cli/src/test/java/hudson/cli/PrivateKeyProviderTest.java
@@ -50,7 +50,7 @@ public void loadKeyDSAPassword() throws IOException, GeneralSecurityException {
         String password = "password";
         assertKeyPairNotNull(file, password);
     }
-    
+
     /**
     key command: ssh-keygen -f rsa -t rsa -b 1024 -m PEM
     */
@@ -69,7 +69,7 @@ public void loadKeyRSAPassword() throws IOException, GeneralSecurityException {
         String password = "password";
         assertKeyPairNotNull(file, password);
     }
-    
+
     /**
     key command: ssh-keygen -f openssh -t rsa -b 1024
     */
@@ -78,7 +78,7 @@ public void loadKeyOpenSSH() throws IOException, GeneralSecurityException {
         File file = new File(this.getClass().getResource("openssh").getFile());
         assertKeyPairNotNull(file, null);
     }
-    
+
     /**
      key command: ssh-keygen -f openssh-unsupported -t rsa -b 1024 -m PKCS8 -p password
      */
@@ -123,7 +123,7 @@ public void loadBlankKey() throws IOException, GeneralSecurityException {
     /**
     key command: ssh-keygen -f openssh -t rsa -b 1024
     in this key we remove some lines to break the key.
-    */    
+    */
     @Test
     public void loadKeyBroken() throws IOException, GeneralSecurityException {
         File file = new File(this.getClass().getResource("openssh-broken").getFile());

diff --git a/core/pom.xml b/core/pom.xml
@@ -56,7 +56,6 @@ THE SOFTWARE.
     </dependencies>
   </dependencyManagement>
 
-
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -76,7 +75,8 @@ THE SOFTWARE.
       <artifactId>crypto-util</artifactId>
     </dependency>
 
-    <dependency><!-- working around MCOMPILER-97 -->
+    <dependency>
+      <!-- working around MCOMPILER-97 -->
       <groupId>org.jenkins-ci</groupId>
       <artifactId>core-annotation-processors</artifactId>
       <version>1.0</version>
@@ -163,7 +163,8 @@ THE SOFTWARE.
       <groupId>org.kohsuke.stapler</groupId>
       <artifactId>stapler-adjunct-codemirror</artifactId>
     </dependency>
-    <dependency><!-- this helps us see the source code of the control while we edit Jenkins. -->
+    <dependency>
+      <!-- this helps us see the source code of the control while we edit Jenkins -->
       <groupId>org.kohsuke.stapler</groupId>
       <artifactId>stapler-adjunct-timeline</artifactId>
       <version>1.5</version>
@@ -193,7 +194,7 @@ THE SOFTWARE.
       <version>${bridge-method-injector.version}</version>
     </dependency>
 
-    <dependency><!-- until we get this version through Stapler -->
+    <dependency>
       <groupId>org.kohsuke.stapler</groupId>
       <artifactId>json-lib</artifactId>
     </dependency>
@@ -266,7 +267,8 @@ THE SOFTWARE.
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
     </dependency>
-    <dependency><!-- hudson doesn't use this directly, but some plugins wanted to use the latest -->
+    <dependency>
+      <!-- Jenkins doesn't use this directly, but some plugins wanted to use the latest -->
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
     </dependency>
@@ -382,13 +384,15 @@ THE SOFTWARE.
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy-all</artifactId>
     </dependency>
-    <dependency><!-- groovy shell uses this but uses an optional dependency. Not included into BOM -->
+    <dependency>
+      <!-- Groovy shell uses this, but it uses an optional dependency. Not included into BOM. -->
       <groupId>jline</groupId>
       <artifactId>jline</artifactId>
       <version>2.14.6</version>
       <scope>compile</scope>
     </dependency>
-    <dependency><!-- groovy shell uses this but it doesn't declare this dependency -->
+    <dependency>
+      <!-- Groovy shell uses this, but it doesn't declare the dependency -->
       <groupId>org.fusesource.jansi</groupId>
       <artifactId>jansi</artifactId>
     </dependency>
@@ -427,7 +431,8 @@ THE SOFTWARE.
       <version>${mockito.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency><!-- needed by Jelly -->
+    <dependency>
+      <!-- needed by Jelly -->
       <groupId>jakarta.servlet.jsp.jstl</groupId>
       <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
     </dependency>
@@ -483,7 +488,8 @@ THE SOFTWARE.
       <groupId>org.kohsuke.jinterop</groupId>
       <artifactId>j-interop</artifactId>
     </dependency>
-    <dependency> <!-- Not in BOM, optional -->
+    <dependency>
+      <!-- not in BOM, optional -->
       <groupId>org.kohsuke.metainf-services</groupId>
       <artifactId>metainf-services</artifactId>
       <version>1.8</version>
@@ -583,10 +589,10 @@ THE SOFTWARE.
         <executions>
           <execution>
             <id>add-source</id>
-            <phase>generate-sources</phase>
             <goals>
               <goal>add-source</goal>
             </goals>
+            <phase>generate-sources</phase>
             <configuration>
               <sources>
                 <source>${project.build.directory}/generated-sources/antlr</source>
@@ -639,7 +645,8 @@ THE SOFTWARE.
         <artifactId>maven-stapler-plugin</artifactId>
         <!-- version specified in grandparent pom -->
         <configuration>
-          <fork>${staplerFork}</fork><!-- the source code is big enough now that otherwise it fails with OutOfMemoryError -->
+          <!-- the source code is big enough now that otherwise it fails with OutOfMemoryError -->
+          <fork>${staplerFork}</fork>
           <maxmem>128m</maxmem>
         </configuration>
       </plugin>
@@ -704,11 +711,11 @@ THE SOFTWARE.
         <executions>
           <execution>
             <id>winsw</id>
-            <phase>generate-resources</phase>
             <goals>
               <!-- we use copy as this is a dependency from outside the reactor -->
               <goal>copy</goal>
             </goals>
+            <phase>generate-resources</phase>
             <configuration>
               <artifactItems>
                 <artifactItem>
@@ -733,7 +740,8 @@ THE SOFTWARE.
           <reuseForks>false</reuseForks>
         </configuration>
       </plugin>
-      <plugin><!-- set main class -->
+      <plugin>
+        <!-- set main class -->
         <artifactId>maven-jar-plugin</artifactId>
         <!-- version specified in grandparent pom -->
         <configuration>
@@ -751,7 +759,8 @@ THE SOFTWARE.
 
   <reporting>
     <plugins>
-      <plugin><!-- generate Jelly tag lib documentation -->
+      <plugin>
+        <!-- generate Jelly tag lib documentation -->
         <groupId>org.kohsuke.stapler</groupId>
         <artifactId>maven-stapler-plugin</artifactId>
         <!-- Version specified in grandparent POM -->
@@ -761,7 +770,8 @@ THE SOFTWARE.
           </patterns>
         </configuration>
       </plugin>
-      <plugin><!-- skip slow dependency analysis -->
+      <plugin>
+        <!-- skip slow dependency analysis -->
         <artifactId>maven-project-info-reports-plugin</artifactId>
         <!-- Version specified in grandparent POM -->
         <configuration>
@@ -834,7 +844,8 @@ THE SOFTWARE.
           <plugin>
             <groupId>com.github.siom79.japicmp</groupId>
             <artifactId>japicmp-maven-plugin</artifactId>
-            <version>0.14.4-20200728.214757-1</version> <!-- TODO https://github.com/siom79/japicmp/pull/266 -->
+            <!-- TODO https://github.com/siom79/japicmp/pull/266 -->
+            <version>0.14.4-20200728.214757-1</version>
             <configuration>
               <parameter>
                 <!-- see https://siom79.github.io/japicmp/MavenPlugin.html -->
@@ -843,7 +854,8 @@ THE SOFTWARE.
                 <onlyBinaryIncompatible>true</onlyBinaryIncompatible>
               </parameter>
               <oldClassPathDependencies>
-                <dependency> <!-- provided, so not visible in flattened artifact -->
+                <dependency>
+                  <!-- provided, so not visible in flattened artifact -->
                   <groupId>javax.servlet</groupId>
                   <artifactId>javax.servlet-api</artifactId>
                   <version>3.1.0</version>
@@ -853,10 +865,10 @@ THE SOFTWARE.
             </configuration>
             <executions>
               <execution>
-                <phase>verify</phase>
                 <goals>
                   <goal>cmp</goal>
                 </goals>
+                <phase>verify</phase>
               </execution>
             </executions>
           </plugin>