From 2ed34a520d811624a165cc51c4b0b08701bbcedd Mon Sep 17 00:00:00 2001 From: Liam Newman Date: Tue, 14 Nov 2023 16:29:33 -0800 Subject: [PATCH] Add nobridge compilation jar --- github-api-nobridge/pom.xml | 306 +++++++++++ github-api/pom.xml | 475 ++++------------ .../org/kohsuke/github/LifecycleTest.java | 2 +- pom.xml | 512 ++++++++++++++++++ 4 files changed, 936 insertions(+), 359 deletions(-) create mode 100644 github-api-nobridge/pom.xml create mode 100644 pom.xml diff --git a/github-api-nobridge/pom.xml b/github-api-nobridge/pom.xml new file mode 100644 index 0000000000..a5973bee1b --- /dev/null +++ b/github-api-nobridge/pom.xml @@ -0,0 +1,306 @@ + + 4.0.0 + org.kohsuke + github-api-nobridge + 1.318-SNAPSHOT + GitHub API for Java + https://github-api.kohsuke.org/ + GitHub API for Java + + + org.kohsuke + github-api-parent + 1.318-SNAPSHOT + ../pom.xml + + + + ../github-api/src/main/java + ../github-api/src/test/java + + + ../github-api/src/test/resources + + **/wiremock/** + + + + + + org.apache.maven.plugins + maven-release-plugin + + + org.sonatype.plugins + nexus-staging-maven-plugin + + + maven-compiler-plugin + + 1.8 + 1.8 + + + org.jenkins-ci + annotation-indexer + 1.12 + + + + + + compile-java-11 + compile + + compile + + + 11 + 11 + 11 + + ../github-api/src/main/java11 + + true + + + + + + maven-surefire-plugin + + true + + + + org.apache.maven.plugins + maven-jar-plugin + + + + org.kohsuke.github.api + true + + + + + + com.github.siom79.japicmp + japicmp-maven-plugin + + true + + true + true + true + + + org.kohsuke.github.internal + + org.kohsuke.github.extras.HttpClientGitHubConnector#HttpClientGitHubConnector(java.net.http.HttpClient) + + + + + + verify + + cmp + + + + + + + + + + org.apache.commons + commons-lang3 + + + com.tngtech.archunit + archunit + test + + + org.hamcrest + hamcrest + test + + + + org.hamcrest + hamcrest-core + test + + + org.hamcrest + hamcrest-library + test + + + com.github.npathai + hamcrest-optional + test + + + junit + junit + test + + + org.awaitility + awaitility + test + + + com.fasterxml.jackson.core + jackson-databind + + + commons-io + commons-io + + + com.infradna.tool + bridge-method-annotation + true + + + + commons-fileupload + commons-fileupload + test + + + + commons-discovery + commons-discovery + test + + + + org.kohsuke.stapler + stapler + test + + + org.kohsuke.stapler + stapler-jetty + test + + + org.eclipse.jgit + org.eclipse.jgit + test + + + io.jsonwebtoken + jjwt-api + true + + + io.jsonwebtoken + jjwt-impl + true + + + io.jsonwebtoken + jjwt-jackson + true + + + com.squareup.okio + okio + true + + + com.squareup.okhttp3 + okhttp + true + + + + + com.squareup.okhttp3 + okhttp-urlconnection + true + + + com.squareup.okhttp + okhttp-urlconnection + true + + + org.kohsuke + wordnet-random-name + test + + + org.mockito + mockito-core + test + + + com.github.spotbugs + spotbugs-annotations + provided + + + com.github.tomakehurst + wiremock-jre8-standalone + test + + + com.google.code.gson + gson + test + + + org.slf4j + slf4j-simple + test + + + + + repo.jenkins-ci.org + https://repo.jenkins-ci.org/public/ + + + + + repo.jenkins-ci.org + https://repo.jenkins-ci.org/public/ + + + + + release + + + + org.apache.maven.plugins + maven-gpg-plugin + + + sign-artifacts + verify + + sign + + + + --pinentry-mode + loopback + + + + + + + + + + diff --git a/github-api/pom.xml b/github-api/pom.xml index bd9bb94e04..e8e23b4e87 100644 --- a/github-api/pom.xml +++ b/github-api/pom.xml @@ -7,70 +7,14 @@ https://github-api.kohsuke.org/ GitHub API for Java - - scm:git:git@github.com/hub4j/${project.artifactId}.git - scm:git:ssh://git@github.com/hub4j/${project.artifactId}.git - https://github.com/hub4j/github-api/ - HEAD - - - - - sonatype-nexus-snapshots - Sonatype Nexus Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - - - sonatype-nexus-staging - Nexus Release Repository - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - github-pages - gitsite:git@github.com/hub4j/${project.artifactId}.git - - - - - UTF-8 - 4.7.3.0 - 4.7.3 - true - 2.2 - 4.9.2 - 3.5.0 - - 0.70 - 0.50 - - false - 0.12.3 - - - - + + org.kohsuke + github-api-parent + 1.318-SNAPSHOT + ../pom.xml + - - - org.apache.maven.scm - maven-scm-provider-gitexe - 1.13.0 - - - org.apache.maven.scm - maven-scm-manager-plexus - 2.0.1 - - - - src/test/resources @@ -79,200 +23,14 @@ - - - - maven-surefire-plugin - 3.2.2 - - - false - - - - org.apache.maven.plugins - maven-source-plugin - 3.3.0 - - - org.apache.maven.plugins - maven-gpg-plugin - 3.1.0 - - - org.jacoco - jacoco-maven-plugin - 0.8.10 - - - - /org/kohsuke/github/extras/HttpClient* - /org/kohsuke/github/example/* - /org/kohsuke/github/extras/OkHttpConnector* - /org/kohsuke/github/extras/OkHttp3Connector* - /org/kohsuke/github/extras/okhttp3/ObsoleteUrlFactory* - - - - - - prepare-agent-integration - - - jacoco.surefire.argLine - - - - - report - - report-integration - - - - check - verify - - check - - - ${project.build.directory}/jacoco-it.exec - - - BUNDLE - - - METHOD - COVEREDRATIO - ${jacoco.coverage.target.bundle.method} - - - - - - - - CLASS - - - METHOD - COVEREDRATIO - ${jacoco.coverage.target.class.method} - - - - - org.kohsuke.github.extras.HttpClientGitHubConnector.** - org.kohsuke.github.extras.HttpClientGitHubConnector - - - org.kohsuke.github.extras.okhttp3.ObsoleteUrlFactory.** - org.kohsuke.github.extras.okhttp3.ObsoleteUrlFactory - - - org.kohsuke.github.example.* - - - org.kohsuke.github.extras.OkHttpConnector - org.kohsuke.github.extras.OkHttp3Connector - org.kohsuke.github.EnforcementLevel - org.kohsuke.github.GHPerson.1 - org.kohsuke.github.GHCompare.User - - - org.kohsuke.github.GHPullRequestReviewBuilder.DraftReviewComment - org.kohsuke.github.GHIssue.PullRequest - org.kohsuke.github.GHCommitSearchBuilder - org.kohsuke.github.GHRepositorySearchBuilder - org.kohsuke.github.GHUserSearchBuilder - - - org.kohsuke.github.GHBranchProtection.RequiredSignatures - org.kohsuke.github.GHBranchProtectionBuilder.Restrictions - org.kohsuke.github.GHBranchProtection.Restrictions - org.kohsuke.github.GHCommentAuthorAssociation - org.kohsuke.github.GHDeployKey - org.kohsuke.github.GHEmail - org.kohsuke.github.GHInvitation - org.kohsuke.github.GHPullRequestCommitDetail.Authorship - org.kohsuke.github.GHPullRequestCommitDetail.Commit - org.kohsuke.github.GHPullRequestCommitDetail.CommitPointer - org.kohsuke.github.GHPullRequestCommitDetail.Tree - org.kohsuke.github.GHPullRequestCommitDetail - org.kohsuke.github.GHPullRequestFileDetail - org.kohsuke.github.GHReleaseUpdater - org.kohsuke.github.GHRequestedAction - org.kohsuke.github.GHVerifiedKey - - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.4.1 - - 8 - true - all - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.13 - true - - sonatype-nexus-staging - https://oss.sonatype.org/ - true - - - - org.codehaus.mojo - animal-sniffer-maven-plugin - 1.22 - - - org.codehaus.mojo.signature - java18 - 1.0 - - - java.net.http.* - - - - - ensure-java-1.8-class-library - test - - check - - - - - - org.apache.maven.plugins maven-site-plugin - 3.12.1 org.apache.maven.plugins maven-release-plugin - 2.5.3 - - true - false - release - deploy - org.sonatype.plugins @@ -281,18 +39,120 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.4.2 - - - org.apache.bcel - bcel - 6.6.1 - - + + + org.jacoco + jacoco-maven-plugin + 0.8.10 + + + + /org/kohsuke/github/extras/HttpClient* + /org/kohsuke/github/example/* + /org/kohsuke/github/extras/OkHttpConnector* + /org/kohsuke/github/extras/OkHttp3Connector* + /org/kohsuke/github/extras/okhttp3/ObsoleteUrlFactory* + + + + + + prepare-agent-integration + + + jacoco.surefire.argLine + + + + + report + + report-integration + + + + check + verify + + check + + + ${project.build.directory}/jacoco-it.exec + + + BUNDLE + + + METHOD + COVEREDRATIO + ${jacoco.coverage.target.bundle.method} + + + + + + + + CLASS + + + METHOD + COVEREDRATIO + ${jacoco.coverage.target.class.method} + + + + + org.kohsuke.github.extras.HttpClientGitHubConnector.** + org.kohsuke.github.extras.HttpClientGitHubConnector + + + org.kohsuke.github.extras.okhttp3.ObsoleteUrlFactory.** + org.kohsuke.github.extras.okhttp3.ObsoleteUrlFactory + + + org.kohsuke.github.example.* + + + org.kohsuke.github.extras.OkHttpConnector + org.kohsuke.github.extras.OkHttp3Connector + org.kohsuke.github.EnforcementLevel + org.kohsuke.github.GHPerson.1 + org.kohsuke.github.GHCompare.User + + + org.kohsuke.github.GHPullRequestReviewBuilder.DraftReviewComment + org.kohsuke.github.GHIssue.PullRequest + org.kohsuke.github.GHCommitSearchBuilder + org.kohsuke.github.GHRepositorySearchBuilder + org.kohsuke.github.GHUserSearchBuilder + + + org.kohsuke.github.GHBranchProtection.RequiredSignatures + org.kohsuke.github.GHBranchProtectionBuilder.Restrictions + org.kohsuke.github.GHBranchProtection.Restrictions + org.kohsuke.github.GHCommentAuthorAssociation + org.kohsuke.github.GHDeployKey + org.kohsuke.github.GHEmail + org.kohsuke.github.GHInvitation + org.kohsuke.github.GHPullRequestCommitDetail.Authorship + org.kohsuke.github.GHPullRequestCommitDetail.Commit + org.kohsuke.github.GHPullRequestCommitDetail.CommitPointer + org.kohsuke.github.GHPullRequestCommitDetail.Tree + org.kohsuke.github.GHPullRequestCommitDetail + org.kohsuke.github.GHPullRequestFileDetail + org.kohsuke.github.GHReleaseUpdater + org.kohsuke.github.GHRequestedAction + org.kohsuke.github.GHVerifiedKey + + + + + + maven-compiler-plugin - 3.10.1 1.8 1.8 @@ -325,9 +185,6 @@ maven-surefire-plugin - - @{jacoco.surefire.argLine} ${surefire.argLine} - default-test @@ -340,7 +197,6 @@ org.apache.maven.plugins maven-jar-plugin - 3.3.0 @@ -357,19 +213,10 @@ com.infradna.tool bridge-method-injector - 1.29 - - - - process - - - com.diffplug.spotless spotless-maven-plugin - 2.27.2 spotless-check @@ -406,33 +253,10 @@ com.github.spotbugs spotbugs-maven-plugin - ${spotbugs-maven-plugin.version} - - true - ${spotbugs-maven-plugin.failOnError} - - - - run-spotbugs - verify - - check - - - - - - - com.github.spotbugs - spotbugs - ${spotbugs.version} - - com.github.siom79.japicmp japicmp-maven-plugin - 0.17.2 true @@ -458,65 +282,45 @@ - - - - com.fasterxml.jackson - jackson-bom - 2.15.3 - import - pom - - - - org.apache.commons commons-lang3 - 3.9 com.tngtech.archunit archunit - 1.1.0 test org.hamcrest hamcrest - ${hamcrest.version} test org.hamcrest hamcrest-core - ${hamcrest.version} test org.hamcrest hamcrest-library - ${hamcrest.version} test com.github.npathai hamcrest-optional - 2.0.0 test junit junit - 4.13.2 test org.awaitility awaitility - 4.2.0 test @@ -526,75 +330,63 @@ commons-io commons-io - 2.8.0 com.infradna.tool bridge-method-annotation - 1.29 true commons-fileupload commons-fileupload - 1.5 test commons-discovery commons-discovery - 0.5 test org.kohsuke.stapler stapler - 1.263 test org.kohsuke.stapler stapler-jetty - 1.1 test org.eclipse.jgit org.eclipse.jgit - 6.7.0.202309050840-r test io.jsonwebtoken jjwt-api - ${jjwt.suite.version} true io.jsonwebtoken jjwt-impl - ${jjwt.suite.version} true io.jsonwebtoken jjwt-jackson - ${jjwt.suite.version} true com.squareup.okio okio - ${okio.version} true com.squareup.okhttp3 okhttp - ${okhttp3.version} true @@ -602,49 +394,41 @@ com.squareup.okhttp3 okhttp-urlconnection - 3.12.3 true com.squareup.okhttp okhttp-urlconnection - 2.7.5 true org.kohsuke wordnet-random-name - 1.5 test org.mockito mockito-core - 4.11.0 test com.github.spotbugs spotbugs-annotations - ${spotbugs.version} provided com.github.tomakehurst wiremock-jre8-standalone - 2.35.1 test com.google.code.gson gson - 2.10 test org.slf4j slf4j-simple - 2.0.7 test @@ -913,29 +697,4 @@ - - - - The MIT license - https://www.opensource.org/licenses/mit-license.php - repo - - - - - - User List - github-api@googlegroups.com - https://groups.google.com/forum/#!forum/github-api - - - - - - Kohsuke Kawaguchi - kohsuke - kk@kohsuke.org - - - diff --git a/github-api/src/test/java/org/kohsuke/github/LifecycleTest.java b/github-api/src/test/java/org/kohsuke/github/LifecycleTest.java index 2651346f78..8b34638fa1 100644 --- a/github-api/src/test/java/org/kohsuke/github/LifecycleTest.java +++ b/github-api/src/test/java/org/kohsuke/github/LifecycleTest.java @@ -64,7 +64,7 @@ private void deleteAsset(GHRelease release, GHAsset asset) throws IOException { } private GHAsset uploadAsset(GHRelease release) throws IOException { - GHAsset asset = release.uploadAsset(new File("LICENSE.txt"), "application/text"); + GHAsset asset = release.uploadAsset(new File("../LICENSE.txt"), "application/text"); assertThat(asset, notNullValue()); List cachedAssets = release.assets(); assertThat(cachedAssets, is(empty())); diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000000..13c7171836 --- /dev/null +++ b/pom.xml @@ -0,0 +1,512 @@ + + 4.0.0 + org.kohsuke + github-api-parent + 1.318-SNAPSHOT + GitHub API for Java Parent POM + https://github.com/hub4j/github-api/ + GitHub API for Java + pom + + + scm:git:git@github.com/hub4j/github-api.git + scm:git:ssh://git@github.com/hub4j/github-api.git + https://github.com/hub4j/github-api/ + HEAD + + + + + sonatype-nexus-snapshots + Sonatype Nexus Snapshots + https://oss.sonatype.org/content/repositories/snapshots/ + + + sonatype-nexus-staging + Nexus Release Repository + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + github-pages + gitsite:git@github.com/hub4j/github-api.git + + + + + UTF-8 + 4.7.3.0 + 4.7.3 + true + 2.2 + 4.9.2 + 3.5.0 + + 0.70 + 0.50 + + false + 0.12.3 + + + + + + + github-api + github-api-nobridge + + + + + + org.apache.maven.scm + maven-scm-provider-gitexe + 1.13.0 + + + org.apache.maven.scm + maven-scm-manager-plexus + 2.0.1 + + + + + + + + maven-surefire-plugin + 3.2.2 + + + false + @{jacoco.surefire.argLine} ${surefire.argLine} + + + + org.apache.maven.plugins + maven-source-plugin + 3.3.0 + + + org.apache.maven.plugins + maven-gpg-plugin + 3.1.0 + + + org.jacoco + jacoco-maven-plugin + 0.8.10 + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.4.1 + + 8 + true + all + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.13 + true + + sonatype-nexus-staging + https://oss.sonatype.org/ + true + + + + org.codehaus.mojo + animal-sniffer-maven-plugin + 1.22 + + + org.codehaus.mojo.signature + java18 + 1.0 + + + java.net.http.* + + + + + ensure-java-1.8-class-library + test + + check + + + + + + org.apache.maven.plugins + maven-site-plugin + 3.12.1 + + + org.apache.maven.plugins + maven-release-plugin + 2.5.3 + + true + false + release + deploy + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 3.4.2 + + + org.apache.bcel + bcel + 6.6.1 + + + + + maven-compiler-plugin + 3.10.1 + + + org.apache.maven.plugins + maven-jar-plugin + 3.3.0 + + + com.infradna.tool + bridge-method-injector + 1.29 + + + + process + + + + + + com.diffplug.spotless + spotless-maven-plugin + 2.27.2 + + + com.github.spotbugs + spotbugs-maven-plugin + ${spotbugs-maven-plugin.version} + + true + ${spotbugs-maven-plugin.failOnError} + + + + run-spotbugs + verify + + check + + + + + + + com.github.spotbugs + spotbugs + ${spotbugs.version} + + + + + com.github.siom79.japicmp + japicmp-maven-plugin + 0.17.2 + + + + + + + org.apache.maven.plugins + maven-release-plugin + + + org.sonatype.plugins + nexus-staging-maven-plugin + + + com.diffplug.spotless + spotless-maven-plugin + + + + + + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.apache.commons + commons-lang3 + 3.9 + + + com.tngtech.archunit + archunit + 1.1.0 + test + + + org.hamcrest + hamcrest + ${hamcrest.version} + test + + + + org.hamcrest + hamcrest-core + ${hamcrest.version} + test + + + org.hamcrest + hamcrest-library + ${hamcrest.version} + test + + + com.github.npathai + hamcrest-optional + 2.0.0 + test + + + junit + junit + 4.13.2 + test + + + org.awaitility + awaitility + 4.2.0 + test + + + commons-io + commons-io + 2.8.0 + + + com.infradna.tool + bridge-method-annotation + 1.29 + + + + commons-fileupload + commons-fileupload + 1.5 + test + + + + commons-discovery + commons-discovery + 0.5 + test + + + + org.kohsuke.stapler + stapler + 1.263 + test + + + org.kohsuke.stapler + stapler-jetty + 1.1 + test + + + org.eclipse.jgit + org.eclipse.jgit + 6.7.0.202309050840-r + test + + + io.jsonwebtoken + jjwt-api + ${jjwt.suite.version} + + + io.jsonwebtoken + jjwt-impl + ${jjwt.suite.version} + + + io.jsonwebtoken + jjwt-jackson + ${jjwt.suite.version} + + + com.squareup.okio + okio + ${okio.version} + + + com.squareup.okhttp3 + okhttp + ${okhttp3.version} + + + + + com.squareup.okhttp3 + okhttp-urlconnection + 3.12.3 + + + com.squareup.okhttp + okhttp-urlconnection + 2.7.5 + + + org.kohsuke + wordnet-random-name + 1.5 + test + + + org.mockito + mockito-core + 4.11.0 + test + + + com.github.spotbugs + spotbugs-annotations + ${spotbugs.version} + provided + + + com.github.tomakehurst + wiremock-jre8-standalone + 2.35.1 + test + + + com.google.code.gson + gson + 2.10 + test + + + org.slf4j + slf4j-simple + 2.0.7 + test + + + + + + + repo.jenkins-ci.org + https://repo.jenkins-ci.org/public/ + + + + + repo.jenkins-ci.org + https://repo.jenkins-ci.org/public/ + + + + + + ci-non-windows + + + enable-ci + + + !windows + + + + + true + + + + release + + + + org.apache.maven.plugins + maven-gpg-plugin + + + sign-artifacts + verify + + sign + + + + --pinentry-mode + loopback + + + + + + + + + + + + + The MIT license + https://www.opensource.org/licenses/mit-license.php + repo + + + + + + User List + github-api@googlegroups.com + https://groups.google.com/forum/#!forum/github-api + + + + + + Kohsuke Kawaguchi + kohsuke + kk@kohsuke.org + + + +