Skip to content

Commit 816c83c

Browse files
bitwisemanbitwiseman
authored
Merge branch 'master' into feature/delete_branch_automatically
2 parents d34881a + 0c3c490 commit 816c83c

480 files changed

Lines changed: 42017 additions & 2292 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/maven-build.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,5 +64,9 @@ jobs:
6464
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
6565
restore-keys: |
6666
${{ runner.os }}-maven-
67-
- name: Maven Install
67+
- name: Maven Install without Code Coverage
68+
if: matrix.os == 'windows'
6869
run: mvn -B install --file pom.xml
70+
- name: Maven Install with Code Coverage
71+
if: matrix.os != 'windows'
72+
run: mvn -B install -D enable-ci --file pom.xml

‎pom.xml‎

Lines changed: 4 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434
<properties>
3535
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3636
<spotbugs-maven-plugin.version>3.1.12.2</spotbugs-maven-plugin.version>
37-
<spotbugs.version>3.1.12</spotbugs.version>
37+
<spotbugs.version>4.0.0</spotbugs.version>
3838
<spotbugs-maven-plugin.failOnError>true</spotbugs-maven-plugin.failOnError>
3939
<hamcrest.version>2.2</hamcrest.version>
40-
<okhttp3.version>4.3.1</okhttp3.version>
40+
<okhttp3.version>4.4.0</okhttp3.version>
4141
<okio.version>2.4.3</okio.version>
4242
<formatter-maven-plugin.goal>format</formatter-maven-plugin.goal>
4343
<impsort-maven-plugin.goal>sort</impsort-maven-plugin.goal>
@@ -79,54 +79,6 @@
7979
</testResources>
8080
<pluginManagement>
8181
<plugins>
82-
<plugin>
83-
<groupId>org.apache.maven.plugins</groupId>
84-
<artifactId>maven-shade-plugin</artifactId>
85-
<version>3.2.2</version>
86-
<executions>
87-
<execution>
88-
<id>shaded-jar</id>
89-
<phase>package</phase>
90-
<goals>
91-
<goal>shade</goal>
92-
</goals>
93-
<configuration>
94-
<relocations>
95-
<relocation>
96-
<pattern>com.fasterxml.jackson</pattern>
97-
<shadedPattern>hidden.com.fasterxml.jackson</shadedPattern>
98-
</relocation>
99-
<relocation>
100-
<pattern>org.apache</pattern>
101-
<shadedPattern>hidden.org.apache</shadedPattern>
102-
</relocation>
103-
</relocations>
104-
<artifactSet>
105-
<excludes>
106-
<exclude>com.infradna.tool:bridge-method-annotation</exclude>
107-
<exclude>org.jenkins-ci:annotation-indexer</exclude>
108-
<exclude>com.squareup.*:*</exclude>
109-
<exclude>org.jetbrains*:*</exclude>
110-
<exclude>com.github.spotbugs:*</exclude>
111-
<exclude>com.google.code.findbugs:*</exclude>
112-
</excludes>
113-
</artifactSet>
114-
<shadedArtifactAttached>true</shadedArtifactAttached>
115-
<filters>
116-
<filter>
117-
<artifact>*:*</artifact>
118-
<excludes>
119-
<exclude>module-info.class</exclude>
120-
<exclude>META-INF/*.SF</exclude>
121-
<exclude>META-INF/*.DSA</exclude>
122-
<exclude>META-INF/*.RSA</exclude>
123-
</excludes>
124-
</filter>
125-
</filters>
126-
</configuration>
127-
</execution>
128-
</executions>
129-
</plugin>
13082
<plugin>
13183
<groupId>org.apache.maven.plugins</groupId>
13284
<artifactId>maven-source-plugin</artifactId>
@@ -209,15 +161,12 @@
209161
<exclude>org.kohsuke.github.GHRelease</exclude>
210162

211163
<!-- TODO: These still need test coverage -->
212-
<exclude>org.kohsuke.github.GitHub.GHApiInfo</exclude>
164+
<exclude>org.kohsuke.github.GitHubClient.GHApiInfo</exclude>
213165
<exclude>org.kohsuke.github.GHBranchProtection.RequiredSignatures</exclude>
214166
<exclude>org.kohsuke.github.GHBranchProtectionBuilder.Restrictions</exclude>
215167
<exclude>org.kohsuke.github.GHBranchProtection.Restrictions</exclude>
216168
<exclude>org.kohsuke.github.GHCommentAuthorAssociation</exclude>
217169
<exclude>org.kohsuke.github.GHCommitBuilder.UserInfo</exclude>
218-
<exclude>org.kohsuke.github.GHCommitSearchBuilder.CommitSearchResult</exclude>
219-
<exclude>org.kohsuke.github.GHCommitSearchBuilder.Sort</exclude>
220-
<exclude>org.kohsuke.github.GHCommitSearchBuilder</exclude>
221170
<exclude>org.kohsuke.github.GHCommitState</exclude>
222171
<exclude>org.kohsuke.github.GHCompare.Commit</exclude>
223172
<exclude>org.kohsuke.github.GHCompare.InnerCommit</exclude>
@@ -235,9 +184,6 @@
235184
<exclude>org.kohsuke.github.GHHook</exclude>
236185
<exclude>org.kohsuke.github.GHHooks.OrgContext</exclude>
237186
<exclude>org.kohsuke.github.GHInvitation</exclude>
238-
<exclude>org.kohsuke.github.GHIssueSearchBuilder.IssueSearchResult</exclude>
239-
<exclude>org.kohsuke.github.GHIssueSearchBuilder.Sort</exclude>
240-
<exclude>org.kohsuke.github.GHIssueSearchBuilder</exclude>
241187
<exclude>org.kohsuke.github.GHMilestoneState</exclude>
242188
<exclude>org.kohsuke.github.GHOrgHook</exclude>
243189
<exclude>org.kohsuke.github.GHProject.ProjectStateFilter</exclude>
@@ -511,7 +457,7 @@
511457
<dependency>
512458
<groupId>org.eclipse.jgit</groupId>
513459
<artifactId>org.eclipse.jgit</artifactId>
514-
<version>5.6.0.201912101111-r</version>
460+
<version>5.6.1.202002131546-r</version>
515461
<scope>test</scope>
516462
</dependency>
517463
<dependency>
@@ -611,10 +557,6 @@
611557
</properties>
612558
<build>
613559
<plugins>
614-
<plugin>
615-
<groupId>org.apache.maven.plugins</groupId>
616-
<artifactId>maven-shade-plugin</artifactId>
617-
</plugin>
618560
<plugin>
619561
<groupId>org.jacoco</groupId>
620562
<artifactId>jacoco-maven-plugin</artifactId>
@@ -630,10 +572,6 @@
630572
</properties>
631573
<build>
632574
<plugins>
633-
<plugin>
634-
<groupId>org.apache.maven.plugins</groupId>
635-
<artifactId>maven-shade-plugin</artifactId>
636-
</plugin>
637575
<plugin>
638576
<groupId>org.apache.maven.plugins</groupId>
639577
<artifactId>maven-gpg-plugin</artifactId>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
/**
88
* Pluggable strategy to determine what to do when the API abuse limit is hit.
99
*
10-
* @author Kohsuke Kawaguchi
1110
* @see GitHubBuilder#withAbuseLimitHandler(AbuseLimitHandler) GitHubBuilder#withAbuseLimitHandler(AbuseLimitHandler)
1211
* @see <a href="https://developer.github.com/v3/#abuse-rate-limits">documentation</a>
1312
* @see RateLimitHandler
@@ -32,7 +31,6 @@ public abstract class AbuseLimitHandler {
3231
* @see <a href=
3332
* "https://developer.github.com/v3/guides/best-practices-for-integrators/#dealing-with-abuse-rate-limits">Dealing
3433
* with abuse rate limits</a>
35-
*
3634
*/
3735
public abstract void onError(IOException e, HttpURLConnection uc) throws IOException;
3836

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@
2626
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
2727

