Skip to content

Commit bb3738f

Browse files
bitwisemanbitwiseman
authored
Merge pull request #1935 from bitwiseman/feature/2.x-release
Begin 2.x release train
2 parents 9e9e775 + b868261 commit bb3738f

File tree

154 files changed

+1209
-8506
lines changed

Some content is hidden

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

154 files changed

+1209
-8506
lines changed

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

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -112,25 +112,6 @@ jobs:
112112
fail_ci_if_error: true
113113
verbose: true
114114

115-
test-java-8:
116-
name: test Java 8 (no-build)
117-
needs: build
118-
runs-on: ubuntu-latest
119-
steps:
120-
- uses: actions/checkout@v4
121-
- uses: actions/download-artifact@v4
122-
with:
123-
name: maven-target-directory
124-
path: target
125-
- name: Set up JDK
126-
uses: actions/setup-java@v4
127-
with:
128-
java-version: 8
129-
distribution: 'temurin'
130-
cache: 'maven'
131-
- name: Maven Test (no build) Java 8
132-
run: mvn -B surefire:test -DfailIfNoTests -Dsurefire.excludesFile=src/test/resources/slow-or-flaky-tests.txt
133-
134115
test-java-11:
135116
name: test Java 11 (no-build)
136117
needs: build
@@ -144,7 +125,7 @@ jobs:
144125
- name: Set up JDK
145126
uses: actions/setup-java@v4
146127
with:
147-
java-version: 8
128+
java-version: 11
148129
distribution: 'temurin'
149130
cache: 'maven'
150131
- name: Maven Test (no build) Java 11

‎pom.xml‎

