diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f70fe33..3b53b9e 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -11,6 +11,10 @@ updates: ignore: - dependency-name: "*" update-types: ["version-update:semver-major"] + - dependency-name: "io.quarkus.*" + update-types: + - "version-update:semver-major" + - "version-update:semver-minor" - package-ecosystem: "github-actions" # Also update Github actions directory: "/" diff --git a/.github/workflows/merge-build.yml b/.github/workflows/merge-build.yml index d3ca504..ecf3d81 100644 --- a/.github/workflows/merge-build.yml +++ b/.github/workflows/merge-build.yml @@ -24,6 +24,11 @@ on: branches: - 'main' - '1.x' + paths: + - 'addons/**' + - 'core-java/**' + - 'event/**' + - 'pom.xml' jobs: publish-snapshot: diff --git a/Jenkinsfile.bak b/Jenkinsfile.bak deleted file mode 100644 index c420067..0000000 --- a/Jenkinsfile.bak +++ /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 '${M2_HOME}/bin/mvn -B -V clean verify -Prun-its' - } - } - stage('Deploy') { - when { branch 'main' } - steps { - echo "Deploy" - sh '${M2_HOME}/bin/mvn help:effective-settings -B -V clean deploy -e' - } - } - } -} diff --git a/pom.xml b/pom.xml index 7f1b1d4..fd75123 100644 --- a/pom.xml +++ b/pom.xml @@ -41,10 +41,11 @@ https://github.com/Commonjava/indy-model 1.2.1 - 3.32.3 + 3.6.9 1.2.13 - 2.15.2 - 6.0.3 + 2.21.0 + 2.21 + 5.14.3 11 11 @@ -79,7 +80,7 @@ com.fasterxml.jackson.core jackson-annotations - ${jackson-version} + ${jackson-annotation-version} org.commonjava.atlas