Merge remote-tracking branch 'upstream/master' into issue/appid-expiration

Author: bitwiseman

pom.xml

@@ -88,7 +88,7 @@
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
             <artifactId>wiremock-jre8-standalone</artifactId>
-            <version>2.25.1</version>
+            <version>2.27.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>

src/main/java/org/jenkinsci/plugins/github_branch_source/JwtHelper.java

@@ -67,7 +67,9 @@ private static PrivateKey getPrivateKeyFromString(final String key) throws Gener
             );
         }
 
-        String privateKeyContent = key.replaceAll("\\n", "")
+        String privateKeyContent = key
+                .replaceAll("\\n", "")
+                .replaceAll("\\r", "")
                 .replace("-----BEGIN PRIVATE KEY-----", "")
                 .replace("-----END PRIVATE KEY-----", "");
 

src/test/java/org/jenkinsci/plugins/github_branch_source/JwtHelperTest.java

@@ -24,8 +24,10 @@ public class JwtHelperTest {
 
     // https://stackoverflow.com/a/22176759/4951015
     public static final String PKCS8_PRIVATE_KEY = "-----BEGIN PRIVATE KEY-----\n" +
-            "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQD7vHsVwyDV8cj7\n" +
-            "5yR4WWl6rlgf/e5zmeBgtm0PCgnitcSbD5FU33301DPY5a7AtqVBOwEnE14L9XS7\n" +
+            // Windows line ending
+            "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQD7vHsVwyDV8cj7\r\n" +
+            // This should also work
+            "5yR4WWl6rlgf/e5zmeBgtm0PCgnitcSbD5FU33301DPY5a7AtqVBOwEnE14L9XS7\r" +
             "ov61U+x1m4aQmqR/dPQaA2ayh2cYPszWNQMp42ArDIfg7DhSrvsRJKHsbPXlPjqe\n" +
             "c0udLqhSLVIO9frNLf+dAsLsgYk8O39PKGb33akGG7tWTe0J+akNQjgbS7vOi8sS\n" +
             "NLwHIdYfz/Am+6Xmm+J4yVs6+Xt3kOeLdFBkz8H/HGsJq854MbIAK/HuId1MOPS0\n" +