Skip to content

Commit f26f9bc

Browse files
committed
Merge tag 'github-api-2.0.0-alpha-2' into release/v2.x
github-api-2.0.0-alpha-2
2 parents 0d3de03 + f4a0d34 commit f26f9bc

File tree

179 files changed

+1885
-42
lines changed

Some content is hidden

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

179 files changed

+1885
-42
lines changed

.github/workflows/maven-build.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ jobs:
5757
- name: Maven Site
5858
env:
5959
MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }}
60-
run: mvn -B clean site -D enable-ci --file pom.xml
60+
# running install site seems to more closely imitate real site deployment,
61+
# more likely to prevent failed deployment
62+
run: mvn -B clean install site -DskipTests --file pom.xml
6163
test:
6264
name: test (${{ matrix.os }}, Java ${{ matrix.java }})
6365
# Does not require build output, but orders execution to prevent launching test workflows when simple build fails

.github/workflows/publish_release_branch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
publish_gh_pages:
6060
runs-on: ubuntu-latest
6161
needs: build
62-
if: ${{ github.ref == 'refs/heads/release/v1.x' }}
62+
if: ${{ github.ref == 'refs/heads/release/v2.x' }}
6363
steps:
6464
- uses: actions/checkout@v4
6565
with:

pom.xml

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>org.kohsuke</groupId>
44
<artifactId>github-api</artifactId>
5-
<version>2.0.0-alpha-1</version>
5+
<version>2.0.0-alpha-2</version>
66
<name>GitHub API for Java</name>
77
<url>https://github-api.kohsuke.org/</url>
88
<description>GitHub API for Java</description>
@@ -34,7 +34,7 @@
3434
<properties>
3535
<spring.boot.version>3.3.3</spring.boot.version>
3636
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
37-
<spotbugs-maven-plugin.version>4.8.6.1</spotbugs-maven-plugin.version>
37+
<spotbugs-maven-plugin.version>4.8.6.3</spotbugs-maven-plugin.version>
3838
<spotbugs.version>4.8.6</spotbugs.version>
3939
<spotbugs-maven-plugin.failOnError>true</spotbugs-maven-plugin.failOnError>
4040
<hamcrest.version>3.0</hamcrest.version>
@@ -86,7 +86,7 @@
8686
</plugin>
8787
<plugin>
8888
<artifactId>maven-surefire-plugin</artifactId>
89-
<version>3.2.3</version>
89+
<version>3.5.0</version>
9090
<configuration>
9191
<!-- SUREFIRE-1226 workaround -->
9292
<trimStackTrace>false</trimStackTrace>
@@ -100,7 +100,7 @@
100100
<plugin>
101101
<groupId>org.apache.maven.plugins</groupId>
102102
<artifactId>maven-gpg-plugin</artifactId>
103-
<version>3.2.4</version>
103+
<version>3.2.6</version>
104104
</plugin>
105105
<plugin>
106106
<groupId>org.jacoco</groupId>
@@ -202,8 +202,9 @@
202202
<plugin>
203203
<groupId>org.apache.maven.plugins</groupId>
204204
<artifactId>maven-javadoc-plugin</artifactId>
205-
<version>3.8.0</version>
205+
<version>3.10.0</version>
206206
<configuration>
207+
<source>11</source>
207208
<release>11</release>
208209
<failOnWarnings>true</failOnWarnings>
209210
<doclint>all</doclint>
@@ -269,7 +270,7 @@
269270
<dependency>
270271
<groupId>org.apache.bcel</groupId>
271272
<artifactId>bcel</artifactId>
272-
<version>6.9.0</version>
273+
<version>6.10.0</version>
273274
</dependency>
274275
</dependencies>
275276
</plugin>
@@ -279,6 +280,7 @@
279280
<configuration>
280281
<source>11</source>
281282
<target>11</target>
283+
<release>11</release>
282284
<annotationProcessorPaths>
283285
<annotationProcessorPath>
284286
<groupId>org.jenkins-ci</groupId>
@@ -379,10 +381,18 @@
379381
<plugin>
380382
<groupId>com.github.siom79.japicmp</groupId>
381383
<artifactId>japicmp-maven-plugin</artifactId>
382-
<version>0.21.2</version>
384+
<version>0.23.0</version>
383385
<configuration>
386+
<oldVersion>
387+
<dependency>
388+
<groupId>${project.groupId}</groupId>
389+
<artifactId>${project.artifactId}</artifactId>
390+
<version>2.0.0-alpha-1</version>
391+
<type>jar</type>
392+
</dependency>
393+
</oldVersion>
384394
<parameter>
385-
<!-- <breakBuildOnBinaryIncompatibleModifications>true</breakBuildOnBinaryIncompatibleModifications> -->
395+
<breakBuildOnBinaryIncompatibleModifications>true</breakBuildOnBinaryIncompatibleModifications> -->
386396
<!-- <breakBuildBasedOnSemanticVersioning>true</breakBuildBasedOnSemanticVersioning> -->
387397
<onlyModified>true</onlyModified>
388398
<includeSynthetic>true</includeSynthetic>
@@ -420,7 +430,7 @@
420430
<dependency>
421431
<groupId>org.apache.commons</groupId>
422432
<artifactId>commons-lang3</artifactId>
423-
<version>3.14.0</version>
433+
<version>3.17.0</version>
424434
</dependency>
425435
<dependency>
426436
<groupId>com.tngtech.archunit</groupId>

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

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import javax.annotation.CheckForNull;
88
import javax.annotation.Nonnull;
99

