Merge branch 'master' into dependabot/gradle/com.gradle.common-custom…

…-user-data-gradle-plugin-1.10 * master: Bump com.gradle.enterprise from 3.12.4 to 3.12.5 (#265) Configure depandabot to ignore maven-core versions update (#266) # Conflicts: # settings.gradle.kts
jenkinsci · Mar 21, 2023 · 76aa1cf · 76aa1cf
2 parents 8e27f0b + 1f15bf1
commit 76aa1cf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -5,6 +5,5 @@ updates:
     schedule:
       interval: "weekly"
     ignore:
-    - dependency-name: org.jenkins-ci.main:jenkins-core
-      versions:
-      - ">= 0"
+      - dependency-name: "org.jenkins-ci.main:jenkins-core"
+      - dependency-name: "org.apache.maven:maven-core"
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("com.gradle.enterprise") version "3.12.4"
+    id("com.gradle.enterprise") version "3.12.5"
     id("com.gradle.common-custom-user-data-gradle-plugin") version "1.10"
     id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0"
 }