From 96290c7ce5d9925052e164decfe8bac246c9bebc Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Fri, 3 Oct 2025 11:57:31 +1000 Subject: [PATCH 1/2] Restore dependabot for 12 and 12.1 Signed-off-by: Olivier Lamy --- .github/dependabot.yml | 764 ++++++++++++++++++++++++++++++++++++++++- jetty-core/pom.xml | 129 ------- jetty-ee10/pom.xml | 375 -------------------- jetty-ee11/pom.xml | 375 -------------------- jetty-ee8/pom.xml | 288 ---------------- jetty-ee9/pom.xml | 481 -------------------------- 6 files changed, 763 insertions(+), 1649 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 3722537ae385..6984f85d66e6 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,4 +4,766 @@ updates: - package-ecosystem: "github-actions" directory: "/" schedule: - interval: "weekly" \ No newline at end of file + interval: "weekly" + +## jetty-12.1.x branch + + - package-ecosystem: maven + directory: "/" + exclude-paths: + - "build/**" + - "jetty-core/**" + - "jetty-ee*/**" + - "jetty-integrations/**" + target-branch: "jetty-12.1.x" + open-pull-requests-limit: 30 + schedule: + interval: "weekly" + day: "saturday" + time: "10:00" + timezone: "Australia/Brisbane" + commit-message: + prefix: "[12.1.x Root pom] " + groups: + build-deps: + patterns: + - "org.apache.maven:*" + - "org.apache.maven.plugins:*" + - "org.apache.maven.plugin-tools:*" + - "org.apache.felix:*-plugin" + - "org.apache.servicemix.tooling:*" + - "org.asciidoctor:*" + - "org.codehaus.mojo:*" + - "org.eclipse.jetty.toolchain:*-maven-plugin" + - "org.jacoco:*" + - "org.mortbay:*-maven-plugin" + - "org.testcontainers:*" + - "com.diffplug.spotless:*" + - "com.github.spotbugs:*" + - "com.mycila:*" + integration-deps: + patterns: + - "org.infinispan*" + - "org.mongodb*" + - "org.wildfly*" + - "org.eclipse.platform*" + - "com.google.cloud:*" + - "org.hawtio:*" + spec-deps: + patterns: + - "jakarta.*" + - "org.jboss.weld.*" + - "com.sun.xml*" + - "org.glassfish.jaxb*" + - "org.mortbay.jasper:*" + dev-dependencies: + patterns: + - "*" + ignore: + # Do not upgrade major versions of dependencies + - dependency-name: "*" + update-types: [ "version-update:semver-major" ] + + - package-ecosystem: maven + directory: "/jetty-core" + target-branch: "jetty-12.1.x" + open-pull-requests-limit: 30 + schedule: + interval: "weekly" + day: "saturday" + time: "10:00" + timezone: "Australia/Brisbane" + commit-message: + prefix: "[12.1.x Core] " + groups: + build-deps: + patterns: + - "org.apache.maven:*" + - "org.apache.maven.plugins:*" + - "org.apache.maven.plugin-tools:*" + - "org.apache.felix:*-plugin" + - "org.apache.servicemix.tooling:*" + - "org.asciidoctor:*" + - "org.codehaus.mojo:*" + - "org.eclipse.jetty.toolchain:*-maven-plugin" + - "org.jacoco:*" + - "org.mortbay:*-maven-plugin" + - "org.testcontainers:*" + - "com.diffplug.spotless:*" + - "com.github.spotbugs:*" + - "com.mycila:*" + integration-deps: + patterns: + - "org.infinispan*" + - "org.mongodb*" + - "org.wildfly*" + - "org.eclipse.platform*" + - "com.google.cloud:*" + - "org.hawtio:*" + spec-deps: + patterns: + - "jakarta.*" + - "org.jboss.weld.*" + - "com.sun.xml*" + - "org.glassfish.jaxb*" + - "org.mortbay.jasper:*" + dev-dependencies: + patterns: + - "*" + - package-ecosystem: maven + directory: "/jetty-integrations" + target-branch: "jetty-12.1.x" + open-pull-requests-limit: 30 + schedule: + interval: "weekly" + day: "saturday" + time: "10:00" + timezone: "Australia/Brisbane" + commit-message: + prefix: "[12.1.x Integrations] " + groups: + build-deps: + patterns: + - "org.apache.maven:*" + - "org.apache.maven.plugins:*" + - "org.apache.maven.plugin-tools:*" + - "org.apache.felix:*-plugin" + - "org.apache.servicemix.tooling:*" + - "org.asciidoctor:*" + - "org.codehaus.mojo:*" + - "org.eclipse.jetty.toolchain:*-maven-plugin" + - "org.jacoco:*" + - "org.mortbay:*-maven-plugin" + - "org.testcontainers:*" + - "com.diffplug.spotless:*" + - "com.github.spotbugs:*" + - "com.mycila:*" + integration-deps: + patterns: + - "org.infinispan*" + - "org.mongodb*" + - "org.wildfly*" + - "org.eclipse.platform*" + - "com.google.cloud:*" + - "org.hawtio:*" + spec-deps: + patterns: + - "jakarta.*" + - "org.jboss.weld.*" + - "com.sun.xml*" + - "org.glassfish.jaxb*" + - "org.mortbay.jasper:*" + dev-dependencies: + patterns: + - "*" + ignore: + # Do not upgrade major versions of dependencies + - dependency-name: "*" + update-types: [ "version-update:semver-major" ] + + - package-ecosystem: maven + directory: "/jetty-ee8" + target-branch: "jetty-12.1.x" + open-pull-requests-limit: 30 + schedule: + interval: "weekly" + day: "saturday" + time: "10:00" + timezone: "Australia/Brisbane" + commit-message: + prefix: "[12.1.x EE8] " + groups: + build-deps: + patterns: + - "org.apache.maven:*" + - "org.apache.maven.plugins:*" + - "org.apache.maven.plugin-tools:*" + - "org.apache.felix:*-plugin" + - "org.apache.servicemix.tooling:*" + - "org.asciidoctor:*" + - "org.codehaus.mojo:*" + - "org.eclipse.jetty.toolchain:*-maven-plugin" + - "org.jacoco:*" + - "org.mortbay:*-maven-plugin" + - "org.testcontainers:*" + - "com.diffplug.spotless:*" + - "com.github.spotbugs:*" + - "com.mycila:*" + integration-deps: + patterns: + - "org.infinispan*" + - "org.mongodb*" + - "org.wildfly*" + - "org.eclipse.platform*" + - "com.google.cloud:*" + - "org.hawtio:*" + spec-deps: + patterns: + - "jakarta.*" + - "org.jboss.weld.*" + - "com.sun.xml*" + - "org.glassfish.jaxb*" + - "org.mortbay.jasper:*" + dev-dependencies: + patterns: + - "*" + ignore: + # Do not upgrade major versions of dependencies + - dependency-name: "*" + update-types: [ "version-update:semver-major" ] + # Restrict updates in this branch to jetty in the 11.x.x space + - dependency-name: "jakarta.activation:*" + versions: [ ">=2.1.0" ] + - dependency-name: "jakarta.annotation:*" + versions: [ ">=3.0.0" ] + - dependency-name: "jakarta.authentication:*" + versions: [ ">=3.0.0" ] + - dependency-name: "jakarta.el:*" + versions: [ ">=5.0.0" ] + - dependency-name: "jakarta.enterprise:jakarta.enterprise.cdi-api:*" + versions: [ ">=3.0.0" ] + - dependency-name: "jakarta.inject:*" + versions: [ ">=3.0.0" ] + - dependency-name: "jakarta.interceptor:*" + versions: [ ">=2.0.0" ] + - dependency-name: "jakarta.mail:*" + versions: [ ">=3.0.0" ] + - dependency-name: "jakarta.servlet:*" + versions: [ ">=6.0.0" ] + - dependency-name: "jakarta.servlet.jsp:*" + versions: [ ">=4.0.0" ] + - dependency-name: "jakarta.servlet.jsp.jstl:*" + versions: [ ">=3.0.0" ] + - dependency-name: "jakarta.transaction:*" + versions: [ ">=2.0.0" ] + - dependency-name: "jakarta.websocket:*" + versions: [ ">=3.0.0" ] + - dependency-name: "jakarta.ws.rs:*" + versions: [ ">=4.0.0" ] + - dependency-name: "jakarta.xml.bind:*" + versions: [ ">=4.0.0" ] + - dependency-name: "org.glassfish.jaxb:*" + versions: [ ">=4.0.0"] + - dependency-name: "jakarta.xml.ws:*" + versions: [ ">=4.0.0" ] + - dependency-name: "com.sun.xml.ws:jaxws*" + versions: [ ">=4.0.0" ] + - dependency-name: "org.jboss.weld.servlet:*" + versions: [ ">=5.0.0" ] + - dependency-name: "org.infinispan:*" + versions: [ ">=12" ] + - dependency-name: "com.hazelcast:*" + versions: [ ">=5.4.0"] + - dependency-name: "org.jboss.threads:jboss-threads" + versions: [ ">=3.7.0"] + + - package-ecosystem: maven + directory: "/jetty-ee9" + target-branch: "jetty-12.1.x" + open-pull-requests-limit: 30 + schedule: + interval: "weekly" + day: "saturday" + time: "10:00" + timezone: "Australia/Brisbane" + commit-message: + prefix: "[12.1.x EE9] " + groups: + build-deps: + patterns: + - "org.apache.maven:*" + - "org.apache.maven.plugins:*" + - "org.apache.maven.plugin-tools:*" + - "org.apache.felix:*-plugin" + - "org.apache.servicemix.tooling:*" + - "org.asciidoctor:*" + - "org.codehaus.mojo:*" + - "org.eclipse.jetty.toolchain:*-maven-plugin" + - "org.jacoco:*" + - "org.mortbay:*-maven-plugin" + - "org.testcontainers:*" + - "com.diffplug.spotless:*" + - "com.github.spotbugs:*" + - "com.mycila:*" + integration-deps: + patterns: + - "org.infinispan*" + - "org.mongodb*" + - "org.wildfly*" + - "org.eclipse.platform*" + - "com.google.cloud:*" + - "org.hawtio:*" + spec-deps: + patterns: + - "jakarta.*" + - "org.jboss.weld.*" + - "com.sun.xml*" + - "org.glassfish.jaxb*" + - "org.mortbay.jasper:*" + dev-dependencies: + patterns: + - "*" + ignore: + # Do not upgrade major versions of dependencies + - dependency-name: "*" + update-types: [ "version-update:semver-major" ] + + - package-ecosystem: maven + directory: "/jetty-e10" + target-branch: "jetty-12.1.x" + open-pull-requests-limit: 30 + schedule: + interval: "weekly" + day: "saturday" + time: "10:00" + timezone: "Australia/Brisbane" + commit-message: + prefix: "[12.1.x EE10] " + groups: + build-deps: + patterns: + - "org.apache.maven:*" + - "org.apache.maven.plugins:*" + - "org.apache.maven.plugin-tools:*" + - "org.apache.felix:*-plugin" + - "org.apache.servicemix.tooling:*" + - "org.asciidoctor:*" + - "org.codehaus.mojo:*" + - "org.eclipse.jetty.toolchain:*-maven-plugin" + - "org.jacoco:*" + - "org.mortbay:*-maven-plugin" + - "org.testcontainers:*" + - "com.diffplug.spotless:*" + - "com.github.spotbugs:*" + - "com.mycila:*" + integration-deps: + patterns: + - "org.infinispan*" + - "org.mongodb*" + - "org.wildfly*" + - "org.eclipse.platform*" + - "com.google.cloud:*" + - "org.hawtio:*" + spec-deps: + patterns: + - "jakarta.*" + - "org.jboss.weld.*" + - "com.sun.xml*" + - "org.glassfish.jaxb*" + - "org.mortbay.jasper:*" + dev-dependencies: + patterns: + - "*" + ignore: + # Do not upgrade major versions of dependencies + - dependency-name: "*" + update-types: [ "version-update:semver-major" ] + + - package-ecosystem: maven + directory: "/jetty-e11" + target-branch: "jetty-12.1.x" + open-pull-requests-limit: 30 + schedule: + interval: "weekly" + day: "saturday" + time: "10:00" + timezone: "Australia/Brisbane" + commit-message: + prefix: "[12.1.x EE11] " + groups: + build-deps: + patterns: + - "org.apache.maven:*" + - "org.apache.maven.plugins:*" + - "org.apache.maven.plugin-tools:*" + - "org.apache.felix:*-plugin" + - "org.apache.servicemix.tooling:*" + - "org.asciidoctor:*" + - "org.codehaus.mojo:*" + - "org.eclipse.jetty.toolchain:*-maven-plugin" + - "org.jacoco:*" + - "org.mortbay:*-maven-plugin" + - "org.testcontainers:*" + - "com.diffplug.spotless:*" + - "com.github.spotbugs:*" + - "com.mycila:*" + integration-deps: + patterns: + - "org.infinispan*" + - "org.mongodb*" + - "org.wildfly*" + - "org.eclipse.platform*" + - "com.google.cloud:*" + - "org.hawtio:*" + spec-deps: + patterns: + - "jakarta.*" + - "org.jboss.weld.*" + - "com.sun.xml*" + - "org.glassfish.jaxb*" + - "org.mortbay.jasper:*" + dev-dependencies: + patterns: + - "*" + ignore: + # Do not upgrade major versions of dependencies + - dependency-name: "*" + update-types: [ "version-update:semver-major" ] + +#### jetty-12.0.x branch + + - package-ecosystem: maven + directory: "/" + exclude-paths: + - "build/**" + - "jetty-core/**" + - "jetty-ee*/**" + - "jetty-integrations/**" + target-branch: "jetty-12.0.x" + open-pull-requests-limit: 30 + schedule: + interval: "weekly" + day: "saturday" + time: "10:00" + timezone: "Australia/Brisbane" + commit-message: + prefix: "[12.0.x Root pom] " + groups: + build-deps: + patterns: + - "org.apache.maven:*" + - "org.apache.maven.plugins:*" + - "org.apache.maven.plugin-tools:*" + - "org.apache.felix:*-plugin" + - "org.apache.servicemix.tooling:*" + - "org.asciidoctor:*" + - "org.codehaus.mojo:*" + - "org.eclipse.jetty.toolchain:*-maven-plugin" + - "org.jacoco:*" + - "org.mortbay:*-maven-plugin" + - "org.testcontainers:*" + - "com.diffplug.spotless:*" + - "com.github.spotbugs:*" + - "com.mycila:*" + integration-deps: + patterns: + - "org.infinispan*" + - "org.mongodb*" + - "org.wildfly*" + - "org.eclipse.platform*" + - "com.google.cloud:*" + - "org.hawtio:*" + spec-deps: + patterns: + - "jakarta.*" + - "org.jboss.weld.*" + - "com.sun.xml*" + - "org.glassfish.jaxb*" + - "org.mortbay.jasper:*" + dev-dependencies: + patterns: + - "*" + ignore: + # Do not upgrade major versions of dependencies + - dependency-name: "*" + update-types: [ "version-update:semver-major" ] + + - package-ecosystem: maven + directory: "/jetty-core" + target-branch: "jetty-12.0.x" + open-pull-requests-limit: 30 + schedule: + interval: "weekly" + day: "saturday" + time: "10:00" + timezone: "Australia/Brisbane" + commit-message: + prefix: "[12.0.x Core] " + groups: + build-deps: + patterns: + - "org.apache.maven:*" + - "org.apache.maven.plugins:*" + - "org.apache.maven.plugin-tools:*" + - "org.apache.felix:*-plugin" + - "org.apache.servicemix.tooling:*" + - "org.asciidoctor:*" + - "org.codehaus.mojo:*" + - "org.eclipse.jetty.toolchain:*-maven-plugin" + - "org.jacoco:*" + - "org.mortbay:*-maven-plugin" + - "org.testcontainers:*" + - "com.diffplug.spotless:*" + - "com.github.spotbugs:*" + - "com.mycila:*" + integration-deps: + patterns: + - "org.infinispan*" + - "org.mongodb*" + - "org.wildfly*" + - "org.eclipse.platform*" + - "com.google.cloud:*" + - "org.hawtio:*" + spec-deps: + patterns: + - "jakarta.*" + - "org.jboss.weld.*" + - "com.sun.xml*" + - "org.glassfish.jaxb*" + - "org.mortbay.jasper:*" + dev-dependencies: + patterns: + - "*" + ignore: + # Do not upgrade major versions of dependencies + - dependency-name: "*" + update-types: [ "version-update:semver-major" ] + + - package-ecosystem: maven + directory: "/jetty-integrations" + target-branch: "jetty-12.0.x" + open-pull-requests-limit: 30 + schedule: + interval: "weekly" + day: "saturday" + time: "10:00" + timezone: "Australia/Brisbane" + commit-message: + prefix: "[12.0.x Integrations] " + groups: + build-deps: + patterns: + - "org.apache.maven:*" + - "org.apache.maven.plugins:*" + - "org.apache.maven.plugin-tools:*" + - "org.apache.felix:*-plugin" + - "org.apache.servicemix.tooling:*" + - "org.asciidoctor:*" + - "org.codehaus.mojo:*" + - "org.eclipse.jetty.toolchain:*-maven-plugin" + - "org.jacoco:*" + - "org.mortbay:*-maven-plugin" + - "org.testcontainers:*" + - "com.diffplug.spotless:*" + - "com.github.spotbugs:*" + - "com.mycila:*" + integration-deps: + patterns: + - "org.infinispan*" + - "org.mongodb*" + - "org.wildfly*" + - "org.eclipse.platform*" + - "com.google.cloud:*" + - "org.hawtio:*" + spec-deps: + patterns: + - "jakarta.*" + - "org.jboss.weld.*" + - "com.sun.xml*" + - "org.glassfish.jaxb*" + - "org.mortbay.jasper:*" + dev-dependencies: + patterns: + - "*" + ignore: + # Do not upgrade major versions of dependencies + - dependency-name: "*" + update-types: [ "version-update:semver-major" ] + + - package-ecosystem: maven + directory: "/jetty-ee8" + target-branch: "jetty-12.0.x" + open-pull-requests-limit: 30 + schedule: + interval: "weekly" + day: "saturday" + time: "10:00" + timezone: "Australia/Brisbane" + commit-message: + prefix: "[12.0.x EE8] " + groups: + build-deps: + patterns: + - "org.apache.maven:*" + - "org.apache.maven.plugins:*" + - "org.apache.maven.plugin-tools:*" + - "org.apache.felix:*-plugin" + - "org.apache.servicemix.tooling:*" + - "org.asciidoctor:*" + - "org.codehaus.mojo:*" + - "org.eclipse.jetty.toolchain:*-maven-plugin" + - "org.jacoco:*" + - "org.mortbay:*-maven-plugin" + - "org.testcontainers:*" + - "com.diffplug.spotless:*" + - "com.github.spotbugs:*" + - "com.mycila:*" + integration-deps: + patterns: + - "org.infinispan*" + - "org.mongodb*" + - "org.wildfly*" + - "org.eclipse.platform*" + - "com.google.cloud:*" + - "org.hawtio:*" + spec-deps: + patterns: + - "jakarta.*" + - "org.jboss.weld.*" + - "com.sun.xml*" + - "org.glassfish.jaxb*" + - "org.mortbay.jasper:*" + dev-dependencies: + patterns: + - "*" + ignore: + # Do not upgrade major versions of dependencies + - dependency-name: "*" + update-types: [ "version-update:semver-major" ] + # Restrict updates in this branch to jetty in the 11.x.x space + - dependency-name: "jakarta.activation:*" + versions: [ ">=2.1.0" ] + - dependency-name: "jakarta.annotation:*" + versions: [ ">=3.0.0" ] + - dependency-name: "jakarta.authentication:*" + versions: [ ">=3.0.0" ] + - dependency-name: "jakarta.el:*" + versions: [ ">=5.0.0" ] + - dependency-name: "jakarta.enterprise:jakarta.enterprise.cdi-api:*" + versions: [ ">=3.0.0" ] + - dependency-name: "jakarta.inject:*" + versions: [ ">=3.0.0" ] + - dependency-name: "jakarta.interceptor:*" + versions: [ ">=2.0.0" ] + - dependency-name: "jakarta.mail:*" + versions: [ ">=3.0.0" ] + - dependency-name: "jakarta.servlet:*" + versions: [ ">=6.0.0" ] + - dependency-name: "jakarta.servlet.jsp:*" + versions: [ ">=4.0.0" ] + - dependency-name: "jakarta.servlet.jsp.jstl:*" + versions: [ ">=3.0.0" ] + - dependency-name: "jakarta.transaction:*" + versions: [ ">=2.0.0" ] + - dependency-name: "jakarta.websocket:*" + versions: [ ">=3.0.0" ] + - dependency-name: "jakarta.ws.rs:*" + versions: [ ">=4.0.0" ] + - dependency-name: "jakarta.xml.bind:*" + versions: [ ">=4.0.0" ] + - dependency-name: "org.glassfish.jaxb:*" + versions: [ ">=4.0.0"] + - dependency-name: "jakarta.xml.ws:*" + versions: [ ">=4.0.0" ] + - dependency-name: "com.sun.xml.ws:jaxws*" + versions: [ ">=4.0.0" ] + - dependency-name: "org.jboss.weld.servlet:*" + versions: [ ">=5.0.0" ] + - dependency-name: "org.infinispan:*" + versions: [ ">=12" ] + - dependency-name: "com.hazelcast:*" + versions: [ ">=5.4.0"] + - dependency-name: "org.jboss.threads:jboss-threads" + versions: [ ">=3.7.0"] + + - package-ecosystem: maven + directory: "/jetty-ee9" + target-branch: "jetty-12.0.x" + open-pull-requests-limit: 30 + schedule: + interval: "weekly" + day: "saturday" + time: "10:00" + timezone: "Australia/Brisbane" + commit-message: + prefix: "[12.0.x EE9] " + groups: + build-deps: + patterns: + - "org.apache.maven:*" + - "org.apache.maven.plugins:*" + - "org.apache.maven.plugin-tools:*" + - "org.apache.felix:*-plugin" + - "org.apache.servicemix.tooling:*" + - "org.asciidoctor:*" + - "org.codehaus.mojo:*" + - "org.eclipse.jetty.toolchain:*-maven-plugin" + - "org.jacoco:*" + - "org.mortbay:*-maven-plugin" + - "org.testcontainers:*" + - "com.diffplug.spotless:*" + - "com.github.spotbugs:*" + - "com.mycila:*" + integration-deps: + patterns: + - "org.infinispan*" + - "org.mongodb*" + - "org.wildfly*" + - "org.eclipse.platform*" + - "com.google.cloud:*" + - "org.hawtio:*" + spec-deps: + patterns: + - "jakarta.*" + - "org.jboss.weld.*" + - "com.sun.xml*" + - "org.glassfish.jaxb*" + - "org.mortbay.jasper:*" + dev-dependencies: + patterns: + - "*" + ignore: + # Do not upgrade major versions of dependencies + - dependency-name: "*" + update-types: [ "version-update:semver-major" ] + + - package-ecosystem: maven + directory: "/jetty-e10" + target-branch: "jetty-12.0.x" + open-pull-requests-limit: 30 + schedule: + interval: "weekly" + day: "saturday" + time: "10:00" + timezone: "Australia/Brisbane" + commit-message: + prefix: "[12.0.x EE10] " + groups: + build-deps: + patterns: + - "org.apache.maven:*" + - "org.apache.maven.plugins:*" + - "org.apache.maven.plugin-tools:*" + - "org.apache.felix:*-plugin" + - "org.apache.servicemix.tooling:*" + - "org.asciidoctor:*" + - "org.codehaus.mojo:*" + - "org.eclipse.jetty.toolchain:*-maven-plugin" + - "org.jacoco:*" + - "org.mortbay:*-maven-plugin" + - "org.testcontainers:*" + - "com.diffplug.spotless:*" + - "com.github.spotbugs:*" + - "com.mycila:*" + integration-deps: + patterns: + - "org.infinispan*" + - "org.mongodb*" + - "org.wildfly*" + - "org.eclipse.platform*" + - "com.google.cloud:*" + - "org.hawtio:*" + spec-deps: + patterns: + - "jakarta.*" + - "org.jboss.weld.*" + - "com.sun.xml*" + - "org.glassfish.jaxb*" + - "org.mortbay.jasper:*" + dev-dependencies: + patterns: + - "*" + ignore: + # Do not upgrade major versions of dependencies + - dependency-name: "*" + update-types: [ "version-update:semver-major" ] diff --git a/jetty-core/pom.xml b/jetty-core/pom.xml index 65922666962b..6b6b652edb5c 100644 --- a/jetty-core/pom.xml +++ b/jetty-core/pom.xml @@ -61,133 +61,4 @@ - - - - dependency-updates-reports - - - - org.codehaus.mojo - versions-maven-plugin - - - core-report - - dependency-updates-aggregate-report - - validate - - - html - - true - true - - - - - org.apache.maven - - - regex - .+-(alpha|beta).?[0-9]+ - - - - - - org.eclipse.jetty - - - regex - .+ - - - - - - org.eclipse.jetty.* - - - regex - .+ - - - - - - - - - - - - - - - update-dependencies-core - - - - org.codehaus.mojo - versions-maven-plugin - - - core-update - - update-properties - - validate - - true - true - - - - - org.apache.maven - - - regex - .+-(alpha|beta).?[0-9]+ - - - - - - org.eclipse.jetty - - - regex - .+ - - - - - - org.eclipse.jetty.* - - - regex - .+ - - - - - - - - - - - - - - diff --git a/jetty-ee10/pom.xml b/jetty-ee10/pom.xml index f037f860d55e..679b02805169 100644 --- a/jetty-ee10/pom.xml +++ b/jetty-ee10/pom.xml @@ -275,379 +275,4 @@ - - - - dependency-updates-reports - - - - org.codehaus.mojo - versions-maven-plugin - - - ee10-report - - dependency-updates-aggregate-report - - validate - - - html - - true - true - - - - - org.apache.maven - - - regex - .+-(alpha|beta).?[0-9]+ - - - - - - org.eclipse.jetty - - - regex - .+ - - - - - - org.eclipse.jetty.* - - - regex - .+ - - - - - - org.apache.mina - - - regex - .+-M[0-9]+$ - - - - - - - - - - - - - - - update-dependencies-ee10 - - - - org.codehaus.mojo - versions-maven-plugin - - - ee10-update - - update-properties - - validate - - true - true - - - - - org.apache.maven - - - regex - .+-(alpha|beta).?[0-9]+ - - - - - - org.eclipse.jetty - - - regex - .+ - - - - - - org.eclipse.jetty.* - - - regex - .+ - - - - - - org.apache.mina - - - regex - .+-M[0-9]+$ - - - - - - jakarta.activation - - - regex - ^(?!2.1.).+ - - - - - - jakarta.annotation - - - regex - ^(?!2.1.).+ - - - - - - jakarta.authentication - - - regex - ^(?!3.0.).+ - - - - - - jakarta.el - - - regex - ^(?!5.0.).+ - - - - - - jakarta.enterprise - jakarta.enterprise.cdi-api - - - regex - ^(?!4.0.).+ - - - - - - jakarta.enterprise - jakarta.enterprise.lang-model - - - regex - ^(?!4.0.).+ - - - - - - jakarta.inject - jakarta.inject-api - - - regex - ^(?!2.0.).+ - - - - - - jakarta.interceptor - jakarta.interceptor-api - - - regex - ^(?!2.1.).+ - - - - - - jakarta.mail - jakarta.mail-api - - - regex - ^(?!2.1.).+ - - - - - - jakarta.servlet - jakarta.servlet-api - - - regex - ^(?!6.0.).+ - - - - - - jakarta.servlet - jakarta.servlet.jsp-api - - - regex - ^(?!3.1.).+ - - - - - - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api - - - regex - ^(?!3.0.).+ - - - - - - org.glassfish.web - jakarta.servlet.jsp.jstl - - - regex - ^(?!3.0.).+ - - - - - - jakarta.transaction - jakarta.transaction-api - - - regex - ^(?!3.0.).+ - - - - - - jakarta.websocket - jakarta.websocket-api - - - regex - ^(?!2.1.).+ - - - - - - jakarta.websocket - jakarta.websocket-client-api - - - regex - ^(?!2.1.).+ - - - - - - jakarta.ws.rs - jakarta.ws.rs-api - - - regex - ^(?!3.1).+ - - - - - - com.sun.xml.ws - jaxws-rt - - - regex - ^(?!4.0).+ - - - - - - org.glassfish.jaxb - jaxb-runtime - - - regex - ^(?!4.0.).+ - - - - - - jakarta.xml.bind - jakarta.xml.bind-api - - - regex - ^(?!4.0.).+ - - - - - - jakarta.xml.ws - jakarta.xml.ws-api - - - regex - ^(?!4.0.).+ - - - - - - - - - - - - - diff --git a/jetty-ee11/pom.xml b/jetty-ee11/pom.xml index f3224a4ff79a..e156b797626f 100644 --- a/jetty-ee11/pom.xml +++ b/jetty-ee11/pom.xml @@ -236,379 +236,4 @@ - - - - dependency-updates-reports - - - - org.codehaus.mojo - versions-maven-plugin - - - ee11-report - - dependency-updates-aggregate-report - - validate - - - html - - true - true - - - - - org.apache.maven - - - regex - .+-(alpha|beta).?[0-9]+ - - - - - - org.eclipse.jetty - - - regex - .+ - - - - - - org.eclipse.jetty.* - - - regex - .+ - - - - - - org.apache.mina - - - regex - .+-M[0-9]+$ - - - - - - - - - - - - - - - update-dependencies-ee11 - - - - org.codehaus.mojo - versions-maven-plugin - - - ee11-update - - update-properties - - validate - - true - true - - - - - org.apache.maven - - - regex - .+-(alpha|beta).?[0-9]+ - - - - - - org.eclipse.jetty - - - regex - .+ - - - - - - org.eclipse.jetty.* - - - regex - .+ - - - - - - org.apache.mina - - - regex - .+-M[0-9]+$ - - - - - - jakarta.activation - - - regex - ^(?!2.1.).+ - - - - - - jakarta.annotation - - - regex - ^(?!2.1.).+ - - - - - - jakarta.authentication - - - regex - ^(?!3.0.).+ - - - - - - jakarta.el - - - regex - ^(?!6.0.).+ - - - - - - jakarta.enterprise - jakarta.enterprise.cdi-api - - - regex - ^(?!4.1.).+ - - - - - - jakarta.enterprise - jakarta.enterprise.lang-model - - - regex - ^(?!4.1.).+ - - - - - - jakarta.inject - jakarta.inject-api - - - regex - ^(?!2.0.).+ - - - - - - jakarta.interceptor - jakarta.interceptor-api - - - regex - ^(?!2.2.).+ - - - - - - jakarta.mail - jakarta.mail-api - - - regex - ^(?!2.1.).+ - - - - - - jakarta.servlet - jakarta.servlet-api - - - regex - ^(?!6.0.).+ - - - - - - jakarta.servlet - jakarta.servlet.jsp-api - - - regex - ^(?!4.0.).+ - - - - - - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api - - - regex - ^(?!3.0.).+ - - - - - - org.glassfish.wasp - wasp - - - regex - ^(?!4.0.).+ - - - - - - jakarta.transaction - jakarta.transaction-api - - - regex - ^(?!3.0.).+ - - - - - - jakarta.websocket - jakarta.websocket-api - - - regex - ^(?!2.2.).+ - - - - - - jakarta.websocket - jakarta.websocket-client-api - - - regex - ^(?!2.1.).+ - - - - - - jakarta.ws.rs - jakarta.ws.rs-api - - - regex - ^(?!3.1).+ - - - - - - com.sun.xml.ws - jaxws-rt - - - regex - ^(?!4.0).+ - - - - - - org.glassfish.jaxb - jaxb-runtime - - - regex - ^(?!4.0.).+ - - - - - - jakarta.xml.bind - jakarta.xml.bind-api - - - regex - ^(?!4.0.).+ - - - - - - jakarta.xml.ws - jakarta.xml.ws-api - - - regex - ^(?!4.0.).+ - - - - - - - - - - - - - diff --git a/jetty-ee8/pom.xml b/jetty-ee8/pom.xml index 3fd5c27fabed..cec6c7787b59 100644 --- a/jetty-ee8/pom.xml +++ b/jetty-ee8/pom.xml @@ -422,292 +422,4 @@ ${project.build.directory}/generated-test-sources/ee8 - - - - dependency-updates-reports - - - - org.codehaus.mojo - versions-maven-plugin - - - ee8-report - - dependency-updates-aggregate-report - - validate - - - html - - true - true - - - - - org.apache.maven - - - regex - .+-(alpha|beta).?[0-9]+ - - - - - - org.eclipse.jetty - - - regex - .+ - - - - - - org.eclipse.jetty.* - - - regex - .+ - - - - - - jakarta.annotation - - - regex - ^(?!1.).+ - - - - - - jakarta.servlet.jsp - jakarta.servlet.jsp-api - - - regex - ^(?!2.).+ - - - - - - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api - - - regex - ^(?!1.).+ - - - - - - jakarta.transaction - jakarta.transaction-api - - - regex - ^(?!1.).+ - - - - - - org.apache.directory.api - - - regex - ^(?!2.1.).+ - - - - - - org.mortbay.jasper - mortbay-apache-jsp - - - regex - ^(?!9.0.).+ - - - - - - org.apache.mina - - - regex - .+-M[0-9]+$ - - - - - - - - - - - - - - - update-dependencies-ee8 - - - - org.codehaus.mojo - versions-maven-plugin - - - ee8-update - - update-properties - - validate - - true - true - - - - - org.apache.maven - - - regex - .+-(alpha|beta).?[0-9]+ - - - - - - org.eclipse.jetty - - - regex - .+ - - - - - - org.eclipse.jetty.* - - - regex - .+ - - - - - - jakarta.annotation - - - regex - ^(?!1.).+ - - - - - - jakarta.servlet.jsp - jakarta.servlet.jsp-api - - - regex - ^(?!2.).+ - - - - - - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api - - - regex - ^(?!1.).+ - - - - - - jakarta.transaction - jakarta.transaction-api - - - regex - ^(?!1.).+ - - - - - - org.apache.directory.api - - - regex - ^(?!2.1.).+ - - - - - - org.mortbay.jasper - mortbay-apache-jsp - - - regex - ^(?!9.0.).+ - - - - - - org.apache.mina - - - regex - .+-M[0-9]+$ - - - - - - - - - - - - - diff --git a/jetty-ee9/pom.xml b/jetty-ee9/pom.xml index 490343aaa1ba..b73dfecdab5c 100644 --- a/jetty-ee9/pom.xml +++ b/jetty-ee9/pom.xml @@ -309,485 +309,4 @@ - - - - dependency-updates-reports - - - - org.codehaus.mojo - versions-maven-plugin - - - ee9-report - - dependency-updates-aggregate-report - - validate - - - html - - true - true - - - - - org.apache.maven - - - regex - .+-(alpha|beta).?[0-9]+ - - - - - - org.eclipse.jetty - - - regex - .+ - - - - - - org.eclipse.jetty.* - - - regex - .+ - - - - - - jakarta.activation - - - regex - ^(?!2.0.).+ - - - - - - jakarta.annotation - - - regex - ^(?!2.0.).+ - - - - - - jakarta.authentication - - - regex - ^(?!2.).+ - - - - - - jakarta.el - - - regex - ^(?!4.).+ - - - - - - jakarta.enterprise - jakarta.enterprise.cdi-api - - - regex - ^(?!3.).+ - - - - - - jakarta.interceptor - jakarta.interceptor-api - - - regex - ^(?!2.0.).+ - - - - - - jakarta.mail - jakarta.mail-api - - - regex - ^(?!2.0.).+ - - - - - - jakarta.servlet - jakarta.servlet-api - - - regex - ^(?!5.).+ - - - - - - jakarta.servlet - jakarta.servlet.jsp-api - - - regex - ^(?!3.0.).+ - - - - - - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api - - - regex - ^(?!2.).+ - - - - - - org.glassfish.web - jakarta.servlet.jsp.jstl - - - regex - ^(?!2.).+ - - - - - - org.mortbay.jasper - mortbay-apache-jsp - - - regex - ^(?!10.0.).+ - - - - - - org.mortbay.jasper - mortbay-apache-el - - - regex - ^(?!10.0.).+ - - - - - - org.apache.mina - - - regex - .+-M[0-9]+$ - - - - - - - - - - - - - - - update-dependencies-ee9 - - - - org.codehaus.mojo - versions-maven-plugin - - - ee9-update - - update-properties - - validate - - true - true - - - - - org.apache.maven - - - regex - .+-(alpha|beta).?[0-9]+ - - - - - - org.eclipse.jetty - - - regex - .+ - - - - - - org.eclipse.jetty.* - - - regex - .+ - - - - - - jakarta.activation - - - regex - ^(?!2.0.).+ - - - - - - jakarta.annotation - - - regex - ^(?!2.0.).+ - - - - - - jakarta.authentication - - - regex - ^(?!2.).+ - - - - - - jakarta.el - - - regex - ^(?!4.).+ - - - - - - jakarta.enterprise - jakarta.enterprise.cdi-api - - - regex - ^(?!3.).+ - - - - - - jakarta.interceptor - jakarta.interceptor-api - - - regex - ^(?!2.0.).+ - - - - - - jakarta.inject - jakarta.inject-api - - - regex - ^(?!2.0.).+ - - - - - - jakarta.mail - jakarta.mail-api - - - regex - ^(?!2.0.).+ - - - - - - jakarta.servlet - jakarta.servlet-api - - - regex - ^(?!5.).+ - - - - - - jakarta.servlet - jakarta.servlet.jsp-api - - - regex - ^(?!3.0.).+ - - - - - - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api - - - regex - ^(?!2.).+ - - - - - - jakarta.ws.rs - jakarta.ws.rs-api - - - regex - ^(?!3.0).+ - - - - - - jakarta.xml.bind - jakarta.xml.bind-api - - - regex - ^(?!3.0.).+ - - - - - - org.glassfish.jaxb - jaxb-runtime - - - regex - ^(?!3.0.).+ - - - - - - com.sun.xml.ws - jaxws-rt - - - regex - ^(?!3.0.).+ - - - - - - jakarta.xml.ws - jakarta.xml.ws-api - - - regex - ^(?!3.0.).+ - - - - - - org.mortbay.jasper - mortbay-apache-jsp - - - regex - ^(?!10.0.).+ - - - - - - org.mortbay.jasper - mortbay-apache-el - - - regex - ^(?!10.0.).+ - - - - - - org.apache.mina - - - regex - .+-M[0-9]+$ - - - - - - - - - - - - - From 61009d361e2cbf48e6c2e8078f4e6ca3038ed77d Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 9 Oct 2025 22:04:32 +1000 Subject: [PATCH 2/2] remove not anymore needed files Signed-off-by: Olivier Lamy --- Jenkinsfile-dependency-report | 46 --------------------- build/scripts/dependency-update-reports.sh | 47 ---------------------- build/scripts/dependency-update.sh | 28 ------------- 3 files changed, 121 deletions(-) delete mode 100644 Jenkinsfile-dependency-report delete mode 100755 build/scripts/dependency-update-reports.sh delete mode 100755 build/scripts/dependency-update.sh diff --git a/Jenkinsfile-dependency-report b/Jenkinsfile-dependency-report deleted file mode 100644 index e25e11830abb..000000000000 --- a/Jenkinsfile-dependency-report +++ /dev/null @@ -1,46 +0,0 @@ -#!groovy - -pipeline { - agent any - triggers { - pollSCM('@weekly') - } - options { - skipDefaultCheckout() - buildDiscarder logRotator( numToKeepStr: '50' ) - // save some io during the build - durabilityHint( 'PERFORMANCE_OPTIMIZED' ) - } - parameters { - string( defaultValue: 'jetty-12.0.x', description: 'Jetty branch to build', - name: 'JETTY_BRANCH' ) - } - stages { - stage( "Build / Dependency Report" ) { - agent { - node { label 'linux' } - } - steps { - timeout( time: 120, unit: 'MINUTES' ) { - withEnv(["JAVA_HOME=${ tool "jdk17" }", - "PATH+MAVEN=${ tool "jdk17" }/bin:${tool "maven3"}/bin", - "MAVEN_OPTS=-Xms2g -Xmx4g -Djava.awt.headless=true"]) { - checkout([$class: 'GitSCM', - branches: [[name: "$JETTY_BRANCH"]], - extensions: [[$class: 'CloneOption', depth: 1, noTags: true, shallow: true, reference: "/home/jenkins/jetty.project.git"]], - userRemoteConfigs: [[url: 'https://github.com/eclipse/jetty.project.git']]]) - sh "mvn install -ntp -DskipTests -T5" - sh "bash ./build/scripts/dependency-update-reports.sh" - publishHTML([allowMissing: false, alwaysLinkToLastBuild: true, keepAll: true, reportDir: "reports/dependency-update-reports/", reportFiles: 'dependency-updates-report-*.html', reportName: 'Dependencies Report', reportTitles: '']) - } - } - } - } - } -} - - - - - -// vim: et:ts=2:sw=2:ft=groovy diff --git a/build/scripts/dependency-update-reports.sh b/build/scripts/dependency-update-reports.sh deleted file mode 100755 index 98bf5799bf8b..000000000000 --- a/build/scripts/dependency-update-reports.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/env bash - -echo "# This script is meant to be run from the root of the project" -echo "[jetty.project-12.0.0x]$ build/scripts/dependency-updates-report.sh" - -PWD=$(pwd) -REPORT_OUTPUT_DIR=$PWD/reports/dependency-update-reports/ - -if [ -d $REPORT_OUTPUT_DIR ] ; then - rm -rf $REPORT_OUTPUT_DIR/* -fi - -mkdir -p $REPORT_OUTPUT_DIR - -echo "HTML Reports can be found in $REPORT_OUTPUT_DIR" - -mvn -N -B -Pdependency-updates-reports validate -Dmaven.build.cache.enabled=false - -cp -Rv target/site/* $REPORT_OUTPUT_DIR -mv $REPORT_OUTPUT_DIR/dependency-updates-aggregate-report.html $REPORT_OUTPUT_DIR/dependency-updates-report-root.html - -pushd jetty-core -mvn -B -Pdependency-updates-reports validate -Dmaven.build.cache.enabled=false -cp target/site/dependency-updates-aggregate-report.html $REPORT_OUTPUT_DIR/dependency-updates-report-core.html -popd - -pushd jetty-ee11 -mvn -B -Pdependency-updates-reports validate -Dmaven.build.cache.enabled=false -cp target/site/dependency-updates-aggregate-report.html $REPORT_OUTPUT_DIR/dependency-updates-report-ee11.html -popd - -pushd jetty-ee10 -mvn -B -Pdependency-updates-reports validate -Dmaven.build.cache.enabled=false -cp target/site/dependency-updates-aggregate-report.html $REPORT_OUTPUT_DIR/dependency-updates-report-ee10.html -popd - -pushd jetty-ee9 -mvn -B -Pdependency-updates-reports validate -Dmaven.build.cache.enabled=false -cp target/site/dependency-updates-aggregate-report.html $REPORT_OUTPUT_DIR/dependency-updates-report-ee9.html -popd - -pushd jetty-ee8 -mvn -B -Pdependency-updates-reports validate -Dmaven.build.cache.enabled=false -cp target/site/dependency-updates-aggregate-report.html $REPORT_OUTPUT_DIR/dependency-updates-report-ee8.html -popd - -echo "HTML Reports can be found in $REPORT_OUTPUT_DIR" diff --git a/build/scripts/dependency-update.sh b/build/scripts/dependency-update.sh deleted file mode 100755 index 18f02db30166..000000000000 --- a/build/scripts/dependency-update.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash - -echo "# This script is meant to be run from the root of the project" -echo "[jetty.project-12.0.x]$ build/scripts/dependency-update.sh" - -PWD=$(pwd) - -mvn -N -B -Pupdate-dependencies validate -Dmaven.build.cache.enabled=false - -pushd jetty-core -mvn -N -B -Pupdate-dependencies-core validate -Dmaven.build.cache.enabled=false -popd - -pushd jetty-ee11 -mvn -N -B -Pupdate-dependencies-ee11 validate -Dmaven.build.cache.enabled=false -popd - -pushd jetty-ee10 -mvn -N -B -Pupdate-dependencies-ee10 validate -Dmaven.build.cache.enabled=false -popd - -pushd jetty-ee9 -mvn -N -B -Pupdate-dependencies-ee9 validate -Dmaven.build.cache.enabled=false -popd - -pushd jetty-ee8 -mvn -N -B -Pupdate-dependencies-ee8 validate -Dmaven.build.cache.enabled=false -popd