2828
/**
29-
* @author Kohsuke Kawaguchi
30-
*/
29+
*/
3130
@SuppressFBWarnings(value = "UUF_UNUSED_PUBLIC_OR_PROTECTED_FIELD",
3231
justification = "Being constructed by JSON deserialization")
3332
class DeleteToken {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
/**
66
* This was added during preview API period but it has changed since then.
7-
*
8-
* @author Kohsuke Kawaguchi
97
*/
108
@Deprecated
119
public enum EnforcementLevel {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
/**
1111
* A Github App.
1212
*
13-
* @author Paulo Miguel Almeida
1413
* @see GitHub#getApp() GitHub#getApp()
1514
*/
1615
public class GHApp extends GHObject {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
/**
1111
* Creates a access token for a GitHub App Installation
1212
*
13-
* @author Paulo Miguel Almeida
1413
* @see GHAppInstallation#createToken(Map) GHAppInstallation#createToken(Map)
1514
* @see GHAppInstallation#createToken() GHAppInstallation#createToken()
1615
*/
@@ -63,7 +62,7 @@ public GHAppCreateTokenBuilder repositoryIds(List<Long> repositoryIds) {
6362
public GHAppCreateTokenBuilder permissions(Map<String, GHPermissionType> permissions) {
6463
Map<String, String> retMap = new HashMap<>();
6564
for (Map.Entry<String, GHPermissionType> entry : permissions.entrySet()) {
66-
retMap.put(entry.getKey(), Requester.transformEnum(entry.getValue()));
65+
retMap.put(entry.getKey(), GitHubRequest.transformEnum(entry.getValue()));
6766
}
6867
builder.with("permissions", retMap);
6968
return this;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
/**
1313
* A Github App Installation.
1414
*
15-
* @author Paulo Miguel Almeida
1615
* @see GHApp#listInstallations() GHApp#listInstallations()
1716
* @see GHApp#getInstallationById(long) GHApp#getInstallationById(long)
1817
* @see GHApp#getInstallationByOrganization(String) GHApp#getInstallationByOrganization(String)

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
/**
1212
* A Github App Installation Token.
1313
*
14-
* @author Paulo Miguel Almeida
1514
* @see GHAppInstallation#createToken(Map) GHAppInstallation#createToken(Map)
1615
*/
1716
public class GHAppInstallationToken {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
/**
1010
* Generated OAuth token
1111
*
12-
* @author janinko
1312
* @see GitHub#createToken(Collection, String, String) GitHub#createToken(Collection, String, String)
1413
* @see <a href="http://developer.github.com/v3/oauth/#create-a-new-authorization">API documentation</a>
1514
*/

0 commit comments

Comments
 (0)