Skip to content

Commit 43efa78

Browse files
bitwisemanbitwiseman
committed
Post-merge fixes
1 parent 9e3de43 commit 43efa78

4 files changed

Lines changed: 11 additions & 33 deletions

File tree

‎pom.xml‎

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<jacoco.coverage.target.class.method>0.25</jacoco.coverage.target.class.method>
4646
<!-- For non-ci builds we'd like the build to still complete if jacoco metrics aren't met. -->
4747
<jacoco.haltOnFailure>false</jacoco.haltOnFailure>
48-
<jjwt.suite.version>0.11.1</jjwt.suite.version>
48+
<jjwt.suite.version>0.11.2</jjwt.suite.version>
4949
</properties>
5050

5151
<build>
@@ -491,20 +491,20 @@
491491
<dependency>
492492
<groupId>io.jsonwebtoken</groupId>
493493
<artifactId>jjwt-api</artifactId>
494-
<version>0.11.2</version>
495-
<scope>test</scope>
494+
<version>${jjwt.suite.version}</version>
495+
<optional>true</optional>
496496
</dependency>
497497
<dependency>
498498
<groupId>io.jsonwebtoken</groupId>
499499
<artifactId>jjwt-impl</artifactId>
500-
<version>0.11.2</version>
501-
<scope>test</scope>
500+
<version>${jjwt.suite.version}</version>
501+
<optional>true</optional>
502502
</dependency>
503503
<dependency>
504504
<groupId>io.jsonwebtoken</groupId>
505505
<artifactId>jjwt-jackson</artifactId>
506-
<version>0.11.2</version>
507-
<scope>test</scope>
506+
<version>${jjwt.suite.version}</version>
507+
<optional>true</optional>
508508
</dependency>
509509
<dependency>
510510
<groupId>com.squareup.okio</groupId>
@@ -562,26 +562,6 @@
562562
<version>2.8.6</version>
563563
<scope>test</scope>
564564
</dependency>
565-
<!-- JWT Dependencies -->
566-
<dependency>
567-
<groupId>io.jsonwebtoken</groupId>
568-
<artifactId>jjwt-api</artifactId>
569-
<version>${jjwt.suite.version}</version>
570-
<scope>provided</scope>
571-
</dependency>
572-
<dependency>
573-
<groupId>io.jsonwebtoken</groupId>
574-
<artifactId>jjwt-impl</artifactId>
575-
<version>${jjwt.suite.version}</version>
576-
<scope>provided</scope>
577-
</dependency>
578-
<dependency>
579-
<groupId>io.jsonwebtoken</groupId>
580-
<artifactId>jjwt-jackson</artifactId>
581-
<version>${jjwt.suite.version}</version>
582-
<scope>provided</scope>
583-
</dependency>
584-
<!-- end JWT Dependencies -->
585565
<dependency>
586566
<groupId>org.slf4j</groupId>
587567
<artifactId>slf4j-simple</artifactId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public interface CredentialProvider {
1515
/**
1616
* Returns the credentials to be used with a given request. As an example, a credential provider for a bearer token
1717
* will return something like:
18-
*
18+
*
1919
* <pre>
2020
* {@code
2121
* &#64;Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public class GitHub {
8787
* header. Please note that only operations in which permissions have been previously configured and accepted during
8888
* the GitHub App will be executed successfully.
8989
* </dl>
90-
*
90+
*
9191
* @param apiUrl
9292
* The URL of GitHub (or GitHub enterprise) API endpoint, such as "https://api.github.com" or
9393
* "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‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ public OrgInstallationCredentialProvider(String organizationName, GitHub gitHub)
2929
/**
3030
* Obtains a new OAuth2 token, using the configured client to request it. The configured client <b>must</b> be able
3131
* to request the token, this usually means that it needs to have JWT authentication
32-
*
32+
*
3333
* @throws IOException
3434
* for any problem obtaining the token
3535
*/
36-
@Preview
36+
@BetaApi
3737
@Override
3838
@Deprecated
3939
public String getEncodedAuthorization() throws IOException {
@@ -44,8 +44,6 @@ public String getEncodedAuthorization() throws IOException {
4444
return String.format("token %s", this.latestToken);
4545
}
4646

47-
@Preview
48-
@Deprecated
4947
private void refreshToken() throws IOException {
5048
GHAppInstallation installationByOrganization = this.gitHub.getApp()
5149
.getInstallationByOrganization(this.organizationName);

0 commit comments

Comments
 (0)