Lines changed: 17 additions & 133 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>1.326-SNAPSHOT</version>
5+
<version>2.0.0-alpha-1-SNAPSHOT</version>
66
<name>GitHub API for Java</name>
77
<url>https://github-api.kohsuke.org/</url>
88
<description>GitHub API for Java</description>
@@ -63,14 +63,6 @@
6363
<artifactId>maven-scm-manager-plexus</artifactId>
6464
<version>2.1.0</version>
6565
</extension>
66-
<!-- Doing site publishing manually for now -->
67-
<!--
68-
<extension>
69-
<groupId>org.kohsuke</groupId>
70-
<artifactId>wagon-gitsite</artifactId>
71-
<version>0.3.5</version>
72-
</extension>
73-
-->
7466
</extensions>
7567
<testResources>
7668
<testResource>
@@ -117,11 +109,7 @@
117109
<configuration>
118110
<!-- no need to get data about external code. It dramatically reduces performance of JaCoCo for nothing -->
119111
<excludes>
120-
<exclude>/org/kohsuke/github/extras/HttpClient*</exclude>
121112
<exclude>/org/kohsuke/github/example/*</exclude>
122-
<exclude>/org/kohsuke/github/extras/OkHttpConnector*</exclude>
123-
<exclude>/org/kohsuke/github/extras/OkHttp3Connector*</exclude>
124-
<exclude>/org/kohsuke/github/extras/okhttp3/ObsoleteUrlFactory*</exclude>
125113
</excludes>
126114
</configuration>
127115
<executions>
@@ -172,23 +160,14 @@
172160
</limit>
173161
</limits>
174162
<excludes>
175-
<!-- Java 11 multi-release overlay problems -->
176-
<exclude>org.kohsuke.github.extras.HttpClientGitHubConnector.**</exclude>
177-
<exclude>org.kohsuke.github.extras.HttpClientGitHubConnector</exclude>
178-
179-
<!-- Code implemented externally -->
180-
<exclude>org.kohsuke.github.extras.okhttp3.ObsoleteUrlFactory.**</exclude>
181-
<exclude>org.kohsuke.github.extras.okhttp3.ObsoleteUrlFactory</exclude>
163+
<!-- V2.x changes -->
164+
<exclude>org.kohsuke.github.GHRepositorySearchBuilder.Fork</exclude>
182165

183166
<!-- Sample only -->
184167
<exclude>org.kohsuke.github.example.*</exclude>
185168

186-
<!-- Deprecated -->
187-
<exclude>org.kohsuke.github.extras.OkHttpConnector</exclude>
188-
<exclude>org.kohsuke.github.extras.OkHttp3Connector</exclude>
189-
<exclude>org.kohsuke.github.EnforcementLevel</exclude>
190-
<exclude>org.kohsuke.github.GHPerson.1</exclude>
191-
<exclude>org.kohsuke.github.GHCompare.User</exclude>
169+
<!-- Unbridged test changes -->
170+
<exclude>org.kohsuke.github.GHCommit.GHAuthor</exclude>
192171

193172
<!-- TODO: Some coverage, but more needed -->
194173
<exclude>org.kohsuke.github.GHIssue.PullRequest</exclude>
@@ -225,7 +204,7 @@
225204
<artifactId>maven-javadoc-plugin</artifactId>
226205
<version>3.8.0</version>
227206
<configuration>
228-
<release>8</release>
207+
<release>11</release>
229208
<failOnWarnings>true</failOnWarnings>
230209
<doclint>all</doclint>
231210
</configuration>
@@ -298,34 +277,16 @@
298277
<artifactId>maven-compiler-plugin</artifactId>
299278
<version>3.13.0</version>
300279
<configuration>
301-
<source>1.8</source>
302-
<target>1.8</target>
280+
<source>11</source>
281+
<target>11</target>
303282
<annotationProcessorPaths>
304283
<annotationProcessorPath>
305284
<groupId>org.jenkins-ci</groupId>
306285
<artifactId>annotation-indexer</artifactId>
307-
<version>1.12</version>
286+
<version>1.17</version>
308287
</annotationProcessorPath>
309288
</annotationProcessorPaths>
310289
</configuration>
311-
<executions>
312-
<execution>
313-
<id>compile-java-11</id>
314-
<phase>compile</phase>
315-
<goals>
316-
<goal>compile</goal>
317-
</goals>
318-
<configuration>
319-
<release>11</release>
320-
<source>11</source>
321-
<target>11</target>
322-
<compileSourceRoots>
323-
<compileSourceRoot>${project.basedir}/src/main/java11</compileSourceRoot>
324-
</compileSourceRoots>
325-
<multiReleaseOutput>true</multiReleaseOutput>
326-
</configuration>
327-
</execution>
328-
</executions>
329290
</plugin>
330291
<plugin>
331292
<artifactId>maven-surefire-plugin</artifactId>
@@ -349,27 +310,10 @@
349310
<archive>
350311
<manifestEntries>
351312
<Automatic-Module-Name>org.kohsuke.github.api</Automatic-Module-Name>
352-
<Multi-Release>true</Multi-Release>
353313
</manifestEntries>
354314
</archive>
355315
</configuration>
356316
</plugin>
357-
<plugin>
358-
<groupId>org.codehaus.mojo</groupId>
359-
<artifactId>animal-sniffer-maven-plugin</artifactId>
360-
</plugin>
361-
<plugin>
362-
<groupId>com.infradna.tool</groupId>
363-
<artifactId>bridge-method-injector</artifactId>
364-
<version>1.29</version>
365-
<executions>
366-
<execution>
367-
<goals>
368-
<goal>process</goal>
369-
</goals>
370-
</execution>
371-
</executions>
372-
</plugin>
373317
<plugin>
374318
<groupId>com.diffplug.spotless</groupId>
375319
<artifactId>spotless-maven-plugin</artifactId>
@@ -388,7 +332,6 @@
388332
<java>
389333
<includes>
390334
<include>src/main/java/**/*.java</include>
391-
<include>src/main/java11/**/*.java</include>
392335
<include>src/test/java/**/*.java</include>
393336
</includes>
394337

