diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..31de232 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,19 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates +version: 2 +updates: + - package-ecosystem: "maven" # See documentation for possible values + directory: "/" # Location of package manifests + schedule: + interval: "weekly" + ignore: + - dependency-name: "*" + update-types: ["version-update:semver-major", "version-update:semver-minor"] + + - package-ecosystem: "github-actions" # Also update Github actions + directory: "/" + schedule: + # Check for updates to GitHub Actions every week + interval: "weekly" diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml index 6187f36..3775b03 100644 --- a/.github/workflows/maven-build.yml +++ b/.github/workflows/maven-build.yml @@ -1,3 +1,22 @@ +# +# Copyright (C) 2011-2022 Red Hat, Inc. (http://github.com/Commonjava/commonjava) +# +# Licensed 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 +# +# http://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. +# + +# This workflow will build a Java project with Maven +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven + name: build on maven on: @@ -19,16 +38,16 @@ jobs: env: MAVEN_OPTS: "-Xmx4096m -Xms2048m -XX:MaxMetaspaceSize=4096m -Xss8m" steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up JDK 11 for x64 - uses: actions/setup-java@v3 + uses: actions/setup-java@v5 with: java-version: '11' distribution: 'temurin' architecture: x64 - - uses: s4u/maven-settings-action@v2.8.0 + - uses: s4u/maven-settings-action@v4.0.0 with: sonatypeSnapshots: true @@ -36,12 +55,12 @@ jobs: run: mvn -B -V clean verify -Prun-its -Pci - - uses: s4u/maven-settings-action@v2.8.0 + - uses: s4u/maven-settings-action@v4.0.0 if: ${{ github.event_name == 'push' }} with: servers: | [{ - "id": "sonatype-nexus-snapshots", + "id": "central-portal-snapshots", "username": "${{ secrets.SONATYPE_BOT_USERNAME }}", "password": "${{ secrets.SONATYPE_BOT_TOKEN }}" }] diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 61c4af3..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,25 +0,0 @@ -pipeline { - agent { label 'maven-36-jdk11' } - stages { - stage('Prepare') { - steps { - sh 'printenv' - } - } - stage('Build') { - when { - expression { env.CHANGE_ID != null } // Pull request - } - steps { - sh 'mvn -B -V clean verify -Prun-its -Pci' - } - } - stage('Deploy') { - when { branch 'master' } - steps { - echo "Deploy" - sh 'mvn help:effective-settings -B -V clean deploy -e' - } - } - } -} diff --git a/pom.xml b/pom.xml index e76b833..fb03983 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ org.commonjava commonjava - 19-SNAPSHOT + 22-SNAPSHOT pom CommonJava Top-Level Parent POM @@ -48,36 +48,37 @@ scm:git:https://github.com/Commonjava/commonjava.git - scm:git:git@github.com:Commonjava/commonjava.git + scm:git:https://github.com/Commonjava/commonjava.git http://github.com/Commonjava/commonjava HEAD - 1.8 + 11 ${javaVersion} Red Hat, Inc. http://github.com/Commonjava/commonjava UTF-8 - 3.8.1 - 3.6.2 + 3.11.0 + 3.10.2 1.6 - 2.5.3 - 3.0.0 - 3.3.0 - 3.2.0 - 3.2.1 - 3.3.1 - 3.0.1 - 2.22.2 - 2.22.2 - 3.1.0 - 2.8.2 - 2.5.2 - 3.2.0 + 3.1.1 + 3.4.1 + 3.6.0 + 3.3.0 + 3.3.1 + 3.6.3 + 3.1.0 + 3.2.5 + 3.2.5 + 3.3.2 + 3.1.4 + 0.7.0 + 3.1.4 + 3.3.1 3.9.1 - 3.9.0 - 0.8.7 + 3.21.2 + 0.8.14 true @@ -179,9 +180,18 @@ ${version.plugin.release} true - forked-path false - -Prelease + release + + + + org.sonatype.central + central-publishing-maven-plugin + ${version.plugin.sonatype} + true + + central + true @@ -408,6 +418,10 @@ org.jacoco jacoco-maven-plugin + + org.sonatype.central + central-publishing-maven-plugin + @@ -494,22 +508,19 @@ - - sonatype-nexus-staging - Release Repository - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - sonatype-nexus-snapshots - Sonatype Nexus - https://oss.sonatype.org/content/repositories/snapshots + true + central-portal-snapshots + Central Portal Snapshots + https://central.sonatype.com/repository/maven-snapshots/ + default sonatype-snapshots - https://oss.sonatype.org/content/repositories/snapshots/ + https://central.sonatype.com/repository/maven-snapshots/ false true diff --git a/travis-settings.xml b/travis-settings.xml deleted file mode 100644 index ac46c68..0000000 --- a/travis-settings.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - sonatype-nexus-snapshots - ${env.SONATYPE_USER} - ${env.SONATYPE_PASS} - - - - - snapshot-repo - - - sonatype-nexus-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - false - - - true - - - - - - sonatype-nexus-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - false - - - true - - - - - - - snapshot-repo - - \ No newline at end of file