10-
// TODO: Auto-generated Javadoc
1110
/**
1211
* An abstract data object builder/updater.
1312
*
@@ -42,7 +41,7 @@
4241
* Intermediate return type for this builder returned by calls to {@link #with(String, Object)}. If {@link S}
4342
* the same as {@link R}, this builder will commit changes after each call to {@link #with(String, Object)}.
4443
*/
45-
abstract class AbstractBuilder<R, S> extends GitHubInteractiveObject {
44+
abstract class AbstractBuilder<R, S> extends GitHubInteractiveObject implements GitHubRequestBuilderDone<R> {
4645

4746
@Nonnull
4847
private final Class<R> returnType;
@@ -58,9 +57,9 @@ abstract class AbstractBuilder<R, S> extends GitHubInteractiveObject {
5857

5958
// TODO: Not sure how update-in-place behavior should be controlled
6059
// However, it certainly can be controlled dynamically down to the instance level or inherited for all children of
61-
// some
60+
// some connection.
61+
6262
/** The update in place. */
63-
// connection.
6463
protected boolean updateInPlace;
6564

6665
/**
@@ -96,14 +95,9 @@ protected AbstractBuilder(@Nonnull Class<R> finalReturnType,
9695
}
9796

9897
/**
99-
* Finishes an update, committing changes.
100-
*
101-
* This method may update-in-place or not. Either way it returns the resulting instance.
102-
*
103-
* @return an instance with updated current data
104-
* @throws IOException
105-
* if there is an I/O Exception
98+
* {@inheritDoc}
10699
*/
100+
@Override
107101
@Nonnull
108102
@BetaApi
109103
public R done() throws IOException {

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@
2020
*/
2121
public class GHApp extends GHObject {
2222

23+
/**
24+
* Create default GHApp instance
25+
*/
26+
public GHApp() {
27+
}
28+
2329
private GHUser owner;
2430
private String name;
2531
private String slug;

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88
*/
99
public class GHAppFromManifest extends GHApp {
1010

11+
/**
12+
* Create default GHAppFromManifest instance
13+
*/
14+
public GHAppFromManifest() {
15+
}
16+
1117
private String clientId;
1218
private String clientSecret;
1319
private String webhookSecret;

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,13 @@
2424
* @see GHApp#getInstallationByUser(String) GHApp#getInstallationByUser(String)
2525
*/
2626
public class GHAppInstallation extends GHObject {
27+
28+
/**
29+
* Create default GHAppInstallation instance
30+
*/
31+
public GHAppInstallation() {
32+
}
33+
2734
private GHUser account;
2835

2936
@JsonProperty("access_tokens_url")

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,13 @@
1111
* @see GHAppInstallation#createToken() GHAppInstallation#createToken()
1212
*/
1313
public class GHAppInstallationToken extends GitHubInteractiveObject {
14+
15+
/**
16+
* Create default GHAppInstallationToken instance
17+
*/
18+
public GHAppInstallationToken() {
19+
}
20+
1421
private String token;
1522

1623
/** The expires at. */

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@
2020
*/
2121
public class GHArtifact extends GHObject {
2222

23+
/**
24+
* Create default GHArtifact instance
25+
*/
26+
public GHArtifact() {
27+
}
28+
2329
// Not provided by the API.
2430
@JsonIgnore
2531
private GHRepository owner;

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@
1212
*/
1313
public class GHAsset extends GHObject {
1414

15+
/**
16+
* Create default GHAsset instance
17+
*/
18+
public GHAsset() {
19+
}
20+
1521
/** The owner. */
1622
GHRepository owner;
1723
private String name;

0 commit comments

Comments
 (0)