Clean up dependency updates (#1649)

Author: basil

.github/dependabot.yml

@@ -1,74 +1,7 @@
 ---
 version: 2
 updates:
-  - package-ecosystem: "docker"
-    directory: "src/main/resources/ath-container"
-    schedule:
-      interval: "weekly"
-    ignore:
-      - dependency-name: "ubuntu"
-        versions: [">=22.04"]
   - package-ecosystem: "docker"
     directory: "src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/ArtifactoryContainer"
     schedule:
       interval: "weekly"
-  - package-ecosystem: "docker"
-    directory: "src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/FtpdContainer"
-    schedule:
-      interval: "weekly"
-    ignore:
-      - dependency-name: "ubuntu"
-        versions: [">=22.04"]
-  - package-ecosystem: "docker"
-    directory: "src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/GitContainer"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "docker"
-    directory: "src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JabberContainer"
-    schedule:
-      interval: "weekly"
-    ignore:
-      - dependency-name: "ubuntu"
-        versions: [">=22.04"]
-  - package-ecosystem: "docker"
-    directory: "src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JavaGitContainer"
-    schedule:
-      interval: "weekly"
-    ignore:
-      - dependency-name: "ubuntu"
-        versions: [">=22.04"]
-  - package-ecosystem: "docker"
-    directory: "src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JiraContainer"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "docker"
-    directory: "src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/LdapContainer"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "docker"
-    directory: "src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/MailhogContainer"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "docker"
-    directory: "src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/SMBContainer"
-    schedule:
-      interval: "weekly"
-    ignore:
-      - dependency-name: "ubuntu"
-        versions: [">=22.04"]
-  - package-ecosystem: "docker"
-    directory: "src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/SshAgentContainer"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "docker"
-    directory: "src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/SvnContainer"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "docker"
-    directory: "src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/Tomcat10Container"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "docker"
-    directory: "src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/GitLabContainer"
-    schedule:
-      interval: "weekly"

.github/renovate.json

@@ -6,7 +6,7 @@
     "schedule:earlyMondays"
   ],
   "ignorePaths": [
-    "src/main/resources/org/**/Dockerfile"
+    "src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/ArtifactoryContainer/Dockerfile"
   ],
   "ignoreDeps": [
     "org.apache.maven:maven-resolver-provider",
@@ -24,6 +24,18 @@
     {
       "matchPackagePatterns": ["selenium"],
       "groupName": "Selenium"
+    },
+    {
+      "matchDepNames": [
+        "docker",
+        "docker/buildx",
+        "mozilla/geckodriver",
+        "org.apache.maven:maven-core"
+      ],
+      "labels": [
+        "dependencies",
+        "build-image"
+      ]
     }
   ],
   "labels": [
@@ -48,6 +60,12 @@
       "depNameTemplate": "org.apache.maven:maven-core",
       "datasourceTemplate": "maven"
     },
+    {
+      "fileMatch": ["src/main/resources/ath-container/Dockerfile"],
+      "matchStrings": ["ARG DOCKER_BUILDX_VERSION=(?<currentValue>.*?)\n"],
+      "depNameTemplate": "docker/buildx",
+      "datasourceTemplate": "github-releases"
+    },
     {
       "fileMatch": ["src/main/resources/ath-container/Dockerfile"],
       "matchStrings": ["ARG DOCKER_VERSION=(?<currentValue>.*?)\n"],

pom.xml

@@ -306,24 +306,6 @@
       <artifactId>zt-zip</artifactId>
       <version>1.17</version>
     </dependency>
-    <!--
-      This is just for dependency updates.
-
-      TODO: Delete this dependency and figure out how to automatically update
-      this dependency some other way.
-    -->
-    <dependency>
-      <groupId>org.jenkins-ci.main</groupId>
-      <artifactId>jenkins-core</artifactId>
-      <version>${jenkins.version}</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>*</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>