diff --git a/.circleci/config.yml b/.circleci/config.yml index 8ee1d4300c..22ac02c0f7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -147,7 +147,7 @@ jobs: name: 'Test' command: | source "$HOME/.sdkman/bin/sdkman-init.sh" - ./mvnw -ntp -B verify + ./mvnw -ntp -B verify -T1C - verify-formatting deploy: @@ -191,7 +191,7 @@ workflows: name: 'deploy snapshot' requires: - 'snapshot' - context: Sonatype + context: central filters: <<: *master-only @@ -205,6 +205,6 @@ workflows: name: 'release to maven central' requires: - 'setup-environment-release' - context: Sonatype + context: central filters: <<: *tags-only \ No newline at end of file diff --git a/.circleci/settings.xml b/.circleci/settings.xml index b7f976093f..d3892ed423 100644 --- a/.circleci/settings.xml +++ b/.circleci/settings.xml @@ -19,9 +19,9 @@ http://maven.apache.org/xsd/settings-1.0.0.xsd"> - ossrh - ${env.SONATYPE_USER} - ${env.SONATYPE_PASSWORD} + central + ${env.CENTRAL_TOKEN_USERNAME} + ${env.CENTRAL_TOKEN_PASSWORD} diff --git a/.github/files/settings.xml b/.github/files/settings.xml deleted file mode 100644 index b3b4740ad1..0000000000 --- a/.github/files/settings.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - ossrh - ${env.SONATYPE_USER} - ${env.SONATYPE_PASSWORD} - - - - - ossrh - - true - - - ${env.GPG_PASSPHRASE} - - - - - diff --git a/.github/files/toolchains.xml b/.github/files/toolchains.xml deleted file mode 100644 index 7fb26e061e..0000000000 --- a/.github/files/toolchains.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - jdk - - 1.8 - - - /home/runner/.sdkman/candidates/java/8.0.382-tem - - - - jdk - - 11 - - - /home/runner/.sdkman/candidates/java/11.0.22-tem - - - - jdk - - 17 - - - /home/runner/.sdkman/candidates/java/17.0.10-tem - - - - jdk - - 21 - - - /home/runner/.sdkman/candidates/java/21.0.2-tem - - - \ No newline at end of file diff --git a/.github/workflows/auto-merge-dependabot.yml b/.github/workflows/auto-merge-dependabot.yml deleted file mode 100644 index c434f8c53d..0000000000 --- a/.github/workflows/auto-merge-dependabot.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: Dependabot auto-merge -on: pull_request - -permissions: - contents: write - pull-requests: write - -jobs: - dependabot: - runs-on: ubuntu-latest - if: github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'OpenFeign/feign' - steps: - - name: Dependabot metadata - id: metadata - uses: dependabot/fetch-metadata@v2.2.0 - with: - github-token: "${{ secrets.GITHUB_TOKEN }}" - - - name: Auto-approve Dependabot PRs - uses: hmarr/auto-approve-action@v3 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - - - name: Enable auto-merge for Dependabot PRs - run: gh pr merge --auto --merge "$PR_URL" - env: - PR_URL: ${{github.event.pull_request.html_url}} - GH_TOKEN: ${{secrets.GITHUB_TOKEN}} diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml deleted file mode 100644 index 710211c27b..0000000000 --- a/.github/workflows/codeql-analysis.yml +++ /dev/null @@ -1,105 +0,0 @@ -# ---------------------------------------------------------------------------- -# Copyright 2012-2014 The Feign Authors -# -# The Netty Project licenses this file to you under the Apache License, -# version 2.0 (the "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at: -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# ---------------------------------------------------------------------------- -# For most projects, this workflow file will not need changing; you simply need -# to commit it to your repository. -# -# You may wish to alter this file to override the set of languages analyzed, -# or to provide custom queries or build logic. -name: "CodeQL" - -on: - push: - branches: ["master"] - pull_request: - # The branches below must be a subset of the branches above - branches: ["master"] - schedule: - - cron: '0 13 * * 3' - -permissions: - contents: read - -jobs: - analyze: - permissions: - actions: read # for github/codeql-action/init to get workflow details - contents: read # for actions/checkout to fetch code - security-events: write # for github/codeql-action/analyze to upload SARIF results - name: Analyze - runs-on: ubuntu-latest - - strategy: - fail-fast: false - matrix: - # Override automatic language detection by changing the below list - # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python'] - language: ['java'] - # Learn more... - # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - # Cache .m2/repository - - name: Cache local Maven repository - uses: actions/cache@v3 - continue-on-error: true - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ matrix.language }} ${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven-${{ matrix.language }} - ${{ runner.os }}-maven- - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v2 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - # queries: ./path/to/local/query, your-org/your-repo/queries@main - - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - # - name: Autobuild - # uses: github/codeql-action/autobuild@v2 - - # ℹī¸ Command-line programs to run using the OS shell. - # 📚 https://git.io/JvXDl - - # ✏ī¸ If the Autobuild fails above, remove it and uncomment the following three lines - # and modify them (or add more) to build your code if your project - # uses a compiled language - - name: Setup Java JDK - uses: actions/setup-java@v4.0.0 - with: - distribution: 'temurin' - java-version: '21' - - - name: Setup Develocity - uses: gradle/develocity-actions/setup-maven@v1.2 - with: - add-pr-comment: false - develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }} - - - name: Compile project - run: ./mvnw -B -ntp clean package -Pquickbuild -Dtoolchain.skip=true - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 diff --git a/pom.xml b/pom.xml index aa06fe207f..844e501256 100644 --- a/pom.xml +++ b/pom.xml @@ -143,12 +143,12 @@ - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + central + https://central.sonatype.com/api/v1/publisher - ossrh - https://oss.sonatype.org/content/repositories/snapshots + central + https://central.sonatype.com/api/v1/publisher @@ -194,6 +194,7 @@ 3.1.1 6.0.0 0.1.1 + 0.8.0 3.5.2 0.200.4 file://${project.basedir}/src/config/bom.xml @@ -876,15 +877,15 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 + org.sonatype.central + central-publishing-maven-plugin + ${central-publishing-maven-plugin.version} true - ossrh - https://oss.sonatype.org/ - true - 15 + central + true + published + all