From 3b736c89293d2fc966dd75d08026dd4f140e2690 Mon Sep 17 00:00:00 2001 From: Liam Newman Date: Sun, 15 Sep 2024 02:02:20 -0700 Subject: [PATCH 01/14] Add space --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 29c700b1bd..f33ef66962 100644 --- a/pom.xml +++ b/pom.xml @@ -5,6 +5,7 @@ 2.0.0-alpha-1 GitHub API for Java https://github-api.kohsuke.org/ + GitHub API for Java From cb5a0871ce1148f276e135599bb7534c7f37d99f Mon Sep 17 00:00:00 2001 From: Liam Newman Date: Sun, 15 Sep 2024 02:02:30 -0700 Subject: [PATCH 02/14] Revert "Add space" This reverts commit 3b736c89293d2fc966dd75d08026dd4f140e2690. --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index f33ef66962..29c700b1bd 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,6 @@ 2.0.0-alpha-1 GitHub API for Java https://github-api.kohsuke.org/ - GitHub API for Java From fb4bc8f323b2f2083d204042627ba5ca01e0aeb4 Mon Sep 17 00:00:00 2001 From: Liam Newman Date: Sun, 15 Sep 2024 02:23:33 -0700 Subject: [PATCH 03/14] Move AOT tests --- pom.xml | 2 +- .../java/org/kohsuke/{aot => github}/AotIntegrationTest.java | 5 +++-- .../java/org/kohsuke/{aot => github}/AotTestApplication.java | 4 ++-- .../org/kohsuke/{aot => github}/AotTestRuntimeHints.java | 2 +- src/test/resources/META-INF/spring/aot.factories | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) rename src/test/java/org/kohsuke/{aot => github}/AotIntegrationTest.java (96%) rename src/test/java/org/kohsuke/{aot => github}/AotTestApplication.java (90%) rename src/test/java/org/kohsuke/{aot => github}/AotTestRuntimeHints.java (99%) diff --git a/pom.xml b/pom.xml index 29c700b1bd..1ecc24b881 100644 --- a/pom.xml +++ b/pom.xml @@ -226,7 +226,7 @@ org.springframework.boot diff --git a/src/test/java/org/kohsuke/aot/AotIntegrationTest.java b/src/test/java/org/kohsuke/github/AotIntegrationTest.java similarity index 96% rename from src/test/java/org/kohsuke/aot/AotIntegrationTest.java rename to src/test/java/org/kohsuke/github/AotIntegrationTest.java index 574661906f..403dbeb990 100644 --- a/src/test/java/org/kohsuke/aot/AotIntegrationTest.java +++ b/src/test/java/org/kohsuke/github/AotIntegrationTest.java @@ -1,4 +1,4 @@ -package org.kohsuke.aot; +package org.kohsuke.github; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -77,6 +77,7 @@ private Stream readAotConfigToStreamOfClassNames(String reflectionConfig .map(jsonNode -> jsonNode.get("name")) .map(JsonNode::toString) .map(reflectConfigEntryClassName -> reflectConfigEntryClassName.replace("\"", "")) - .filter(x -> x.contains("org.kohsuke.github")); + .filter(x -> x.contains("org.kohsuke.github")) + .filter(x -> !x.contains("org.kohsuke.github.AotTest")); } } diff --git a/src/test/java/org/kohsuke/aot/AotTestApplication.java b/src/test/java/org/kohsuke/github/AotTestApplication.java similarity index 90% rename from src/test/java/org/kohsuke/aot/AotTestApplication.java rename to src/test/java/org/kohsuke/github/AotTestApplication.java index 0e3081d937..bc4231fabe 100644 --- a/src/test/java/org/kohsuke/aot/AotTestApplication.java +++ b/src/test/java/org/kohsuke/github/AotTestApplication.java @@ -1,4 +1,4 @@ -package org.kohsuke.aot; +package org.kohsuke.github; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; @@ -8,7 +8,7 @@ * required for test purpose. */ @SpringBootApplication -public class AotTestApplication { +class AotTestApplication { /** * Runs a spring boot application to generate AOT hints diff --git a/src/test/java/org/kohsuke/aot/AotTestRuntimeHints.java b/src/test/java/org/kohsuke/github/AotTestRuntimeHints.java similarity index 99% rename from src/test/java/org/kohsuke/aot/AotTestRuntimeHints.java rename to src/test/java/org/kohsuke/github/AotTestRuntimeHints.java index 0dbad0591c..5f321bc028 100644 --- a/src/test/java/org/kohsuke/aot/AotTestRuntimeHints.java +++ b/src/test/java/org/kohsuke/github/AotTestRuntimeHints.java @@ -1,4 +1,4 @@ -package org.kohsuke.aot; +package org.kohsuke.github; import org.jetbrains.annotations.NotNull; import org.springframework.aot.hint.MemberCategory; diff --git a/src/test/resources/META-INF/spring/aot.factories b/src/test/resources/META-INF/spring/aot.factories index f81c736a2b..bd66387017 100644 --- a/src/test/resources/META-INF/spring/aot.factories +++ b/src/test/resources/META-INF/spring/aot.factories @@ -1 +1 @@ -org.springframework.aot.hint.RuntimeHintsRegistrar=org.kohsuke.aot.AotTestRuntimeHints \ No newline at end of file +org.springframework.aot.hint.RuntimeHintsRegistrar=org.kohsuke.github.AotTestRuntimeHints \ No newline at end of file From 0d3de03cc59d1fc96928b750b3f0d17e844c38c3 Mon Sep 17 00:00:00 2001 From: Liam Newman Date: Sun, 15 Sep 2024 02:55:15 -0700 Subject: [PATCH 04/14] Publish without site for alpha --- .github/workflows/publish_release_branch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_release_branch.yml b/.github/workflows/publish_release_branch.yml index 897878363e..01b3f3564a 100644 --- a/.github/workflows/publish_release_branch.yml +++ b/.github/workflows/publish_release_branch.yml @@ -23,7 +23,7 @@ jobs: - name: Maven Install and Site with Code Coverage env: MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }} - run: mvn -B clean install site -D enable-ci --file pom.xml "-Dsurefire.argLine=--add-opens java.base/java.net=ALL-UNNAMED" + run: mvn -B clean install -D enable-ci --file pom.xml "-Dsurefire.argLine=--add-opens java.base/java.net=ALL-UNNAMED" - uses: actions/upload-artifact@v4 with: From 9fae1812e38913c6830b183b1d73687e2f71a8fd Mon Sep 17 00:00:00 2001 From: Liam Newman Date: Tue, 17 Sep 2024 14:21:43 -0700 Subject: [PATCH 05/14] Re-enable gh-pages site publishing on 2.x --- .github/workflows/publish_release_branch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_release_branch.yml b/.github/workflows/publish_release_branch.yml index 81d943ec30..6e3041a436 100644 --- a/.github/workflows/publish_release_branch.yml +++ b/.github/workflows/publish_release_branch.yml @@ -23,7 +23,7 @@ jobs: - name: Maven Install and Site with Code Coverage env: MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }} - run: mvn -B clean install -D enable-ci --file pom.xml "-Dsurefire.argLine=--add-opens java.base/java.net=ALL-UNNAMED" + run: mvn -B clean install site -D enable-ci --file pom.xml "-Dsurefire.argLine=--add-opens java.base/java.net=ALL-UNNAMED" - uses: actions/upload-artifact@v4 with: From 981a9b3cec92d51aaa2bd54ce1458d2476220629 Mon Sep 17 00:00:00 2001 From: bitwiseman <1958953+bitwiseman@users.noreply.github.com> Date: Fri, 21 Mar 2025 03:04:34 +0000 Subject: [PATCH 06/14] Prepare release (bitwiseman): github-api-2.0-rc.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6297cde6da..147b66f2e8 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.kohsuke github-api - 2.0-rc.1-SNAPSHOT + 2.0-rc.1 GitHub API for Java GitHub API for Java https://hub4j.github.io/github-api/ From e277c5a3a45ff5664ad15ae9d3762f91058333fc Mon Sep 17 00:00:00 2001 From: Liam Newman Date: Thu, 20 Mar 2025 20:32:14 -0700 Subject: [PATCH 07/14] Update sonatype url --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 147b66f2e8..b87e2118a0 100644 --- a/pom.xml +++ b/pom.xml @@ -443,7 +443,7 @@ true sonatype-nexus-staging - https://oss.sonatype.org/ + https://s01.oss.sonatype.org/ true From 508975345f14852fddbec469cb5f3250dad4695d Mon Sep 17 00:00:00 2001 From: Liam Newman Date: Fri, 21 Mar 2025 08:23:32 -0700 Subject: [PATCH 08/14] Revert "Update sonatype url" This reverts commit e277c5a3a45ff5664ad15ae9d3762f91058333fc. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b87e2118a0..147b66f2e8 100644 --- a/pom.xml +++ b/pom.xml @@ -443,7 +443,7 @@ true sonatype-nexus-staging - https://s01.oss.sonatype.org/ + https://oss.sonatype.org/ true From 6cdba16c0838028ec98749706214d9a242838cb6 Mon Sep 17 00:00:00 2001 From: Liam Newman Date: Thu, 20 Mar 2025 20:32:14 -0700 Subject: [PATCH 09/14] Update sonatype url --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 147b66f2e8..b87e2118a0 100644 --- a/pom.xml +++ b/pom.xml @@ -443,7 +443,7 @@ true sonatype-nexus-staging - https://oss.sonatype.org/ + https://s01.oss.sonatype.org/ true From acac7e82538c02904f0f204f268319a5ed645129 Mon Sep 17 00:00:00 2001 From: Liam Newman Date: Fri, 21 Mar 2025 10:22:09 -0700 Subject: [PATCH 10/14] Revert "Update sonatype url" This reverts commit 6cdba16c0838028ec98749706214d9a242838cb6. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b87e2118a0..147b66f2e8 100644 --- a/pom.xml +++ b/pom.xml @@ -443,7 +443,7 @@ true sonatype-nexus-staging - https://s01.oss.sonatype.org/ + https://oss.sonatype.org/ true From 3d7f7b10f058207ebf343203bb870226ed14d747 Mon Sep 17 00:00:00 2001 From: Liam Newman Date: Thu, 20 Mar 2025 20:32:14 -0700 Subject: [PATCH 11/14] Update sonatype url --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 147b66f2e8..b87e2118a0 100644 --- a/pom.xml +++ b/pom.xml @@ -443,7 +443,7 @@ true sonatype-nexus-staging - https://oss.sonatype.org/ + https://s01.oss.sonatype.org/ true From b6c41211e85207a1411894285afb8db3e684ae7f Mon Sep 17 00:00:00 2001 From: Liam Newman Date: Fri, 21 Mar 2025 11:39:59 -0700 Subject: [PATCH 12/14] Move back to old nexus server --- pom.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index b87e2118a0..cddbe2dfd7 100644 --- a/pom.xml +++ b/pom.xml @@ -48,12 +48,12 @@ sonatype-nexus-staging Nexus Release Repository - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + ${nexus.serverUrl}/service/local/staging/deploy/maven2/ sonatype-nexus-snapshots Sonatype Nexus Snapshots - https://s01.oss.sonatype.org/content/repositories/snapshots/ + ${nexus.serverUrl}/content/repositories/snapshots/ github-pages @@ -71,6 +71,8 @@ 0.12.6 + + https://oss.sonatype.org 4.12.0 3.10.2 UTF-8 @@ -443,7 +445,7 @@ true sonatype-nexus-staging - https://s01.oss.sonatype.org/ + ${nexus.serverUrl}/ true From 1b192953abbea71472b82ed4f86a841d5d388d27 Mon Sep 17 00:00:00 2001 From: bitwiseman <1958953+bitwiseman@users.noreply.github.com> Date: Sat, 12 Apr 2025 06:34:34 +0000 Subject: [PATCH 13/14] Prepare release (bitwiseman): github-api-2.0-rc.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index db5cdef806..55f32e1f02 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.kohsuke ${github-api.artifactId} - 2.0-rc.2-SNAPSHOT + 2.0-rc.2 GitHub API for Java GitHub API for Java https://hub4j.github.io/github-api/ From cbeec1bfc7c3ddf177406e35301afe11cdf22c0b Mon Sep 17 00:00:00 2001 From: Liam Newman Date: Sat, 12 Apr 2025 10:49:33 -0700 Subject: [PATCH 14/14] Disable japicmp during publish --- .github/workflows/publish_release_branch.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish_release_branch.yml b/.github/workflows/publish_release_branch.yml index 72e5c21a0f..28134e332e 100644 --- a/.github/workflows/publish_release_branch.yml +++ b/.github/workflows/publish_release_branch.yml @@ -23,7 +23,7 @@ jobs: - name: Maven Install and Site with Code Coverage env: MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }} - run: mvn -B clean install site -D enable-ci --file pom.xml "-Dsurefire.argLine=--add-opens java.base/java.net=ALL-UNNAMED" + run: mvn -B clean install site -Djapicmp.skip=true -D enable-ci --file pom.xml "-Dsurefire.argLine=--add-opens java.base/java.net=ALL-UNNAMED" - uses: actions/upload-artifact@v4 with: @@ -49,7 +49,7 @@ jobs: gpg-passphrase: MAVEN_GPG_PASSPHRASE - name: Publish package - run: mvn -B clean deploy -DskipTests -Prelease + run: mvn -B clean deploy -Djapicmp.skip=true -DskipTests -Prelease env: MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }} MAVEN_USERNAME: ${{ secrets.OSSRH_TOKEN_USERNAME }} @@ -57,7 +57,7 @@ jobs: MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSPHRASE }} - name: Publish package with bridge methods - run: mvn -B clean deploy -DskipTests -Prelease -Pbridged + run: mvn -B clean deploy -Djapicmp.skip=true -DskipTests -Prelease -Pbridged env: MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }} MAVEN_USERNAME: ${{ secrets.OSSRH_TOKEN_USERNAME }}