Post-merge fixes

pom.xml

@@ -45,7 +45,7 @@
     <jacoco.coverage.target.class.method>0.25</jacoco.coverage.target.class.method>
     <!-- For non-ci builds we'd like the build to still complete if jacoco metrics aren't met. -->
     <jacoco.haltOnFailure>false</jacoco.haltOnFailure>
-    <jjwt.suite.version>0.11.1</jjwt.suite.version>
+    <jjwt.suite.version>0.11.2</jjwt.suite.version>
   </properties>
 
   <build>
@@ -491,20 +491,20 @@
     <dependency>
       <groupId>io.jsonwebtoken</groupId>
       <artifactId>jjwt-api</artifactId>
-      <version>0.11.2</version>
-      <scope>test</scope>
+      <version>${jjwt.suite.version}</version>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>io.jsonwebtoken</groupId>
       <artifactId>jjwt-impl</artifactId>
-      <version>0.11.2</version>
-      <scope>test</scope>
+      <version>${jjwt.suite.version}</version>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>io.jsonwebtoken</groupId>
       <artifactId>jjwt-jackson</artifactId>
-      <version>0.11.2</version>
-      <scope>test</scope>
+      <version>${jjwt.suite.version}</version>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>com.squareup.okio</groupId>
@@ -562,26 +562,6 @@
       <version>2.8.6</version>
       <scope>test</scope>
     </dependency>
-    <!-- JWT Dependencies -->
-    <dependency>
-      <groupId>io.jsonwebtoken</groupId>
-      <artifactId>jjwt-api</artifactId>
-      <version>${jjwt.suite.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.jsonwebtoken</groupId>
-      <artifactId>jjwt-impl</artifactId>
-      <version>${jjwt.suite.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.jsonwebtoken</groupId>
-      <artifactId>jjwt-jackson</artifactId>
-      <version>${jjwt.suite.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <!-- end JWT Dependencies -->
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>

src/main/java/org/kohsuke/github/CredentialProvider.java

@@ -15,7 +15,7 @@ public interface CredentialProvider {
     /**
      * Returns the credentials to be used with a given request. As an example, a credential provider for a bearer token
      * will return something like:
-     * 
+     *
      * <pre>
      * {@code
      *  &#64;Override

src/main/java/org/kohsuke/github/GitHub.java

@@ -87,7 +87,7 @@ public class GitHub {
      * header. Please note that only operations in which permissions have been previously configured and accepted during
      * the GitHub App will be executed successfully.
      * </dl>
-     * 
+     *
      * @param apiUrl
      *            The URL of GitHub (or GitHub enterprise) API endpoint, such as "https://api.github.com" or
      *            "http://ghe.acme.com/api/v3". Note that GitHub Enterprise has <code>/api/v3</code> in the URL. For

src/main/java/org/kohsuke/github/extras/auth/OrgInstallationCredentialProvider.java

@@ -29,11 +29,11 @@ public class OrgInstallationCredentialProvider implements CredentialProvider {
     /**
      * Obtains a new OAuth2 token, using the configured client to request it. The configured client <b>must</b> be able
      * to request the token, this usually means that it needs to have JWT authentication
-     * 
+     *
      * @throws IOException
      *             for any problem obtaining the token
      */
-    @Preview
+    @BetaApi
     @Override
     @Deprecated
     public String getEncodedAuthorization() throws IOException {
@@ -44,8 +44,6 @@ public class OrgInstallationCredentialProvider implements CredentialProvider {
         return String.format("token %s", this.latestToken);
     }
 
-    @Preview
-    @Deprecated
     private void refreshToken() throws IOException {
         GHAppInstallation installationByOrganization = this.gitHub.getApp()
                 .getInstallationByOrganization(this.organizationName);