@@ -436,17 +379,16 @@
436379
<plugin>
437380
<groupId>com.github.siom79.japicmp</groupId>
438381
<artifactId>japicmp-maven-plugin</artifactId>
439-
<version>0.17.2</version>
382+
<version>0.21.2</version>
440383
<configuration>
441384
<parameter>
442-
<breakBuildOnBinaryIncompatibleModifications>true</breakBuildOnBinaryIncompatibleModifications>
385+
<!-- <breakBuildOnBinaryIncompatibleModifications>true</breakBuildOnBinaryIncompatibleModifications> -->
386+
<!-- <breakBuildBasedOnSemanticVersioning>true</breakBuildBasedOnSemanticVersioning> -->
443387
<onlyModified>true</onlyModified>
444388
<includeSynthetic>true</includeSynthetic>
445389
<excludes>
446390
<!-- Classes in internal are public but are considered private for API stability purposes -->
447391
<exclude>org.kohsuke.github.internal</exclude>
448-
<!-- TODO: started failing in CI recently. This is part of the multi-release structure. -->
449-
<exclude>org.kohsuke.github.extras.HttpClientGitHubConnector#HttpClientGitHubConnector(java.net.http.HttpClient)</exclude>
450392
</excludes>
451393
</parameter>
452394
</configuration>
@@ -555,37 +497,10 @@
555497
<version>1.29</version>
556498
<optional>true</optional>
557499
</dependency>
558-
<!-- for stapler-jetty -->
559500
<dependency>
560-
<groupId>commons-fileupload</groupId>
561-
<artifactId>commons-fileupload</artifactId>
562-
<version>1.5</version>
563-
<scope>test</scope>
564-
</dependency>
565-
<!-- for stapler-jetty -->
566-
<dependency>
567-
<groupId>commons-discovery</groupId>
568-
<artifactId>commons-discovery</artifactId>
569-
<version>0.5</version>
570-
<scope>test</scope>
571-
</dependency>
572-
<!-- for stapler-jetty -->
573-
<dependency>
574-
<groupId>org.kohsuke.stapler</groupId>
575-
<artifactId>stapler</artifactId>
576-
<version>1.263</version>
577-
<scope>test</scope>
578-
</dependency>
579-
<dependency>
580-
<groupId>org.kohsuke.stapler</groupId>
581-
<artifactId>stapler-jetty</artifactId>
582-
<version>1.1</version>
583-
<scope>test</scope>
584-
</dependency>
585-
<dependency>
586-
<groupId>org.eclipse.jgit</groupId>
587-
<artifactId>org.eclipse.jgit</artifactId>
588-
<version>6.7.0.202309050840-r</version>
501+
<groupId>com.google.guava</groupId>
502+
<artifactId>guava</artifactId>
503+
<version>33.1.0-jre</version>
589504
<scope>test</scope>
590505
</dependency>
591506
<dependency>
@@ -618,20 +533,6 @@
618533
<version>${okhttp3.version}</version>
619534
<optional>true</optional>
620535
</dependency>
621-
<!-- This is the last version of okhttp3 that support UrlConnection -->
622-
<!-- The class using this has been deprecated, this dependency can be remove when that class is. -->
623-
<dependency>
624-
<groupId>com.squareup.okhttp3</groupId>
625-
<artifactId>okhttp-urlconnection</artifactId>
626-
<version>3.12.3</version>
627-
<optional>true</optional>
628-
</dependency>
629-
<dependency>
630-
<groupId>com.squareup.okhttp</groupId>
631-
<artifactId>okhttp-urlconnection</artifactId>
632-
<version>2.7.5</version>
633-
<optional>true</optional>
634-
</dependency>
635536
<dependency>
636537
<groupId>org.kohsuke</groupId>
637538
<artifactId>wordnet-random-name</artifactId>
@@ -684,7 +585,7 @@
684585
<profiles>
685586
<!-- only enable slow-or-flaky-test if -Dtest= is not present -->
686587
<profile>
687-
<id>test-jwt-slow-multireleasejar-flaky</id>
588+
<id>test-jwt-slow-flaky</id>
688589
<activation>
689590
<property>
690591
<name>!test</name>
@@ -708,7 +609,7 @@
708609
</configuration>
709610
</execution>
710611
<execution>
711-
<id>java11-test</id>
612+
<id>httpclient-test</id>
712613
<phase>integration-test</phase>
713614
<goals>
714615
<goal>test</goal>
@@ -724,23 +625,6 @@
724625
</systemPropertyVariables>
725626
</configuration>
726627
</execution>
727-
<execution>
728-
<id>java11-urlconnection-test</id>
729-
<phase>integration-test</phase>
730-
<goals>
731-
<goal>test</goal>
732-
</goals>
733-
<configuration>
734-
<classesDirectory>${project.basedir}/target/${project.artifactId}-${project.version}.jar</classesDirectory>
735-
<useSystemClassLoader>false</useSystemClassLoader>
736-
<excludesFile>src/test/resources/slow-or-flaky-tests.txt</excludesFile>
737-
<argLine>@{jacoco.surefire.argLine} ${surefire.argLine} -Dtest.github.connector=urlconnection</argLine>
738-
<!-- Run some test passes with trace logging turned on -->
739-
<systemPropertyVariables>
740-
<java.util.logging.config.file>src/test/resources/test-trace-logging.properties</java.util.logging.config.file>
741-
</systemPropertyVariables>
742-
</configuration>
743-
</execution>
744628
<execution>
745629
<id>slow-or-flaky-test</id>
746630
<phase>integration-test</phase>

0 commit comments

Comments
 (0)