From ccb03ed3ddf2f894ee5b2d8e05d64207dfc57716 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Jun 2024 00:35:35 +0000 Subject: [PATCH 01/20] [10.0.x] Bump the build-deps group with 13 updates Bumps the build-deps group with 13 updates: | Package | From | To | | --- | --- | --- | | [org.testcontainers:testcontainers-bom](https://github.com/testcontainers/testcontainers-java) | `1.19.7` | `1.19.8` | | [org.apache.maven.plugin-tools:maven-plugin-tools-api](https://github.com/apache/maven-plugin-tools) | `3.12.0` | `3.13.1` | | [org.apache.maven.plugin-tools:maven-plugin-annotations](https://github.com/apache/maven-plugin-tools) | `3.12.0` | `3.13.1` | | [org.asciidoctor:asciidoctorj](https://github.com/asciidoctor/asciidoctorj) | `2.5.12` | `2.5.13` | | [com.mycila:license-maven-plugin](https://github.com/mathieucarbou/license-maven-plugin) | `4.3` | `4.5` | | [org.apache.maven.plugins:maven-enforcer-plugin](https://github.com/apache/maven-enforcer) | `3.4.1` | `3.5.0` | | [org.apache.maven.plugins:maven-invoker-plugin](https://github.com/apache/maven-invoker-plugin) | `3.6.1` | `3.7.0` | | [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) | `3.6.3` | `3.7.0` | | [org.apache.maven.plugins:maven-plugin-plugin](https://github.com/apache/maven-plugin-tools) | `3.12.0` | `3.13.1` | | [org.apache.maven.plugins:maven-shade-plugin](https://github.com/apache/maven-shade-plugin) | `3.5.3` | `3.6.0` | | [org.codehaus.mojo:build-helper-maven-plugin](https://github.com/mojohaus/build-helper-maven-plugin) | `3.5.0` | `3.6.0` | | [org.codehaus.mojo:exec-maven-plugin](https://github.com/mojohaus/exec-maven-plugin) | `3.2.0` | `3.3.0` | | [com.github.spotbugs:spotbugs-maven-plugin](https://github.com/spotbugs/spotbugs-maven-plugin) | `4.8.4.0` | `4.8.5.0` | Updates `org.testcontainers:testcontainers-bom` from 1.19.7 to 1.19.8 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.19.7...1.19.8) Updates `org.apache.maven.plugin-tools:maven-plugin-tools-api` from 3.12.0 to 3.13.1 - [Release notes](https://github.com/apache/maven-plugin-tools/releases) - [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.12.0...maven-plugin-tools-3.13.1) Updates `org.apache.maven.plugin-tools:maven-plugin-annotations` from 3.12.0 to 3.13.1 - [Release notes](https://github.com/apache/maven-plugin-tools/releases) - [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.12.0...maven-plugin-tools-3.13.1) Updates `org.asciidoctor:asciidoctorj` from 2.5.12 to 2.5.13 - [Release notes](https://github.com/asciidoctor/asciidoctorj/releases) - [Changelog](https://github.com/asciidoctor/asciidoctorj/blob/v2.5.13/CHANGELOG.adoc) - [Commits](https://github.com/asciidoctor/asciidoctorj/compare/v2.5.12...v2.5.13) Updates `org.apache.maven.plugin-tools:maven-plugin-annotations` from 3.12.0 to 3.13.1 - [Release notes](https://github.com/apache/maven-plugin-tools/releases) - [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.12.0...maven-plugin-tools-3.13.1) Updates `com.mycila:license-maven-plugin` from 4.3 to 4.5 - [Commits](https://github.com/mathieucarbou/license-maven-plugin/compare/license-maven-plugin-4.3...license-maven-plugin-4.5) Updates `org.apache.maven.plugins:maven-enforcer-plugin` from 3.4.1 to 3.5.0 - [Release notes](https://github.com/apache/maven-enforcer/releases) - [Commits](https://github.com/apache/maven-enforcer/compare/enforcer-3.4.1...enforcer-3.5.0) Updates `org.apache.maven.plugins:maven-invoker-plugin` from 3.6.1 to 3.7.0 - [Release notes](https://github.com/apache/maven-invoker-plugin/releases) - [Commits](https://github.com/apache/maven-invoker-plugin/compare/maven-invoker-plugin-3.6.1...maven-invoker-plugin-3.7.0) Updates `org.apache.maven.plugins:maven-javadoc-plugin` from 3.6.3 to 3.7.0 - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.6.3...maven-javadoc-plugin-3.7.0) Updates `org.apache.maven.plugins:maven-plugin-plugin` from 3.12.0 to 3.13.1 - [Release notes](https://github.com/apache/maven-plugin-tools/releases) - [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.12.0...maven-plugin-tools-3.13.1) Updates `org.apache.maven.plugins:maven-shade-plugin` from 3.5.3 to 3.6.0 - [Release notes](https://github.com/apache/maven-shade-plugin/releases) - [Commits](https://github.com/apache/maven-shade-plugin/compare/maven-shade-plugin-3.5.3...maven-shade-plugin-3.6.0) Updates `org.codehaus.mojo:build-helper-maven-plugin` from 3.5.0 to 3.6.0 - [Release notes](https://github.com/mojohaus/build-helper-maven-plugin/releases) - [Commits](https://github.com/mojohaus/build-helper-maven-plugin/compare/3.5.0...3.6.0) Updates `org.codehaus.mojo:exec-maven-plugin` from 3.2.0 to 3.3.0 - [Release notes](https://github.com/mojohaus/exec-maven-plugin/releases) - [Commits](https://github.com/mojohaus/exec-maven-plugin/compare/3.2.0...3.3.0) Updates `com.github.spotbugs:spotbugs-maven-plugin` from 4.8.4.0 to 4.8.5.0 - [Release notes](https://github.com/spotbugs/spotbugs-maven-plugin/releases) - [Commits](https://github.com/spotbugs/spotbugs-maven-plugin/compare/spotbugs-maven-plugin-4.8.4.0...spotbugs-maven-plugin-4.8.5.0) --- updated-dependencies: - dependency-name: org.testcontainers:testcontainers-bom dependency-type: direct:production update-type: version-update:semver-patch dependency-group: build-deps - dependency-name: org.apache.maven.plugin-tools:maven-plugin-tools-api dependency-type: direct:production update-type: version-update:semver-minor dependency-group: build-deps - dependency-name: org.apache.maven.plugin-tools:maven-plugin-annotations dependency-type: direct:production update-type: version-update:semver-minor dependency-group: build-deps - dependency-name: org.asciidoctor:asciidoctorj dependency-type: direct:production update-type: version-update:semver-patch dependency-group: build-deps - dependency-name: org.apache.maven.plugin-tools:maven-plugin-annotations dependency-type: direct:production update-type: version-update:semver-minor dependency-group: build-deps - dependency-name: com.mycila:license-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: build-deps - dependency-name: org.apache.maven.plugins:maven-enforcer-plugin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: build-deps - dependency-name: org.apache.maven.plugins:maven-invoker-plugin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: build-deps - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: build-deps - dependency-name: org.apache.maven.plugins:maven-plugin-plugin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: build-deps - dependency-name: org.apache.maven.plugins:maven-shade-plugin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: build-deps - dependency-name: org.codehaus.mojo:build-helper-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: build-deps - dependency-name: org.codehaus.mojo:exec-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: build-deps - dependency-name: com.github.spotbugs:spotbugs-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch dependency-group: build-deps ... Signed-off-by: dependabot[bot] --- pom.xml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 265daa4f494..2343827a042 100644 --- a/pom.xml +++ b/pom.xml @@ -200,11 +200,11 @@ 4.4.16 2.2.6 2.3.0 - 2.5.12 + 2.5.13 9.7 4.2.1 6.4.1 - 3.5.0 + 3.6.0 1.5 3.2.0 10.16.0 @@ -290,13 +290,13 @@ 9.0.83.1 5.10.2 2.0.3 - 4.3 + 4.5 ${project.build.directory}/local-repo 2.23.1 1.3.14 10.3.6 3.3.3 - 3.12.0 + 3.13.1 3.1.0 3.7.1 5.1.9 @@ -306,19 +306,19 @@ 3.13.0 3.6.1 3.1.2 - 3.4.1 - 3.2.0 + 3.5.0 + 3.3.0 3.2.4 3.1.2 - 3.6.1 + 3.7.0 3.4.1 - 3.6.3 - 3.12.0 + 3.7.0 + 3.13.1 3.0.1 3.2.0 1.9.20 3.3.1 - 3.5.3 + 3.6.0 3.3.1 3.2.5 3.9.0 @@ -339,12 +339,12 @@ UTF-8 src/it/settings.xml 2.0.9 - 4.8.4.0 + 4.8.5.0 2.1.1.RELEASE 0 1.2.5 1.2.5 - 1.19.7 + 1.19.8 2.16.2 3.1.9.Final 1.7.0.Final From 7df1d7ec284d320cd7be8e1218ec6de95e9c032a Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Tue, 11 Jun 2024 11:31:16 +1000 Subject: [PATCH 02/20] fix some upperbound issue Signed-off-by: Olivier Lamy --- jetty-jspc-maven-plugin/pom.xml | 4 ++-- jetty-maven-plugin/pom.xml | 6 ++++++ pom.xml | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/jetty-jspc-maven-plugin/pom.xml b/jetty-jspc-maven-plugin/pom.xml index b36c64f27d6..ef8a3e4c409 100644 --- a/jetty-jspc-maven-plugin/pom.xml +++ b/jetty-jspc-maven-plugin/pom.xml @@ -22,8 +22,8 @@ maven-plugin-tools-api - junit - junit + javax.annotation + javax.annotation-api diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml index 2c136569319..a97e5993863 100644 --- a/jetty-maven-plugin/pom.xml +++ b/jetty-maven-plugin/pom.xml @@ -24,6 +24,12 @@ org.apache.maven.plugin-tools maven-plugin-tools-api + + + javax.annotation + javax.annotation-api + + org.codehaus.plexus diff --git a/pom.xml b/pom.xml index 2343827a042..39a13b6f2a7 100644 --- a/pom.xml +++ b/pom.xml @@ -321,7 +321,7 @@ 3.6.0 3.3.1 3.2.5 - 3.9.0 + 3.9.6 3.4.0 2.2.3 From 96a2d3f28b3b47bf86c42ea6836e3a875712be7a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 10:11:37 +0000 Subject: [PATCH 03/20] [10.0.x] Bump the integration-deps group across 1 directory with 4 updates Bumps the integration-deps group with 4 updates in the / directory: [org.wildfly.security:wildfly-elytron](https://github.com/wildfly-security/wildfly-elytron), [com.google.cloud:google-cloud-datastore](https://github.com/googleapis/java-datastore), [org.eclipse.platform:org.eclipse.osgi](https://github.com/eclipse-equinox/equinox) and [org.eclipse.platform:org.eclipse.osgi.services](https://github.com/eclipse-equinox/equinox). Updates `org.wildfly.security:wildfly-elytron` from 2.4.1.Final to 2.4.2.Final - [Commits](https://github.com/wildfly-security/wildfly-elytron/compare/2.4.1.Final...2.4.2.Final) Updates `com.google.cloud:google-cloud-datastore` from 2.19.1 to 2.20.1 - [Release notes](https://github.com/googleapis/java-datastore/releases) - [Changelog](https://github.com/googleapis/java-datastore/blob/main/CHANGELOG.md) - [Commits](https://github.com/googleapis/java-datastore/compare/v2.19.1...v2.20.1) Updates `org.eclipse.platform:org.eclipse.osgi` from 3.19.0 to 3.20.0 - [Commits](https://github.com/eclipse-equinox/equinox/commits) Updates `org.eclipse.platform:org.eclipse.osgi.services` from 3.12.0 to 3.12.100 - [Commits](https://github.com/eclipse-equinox/equinox/commits) --- updated-dependencies: - dependency-name: org.wildfly.security:wildfly-elytron dependency-type: direct:production update-type: version-update:semver-patch dependency-group: integration-deps - dependency-name: com.google.cloud:google-cloud-datastore dependency-type: direct:production update-type: version-update:semver-minor dependency-group: integration-deps - dependency-name: org.eclipse.platform:org.eclipse.osgi dependency-type: direct:development update-type: version-update:semver-minor dependency-group: integration-deps - dependency-name: org.eclipse.platform:org.eclipse.osgi.services dependency-type: direct:development update-type: version-update:semver-patch dependency-group: integration-deps ... Signed-off-by: dependabot[bot] --- jetty-gcloud/pom.xml | 2 +- jetty-osgi/pom.xml | 4 ++-- pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jetty-gcloud/pom.xml b/jetty-gcloud/pom.xml index e74575cb1f9..50ad357ba26 100644 --- a/jetty-gcloud/pom.xml +++ b/jetty-gcloud/pom.xml @@ -17,7 +17,7 @@ - 2.19.1 + 2.20.1 diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml index ae55e8dccc1..f7ae6022559 100644 --- a/jetty-osgi/pom.xml +++ b/jetty-osgi/pom.xml @@ -32,7 +32,7 @@ 1.6.1 1.5.1 1.4.1 - 3.12.0 + 3.12.100 1.2.0 1.0.2 1.0.1 @@ -40,7 +40,7 @@ 1.5.4 3.7.300 1.0.2 - 3.19.0 + 3.20.0 diff --git a/pom.xml b/pom.xml index 39a13b6f2a7..ca6bee2fe3a 100644 --- a/pom.xml +++ b/pom.xml @@ -348,7 +348,7 @@ 2.16.2 3.1.9.Final 1.7.0.Final - 2.4.1.Final + 2.4.2.Final 2.4.8 From 7e9b387c934d54f0259bd874eb9f79e2d930e707 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 12 Jun 2024 16:38:50 -0500 Subject: [PATCH 04/20] Bump google.errorprone from 2.27.0 to 2.28.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ca6bee2fe3a..e595b05b02f 100644 --- a/pom.xml +++ b/pom.xml @@ -221,7 +221,7 @@ 7.0.5 3.0.2 1.6.0 - 2.27.0 + 2.28.0 4.0.6 1.63.0 2.10.1 From e0c390aa7cc0c8843a92f895d36f823a779db4a3 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 12 Jun 2024 16:39:31 -0500 Subject: [PATCH 05/20] Bump jackson 2.17.0 to 2.17.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e595b05b02f..db0ee7135c6 100644 --- a/pom.xml +++ b/pom.xml @@ -235,7 +235,7 @@ 11.0.19.Final false false - 2.17.0 + 2.17.1 0.8.12 1.2.2 1.3.5 From 6e6f0a259903565906975617de9d9eeda9f8a146 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 12 Jun 2024 16:42:28 -0500 Subject: [PATCH 06/20] Bump gson 2.10.1 to 2.11.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index db0ee7135c6..bad47aee4d2 100644 --- a/pom.xml +++ b/pom.xml @@ -224,7 +224,7 @@ 2.28.0 4.0.6 1.63.0 - 2.10.1 + 2.11.0 33.1.0-jre 5.1.0 1.0.10 From d64389de22f8a089402abdfac44bdf8876f4da08 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 13 Jun 2024 16:34:12 +0000 Subject: [PATCH 07/20] [10.0.x] Bump the dev-dependencies group across 1 directory with 12 updates Bumps the dev-dependencies group with 12 updates in the / directory: | Package | From | To | | --- | --- | --- | | [com.google.guava:guava](https://github.com/google/guava) | `33.1.0-jre` | `33.2.1-jre` | | [io.grpc:grpc-core](https://github.com/grpc/grpc-java) | `1.63.0` | `1.64.0` | | io.hawt:hawtio-default | `3.0.1` | `3.0.2` | | org.apache.commons:commons-compress | `1.26.1` | `1.26.2` | | [org.codehaus.plexus:plexus-xml](https://github.com/codehaus-plexus/plexus-xml) | `4.0.3` | `4.0.4` | | [org.jboss.logging:jboss-logging](https://github.com/jboss-logging/jboss-logging) | `3.5.3.Final` | `3.6.0.Final` | | [org.mariadb.jdbc:mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) | `3.3.3` | `3.4.0` | | [com.puppycrawl.tools:checkstyle](https://github.com/checkstyle/checkstyle) | `10.16.0` | `10.17.0` | | [org.apache.maven.plugins:maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin) | `3.6.1` | `3.7.0` | | [org.apache.maven.plugins:maven-checkstyle-plugin](https://github.com/apache/maven-checkstyle-plugin) | `3.3.1` | `3.4.0` | | [com.hazelcast:hazelcast](https://github.com/hazelcast/hazelcast) | `5.3.6` | `5.3.7` | | [org.eclipse.tycho:tycho-p2-repository-plugin](https://github.com/eclipse-tycho/tycho) | `4.0.7` | `4.0.8` | Updates `com.google.guava:guava` from 33.1.0-jre to 33.2.1-jre - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) Updates `io.grpc:grpc-core` from 1.63.0 to 1.64.0 - [Release notes](https://github.com/grpc/grpc-java/releases) - [Commits](https://github.com/grpc/grpc-java/compare/v1.63.0...v1.64.0) Updates `io.hawt:hawtio-default` from 3.0.1 to 3.0.2 Updates `org.apache.commons:commons-compress` from 1.26.1 to 1.26.2 Updates `org.codehaus.plexus:plexus-xml` from 4.0.3 to 4.0.4 - [Release notes](https://github.com/codehaus-plexus/plexus-xml/releases) - [Commits](https://github.com/codehaus-plexus/plexus-xml/compare/plexus-xml-4.0.3...plexus-xml-4.0.4) Updates `org.jboss.logging:jboss-logging` from 3.5.3.Final to 3.6.0.Final - [Release notes](https://github.com/jboss-logging/jboss-logging/releases) - [Commits](https://github.com/jboss-logging/jboss-logging/compare/3.5.3.Final...3.6.0.Final) Updates `org.mariadb.jdbc:mariadb-java-client` from 3.3.3 to 3.4.0 - [Release notes](https://github.com/mariadb-corporation/mariadb-connector-j/releases) - [Changelog](https://github.com/mariadb-corporation/mariadb-connector-j/blob/master/CHANGELOG.md) - [Commits](https://github.com/mariadb-corporation/mariadb-connector-j/compare/3.3.3...3.4.0) Updates `com.puppycrawl.tools:checkstyle` from 10.16.0 to 10.17.0 - [Release notes](https://github.com/checkstyle/checkstyle/releases) - [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-10.16.0...checkstyle-10.17.0) Updates `org.apache.maven.plugins:maven-dependency-plugin` from 3.6.1 to 3.7.0 - [Release notes](https://github.com/apache/maven-dependency-plugin/releases) - [Commits](https://github.com/apache/maven-dependency-plugin/compare/maven-dependency-plugin-3.6.1...maven-dependency-plugin-3.7.0) Updates `org.apache.maven.plugins:maven-checkstyle-plugin` from 3.3.1 to 3.4.0 - [Commits](https://github.com/apache/maven-checkstyle-plugin/compare/maven-checkstyle-plugin-3.3.1...maven-checkstyle-plugin-3.4.0) Updates `com.hazelcast:hazelcast` from 5.3.6 to 5.3.7 - [Release notes](https://github.com/hazelcast/hazelcast/releases) - [Commits](https://github.com/hazelcast/hazelcast/compare/v5.3.6...v5.3.7) Updates `org.eclipse.tycho:tycho-p2-repository-plugin` from 4.0.7 to 4.0.8 - [Release notes](https://github.com/eclipse-tycho/tycho/releases) - [Changelog](https://github.com/eclipse-tycho/tycho/blob/main/RELEASE_NOTES.md) - [Commits](https://github.com/eclipse-tycho/tycho/compare/tycho-4.0.7...tycho-4.0.8) --- updated-dependencies: - dependency-name: com.google.guava:guava dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dev-dependencies - dependency-name: io.grpc:grpc-core dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dev-dependencies - dependency-name: io.hawt:hawtio-default dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dev-dependencies - dependency-name: org.apache.commons:commons-compress dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dev-dependencies - dependency-name: org.codehaus.plexus:plexus-xml dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dev-dependencies - dependency-name: org.jboss.logging:jboss-logging dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dev-dependencies - dependency-name: org.mariadb.jdbc:mariadb-java-client dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dev-dependencies - dependency-name: com.puppycrawl.tools:checkstyle dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dev-dependencies - dependency-name: org.apache.maven.plugins:maven-dependency-plugin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dev-dependencies - dependency-name: org.apache.maven.plugins:maven-checkstyle-plugin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dev-dependencies - dependency-name: com.hazelcast:hazelcast dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dev-dependencies - dependency-name: org.eclipse.tycho:tycho-p2-repository-plugin dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dev-dependencies ... Signed-off-by: dependabot[bot] --- jetty-p2/pom.xml | 2 +- pom.xml | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/jetty-p2/pom.xml b/jetty-p2/pom.xml index fee6e87120c..bd1bf5c32e2 100644 --- a/jetty-p2/pom.xml +++ b/jetty-p2/pom.xml @@ -11,7 +11,7 @@ Jetty :: P2 Generates a (maven based) P2 Updatesite - 4.0.7 + 4.0.8 diff --git a/demos/demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/demos/demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-web.xml index 76a7b85824b..73bf6c35cff 100644 --- a/demos/demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-web.xml +++ b/demos/demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-web.xml @@ -1,5 +1,5 @@ - + diff --git a/demos/demo-jaas-webapp/src/main/webapp/index.html b/demos/demo-jaas-webapp/src/main/webapp/index.html index c87f04cfce1..dafbd88aa86 100644 --- a/demos/demo-jaas-webapp/src/main/webapp/index.html +++ b/demos/demo-jaas-webapp/src/main/webapp/index.html @@ -45,7 +45,7 @@
-
+
diff --git a/demos/demo-jaas-webapp/src/main/webapp/login.html b/demos/demo-jaas-webapp/src/main/webapp/login.html index 3e82c524c08..607d8d38184 100644 --- a/demos/demo-jaas-webapp/src/main/webapp/login.html +++ b/demos/demo-jaas-webapp/src/main/webapp/login.html @@ -28,7 +28,7 @@
-
+
diff --git a/demos/demo-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml b/demos/demo-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml index b5b3234bf57..9ff1cfa4211 100644 --- a/demos/demo-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml +++ b/demos/demo-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml @@ -1,5 +1,5 @@ - + diff --git a/demos/demo-jetty-webapp/src/main/config/modules/demo.d/demo-rewrite-rules.xml b/demos/demo-jetty-webapp/src/main/config/modules/demo.d/demo-rewrite-rules.xml index cedd98cd877..d370e98b478 100644 --- a/demos/demo-jetty-webapp/src/main/config/modules/demo.d/demo-rewrite-rules.xml +++ b/demos/demo-jetty-webapp/src/main/config/modules/demo.d/demo-rewrite-rules.xml @@ -1,5 +1,5 @@ - + diff --git a/demos/demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/demos/demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml index 28127c882b6..48676b52a4e 100644 --- a/demos/demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml +++ b/demos/demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml @@ -1,5 +1,5 @@ - + diff --git a/demos/demo-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml b/demos/demo-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml index 3295cd62306..d03931f44ae 100644 --- a/demos/demo-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml +++ b/demos/demo-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml @@ -1,5 +1,5 @@ - + diff --git a/demos/demo-jndi-webapp/src/main/templates/plugin-context-header.xml b/demos/demo-jndi-webapp/src/main/templates/plugin-context-header.xml index 27829769c0e..adacbdb0120 100644 --- a/demos/demo-jndi-webapp/src/main/templates/plugin-context-header.xml +++ b/demos/demo-jndi-webapp/src/main/templates/plugin-context-header.xml @@ -1,5 +1,5 @@ - + diff --git a/demos/demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml b/demos/demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml index 191d6371497..f5bea072e97 100644 --- a/demos/demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml +++ b/demos/demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml @@ -1,5 +1,5 @@ - + diff --git a/demos/demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/demos/demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-web.xml index 4da3d62237c..ee6c6ae42cf 100644 --- a/demos/demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-web.xml +++ b/demos/demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-web.xml @@ -1,5 +1,5 @@ - + diff --git a/demos/demo-jndi-webapp/src/main/webapp/index.html b/demos/demo-jndi-webapp/src/main/webapp/index.html index 77d4dfed398..5f3a1addd04 100644 --- a/demos/demo-jndi-webapp/src/main/webapp/index.html +++ b/demos/demo-jndi-webapp/src/main/webapp/index.html @@ -48,7 +48,7 @@
-
+
diff --git a/demos/demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/demos/demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-web.xml index bd90a5e1303..8171068e94f 100644 --- a/demos/demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-web.xml +++ b/demos/demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-web.xml @@ -1,5 +1,5 @@ - + diff --git a/demos/demo-jsp-webapp/src/main/webapp/index.jsp b/demos/demo-jsp-webapp/src/main/webapp/index.jsp index f9cd990602a..e0f0c99e34f 100644 --- a/demos/demo-jsp-webapp/src/main/webapp/index.jsp +++ b/demos/demo-jsp-webapp/src/main/webapp/index.jsp @@ -39,7 +39,7 @@
-
+
diff --git a/demos/demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/demos/demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml index 169c0f903ad..70fbe6ae959 100644 --- a/demos/demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml +++ b/demos/demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml @@ -1,5 +1,5 @@ - + diff --git a/demos/demo-spec/demo-spec-webapp/src/main/config/modules/demo.d/demo-spec.xml b/demos/demo-spec/demo-spec-webapp/src/main/config/modules/demo.d/demo-spec.xml index 76779a891d7..1f4eccfc8ac 100644 --- a/demos/demo-spec/demo-spec-webapp/src/main/config/modules/demo.d/demo-spec.xml +++ b/demos/demo-spec/demo-spec-webapp/src/main/config/modules/demo.d/demo-spec.xml @@ -1,5 +1,5 @@ - + /test-spec diff --git a/demos/demo-spec/demo-spec-webapp/src/main/templates/annotations-context-header.xml b/demos/demo-spec/demo-spec-webapp/src/main/templates/annotations-context-header.xml index e5fb833ce02..af37e492619 100644 --- a/demos/demo-spec/demo-spec-webapp/src/main/templates/annotations-context-header.xml +++ b/demos/demo-spec/demo-spec-webapp/src/main/templates/annotations-context-header.xml @@ -1,5 +1,5 @@ - + diff --git a/demos/demo-spec/demo-spec-webapp/src/main/templates/plugin-context-header.xml b/demos/demo-spec/demo-spec-webapp/src/main/templates/plugin-context-header.xml index de0c0c9f69c..5696875ec01 100644 --- a/demos/demo-spec/demo-spec-webapp/src/main/templates/plugin-context-header.xml +++ b/demos/demo-spec/demo-spec-webapp/src/main/templates/plugin-context-header.xml @@ -1,5 +1,5 @@ - + diff --git a/demos/demo-spec/demo-spec-webapp/src/main/webapp/WEB-INF/jetty-env.xml b/demos/demo-spec/demo-spec-webapp/src/main/webapp/WEB-INF/jetty-env.xml index c3b96ec098b..34628988688 100644 --- a/demos/demo-spec/demo-spec-webapp/src/main/webapp/WEB-INF/jetty-env.xml +++ b/demos/demo-spec/demo-spec-webapp/src/main/webapp/WEB-INF/jetty-env.xml @@ -1,5 +1,5 @@ - + diff --git a/demos/demo-spec/demo-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/demos/demo-spec/demo-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml index 4893c6fa3de..89ddb70cb61 100644 --- a/demos/demo-spec/demo-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml +++ b/demos/demo-spec/demo-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml @@ -1,5 +1,5 @@ - + diff --git a/demos/demo-spec/demo-spec-webapp/src/main/webapp/index.html b/demos/demo-spec/demo-spec-webapp/src/main/webapp/index.html index ffa24a8976a..0f4ac2a53c8 100644 --- a/demos/demo-spec/demo-spec-webapp/src/main/webapp/index.html +++ b/demos/demo-spec/demo-spec-webapp/src/main/webapp/index.html @@ -80,7 +80,7 @@
-
+
diff --git a/demos/demo-spec/demo-spec-webapp/src/test/jetty-plugin-env.xml b/demos/demo-spec/demo-spec-webapp/src/test/jetty-plugin-env.xml index f3724c601b4..e916fac003e 100644 --- a/demos/demo-spec/demo-spec-webapp/src/test/jetty-plugin-env.xml +++ b/demos/demo-spec/demo-spec-webapp/src/test/jetty-plugin-env.xml @@ -1,5 +1,5 @@ - + diff --git a/demos/demo-template/src/main/resources/index.html b/demos/demo-template/src/main/resources/index.html index 7ebe375fcd6..9628c8783a8 100644 --- a/demos/demo-template/src/main/resources/index.html +++ b/demos/demo-template/src/main/resources/index.html @@ -29,7 +29,7 @@
-
+
diff --git a/demos/embedded/src/main/resources/exampleserver.xml b/demos/embedded/src/main/resources/exampleserver.xml index c7258dddb20..2dfc1f4e0d9 100644 --- a/demos/embedded/src/main/resources/exampleserver.xml +++ b/demos/embedded/src/main/resources/exampleserver.xml @@ -1,5 +1,5 @@ - + diff --git a/demos/embedded/src/main/resources/fileserver.xml b/demos/embedded/src/main/resources/fileserver.xml index 6f67e8d4cdc..4340d18bd03 100644 --- a/demos/embedded/src/main/resources/fileserver.xml +++ b/demos/embedded/src/main/resources/fileserver.xml @@ -1,5 +1,5 @@ - + diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/ant/jetty-ant.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/ant/jetty-ant.adoc index 9b30e9f6a30..c82c31c1a6a 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/ant/jetty-ant.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/ant/jetty-ant.adoc @@ -32,7 +32,7 @@ Its purpose is to provide almost the same functionality as the Jetty plugin for To set up your project for Ant to run Jetty, you need a Jetty distribution and the jetty-ant Jar: -1. https://eclipse.dev/jetty/download.php[Download] a Jetty distribution and unpack it in the local filesystem. +1. https://jetty.org/download.html[Download] a Jetty distribution and unpack it in the local filesystem. 2. https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-ant/[Get] the jetty-ant Jar. 3. Make a directory in your project called `jetty-lib/`. 4. Copy all of the Jars in your Jetty distribution's `lib` directory, and all its subdirectories, into your new `jetty-lib` dir. diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/contexts/custom-error-pages.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/contexts/custom-error-pages.adoc index bddb11db311..cdb9d405752 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/contexts/custom-error-pages.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/contexts/custom-error-pages.adoc @@ -72,7 +72,7 @@ Context files are normally located in `${jetty.base}/webapps/` (see `DeployerMan [source, xml, subs="{sub-order}"] ---- - + /test diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/releasing-jetty.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/releasing-jetty.adoc index 8509ef4588f..610f813b0d4 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/releasing-jetty.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/releasing-jetty.adoc @@ -230,7 +230,7 @@ There are two git repositories you need to be aware of for releasing jetty-docum jetty-documentation:: https://github.com/jetty-project/jetty-documentation jetty-website:: -http://git.eclipse.org/c/www.eclipse.org/jetty.git +http://github.com/jetty/jetty.website Do the following steps to publish documentation for the release: diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/configuring-specific-webapp-deployment.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/configuring-specific-webapp-deployment.adoc index 41fff9a9937..17670bf24e9 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/configuring-specific-webapp-deployment.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/configuring-specific-webapp-deployment.adoc @@ -41,7 +41,7 @@ For example, here is a descriptor file that deploys the file `/opt/myapp/myapp.w [source, xml, subs="{sub-order}"] ---- - + /wiki @@ -55,7 +55,7 @@ For example, if the system property is set to `myapp.home=/opt/myapp`, the previ [source, xml, subs="{sub-order}"] ---- - + /wiki @@ -83,7 +83,7 @@ This can help make it clear that users should not make changes to the temporary [source, xml, subs="{sub-order}"] ---- - + /wiki @@ -99,7 +99,7 @@ However, since the `web.xml` for the web application is processed after the depl [source, xml, subs="{sub-order}"] ---- - + /wiki @@ -120,7 +120,7 @@ This feature is useful when adding parameters or additional Servlet mappings wit [source, xml, subs="{sub-order}"] ---- - + /wiki @@ -135,7 +135,7 @@ If the `web.xml` does not include a reference to this data source, an override d [source, xml, subs="{sub-order}"] ---- - + /wiki diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/deployment-architecture.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/deployment-architecture.adoc index 6b0a29c18e3..94b241ed2fa 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/deployment-architecture.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/deployment-architecture.adoc @@ -99,7 +99,7 @@ In the standard Jetty Distribution, this is configured in the `${jetty.home}/etc [source, xml, subs="{sub-order}"] ---- - + diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/deployment-processing-webapps.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/deployment-processing-webapps.adoc index e9cd4d2517d..d9b24efd246 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/deployment-processing-webapps.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/deployment-processing-webapps.adoc @@ -130,7 +130,7 @@ Let's see an example of how we would add in the Configurations for both JNDI _an [source, xml, subs="{sub-order}"] ---- - + @@ -162,7 +162,7 @@ They will then be applied to each `WebAppContext` deployed by the deployer: [source, xml, subs="{sub-order}"] ---- - + @@ -206,7 +206,7 @@ This example uses an xml file, in fact it is the `$JETTY_HOME/etc/jetty-plus.xml [source, xml, subs="{sub-order}"] ---- - + @@ -256,7 +256,7 @@ Here's an example from a context xml file (although as always, you could have ac [source, xml, subs="{sub-order}"] ---- - + @@ -282,7 +282,7 @@ Here's an example in a xml file of a pattern that matches any jar that starts wi [source, xml, subs="{sub-order}"] ---- - + diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/quickstart-webapp.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/quickstart-webapp.adoc index c9b0417d155..5eccb6b64e3 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/quickstart-webapp.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/quickstart-webapp.adoc @@ -100,7 +100,7 @@ Otherwise, create a context xml file with the following information (in addition [source, xml, subs="{sub-order}"] ---- - + true diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/static-content-deployment.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/static-content-deployment.adoc index 92f62d1eaf3..736f136de0d 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/static-content-deployment.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/static-content-deployment.adoc @@ -20,7 +20,7 @@ Create a file called `scratch.xml` in the `${jetty.base}/webapps` directory and [source, xml, subs="{sub-order}"] ---- - + /scratch diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/extras/moved-context-handler.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/extras/moved-context-handler.adoc index d860770896e..c012f5f76ec 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/extras/moved-context-handler.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/extras/moved-context-handler.adoc @@ -43,7 +43,7 @@ This is a permanent redirection, which also preserves `pathinfo` and query strin [source, xml, subs="{sub-order}"] ---- - + /foo diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/fastcgi/configuring-fastcgi.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/fastcgi/configuring-fastcgi.adoc index b3c0c4a9f9d..e30f193c1f9 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/fastcgi/configuring-fastcgi.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/fastcgi/configuring-fastcgi.adoc @@ -44,7 +44,7 @@ Copy and paste the following content as `$JETTY_BASE/webapps/jetty-wordpress.xml [source, xml, subs="{sub-order}"] ---- - + diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/cdi.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/cdi.adoc index bad8500b497..ec9cd77b7b0 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/cdi.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/cdi.adoc @@ -73,7 +73,7 @@ This module is equivalent to directly modifying the class path configuration wit [source.XML, xml] ------------------------------------------------------------- - + -org.eclipse.jetty.util.Decorator diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/osgi.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/osgi.adoc index ee19f98c8ad..9faf168ddf4 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/osgi.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/osgi.adoc @@ -24,7 +24,7 @@ In addition, the infrastructure also supports the OSGi `HttpService` interface. All of the Jetty jars contain manifest entries appropriate to ensure that they can be deployed into an OSGi container as bundles. You will need to install some jetty jars into your OSGi container. -You can always find the Jetty jars either in the Maven Central repository, or you can link:https://eclipse.dev/jetty/download.php[download] a distribution of Jetty. +You can always find the Jetty jars either in the Maven Central repository, or you can link:https://jetty.org/download.html[download] a distribution of Jetty. Here's the absolute minimal set of Jetty jars: .Minimal Bundles @@ -355,7 +355,7 @@ Here's an example of the contents of a `META-INF/jetty-webapp-context.xml` file: ---- - + META-INF/webdefault.xml @@ -796,7 +796,7 @@ To set the pattern, you will need to provide your own etc files - see the sectio [source, xml, subs="{sub-order}"] ---- - + diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/configuring/what-to-configure.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/configuring/what-to-configure.adoc index d6d890a18ac..638abfac59a 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/configuring/what-to-configure.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/configuring/what-to-configure.adoc @@ -140,7 +140,7 @@ The deployer discovers and hot deploys context IoC descriptors like the followin [source, xml, subs="{sub-order}"] ---- - + diff --git a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/modules/modules-custom.adoc b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/modules/modules-custom.adoc index 61ce8a99e68..3dc63f663e8 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/modules/modules-custom.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/modules/modules-custom.adoc @@ -43,7 +43,7 @@ Start with the custom Jetty XML file, `$JETTY_BASE/etc/custom-ssl.xml`: [source,xml] ---- - + @@ -159,7 +159,7 @@ Next, let's write the Jetty XML file that wires the auditing component to the `S [source,xml,subs=verbatim,options=nowrap] ---- - + diff --git a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/modules/modules.adoc b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/modules/modules.adoc index 92746df88af..a2a0211f1a2 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/modules/modules.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/modules/modules.adoc @@ -85,7 +85,7 @@ For example, a Jetty XML file that allocates Jetty's `QueuedThreadPool` could be .jetty-threadpool.xml ---- - + @@ -235,7 +235,7 @@ The `custom-server.xml` file is the following: [source,xml] ---- - + ---- diff --git a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/protocols/protocols-ssl.adoc b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/protocols/protocols-ssl.adoc index b3f2c541063..a5bc25998ba 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/protocols/protocols-ssl.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/protocols/protocols-ssl.adoc @@ -59,7 +59,7 @@ You want to create the `$JETTY_BASE/etc/tls-config.xml` with the following templ [source,xml,subs=verbatim] ---- - + @@ -85,7 +85,7 @@ To explicitly add the exclusion of TLSv1.0 and TLSv1.1 (that are also vulnerable [source,xml] ---- - + @@ -110,7 +110,7 @@ You can precisely set the list of excluded ciphers, completely overriding Jetty' [source,xml] ---- - + diff --git a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/xml/xml-syntax.adoc b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/xml/xml-syntax.adoc index 17ab9aca528..ebf21db61aa 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/xml/xml-syntax.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/xml/xml-syntax.adoc @@ -21,7 +21,7 @@ The Jetty XML elements define attributes such as `id`, `name`, `class`, etc. tha [source,xml] ---- - + @@ -33,7 +33,7 @@ The Jetty XML elements define attributes such as `id`, `name`, `class`, etc. tha [source,xml] ---- - + @@ -60,7 +60,7 @@ The following Jetty XML creates an empty `String` and assigns it the id `mystrin [source,xml] ---- - + ---- @@ -88,7 +88,7 @@ The following example creates a minimal Jetty `Server`: [source,xml] ---- - + 8080 @@ -102,7 +102,7 @@ Arguments may also have a `name` attribute, which is matched with the correspond [source,xml] ---- - + 8080 @@ -122,7 +122,7 @@ The following example creates an `ArrayList`: [source,xml] ---- - + @@ -149,7 +149,7 @@ Within element `` the return value, if the return type is not `void`, is i [source,xml] ---- - + @@ -173,7 +173,7 @@ It is possible to call `static` methods by specifying the `class` attribute: [source,xml] ---- - + @@ -196,7 +196,7 @@ For example: [source,xml,subs=normal] ---- - + @@ -225,7 +225,7 @@ If the JavaBean property is `foo` (or `Foo`), `` first attempts to invoke _ [source,xml] ---- - + @@ -252,7 +252,7 @@ If the JavaBean property is `foo` (or `Foo`), `` first attempts to invoke _ [source,xml] ---- - + @@ -277,7 +277,7 @@ The map entries are specified with a sequence of `` elements, each with e [source,xml] ---- - + @@ -302,7 +302,7 @@ You can only specify the key value via the `name` attribute, so the key can only [source,xml] ---- - + @@ -323,7 +323,7 @@ Element `` creates a new array, whose component type may be specified by [source,xml] ---- - + @@ -347,7 +347,7 @@ You must give a unique `id` attribute to the objects you want to reference. [source,xml] ---- - + @@ -381,7 +381,7 @@ For example, you may want to configure the context path of your web application [source,xml,subs=normal] ---- - + @@ -407,7 +407,7 @@ The following example creates a minimal Jetty `Server` that listens on a port sp [source,xml] ---- - + @@ -430,7 +430,7 @@ The following example creates a minimal Jetty `Server` that listens on a port sp [source,xml] ---- - + @@ -462,7 +462,7 @@ The following example illustrates how scopes work: [source,xml] ---- - + 8080 diff --git a/documentation/jetty-documentation/src/main/asciidoc/programming-guide/index.adoc b/documentation/jetty-documentation/src/main/asciidoc/programming-guide/index.adoc index 9e7948d2303..d4bcb554eae 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/programming-guide/index.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/programming-guide/index.adoc @@ -11,7 +11,7 @@ // ======================================================================== // -:doctitle: link:https://eclipse.org/jetty[Eclipse Jetty]: Programming Guide +:doctitle: link:https://jetty.org[Eclipse Jetty]: Programming Guide :toc-title: Jetty Programming Guide :idprefix: pg- :docinfo: private-head diff --git a/documentation/jetty/modules/operations-guide/pages/annotations/index.adoc b/documentation/jetty/modules/operations-guide/pages/annotations/index.adoc index 240a86c5639..b3f1ab6dc33 100644 --- a/documentation/jetty/modules/operations-guide/pages/annotations/index.adoc +++ b/documentation/jetty/modules/operations-guide/pages/annotations/index.adoc @@ -47,7 +47,7 @@ Here's an example context xml file that calls this method: [,xml,subs=verbatim] ---- - + <1> false <2> @@ -76,7 +76,7 @@ Here's an example from a context xml file that includes any jar whose name start [,xml,subs=verbatim] ---- - + <1> <2> @@ -107,7 +107,7 @@ Here's an example of a context xml file that sets a pattern that matches any jar [,xml,subs=verbatim] ---- - + <1> <2> @@ -173,7 +173,7 @@ Here's an example of setting the context attribute in a context xml file: [,xml,subs=verbatim] ---- - + <1> <2> @@ -204,7 +204,7 @@ Here is an example context xml file that ensures the `com.example.PrioritySCI` w [,xml,subs=verbatim] ---- - + <1> <2> diff --git a/documentation/jetty/modules/operations-guide/pages/begin/index.adoc b/documentation/jetty/modules/operations-guide/pages/begin/index.adoc index f77381fb44a..017f5725586 100644 --- a/documentation/jetty/modules/operations-guide/pages/begin/index.adoc +++ b/documentation/jetty/modules/operations-guide/pages/begin/index.adoc @@ -56,7 +56,7 @@ Read the xref:arch/index.adoc[Jetty architecture section] for more information a [[download]] == Downloading Jetty -The Eclipse Jetty distribution is available for download from https://eclipse.dev/jetty/download.php[] +The Eclipse Jetty distribution is available for download from https://jetty.org/download.html[] The Eclipse Jetty distribution is available in both `zip` and `gzip` formats; download the one most appropriate for your system, typically `zip` for Windows and `gzip` for other operating systems. diff --git a/documentation/jetty/modules/operations-guide/pages/deploy/index.adoc b/documentation/jetty/modules/operations-guide/pages/deploy/index.adoc index 5e16df2a1a7..f7ac109db37 100644 --- a/documentation/jetty/modules/operations-guide/pages/deploy/index.adoc +++ b/documentation/jetty/modules/operations-guide/pages/deploy/index.adoc @@ -83,7 +83,7 @@ A simple Jetty context XML file, for example named `wiki.xml` is the following: [,xml,subs=verbatim] ---- - + <1> /wiki <2> @@ -117,7 +117,7 @@ You can use the features of xref:xml/index.adoc[Jetty XML files] to avoid to har [,xml] ---- - + /wiki @@ -141,7 +141,7 @@ The JNDI entry must be _defined_ in a xref:jndi/index.adoc#xml[Jetty XML file], [,xml,subs=normal] ---- - + /mywebapp @@ -215,7 +215,7 @@ If you have a web application `mywebapp.war` you can configure its virtual hosts [,xml] ---- - + /mywebapp @@ -260,7 +260,7 @@ To achieve this, you simply use the same context path of `/` for each of your we [,xml] ---- - + / @@ -277,7 +277,7 @@ To achieve this, you simply use the same context path of `/` for each of your we [,xml] ---- - + / @@ -305,7 +305,7 @@ In this case, you want to xref:protocols/index.adoc[configure multiple connector [,xml,highlight=10] ---- - + / @@ -322,7 +322,7 @@ In this case, you want to xref:protocols/index.adoc[configure multiple connector [,xml,highlight=10] ---- - + / @@ -357,7 +357,7 @@ If you do not want Jetty to extract the `+*.war+` files, you can disable this fe [,xml,highlight=8] ---- - + /mywebapp @@ -377,7 +377,7 @@ This allows you to add host specific configuration or server specific configurat [,xml,highlight=8] ---- - + /mywebapp diff --git a/documentation/jetty/modules/operations-guide/pages/jaas/index.adoc b/documentation/jetty/modules/operations-guide/pages/jaas/index.adoc index c39fb251cc7..c26db134bf9 100644 --- a/documentation/jetty/modules/operations-guide/pages/jaas/index.adoc +++ b/documentation/jetty/modules/operations-guide/pages/jaas/index.adoc @@ -95,7 +95,7 @@ Here's an example of this type of XML file: [,xml] ---- - + @@ -113,7 +113,7 @@ Here's an example of this type of XML file: [,xml] ---- - + diff --git a/documentation/jetty/modules/operations-guide/pages/jsf-taglibs/index.adoc b/documentation/jetty/modules/operations-guide/pages/jsf-taglibs/index.adoc index 32123aea68b..1dd1be9da12 100644 --- a/documentation/jetty/modules/operations-guide/pages/jsf-taglibs/index.adoc +++ b/documentation/jetty/modules/operations-guide/pages/jsf-taglibs/index.adoc @@ -26,7 +26,7 @@ Here's an example of using a context xml file to add in a pattern to match files [,xml,subs=verbatim] ---- - + diff --git a/documentation/jetty/modules/operations-guide/pages/modules/custom.adoc b/documentation/jetty/modules/operations-guide/pages/modules/custom.adoc index 2b32fdfa51a..7bac711e5a3 100644 --- a/documentation/jetty/modules/operations-guide/pages/modules/custom.adoc +++ b/documentation/jetty/modules/operations-guide/pages/modules/custom.adoc @@ -42,7 +42,7 @@ Start with the custom Jetty XML file, `$JETTY_BASE/etc/custom-ssl.xml`: [,xml] ---- - + @@ -158,7 +158,7 @@ Next, let's write the Jetty XML file that wires the auditing component to the `S [,xml,subs=verbatim,options=nowrap] ---- - + diff --git a/documentation/jetty/modules/operations-guide/pages/modules/index.adoc b/documentation/jetty/modules/operations-guide/pages/modules/index.adoc index be56b270f5a..a8adef6a59d 100644 --- a/documentation/jetty/modules/operations-guide/pages/modules/index.adoc +++ b/documentation/jetty/modules/operations-guide/pages/modules/index.adoc @@ -84,7 +84,7 @@ For example, a Jetty XML file that allocates Jetty's `QueuedThreadPool` could be .jetty-threadpool.xml ---- - + @@ -234,7 +234,7 @@ The `custom-server.xml` file is the following: [,xml] ---- - + ---- diff --git a/documentation/jetty/modules/operations-guide/pages/protocols/index.adoc b/documentation/jetty/modules/operations-guide/pages/protocols/index.adoc index 19c5e2fb21f..fc771fdd0a2 100644 --- a/documentation/jetty/modules/operations-guide/pages/protocols/index.adoc +++ b/documentation/jetty/modules/operations-guide/pages/protocols/index.adoc @@ -498,7 +498,7 @@ You want to create the `$JETTY_BASE/etc/tls-config.xml` with the following templ [,xml,subs=verbatim] ---- - + @@ -524,7 +524,7 @@ To explicitly add the exclusion of TLSv1.0 and TLSv1.1 (that are also vulnerable [,xml] ---- - + @@ -549,7 +549,7 @@ You can precisely set the list of excluded ciphers, completely overriding Jetty' [,xml] ---- - + diff --git a/documentation/jetty/modules/operations-guide/pages/xml/index.adoc b/documentation/jetty/modules/operations-guide/pages/xml/index.adoc index 5e7a50fc3a8..44989b48c9a 100644 --- a/documentation/jetty/modules/operations-guide/pages/xml/index.adoc +++ b/documentation/jetty/modules/operations-guide/pages/xml/index.adoc @@ -31,7 +31,7 @@ The Jetty XML elements define attributes such as `id`, `name`, `class`, etc. tha [,xml] ---- - + @@ -43,7 +43,7 @@ The Jetty XML elements define attributes such as `id`, `name`, `class`, etc. tha [,xml] ---- - + @@ -70,7 +70,7 @@ The following Jetty XML creates an empty `String` and assigns it the id `mystrin [,xml] ---- - + ---- @@ -98,7 +98,7 @@ The following example creates a minimal Jetty `Server`: [,xml] ---- - + 8080 @@ -112,7 +112,7 @@ Arguments may also have a `name` attribute, which is matched with the correspond [,xml] ---- - + 8080 @@ -132,7 +132,7 @@ The following example creates an `ArrayList`: [,xml] ---- - + @@ -159,7 +159,7 @@ Within element `` the return value, if the return type is not `void`, is i [,xml] ---- - + @@ -183,7 +183,7 @@ It is possible to call `static` methods by specifying the `class` attribute: [,xml] ---- - + @@ -206,7 +206,7 @@ For example: [,xml,subs=normal] ---- - + @@ -235,7 +235,7 @@ If the JavaBean property is `foo` (or `Foo`), `` first attempts to invoke _ [,xml] ---- - + @@ -262,7 +262,7 @@ If the JavaBean property is `foo` (or `Foo`), `` first attempts to invoke _ [,xml] ---- - + @@ -287,7 +287,7 @@ The map entries are specified with a sequence of `` elements, each with e [,xml] ---- - + @@ -312,7 +312,7 @@ You can only specify the key value via the `name` attribute, so the key can only [,xml] ---- - + @@ -333,7 +333,7 @@ Element `` creates a new array, whose component type may be specified by [,xml] ---- - + @@ -357,7 +357,7 @@ You must give a unique `id` attribute to the objects you want to reference. [,xml] ---- - + @@ -391,7 +391,7 @@ For example, you may want to configure the context path of your web application [,xml,subs=normal] ---- - + @@ -417,7 +417,7 @@ The following example creates a minimal Jetty `Server` that listens on a port sp [,xml] ---- - + @@ -440,7 +440,7 @@ The following example creates a minimal Jetty `Server` that listens on a port sp [,xml] ---- - + @@ -472,7 +472,7 @@ The following example illustrates how scopes work: [,xml] ---- - + 8080 diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/etc/jetty-alpn.xml b/jetty-alpn/jetty-alpn-server/src/main/config/etc/jetty-alpn.xml index 81ddf0aa7b6..a5a49056c59 100644 --- a/jetty-alpn/jetty-alpn-server/src/main/config/etc/jetty-alpn.xml +++ b/jetty-alpn/jetty-alpn-server/src/main/config/etc/jetty-alpn.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-cdi/src/main/config/etc/cdi/jetty-cdi.xml b/jetty-cdi/src/main/config/etc/cdi/jetty-cdi.xml index 484c19df26f..c36524d7165 100644 --- a/jetty-cdi/src/main/config/etc/cdi/jetty-cdi.xml +++ b/jetty-cdi/src/main/config/etc/cdi/jetty-cdi.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-deploy/src/main/config/etc/jetty-decorate.xml b/jetty-deploy/src/main/config/etc/jetty-decorate.xml index 3abfb16941b..011abeee7e5 100644 --- a/jetty-deploy/src/main/config/etc/jetty-decorate.xml +++ b/jetty-deploy/src/main/config/etc/jetty-decorate.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-deploy/src/main/config/etc/jetty-deploy.xml b/jetty-deploy/src/main/config/etc/jetty-deploy.xml index 7a1e8d02d15..e9c20b38538 100644 --- a/jetty-deploy/src/main/config/etc/jetty-deploy.xml +++ b/jetty-deploy/src/main/config/etc/jetty-deploy.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-deploy/src/main/config/etc/jetty-web-decorate.xml b/jetty-deploy/src/main/config/etc/jetty-web-decorate.xml index f91048c4b73..838d345af79 100644 --- a/jetty-deploy/src/main/config/etc/jetty-web-decorate.xml +++ b/jetty-deploy/src/main/config/etc/jetty-web-decorate.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-deploy/src/main/config/modules/global-webapp-common.d/global-webapp-common.xml b/jetty-deploy/src/main/config/modules/global-webapp-common.d/global-webapp-common.xml index 7f28fd55ca5..f77ea94ac11 100644 --- a/jetty-deploy/src/main/config/modules/global-webapp-common.d/global-webapp-common.xml +++ b/jetty-deploy/src/main/config/modules/global-webapp-common.d/global-webapp-common.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-deploy/src/main/config/modules/global-webapp-common.d/webapp-common.xml b/jetty-deploy/src/main/config/modules/global-webapp-common.d/webapp-common.xml index 02e338e6c9c..76f73e46665 100644 --- a/jetty-deploy/src/main/config/modules/global-webapp-common.d/webapp-common.xml +++ b/jetty-deploy/src/main/config/modules/global-webapp-common.d/webapp-common.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/DeploymentTempDirTest.java b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/DeploymentTempDirTest.java index 8411387fb4f..0f2748b00fb 100644 --- a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/DeploymentTempDirTest.java +++ b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/DeploymentTempDirTest.java @@ -101,7 +101,7 @@ public class DeploymentTempDirTest public void testTmpDirectory() throws Exception { Path warPath = MavenTestingUtils.getTestResourcePath("webapps/foo-webapp-1.war"); - String deploymentXml = "\n" + + String deploymentXml = "\n" + "\n" + "" + warPath + "\n" + "" + tmpDir + "\n" + @@ -145,7 +145,7 @@ public class DeploymentTempDirTest public void testPersistentTmpDirectory() throws Exception { Path warPath = MavenTestingUtils.getTestResourcePath("webapps/foo-webapp-1.war"); - String deploymentXml = "\n" + + String deploymentXml = "\n" + "\n" + "" + warPath + "\n" + "" + tmpDir + "\n" + diff --git a/jetty-deploy/src/test/resources/binding-test-contexts-1.xml b/jetty-deploy/src/test/resources/binding-test-contexts-1.xml index 6714b3b2316..50da9ad4484 100644 --- a/jetty-deploy/src/test/resources/binding-test-contexts-1.xml +++ b/jetty-deploy/src/test/resources/binding-test-contexts-1.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-deploy/src/test/resources/context-binding-test-1.xml b/jetty-deploy/src/test/resources/context-binding-test-1.xml index 9e5215df02a..e1e4497a4a9 100644 --- a/jetty-deploy/src/test/resources/context-binding-test-1.xml +++ b/jetty-deploy/src/test/resources/context-binding-test-1.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-deploy/src/test/resources/jetty-deploy-wars.xml b/jetty-deploy/src/test/resources/jetty-deploy-wars.xml index 6d66339e7d3..0e8e294f1f0 100644 --- a/jetty-deploy/src/test/resources/jetty-deploy-wars.xml +++ b/jetty-deploy/src/test/resources/jetty-deploy-wars.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml b/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml index bde43d34299..ef89d44dcd8 100644 --- a/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml +++ b/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-deploy/src/test/resources/jetty-http.xml b/jetty-deploy/src/test/resources/jetty-http.xml index 137da33293f..8ee14df91ae 100644 --- a/jetty-deploy/src/test/resources/jetty-http.xml +++ b/jetty-deploy/src/test/resources/jetty-http.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-deploy/src/test/resources/jetty.xml b/jetty-deploy/src/test/resources/jetty.xml index 73a091bcc02..a318d48c78a 100644 --- a/jetty-deploy/src/test/resources/jetty.xml +++ b/jetty-deploy/src/test/resources/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-deploy/src/test/resources/webapps/badapp/badapp.xml b/jetty-deploy/src/test/resources/webapps/badapp/badapp.xml index 952aab492d1..58d144f3a96 100644 --- a/jetty-deploy/src/test/resources/webapps/badapp/badapp.xml +++ b/jetty-deploy/src/test/resources/webapps/badapp/badapp.xml @@ -1,5 +1,5 @@ - + /badapp diff --git a/jetty-deploy/src/test/resources/webapps/foo.xml b/jetty-deploy/src/test/resources/webapps/foo.xml index 8b600c3bdc6..3e43f2c13c2 100644 --- a/jetty-deploy/src/test/resources/webapps/foo.xml +++ b/jetty-deploy/src/test/resources/webapps/foo.xml @@ -1,5 +1,5 @@ - + /foo diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/etc/sessions/gcloud/session-store.xml b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/etc/sessions/gcloud/session-store.xml index 070c76aa25a..b0db7b5d224 100644 --- a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/etc/sessions/gcloud/session-store.xml +++ b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/etc/sessions/gcloud/session-store.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/default.xml b/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/default.xml index 07b47ee84b3..f0c6035fc71 100644 --- a/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/default.xml +++ b/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/default.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/remote.xml b/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/remote.xml index 377706a27c5..ea09e1a172c 100644 --- a/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/remote.xml +++ b/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/remote.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-home/src/main/resources/etc/jetty-halt.xml b/jetty-home/src/main/resources/etc/jetty-halt.xml index 570f4fe08a1..e77c4553f40 100644 --- a/jetty-home/src/main/resources/etc/jetty-halt.xml +++ b/jetty-home/src/main/resources/etc/jetty-halt.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-home/src/main/resources/etc/jetty-setuid.xml b/jetty-home/src/main/resources/etc/jetty-setuid.xml index 3c70cbb266f..9ed3fcc18bb 100644 --- a/jetty-home/src/main/resources/etc/jetty-setuid.xml +++ b/jetty-home/src/main/resources/etc/jetty-setuid.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-home/src/main/resources/etc/jetty-stop.xml b/jetty-home/src/main/resources/etc/jetty-stop.xml index d1a39642862..9b702ba72f2 100644 --- a/jetty-home/src/main/resources/etc/jetty-stop.xml +++ b/jetty-home/src/main/resources/etc/jetty-stop.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-home/src/main/resources/modules/conscrypt/conscrypt.xml b/jetty-home/src/main/resources/modules/conscrypt/conscrypt.xml index df41e444bcf..4f3d7a5f2bd 100644 --- a/jetty-home/src/main/resources/modules/conscrypt/conscrypt.xml +++ b/jetty-home/src/main/resources/modules/conscrypt/conscrypt.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-home/src/main/resources/modules/demo.d/demo-realm.xml b/jetty-home/src/main/resources/modules/demo.d/demo-realm.xml index 176ab918d23..4743b6c05f3 100644 --- a/jetty-home/src/main/resources/modules/demo.d/demo-realm.xml +++ b/jetty-home/src/main/resources/modules/demo.d/demo-realm.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-home/src/main/resources/modules/hawtio/hawtio.xml b/jetty-home/src/main/resources/modules/hawtio/hawtio.xml index 8b66e036292..9a7ff066007 100644 --- a/jetty-home/src/main/resources/modules/hawtio/hawtio.xml +++ b/jetty-home/src/main/resources/modules/hawtio/hawtio.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-home/src/main/resources/modules/jamon/jamon.xml b/jetty-home/src/main/resources/modules/jamon/jamon.xml index e4356d4833f..f2d9c600396 100644 --- a/jetty-home/src/main/resources/modules/jamon/jamon.xml +++ b/jetty-home/src/main/resources/modules/jamon/jamon.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-home/src/main/resources/modules/jolokia/jolokia.xml b/jetty-home/src/main/resources/modules/jolokia/jolokia.xml index a7f9b9a92fd..89c65bedec4 100644 --- a/jetty-home/src/main/resources/modules/jolokia/jolokia.xml +++ b/jetty-home/src/main/resources/modules/jolokia/jolokia.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-http2/http2-server/src/main/config/etc/jetty-http2.xml b/jetty-http2/http2-server/src/main/config/etc/jetty-http2.xml index 78904fd4bba..b4694150e04 100644 --- a/jetty-http2/http2-server/src/main/config/etc/jetty-http2.xml +++ b/jetty-http2/http2-server/src/main/config/etc/jetty-http2.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-http2/http2-server/src/main/config/etc/jetty-http2c.xml b/jetty-http2/http2-server/src/main/config/etc/jetty-http2c.xml index a13cf3970f6..2e1286ccf22 100644 --- a/jetty-http2/http2-server/src/main/config/etc/jetty-http2c.xml +++ b/jetty-http2/http2-server/src/main/config/etc/jetty-http2c.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-http3/http3-server/src/main/config/etc/jetty-http3.xml b/jetty-http3/http3-server/src/main/config/etc/jetty-http3.xml index ca37ce84f07..f7ee9d9f93b 100644 --- a/jetty-http3/http3-server/src/main/config/etc/jetty-http3.xml +++ b/jetty-http3/http3-server/src/main/config/etc/jetty-http3.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-infinispan/infinispan-common/src/main/config/etc/sessions/infinispan/infinispan-common.xml b/jetty-infinispan/infinispan-common/src/main/config/etc/sessions/infinispan/infinispan-common.xml index 0092a534815..24645d4f8be 100644 --- a/jetty-infinispan/infinispan-common/src/main/config/etc/sessions/infinispan/infinispan-common.xml +++ b/jetty-infinispan/infinispan-common/src/main/config/etc/sessions/infinispan/infinispan-common.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-infinispan/infinispan-embedded-query/src/main/config-template/etc/sessions/infinispan/infinispan-embedded-query.xml b/jetty-infinispan/infinispan-embedded-query/src/main/config-template/etc/sessions/infinispan/infinispan-embedded-query.xml index 52ca7ddd2ab..e1eed20430b 100644 --- a/jetty-infinispan/infinispan-embedded-query/src/main/config-template/etc/sessions/infinispan/infinispan-embedded-query.xml +++ b/jetty-infinispan/infinispan-embedded-query/src/main/config-template/etc/sessions/infinispan/infinispan-embedded-query.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-infinispan/infinispan-embedded/src/main/config-template/etc/sessions/infinispan/infinispan-embedded.xml b/jetty-infinispan/infinispan-embedded/src/main/config-template/etc/sessions/infinispan/infinispan-embedded.xml index ee0b60b7ab9..79a88aa3b08 100644 --- a/jetty-infinispan/infinispan-embedded/src/main/config-template/etc/sessions/infinispan/infinispan-embedded.xml +++ b/jetty-infinispan/infinispan-embedded/src/main/config-template/etc/sessions/infinispan/infinispan-embedded.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-infinispan/infinispan-remote-query/src/main/config-template/etc/sessions/infinispan/infinispan-remote-query.xml b/jetty-infinispan/infinispan-remote-query/src/main/config-template/etc/sessions/infinispan/infinispan-remote-query.xml index 6c2c7565c1a..8d55b74a3cc 100644 --- a/jetty-infinispan/infinispan-remote-query/src/main/config-template/etc/sessions/infinispan/infinispan-remote-query.xml +++ b/jetty-infinispan/infinispan-remote-query/src/main/config-template/etc/sessions/infinispan/infinispan-remote-query.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-infinispan/infinispan-remote/src/main/config-template/etc/sessions/infinispan/infinispan-remote.xml b/jetty-infinispan/infinispan-remote/src/main/config-template/etc/sessions/infinispan/infinispan-remote.xml index f9525cddd30..26dcceabc7c 100644 --- a/jetty-infinispan/infinispan-remote/src/main/config-template/etc/sessions/infinispan/infinispan-remote.xml +++ b/jetty-infinispan/infinispan-remote/src/main/config-template/etc/sessions/infinispan/infinispan-remote.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-jaas/src/main/config/etc/jetty-jaas.xml b/jetty-jaas/src/main/config/etc/jetty-jaas.xml index 881b23292a0..3fc4994f9b4 100644 --- a/jetty-jaas/src/main/config/etc/jetty-jaas.xml +++ b/jetty-jaas/src/main/config/etc/jetty-jaas.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-jaspi/src/main/config/etc/jaspi/jaspi-authmoduleconfig.xml b/jetty-jaspi/src/main/config/etc/jaspi/jaspi-authmoduleconfig.xml index 2bece156f6a..3fda49ba251 100644 --- a/jetty-jaspi/src/main/config/etc/jaspi/jaspi-authmoduleconfig.xml +++ b/jetty-jaspi/src/main/config/etc/jaspi/jaspi-authmoduleconfig.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-jaspi/src/main/config/etc/jaspi/jaspi-default.xml b/jetty-jaspi/src/main/config/etc/jaspi/jaspi-default.xml index 1742c19568e..bc3e1856c4d 100644 --- a/jetty-jaspi/src/main/config/etc/jaspi/jaspi-default.xml +++ b/jetty-jaspi/src/main/config/etc/jaspi/jaspi-default.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-jaspi/src/main/config/etc/jaspi/jaspi-demo.xml b/jetty-jaspi/src/main/config/etc/jaspi/jaspi-demo.xml index a1dde13d2f9..f4b7c5fc2e3 100644 --- a/jetty-jaspi/src/main/config/etc/jaspi/jaspi-demo.xml +++ b/jetty-jaspi/src/main/config/etc/jaspi/jaspi-demo.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-jmx/src/main/config/etc/jetty-jmx-remote.xml b/jetty-jmx/src/main/config/etc/jetty-jmx-remote.xml index 09233ae33c7..2f517dcfd37 100644 --- a/jetty-jmx/src/main/config/etc/jetty-jmx-remote.xml +++ b/jetty-jmx/src/main/config/etc/jetty-jmx-remote.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-jmx/src/main/config/etc/jetty-jmx.xml b/jetty-jmx/src/main/config/etc/jetty-jmx.xml index 5aadbb66a70..008ad50b3ab 100644 --- a/jetty-jmx/src/main/config/etc/jetty-jmx.xml +++ b/jetty-jmx/src/main/config/etc/jetty-jmx.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-jmx/src/main/config/modules/jmx.d/jmx-remote-auth.xml b/jetty-jmx/src/main/config/modules/jmx.d/jmx-remote-auth.xml index 42b97d1b5ba..adb2adaf276 100644 --- a/jetty-jmx/src/main/config/modules/jmx.d/jmx-remote-auth.xml +++ b/jetty-jmx/src/main/config/modules/jmx.d/jmx-remote-auth.xml @@ -19,7 +19,7 @@ ~ --> - + diff --git a/jetty-jmx/src/main/config/modules/jmx.d/jmx-remote-ssl.xml b/jetty-jmx/src/main/config/modules/jmx.d/jmx-remote-ssl.xml index ddfb4cb7bb3..78a79d82da2 100644 --- a/jetty-jmx/src/main/config/modules/jmx.d/jmx-remote-ssl.xml +++ b/jetty-jmx/src/main/config/modules/jmx.d/jmx-remote-ssl.xml @@ -19,7 +19,7 @@ ~ --> - + diff --git a/jetty-keystore/src/main/config/etc/jetty-test-keystore.xml b/jetty-keystore/src/main/config/etc/jetty-test-keystore.xml index e7c39859657..5d3c485db97 100644 --- a/jetty-keystore/src/main/config/etc/jetty-test-keystore.xml +++ b/jetty-keystore/src/main/config/etc/jetty-test-keystore.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-maven-plugin/src/it/exclude-javax-annotation/src/config/jetty.xml b/jetty-maven-plugin/src/it/exclude-javax-annotation/src/config/jetty.xml index 4e43b5305df..4d8217d8fb2 100644 --- a/jetty-maven-plugin/src/it/exclude-javax-annotation/src/config/jetty.xml +++ b/jetty-maven-plugin/src/it/exclude-javax-annotation/src/config/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-maven-plugin/src/it/jetty-cdi-start-forked/src/main/jetty/jetty-context.xml b/jetty-maven-plugin/src/it/jetty-cdi-start-forked/src/main/jetty/jetty-context.xml index c7d7bf4cde7..2fddda64598 100644 --- a/jetty-maven-plugin/src/it/jetty-cdi-start-forked/src/main/jetty/jetty-context.xml +++ b/jetty-maven-plugin/src/it/jetty-cdi-start-forked/src/main/jetty/jetty-context.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-maven-plugin/src/it/jetty-cdi-start-forked/src/main/jetty/jetty.xml b/jetty-maven-plugin/src/it/jetty-cdi-start-forked/src/main/jetty/jetty.xml index 8f1c473fb3f..96b2d3edd49 100644 --- a/jetty-maven-plugin/src/it/jetty-cdi-start-forked/src/main/jetty/jetty.xml +++ b/jetty-maven-plugin/src/it/jetty-cdi-start-forked/src/main/jetty/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-maven-plugin/src/it/jetty-effective-web-xml-it/webapp-war/src/config/jetty.xml b/jetty-maven-plugin/src/it/jetty-effective-web-xml-it/webapp-war/src/config/jetty.xml index 4e43b5305df..4d8217d8fb2 100644 --- a/jetty-maven-plugin/src/it/jetty-effective-web-xml-it/webapp-war/src/config/jetty.xml +++ b/jetty-maven-plugin/src/it/jetty-effective-web-xml-it/webapp-war/src/config/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-maven-plugin/src/it/jetty-maven-plugin-provided-module-dep/web/src/config/jetty.xml b/jetty-maven-plugin/src/it/jetty-maven-plugin-provided-module-dep/web/src/config/jetty.xml index 7df44bd5ad7..99deb7f254f 100644 --- a/jetty-maven-plugin/src/it/jetty-maven-plugin-provided-module-dep/web/src/config/jetty.xml +++ b/jetty-maven-plugin/src/it/jetty-maven-plugin-provided-module-dep/web/src/config/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-maven-plugin/src/it/jetty-run-mojo-jar-scan-it/MyWebApp/src/config/context.xml b/jetty-maven-plugin/src/it/jetty-run-mojo-jar-scan-it/MyWebApp/src/config/context.xml index 3eb5570a37d..dea3edec690 100644 --- a/jetty-maven-plugin/src/it/jetty-run-mojo-jar-scan-it/MyWebApp/src/config/context.xml +++ b/jetty-maven-plugin/src/it/jetty-run-mojo-jar-scan-it/MyWebApp/src/config/context.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-maven-plugin/src/it/jetty-run-mojo-jar-scan-it/MyWebApp/src/config/jetty.xml b/jetty-maven-plugin/src/it/jetty-run-mojo-jar-scan-it/MyWebApp/src/config/jetty.xml index 4e43b5305df..4d8217d8fb2 100644 --- a/jetty-maven-plugin/src/it/jetty-run-mojo-jar-scan-it/MyWebApp/src/config/jetty.xml +++ b/jetty-maven-plugin/src/it/jetty-run-mojo-jar-scan-it/MyWebApp/src/config/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/etc/test-jetty.xml b/jetty-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/etc/test-jetty.xml index 7fa53cc3a33..410080be0d8 100644 --- a/jetty-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/etc/test-jetty.xml +++ b/jetty-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/etc/test-jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-webapp/src/config/jetty.xml b/jetty-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-webapp/src/config/jetty.xml index 4e43b5305df..4d8217d8fb2 100644 --- a/jetty-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-webapp/src/config/jetty.xml +++ b/jetty-maven-plugin/src/it/jetty-start-forked-mojo-it/jetty-simple-webapp/src/config/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-maven-plugin/src/it/jetty-start-gwt-it/beer-server/src/config/jetty.xml b/jetty-maven-plugin/src/it/jetty-start-gwt-it/beer-server/src/config/jetty.xml index 4e43b5305df..4d8217d8fb2 100644 --- a/jetty-maven-plugin/src/it/jetty-start-gwt-it/beer-server/src/config/jetty.xml +++ b/jetty-maven-plugin/src/it/jetty-start-gwt-it/beer-server/src/config/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-maven-plugin/src/it/jetty-start-gwt-it/beer-server/src/main/jettyconf/context.xml b/jetty-maven-plugin/src/it/jetty-start-gwt-it/beer-server/src/main/jettyconf/context.xml index e1ab206a186..948d34b8028 100644 --- a/jetty-maven-plugin/src/it/jetty-start-gwt-it/beer-server/src/main/jettyconf/context.xml +++ b/jetty-maven-plugin/src/it/jetty-start-gwt-it/beer-server/src/main/jettyconf/context.xml @@ -1,5 +1,5 @@ - + org.eclipse.jetty.servlet.Default.useFileMappedBuffer diff --git a/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/config/context.xml b/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/config/context.xml index 3eb5570a37d..dea3edec690 100644 --- a/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/config/context.xml +++ b/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/config/context.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/config/jetty.xml b/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/config/jetty.xml index 4e43b5305df..4d8217d8fb2 100644 --- a/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/config/jetty.xml +++ b/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/config/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-maven-plugin/src/it/jetty-start-mojo-multi-module-single-war-it/webapp-war/src/config/jetty.xml b/jetty-maven-plugin/src/it/jetty-start-mojo-multi-module-single-war-it/webapp-war/src/config/jetty.xml index 4e43b5305df..4d8217d8fb2 100644 --- a/jetty-maven-plugin/src/it/jetty-start-mojo-multi-module-single-war-it/webapp-war/src/config/jetty.xml +++ b/jetty-maven-plugin/src/it/jetty-start-mojo-multi-module-single-war-it/webapp-war/src/config/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-maven-plugin/src/it/jetty-start-overlay-it/jetty-simple-webapp/src/config/context.xml b/jetty-maven-plugin/src/it/jetty-start-overlay-it/jetty-simple-webapp/src/config/context.xml index 3eb5570a37d..dea3edec690 100644 --- a/jetty-maven-plugin/src/it/jetty-start-overlay-it/jetty-simple-webapp/src/config/context.xml +++ b/jetty-maven-plugin/src/it/jetty-start-overlay-it/jetty-simple-webapp/src/config/context.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-maven-plugin/src/it/jetty-start-overlay-it/jetty-simple-webapp/src/config/jetty.xml b/jetty-maven-plugin/src/it/jetty-start-overlay-it/jetty-simple-webapp/src/config/jetty.xml index 4e43b5305df..4d8217d8fb2 100644 --- a/jetty-maven-plugin/src/it/jetty-start-overlay-it/jetty-simple-webapp/src/config/jetty.xml +++ b/jetty-maven-plugin/src/it/jetty-start-overlay-it/jetty-simple-webapp/src/config/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/etc/test-jetty.xml b/jetty-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/etc/test-jetty.xml index 7fa53cc3a33..410080be0d8 100644 --- a/jetty-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/etc/test-jetty.xml +++ b/jetty-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/etc/test-jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-maven-plugin/src/it/jetty-start-war-forked-mojo-it/jetty-simple-webapp/src/config/jetty.xml b/jetty-maven-plugin/src/it/jetty-start-war-forked-mojo-it/jetty-simple-webapp/src/config/jetty.xml index 4e43b5305df..4d8217d8fb2 100644 --- a/jetty-maven-plugin/src/it/jetty-start-war-forked-mojo-it/jetty-simple-webapp/src/config/jetty.xml +++ b/jetty-maven-plugin/src/it/jetty-start-war-forked-mojo-it/jetty-simple-webapp/src/config/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-maven-plugin/src/it/jetty-start-war-mojo-it/src/config/jetty.xml b/jetty-maven-plugin/src/it/jetty-start-war-mojo-it/src/config/jetty.xml index 4e43b5305df..4d8217d8fb2 100644 --- a/jetty-maven-plugin/src/it/jetty-start-war-mojo-it/src/config/jetty.xml +++ b/jetty-maven-plugin/src/it/jetty-start-war-mojo-it/src/config/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-maven-plugin/src/main/resources/jetty-maven.xml b/jetty-maven-plugin/src/main/resources/jetty-maven.xml index 47d10a84d4f..822478c9836 100644 --- a/jetty-maven-plugin/src/main/resources/jetty-maven.xml +++ b/jetty-maven-plugin/src/main/resources/jetty-maven.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-maven-plugin/src/main/resources/maven.xml b/jetty-maven-plugin/src/main/resources/maven.xml index 98cf64733c3..a68454ba002 100644 --- a/jetty-maven-plugin/src/main/resources/maven.xml +++ b/jetty-maven-plugin/src/main/resources/maven.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-maven-plugin/src/test/resources/embedder-context.xml b/jetty-maven-plugin/src/test/resources/embedder-context.xml index bde6592cc3e..73dcde3e216 100644 --- a/jetty-maven-plugin/src/test/resources/embedder-context.xml +++ b/jetty-maven-plugin/src/test/resources/embedder-context.xml @@ -1,5 +1,5 @@ - + /embedder diff --git a/jetty-maven-plugin/src/test/resources/embedder-jetty.xml b/jetty-maven-plugin/src/test/resources/embedder-jetty.xml index a7ad2021f67..9394623b341 100644 --- a/jetty-maven-plugin/src/test/resources/embedder-jetty.xml +++ b/jetty-maven-plugin/src/test/resources/embedder-jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-memcached/jetty-memcached-sessions/src/main/config/etc/sessions/session-data-cache/xmemcached.xml b/jetty-memcached/jetty-memcached-sessions/src/main/config/etc/sessions/session-data-cache/xmemcached.xml index 4a22c9b6765..7cf7737769c 100644 --- a/jetty-memcached/jetty-memcached-sessions/src/main/config/etc/sessions/session-data-cache/xmemcached.xml +++ b/jetty-memcached/jetty-memcached-sessions/src/main/config/etc/sessions/session-data-cache/xmemcached.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-nosql/src/main/config/etc/sessions/mongo/session-store-by-address.xml b/jetty-nosql/src/main/config/etc/sessions/mongo/session-store-by-address.xml index 28e5a7da378..645d9a1c3ab 100644 --- a/jetty-nosql/src/main/config/etc/sessions/mongo/session-store-by-address.xml +++ b/jetty-nosql/src/main/config/etc/sessions/mongo/session-store-by-address.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-nosql/src/main/config/etc/sessions/mongo/session-store-by-uri.xml b/jetty-nosql/src/main/config/etc/sessions/mongo/session-store-by-uri.xml index 717f9949cf1..daac2febb08 100644 --- a/jetty-nosql/src/main/config/etc/sessions/mongo/session-store-by-uri.xml +++ b/jetty-nosql/src/main/config/etc/sessions/mongo/session-store-by-uri.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-openid/src/main/config/etc/jetty-openid.xml b/jetty-openid/src/main/config/etc/jetty-openid.xml index acdddbf113f..4fbe0644a48 100644 --- a/jetty-openid/src/main/config/etc/jetty-openid.xml +++ b/jetty-openid/src/main/config/etc/jetty-openid.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-openid/src/main/config/modules/openid/openid-baseloginservice.xml b/jetty-openid/src/main/config/modules/openid/openid-baseloginservice.xml index 1773ebd46db..f0464fefcf6 100644 --- a/jetty-openid/src/main/config/modules/openid/openid-baseloginservice.xml +++ b/jetty-openid/src/main/config/modules/openid/openid-baseloginservice.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml index eb89fb21f7e..ccc9d40c3c1 100644 --- a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml +++ b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/jetty-osgi-httpservice/contexts/httpservice.xml b/jetty-osgi/jetty-osgi-httpservice/contexts/httpservice.xml index 7b57f96be2c..9acb8a71774 100644 --- a/jetty-osgi/jetty-osgi-httpservice/contexts/httpservice.xml +++ b/jetty-osgi/jetty-osgi-httpservice/contexts/httpservice.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/test-jetty-osgi-context/src/main/context/acme.xml b/jetty-osgi/test-jetty-osgi-context/src/main/context/acme.xml index f2052300efb..f53fe7d7e2c 100644 --- a/jetty-osgi/test-jetty-osgi-context/src/main/context/acme.xml +++ b/jetty-osgi/test-jetty-osgi-context/src/main/context/acme.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-alpn.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-alpn.xml index 22eacf1cf38..bc73c4d1ffe 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-alpn.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-alpn.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-deploy.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-deploy.xml index fe917c2430e..629a8cbcad6 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-deploy.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-deploy.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-context-as-service.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-context-as-service.xml index 5333433aab7..65b17d9f335 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-context-as-service.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-context-as-service.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-webapp-as-service.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-webapp-as-service.xml index b90533d0b60..64c17f608d1 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-webapp-as-service.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-webapp-as-service.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-annotations.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-annotations.xml index 271f12e042c..69f13636b55 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-annotations.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-annotations.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-bundle.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-bundle.xml index 6cb5d15395a..4a672e9700f 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-bundle.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-bundle.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-javax-websocket.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-javax-websocket.xml index 4ff583996c4..ce7286c93d8 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-javax-websocket.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-javax-websocket.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-jsp.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-jsp.xml index 9edaf7b56c0..2584d302ec9 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-jsp.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-jsp.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-resources.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-resources.xml index f77ab2d7227..aa41e76d79e 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-resources.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-resources.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-websocket.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-websocket.xml index e1b37e7c70f..8ea67d8a0a4 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-websocket.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-websocket.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http.xml index 6b883c59a0e..bc964cebdc6 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http2-jdk9.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http2-jdk9.xml index ad51713fd9c..4bf134cec4b 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http2-jdk9.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http2-jdk9.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http2.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http2.xml index 2bf9d1051b1..f3cbd267a76 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http2.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http2.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-https.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-https.xml index 941216afee1..e5978d5edb9 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-https.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-https.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-ssl.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-ssl.xml index b25525dec5c..801de9e53a5 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-ssl.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-ssl.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-testrealm.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-testrealm.xml index e9ebabc4699..4ef4ccac1dd 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-testrealm.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-testrealm.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-with-custom-class.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-with-custom-class.xml index 4561574d208..f1922622867 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-with-custom-class.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-with-custom-class.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml index 32eb6404275..04e786508d5 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-proxy/src/main/config/etc/jetty-proxy.xml b/jetty-proxy/src/main/config/etc/jetty-proxy.xml index 3e6b3b91918..0d997a47361 100644 --- a/jetty-proxy/src/main/config/etc/jetty-proxy.xml +++ b/jetty-proxy/src/main/config/etc/jetty-proxy.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-quickstart/src/main/config/etc/jetty-quickstart.xml b/jetty-quickstart/src/main/config/etc/jetty-quickstart.xml index 84d030260b0..a939c361d83 100644 --- a/jetty-quickstart/src/main/config/etc/jetty-quickstart.xml +++ b/jetty-quickstart/src/main/config/etc/jetty-quickstart.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-quickstart/src/main/config/modules/jetty-quickstart.d/quickstart-webapp.xml b/jetty-quickstart/src/main/config/modules/jetty-quickstart.d/quickstart-webapp.xml index b0f07545e95..267d38b46b2 100644 --- a/jetty-quickstart/src/main/config/modules/jetty-quickstart.d/quickstart-webapp.xml +++ b/jetty-quickstart/src/main/config/modules/jetty-quickstart.d/quickstart-webapp.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-quickstart/src/test/resources/context.xml b/jetty-quickstart/src/test/resources/context.xml index 1ac22a00e2c..a74b3deabfe 100644 --- a/jetty-quickstart/src/test/resources/context.xml +++ b/jetty-quickstart/src/test/resources/context.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-rewrite/src/main/config/etc/jetty-rewrite.xml b/jetty-rewrite/src/main/config/etc/jetty-rewrite.xml index c78237e0c03..4cbb42592d7 100644 --- a/jetty-rewrite/src/main/config/etc/jetty-rewrite.xml +++ b/jetty-rewrite/src/main/config/etc/jetty-rewrite.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-rewrite/src/main/config/etc/rewrite-compactpath.xml b/jetty-rewrite/src/main/config/etc/rewrite-compactpath.xml index 7019f342a6d..18117d193c9 100644 --- a/jetty-rewrite/src/main/config/etc/rewrite-compactpath.xml +++ b/jetty-rewrite/src/main/config/etc/rewrite-compactpath.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-rewrite/src/main/config/modules/rewrite/rewrite-msie.xml b/jetty-rewrite/src/main/config/modules/rewrite/rewrite-msie.xml index d4b5b3edccb..6f15b2306b2 100644 --- a/jetty-rewrite/src/main/config/modules/rewrite/rewrite-msie.xml +++ b/jetty-rewrite/src/main/config/modules/rewrite/rewrite-msie.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-rewrite/src/main/config/modules/rewrite/rewrite-rules.xml b/jetty-rewrite/src/main/config/modules/rewrite/rewrite-rules.xml index b12af8f4da3..b2293f1321d 100644 --- a/jetty-rewrite/src/main/config/modules/rewrite/rewrite-rules.xml +++ b/jetty-rewrite/src/main/config/modules/rewrite/rewrite-rules.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/home-base-warning.xml b/jetty-server/src/main/config/etc/home-base-warning.xml index 5b0f42bcb52..8d7e3633c55 100644 --- a/jetty-server/src/main/config/etc/home-base-warning.xml +++ b/jetty-server/src/main/config/etc/home-base-warning.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-acceptratelimit.xml b/jetty-server/src/main/config/etc/jetty-acceptratelimit.xml index 0ae2b002521..faaf45b864f 100644 --- a/jetty-server/src/main/config/etc/jetty-acceptratelimit.xml +++ b/jetty-server/src/main/config/etc/jetty-acceptratelimit.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-bytebufferpool-logarithmic.xml b/jetty-server/src/main/config/etc/jetty-bytebufferpool-logarithmic.xml index 39a1e58911c..aae744f414d 100644 --- a/jetty-server/src/main/config/etc/jetty-bytebufferpool-logarithmic.xml +++ b/jetty-server/src/main/config/etc/jetty-bytebufferpool-logarithmic.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-bytebufferpool.xml b/jetty-server/src/main/config/etc/jetty-bytebufferpool.xml index f1d787a6201..a2f327787b8 100644 --- a/jetty-server/src/main/config/etc/jetty-bytebufferpool.xml +++ b/jetty-server/src/main/config/etc/jetty-bytebufferpool.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-connectionlimit.xml b/jetty-server/src/main/config/etc/jetty-connectionlimit.xml index fd15acb9ff2..f777c87c24f 100644 --- a/jetty-server/src/main/config/etc/jetty-connectionlimit.xml +++ b/jetty-server/src/main/config/etc/jetty-connectionlimit.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-debug.xml b/jetty-server/src/main/config/etc/jetty-debug.xml index bd436d322c8..0e091f017e4 100644 --- a/jetty-server/src/main/config/etc/jetty-debug.xml +++ b/jetty-server/src/main/config/etc/jetty-debug.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-debuglog.xml b/jetty-server/src/main/config/etc/jetty-debuglog.xml index 067192e7114..31500c94753 100644 --- a/jetty-server/src/main/config/etc/jetty-debuglog.xml +++ b/jetty-server/src/main/config/etc/jetty-debuglog.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-gzip.xml b/jetty-server/src/main/config/etc/jetty-gzip.xml index 933f2ef4893..48c835a6e32 100644 --- a/jetty-server/src/main/config/etc/jetty-gzip.xml +++ b/jetty-server/src/main/config/etc/jetty-gzip.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-http-forwarded.xml b/jetty-server/src/main/config/etc/jetty-http-forwarded.xml index ffe0a2cae03..0a839c0648a 100644 --- a/jetty-server/src/main/config/etc/jetty-http-forwarded.xml +++ b/jetty-server/src/main/config/etc/jetty-http-forwarded.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-http.xml b/jetty-server/src/main/config/etc/jetty-http.xml index 9fa1e6a7bfa..2c99e7d2575 100644 --- a/jetty-server/src/main/config/etc/jetty-http.xml +++ b/jetty-server/src/main/config/etc/jetty-http.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-https.xml b/jetty-server/src/main/config/etc/jetty-https.xml index a71de579531..5e5df4ddaa7 100644 --- a/jetty-server/src/main/config/etc/jetty-https.xml +++ b/jetty-server/src/main/config/etc/jetty-https.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-lowresources.xml b/jetty-server/src/main/config/etc/jetty-lowresources.xml index 66e1da74aad..5e2d4650200 100644 --- a/jetty-server/src/main/config/etc/jetty-lowresources.xml +++ b/jetty-server/src/main/config/etc/jetty-lowresources.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-proxy-protocol-ssl.xml b/jetty-server/src/main/config/etc/jetty-proxy-protocol-ssl.xml index 246321829c5..fd61006e376 100644 --- a/jetty-server/src/main/config/etc/jetty-proxy-protocol-ssl.xml +++ b/jetty-server/src/main/config/etc/jetty-proxy-protocol-ssl.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-proxy-protocol.xml b/jetty-server/src/main/config/etc/jetty-proxy-protocol.xml index 49d427e5195..0124d3b59ab 100644 --- a/jetty-server/src/main/config/etc/jetty-proxy-protocol.xml +++ b/jetty-server/src/main/config/etc/jetty-proxy-protocol.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-requestlog.xml b/jetty-server/src/main/config/etc/jetty-requestlog.xml index 70e6ae0f8c0..510a7773be7 100644 --- a/jetty-server/src/main/config/etc/jetty-requestlog.xml +++ b/jetty-server/src/main/config/etc/jetty-requestlog.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-secure-redirect.xml b/jetty-server/src/main/config/etc/jetty-secure-redirect.xml index b834c2f0c85..a3c68444b60 100644 --- a/jetty-server/src/main/config/etc/jetty-secure-redirect.xml +++ b/jetty-server/src/main/config/etc/jetty-secure-redirect.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-ssl-context-reload.xml b/jetty-server/src/main/config/etc/jetty-ssl-context-reload.xml index 46346359ed7..d301e5ecb54 100644 --- a/jetty-server/src/main/config/etc/jetty-ssl-context-reload.xml +++ b/jetty-server/src/main/config/etc/jetty-ssl-context-reload.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-ssl-context.xml b/jetty-server/src/main/config/etc/jetty-ssl-context.xml index 8e4fbbc87bf..3f3292334c4 100644 --- a/jetty-server/src/main/config/etc/jetty-ssl-context.xml +++ b/jetty-server/src/main/config/etc/jetty-ssl-context.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-ssl.xml b/jetty-server/src/main/config/etc/jetty-ssl.xml index c83840f7754..aee17b9d5f3 100644 --- a/jetty-server/src/main/config/etc/jetty-ssl.xml +++ b/jetty-server/src/main/config/etc/jetty-ssl.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-state.xml b/jetty-server/src/main/config/etc/jetty-state.xml index f2ab5c98f80..e80cf6c72ba 100644 --- a/jetty-server/src/main/config/etc/jetty-state.xml +++ b/jetty-server/src/main/config/etc/jetty-state.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-stats.xml b/jetty-server/src/main/config/etc/jetty-stats.xml index 74238e1b046..22977067017 100644 --- a/jetty-server/src/main/config/etc/jetty-stats.xml +++ b/jetty-server/src/main/config/etc/jetty-stats.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-threadlimit.xml b/jetty-server/src/main/config/etc/jetty-threadlimit.xml index 3d0c7e5626d..fc3249f8f77 100644 --- a/jetty-server/src/main/config/etc/jetty-threadlimit.xml +++ b/jetty-server/src/main/config/etc/jetty-threadlimit.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-threadpool-virtual-preview.xml b/jetty-server/src/main/config/etc/jetty-threadpool-virtual-preview.xml index e5c454fb5de..da285e4bb43 100644 --- a/jetty-server/src/main/config/etc/jetty-threadpool-virtual-preview.xml +++ b/jetty-server/src/main/config/etc/jetty-threadpool-virtual-preview.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-threadpool-virtual.xml b/jetty-server/src/main/config/etc/jetty-threadpool-virtual.xml index 71dc9444ba8..8e65727775d 100644 --- a/jetty-server/src/main/config/etc/jetty-threadpool-virtual.xml +++ b/jetty-server/src/main/config/etc/jetty-threadpool-virtual.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty-threadpool.xml b/jetty-server/src/main/config/etc/jetty-threadpool.xml index 2ef169a6c67..ae55f65a217 100644 --- a/jetty-server/src/main/config/etc/jetty-threadpool.xml +++ b/jetty-server/src/main/config/etc/jetty-threadpool.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/jetty.xml b/jetty-server/src/main/config/etc/jetty.xml index 3e4c4a890d4..e0db88e97d5 100644 --- a/jetty-server/src/main/config/etc/jetty.xml +++ b/jetty-server/src/main/config/etc/jetty.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/sessions/file/session-store.xml b/jetty-server/src/main/config/etc/sessions/file/session-store.xml index 7b48c1cafaf..d1816fb82e2 100644 --- a/jetty-server/src/main/config/etc/sessions/file/session-store.xml +++ b/jetty-server/src/main/config/etc/sessions/file/session-store.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/sessions/id-manager.xml b/jetty-server/src/main/config/etc/sessions/id-manager.xml index 546f2682a48..70c12f3e668 100644 --- a/jetty-server/src/main/config/etc/sessions/id-manager.xml +++ b/jetty-server/src/main/config/etc/sessions/id-manager.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/sessions/jdbc/datasource.xml b/jetty-server/src/main/config/etc/sessions/jdbc/datasource.xml index 5113d8cfb49..c797fcd131b 100644 --- a/jetty-server/src/main/config/etc/sessions/jdbc/datasource.xml +++ b/jetty-server/src/main/config/etc/sessions/jdbc/datasource.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/sessions/jdbc/driver.xml b/jetty-server/src/main/config/etc/sessions/jdbc/driver.xml index 1fcd811dab9..142a917c64a 100644 --- a/jetty-server/src/main/config/etc/sessions/jdbc/driver.xml +++ b/jetty-server/src/main/config/etc/sessions/jdbc/driver.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/sessions/jdbc/session-store.xml b/jetty-server/src/main/config/etc/sessions/jdbc/session-store.xml index 963c5252b09..7362061c8a6 100644 --- a/jetty-server/src/main/config/etc/sessions/jdbc/session-store.xml +++ b/jetty-server/src/main/config/etc/sessions/jdbc/session-store.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-server/src/main/config/etc/sessions/session-cache-hash.xml b/jetty-server/src/main/config/etc/sessions/session-cache-hash.xml index a6f09ea3ef0..75f8a461e4f 100644 --- a/jetty-server/src/main/config/etc/sessions/session-cache-hash.xml +++ b/jetty-server/src/main/config/etc/sessions/session-cache-hash.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/sessions/session-cache-null.xml b/jetty-server/src/main/config/etc/sessions/session-cache-null.xml index 9e8928d0cac..822112a1ffe 100644 --- a/jetty-server/src/main/config/etc/sessions/session-cache-null.xml +++ b/jetty-server/src/main/config/etc/sessions/session-cache-null.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/sessions/session-data-cache/session-caching-store.xml b/jetty-server/src/main/config/etc/sessions/session-data-cache/session-caching-store.xml index cfcfdaa1e88..a181ba19ed1 100644 --- a/jetty-server/src/main/config/etc/sessions/session-data-cache/session-caching-store.xml +++ b/jetty-server/src/main/config/etc/sessions/session-data-cache/session-caching-store.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/etc/well-known.xml b/jetty-server/src/main/config/etc/well-known.xml index fea5398ad0a..3c110ba2088 100644 --- a/jetty-server/src/main/config/etc/well-known.xml +++ b/jetty-server/src/main/config/etc/well-known.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/config/modules/inetaccess/jetty-inetaccess.xml b/jetty-server/src/main/config/modules/inetaccess/jetty-inetaccess.xml index f30fe062f66..74ee355f285 100644 --- a/jetty-server/src/main/config/modules/inetaccess/jetty-inetaccess.xml +++ b/jetty-server/src/main/config/modules/inetaccess/jetty-inetaccess.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DefaultHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DefaultHandler.java index c728c649f7f..f9ffbd77e04 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DefaultHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DefaultHandler.java @@ -183,8 +183,8 @@ public class DefaultHandler extends AbstractHandler } writer.append("
\n"); - writer.append("\"icon\" "); - writer.append("Powered by Eclipse Jetty:// Server
\n"); + writer.append("\"icon\" "); + writer.append("Powered by Eclipse Jetty:// Server
\n"); writer.append("\n\n"); writer.flush(); byte[] content = outputStream.toByteArray(); diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializerTest.java b/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializerTest.java index 82b30b6fbf7..9e2c55d570f 100644 --- a/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializerTest.java +++ b/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializerTest.java @@ -75,7 +75,7 @@ public class MavenLocalRepoFileInitializerTest public void testGetCoordinateInvalidMaven() { MavenLocalRepoFileInitializer repo = new MavenLocalRepoFileInitializer(baseHome); - String ref = "maven://www.eclipse.org/jetty"; + String ref = "maven://jetty.org"; RuntimeException x = assertThrows(RuntimeException.class, () -> repo.getCoordinates(URI.create(ref))); assertThat(x.getMessage(), containsString("Not a valid maven:// uri")); } diff --git a/jetty-start/src/test/resources/bogus.xml b/jetty-start/src/test/resources/bogus.xml index c1d3126ab22..3dac2d69175 100644 --- a/jetty-start/src/test/resources/bogus.xml +++ b/jetty-start/src/test/resources/bogus.xml @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/jetty-unixdomain-server/src/main/config/etc/jetty-unixdomain-http.xml b/jetty-unixdomain-server/src/main/config/etc/jetty-unixdomain-http.xml index d59074567be..236563eecef 100644 --- a/jetty-unixdomain-server/src/main/config/etc/jetty-unixdomain-http.xml +++ b/jetty-unixdomain-server/src/main/config/etc/jetty-unixdomain-http.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket-forwarded.xml b/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket-forwarded.xml index e427b94cd9f..43f0cdbd873 100644 --- a/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket-forwarded.xml +++ b/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket-forwarded.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket-http.xml b/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket-http.xml index 009f02a70e6..550c9091d2f 100644 --- a/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket-http.xml +++ b/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket-http.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket-http2c.xml b/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket-http2c.xml index 3871d02981a..3ec381d3d5b 100644 --- a/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket-http2c.xml +++ b/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket-http2c.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket-proxy-protocol.xml b/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket-proxy-protocol.xml index 33ee605e0f4..f50756eab27 100644 --- a/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket-proxy-protocol.xml +++ b/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket-proxy-protocol.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket-secure.xml b/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket-secure.xml index 15110890034..6f78a04c939 100644 --- a/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket-secure.xml +++ b/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket-secure.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket.xml b/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket.xml index b58242ffd9f..e5e4104a6fa 100644 --- a/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket.xml +++ b/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/etc/jetty-unixsocket.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-util/src/main/config/etc/console-capture.xml b/jetty-util/src/main/config/etc/console-capture.xml index 439b0375241..fb5f4f76211 100644 --- a/jetty-util/src/main/config/etc/console-capture.xml +++ b/jetty-util/src/main/config/etc/console-capture.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-util/src/main/config/etc/jetty-pid.xml b/jetty-util/src/main/config/etc/jetty-pid.xml index 7ca3084a28c..543d4725194 100644 --- a/jetty-util/src/main/config/etc/jetty-pid.xml +++ b/jetty-util/src/main/config/etc/jetty-pid.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/Jetty.java b/jetty-util/src/main/java/org/eclipse/jetty/util/Jetty.java index d65aa3d3752..4e7748985dd 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/Jetty.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/Jetty.java @@ -67,7 +67,7 @@ public class Jetty else VERSION = System.getProperty("jetty.version", __buildProperties.getProperty("version", "10.0.z-SNAPSHOT")); - POWERED_BY = "Powered by Jetty:// " + VERSION + ""; + POWERED_BY = "Powered by Jetty:// " + VERSION + ""; // Show warning when RC# or M# is in version string STABLE = !VERSION.matches("^.*\\.(RC|M)[0-9]+$"); diff --git a/jetty-webapp/src/main/config/etc/jetty-webapp.xml b/jetty-webapp/src/main/config/etc/jetty-webapp.xml index 47c9519abf9..3f655ef3585 100644 --- a/jetty-webapp/src/main/config/etc/jetty-webapp.xml +++ b/jetty-webapp/src/main/config/etc/jetty-webapp.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-websocket/websocket-javax-client/src/test/resources/jetty-websocket-httpclient.xml b/jetty-websocket/websocket-javax-client/src/test/resources/jetty-websocket-httpclient.xml index f2bab081984..ab940349f2c 100644 --- a/jetty-websocket/websocket-javax-client/src/test/resources/jetty-websocket-httpclient.xml +++ b/jetty-websocket/websocket-javax-client/src/test/resources/jetty-websocket-httpclient.xml @@ -1,4 +1,4 @@ - + diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/jetty-websocket-httpclient.xml b/jetty-websocket/websocket-javax-tests/src/test/resources/jetty-websocket-httpclient.xml index eef3def7410..c59ddb166ed 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/resources/jetty-websocket-httpclient.xml +++ b/jetty-websocket/websocket-javax-tests/src/test/resources/jetty-websocket-httpclient.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/simple/jetty-websocket-httpclient.xml b/jetty-websocket/websocket-javax-tests/src/test/resources/simple/jetty-websocket-httpclient.xml index 4ba6b4cbaa4..c750444e6cb 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/resources/simple/jetty-websocket-httpclient.xml +++ b/jetty-websocket/websocket-javax-tests/src/test/resources/simple/jetty-websocket-httpclient.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithAttr.xml b/jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithAttr.xml index cf8976056ea..d827bd521cd 100644 --- a/jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithAttr.xml +++ b/jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithAttr.xml @@ -1,5 +1,5 @@ - + name diff --git a/jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithElements.xml b/jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithElements.xml index 19447335471..3c33b3ded2b 100644 --- a/jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithElements.xml +++ b/jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithElements.xml @@ -1,5 +1,5 @@ - + org.eclipse.jetty.xml.TestConfiguration diff --git a/pom.xml b/pom.xml index a9072b61da4..8da160dde12 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ pom Jetty :: Project The Eclipse Jetty Project - https://eclipse.dev/jetty + https://jetty.org 1995 diff --git a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java index 8abfcb26cb0..8f8086bb1d1 100644 --- a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java +++ b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java @@ -859,7 +859,7 @@ public class DistributionTests extends AbstractJettyHomeTest String message = "test-log-line"; String xml = "" + "" + - "" + + "" + "" + " " + " " + loggerName + "" + @@ -920,7 +920,7 @@ public class DistributionTests extends AbstractJettyHomeTest String nextProtocol = "fcgi/1.0"; String xml = "" + "" + - "" + + "" + "" + " " + " " + diff --git a/tests/test-distribution/src/test/resources/badapp/badapp_throwonunavailable_false.xml b/tests/test-distribution/src/test/resources/badapp/badapp_throwonunavailable_false.xml index 7e325b59625..fb8d7764d1c 100644 --- a/tests/test-distribution/src/test/resources/badapp/badapp_throwonunavailable_false.xml +++ b/tests/test-distribution/src/test/resources/badapp/badapp_throwonunavailable_false.xml @@ -1,5 +1,5 @@ - + /badapp diff --git a/tests/test-distribution/src/test/resources/badapp/badapp_throwonunavailable_true.xml b/tests/test-distribution/src/test/resources/badapp/badapp_throwonunavailable_true.xml index 952aab492d1..58d144f3a96 100644 --- a/tests/test-distribution/src/test/resources/badapp/badapp_throwonunavailable_true.xml +++ b/tests/test-distribution/src/test/resources/badapp/badapp_throwonunavailable_true.xml @@ -1,5 +1,5 @@ - + /badapp diff --git a/tests/test-distribution/src/test/resources/bases/spaces-with-conf/dir one/test1.xml b/tests/test-distribution/src/test/resources/bases/spaces-with-conf/dir one/test1.xml index b16b24aae94..ad4cf12ee4d 100644 --- a/tests/test-distribution/src/test/resources/bases/spaces-with-conf/dir one/test1.xml +++ b/tests/test-distribution/src/test/resources/bases/spaces-with-conf/dir one/test1.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/tests/test-distribution/src/test/resources/bases/spaces-with-conf/dir two/test2.xml b/tests/test-distribution/src/test/resources/bases/spaces-with-conf/dir two/test2.xml index b16b24aae94..ad4cf12ee4d 100644 --- a/tests/test-distribution/src/test/resources/bases/spaces-with-conf/dir two/test2.xml +++ b/tests/test-distribution/src/test/resources/bases/spaces-with-conf/dir two/test2.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/tests/test-distribution/src/test/resources/test-realm.xml b/tests/test-distribution/src/test/resources/test-realm.xml index 0b4cf7f7c31..a9ef4f11ce3 100644 --- a/tests/test-distribution/src/test/resources/test-realm.xml +++ b/tests/test-distribution/src/test/resources/test-realm.xml @@ -1,5 +1,5 @@ - + diff --git a/tests/test-integration/src/test/resources/DefaultHandler.xml b/tests/test-integration/src/test/resources/DefaultHandler.xml index e23d89e6d0e..9722b5de0b8 100644 --- a/tests/test-integration/src/test/resources/DefaultHandler.xml +++ b/tests/test-integration/src/test/resources/DefaultHandler.xml @@ -1,5 +1,5 @@ - + diff --git a/tests/test-integration/src/test/resources/NIOHttp.xml b/tests/test-integration/src/test/resources/NIOHttp.xml index 13f9ccca2dd..978d33449bb 100644 --- a/tests/test-integration/src/test/resources/NIOHttp.xml +++ b/tests/test-integration/src/test/resources/NIOHttp.xml @@ -1,5 +1,5 @@ - + diff --git a/tests/test-integration/src/test/resources/NIOHttps.xml b/tests/test-integration/src/test/resources/NIOHttps.xml index db2513ef8b9..69f126cd5c9 100644 --- a/tests/test-integration/src/test/resources/NIOHttps.xml +++ b/tests/test-integration/src/test/resources/NIOHttps.xml @@ -1,5 +1,5 @@ - + diff --git a/tests/test-integration/src/test/resources/RFC2616Base.xml b/tests/test-integration/src/test/resources/RFC2616Base.xml index 449b0174946..2ce56ecd6e4 100644 --- a/tests/test-integration/src/test/resources/RFC2616Base.xml +++ b/tests/test-integration/src/test/resources/RFC2616Base.xml @@ -1,5 +1,5 @@ - + diff --git a/tests/test-integration/src/test/resources/RFC2616_Filters.xml b/tests/test-integration/src/test/resources/RFC2616_Filters.xml index f540bf0f7c9..5808ac05342 100644 --- a/tests/test-integration/src/test/resources/RFC2616_Filters.xml +++ b/tests/test-integration/src/test/resources/RFC2616_Filters.xml @@ -1,5 +1,5 @@ - + diff --git a/tests/test-integration/src/test/resources/RFC2616_Redirects.xml b/tests/test-integration/src/test/resources/RFC2616_Redirects.xml index ab0c7c9da05..4781b7d53a1 100644 --- a/tests/test-integration/src/test/resources/RFC2616_Redirects.xml +++ b/tests/test-integration/src/test/resources/RFC2616_Redirects.xml @@ -1,5 +1,5 @@ - + diff --git a/tests/test-integration/src/test/resources/add-jetty-test-webapp.xml b/tests/test-integration/src/test/resources/add-jetty-test-webapp.xml index 96e6c271d45..3af9297fc24 100644 --- a/tests/test-integration/src/test/resources/add-jetty-test-webapp.xml +++ b/tests/test-integration/src/test/resources/add-jetty-test-webapp.xml @@ -1,5 +1,5 @@ - + diff --git a/tests/test-integration/src/test/resources/basic-server.xml b/tests/test-integration/src/test/resources/basic-server.xml index 74283e41641..8f02cfdcee2 100644 --- a/tests/test-integration/src/test/resources/basic-server.xml +++ b/tests/test-integration/src/test/resources/basic-server.xml @@ -1,5 +1,5 @@ - + diff --git a/tests/test-integration/src/test/resources/deploy.xml b/tests/test-integration/src/test/resources/deploy.xml index 21a9bc9b187..179ce322cd2 100644 --- a/tests/test-integration/src/test/resources/deploy.xml +++ b/tests/test-integration/src/test/resources/deploy.xml @@ -1,5 +1,5 @@ - + diff --git a/tests/test-integration/src/test/resources/docroots/deployerror/badapp-unavailable-false.xml b/tests/test-integration/src/test/resources/docroots/deployerror/badapp-unavailable-false.xml index c51104ddc6b..473a6bc25a4 100644 --- a/tests/test-integration/src/test/resources/docroots/deployerror/badapp-unavailable-false.xml +++ b/tests/test-integration/src/test/resources/docroots/deployerror/badapp-unavailable-false.xml @@ -1,5 +1,5 @@ - + /badapp-uaf diff --git a/tests/test-integration/src/test/resources/docroots/deployerror/badapp.xml b/tests/test-integration/src/test/resources/docroots/deployerror/badapp.xml index 5c45d195481..f9ba58db42a 100644 --- a/tests/test-integration/src/test/resources/docroots/deployerror/badapp.xml +++ b/tests/test-integration/src/test/resources/docroots/deployerror/badapp.xml @@ -1,5 +1,5 @@ - + /badapp diff --git a/tests/test-integration/src/test/resources/login-service.xml b/tests/test-integration/src/test/resources/login-service.xml index 64bdfabd3a7..8ee388c2bbc 100644 --- a/tests/test-integration/src/test/resources/login-service.xml +++ b/tests/test-integration/src/test/resources/login-service.xml @@ -1,5 +1,5 @@ - + diff --git a/tests/test-integration/src/test/resources/ssl.xml b/tests/test-integration/src/test/resources/ssl.xml index 88d6cf3e16f..f64e8a9d7cf 100644 --- a/tests/test-integration/src/test/resources/ssl.xml +++ b/tests/test-integration/src/test/resources/ssl.xml @@ -1,5 +1,5 @@ - + diff --git a/tests/test-integration/src/test/resources/webapp-contexts/RFC2616/rfc2616-webapp.xml b/tests/test-integration/src/test/resources/webapp-contexts/RFC2616/rfc2616-webapp.xml index 7c7a5934411..81f752e18d5 100644 --- a/tests/test-integration/src/test/resources/webapp-contexts/RFC2616/rfc2616-webapp.xml +++ b/tests/test-integration/src/test/resources/webapp-contexts/RFC2616/rfc2616-webapp.xml @@ -1,5 +1,5 @@ - + /rfc2616-webapp /test-webapp-rfc2616.war diff --git a/tests/test-quickstart/src/test/resources/test-jndi.xml b/tests/test-quickstart/src/test/resources/test-jndi.xml index a683d5e5fe0..6fad94e3e9f 100644 --- a/tests/test-quickstart/src/test/resources/test-jndi.xml +++ b/tests/test-quickstart/src/test/resources/test-jndi.xml @@ -1,5 +1,5 @@ - + diff --git a/tests/test-quickstart/src/test/resources/test-spec.xml b/tests/test-quickstart/src/test/resources/test-spec.xml index 9e6b25b2ed8..b77c82ff2af 100644 --- a/tests/test-quickstart/src/test/resources/test-spec.xml +++ b/tests/test-quickstart/src/test/resources/test-spec.xml @@ -1,5 +1,5 @@ - + diff --git a/tests/test-quickstart/src/test/resources/test.xml b/tests/test-quickstart/src/test/resources/test.xml index 39e94e5a433..01ba7c555c8 100644 --- a/tests/test-quickstart/src/test/resources/test.xml +++ b/tests/test-quickstart/src/test/resources/test.xml @@ -1,5 +1,5 @@ - + diff --git a/tests/test-webapps/test-websocket-client-provided-webapp/src/main/resources/jetty-websocket-httpclient.xml b/tests/test-webapps/test-websocket-client-provided-webapp/src/main/resources/jetty-websocket-httpclient.xml index 4e938193675..d370be62c4f 100644 --- a/tests/test-webapps/test-websocket-client-provided-webapp/src/main/resources/jetty-websocket-httpclient.xml +++ b/tests/test-webapps/test-websocket-client-provided-webapp/src/main/resources/jetty-websocket-httpclient.xml @@ -1,4 +1,4 @@ - + diff --git a/tests/test-webapps/test-weld-cdi-webapp/src/main/webapp/WEB-INF/jetty-env.xml b/tests/test-webapps/test-weld-cdi-webapp/src/main/webapp/WEB-INF/jetty-env.xml index a079f8241a6..9d04986120c 100644 --- a/tests/test-webapps/test-weld-cdi-webapp/src/main/webapp/WEB-INF/jetty-env.xml +++ b/tests/test-webapps/test-weld-cdi-webapp/src/main/webapp/WEB-INF/jetty-env.xml @@ -1,5 +1,5 @@ - + From 35903ae2624591c8efcbf539e74ae4959676cad5 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Thu, 20 Jun 2024 09:43:05 -0500 Subject: [PATCH 12/20] Update github URL references to new location --- .../ISSUE_TEMPLATE/enhancement-template.md | 2 +- .github/ISSUE_TEMPLATE/issue-template.md | 2 +- .github/ISSUE_TEMPLATE/release-template.md | 22 +++++++++---------- CONTRIBUTING.md | 6 ++--- Jenkinsfile-autobahn | 2 +- .../src/main/webapp/index.html | 2 +- .../src/main/webapp/index.html | 2 +- .../src/main/webapp/login.html | 2 +- .../src/main/webapp/auth.html | 2 +- .../src/main/webapp/index.html | 2 +- .../src/main/webapp/remote.html | 2 +- .../src/main/webapp/rewrite/info.html | 2 +- .../src/main/webapp/index.html | 2 +- .../demo-jsp-webapp/src/main/webapp/index.jsp | 2 +- .../src/main/webapp/index.html | 2 +- .../src/main/resources/index.html | 2 +- .../asciidoc/old_docs/contributing/bugs.adoc | 2 +- .../old_docs/contributing/documentation.adoc | 4 ++-- .../old_docs/contributing/source-build.adoc | 4 ++-- .../old_docs/jetty-xml/jetty-xml-config.adoc | 2 +- .../old_docs/security/jaas-support.adoc | 2 +- .../sessions/session-infinispan.adoc | 2 +- .../operations-guide/pages/session/index.adoc | 2 +- jetty-home/src/main/resources/README.adoc | 2 +- .../resources/modules/demo.d/root/index.html | 2 +- jetty-osgi/test-jetty-osgi/README.txt | 2 +- .../util/RolloverFileOutputStreamTest.java | 2 +- .../core/internal/FrameFlusherTest.java | 2 +- .../websocket/JavaxWebSocketCdiTest.java | 2 +- .../test/DeploymentErrorInitializer.java | 2 +- 30 files changed, 44 insertions(+), 44 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/enhancement-template.md b/.github/ISSUE_TEMPLATE/enhancement-template.md index 87f5652cac6..f8232ee6327 100644 --- a/.github/ISSUE_TEMPLATE/enhancement-template.md +++ b/.github/ISSUE_TEMPLATE/enhancement-template.md @@ -8,7 +8,7 @@ labels: Enhancement --- **Jetty version(s)** -_[Jetty 9.x is now at End of Community Support](https://github.com/eclipse/jetty.project/issues/7958)_ +_[Jetty 9.x is now at End of Community Support](https://github.com/jetty/jetty.project/issues/7958)_ **Enhancement Description** diff --git a/.github/ISSUE_TEMPLATE/issue-template.md b/.github/ISSUE_TEMPLATE/issue-template.md index 98e009121fc..bded56c3883 100644 --- a/.github/ISSUE_TEMPLATE/issue-template.md +++ b/.github/ISSUE_TEMPLATE/issue-template.md @@ -8,7 +8,7 @@ labels: Bug --- **Jetty version(s)** - + **Jetty Environment** diff --git a/.github/ISSUE_TEMPLATE/release-template.md b/.github/ISSUE_TEMPLATE/release-template.md index 0bdb16e450f..0080b203e73 100644 --- a/.github/ISSUE_TEMPLATE/release-template.md +++ b/.github/ISSUE_TEMPLATE/release-template.md @@ -16,18 +16,18 @@ This release process will produce releases: - [x] Create the release(s) issue. - [ ] Update the target Jetty version(s) in the issue. - [ ] Update the target release date in the issue. -- [ ] Link this issue to the target [GitHub Project(s)](https://github.com/eclipse/jetty.project/projects). +- [ ] Link this issue to the target [GitHub Project(s)](https://github.com/jetty/jetty.project/projects). - [ ] Assign this issue to a "release manager". -- [ ] Review [draft security advisories](https://github.com/eclipse/jetty.project/security/advisories). Ensure that issues are created and assigned to GitHub Projects to capture any advisories that will be announced. -- [ ] Update [GitHub Project(s)](https://github.com/eclipse/jetty.project/projects) +- [ ] Review [draft security advisories](https://github.com/jetty/jetty.project/security/advisories). Ensure that issues are created and assigned to GitHub Projects to capture any advisories that will be announced. +- [ ] Update [GitHub Project(s)](https://github.com/jetty/jetty.project/projects) + [ ] Create new project for the next releases (not this release). + [ ] Ensure new project is public (not private) - + [ ] Freeze the target [GitHub Project(s)](https://github.com/eclipse/jetty.project/projects) by editing their names to "Jetty X.Y.Z FROZEN" - + [ ] Review the issues/PRs assigned to the target [GitHub Project(s)](https://github.com/eclipse/jetty.project/projects). Any tasks that are not-yet-started are moved to next releases. -- [ ] Review dependabot status. [Manually](https://github.com/eclipse/jetty.project/network/updates) run dependabot if needed and review resulting PRs for inclusion. + + [ ] Freeze the target [GitHub Project(s)](https://github.com/jetty/jetty.project/projects) by editing their names to "Jetty X.Y.Z FROZEN" + + [ ] Review the issues/PRs assigned to the target [GitHub Project(s)](https://github.com/jetty/jetty.project/projects). Any tasks that are not-yet-started are moved to next releases. +- [ ] Review dependabot status. [Manually](https://github.com/jetty/jetty.project/network/updates) run dependabot if needed and review resulting PRs for inclusion. Such updates should only be included in the week before a release if there is a compelling security or stability reason to do so. - [ ] Wait 24 hours from last change to the issues/PRs included in FROZEN GitHub Project(s). -- [ ] Verify target [project(s)](https://github.com/eclipse/jetty.project/projects) are complete. +- [ ] Verify target [project(s)](https://github.com/jetty/jetty.project/projects) are complete. - [ ] Verify that branch `jetty-10.0.x` is merged to branch `jetty-11.0.x`. - [ ] Assign issue to "build manager", who will stage the releases. + [ ] Create and use branches `release/` to perform version specific release work from. @@ -35,9 +35,9 @@ This release process will produce releases: + [ ] Stage 9.4 release with Java 11. + [ ] Stage 10 release with Java 21. + [ ] Stage 11 release with Java 21. - + [ ] Push release branches `release/` to to https://github.com/eclipse/jetty.project - + [ ] Push release tags `jetty-` to https://github.com/eclipse/jetty.project - + [ ] Edit a draft release (for each Jetty release) in GitHub (https://github.com/eclipse/jetty.project/releases). Content is generated with the "changelog tool". + + [ ] Push release branches `release/` to to https://github.com/jetty/jetty.project + + [ ] Push release tags `jetty-` to https://github.com/jetty/jetty.project + + [ ] Edit a draft release (for each Jetty release) in GitHub (https://github.com/jetty/jetty.project/releases). Content is generated with the "changelog tool". - [ ] Assign issue to "test manager", who will oversee the testing of the staged releases. + [ ] Test [CometD](https://github.com/cometd/cometd). + [ ] Test [Reactive HttpClient](https://github.com/jetty-project/jetty-reactive-httpclient). @@ -58,7 +58,7 @@ This release process will produce releases: + [ ] Update (or check) documentation page(s) are updated. - [ ] Publish GitHub Releases. - [ ] Prepare release announcement for mailing lists. -- [ ] Publish any [security advisories](https://github.com/eclipse/jetty.project/security/advisories). +- [ ] Publish any [security advisories](https://github.com/jetty/jetty.project/security/advisories). + [ ] Edit `VERSION.txt` to include any actual CVE number next to correspondent issue. + [ ] Edit any issues for CVEs in github with their CVE number - [ ] Notify downstream maintainers. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 38f9fb35645..afd1bc0e44a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -16,7 +16,7 @@ Information regarding source code management, builds, coding standards, and more - [https://eclipse.dev/jetty/documentation/](https://eclipse.dev/jetty/documentation/) -The canonical Jetty git repository is located at [GitHub.](https://github.com/eclipse/jetty.project) Providing you have +The canonical Jetty git repository is located at [GitHub.](https://github.com/jetty/jetty.project) Providing you have completed the contributors agreement mentioned below we will endeavor to pull your commit into Jetty proper. Eclipse Contributor Agreement @@ -43,13 +43,13 @@ Search for bugs ---------------- This project uses GitHub Issues to track ongoing development and issues. -- [https://github.com/eclipse/jetty.project/issues](https://github.com/eclipse/jetty.project/issues) +- [https://github.com/jetty/jetty.project/issues](https://github.com/jetty/jetty.project/issues) Create a new bug ----------------- Be sure to search for existing bugs before you create another one. Remember that contributions are always welcome! -- [https://github.com/eclipse/jetty.project/issues](https://github.com/eclipse/jetty.project/issues) +- [https://github.com/jetty/jetty.project/issues](https://github.com/jetty/jetty.project/issues) Reporting Security Issues ----------------- diff --git a/Jenkinsfile-autobahn b/Jenkinsfile-autobahn index 3366e2d2ec0..620f9c45f45 100644 --- a/Jenkinsfile-autobahn +++ b/Jenkinsfile-autobahn @@ -18,7 +18,7 @@ pipeline { stages { stage("Checkout Jetty Branch") { steps { - git url: 'https://github.com/eclipse/jetty.project/', branch: '${JETTY_BRANCH}' + git url: 'https://github.com/jetty/jetty.project/', branch: '${JETTY_BRANCH}' } } stage( "Build / Test - JDK11" ) { diff --git a/demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/index.html b/demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/index.html index 3f2f70f517c..ce1b3273cf2 100644 --- a/demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/index.html +++ b/demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/index.html @@ -9,7 +9,7 @@
Demo Home - Source + Source Jetty Project Home Documentation Commercial Support diff --git a/demos/demo-jaas-webapp/src/main/webapp/index.html b/demos/demo-jaas-webapp/src/main/webapp/index.html index dafbd88aa86..dbaafe5a45e 100644 --- a/demos/demo-jaas-webapp/src/main/webapp/index.html +++ b/demos/demo-jaas-webapp/src/main/webapp/index.html @@ -9,7 +9,7 @@
Demo Home - Source + Source Jetty Project Home Documentation Commercial Support diff --git a/demos/demo-jaas-webapp/src/main/webapp/login.html b/demos/demo-jaas-webapp/src/main/webapp/login.html index 607d8d38184..a0140e9d205 100644 --- a/demos/demo-jaas-webapp/src/main/webapp/login.html +++ b/demos/demo-jaas-webapp/src/main/webapp/login.html @@ -6,7 +6,7 @@
Demo Home - Source + Source Jetty Project Home Documentation Commercial Support diff --git a/demos/demo-jetty-webapp/src/main/webapp/auth.html b/demos/demo-jetty-webapp/src/main/webapp/auth.html index 5870ec5904c..57d6cf8e06b 100644 --- a/demos/demo-jetty-webapp/src/main/webapp/auth.html +++ b/demos/demo-jetty-webapp/src/main/webapp/auth.html @@ -9,7 +9,7 @@
Demo Home - Source + Source Jetty Project Home Documentation Commercial Support diff --git a/demos/demo-jetty-webapp/src/main/webapp/index.html b/demos/demo-jetty-webapp/src/main/webapp/index.html index 169cb794cf7..81bfdc4e169 100644 --- a/demos/demo-jetty-webapp/src/main/webapp/index.html +++ b/demos/demo-jetty-webapp/src/main/webapp/index.html @@ -8,7 +8,7 @@
Demo Home - Source + Source Jetty Project Home Documentation Commercial Support diff --git a/demos/demo-jetty-webapp/src/main/webapp/remote.html b/demos/demo-jetty-webapp/src/main/webapp/remote.html index 1f076c43dca..7b1822787b3 100644 --- a/demos/demo-jetty-webapp/src/main/webapp/remote.html +++ b/demos/demo-jetty-webapp/src/main/webapp/remote.html @@ -8,7 +8,7 @@
Demo Home - Source + Source Jetty Project Home Documentation Commercial Support diff --git a/demos/demo-jetty-webapp/src/main/webapp/rewrite/info.html b/demos/demo-jetty-webapp/src/main/webapp/rewrite/info.html index 416fd03cf1a..0e85b8213e4 100644 --- a/demos/demo-jetty-webapp/src/main/webapp/rewrite/info.html +++ b/demos/demo-jetty-webapp/src/main/webapp/rewrite/info.html @@ -9,7 +9,7 @@
Demo Home - Source + Source Jetty Project Home Documentation Commercial Support diff --git a/demos/demo-jndi-webapp/src/main/webapp/index.html b/demos/demo-jndi-webapp/src/main/webapp/index.html index 5f3a1addd04..c24f9e853e2 100644 --- a/demos/demo-jndi-webapp/src/main/webapp/index.html +++ b/demos/demo-jndi-webapp/src/main/webapp/index.html @@ -8,7 +8,7 @@
Demo Home - Source + Source Jetty Project Home Documentation Commercial Support diff --git a/demos/demo-jsp-webapp/src/main/webapp/index.jsp b/demos/demo-jsp-webapp/src/main/webapp/index.jsp index e0f0c99e34f..709a38f50f1 100644 --- a/demos/demo-jsp-webapp/src/main/webapp/index.jsp +++ b/demos/demo-jsp-webapp/src/main/webapp/index.jsp @@ -10,7 +10,7 @@
Demo Home - Source + Source Jetty Project Home Documentation Commercial Support diff --git a/demos/demo-spec/demo-spec-webapp/src/main/webapp/index.html b/demos/demo-spec/demo-spec-webapp/src/main/webapp/index.html index 0f4ac2a53c8..90e3e06b2fe 100644 --- a/demos/demo-spec/demo-spec-webapp/src/main/webapp/index.html +++ b/demos/demo-spec/demo-spec-webapp/src/main/webapp/index.html @@ -8,7 +8,7 @@
Demo Home - Source + Source Jetty Project Home Documentation Commercial Support diff --git a/demos/demo-template/src/main/resources/index.html b/demos/demo-template/src/main/resources/index.html index 9628c8783a8..0b5debc6fc6 100644 --- a/demos/demo-template/src/main/resources/index.html +++ b/demos/demo-template/src/main/resources/index.html @@ -10,7 +10,7 @@
Demo Home - Source + Source Jetty Project Home Documentation Commercial Support diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/bugs.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/bugs.adoc index 50edbfe9ba5..0328bde4437 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/bugs.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/bugs.adoc @@ -17,5 +17,5 @@ As with any constantly evolving software project, there will be issues, features, and bugs. We want to know whats bugging you! -File bugs as Issues in our Github repository http://github.com/eclipse/jetty.project[Issues at Github] +File bugs as Issues in our Github repository http://github.com/jetty/jetty.project[Issues at Github] diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/documentation.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/documentation.adoc index f2523ab5460..d27142bbe65 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/documentation.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/documentation.adoc @@ -49,7 +49,7 @@ Clone the repository: [source, screen, subs="{sub-order}"] .... -$ git clone https://github.com/eclipse/jetty.project.git +$ git clone https://github.com/jetty/jetty.project.git .... You will now have a local directory with all of jetty, including the jetty-documentation. @@ -109,7 +109,7 @@ Obviously we can not allow anyone immediate access to this repository so you mus In English that means that you would go to the url of the documentation in github: .... -https://github.com/eclipse/jetty.project +https://github.com/jetty/jetty.project .... When you are on this page you will see a little button called 'Fork' which you can click and you will be taken back to your main page on github where you have a new repository. diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/source-build.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/source-build.adoc index 96c6a246d73..cfaa3fcf830 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/source-build.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/source-build.adoc @@ -28,7 +28,7 @@ These are the URLs to the GIT repositories for the Jetty code. They are for people who are working on the Jetty project, as well as for people who are interested in examining or modifying the Jetty code for their own projects. Jetty Project Repository:: - https://github.com/eclipse/jetty.project + https://github.com/jetty/jetty.project ===== Build and Project Infrastructure SCM URLs @@ -53,7 +53,7 @@ Building Jetty should simply be a matter of changing into the relevant directory [source, screen, subs="{sub-order}"] .... -$ git clone https://github.com/eclipse/jetty.project.git +$ git clone https://github.com/jetty/jetty.project.git $ cd jetty.project $ mvn install diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/jetty-xml/jetty-xml-config.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/jetty-xml/jetty-xml-config.adoc index bc0793a93c1..926eafcf92b 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/jetty-xml/jetty-xml-config.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/jetty-xml/jetty-xml-config.adoc @@ -26,7 +26,7 @@ Not all Jetty features are configured in `jetty.xml`. There are several optional configuration files that share the same format as `jetty.xml` and, if specified, concatenate to it. -These configuration files are also stored in `$JETTY_HOME/etc/`, and examples of them are in http://github.com/eclipse/jetty.project/jetty-server/src/main/config/etc/[Github Repository]. +These configuration files are also stored in `$JETTY_HOME/etc/`, and examples of them are in http://github.com/jetty/jetty.project/jetty-server/src/main/config/etc/[Github Repository]. The selection of which configuration files to use is controlled by `start.jar` and the process of merging configuration is described in xref:jetty-xml-usage[]. [[root-element-jetty-xml]] diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/security/jaas-support.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/security/jaas-support.adoc index a50084ccfa6..ff801b6a270 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/security/jaas-support.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/security/jaas-support.adoc @@ -406,4 +406,4 @@ public class FooLoginModule extends AbstractLoginModule An example webapp using JAAS can be found in the Jetty GitHub repository: -* link:{GITBROWSEURL}/tests/test-webapps/test-jaas-webapp[https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/tests/test-webapps/test-jaas-webapp] +* link:{GITBROWSEURL}/tests/test-webapps/test-jaas-webapp[https://github.com/jetty/jetty.project/tree/jetty-10.0.x/tests/test-webapps/test-jaas-webapp] diff --git a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/sessions/session-infinispan.adoc b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/sessions/session-infinispan.adoc index d0cc65d8803..cbf6624783a 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/sessions/session-infinispan.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/sessions/session-infinispan.adoc @@ -126,7 +126,7 @@ There are no configuration properties associated with this module. From Jetty-9.4.13 onwards, we have changed the format of the serialized session when using a remote cache (ie using hotrod). Prior to release 9.4.13 we used the default Infinispan serialization, however this was not able to store sufficient information to allow Jetty to properly deserialize session attributes in all circumstances. -See issue link:https://github.com/eclipse/jetty.project/issues/2919[] for more background. +See issue link:https://github.com/jetty/jetty.project/issues/2919[] for more background. We have provided a conversion program which will convert any sessions stored in Infinispan to the new format. diff --git a/documentation/jetty/modules/operations-guide/pages/session/index.adoc b/documentation/jetty/modules/operations-guide/pages/session/index.adoc index c8d9ba3aa36..483bc9da932 100644 --- a/documentation/jetty/modules/operations-guide/pages/session/index.adoc +++ b/documentation/jetty/modules/operations-guide/pages/session/index.adoc @@ -604,7 +604,7 @@ There are no configuration properties associated with this module. From Jetty-9.4.13 onwards, we have changed the format of the serialized session when using a remote cache (ie using hotrod). Prior to release 9.4.13 we used the default Infinispan serialization, however this was not able to store sufficient information to allow Jetty to properly deserialize session attributes in all circumstances. -See issue https://github.com/eclipse/jetty.project/issues/2919[] for more background. +See issue https://github.com/jetty/jetty.project/issues/2919[] for more background. We have provided a conversion program which will convert any sessions stored in Infinispan to the new format. diff --git a/jetty-home/src/main/resources/README.adoc b/jetty-home/src/main/resources/README.adoc index af5739c576d..8f76a9a2aad 100644 --- a/jetty-home/src/main/resources/README.adoc +++ b/jetty-home/src/main/resources/README.adoc @@ -6,7 +6,7 @@ The link:https://eclipse.dev/jetty/[Eclipse Jetty] Project provides a: * Servlet Container * Java HTTP & WebSocket Client -Jetty is available under an open source link:LICENSE.txt[LICENSE], and the full source code is available at link:https://github.com/eclipse/jetty.project[GitHub]. +Jetty is available under an open source link:LICENSE.txt[LICENSE], and the full source code is available at link:https://github.com/jetty/jetty.project[GitHub]. The Jetty documentation is available at link:https://eclipse.dev/jetty/documentation/[]. diff --git a/jetty-home/src/main/resources/modules/demo.d/root/index.html b/jetty-home/src/main/resources/modules/demo.d/root/index.html index 28b06d176e8..b9e8466f77e 100644 --- a/jetty-home/src/main/resources/modules/demo.d/root/index.html +++ b/jetty-home/src/main/resources/modules/demo.d/root/index.html @@ -61,7 +61,7 @@

getting help

  • Mailing lists @ eclipse
    • -
  • Source @ github
    • +
  • Source @ github
  • Developer Advice
  • Custom Development
  • Production support
    • diff --git a/jetty-osgi/test-jetty-osgi/README.txt b/jetty-osgi/test-jetty-osgi/README.txt index 9811ae5018a..58bc75e2f08 100644 --- a/jetty-osgi/test-jetty-osgi/README.txt +++ b/jetty-osgi/test-jetty-osgi/README.txt @@ -143,7 +143,7 @@ If you've upgraded the jetty jar and that's all you've changed, then more than l Also, if you don't see any test failures with unresolved jar messages, then it's also a good indicator that the problem is with SpiFly versioning. Unfortunately, when the problem is a jvm/SpiFly versioning mismatch, the osgi paxexam environment doesn't output any good log messages. There is a java.lang.Error that is thrown from inside asm that the environment doesn't pass on in any useful fashion. To try and catch this error, you can modify the ServletInstanceWrapper at line 163 to catch Throwable instead of Exception: -https://github.com/eclipse/jetty.project/blob/jetty-10.0.x/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/ServerInstanceWrapper.java#L163 +https://github.com/jetty/jetty.project/blob/jetty-10.0.x/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/ServerInstanceWrapper.java#L163 When you do this, you get output like the following: diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/RolloverFileOutputStreamTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/RolloverFileOutputStreamTest.java index c19bc4184fe..a79251f04cc 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/RolloverFileOutputStreamTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/RolloverFileOutputStreamTest.java @@ -81,7 +81,7 @@ public class RolloverFileOutputStreamTest } /** - * https://github.com/eclipse/jetty.project/issues/1507 + * https://github.com/jetty/jetty.project/issues/1507 */ @Test public void testMidnightRolloverCalcPDTIssue1507() diff --git a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/FrameFlusherTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/FrameFlusherTest.java index 2d89b3da755..329e4aa5a88 100644 --- a/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/FrameFlusherTest.java +++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/FrameFlusherTest.java @@ -100,7 +100,7 @@ public class FrameFlusherTest /** * Ensure that FrameFlusher honors the correct order of websocket frames. * - * @see eclipse/jetty.project#2491 + * @see eclipse/jetty.project#2491 */ @Test public void testLargeSmallText() throws ExecutionException, InterruptedException diff --git a/tests/test-cdi/src/test/java/org/eclipse/jetty/cdi/tests/websocket/JavaxWebSocketCdiTest.java b/tests/test-cdi/src/test/java/org/eclipse/jetty/cdi/tests/websocket/JavaxWebSocketCdiTest.java index e217e3454cc..dde298e7507 100644 --- a/tests/test-cdi/src/test/java/org/eclipse/jetty/cdi/tests/websocket/JavaxWebSocketCdiTest.java +++ b/tests/test-cdi/src/test/java/org/eclipse/jetty/cdi/tests/websocket/JavaxWebSocketCdiTest.java @@ -163,7 +163,7 @@ public class JavaxWebSocketCdiTest } @Test - @Disabled("See issue https://github.com/eclipse/jetty.project/issues/6174") + @Disabled("See issue https://github.com/jetty/jetty.project/issues/6174") public void testHttpSessionInjection() throws Exception { start((servletContext, wsContainer) -> wsContainer.addEndpoint(CdiHttpSessionSocket.class)); diff --git a/tests/test-integration/src/test/java/org/eclipse/jetty/test/DeploymentErrorInitializer.java b/tests/test-integration/src/test/java/org/eclipse/jetty/test/DeploymentErrorInitializer.java index ad27c08b63c..c04c7e6f9fd 100644 --- a/tests/test-integration/src/test/java/org/eclipse/jetty/test/DeploymentErrorInitializer.java +++ b/tests/test-integration/src/test/java/org/eclipse/jetty/test/DeploymentErrorInitializer.java @@ -21,7 +21,7 @@ import javax.servlet.ServletException; /** * A SCI that tosses an Error to intentionally to cause issues with the DeploymentManager * - * @see Issue #1602 + * @see Issue #1602 */ public class DeploymentErrorInitializer implements ServletContainerInitializer { From 5bbd012d60057ed9d41b435609f32a6ebd896b40 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Thu, 20 Jun 2024 10:00:56 -0500 Subject: [PATCH 13/20] Update github URL references to new location --- .github/ISSUE_TEMPLATE/release-template.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/release-template.md b/.github/ISSUE_TEMPLATE/release-template.md index 0080b203e73..b69ae452124 100644 --- a/.github/ISSUE_TEMPLATE/release-template.md +++ b/.github/ISSUE_TEMPLATE/release-template.md @@ -42,7 +42,7 @@ This release process will produce releases: + [ ] Test [CometD](https://github.com/cometd/cometd). + [ ] Test [Reactive HttpClient](https://github.com/jetty-project/jetty-reactive-httpclient). + [ ] Test [Load Generator](https://github.com/jetty-project/jetty-load-generator). - + [ ] Test [Jetty Docker images](https://github.com/eclipse/jetty.docker). + + [ ] Test [Jetty Docker images](https://github.com/jetty/jetty.docker). + [ ] Test other [Jetty OSS integrations](https://jenkins.webtide.net/job/external_oss). + [ ] Check [TCK CI](https://jenkins.webtide.net/job/tck). + [ ] Test sponsored integrations. @@ -53,7 +53,7 @@ This release process will produce releases: - [ ] Promote staged releases. - [ ] Merge release branches back to main branches and delete release branches. - [ ] Verify release existence in Maven Central by triggering the Jenkins builds of CometD. -- [ ] Update Jetty versions on the website ( follow instructions in [jetty.website](https://github.com/eclipse/jetty.website/blob/master/README.md) ). +- [ ] Update Jetty versions on the website (follow instructions in [jetty.website](https://github.com/jetty/jetty.website/blob/master/README.md) ). + [ ] Update (or check) [Download](https://jetty.org/download.html) page is updated. + [ ] Update (or check) documentation page(s) are updated. - [ ] Publish GitHub Releases. From 5927b62793afbbb0683216bddb73b3a0fdc94870 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Thu, 20 Jun 2024 10:13:54 -0500 Subject: [PATCH 14/20] Fixing maven pom spotless error --- jetty-xml/pom.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index ec601f8ddb6..63a017d40c3 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -45,13 +45,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - - @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.xml=org.eclipse.jetty.logging - - org.apache.maven.plugins maven-compiler-plugin @@ -60,6 +53,13 @@ 8 + + org.apache.maven.plugins + maven-surefire-plugin + + @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.xml=org.eclipse.jetty.logging + + From 23aecbe3a80d6eab6fa5f3c152e6019737e8f1f8 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Thu, 20 Jun 2024 14:38:15 -0500 Subject: [PATCH 15/20] Fix warnings during jetty-ee9-servlet tests --- .../ee9/servlet/CacheControlHeaderTest.java | 2 +- .../ee9/servlet/DefaultServletRangesTest.java | 2 +- .../jetty/ee9/servlet/DefaultServletTest.java | 16 ++++++++-------- .../jetty/ee9/servlet/ServletRequestLogTest.java | 1 + 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/CacheControlHeaderTest.java b/jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/CacheControlHeaderTest.java index f0b64d4b732..d327bbcd4c0 100644 --- a/jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/CacheControlHeaderTest.java +++ b/jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/CacheControlHeaderTest.java @@ -95,7 +95,7 @@ public class CacheControlHeaderTest servletHolder.setServlet(new DefaultServlet()); servletHolder.setInitParameter("cacheControl", "max-age=3600,public"); Path resBase = MavenTestingUtils.getTargetPath("test-classes/contextResources"); - servletHolder.setInitParameter("resourceBase", resBase.toFile().toURI().toASCIIString()); + servletHolder.setInitParameter("baseResource", resBase.toFile().toURI().toASCIIString()); context.addServlet(servletHolder, "/*"); if (forceFilter) { diff --git a/jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/DefaultServletRangesTest.java b/jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/DefaultServletRangesTest.java index 052b9808747..3b580942784 100644 --- a/jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/DefaultServletRangesTest.java +++ b/jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/DefaultServletRangesTest.java @@ -66,7 +66,7 @@ public class DefaultServletRangesTest ServletHolder defholder = context.addServlet(DefaultServlet.class, "/"); defholder.setInitParameter("acceptRanges", "true"); - defholder.setInitParameter("resourceBase", resBasePath); + defholder.setInitParameter("baseResource", resBasePath); server.start(); } diff --git a/jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/DefaultServletTest.java b/jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/DefaultServletTest.java index 49846109bf9..7c157f58f26 100644 --- a/jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/DefaultServletTest.java +++ b/jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/DefaultServletTest.java @@ -295,7 +295,7 @@ public class DefaultServletTest defholder.setInitParameter("redirectWelcome", "false"); defholder.setInitParameter("gzip", "false"); - defholder.setInitParameter("resourceBase", resBasePath); + defholder.setInitParameter("baseResource", resBasePath); }); String req1 = "GET /context/one/deep/ HTTP/1.0\n\n"; @@ -335,7 +335,7 @@ public class DefaultServletTest context.setClassLoader(extraClassLoader); ServletHolder defholder = context.addServlet(DefaultServlet.class, "/extra/*"); - defholder.setInitParameter("resourceBase", extraResourceBaseString); + defholder.setInitParameter("baseResource", extraResourceBaseString); defholder.setInitParameter("pathInfoOnly", "true"); defholder.setInitParameter("dirAllowed", "true"); defholder.setInitParameter("redirectWelcome", "false"); @@ -800,7 +800,7 @@ public class DefaultServletTest startServer((context) -> { ServletHolder altholder = context.addServlet(DefaultServlet.class, "/alt/*"); - altholder.setInitParameter("resourceBase", altRoot.toUri().toASCIIString()); + altholder.setInitParameter("baseResource", altRoot.toUri().toASCIIString()); altholder.setInitParameter("pathInfoOnly", "true"); altholder.setInitParameter("dirAllowed", "false"); altholder.setInitParameter("redirectWelcome", "false"); @@ -808,7 +808,7 @@ public class DefaultServletTest altholder.setInitParameter("gzip", "false"); ServletHolder otherholder = context.addServlet(DefaultServlet.class, "/other/*"); - otherholder.setInitParameter("resourceBase", altRoot.toUri().toASCIIString()); + otherholder.setInitParameter("baseResource", altRoot.toUri().toASCIIString()); otherholder.setInitParameter("pathInfoOnly", "true"); otherholder.setInitParameter("dirAllowed", "true"); otherholder.setInitParameter("redirectWelcome", "false"); @@ -927,7 +927,7 @@ public class DefaultServletTest startServer((context) -> { ServletHolder defholder = context.addServlet(DefaultServlet.class, "/alt/*"); - defholder.setInitParameter("resourceBase", altRoot.toUri().toASCIIString()); + defholder.setInitParameter("baseResource", altRoot.toUri().toASCIIString()); defholder.setInitParameter("dirAllowed", "false"); defholder.setInitParameter("redirectWelcome", "false"); defholder.setInitParameter("welcomeServlets", "true"); @@ -2237,7 +2237,7 @@ public class DefaultServletTest { ServletHolder defholder = context.addServlet(DefaultServlet.class, "/"); defholder.setInitParameter("precompressed", "true"); - defholder.setInitParameter("resourceBase", docRoot.toString()); + defholder.setInitParameter("baseResource", docRoot.toString()); }); String rawResponse; @@ -2290,7 +2290,7 @@ public class DefaultServletTest { ServletHolder defholder = context.addServlet(DefaultServlet.class, "/"); defholder.setInitParameter("precompressed", "bzip2=.bz2,gzip=.gz,br=.br"); - defholder.setInitParameter("resourceBase", docRoot.toString()); + defholder.setInitParameter("baseResource", docRoot.toString()); }); String rawResponse; @@ -2330,7 +2330,7 @@ public class DefaultServletTest { connector.getConnectionFactory(HttpConnectionFactory.class).getHttpConfiguration().setUriCompliance(UriCompliance.UNSAFE); ServletHolder defholder = context.addServlet(DefaultServlet.class, "/"); - defholder.setInitParameter("resourceBase", docRoot.toFile().getAbsolutePath()); + defholder.setInitParameter("baseResource", docRoot.toFile().getAbsolutePath()); }); try (StacklessLogging ignore = new StacklessLogging(ResourceService.class)) diff --git a/jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/ServletRequestLogTest.java b/jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/ServletRequestLogTest.java index d19f5977c2e..355d9075280 100644 --- a/jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/ServletRequestLogTest.java +++ b/jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/ServletRequestLogTest.java @@ -366,6 +366,7 @@ public class ServletRequestLogTest server.setConnectors(new Connector[]{connector}); ErrorHandler errorHandler = new ErrorHandler(); + errorHandler.setServer(server); server.addBean(errorHandler); // First the behavior as defined in etc/jetty.xml From 8a0c4da385682b6620a97d005826658e2c8aaf60 Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Fri, 21 Jun 2024 04:33:15 +0200 Subject: [PATCH 16/20] Issue #11942 Update PoweredBy to reference new jetty.org site (#11943) --- .../jetty-util/src/main/java/org/eclipse/jetty/util/Jetty.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/Jetty.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/Jetty.java index d98fdb82ea7..cc7e04c10d6 100644 --- a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/Jetty.java +++ b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/Jetty.java @@ -67,7 +67,7 @@ public class Jetty else VERSION = System.getProperty("jetty.version", __buildProperties.getProperty("version", "10.0.z-SNAPSHOT")); - POWERED_BY = "Powered by Jetty:// " + VERSION + ""; + POWERED_BY = "Powered by Jetty:// " + VERSION + ""; // Show warning when RC# or M# is in version string STABLE = !VERSION.matches("^.*\\.(RC|M)[0-9]+$"); From 3d7f6d8dc51292f5ee346d736e3972be502a8142 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Fri, 21 Jun 2024 11:38:22 -0500 Subject: [PATCH 17/20] Update URLs for new jetty locations --- CONTRIBUTING.md | 2 +- NOTICE.txt | 2 +- README.md | 2 +- SECURITY.md | 2 +- .../demo-async-rest-webapp/src/main/webapp/index.html | 6 +++--- demos/demo-jaas-webapp/src/main/webapp/index.html | 8 ++++---- demos/demo-jaas-webapp/src/main/webapp/login.html | 6 +++--- demos/demo-jetty-webapp/src/main/webapp/auth.html | 6 +++--- demos/demo-jetty-webapp/src/main/webapp/index.html | 8 ++++---- demos/demo-jetty-webapp/src/main/webapp/remote.html | 6 +++--- demos/demo-jetty-webapp/src/main/webapp/rewrite/info.html | 6 +++--- demos/demo-jndi-webapp/src/main/webapp/index.html | 8 ++++---- demos/demo-jsp-webapp/src/main/webapp/index.jsp | 8 ++++---- .../demo-spec/demo-spec-webapp/src/main/webapp/index.html | 6 +++--- demos/demo-template/src/main/resources/index.html | 6 +++--- .../jetty-documentation/src/main/asciidoc/index.adoc | 2 +- .../old_docs/annotations/using-annotations-embedded.adoc | 2 +- .../asciidoc/old_docs/contributing/releasing-jetty.adoc | 2 +- .../src/main/asciidoc/old_docs/frameworks/cdi.adoc | 2 +- .../gettingstarted/getting-started/jetty-running.adoc | 2 +- .../asciidoc/old_docs/images/modules-9.3-simplified.dot | 2 +- .../src/main/asciidoc/old_docs/platforms/chapter.adoc | 2 +- .../src/main/asciidoc/old_docs/runner/jetty-runner.adoc | 2 +- .../src/main/asciidoc/old_docs/security/jaas-support.adoc | 2 +- .../old_docs/troubleshooting/security-reports.adoc | 2 +- .../operations-guide/protocols/protocols-ssl.adoc | 6 +++--- documentation/jetty/antora.yml | 2 +- .../modules/operations-guide/pages/protocols/index.adoc | 6 +++--- jetty-home/src/main/resources/NOTICE.txt | 2 +- jetty-home/src/main/resources/README.adoc | 6 +++--- .../src/main/resources/modules/demo.d/root/index.html | 8 ++++---- .../main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java | 2 +- .../src/main/java/org/eclipse/jetty/runner/Runner.java | 2 +- .../java/org/eclipse/jetty/server/HomeBaseWarning.java | 2 +- .../java/org/eclipse/jetty/start/ModuleGraphWriter.java | 2 +- .../fileinits/MavenLocalRepoFileInitializerTest.java | 2 +- .../test/java/org/eclipse/jetty/util/LazyListTest.java | 4 ++-- .../java/org/eclipse/jetty/util/Utf8LineParserTest.java | 2 +- .../jetty/util/resource/FileSystemResourceTest.java | 2 +- .../java/org/eclipse/jetty/xml/XmlConfigurationTest.java | 4 ++-- .../test/java/org/eclipse/jetty/xml/XmlParserTest.java | 2 +- 41 files changed, 78 insertions(+), 78 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index afd1bc0e44a..867255013d3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,7 +14,7 @@ Developer resources -------------------- Information regarding source code management, builds, coding standards, and more. -- [https://eclipse.dev/jetty/documentation/](https://eclipse.dev/jetty/documentation/) +- [https://jetty.org/docs/](https://jetty.org/docs/) The canonical Jetty git repository is located at [GitHub.](https://github.com/jetty/jetty.project) Providing you have completed the contributors agreement mentioned below we will endeavor to pull your commit into Jetty proper. diff --git a/NOTICE.txt b/NOTICE.txt index afb099daecf..2dcdea51d20 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -2,7 +2,7 @@ Notices for Eclipse Jetty ========================= This content is produced and maintained by the Eclipse Jetty project. -Project home: https://eclipse.dev/jetty/ +Project home: https://jetty.org/ Trademarks ---------- diff --git a/README.md b/README.md index 425fd311c70..d4fc91065e5 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ Documentation Project documentation is available on the Jetty Eclipse website. -- [https://eclipse.dev/jetty/documentation/](https://eclipse.dev/jetty/documentation/) +- [https://jetty.org/docs/](https://jetty.org/docs/) Building ======== diff --git a/SECURITY.md b/SECURITY.md index 7d4940ff291..e25a9c84013 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -10,7 +10,7 @@ Do not open a public issue to report a security vulnerability. Please send a me ## Handling a Vulnerability -The [following checklist](https://eclipse.dev/jetty/security_processes.php) is used to handle security issues: +The [following checklist](https://jetty.org/security_processes.php) is used to handle security issues: - [ ] On receipt of a security report via security@webtide.com or other channels, if it cannot be trivially dismissed (already fixed, known not a problem, etc.), then a Github security advisory is created by project leadership. - [ ] Copy this list as a markdown in the security advisory for tracking the completion of various tasks. diff --git a/demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/index.html b/demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/index.html index f6c6785184f..016c0e4887e 100644 --- a/demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/index.html +++ b/demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/index.html @@ -9,9 +9,9 @@
    Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
    diff --git a/demos/demo-jaas-webapp/src/main/webapp/index.html b/demos/demo-jaas-webapp/src/main/webapp/index.html index 0079d66c608..e00334b68f4 100644 --- a/demos/demo-jaas-webapp/src/main/webapp/index.html +++ b/demos/demo-jaas-webapp/src/main/webapp/index.html @@ -9,9 +9,9 @@
    Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
    @@ -21,7 +21,7 @@

    JAAS Demo

    - This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory. + This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory. It uses a simple login module that stores its configuration in a properties file.

    diff --git a/demos/demo-jaas-webapp/src/main/webapp/login.html b/demos/demo-jaas-webapp/src/main/webapp/login.html index e4ba0d5715e..a8f7c64a4d1 100644 --- a/demos/demo-jaas-webapp/src/main/webapp/login.html +++ b/demos/demo-jaas-webapp/src/main/webapp/login.html @@ -6,9 +6,9 @@
    Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
    diff --git a/demos/demo-jetty-webapp/src/main/webapp/auth.html b/demos/demo-jetty-webapp/src/main/webapp/auth.html index 7e4a587a202..c5c3ba7da32 100644 --- a/demos/demo-jetty-webapp/src/main/webapp/auth.html +++ b/demos/demo-jetty-webapp/src/main/webapp/auth.html @@ -9,9 +9,9 @@
    Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
    diff --git a/demos/demo-jetty-webapp/src/main/webapp/index.html b/demos/demo-jetty-webapp/src/main/webapp/index.html index e0bcd318b2e..6015956397e 100644 --- a/demos/demo-jetty-webapp/src/main/webapp/index.html +++ b/demos/demo-jetty-webapp/src/main/webapp/index.html @@ -8,9 +8,9 @@
    Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
    @@ -20,7 +20,7 @@

    Eclipse Jetty Demo Webapp

    - This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory. + This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory.

    Jetty Tests:

    diff --git a/demos/demo-jetty-webapp/src/main/webapp/remote.html b/demos/demo-jetty-webapp/src/main/webapp/remote.html index aa6e337c80f..5a6c67727cc 100644 --- a/demos/demo-jetty-webapp/src/main/webapp/remote.html +++ b/demos/demo-jetty-webapp/src/main/webapp/remote.html @@ -8,9 +8,9 @@
    Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
    diff --git a/demos/demo-jetty-webapp/src/main/webapp/rewrite/info.html b/demos/demo-jetty-webapp/src/main/webapp/rewrite/info.html index 1879be6a4c7..8d0b7f2c8b2 100644 --- a/demos/demo-jetty-webapp/src/main/webapp/rewrite/info.html +++ b/demos/demo-jetty-webapp/src/main/webapp/rewrite/info.html @@ -9,9 +9,9 @@
    Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
    diff --git a/demos/demo-jndi-webapp/src/main/webapp/index.html b/demos/demo-jndi-webapp/src/main/webapp/index.html index 3972d02649b..311ba654256 100644 --- a/demos/demo-jndi-webapp/src/main/webapp/index.html +++ b/demos/demo-jndi-webapp/src/main/webapp/index.html @@ -8,9 +8,9 @@
    Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
    @@ -20,7 +20,7 @@

    Eclipse Jetty JNDI Demo Webapp

    - This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory. + This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory.

    diff --git a/demos/demo-jsp-webapp/src/main/webapp/index.jsp b/demos/demo-jsp-webapp/src/main/webapp/index.jsp index 0c861cd6444..a53d45b47cf 100644 --- a/demos/demo-jsp-webapp/src/main/webapp/index.jsp +++ b/demos/demo-jsp-webapp/src/main/webapp/index.jsp @@ -10,9 +10,9 @@

    Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
    @@ -22,7 +22,7 @@

    Eclipse Jetty JSP Demo Webapp

    - This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory. + This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory.

    JSP Examples on <%= DateTimeFormatter.ofPattern("d MMMM yyyy").format(LocalDate.now()) %>

    diff --git a/demos/demo-spec/demo-spec-webapp/src/main/webapp/index.html b/demos/demo-spec/demo-spec-webapp/src/main/webapp/index.html index 5a02b4c7a9f..9bb62b37f88 100644 --- a/demos/demo-spec/demo-spec-webapp/src/main/webapp/index.html +++ b/demos/demo-spec/demo-spec-webapp/src/main/webapp/index.html @@ -8,9 +8,9 @@
    Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
    diff --git a/demos/demo-template/src/main/resources/index.html b/demos/demo-template/src/main/resources/index.html index 7bc052c818f..7ab19ab72ff 100644 --- a/demos/demo-template/src/main/resources/index.html +++ b/demos/demo-template/src/main/resources/index.html @@ -10,9 +10,9 @@
    Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
    diff --git a/documentation/jetty-documentation/src/main/asciidoc/index.adoc b/documentation/jetty-documentation/src/main/asciidoc/index.adoc index 7f8e049f6de..82fdd11c0fa 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/index.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/index.adoc @@ -23,7 +23,7 @@ The Eclipse Jetty Operations Guide targets sysops, devops, and developers who wa The Eclipse Jetty Programming Guide targets developers who want to use the Eclipse Jetty libraries in their applications, and advanced sysops/devops that want to customize the deployment of web applications. -== https://eclipse.dev/jetty/documentation/contribution-guide/index.html[Jetty Contribution Guide] +== https://jetty.org/docs/contribution-guide/index.html[Jetty Contribution Guide] The Eclipse Jetty Programming Guide targets developers that wish to contribute to the Jetty Project with code patches or documentation improvements. diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/annotations/using-annotations-embedded.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/annotations/using-annotations-embedded.adoc index 61f1bd8c699..78314c615f7 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/annotations/using-annotations-embedded.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/annotations/using-annotations-embedded.adoc @@ -17,7 +17,7 @@ ==== Setting up the Classpath You will need to place the following Jetty jar files onto the classpath of your application. -You can obtain them from the https://eclipse.dev/jetty/download.html[Jetty distribution], or the https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-annotations[Maven repository]: +You can obtain them from the https://jetty.org/download.html[Jetty distribution], or the https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-annotations[Maven repository]: .... jetty-plus.jar diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/releasing-jetty.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/releasing-jetty.adoc index 610f813b0d4..378b8f1ee4f 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/releasing-jetty.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/releasing-jetty.adoc @@ -246,7 +246,7 @@ Make sure you follow the other examples and include the `rel="nofollow"` attribu ____ [NOTE] -There is a separate Jenkins build job that publishes documentation to https://eclipse.dev/jetty/documentation/ triggered by a push of changed files to the jetty-documentation project. +There is a separate Jenkins build job that publishes documentation to https://jetty.org/docs/ triggered by a push of changed files to the jetty-documentation project. If you commit your change to the number from step 2, then these builds will use the same release version number. It is preferable if you _don't_ commit that version number change, or better yet, ensure that it is set to the next -SNAPSHOT version number for your jetty major release number. ____ diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/cdi.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/cdi.adoc index ec9cd77b7b0..86979637696 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/cdi.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/cdi.adoc @@ -73,7 +73,7 @@ This module is equivalent to directly modifying the class path configuration wit [source.XML, xml] ------------------------------------------------------------- - + -org.eclipse.jetty.util.Decorator diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/getting-started/jetty-running.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/getting-started/jetty-running.adoc index 11da3b7bccb..89e33a2326c 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/getting-started/jetty-running.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/getting-started/jetty-running.adoc @@ -24,7 +24,7 @@ To start Jetty on the default port of 8080, run the following command: ---- $ java -jar start.jar 2017-09-20 15:45:11.986:INFO::main: Logging initialized @683ms to org.eclipse.jetty.util.log.StdErrLog -2017-09-20 15:45:12.197:WARN:oejs.HomeBaseWarning:main: This instance of Jetty is not running from a separate {jetty.base} directory, this is not recommended. See documentation at https://eclipse.dev/jetty/documentation/ +2017-09-20 15:45:12.197:WARN:oejs.HomeBaseWarning:main: This instance of Jetty is not running from a separate {jetty.base} directory, this is not recommended. See documentation at https://jetty.org/docs/ 2017-09-20 15:45:12.243:INFO:oejs.Server:main: {VERSION} 2017-09-20 15:45:12.266:INFO:oejdp.ScanningAppProvider:main: Deployment monitor [file:///installs/repository/jetty/webapps/] at interval 1 2017-09-20 15:45:12.298:INFO:oejs.AbstractConnector:main: Started ServerConnector@39c0f4a{HTTP/1.1,[http/1.1]}{0.0.0.0:8080} diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/images/modules-9.3-simplified.dot b/documentation/jetty-documentation/src/main/asciidoc/old_docs/images/modules-9.3-simplified.dot index ba0ed540609..b78647f1739 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/images/modules-9.3-simplified.dot +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/images/modules-9.3-simplified.dot @@ -1,7 +1,7 @@ /* * GraphViz Graph of Jetty Modules * - * Jetty: https://eclipse.dev/jetty/ + * Jetty: https://jetty.org/ * GraphViz: http://graphviz.org/ * * To Generate Graph image using graphviz: diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/platforms/chapter.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/platforms/chapter.adoc index 68b0a7b9c4f..7b0042eb038 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/platforms/chapter.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/platforms/chapter.adoc @@ -20,7 +20,7 @@ In addition to using Jetty in its distribution form and its multiple embedded fo Many products and open source projects out there distribute Jetty themselves, in both distribution and embedded forms, not to mention different operating systems bundling Jetty in other installable forms. If your platform supports Jetty from a distribution or deployment perspective and want to be included on this list just fork the documentation and submit a pull request, or contact us. -Check out our list of https://eclipse.dev/jetty/powered[Powered By] page for software that makes use of Jetty, often in novel and exciting ways. +Check out our list of https://jetty.org/powered[Powered By] page for software that makes use of Jetty, often in novel and exciting ways. include::jelastic.adoc[] include::cloudfoundry.adoc[] diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/runner/jetty-runner.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/runner/jetty-runner.adoc index e02f90ef572..59d57ab1876 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/runner/jetty-runner.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/runner/jetty-runner.adoc @@ -69,7 +69,7 @@ The default Configuration Classes are: `org.eclipse.jetty.plus.webapp.PlusConfiguration` `org.eclipse.jetty.annotations.AnnotationConfiguration` -You can learn more about implementing specific Configuration Classes link:https://eclipse.dev/jetty/documentation/[in the Jetty documentation.] +You can learn more about implementing specific Configuration Classes link:https://jetty.org/docs/[in the Jetty documentation.] ==== Deploying Multiple Contexts diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/security/jaas-support.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/security/jaas-support.adoc index 3c9ebe28d02..e1f29339e19 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/security/jaas-support.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/security/jaas-support.adoc @@ -406,4 +406,4 @@ public class FooLoginModule extends AbstractLoginModule An example webapp using JAAS can be found in the Jetty GitHub repository: -* link:{GITBROWSEURL}/tests/test-webapps/test-jaas-webapp[https://github.com/eclipse/jetty.project/tree/jetty-11.0.x/tests/test-webapps/test-jaas-webapp] +* link:{GITBROWSEURL}/tests/test-webapps/test-jaas-webapp[https://github.com/jetty/jetty.project/tree/jetty-11.0.x/tests/test-webapps/test-jaas-webapp] diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/troubleshooting/security-reports.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/troubleshooting/security-reports.adoc index f801eec6226..10add18b096 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/troubleshooting/security-reports.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/troubleshooting/security-reports.adoc @@ -16,7 +16,7 @@ ==== List of Security Reports -A current list of Jetty security reports can be viewed on the link:https://eclipse.dev/jetty/security-reports.php[Project Home Page.] +A current list of Jetty security reports can be viewed on the link:https://jetty.org/security-reports.php[Project Home Page.] ==== Reporting Security Issues diff --git a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/protocols/protocols-ssl.adoc b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/protocols/protocols-ssl.adoc index a5bc25998ba..03159329911 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/protocols/protocols-ssl.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/protocols/protocols-ssl.adoc @@ -59,7 +59,7 @@ You want to create the `$JETTY_BASE/etc/tls-config.xml` with the following templ [source,xml,subs=verbatim] ---- - + @@ -85,7 +85,7 @@ To explicitly add the exclusion of TLSv1.0 and TLSv1.1 (that are also vulnerable [source,xml] ---- - + @@ -110,7 +110,7 @@ You can precisely set the list of excluded ciphers, completely overriding Jetty' [source,xml] ---- - + diff --git a/documentation/jetty/antora.yml b/documentation/jetty/antora.yml index f69bf37b756..973e37236e9 100644 --- a/documentation/jetty/antora.yml +++ b/documentation/jetty/antora.yml @@ -3,7 +3,7 @@ version: '11' title: Eclipse Jetty asciidoc: attributes: - javadoc-url: https://eclipse.dev/jetty/javadoc/jetty-11 + javadoc-url: https://jetty.org/javadoc/jetty-11 jdurl: '{javadoc-url}' jetty-home: ${jetty.home}@ version: 11.0.21-SNAPSHOT diff --git a/documentation/jetty/modules/operations-guide/pages/protocols/index.adoc b/documentation/jetty/modules/operations-guide/pages/protocols/index.adoc index fc771fdd0a2..4258e996c24 100644 --- a/documentation/jetty/modules/operations-guide/pages/protocols/index.adoc +++ b/documentation/jetty/modules/operations-guide/pages/protocols/index.adoc @@ -498,7 +498,7 @@ You want to create the `$JETTY_BASE/etc/tls-config.xml` with the following templ [,xml,subs=verbatim] ---- - + @@ -524,7 +524,7 @@ To explicitly add the exclusion of TLSv1.0 and TLSv1.1 (that are also vulnerable [,xml] ---- - + @@ -549,7 +549,7 @@ You can precisely set the list of excluded ciphers, completely overriding Jetty' [,xml] ---- - + diff --git a/jetty-home/src/main/resources/NOTICE.txt b/jetty-home/src/main/resources/NOTICE.txt index ee70c29a02f..db958813251 100644 --- a/jetty-home/src/main/resources/NOTICE.txt +++ b/jetty-home/src/main/resources/NOTICE.txt @@ -2,7 +2,7 @@ Notices for Eclipse Jetty ========================= This content is produced and maintained by the Eclipse Jetty project. -Project home: https://eclipse.dev/jetty/ +Project home: https://jetty.org/ Trademarks ---------- diff --git a/jetty-home/src/main/resources/README.adoc b/jetty-home/src/main/resources/README.adoc index 8f76a9a2aad..18528ad9bf0 100644 --- a/jetty-home/src/main/resources/README.adoc +++ b/jetty-home/src/main/resources/README.adoc @@ -1,6 +1,6 @@ === ECLIPSE JETTY -The link:https://eclipse.dev/jetty/[Eclipse Jetty] Project provides a: +The link:https://jetty.org/[Eclipse Jetty] Project provides a: * Java HTTP & WebSocket Server * Servlet Container @@ -8,7 +8,7 @@ The link:https://eclipse.dev/jetty/[Eclipse Jetty] Project provides a: Jetty is available under an open source link:LICENSE.txt[LICENSE], and the full source code is available at link:https://github.com/jetty/jetty.project[GitHub]. -The Jetty documentation is available at link:https://eclipse.dev/jetty/documentation/[]. +The Jetty documentation is available at link:https://jetty.org/docs/[]. // tag::quick[] ==== Quick Setup @@ -46,7 +46,7 @@ Point your browser at `+http://localhost:8080+` to see the demo web applications The Jetty server can be stopped with `ctrl+c` in the terminal window. // end::quick[] -For more information about how to start Jetty, run this command (or go to the link:https://eclipse.dev/jetty/documentation/[documentation]): +For more information about how to start Jetty, run this command (or go to the link:https://jetty.org/docs/[documentation]): ---- $ java -jar $JETTY_HOME/start.jar --help diff --git a/jetty-home/src/main/resources/modules/demo.d/root/index.html b/jetty-home/src/main/resources/modules/demo.d/root/index.html index 53ae49ba43d..0744a9cd8d7 100644 --- a/jetty-home/src/main/resources/modules/demo.d/root/index.html +++ b/jetty-home/src/main/resources/modules/demo.d/root/index.html @@ -23,7 +23,7 @@ Websocket and HTTP/2 protocols. The project is 100% Open Source and hosted by the - Eclipse Foundation at https://eclipse.dev/jetty/. + Eclipse Foundation at https://jetty.org/.

    @@ -45,10 +45,10 @@

    information

      -
    • Jetty Homepage
      • -
    • Jetty Documentation Hub
      • +
    • Jetty Homepage
      • +
    • Jetty Documentation Hub
    • Javadoc (via transparent proxy)
      • -
    • Jetty Powered
      • +
    • Jetty Powered
    • Optional content found only in
      jetty-home-<ver>-with-docs.zip
      • Jetty Documentation
        • diff --git a/jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java b/jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java index 4a7c63bb258..74b98f9fbb3 100644 --- a/jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java +++ b/jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java @@ -59,7 +59,7 @@ import org.eclipse.jetty.util.resource.Resource; * Note that the same java compiler will be used as for on-the-fly compiled * jsps, which will be the Eclipse java compiler. *

        - * See Usage Guide for + * See Usage Guide for * instructions on using this plugin. *

        * Runs jspc compiler to produce .java and .class files diff --git a/jetty-runner/src/main/java/org/eclipse/jetty/runner/Runner.java b/jetty-runner/src/main/java/org/eclipse/jetty/runner/Runner.java index 2924ea9c28c..f3667528ef4 100644 --- a/jetty-runner/src/main/java/org/eclipse/jetty/runner/Runner.java +++ b/jetty-runner/src/main/java/org/eclipse/jetty/runner/Runner.java @@ -579,7 +579,7 @@ public class Runner { System.err.println("WARNING: jetty-runner is deprecated."); System.err.println(" See Jetty Documentation for startup options"); - System.err.println(" https://eclipse.dev/jetty/documentation/"); + System.err.println(" https://jetty.org/docs/"); Runner runner = new Runner(); diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HomeBaseWarning.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HomeBaseWarning.java index 681150359b7..14a8d3d6594 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HomeBaseWarning.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HomeBaseWarning.java @@ -63,7 +63,7 @@ public class HomeBaseWarning { StringBuilder warn = new StringBuilder(); warn.append("This instance of Jetty is not running from a separate {jetty.base} directory"); - warn.append(", this is not recommended. See documentation at https://eclipse.dev/jetty/documentation/"); + warn.append(", this is not recommended. See documentation at https://jetty.org/docs/"); LOG.warn("{}", warn.toString()); } } diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/ModuleGraphWriter.java b/jetty-start/src/main/java/org/eclipse/jetty/start/ModuleGraphWriter.java index d01ad6935c8..e04c4dc007e 100644 --- a/jetty-start/src/main/java/org/eclipse/jetty/start/ModuleGraphWriter.java +++ b/jetty-start/src/main/java/org/eclipse/jetty/start/ModuleGraphWriter.java @@ -121,7 +121,7 @@ public class ModuleGraphWriter out.println("/*"); out.println(" * GraphViz Graph of Jetty Modules"); out.println(" * "); - out.println(" * Jetty: https://eclipse.dev/jetty/"); + out.println(" * Jetty: https://jetty.org/"); out.println(" * GraphViz: http://graphviz.org/"); out.println(" * "); out.println(" * To Generate Graph image using graphviz:"); diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializerTest.java b/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializerTest.java index 9b33ffaf866..1c60487d06a 100644 --- a/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializerTest.java +++ b/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializerTest.java @@ -66,7 +66,7 @@ public class MavenLocalRepoFileInitializerTest public void testGetCoordinateNotMaven() { MavenLocalRepoFileInitializer repo = new MavenLocalRepoFileInitializer(baseHome); - String ref = "https://eclipse.dev/jetty/"; + String ref = "https://jetty.org/"; Coordinates coords = repo.getCoordinates(URI.create(ref)); assertThat("Coords", coords, nullValue()); } diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/LazyListTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/LazyListTest.java index 4b6f6bb0440..e89902917a8 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/LazyListTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/LazyListTest.java @@ -1496,12 +1496,12 @@ public class LazyListTest uris.add(URI.create("http://www.mortbay.org/")); uris.add(URI.create("http://jetty.codehaus.org/jetty/")); uris.add(URI.create("http://www.intalio.com/jetty/")); - uris.add(URI.create("https://eclipse.dev/jetty/")); + uris.add(URI.create("https://jetty.org/")); // Make sure that Generics pass through the 'get' routine safely. // We should be able to call this without casting the result to URI URI eclipseUri = LazyList.get(uris, 3); - assertEquals("https://eclipse.dev/jetty/", eclipseUri.toASCIIString()); + assertEquals("https://jetty.org/", eclipseUri.toASCIIString()); } /** diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/Utf8LineParserTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/Utf8LineParserTest.java index 95fa0519d99..c3461efe7c3 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/Utf8LineParserTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/Utf8LineParserTest.java @@ -82,7 +82,7 @@ public class Utf8LineParserTest public void testWildHttpRequestParse() { // Arbitrary Http Response Headers seen in the wild. - // Request URI -> https://eclipse.dev/jetty/ + // Request URI -> https://jetty.org/ List expected = new ArrayList<>(); expected.add("HEAD /jetty/ HTTP/1.0"); expected.add("User-Agent: \"Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.6) Gecko/20060601 Firefox/2.0.0.6 (Ubuntu-feisty)\""); diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java index 7e052dc7fe8..8b2ac0681bf 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java @@ -218,7 +218,7 @@ public class FileSystemResourceTest public void testNotFileURI(Class resourceClass) { assertThrows(IllegalArgumentException.class, - () -> newResource(resourceClass, new URI("https://eclipse.dev/jetty/"))); + () -> newResource(resourceClass, new URI("https://jetty.org/"))); } @ParameterizedTest diff --git a/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java b/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java index 348eaa97e79..9f9cbeab157 100644 --- a/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java +++ b/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java @@ -286,7 +286,7 @@ public class XmlConfigurationTest { if (!rawXml.contains("!DOCTYPE")) rawXml = "\n" + - "\n" + + "\n" + rawXml; return asXmlConfiguration("raw.xml", rawXml); } @@ -295,7 +295,7 @@ public class XmlConfigurationTest { if (!rawXml.contains("!DOCTYPE")) rawXml = "\n" + - "\n" + + "\n" + rawXml; Path testFile = workDir.getEmptyPathDir().resolve(filename); try (BufferedWriter writer = Files.newBufferedWriter(testFile, UTF_8)) diff --git a/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlParserTest.java b/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlParserTest.java index d12dabd6e04..5d89c89adea 100644 --- a/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlParserTest.java +++ b/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlParserTest.java @@ -45,7 +45,7 @@ public class XmlParserTest URL configURL = XmlConfiguration.class.getResource("configure_10_0.dtd"); parser.redirectEntity("configure_10_0.dtd", configURL); - parser.redirectEntity("https://www.eclipse.org/jetty/configure_10_0.dtd", configURL); + parser.redirectEntity("https://jetty.org/configure_10_0.dtd", configURL); parser.redirectEntity("-//Jetty//Configure//EN", configURL); URL url = XmlParserTest.class.getClassLoader().getResource("org/eclipse/jetty/xml/configureWithAttr.xml"); From 91d5e3355a9c590416c1f81372a8bb149d33828e Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Fri, 21 Jun 2024 11:41:01 -0500 Subject: [PATCH 18/20] Update URLs for new jetty locations --- CONTRIBUTING.md | 2 +- NOTICE.txt | 2 +- README.md | 2 +- SECURITY.md | 2 +- .../demo-async-rest-webapp/src/main/webapp/index.html | 4 ++-- demos/demo-jaas-webapp/src/main/webapp/index.html | 6 +++--- demos/demo-jaas-webapp/src/main/webapp/login.html | 4 ++-- demos/demo-jetty-webapp/src/main/webapp/auth.html | 4 ++-- demos/demo-jetty-webapp/src/main/webapp/index.html | 6 +++--- demos/demo-jetty-webapp/src/main/webapp/remote.html | 4 ++-- demos/demo-jetty-webapp/src/main/webapp/rewrite/info.html | 4 ++-- demos/demo-jndi-webapp/src/main/webapp/index.html | 6 +++--- demos/demo-jsp-webapp/src/main/webapp/index.jsp | 6 +++--- .../demo-spec/demo-spec-webapp/src/main/webapp/index.html | 4 ++-- demos/demo-template/src/main/resources/index.html | 4 ++-- .../jetty-documentation/src/main/asciidoc/index.adoc | 2 +- .../old_docs/annotations/using-annotations-embedded.adoc | 2 +- .../asciidoc/old_docs/contributing/releasing-jetty.adoc | 2 +- .../src/main/asciidoc/old_docs/frameworks/cdi.adoc | 2 +- .../gettingstarted/getting-started/jetty-running.adoc | 2 +- .../asciidoc/old_docs/images/modules-9.3-simplified.dot | 2 +- .../src/main/asciidoc/old_docs/platforms/chapter.adoc | 2 +- .../src/main/asciidoc/old_docs/runner/jetty-runner.adoc | 2 +- .../old_docs/troubleshooting/security-reports.adoc | 2 +- .../operations-guide/protocols/protocols-ssl.adoc | 6 +++--- documentation/jetty/antora.yml | 2 +- .../modules/operations-guide/pages/protocols/index.adoc | 6 +++--- jetty-home/src/main/resources/NOTICE.txt | 2 +- jetty-home/src/main/resources/README.adoc | 6 +++--- .../src/main/resources/modules/demo.d/root/index.html | 8 ++++---- .../main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java | 2 +- .../src/main/java/org/eclipse/jetty/runner/Runner.java | 2 +- .../java/org/eclipse/jetty/server/HomeBaseWarning.java | 2 +- .../java/org/eclipse/jetty/start/ModuleGraphWriter.java | 2 +- .../fileinits/MavenLocalRepoFileInitializerTest.java | 2 +- .../test/java/org/eclipse/jetty/util/LazyListTest.java | 4 ++-- .../java/org/eclipse/jetty/util/Utf8LineParserTest.java | 2 +- .../jetty/util/resource/FileSystemResourceTest.java | 2 +- .../java/org/eclipse/jetty/xml/XmlConfigurationTest.java | 4 ++-- .../test/java/org/eclipse/jetty/xml/XmlParserTest.java | 2 +- 40 files changed, 66 insertions(+), 66 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index afd1bc0e44a..867255013d3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,7 +14,7 @@ Developer resources -------------------- Information regarding source code management, builds, coding standards, and more. -- [https://eclipse.dev/jetty/documentation/](https://eclipse.dev/jetty/documentation/) +- [https://jetty.org/docs/](https://jetty.org/docs/) The canonical Jetty git repository is located at [GitHub.](https://github.com/jetty/jetty.project) Providing you have completed the contributors agreement mentioned below we will endeavor to pull your commit into Jetty proper. diff --git a/NOTICE.txt b/NOTICE.txt index 49000f73ac3..8067213c7ec 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -2,7 +2,7 @@ Notices for Eclipse Jetty ========================= This content is produced and maintained by the Eclipse Jetty project. -Project home: https://eclipse.dev/jetty/ +Project home: https://jetty.org/ Trademarks ---------- diff --git a/README.md b/README.md index 425fd311c70..d4fc91065e5 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ Documentation Project documentation is available on the Jetty Eclipse website. -- [https://eclipse.dev/jetty/documentation/](https://eclipse.dev/jetty/documentation/) +- [https://jetty.org/docs/](https://jetty.org/docs/) Building ======== diff --git a/SECURITY.md b/SECURITY.md index 7d4940ff291..d3ce495a4ef 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -10,7 +10,7 @@ Do not open a public issue to report a security vulnerability. Please send a me ## Handling a Vulnerability -The [following checklist](https://eclipse.dev/jetty/security_processes.php) is used to handle security issues: +The following checklist is used to handle security issues: - [ ] On receipt of a security report via security@webtide.com or other channels, if it cannot be trivially dismissed (already fixed, known not a problem, etc.), then a Github security advisory is created by project leadership. - [ ] Copy this list as a markdown in the security advisory for tracking the completion of various tasks. diff --git a/demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/index.html b/demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/index.html index ce1b3273cf2..24c0e3e2475 100644 --- a/demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/index.html +++ b/demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/index.html @@ -10,8 +10,8 @@
        Demo Home Source - Jetty Project Home - Documentation + Jetty Project Home + Documentation Commercial Support
        diff --git a/demos/demo-jaas-webapp/src/main/webapp/index.html b/demos/demo-jaas-webapp/src/main/webapp/index.html index dbaafe5a45e..205ed826b7b 100644 --- a/demos/demo-jaas-webapp/src/main/webapp/index.html +++ b/demos/demo-jaas-webapp/src/main/webapp/index.html @@ -10,8 +10,8 @@
        Demo Home Source - Jetty Project Home - Documentation + Jetty Project Home + Documentation Commercial Support
        @@ -21,7 +21,7 @@

        JAAS Demo

        - This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory. + This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory. It uses a simple login module that stores its configuration in a properties file.

        diff --git a/demos/demo-jaas-webapp/src/main/webapp/login.html b/demos/demo-jaas-webapp/src/main/webapp/login.html index a0140e9d205..20bae181cab 100644 --- a/demos/demo-jaas-webapp/src/main/webapp/login.html +++ b/demos/demo-jaas-webapp/src/main/webapp/login.html @@ -7,8 +7,8 @@
        Demo Home Source - Jetty Project Home - Documentation + Jetty Project Home + Documentation Commercial Support
        diff --git a/demos/demo-jetty-webapp/src/main/webapp/auth.html b/demos/demo-jetty-webapp/src/main/webapp/auth.html index 57d6cf8e06b..5d78ef1b2b6 100644 --- a/demos/demo-jetty-webapp/src/main/webapp/auth.html +++ b/demos/demo-jetty-webapp/src/main/webapp/auth.html @@ -10,8 +10,8 @@
        Demo Home Source - Jetty Project Home - Documentation + Jetty Project Home + Documentation Commercial Support
        diff --git a/demos/demo-jetty-webapp/src/main/webapp/index.html b/demos/demo-jetty-webapp/src/main/webapp/index.html index 81bfdc4e169..023ba702baa 100644 --- a/demos/demo-jetty-webapp/src/main/webapp/index.html +++ b/demos/demo-jetty-webapp/src/main/webapp/index.html @@ -9,8 +9,8 @@
        Demo Home Source - Jetty Project Home - Documentation + Jetty Project Home + Documentation Commercial Support
        @@ -20,7 +20,7 @@

        Eclipse Jetty Demo Webapp

        - This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory. + This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory.

        Jetty Tests:

        diff --git a/demos/demo-jetty-webapp/src/main/webapp/remote.html b/demos/demo-jetty-webapp/src/main/webapp/remote.html index 7b1822787b3..f77ddf15ff6 100644 --- a/demos/demo-jetty-webapp/src/main/webapp/remote.html +++ b/demos/demo-jetty-webapp/src/main/webapp/remote.html @@ -9,8 +9,8 @@
        Demo Home Source - Jetty Project Home - Documentation + Jetty Project Home + Documentation Commercial Support
        diff --git a/demos/demo-jetty-webapp/src/main/webapp/rewrite/info.html b/demos/demo-jetty-webapp/src/main/webapp/rewrite/info.html index 0e85b8213e4..b2b79a1fd9b 100644 --- a/demos/demo-jetty-webapp/src/main/webapp/rewrite/info.html +++ b/demos/demo-jetty-webapp/src/main/webapp/rewrite/info.html @@ -10,8 +10,8 @@
        Demo Home Source - Jetty Project Home - Documentation + Jetty Project Home + Documentation Commercial Support
        diff --git a/demos/demo-jndi-webapp/src/main/webapp/index.html b/demos/demo-jndi-webapp/src/main/webapp/index.html index c24f9e853e2..a5b7b18f05a 100644 --- a/demos/demo-jndi-webapp/src/main/webapp/index.html +++ b/demos/demo-jndi-webapp/src/main/webapp/index.html @@ -9,8 +9,8 @@
        Demo Home Source - Jetty Project Home - Documentation + Jetty Project Home + Documentation Commercial Support
        @@ -20,7 +20,7 @@

        Eclipse Jetty JNDI Demo Webapp

        - This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory. + This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory.

        diff --git a/demos/demo-jsp-webapp/src/main/webapp/index.jsp b/demos/demo-jsp-webapp/src/main/webapp/index.jsp index 709a38f50f1..fc443987340 100644 --- a/demos/demo-jsp-webapp/src/main/webapp/index.jsp +++ b/demos/demo-jsp-webapp/src/main/webapp/index.jsp @@ -11,8 +11,8 @@

        Demo Home Source - Jetty Project Home - Documentation + Jetty Project Home + Documentation Commercial Support
        @@ -22,7 +22,7 @@

        Eclipse Jetty JSP Demo Webapp

        - This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory. + This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory.

        JSP Examples on <%= DateTimeFormatter.ofPattern("d MMMM yyyy").format(LocalDate.now()) %>

        diff --git a/demos/demo-spec/demo-spec-webapp/src/main/webapp/index.html b/demos/demo-spec/demo-spec-webapp/src/main/webapp/index.html index 90e3e06b2fe..9c464287a11 100644 --- a/demos/demo-spec/demo-spec-webapp/src/main/webapp/index.html +++ b/demos/demo-spec/demo-spec-webapp/src/main/webapp/index.html @@ -9,8 +9,8 @@
        Demo Home Source - Jetty Project Home - Documentation + Jetty Project Home + Documentation Commercial Support
        diff --git a/demos/demo-template/src/main/resources/index.html b/demos/demo-template/src/main/resources/index.html index 0b5debc6fc6..ebe029d88e5 100644 --- a/demos/demo-template/src/main/resources/index.html +++ b/demos/demo-template/src/main/resources/index.html @@ -11,8 +11,8 @@ Demo Home Source - Jetty Project Home - Documentation + Jetty Project Home + Documentation Commercial Support
        diff --git a/documentation/jetty-documentation/src/main/asciidoc/index.adoc b/documentation/jetty-documentation/src/main/asciidoc/index.adoc index 7f8e049f6de..82fdd11c0fa 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/index.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/index.adoc @@ -23,7 +23,7 @@ The Eclipse Jetty Operations Guide targets sysops, devops, and developers who wa The Eclipse Jetty Programming Guide targets developers who want to use the Eclipse Jetty libraries in their applications, and advanced sysops/devops that want to customize the deployment of web applications. -== https://eclipse.dev/jetty/documentation/contribution-guide/index.html[Jetty Contribution Guide] +== https://jetty.org/docs/contribution-guide/index.html[Jetty Contribution Guide] The Eclipse Jetty Programming Guide targets developers that wish to contribute to the Jetty Project with code patches or documentation improvements. diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/annotations/using-annotations-embedded.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/annotations/using-annotations-embedded.adoc index 657f5b2cf78..6939b11fd66 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/annotations/using-annotations-embedded.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/annotations/using-annotations-embedded.adoc @@ -17,7 +17,7 @@ ==== Setting up the Classpath You will need to place the following Jetty jar files onto the classpath of your application. -You can obtain them from the https://eclipse.dev/jetty/download.html[Jetty distribution], or the https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-annotations[Maven repository]: +You can obtain them from the https://jetty.org/download.html[Jetty distribution], or the https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-annotations[Maven repository]: .... jetty-plus.jar diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/releasing-jetty.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/releasing-jetty.adoc index 610f813b0d4..378b8f1ee4f 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/releasing-jetty.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/contributing/releasing-jetty.adoc @@ -246,7 +246,7 @@ Make sure you follow the other examples and include the `rel="nofollow"` attribu ____ [NOTE] -There is a separate Jenkins build job that publishes documentation to https://eclipse.dev/jetty/documentation/ triggered by a push of changed files to the jetty-documentation project. +There is a separate Jenkins build job that publishes documentation to https://jetty.org/docs/ triggered by a push of changed files to the jetty-documentation project. If you commit your change to the number from step 2, then these builds will use the same release version number. It is preferable if you _don't_ commit that version number change, or better yet, ensure that it is set to the next -SNAPSHOT version number for your jetty major release number. ____ diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/cdi.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/cdi.adoc index ec9cd77b7b0..86979637696 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/cdi.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/cdi.adoc @@ -73,7 +73,7 @@ This module is equivalent to directly modifying the class path configuration wit [source.XML, xml] ------------------------------------------------------------- - + -org.eclipse.jetty.util.Decorator diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/getting-started/jetty-running.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/getting-started/jetty-running.adoc index 11da3b7bccb..89e33a2326c 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/getting-started/jetty-running.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/getting-started/jetty-running.adoc @@ -24,7 +24,7 @@ To start Jetty on the default port of 8080, run the following command: ---- $ java -jar start.jar 2017-09-20 15:45:11.986:INFO::main: Logging initialized @683ms to org.eclipse.jetty.util.log.StdErrLog -2017-09-20 15:45:12.197:WARN:oejs.HomeBaseWarning:main: This instance of Jetty is not running from a separate {jetty.base} directory, this is not recommended. See documentation at https://eclipse.dev/jetty/documentation/ +2017-09-20 15:45:12.197:WARN:oejs.HomeBaseWarning:main: This instance of Jetty is not running from a separate {jetty.base} directory, this is not recommended. See documentation at https://jetty.org/docs/ 2017-09-20 15:45:12.243:INFO:oejs.Server:main: {VERSION} 2017-09-20 15:45:12.266:INFO:oejdp.ScanningAppProvider:main: Deployment monitor [file:///installs/repository/jetty/webapps/] at interval 1 2017-09-20 15:45:12.298:INFO:oejs.AbstractConnector:main: Started ServerConnector@39c0f4a{HTTP/1.1,[http/1.1]}{0.0.0.0:8080} diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/images/modules-9.3-simplified.dot b/documentation/jetty-documentation/src/main/asciidoc/old_docs/images/modules-9.3-simplified.dot index ba0ed540609..b78647f1739 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/images/modules-9.3-simplified.dot +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/images/modules-9.3-simplified.dot @@ -1,7 +1,7 @@ /* * GraphViz Graph of Jetty Modules * - * Jetty: https://eclipse.dev/jetty/ + * Jetty: https://jetty.org/ * GraphViz: http://graphviz.org/ * * To Generate Graph image using graphviz: diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/platforms/chapter.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/platforms/chapter.adoc index 68b0a7b9c4f..7b0042eb038 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/platforms/chapter.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/platforms/chapter.adoc @@ -20,7 +20,7 @@ In addition to using Jetty in its distribution form and its multiple embedded fo Many products and open source projects out there distribute Jetty themselves, in both distribution and embedded forms, not to mention different operating systems bundling Jetty in other installable forms. If your platform supports Jetty from a distribution or deployment perspective and want to be included on this list just fork the documentation and submit a pull request, or contact us. -Check out our list of https://eclipse.dev/jetty/powered[Powered By] page for software that makes use of Jetty, often in novel and exciting ways. +Check out our list of https://jetty.org/powered[Powered By] page for software that makes use of Jetty, often in novel and exciting ways. include::jelastic.adoc[] include::cloudfoundry.adoc[] diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/runner/jetty-runner.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/runner/jetty-runner.adoc index e02f90ef572..59d57ab1876 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/runner/jetty-runner.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/runner/jetty-runner.adoc @@ -69,7 +69,7 @@ The default Configuration Classes are: `org.eclipse.jetty.plus.webapp.PlusConfiguration` `org.eclipse.jetty.annotations.AnnotationConfiguration` -You can learn more about implementing specific Configuration Classes link:https://eclipse.dev/jetty/documentation/[in the Jetty documentation.] +You can learn more about implementing specific Configuration Classes link:https://jetty.org/docs/[in the Jetty documentation.] ==== Deploying Multiple Contexts diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/troubleshooting/security-reports.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/troubleshooting/security-reports.adoc index f801eec6226..10add18b096 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/troubleshooting/security-reports.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/troubleshooting/security-reports.adoc @@ -16,7 +16,7 @@ ==== List of Security Reports -A current list of Jetty security reports can be viewed on the link:https://eclipse.dev/jetty/security-reports.php[Project Home Page.] +A current list of Jetty security reports can be viewed on the link:https://jetty.org/security-reports.php[Project Home Page.] ==== Reporting Security Issues diff --git a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/protocols/protocols-ssl.adoc b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/protocols/protocols-ssl.adoc index a5bc25998ba..03159329911 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/protocols/protocols-ssl.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/protocols/protocols-ssl.adoc @@ -59,7 +59,7 @@ You want to create the `$JETTY_BASE/etc/tls-config.xml` with the following templ [source,xml,subs=verbatim] ---- - + @@ -85,7 +85,7 @@ To explicitly add the exclusion of TLSv1.0 and TLSv1.1 (that are also vulnerable [source,xml] ---- - + @@ -110,7 +110,7 @@ You can precisely set the list of excluded ciphers, completely overriding Jetty' [source,xml] ---- - + diff --git a/documentation/jetty/antora.yml b/documentation/jetty/antora.yml index 1a073abaaea..f6078de1f1a 100644 --- a/documentation/jetty/antora.yml +++ b/documentation/jetty/antora.yml @@ -3,7 +3,7 @@ version: '10' title: Eclipse Jetty asciidoc: attributes: - javadoc-url: https://eclipse.dev/jetty/javadoc/jetty-10 + javadoc-url: https://jetty.org/javadoc/jetty-10 jdurl: '{javadoc-url}' jetty-home: ${jetty.home}@ version: 10.0.21-SNAPSHOT diff --git a/documentation/jetty/modules/operations-guide/pages/protocols/index.adoc b/documentation/jetty/modules/operations-guide/pages/protocols/index.adoc index fc771fdd0a2..4258e996c24 100644 --- a/documentation/jetty/modules/operations-guide/pages/protocols/index.adoc +++ b/documentation/jetty/modules/operations-guide/pages/protocols/index.adoc @@ -498,7 +498,7 @@ You want to create the `$JETTY_BASE/etc/tls-config.xml` with the following templ [,xml,subs=verbatim] ---- - + @@ -524,7 +524,7 @@ To explicitly add the exclusion of TLSv1.0 and TLSv1.1 (that are also vulnerable [,xml] ---- - + @@ -549,7 +549,7 @@ You can precisely set the list of excluded ciphers, completely overriding Jetty' [,xml] ---- - + diff --git a/jetty-home/src/main/resources/NOTICE.txt b/jetty-home/src/main/resources/NOTICE.txt index ee70c29a02f..db958813251 100644 --- a/jetty-home/src/main/resources/NOTICE.txt +++ b/jetty-home/src/main/resources/NOTICE.txt @@ -2,7 +2,7 @@ Notices for Eclipse Jetty ========================= This content is produced and maintained by the Eclipse Jetty project. -Project home: https://eclipse.dev/jetty/ +Project home: https://jetty.org/ Trademarks ---------- diff --git a/jetty-home/src/main/resources/README.adoc b/jetty-home/src/main/resources/README.adoc index 8f76a9a2aad..18528ad9bf0 100644 --- a/jetty-home/src/main/resources/README.adoc +++ b/jetty-home/src/main/resources/README.adoc @@ -1,6 +1,6 @@ === ECLIPSE JETTY -The link:https://eclipse.dev/jetty/[Eclipse Jetty] Project provides a: +The link:https://jetty.org/[Eclipse Jetty] Project provides a: * Java HTTP & WebSocket Server * Servlet Container @@ -8,7 +8,7 @@ The link:https://eclipse.dev/jetty/[Eclipse Jetty] Project provides a: Jetty is available under an open source link:LICENSE.txt[LICENSE], and the full source code is available at link:https://github.com/jetty/jetty.project[GitHub]. -The Jetty documentation is available at link:https://eclipse.dev/jetty/documentation/[]. +The Jetty documentation is available at link:https://jetty.org/docs/[]. // tag::quick[] ==== Quick Setup @@ -46,7 +46,7 @@ Point your browser at `+http://localhost:8080+` to see the demo web applications The Jetty server can be stopped with `ctrl+c` in the terminal window. // end::quick[] -For more information about how to start Jetty, run this command (or go to the link:https://eclipse.dev/jetty/documentation/[documentation]): +For more information about how to start Jetty, run this command (or go to the link:https://jetty.org/docs/[documentation]): ---- $ java -jar $JETTY_HOME/start.jar --help diff --git a/jetty-home/src/main/resources/modules/demo.d/root/index.html b/jetty-home/src/main/resources/modules/demo.d/root/index.html index b9e8466f77e..bf988ee89d7 100644 --- a/jetty-home/src/main/resources/modules/demo.d/root/index.html +++ b/jetty-home/src/main/resources/modules/demo.d/root/index.html @@ -23,7 +23,7 @@ Websocket and HTTP/2 protocols. The project is 100% Open Source and hosted by the - Eclipse Foundation at https://eclipse.dev/jetty/. + Eclipse Foundation at https://jetty.org/.

@@ -45,10 +45,10 @@

information

    -
  • Jetty Homepage
    • -
  • Jetty Documentation Hub
    • +
  • Jetty Homepage
    • +
  • Jetty Documentation Hub
  • Javadoc (via transparent proxy)
    • -
  • Jetty Powered
    • +
  • Jetty Powered
  • Optional content found only in
    jetty-home-<ver>-with-docs.zip
    • Jetty Documentation
      • diff --git a/jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java b/jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java index 4a7c63bb258..74b98f9fbb3 100644 --- a/jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java +++ b/jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java @@ -59,7 +59,7 @@ import org.eclipse.jetty.util.resource.Resource; * Note that the same java compiler will be used as for on-the-fly compiled * jsps, which will be the Eclipse java compiler. *

      - * See Usage Guide for + * See Usage Guide for * instructions on using this plugin. *

      * Runs jspc compiler to produce .java and .class files diff --git a/jetty-runner/src/main/java/org/eclipse/jetty/runner/Runner.java b/jetty-runner/src/main/java/org/eclipse/jetty/runner/Runner.java index 2924ea9c28c..f3667528ef4 100644 --- a/jetty-runner/src/main/java/org/eclipse/jetty/runner/Runner.java +++ b/jetty-runner/src/main/java/org/eclipse/jetty/runner/Runner.java @@ -579,7 +579,7 @@ public class Runner { System.err.println("WARNING: jetty-runner is deprecated."); System.err.println(" See Jetty Documentation for startup options"); - System.err.println(" https://eclipse.dev/jetty/documentation/"); + System.err.println(" https://jetty.org/docs/"); Runner runner = new Runner(); diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HomeBaseWarning.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HomeBaseWarning.java index 681150359b7..14a8d3d6594 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HomeBaseWarning.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HomeBaseWarning.java @@ -63,7 +63,7 @@ public class HomeBaseWarning { StringBuilder warn = new StringBuilder(); warn.append("This instance of Jetty is not running from a separate {jetty.base} directory"); - warn.append(", this is not recommended. See documentation at https://eclipse.dev/jetty/documentation/"); + warn.append(", this is not recommended. See documentation at https://jetty.org/docs/"); LOG.warn("{}", warn.toString()); } } diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/ModuleGraphWriter.java b/jetty-start/src/main/java/org/eclipse/jetty/start/ModuleGraphWriter.java index d01ad6935c8..e04c4dc007e 100644 --- a/jetty-start/src/main/java/org/eclipse/jetty/start/ModuleGraphWriter.java +++ b/jetty-start/src/main/java/org/eclipse/jetty/start/ModuleGraphWriter.java @@ -121,7 +121,7 @@ public class ModuleGraphWriter out.println("/*"); out.println(" * GraphViz Graph of Jetty Modules"); out.println(" * "); - out.println(" * Jetty: https://eclipse.dev/jetty/"); + out.println(" * Jetty: https://jetty.org/"); out.println(" * GraphViz: http://graphviz.org/"); out.println(" * "); out.println(" * To Generate Graph image using graphviz:"); diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializerTest.java b/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializerTest.java index 9e2c55d570f..2b9f6bfe683 100644 --- a/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializerTest.java +++ b/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializerTest.java @@ -66,7 +66,7 @@ public class MavenLocalRepoFileInitializerTest public void testGetCoordinateNotMaven() { MavenLocalRepoFileInitializer repo = new MavenLocalRepoFileInitializer(baseHome); - String ref = "https://eclipse.dev/jetty/"; + String ref = "https://jetty.org/"; Coordinates coords = repo.getCoordinates(URI.create(ref)); assertThat("Coords", coords, nullValue()); } diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/LazyListTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/LazyListTest.java index 4b6f6bb0440..e89902917a8 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/LazyListTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/LazyListTest.java @@ -1496,12 +1496,12 @@ public class LazyListTest uris.add(URI.create("http://www.mortbay.org/")); uris.add(URI.create("http://jetty.codehaus.org/jetty/")); uris.add(URI.create("http://www.intalio.com/jetty/")); - uris.add(URI.create("https://eclipse.dev/jetty/")); + uris.add(URI.create("https://jetty.org/")); // Make sure that Generics pass through the 'get' routine safely. // We should be able to call this without casting the result to URI URI eclipseUri = LazyList.get(uris, 3); - assertEquals("https://eclipse.dev/jetty/", eclipseUri.toASCIIString()); + assertEquals("https://jetty.org/", eclipseUri.toASCIIString()); } /** diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/Utf8LineParserTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/Utf8LineParserTest.java index 95fa0519d99..c3461efe7c3 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/Utf8LineParserTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/Utf8LineParserTest.java @@ -82,7 +82,7 @@ public class Utf8LineParserTest public void testWildHttpRequestParse() { // Arbitrary Http Response Headers seen in the wild. - // Request URI -> https://eclipse.dev/jetty/ + // Request URI -> https://jetty.org/ List expected = new ArrayList<>(); expected.add("HEAD /jetty/ HTTP/1.0"); expected.add("User-Agent: \"Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.6) Gecko/20060601 Firefox/2.0.0.6 (Ubuntu-feisty)\""); diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java index 7e052dc7fe8..8b2ac0681bf 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java @@ -218,7 +218,7 @@ public class FileSystemResourceTest public void testNotFileURI(Class resourceClass) { assertThrows(IllegalArgumentException.class, - () -> newResource(resourceClass, new URI("https://eclipse.dev/jetty/"))); + () -> newResource(resourceClass, new URI("https://jetty.org/"))); } @ParameterizedTest diff --git a/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java b/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java index 348eaa97e79..9f9cbeab157 100644 --- a/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java +++ b/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java @@ -286,7 +286,7 @@ public class XmlConfigurationTest { if (!rawXml.contains("!DOCTYPE")) rawXml = "\n" + - "\n" + + "\n" + rawXml; return asXmlConfiguration("raw.xml", rawXml); } @@ -295,7 +295,7 @@ public class XmlConfigurationTest { if (!rawXml.contains("!DOCTYPE")) rawXml = "\n" + - "\n" + + "\n" + rawXml; Path testFile = workDir.getEmptyPathDir().resolve(filename); try (BufferedWriter writer = Files.newBufferedWriter(testFile, UTF_8)) diff --git a/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlParserTest.java b/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlParserTest.java index d12dabd6e04..5d89c89adea 100644 --- a/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlParserTest.java +++ b/jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlParserTest.java @@ -45,7 +45,7 @@ public class XmlParserTest URL configURL = XmlConfiguration.class.getResource("configure_10_0.dtd"); parser.redirectEntity("configure_10_0.dtd", configURL); - parser.redirectEntity("https://www.eclipse.org/jetty/configure_10_0.dtd", configURL); + parser.redirectEntity("https://jetty.org/configure_10_0.dtd", configURL); parser.redirectEntity("-//Jetty//Configure//EN", configURL); URL url = XmlParserTest.class.getClassLoader().getResource("org/eclipse/jetty/xml/configureWithAttr.xml"); From b15cfd125de80db94df6fc9d2adfbe217d7ef190 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Fri, 21 Jun 2024 13:33:46 -0500 Subject: [PATCH 19/20] Update URLs for new jetty locations --- CONTRIBUTING.md | 4 +- README.md | 2 +- .../contribution-guide/1-introduction.adoc | 6 +-- .../asciidoc/contribution-guide/3-source.adoc | 14 +++---- .../asciidoc/contribution-guide/4-build.adoc | 2 +- .../contribution-guide/5-code-standards.adoc | 4 +- .../contribution-guide/6-documentation.adoc | 8 ++-- .../old_docs/contexts/custom-error-pages.adoc | 2 +- ...onfiguring-specific-webapp-deployment.adoc | 12 +++--- .../deploying/deployment-architecture.adoc | 2 +- .../deployment-processing-webapps.adoc | 10 ++--- .../old_docs/deploying/quickstart-webapp.adoc | 2 +- .../deploying/static-content-deployment.adoc | 2 +- .../extras/moved-context-handler.adoc | 2 +- .../asciidoc/old_docs/frameworks/cdi.adoc | 2 +- .../asciidoc/old_docs/frameworks/osgi.adoc | 6 +-- .../configuring/what-to-configure.adoc | 6 +-- .../old_docs/jetty-xml/jetty-env-xml.adoc | 4 +- .../jetty-xml/jetty-web-xml-config.adoc | 2 +- .../old_docs/jetty-xml/jetty-xml-config.adoc | 4 +- .../old_docs/security/jaas-support.adoc | 2 +- .../operations-guide/annotations/chapter.adoc | 10 ++--- .../operations-guide/begin/download.adoc | 2 +- .../deploy/deploy-extract-war.adoc | 2 +- .../operations-guide/deploy/deploy-jetty.adoc | 4 +- .../operations-guide/deploy/deploy-jndi.adoc | 2 +- .../deploy/deploy-override-webxml.adoc | 2 +- .../deploy/deploy-virtual-hosts.adoc | 10 ++--- .../operations-guide/jaas/chapter.adoc | 4 +- .../operations-guide/jsp/chapter.adoc | 2 +- .../modules/module-rewrite.adoc | 4 +- .../modules/modules-custom.adoc | 4 +- .../operations-guide/modules/modules.adoc | 4 +- .../protocols/protocols-fcgi.adoc | 2 +- .../protocols/protocols-ssl.adoc | 6 +-- .../operations-guide/xml/xml-syntax.adoc | 38 +++++++++---------- .../server/websocket/server-websocket.adoc | 2 +- documentation/jetty/antora.yml | 2 +- .../pages/annotations/index.adoc | 10 ++--- .../operations-guide/pages/begin/index.adoc | 2 +- .../operations-guide/pages/deploy/index.adoc | 20 +++++----- .../operations-guide/pages/jaas/index.adoc | 4 +- .../pages/jsf-taglibs/index.adoc | 2 +- .../pages/modules/custom.adoc | 4 +- .../operations-guide/pages/modules/index.adoc | 4 +- .../pages/modules/standard.adoc | 4 +- .../pages/protocols/index.adoc | 8 ++-- .../operations-guide/pages/xml/index.adoc | 38 +++++++++---------- .../pages/server/websocket.adoc | 2 +- .../MavenLocalRepoFileInitializerTest.java | 2 +- .../jetty/util/resource/ResourceFactory.java | 2 +- .../org/eclipse/jetty/util/FileIDTest.java | 6 +-- .../util/resource/FileSystemResourceTest.java | 2 +- .../src/main/webapp/index.html | 6 +-- .../src/main/webapp/index.html | 8 ++-- .../src/main/webapp/login.html | 6 +-- .../src/main/webapp/auth.html | 6 +-- .../src/main/webapp/index.html | 8 ++-- .../src/main/webapp/remote.html | 6 +-- .../src/main/webapp/rewrite/info.html | 6 +-- .../src/main/webapp/index.html | 8 ++-- .../src/main/webapp/index.jsp | 8 ++-- .../src/main/webapp/index.html | 6 +-- .../src/main/resources/index.html | 6 +-- .../test-jetty-ee10-osgi/README.txt | 2 +- .../org/eclipse/jetty/ee10/runner/Runner.java | 2 +- .../ee10/test/DeploymentErrorInitializer.java | 2 +- .../jetty/ee10/test/rfcs/RFC2616BaseTest.java | 6 +-- .../test-jetty-ee8-osgi/README.txt | 2 +- .../src/main/webapp/index.html | 6 +-- .../src/main/webapp/index.html | 8 ++-- .../src/main/webapp/login.html | 6 +-- .../src/main/webapp/auth.html | 6 +-- .../src/main/webapp/index.html | 8 ++-- .../src/main/webapp/remote.html | 6 +-- .../src/main/webapp/rewrite/info.html | 6 +-- .../src/main/webapp/index.html | 8 ++-- .../src/main/webapp/index.jsp | 8 ++-- .../src/main/webapp/index.html | 6 +-- .../src/main/resources/index.html | 6 +-- .../jetty/ee9/jspc/plugin/JspcMojo.java | 2 +- .../test-jetty-ee9-osgi/README.txt | 2 +- .../websocket/JavaxWebSocketCdiTest.java | 2 +- .../jetty/ee9/test/rfcs/RFC2616BaseTest.java | 8 ++-- jetty-home/src/main/resources/README.adoc | 8 ++-- .../resources/modules/demo.d/moved/index.html | 6 +-- .../resources/modules/demo.d/root/index.html | 10 ++--- .../tests/redispatch/RedispatchTests.java | 2 +- .../tests/distribution/DistributionTests.java | 18 ++++----- .../distribution/DisableUrlCacheTest.java | 2 +- 90 files changed, 265 insertions(+), 265 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 544175bb564..19233cd7e72 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,7 +1,7 @@ # Contributing to Jetty Contributions are always welcome! -Please see our [Contribution Guide](https://eclipse.dev/jetty/documentation/contribution-guide/index.html) for instructions on how to set up your development environment, as well as information on our processes and coding standards. +Please see our [Contribution Guide](https://jetty.org/docs/contribution-guide/index.html) for instructions on how to set up your development environment, as well as information on our processes and coding standards. Here are some quick links to other useful resources: @@ -9,7 +9,7 @@ Here are some quick links to other useful resources: * [**Mailing list.**](https://accounts.eclipse.org/mailing-list/jetty-users) The [`jetty-users@eclipse.org`](mailto:jetty-users@eclipse.org) mailing list is a forum for technical discussion. -* [**Issue tracking.**](https://github.com/jetty/jetty.project/issues) We use [GitHub Issues](https://github.com/eclipse/jetty.project/issues) to track ongoing development and issues. +* [**Issue tracking.**](https://github.com/jetty/jetty.project/issues) We use [GitHub Issues](https://github.com/jetty/jetty.project/issues) to track ongoing development and issues. ## Eclipse Contributor Agreement diff --git a/README.md b/README.md index 6e70ff0061e..ef76937dcb3 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ server.start(); ## Building Jetty from Source ```shell -$ git clone https://github.com/eclipse/jetty.project.git +$ git clone https://github.com/jetty/jetty.project.git $ cd jetty.project $ mvn -Pfast clean install # fast build bypasses tests and other checks ``` diff --git a/documentation/jetty-documentation/src/main/asciidoc/contribution-guide/1-introduction.adoc b/documentation/jetty-documentation/src/main/asciidoc/contribution-guide/1-introduction.adoc index 715b1387507..a9ed8e7cbd7 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/contribution-guide/1-introduction.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/contribution-guide/1-introduction.adoc @@ -36,15 +36,15 @@ In particular, the https://stackoverflow.com/questions/tagged/jetty[`jetty`] and [[cg-intro-filing-issues]] === Filing Issues -You can flag potential bugs or suggest new Jetty features on our https://github.com/eclipse/jetty.project/issues[issue tracker]. +You can flag potential bugs or suggest new Jetty features on our https://github.com/jetty/jetty.project/issues[issue tracker]. -Before filing a new issue, https://github.com/eclipse/jetty.project/issues[check the tracker] to see if it's already been filed by someone else. +Before filing a new issue, https://github.com/jetty/jetty.project/issues[check the tracker] to see if it's already been filed by someone else. If you do file an issue, make sure to label it appropriately, as this will help the development team (and other users) find it more easily. [[cg-intro-help-wanted]] === Help Wanted -If you want to contribute to Jetty but don't have a specific task or goal in mind, consider looking through our https://github.com/eclipse/jetty.project/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help+Wanted%22["Help Wanted" issue backlog]. +If you want to contribute to Jetty but don't have a specific task or goal in mind, consider looking through our https://github.com/jetty/jetty.project/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help+Wanted%22["Help Wanted" issue backlog]. These tasks range from the simple to the complex, but they're all ones we've identified as being particularly well-suited for new contributors to tackle. diff --git a/documentation/jetty-documentation/src/main/asciidoc/contribution-guide/3-source.adoc b/documentation/jetty-documentation/src/main/asciidoc/contribution-guide/3-source.adoc index e7517c6c6bc..933f398dae1 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/contribution-guide/3-source.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/contribution-guide/3-source.adoc @@ -14,18 +14,18 @@ [[cg-source]] == Getting the source code -Jetty's source is maintained on GitHub at https://github.com/eclipse/jetty.project, where it is managed by the http://github.com/eclipse/[Eclipse Foundation]. +Jetty's source is maintained on GitHub at https://github.com/jetty/jetty.project, where it is managed by the http://github.com/eclipse/[Eclipse Foundation]. You can clone a copy of the Jetty repo onto your local machine by running: ---- -git clone https://github.com/eclipse/jetty.project.git +git clone https://github.com/jetty/jetty.project.git ---- [[cg-source-repositories]] === Related repositories -In addition to the https://github.com/eclipse/jetty.project[Jetty code repository], we maintain a number of related repositories: +In addition to the https://github.com/jetty/jetty.project[Jetty code repository], we maintain a number of related repositories: Non-Eclipse Jetty Repositories:: https://github.com/jetty-project Build Toolchain:: https://github.com/eclipse/jetty.toolchain @@ -37,10 +37,10 @@ If you plan to work on a specific issue within Jetty, make sure to target the co .Active Jetty branches [cols="4"] |=== -| https://github.com/eclipse/jetty.project/tree/jetty-12.0.x[jetty-12.0.x] | Development (default branch) | Servlet 6.0 | Java 17+ -| https://github.com/eclipse/jetty.project/tree/jetty-11.0.x[jetty-11.0.x] | Maintenance | Servlet 5.0 | Java 11+ -| https://github.com/eclipse/jetty.project/tree/jetty-10.0.x[jetty-10.0.x] | Maintenance | Servlet 4.0 | Java 11+ -| https://github.com/eclipse/jetty.project/tree/jetty-9.4.x[jetty-9.4.x] | link:https://github.com/eclipse/jetty.project/issues/7958[End of Community Support] | Servlet 3.1 | Java 8+ +| https://github.com/jetty/jetty.project/tree/jetty-12.0.x[jetty-12.0.x] | Development (default branch) | Servlet 6.0 | Java 17+ +| https://github.com/jetty/jetty.project/tree/jetty-11.0.x[jetty-11.0.x] | Maintenance | Servlet 5.0 | Java 11+ +| https://github.com/jetty/jetty.project/tree/jetty-10.0.x[jetty-10.0.x] | Maintenance | Servlet 4.0 | Java 11+ +| https://github.com/jetty/jetty.project/tree/jetty-9.4.x[jetty-9.4.x] | link:https://github.com/jetty/jetty.project/issues/7958[End of Community Support] | Servlet 3.1 | Java 8+ |=== Maintenance branches are periodically merged into active development branches. diff --git a/documentation/jetty-documentation/src/main/asciidoc/contribution-guide/4-build.adoc b/documentation/jetty-documentation/src/main/asciidoc/contribution-guide/4-build.adoc index a27b3ee4624..0d0e5ae3d0e 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/contribution-guide/4-build.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/contribution-guide/4-build.adoc @@ -69,7 +69,7 @@ $ ulimit -n [new_value] .Flagging flaky tests ==== Not all test cases are as timing independent as they should be, which can result in intermittent test failures. -You can help us track these flaky tests by opening an https://github.com/eclipse/jetty.project/issues[issue] when you come across one. +You can help us track these flaky tests by opening an https://github.com/jetty/jetty.project/issues[issue] when you come across one. ==== [[cg-build-cache]] diff --git a/documentation/jetty-documentation/src/main/asciidoc/contribution-guide/5-code-standards.adoc b/documentation/jetty-documentation/src/main/asciidoc/contribution-guide/5-code-standards.adoc index d4087f84e01..6bfbea58a7c 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/contribution-guide/5-code-standards.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/contribution-guide/5-code-standards.adoc @@ -20,13 +20,13 @@ This section outlines the various coding conventions and standards we use throug IntelliJ IDE:: An IntelliJ code style XML file is available in the source repo at -https://github.com/eclipse/jetty.project/blob/jetty-10.0.x/build-resources/jetty-codestyle-intellij.xml[`/build-resources/jetty-codestyle-intellij.xml`] +https://github.com/jetty/jetty.project/blob/jetty-10.0.x/build-resources/jetty-codestyle-intellij.xml[`/build-resources/jetty-codestyle-intellij.xml`] // TODO: The above link points to the jetty-10.0.x branch, but it doesn't look like there's a `build-resources` directory for jetty-12.0.x. Follow https://www.jetbrains.com/help/idea/configuring-code-style.html#import-export-schemes[IntelliJ's documentation] to import these settings into your IDE. Eclipse IDE:: An Eclipse code style XML file is available in the source repo at -https://github.com/eclipse/jetty.project/blob/jetty-10.0.x/build-resources/jetty-codestyle-eclipse-ide.xml[`/build-resources/jetty-codestyle-eclipse-ide.xml`]. +https://github.com/jetty/jetty.project/blob/jetty-10.0.x/build-resources/jetty-codestyle-eclipse-ide.xml[`/build-resources/jetty-codestyle-eclipse-ide.xml`]. [[cg-code-standards-java]] === Java conventions diff --git a/documentation/jetty-documentation/src/main/asciidoc/contribution-guide/6-documentation.adoc b/documentation/jetty-documentation/src/main/asciidoc/contribution-guide/6-documentation.adoc index 31d51f30ca7..57c6c1f213c 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/contribution-guide/6-documentation.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/contribution-guide/6-documentation.adoc @@ -32,7 +32,7 @@ Targets developers and writers who want to make contributions to the Jetty proje [[cg-documentation-toolchain]] === The documentation toolchain Jetty follows a https://www.writethedocs.org/guide/docs-as-code/["docs as code"] philosophy, meaning *we use the same tools to write and build our code and docs*. -As such, the docs are maintained directly within the Jetty codebase at https://github.com/eclipse/jetty.project/tree/jetty-12.0.x/documentation/jetty-documentation/src/main/asciidoc[`documentation/jetty-documentation/src/main/asciidoc/`]. +As such, the docs are maintained directly within the Jetty codebase at https://github.com/jetty/jetty.project/tree/jetty-12.0.x/documentation/jetty-documentation/src/main/asciidoc[`documentation/jetty-documentation/src/main/asciidoc/`]. [[cg-documentation-asciidoc]] ==== AsciiDoc @@ -83,13 +83,13 @@ When the build completes, you can view the generated docs in your preferred web [[cg-documentation-build-structure]] ==== Documentation project structure -The documentation root is https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/documentation/jetty-documentation[`documentation/jetty-documentation/`]. +The documentation root is https://github.com/jetty/jetty.project/tree/jetty-10.0.x/documentation/jetty-documentation[`documentation/jetty-documentation/`]. Within this root directory are some files and subdirectories of note: -https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/documentation/jetty-documentation/src/main/asciidoc[`src/main/asciidoc`]:: +https://github.com/jetty/jetty.project/tree/jetty-10.0.x/documentation/jetty-documentation/src/main/asciidoc[`src/main/asciidoc`]:: The primary root for all documentation content. -https://github.com/eclipse/jetty.project/tree/jetty-10.0.x/documentation/jetty-documentation/src/main/asciidoc/config.adoc[`src/main/asciidoc/config.adoc`]:: +https://github.com/jetty/jetty.project/tree/jetty-10.0.x/documentation/jetty-documentation/src/main/asciidoc/config.adoc[`src/main/asciidoc/config.adoc`]:: This file contains metadata and global variables shared across all the xref:cg-documentation-guides[documentation guides]. This configuration is used by Asciidoctor to correctly render the final docs. diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/contexts/custom-error-pages.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/contexts/custom-error-pages.adoc index dc589e84e21..9e3cf03e701 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/contexts/custom-error-pages.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/contexts/custom-error-pages.adoc @@ -72,7 +72,7 @@ Context files are normally located in `${jetty.base}/webapps/` (see `DeployerMan [source, xml, subs="{sub-order}"] ---- - + /test diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/configuring-specific-webapp-deployment.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/configuring-specific-webapp-deployment.adoc index 307fceb4c1c..72aaedc66f4 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/configuring-specific-webapp-deployment.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/configuring-specific-webapp-deployment.adoc @@ -41,7 +41,7 @@ For example, here is a descriptor file that deploys the file `/opt/myapp/myapp.w [source, xml, subs="{sub-order}"] ---- - + /wiki @@ -55,7 +55,7 @@ For example, if the system property is set to `myapp.home=/opt/myapp`, the previ [source, xml, subs="{sub-order}"] ---- - + /wiki @@ -83,7 +83,7 @@ This can help make it clear that users should not make changes to the temporary [source, xml, subs="{sub-order}"] ---- - + /wiki @@ -99,7 +99,7 @@ However, since the `web.xml` for the web application is processed after the depl [source, xml, subs="{sub-order}"] ---- - + /wiki @@ -120,7 +120,7 @@ This feature is useful when adding parameters or additional Servlet mappings wit [source, xml, subs="{sub-order}"] ---- - + /wiki @@ -135,7 +135,7 @@ If the `web.xml` does not include a reference to this data source, an override d [source, xml, subs="{sub-order}"] ---- - + /wiki diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/deployment-architecture.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/deployment-architecture.adoc index c8e43e578f1..793c16ac92a 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/deployment-architecture.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/deployment-architecture.adoc @@ -99,7 +99,7 @@ In the standard Jetty Distribution, this is configured in the `${jetty.home}/etc [source,xml,subs="{sub-order}"] ---- - + diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/deployment-processing-webapps.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/deployment-processing-webapps.adoc index 1e0f4ca9aad..42ec7e05a57 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/deployment-processing-webapps.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/deployment-processing-webapps.adoc @@ -130,7 +130,7 @@ Let's see an example of how we would add in the Configurations for both JNDI _an [source, xml, subs="{sub-order}"] ---- - + @@ -162,7 +162,7 @@ They will then be applied to each `WebAppContext` deployed by the deployer: [source,xml,subs="{sub-order}"] ---- - + @@ -206,7 +206,7 @@ This example uses an xml file, in fact it is the `$JETTY_HOME/etc/jetty-plus.xml [source, xml, subs="{sub-order}"] ---- - + @@ -256,7 +256,7 @@ Here's an example from a context xml file (although as always, you could have ac [source, xml, subs="{sub-order}"] ---- - + @@ -282,7 +282,7 @@ Here's an example in a xml file of a pattern that matches any jar that starts wi [source, xml, subs="{sub-order}"] ---- - + diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/quickstart-webapp.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/quickstart-webapp.adoc index 6f6a5244610..2060d6cbb56 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/quickstart-webapp.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/quickstart-webapp.adoc @@ -100,7 +100,7 @@ Otherwise, create a context xml file with the following information (in addition [source, xml, subs="{sub-order}"] ---- - + true diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/static-content-deployment.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/static-content-deployment.adoc index 70f03fd5337..736f136de0d 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/static-content-deployment.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/deploying/static-content-deployment.adoc @@ -20,7 +20,7 @@ Create a file called `scratch.xml` in the `${jetty.base}/webapps` directory and [source, xml, subs="{sub-order}"] ---- - + /scratch diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/extras/moved-context-handler.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/extras/moved-context-handler.adoc index 7b06887aeab..c012f5f76ec 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/extras/moved-context-handler.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/extras/moved-context-handler.adoc @@ -43,7 +43,7 @@ This is a permanent redirection, which also preserves `pathinfo` and query strin [source, xml, subs="{sub-order}"] ---- - + /foo diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/cdi.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/cdi.adoc index 730fe090877..2ce71456a9b 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/cdi.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/cdi.adoc @@ -73,7 +73,7 @@ This module is equivalent to directly modifying the class path configuration wit [source.XML, xml] ------------------------------------------------------------- - + -org.eclipse.jetty.util.Decorator diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/osgi.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/osgi.adoc index 91659a0fff5..8dc288bb5fb 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/osgi.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/frameworks/osgi.adoc @@ -24,7 +24,7 @@ In addition, the infrastructure also supports the OSGi `HttpService` interface. All of the Jetty jars contain manifest entries appropriate to ensure that they can be deployed into an OSGi container as bundles. You will need to install some jetty jars into your OSGi container. -You can always find the Jetty jars either in the Maven Central repository, or you can link:https://eclipse.dev/jetty/download.php[download] a distribution of Jetty. +You can always find the Jetty jars either in the Maven Central repository, or you can link:https://jetty.org/download.html[download] a distribution of Jetty. Here's the absolute minimal set of Jetty jars: .Minimal Bundles @@ -355,7 +355,7 @@ Here's an example of the contents of a `META-INF/jetty-webapp-context.xml` file: ---- - + META-INF/webdefault.xml @@ -773,7 +773,7 @@ To set the pattern, you will need to provide your own etc files - see the sectio [source, xml, subs="{sub-order}"] ---- - + diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/configuring/what-to-configure.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/configuring/what-to-configure.adoc index c9f98c10528..a999e922915 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/configuring/what-to-configure.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/old_docs/gettingstarted/configuring/what-to-configure.adoc @@ -140,7 +140,7 @@ The deployer discovers and hot deploys context IoC descriptors like the followin [source, xml, subs="{sub-order}"] ---- - + false @@ -77,7 +77,7 @@ Here's an example from a context XML file that includes any jar whose name start [source,xml,subs="verbatim,attributes"] ---- - + @@ -108,7 +108,7 @@ Here's an example of a context XML file that sets a pattern that matches any jar [source,xml,subs="verbatim,attributes"] ---- - + @@ -174,7 +174,7 @@ Here's an example of setting the context attribute in a context XML file: [source,xml,subs="verbatim,attributes"] ---- - + @@ -205,7 +205,7 @@ Here is an example context XML file that ensures the `com.example.PrioritySCI` w [source,xml,subs="verbatim,attributes"] ---- - + diff --git a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/begin/download.adoc b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/begin/download.adoc index 258c091c86a..2cfdfb2208d 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/begin/download.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/begin/download.adoc @@ -14,6 +14,6 @@ [[og-begin-download]] ==== Downloading Jetty -The Jetty distribution is a file of the form `jetty-home-.`, available for download from link:https://eclipse.dev/jetty/download.php[] +The Jetty distribution is a file of the form `jetty-home-.`, available for download from link:https://jetty.org/download.html[] The Jetty distribution is available in both `zip` and `gzip` formats; download the one most appropriate for your system, typically `zip` for Windows and `gzip` for other operating systems. diff --git a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/deploy/deploy-extract-war.adoc b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/deploy/deploy-extract-war.adoc index a49ecba42ed..1eb7b834b0c 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/deploy/deploy-extract-war.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/deploy/deploy-extract-war.adoc @@ -24,7 +24,7 @@ If you do not want Jetty to extract the `+*.war+` files, you can disable this fe [source,xml,subs="verbatim,attributes,quotes"] ---- - + /mywebapp diff --git a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/deploy/deploy-jetty.adoc b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/deploy/deploy-jetty.adoc index aacfb9bcf2a..4196e3a8104 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/deploy/deploy-jetty.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/deploy/deploy-jetty.adoc @@ -26,7 +26,7 @@ A simple Jetty context XML file, for example named `wiki.xml` is the following: [source,xml,subs="verbatim,attributes"] ---- - + /wiki @@ -71,7 +71,7 @@ You can use the features of xref:og-xml[Jetty XML files] to avoid to hard-code f [source,xml,subs="verbatim,attributes"] ---- - + /wiki diff --git a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/deploy/deploy-jndi.adoc b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/deploy/deploy-jndi.adoc index bc33774efe1..d3139684ce2 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/deploy/deploy-jndi.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/deploy/deploy-jndi.adoc @@ -21,7 +21,7 @@ The JNDI entry must be _defined_ in a xref:og-jndi-xml[Jetty XML file], for exam [source,xml,subs="verbatim,attributes,quotes"] ---- - + /mywebapp diff --git a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/deploy/deploy-override-webxml.adoc b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/deploy/deploy-override-webxml.adoc index 725d39af676..b0bad98527d 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/deploy/deploy-override-webxml.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/deploy/deploy-override-webxml.adoc @@ -22,7 +22,7 @@ This allows you to add host specific configuration or server specific configurat [source,xml,subs="verbatim,attributes,quotes"] ---- - + /mywebapp diff --git a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/deploy/deploy-virtual-hosts.adoc b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/deploy/deploy-virtual-hosts.adoc index 256f9fc628c..e3358fb04cd 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/deploy/deploy-virtual-hosts.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/deploy/deploy-virtual-hosts.adoc @@ -56,7 +56,7 @@ If you have a web application `mywebapp.war` you can configure its virtual hosts [source,xml,subs="verbatim,attributes"] ---- - + /mywebapp @@ -101,7 +101,7 @@ To achieve this, you simply use the same context path of `/` for each of your we [source,xml,subs="verbatim,attributes"] ---- - + / @@ -118,7 +118,7 @@ To achieve this, you simply use the same context path of `/` for each of your we [source,xml,subs="verbatim,attributes"] ---- - + / @@ -146,7 +146,7 @@ In this case, you want to xref:og-protocols[configure multiple connectors], each [source,xml,subs="verbatim,attributes,quotes"] ---- - + / @@ -163,7 +163,7 @@ In this case, you want to xref:og-protocols[configure multiple connectors], each [source,xml,subs="verbatim,attributes,quotes"] ---- - + / diff --git a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/jaas/chapter.adoc b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/jaas/chapter.adoc index 8f486d0aaf5..9b1b596e7d1 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/jaas/chapter.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/jaas/chapter.adoc @@ -97,7 +97,7 @@ Here's an example of this type of XML file: [source,xml] ---- - + @@ -115,7 +115,7 @@ Here's an example of this type of XML file: [source,xml] ---- - + diff --git a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/jsp/chapter.adoc b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/jsp/chapter.adoc index c2ea863a70b..4f9748b0b4d 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/jsp/chapter.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/jsp/chapter.adoc @@ -197,7 +197,7 @@ Here's an example of using a context xml file to add in a pattern to match files [source,xml] ---- - + diff --git a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/modules/module-rewrite.adoc b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/modules/module-rewrite.adoc index 22fc46b422e..0bf3a550b5d 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/modules/module-rewrite.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/modules/module-rewrite.adoc @@ -38,7 +38,7 @@ An example of `jetty-rewrite-rules.xml` is the following: .jetty-rewrite-rules.xml ---- - + @@ -60,7 +60,7 @@ In the example below, the rule will only be evaluated if the virtual host matche .jetty-rewrite-rules.xml ---- - + diff --git a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/modules/modules-custom.adoc b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/modules/modules-custom.adoc index be49921330f..8bcff5a7785 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/modules/modules-custom.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/modules/modules-custom.adoc @@ -43,7 +43,7 @@ Start with the custom Jetty XML file, `$JETTY_BASE/etc/custom-ssl.xml`: [source,xml] ---- - + @@ -159,7 +159,7 @@ Next, let's write the Jetty XML file that wires the auditing component to the `S [source,xml,options=nowrap] ---- - + diff --git a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/modules/modules.adoc b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/modules/modules.adoc index 9506074c5d3..1ccf0ccac1a 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/modules/modules.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/modules/modules.adoc @@ -85,7 +85,7 @@ For example, a Jetty XML file that allocates Jetty's `QueuedThreadPool` could be .jetty-threadpool.xml ---- - + @@ -235,7 +235,7 @@ The `custom-server.xml` file is the following: [source,xml] ---- - + ---- diff --git a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/protocols/protocols-fcgi.adoc b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/protocols/protocols-fcgi.adoc index 82a0afce70a..361640f60e1 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/protocols/protocols-fcgi.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/protocols/protocols-fcgi.adoc @@ -79,7 +79,7 @@ Use the following file as example, copy it as `$JETTY_BASE/webapps/wordpress.xml [source,xml,options=nowrap] ---- - + diff --git a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/protocols/protocols-ssl.adoc b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/protocols/protocols-ssl.adoc index dfe2d0d65d3..e511ba4f79d 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/protocols/protocols-ssl.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/protocols/protocols-ssl.adoc @@ -59,7 +59,7 @@ You want to create the `$JETTY_BASE/etc/tls-config.xml` with the following templ [source,xml] ---- - + @@ -85,7 +85,7 @@ To explicitly add the exclusion of TLSv1.0 and TLSv1.1 (that are also vulnerable [source,xml] ---- - + @@ -110,7 +110,7 @@ You can precisely set the list of excluded ciphers, completely overriding Jetty' [source,xml] ---- - + diff --git a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/xml/xml-syntax.adoc b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/xml/xml-syntax.adoc index 3ef76d0bb16..b05b62794f1 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/xml/xml-syntax.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/xml/xml-syntax.adoc @@ -21,7 +21,7 @@ The Jetty XML elements define attributes such as `id`, `name`, `class`, etc. tha [source,xml] ---- - + @@ -33,7 +33,7 @@ The Jetty XML elements define attributes such as `id`, `name`, `class`, etc. tha [source,xml] ---- - + @@ -60,7 +60,7 @@ The following Jetty XML creates an empty `String` and assigns it the id `mystrin [source,xml] ---- - + ---- @@ -88,7 +88,7 @@ The following example creates a minimal Jetty `Server`: [source,xml] ---- - + 8080 @@ -102,7 +102,7 @@ Arguments may also have a `name` attribute, which is matched with the correspond [source,xml] ---- - + 8080 @@ -122,7 +122,7 @@ The following example creates an `ArrayList`: [source,xml] ---- - + @@ -149,7 +149,7 @@ Within element `` the return value, if the return type is not `void`, is i [source,xml] ---- - + @@ -173,7 +173,7 @@ It is possible to call `static` methods by specifying the `class` attribute: [source,xml] ---- - + @@ -196,7 +196,7 @@ For example: [source,xml,subs="verbatim,quotes"] ---- - + @@ -225,7 +225,7 @@ If the JavaBean property is `foo` (or `Foo`), `` first attempts to invoke _ [source,xml] ---- - + @@ -252,7 +252,7 @@ If the JavaBean property is `foo` (or `Foo`), `` first attempts to invoke _ [source,xml] ---- - + @@ -277,7 +277,7 @@ The map entries are specified with a sequence of `` elements, each with e [source,xml] ---- - + @@ -302,7 +302,7 @@ You can only specify the key value via the `name` attribute, so the key can only [source,xml] ---- - + @@ -323,7 +323,7 @@ Element `` creates a new array, whose component type may be specified by [source,xml] ---- - + @@ -347,7 +347,7 @@ You must give a unique `id` attribute to the objects you want to reference. [source,xml] ---- - + @@ -381,7 +381,7 @@ For example, you may want to configure the context path of your web application [source,xml,subs="verbatim,quotes"] ---- - + @@ -407,7 +407,7 @@ The following example creates a minimal Jetty `Server` that listens on a port sp [source,xml] ---- - + @@ -430,7 +430,7 @@ The following example creates a minimal Jetty `Server` that listens on a port sp [source,xml] ---- - + @@ -462,7 +462,7 @@ The following example illustrates how scopes work: [source,xml] ---- - + 8080 diff --git a/documentation/jetty-documentation/src/main/asciidoc/programming-guide/server/websocket/server-websocket.adoc b/documentation/jetty-documentation/src/main/asciidoc/programming-guide/server/websocket/server-websocket.adoc index 144f5434ac5..5fc6ecf8b14 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/programming-guide/server/websocket/server-websocket.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/programming-guide/server/websocket/server-websocket.adoc @@ -40,7 +40,7 @@ Using the Jetty WebSocket APIs allows your applications to be more efficient and If your application needs specific features that are not provided by the standard APIs, the Jetty WebSocket APIs may provide such features. -TIP: If the feature you are looking for is not present, you may ask for these features by link:https://github.com/eclipse/jetty.project/issues[submitting an issue] to the Jetty Project without waiting for the standard Jakarta EE process to approve them and release a new version of the Jakarta EE WebSocket specification. +TIP: If the feature you are looking for is not present, you may ask for these features by link:https://github.com/jetty/jetty.project/issues[submitting an issue] to the Jetty Project without waiting for the standard Jakarta EE process to approve them and release a new version of the Jakarta EE WebSocket specification. include::server-websocket-standard.adoc[] include::server-websocket-filter.adoc[] diff --git a/documentation/jetty/antora.yml b/documentation/jetty/antora.yml index c553fa0c27c..b7eaaad3d60 100644 --- a/documentation/jetty/antora.yml +++ b/documentation/jetty/antora.yml @@ -3,7 +3,7 @@ version: '12' title: Eclipse Jetty asciidoc: attributes: - javadoc-url: https://eclipse.dev/jetty/javadoc/jetty-12 + javadoc-url: https://jetty.org/javadoc/jetty-12 jdurl: '{javadoc-url}' jetty-home: ${jetty.home}@ version: 12.0.10-SNAPSHOT diff --git a/documentation/jetty/modules/operations-guide/pages/annotations/index.adoc b/documentation/jetty/modules/operations-guide/pages/annotations/index.adoc index d20e7a807a9..9d9dad2c394 100644 --- a/documentation/jetty/modules/operations-guide/pages/annotations/index.adoc +++ b/documentation/jetty/modules/operations-guide/pages/annotations/index.adoc @@ -47,7 +47,7 @@ Here's an example context XML file that calls this method: [,xml,subs=attributes+] ---- - + false @@ -76,7 +76,7 @@ Here's an example from a context XML file that includes any jar whose name start [,xml,subs=attributes+] ---- - + @@ -107,7 +107,7 @@ Here's an example of a context XML file that sets a pattern that matches any jar [,xml,subs=attributes+] ---- - + @@ -173,7 +173,7 @@ Here's an example of setting the context attribute in a context XML file: [,xml,subs=attributes+] ---- - + @@ -204,7 +204,7 @@ Here is an example context XML file that ensures the `com.example.PrioritySCI` w [,xml,subs=attributes+] ---- - + diff --git a/documentation/jetty/modules/operations-guide/pages/begin/index.adoc b/documentation/jetty/modules/operations-guide/pages/begin/index.adoc index ce4a361dc05..ccf70c102e7 100644 --- a/documentation/jetty/modules/operations-guide/pages/begin/index.adoc +++ b/documentation/jetty/modules/operations-guide/pages/begin/index.adoc @@ -58,7 +58,7 @@ Read the xref:arch/index.adoc[Jetty architecture section] for more information a [[download]] == Downloading Jetty -The Jetty distribution is a file of the form `jetty-home-.`, available for download from https://eclipse.dev/jetty/download.php[] +The Jetty distribution is a file of the form `jetty-home-.`, available for download from https://jetty.org/download.html[] The Jetty distribution is available in both `zip` and `gzip` formats; download the one most appropriate for your system, typically `zip` for Windows and `gzip` for other operating systems. diff --git a/documentation/jetty/modules/operations-guide/pages/deploy/index.adoc b/documentation/jetty/modules/operations-guide/pages/deploy/index.adoc index e13d1893440..cb45afe69bc 100644 --- a/documentation/jetty/modules/operations-guide/pages/deploy/index.adoc +++ b/documentation/jetty/modules/operations-guide/pages/deploy/index.adoc @@ -140,7 +140,7 @@ A simple Jetty context XML file, for example named `wiki.xml` is the following: [,xml,subs=attributes+] ---- - + /wiki @@ -185,7 +185,7 @@ You can use the features of xref:xml/index.adoc[Jetty XML files] to avoid to har [,xml,subs=attributes+] ---- - + /wiki @@ -209,7 +209,7 @@ The JNDI entry must be _defined_ in a xref:jndi/index.adoc#xml[Jetty XML file], [,xml,subs="attributes+,+quotes"] ---- - + /mywebapp @@ -282,7 +282,7 @@ If you have a web application `mywebapp.war` you can configure its virtual hosts [,xml,subs=attributes+] ---- - + /mywebapp @@ -327,7 +327,7 @@ To achieve this, you simply use the same context path of `/` for each of your we [,xml,subs=attributes+] ---- - + / @@ -344,7 +344,7 @@ To achieve this, you simply use the same context path of `/` for each of your we [,xml,subs=attributes+] ---- - + / @@ -372,7 +372,7 @@ In this case, you want to xref:protocols/index.adoc[configure multiple connector [,xml,subs="attributes+,+quotes"] ---- - + / @@ -389,7 +389,7 @@ In this case, you want to xref:protocols/index.adoc[configure multiple connector [,xml,subs="attributes+,+quotes"] ---- - + / @@ -424,7 +424,7 @@ If you do not want Jetty to extract the `+*.war+` files, you can disable this fe [,xml,subs="attributes+,+quotes"] ---- - + /mywebapp @@ -444,7 +444,7 @@ This allows you to add host specific configuration or server specific configurat [,xml,subs="attributes+,+quotes"] ---- - + /mywebapp diff --git a/documentation/jetty/modules/operations-guide/pages/jaas/index.adoc b/documentation/jetty/modules/operations-guide/pages/jaas/index.adoc index 346feceffaf..876233222fd 100644 --- a/documentation/jetty/modules/operations-guide/pages/jaas/index.adoc +++ b/documentation/jetty/modules/operations-guide/pages/jaas/index.adoc @@ -96,7 +96,7 @@ Here's an example of this type of XML file: [,xml] ---- - + @@ -114,7 +114,7 @@ Here's an example of this type of XML file: [,xml] ---- - + diff --git a/documentation/jetty/modules/operations-guide/pages/jsf-taglibs/index.adoc b/documentation/jetty/modules/operations-guide/pages/jsf-taglibs/index.adoc index 516b042fc33..bc725e71baa 100644 --- a/documentation/jetty/modules/operations-guide/pages/jsf-taglibs/index.adoc +++ b/documentation/jetty/modules/operations-guide/pages/jsf-taglibs/index.adoc @@ -26,7 +26,7 @@ Here's an example of using a context xml file to add in a pattern to match files [,xml] ---- - + diff --git a/documentation/jetty/modules/operations-guide/pages/modules/custom.adoc b/documentation/jetty/modules/operations-guide/pages/modules/custom.adoc index b84f95dca30..bcdbe6784c8 100644 --- a/documentation/jetty/modules/operations-guide/pages/modules/custom.adoc +++ b/documentation/jetty/modules/operations-guide/pages/modules/custom.adoc @@ -42,7 +42,7 @@ Start with the custom Jetty XML file, `$JETTY_BASE/etc/custom-ssl.xml`: [,xml] ---- - + @@ -158,7 +158,7 @@ Next, let's write the Jetty XML file that wires the auditing component to the `S [,xml,options=nowrap] ---- - + diff --git a/documentation/jetty/modules/operations-guide/pages/modules/index.adoc b/documentation/jetty/modules/operations-guide/pages/modules/index.adoc index 8937a9584aa..de5a2f975d6 100644 --- a/documentation/jetty/modules/operations-guide/pages/modules/index.adoc +++ b/documentation/jetty/modules/operations-guide/pages/modules/index.adoc @@ -84,7 +84,7 @@ For example, a Jetty XML file that allocates Jetty's `QueuedThreadPool` could be .jetty-threadpool.xml ---- - + @@ -234,7 +234,7 @@ The `custom-server.xml` file is the following: [,xml] ---- - + ---- diff --git a/documentation/jetty/modules/operations-guide/pages/modules/standard.adoc b/documentation/jetty/modules/operations-guide/pages/modules/standard.adoc index 0ac54f529b8..0e5c6fef3f8 100644 --- a/documentation/jetty/modules/operations-guide/pages/modules/standard.adoc +++ b/documentation/jetty/modules/operations-guide/pages/modules/standard.adoc @@ -349,7 +349,7 @@ An example of `jetty-rewrite-rules.xml` is the following: .jetty-rewrite-rules.xml ---- - + @@ -371,7 +371,7 @@ In the example below, the rule will only be evaluated if the virtual host matche .jetty-rewrite-rules.xml ---- - + diff --git a/documentation/jetty/modules/operations-guide/pages/protocols/index.adoc b/documentation/jetty/modules/operations-guide/pages/protocols/index.adoc index 1b27e9875c0..8e25cb8374f 100644 --- a/documentation/jetty/modules/operations-guide/pages/protocols/index.adoc +++ b/documentation/jetty/modules/operations-guide/pages/protocols/index.adoc @@ -616,7 +616,7 @@ Use the following file as example, copy it as `$JETTY_BASE/webapps/wordpress.xml [,xml,options=nowrap] ---- - + @@ -740,7 +740,7 @@ You want to create the `$JETTY_BASE/etc/tls-config.xml` with the following templ [,xml] ---- - + @@ -766,7 +766,7 @@ To explicitly add the exclusion of TLSv1.0 and TLSv1.1 (that are also vulnerable [,xml] ---- - + @@ -791,7 +791,7 @@ You can precisely set the list of excluded ciphers, completely overriding Jetty' [,xml] ---- - + diff --git a/documentation/jetty/modules/operations-guide/pages/xml/index.adoc b/documentation/jetty/modules/operations-guide/pages/xml/index.adoc index 933374d0e51..9e25bbdb727 100644 --- a/documentation/jetty/modules/operations-guide/pages/xml/index.adoc +++ b/documentation/jetty/modules/operations-guide/pages/xml/index.adoc @@ -31,7 +31,7 @@ The Jetty XML elements define attributes such as `id`, `name`, `class`, etc. tha [,xml] ---- - + @@ -43,7 +43,7 @@ The Jetty XML elements define attributes such as `id`, `name`, `class`, etc. tha [,xml] ---- - + @@ -70,7 +70,7 @@ The following Jetty XML creates an empty `String` and assigns it the id `mystrin [,xml] ---- - + ---- @@ -98,7 +98,7 @@ The following example creates a minimal Jetty `Server`: [,xml] ---- - + 8080 @@ -112,7 +112,7 @@ Arguments may also have a `name` attribute, which is matched with the correspond [,xml] ---- - + 8080 @@ -132,7 +132,7 @@ The following example creates an `ArrayList`: [,xml] ---- - + @@ -159,7 +159,7 @@ Within element `` the return value, if the return type is not `void`, is i [,xml] ---- - + @@ -183,7 +183,7 @@ It is possible to call `static` methods by specifying the `class` attribute: [,xml] ---- - + @@ -206,7 +206,7 @@ For example: [,xml,subs=+quotes] ---- - + @@ -235,7 +235,7 @@ If the JavaBean property is `foo` (or `Foo`), `` first attempts to invoke _ [,xml] ---- - + @@ -262,7 +262,7 @@ If the JavaBean property is `foo` (or `Foo`), `` first attempts to invoke _ [,xml] ---- - + @@ -287,7 +287,7 @@ The map entries are specified with a sequence of `` elements, each with e [,xml] ---- - + @@ -312,7 +312,7 @@ You can only specify the key value via the `name` attribute, so the key can only [,xml] ---- - + @@ -333,7 +333,7 @@ Element `` creates a new array, whose component type may be specified by [,xml] ---- - + @@ -357,7 +357,7 @@ You must give a unique `id` attribute to the objects you want to reference. [,xml] ---- - + @@ -391,7 +391,7 @@ For example, you may want to configure the context path of your web application [,xml,subs=+quotes] ---- - + @@ -417,7 +417,7 @@ The following example creates a minimal Jetty `Server` that listens on a port sp [,xml] ---- - + @@ -440,7 +440,7 @@ The following example creates a minimal Jetty `Server` that listens on a port sp [,xml] ---- - + @@ -472,7 +472,7 @@ The following example illustrates how scopes work: [,xml] ---- - + 8080 diff --git a/documentation/jetty/modules/programming-guide/pages/server/websocket.adoc b/documentation/jetty/modules/programming-guide/pages/server/websocket.adoc index fe3371e6da0..d8276c92c95 100644 --- a/documentation/jetty/modules/programming-guide/pages/server/websocket.adoc +++ b/documentation/jetty/modules/programming-guide/pages/server/websocket.adoc @@ -39,7 +39,7 @@ Using the Jetty WebSocket APIs allows your applications to be more efficient and If your application needs specific features that are not provided by the standard APIs, the Jetty WebSocket APIs may provide such features. -TIP: If the feature you are looking for is not present, you may ask for these features by https://github.com/eclipse/jetty.project/issues[submitting an issue] to the Jetty Project without waiting for the standard Jakarta EE process to approve them and release a new version of the Jakarta EE WebSocket specification. +TIP: If the feature you are looking for is not present, you may ask for these features by https://github.com/jetty/jetty.project/issues[submitting an issue] to the Jetty Project without waiting for the standard Jakarta EE process to approve them and release a new version of the Jakarta EE WebSocket specification. [[standard]] == Standard APIs Implementation diff --git a/jetty-core/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializerTest.java b/jetty-core/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializerTest.java index 01ab03b243b..d769301686e 100644 --- a/jetty-core/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializerTest.java +++ b/jetty-core/jetty-start/src/test/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializerTest.java @@ -68,7 +68,7 @@ public class MavenLocalRepoFileInitializerTest public void testGetCoordinateNotMaven() { MavenLocalRepoFileInitializer repo = new MavenLocalRepoFileInitializer(baseHome); - String ref = "https://eclipse.dev/jetty/"; + String ref = "https://jetty.org/"; Coordinates coords = repo.getCoordinates(URI.create(ref)); assertThat("Coords", coords, nullValue()); } diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/resource/ResourceFactory.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/resource/ResourceFactory.java index 94d04ac3428..ed18fa4f05a 100644 --- a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/resource/ResourceFactory.java +++ b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/resource/ResourceFactory.java @@ -115,7 +115,7 @@ import org.slf4j.LoggerFactory; * urlResourceFactory.setConnectTimeout(1000); * ResourceFactory.registerResourceFactory("https", urlResourceFactory); * - * URI web = URI.create("https://eclipse.dev/jetty/"); + * URI web = URI.create("https://jetty.org/"); * Resource resource = ResourceFactory.root().newResource(web); * */ diff --git a/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/FileIDTest.java b/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/FileIDTest.java index 38d1f452749..0047de25ddb 100644 --- a/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/FileIDTest.java +++ b/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/FileIDTest.java @@ -108,9 +108,9 @@ public class FileIDTest Arguments.of(URI.create("file:///path/to/test.txt"), "test.txt"), Arguments.of(URI.create("file:///path/to/dir/"), "dir"), Arguments.of(URI.create("jar:file:///home/user/libs/jetty-server-12.jar!/org/eclipse/jetty/server/jetty-dir.css"), "jetty-dir.css"), - Arguments.of(URI.create("http://eclipse.org/jetty/"), "jetty"), - Arguments.of(URI.create("http://eclipse.org/jetty/index.html"), "index.html"), - Arguments.of(URI.create("http://eclipse.org/jetty/docs.html?query=val#anchor"), "docs.html") + Arguments.of(URI.create("https://jetty.org/"), "jetty"), + Arguments.of(URI.create("https://jetty.org/index.html"), "index.html"), + Arguments.of(URI.create("https://jetty.org/docs.html?query=val#anchor"), "docs.html") ); } diff --git a/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java b/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java index 20c1c0e7aa7..6c316d97342 100644 --- a/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java +++ b/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java @@ -188,7 +188,7 @@ public class FileSystemResourceTest public void testNotFileURI() { assertThrows(IllegalArgumentException.class, - () -> ResourceFactory.root().newResource(new URI("https://eclipse.dev/jetty/"))); + () -> ResourceFactory.root().newResource(new URI("https://jetty.org/"))); } @Test diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-webapp/src/main/webapp/index.html b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-webapp/src/main/webapp/index.html index a0f1bf514e3..5b6e7d54c48 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-webapp/src/main/webapp/index.html +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-async-rest/jetty-ee10-demo-async-rest-webapp/src/main/webapp/index.html @@ -9,9 +9,9 @@
      Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
      diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/webapp/index.html b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/webapp/index.html index abae6909755..72ba7989e9a 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/webapp/index.html +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/webapp/index.html @@ -9,9 +9,9 @@
      Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
      @@ -21,7 +21,7 @@

      JAAS Demo

      - This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory. + This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory. It uses a simple login module that stores its configuration in a properties file.

      diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/webapp/login.html b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/webapp/login.html index 2571bf9ea31..6db01b4715e 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/webapp/login.html +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jaas-webapp/src/main/webapp/login.html @@ -6,9 +6,9 @@
      Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
      diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/webapp/auth.html b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/webapp/auth.html index e5fcf150bc2..1ef059685e8 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/webapp/auth.html +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/webapp/auth.html @@ -9,9 +9,9 @@
      Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
      diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/webapp/index.html b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/webapp/index.html index 2fdbd165982..85d8e053f47 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/webapp/index.html +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/webapp/index.html @@ -8,9 +8,9 @@
      Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
      @@ -20,7 +20,7 @@

      Eclipse Jetty Demo Webapp

      - This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory. + This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory.

      Jetty Tests:

      diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/webapp/remote.html b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/webapp/remote.html index 23622512be4..7a663d3fa01 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/webapp/remote.html +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/webapp/remote.html @@ -8,9 +8,9 @@
      Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
      diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/webapp/rewrite/info.html b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/webapp/rewrite/info.html index 313d3976080..2cceb21fd55 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/webapp/rewrite/info.html +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-webapp/src/main/webapp/rewrite/info.html @@ -9,9 +9,9 @@
      Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
      diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/webapp/index.html b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/webapp/index.html index 40f2e92ca78..e0db298c8ea 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/webapp/index.html +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jndi-webapp/src/main/webapp/index.html @@ -8,9 +8,9 @@
      Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
      @@ -20,7 +20,7 @@

      Eclipse Jetty JNDI Demo Webapp

      - This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory. + This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory.

      diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jsp-webapp/src/main/webapp/index.jsp b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jsp-webapp/src/main/webapp/index.jsp index 05c0ac224ba..dd3b777a159 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jsp-webapp/src/main/webapp/index.jsp +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jsp-webapp/src/main/webapp/index.jsp @@ -10,9 +10,9 @@

      Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
      @@ -22,7 +22,7 @@

      Eclipse Jetty JSP Demo Webapp

      - This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory. + This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory.

      JSP Examples on <%= DateTimeFormatter.ofPattern("d MMMM yyyy").format(LocalDate.now()) %>

      diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/webapp/index.html b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/webapp/index.html index 8d8ab831742..fdb01b55a17 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/webapp/index.html +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-spec/jetty-ee10-demo-spec-webapp/src/main/webapp/index.html @@ -8,9 +8,9 @@
      Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
      diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-template/src/main/resources/index.html b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-template/src/main/resources/index.html index 14aa5f6d1fc..d504ae7dc88 100644 --- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-template/src/main/resources/index.html +++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-template/src/main/resources/index.html @@ -10,9 +10,9 @@
      Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
      diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/README.txt b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/README.txt index c8b7d9a43ca..189c3b9dbe4 100644 --- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/README.txt +++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/README.txt @@ -143,7 +143,7 @@ If you've upgraded the jetty jar and that's all you've changed, then more than l Also, if you don't see any test failures with unresolved jar messages, then it's also a good indicator that the problem is with SpiFly versioning. Unfortunately, when the problem is a jvm/SpiFly versioning mismatch, the osgi paxexam environment doesn't output any good log messages. There is a java.lang.Error that is thrown from inside asm that the environment doesn't pass on in any useful fashion. To try and catch this error, you can modify the ServletInstanceWrapper at line 163 to catch Throwable instead of Exception: -https://github.com/eclipse/jetty.project/blob/jetty-10.0.x/jetty-ee10-osgi/jetty-ee10-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/ServerInstanceWrapper.java#L163 +https://github.com/jetty/jetty.project/blob/jetty-10.0.x/jetty-ee10-osgi/jetty-ee10-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/ServerInstanceWrapper.java#L163 When you do this, you get output like the following: diff --git a/jetty-ee10/jetty-ee10-runner/src/main/java/org/eclipse/jetty/ee10/runner/Runner.java b/jetty-ee10/jetty-ee10-runner/src/main/java/org/eclipse/jetty/ee10/runner/Runner.java index b16bb84c63e..63a804ff9b0 100644 --- a/jetty-ee10/jetty-ee10-runner/src/main/java/org/eclipse/jetty/ee10/runner/Runner.java +++ b/jetty-ee10/jetty-ee10-runner/src/main/java/org/eclipse/jetty/ee10/runner/Runner.java @@ -569,7 +569,7 @@ public class Runner { System.err.println("WARNING: jetty-runner is deprecated."); System.err.println(" See Jetty Documentation for startup options"); - System.err.println(" https://eclipse.dev/jetty/documentation/"); + System.err.println(" https://jetty.org/docs/"); Runner runner = new Runner(); diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/java/org/eclipse/jetty/ee10/test/DeploymentErrorInitializer.java b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/java/org/eclipse/jetty/ee10/test/DeploymentErrorInitializer.java index 13a824b21e9..c5caf4022eb 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/java/org/eclipse/jetty/ee10/test/DeploymentErrorInitializer.java +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/java/org/eclipse/jetty/ee10/test/DeploymentErrorInitializer.java @@ -22,7 +22,7 @@ import jakarta.servlet.ServletException; /** * A SCI that tosses an Error to intentionally to cause issues with the DeploymentManager * - * @see Issue #1602 + * @see Issue #1602 */ public class DeploymentErrorInitializer implements ServletContainerInitializer { diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/java/org/eclipse/jetty/ee10/test/rfcs/RFC2616BaseTest.java b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/java/org/eclipse/jetty/ee10/test/rfcs/RFC2616BaseTest.java index b51ca70cb41..340282d9a58 100644 --- a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/java/org/eclipse/jetty/ee10/test/rfcs/RFC2616BaseTest.java +++ b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/java/org/eclipse/jetty/ee10/test/rfcs/RFC2616BaseTest.java @@ -665,7 +665,7 @@ public abstract class RFC2616BaseTest * * @see RFC 2616 (section 8.2) */ - @Disabled //TODO https://github.com/eclipse/jetty.project/issues/9206 + @Disabled //TODO https://github.com/jetty/jetty.project/issues/9206 @Test public void test82ExpectInvalid() throws Exception { @@ -690,7 +690,7 @@ public abstract class RFC2616BaseTest * * @see RFC 2616 (section 8.2) */ - @Disabled //TODO https://github.com/eclipse/jetty.project/issues/9206 + @Disabled //TODO https://github.com/jetty/jetty.project/issues/9206 @Test public void test82ExpectWithBody() throws Exception { @@ -719,7 +719,7 @@ public abstract class RFC2616BaseTest * @throws Exception failure * @see RFC 2616 (section 8.2) */ - @Disabled //TODO https://github.com/eclipse/jetty.project/issues/9206 + @Disabled //TODO https://github.com/jetty/jetty.project/issues/9206 @Test public void test82UnexpectWithBody() throws Exception { diff --git a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/README.txt b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/README.txt index 471571132c7..a654cb3e595 100644 --- a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/README.txt +++ b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/README.txt @@ -143,7 +143,7 @@ If you've upgraded the jetty jar and that's all you've changed, then more than l Also, if you don't see any test failures with unresolved jar messages, then it's also a good indicator that the problem is with SpiFly versioning. Unfortunately, when the problem is a jvm/SpiFly versioning mismatch, the osgi paxexam environment doesn't output any good log messages. There is a java.lang.Error that is thrown from inside asm that the environment doesn't pass on in any useful fashion. To try and catch this error, you can modify the ServletInstanceWrapper at line 163 to catch Throwable instead of Exception: -https://github.com/eclipse/jetty.project/blob/jetty-10.0.x/jetty-ee9-osgi/jetty-ee9-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/ServerInstanceWrapper.java#L163 +https://github.com/jetty/jetty.project/blob/jetty-10.0.x/jetty-ee9-osgi/jetty-ee9-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/ServerInstanceWrapper.java#L163 When you do this, you get output like the following: diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-webapp/src/main/webapp/index.html b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-webapp/src/main/webapp/index.html index 8c537665665..95de6f690d0 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-webapp/src/main/webapp/index.html +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-async-rest/jetty-ee9-demo-async-rest-webapp/src/main/webapp/index.html @@ -9,9 +9,9 @@
      Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
      diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/webapp/index.html b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/webapp/index.html index 5a6407aac34..061afd687fa 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/webapp/index.html +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/webapp/index.html @@ -9,9 +9,9 @@
      Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
      @@ -21,7 +21,7 @@

      JAAS Demo

      - This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory. + This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory. It uses a simple login module that stores its configuration in a properties file.

      diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/webapp/login.html b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/webapp/login.html index 7bc289b9070..45f4b9e9d31 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/webapp/login.html +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/webapp/login.html @@ -6,9 +6,9 @@
      Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
      diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/webapp/auth.html b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/webapp/auth.html index 8e0895d2d45..8d6db99474e 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/webapp/auth.html +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/webapp/auth.html @@ -9,9 +9,9 @@
      Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
      diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/webapp/index.html b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/webapp/index.html index 24f1fba00ba..d5b24990253 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/webapp/index.html +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/webapp/index.html @@ -8,9 +8,9 @@
      Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
      @@ -20,7 +20,7 @@

      Eclipse Jetty Demo Webapp

      - This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory. + This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory.

      Jetty Tests:

      diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/webapp/remote.html b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/webapp/remote.html index 3195bcbad4e..3ede5c0602d 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/webapp/remote.html +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/webapp/remote.html @@ -8,9 +8,9 @@
      Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
      diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/webapp/rewrite/info.html b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/webapp/rewrite/info.html index d4308762034..7ea8ab5d7ec 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/webapp/rewrite/info.html +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/webapp/rewrite/info.html @@ -9,9 +9,9 @@
      Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
      diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/webapp/index.html b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/webapp/index.html index 887cef4fe98..59f12e42e21 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/webapp/index.html +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/webapp/index.html @@ -8,9 +8,9 @@
      Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
      @@ -20,7 +20,7 @@

      Eclipse Jetty JNDI Demo Webapp

      - This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory. + This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory.

      diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jsp-webapp/src/main/webapp/index.jsp b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jsp-webapp/src/main/webapp/index.jsp index 39f432579fa..2d6c868bf79 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jsp-webapp/src/main/webapp/index.jsp +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jsp-webapp/src/main/webapp/index.jsp @@ -10,9 +10,9 @@

      Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
      @@ -22,7 +22,7 @@

      Eclipse Jetty JSP Demo Webapp

      - This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory. + This is a demo webapp for the Eclipse Jetty HTTP Server and Servlet Container. It was added into your $JETTY_BASE/webapps directory.

      JSP Examples on <%= DateTimeFormatter.ofPattern("d MMMM yyyy").format(LocalDate.now()) %>

      diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/webapp/index.html b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/webapp/index.html index ac23a15fa5b..0f2a64eda3b 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/webapp/index.html +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/webapp/index.html @@ -8,9 +8,9 @@
      Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
      diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-template/src/main/resources/index.html b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-template/src/main/resources/index.html index addecf99227..94372ac548b 100644 --- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-template/src/main/resources/index.html +++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-template/src/main/resources/index.html @@ -10,9 +10,9 @@
      Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
      diff --git a/jetty-ee9/jetty-ee9-jspc-maven-plugin/src/main/java/org/eclipse/jetty/ee9/jspc/plugin/JspcMojo.java b/jetty-ee9/jetty-ee9-jspc-maven-plugin/src/main/java/org/eclipse/jetty/ee9/jspc/plugin/JspcMojo.java index 66a347495e7..49be6842488 100644 --- a/jetty-ee9/jetty-ee9-jspc-maven-plugin/src/main/java/org/eclipse/jetty/ee9/jspc/plugin/JspcMojo.java +++ b/jetty-ee9/jetty-ee9-jspc-maven-plugin/src/main/java/org/eclipse/jetty/ee9/jspc/plugin/JspcMojo.java @@ -61,7 +61,7 @@ import org.eclipse.jetty.util.IO; *

      * Runs jspc compiler to produce .java and .class files *

      - * @see Usage Guide + * @see Usage Guide */ @Mojo(name = "jspc", defaultPhase = LifecyclePhase.PROCESS_CLASSES, requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME, threadSafe = true) diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/README.txt b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/README.txt index 471571132c7..a654cb3e595 100644 --- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/README.txt +++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/README.txt @@ -143,7 +143,7 @@ If you've upgraded the jetty jar and that's all you've changed, then more than l Also, if you don't see any test failures with unresolved jar messages, then it's also a good indicator that the problem is with SpiFly versioning. Unfortunately, when the problem is a jvm/SpiFly versioning mismatch, the osgi paxexam environment doesn't output any good log messages. There is a java.lang.Error that is thrown from inside asm that the environment doesn't pass on in any useful fashion. To try and catch this error, you can modify the ServletInstanceWrapper at line 163 to catch Throwable instead of Exception: -https://github.com/eclipse/jetty.project/blob/jetty-10.0.x/jetty-ee9-osgi/jetty-ee9-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/ServerInstanceWrapper.java#L163 +https://github.com/jetty/jetty.project/blob/jetty-10.0.x/jetty-ee9-osgi/jetty-ee9-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/ServerInstanceWrapper.java#L163 When you do this, you get output like the following: diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-cdi/src/test/java/org/eclipse/jetty/ee9/cdi/tests/websocket/JavaxWebSocketCdiTest.java b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-cdi/src/test/java/org/eclipse/jetty/ee9/cdi/tests/websocket/JavaxWebSocketCdiTest.java index 16c5600144f..e60c87e5e03 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-cdi/src/test/java/org/eclipse/jetty/ee9/cdi/tests/websocket/JavaxWebSocketCdiTest.java +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-cdi/src/test/java/org/eclipse/jetty/ee9/cdi/tests/websocket/JavaxWebSocketCdiTest.java @@ -164,7 +164,7 @@ public class JavaxWebSocketCdiTest } @Test - @Disabled("See issue https://github.com/eclipse/jetty.project/issues/6174") + @Disabled("See issue https://github.com/jetty/jetty.project/issues/6174") public void testHttpSessionInjection() throws Exception { start((servletContext, wsContainer) -> wsContainer.addEndpoint(CdiHttpSessionSocket.class)); diff --git a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/src/test/java/org/eclipse/jetty/ee9/test/rfcs/RFC2616BaseTest.java b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/src/test/java/org/eclipse/jetty/ee9/test/rfcs/RFC2616BaseTest.java index ea64295ae0e..21840af8480 100644 --- a/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/src/test/java/org/eclipse/jetty/ee9/test/rfcs/RFC2616BaseTest.java +++ b/jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/src/test/java/org/eclipse/jetty/ee9/test/rfcs/RFC2616BaseTest.java @@ -663,7 +663,7 @@ public abstract class RFC2616BaseTest * * @see RFC 2616 (section 8.2) */ - @Disabled //TODO https://github.com/eclipse/jetty.project/issues/9206 + @Disabled //TODO https://github.com/jetty/jetty.project/issues/9206 @Test public void test82ExpectInvalid() throws Exception { @@ -688,7 +688,7 @@ public abstract class RFC2616BaseTest * * @see RFC 2616 (section 8.2) */ - @Disabled //TODO https://github.com/eclipse/jetty.project/issues/9206 + @Disabled //TODO https://github.com/jetty/jetty.project/issues/9206 @Test public void test82ExpectWithBody() throws Exception { @@ -717,7 +717,7 @@ public abstract class RFC2616BaseTest * @throws Exception failure * @see RFC 2616 (section 8.2) */ - @Disabled //TODO https://github.com/eclipse/jetty.project/issues/9206 + @Disabled //TODO https://github.com/jetty/jetty.project/issues/9206 @Test public void test82UnexpectWithBody() throws Exception { @@ -753,7 +753,7 @@ public abstract class RFC2616BaseTest * * @see RFC 2616 (section 8.2) */ - @Disabled //TODO https://github.com/eclipse/jetty.project/issues/9206 + @Disabled //TODO https://github.com/jetty/jetty.project/issues/9206 @Test public void test82ExpectNormal() throws Exception { diff --git a/jetty-home/src/main/resources/README.adoc b/jetty-home/src/main/resources/README.adoc index 1e91e952ecb..f8963784617 100644 --- a/jetty-home/src/main/resources/README.adoc +++ b/jetty-home/src/main/resources/README.adoc @@ -1,14 +1,14 @@ === ECLIPSE JETTY -The link:https://eclipse.dev/jetty/[Eclipse Jetty] Project provides a: +The link:https://jetty.org/[Eclipse Jetty] Project provides a: * Java HTTP (HTTP/1.1, HTTP/2 and HTTP/3) Server and Client * Jakarta EE Servlet Container * Java WebSocket Server and Client -Jetty is available under an open source link:LICENSE.txt[license], and the full source code is available at link:https://github.com/eclipse/jetty.project[GitHub]. +Jetty is available under an open source link:LICENSE.txt[license], and the full source code is available at link:https://github.com/jetty/jetty.project[GitHub]. -The Jetty documentation is available at link:https://eclipse.dev/jetty/documentation/[]. +The Jetty documentation is available at link:https://jetty.org/docs/[]. // tag::quick[] ==== Quick Setup @@ -48,7 +48,7 @@ Point your browser at `+http://localhost:8080+` to see the demo web applications The Jetty server can be stopped with `ctrl+c` in the terminal window. // end::quick[] -For more information about how to start Jetty, you can read the link:https://eclipse.dev/jetty/documentation/[documentation], or run this command: +For more information about how to start Jetty, you can read the link:https://jetty.org/docs/[documentation], or run this command: ---- $ java -jar $JETTY_HOME/start.jar --help diff --git a/jetty-home/src/main/resources/modules/demo.d/moved/index.html b/jetty-home/src/main/resources/modules/demo.d/moved/index.html index 1e47065f797..9cdd2c4ea35 100644 --- a/jetty-home/src/main/resources/modules/demo.d/moved/index.html +++ b/jetty-home/src/main/resources/modules/demo.d/moved/index.html @@ -8,9 +8,9 @@
      Demo Home - Source - Jetty Project Home - Documentation + Source + Jetty Project Home + Documentation Commercial Support
      diff --git a/jetty-home/src/main/resources/modules/demo.d/root/index.html b/jetty-home/src/main/resources/modules/demo.d/root/index.html index 5d870e542ec..0ab37d89385 100644 --- a/jetty-home/src/main/resources/modules/demo.d/root/index.html +++ b/jetty-home/src/main/resources/modules/demo.d/root/index.html @@ -23,7 +23,7 @@

      The project is 100% Open Source and hosted by the - Eclipse Foundation at https://eclipse.dev/jetty/. + Eclipse Foundation at https://jetty.org/.

      @@ -74,10 +74,10 @@

      Information

        -
      • Jetty Homepage
        • -
      • Jetty Documentation Hub
        • +
      • Jetty Homepage
        • +
      • Jetty Documentation Hub
      • Javadoc (via transparent proxy)
        • -
      • Jetty Powered
        • +
      • Jetty Powered
      • Optional content found only in
        jetty-home-<ver>-with-docs.zip
        • Jetty Documentation
          • @@ -90,7 +90,7 @@

          Getting Help

          • Mailing lists @ Eclipse
            • -
          • Source @ github
            • +
          • Source @ github
          • Developer Advice
          • Custom Development
          • Production support
            • diff --git a/tests/test-cross-context-dispatch/ccd-tests/src/test/java/org/eclipse/jetty/tests/redispatch/RedispatchTests.java b/tests/test-cross-context-dispatch/ccd-tests/src/test/java/org/eclipse/jetty/tests/redispatch/RedispatchTests.java index bf1ff53fdf0..ba819b01095 100644 --- a/tests/test-cross-context-dispatch/ccd-tests/src/test/java/org/eclipse/jetty/tests/redispatch/RedispatchTests.java +++ b/tests/test-cross-context-dispatch/ccd-tests/src/test/java/org/eclipse/jetty/tests/redispatch/RedispatchTests.java @@ -54,7 +54,7 @@ public class RedispatchTests extends AbstractRedispatchTest // Now add the filter to the webapp xml init String xml = """ - + /ccd-ee8 /ccd-ee8 diff --git a/tests/test-distribution/test-distribution-common/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java b/tests/test-distribution/test-distribution-common/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java index 8cd07e3feee..a27529f92c3 100644 --- a/tests/test-distribution/test-distribution-common/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java +++ b/tests/test-distribution/test-distribution-common/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java @@ -807,7 +807,7 @@ public class DistributionTests extends AbstractJettyHomeTest String message = "test-log-line"; String xml = "" + "" + - "" + + "" + "" + " " + " " + loggerName + "" + @@ -864,7 +864,7 @@ public class DistributionTests extends AbstractJettyHomeTest Path sslPatchXML = jettyBaseEtc.resolve("ssl-patch.xml"); String xml = """ - + @@ -1306,7 +1306,7 @@ public class DistributionTests extends AbstractJettyHomeTest Path fcgiConnectorXML = jettyBaseEtc.resolve("fcgi-connector.xml"); Files.writeString(fcgiConnectorXML, """ - + @@ -1336,7 +1336,7 @@ public class DistributionTests extends AbstractJettyHomeTest Path phpXML = jettyBase.resolve("webapps").resolve("php.xml"); Files.writeString(phpXML, """ - + /php @@ -1358,7 +1358,7 @@ public class DistributionTests extends AbstractJettyHomeTest Path proxyXML = jettyBase.resolve("webapps").resolve("proxy.xml"); Files.writeString(proxyXML, """ - + /proxy @@ -1420,7 +1420,7 @@ public class DistributionTests extends AbstractJettyHomeTest Path fcgiConnectorXML = jettyBaseEtc.resolve("fcgi-connector.xml"); Files.writeString(fcgiConnectorXML, """ - + @@ -1450,7 +1450,7 @@ public class DistributionTests extends AbstractJettyHomeTest Path phpXML = jettyBase.resolve("webapps").resolve("php.xml"); Files.writeString(phpXML, """ - + /php @@ -1472,7 +1472,7 @@ public class DistributionTests extends AbstractJettyHomeTest Path proxyXML = jettyBase.resolve("webapps").resolve("proxy.xml"); Files.writeString(proxyXML, """ - + /proxy @@ -1663,7 +1663,7 @@ public class DistributionTests extends AbstractJettyHomeTest // Create XML for deployable String xml = """ - + /demo diff --git a/tests/test-distribution/test-ee10-distribution/src/test/java/org/eclipse/jetty/ee10/tests/distribution/DisableUrlCacheTest.java b/tests/test-distribution/test-ee10-distribution/src/test/java/org/eclipse/jetty/ee10/tests/distribution/DisableUrlCacheTest.java index 918a38c08dc..81299ef8038 100644 --- a/tests/test-distribution/test-ee10-distribution/src/test/java/org/eclipse/jetty/ee10/tests/distribution/DisableUrlCacheTest.java +++ b/tests/test-distribution/test-ee10-distribution/src/test/java/org/eclipse/jetty/ee10/tests/distribution/DisableUrlCacheTest.java @@ -77,7 +77,7 @@ public class DisableUrlCacheTest extends AbstractJettyHomeTest Path webappsDir = distribution.getJettyBase().resolve("webapps"); String warXml = """ - + /test /test.war From 99faa7a9a64e909699946236859c4340ac9d51c1 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Fri, 21 Jun 2024 15:26:00 -0500 Subject: [PATCH 20/20] Fixing FileIDTest --- .../src/test/java/org/eclipse/jetty/util/FileIDTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/FileIDTest.java b/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/FileIDTest.java index 0047de25ddb..039e19d1e6e 100644 --- a/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/FileIDTest.java +++ b/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/FileIDTest.java @@ -108,7 +108,8 @@ public class FileIDTest Arguments.of(URI.create("file:///path/to/test.txt"), "test.txt"), Arguments.of(URI.create("file:///path/to/dir/"), "dir"), Arguments.of(URI.create("jar:file:///home/user/libs/jetty-server-12.jar!/org/eclipse/jetty/server/jetty-dir.css"), "jetty-dir.css"), - Arguments.of(URI.create("https://jetty.org/"), "jetty"), + Arguments.of(URI.create("https://jetty.org/"), ""), + Arguments.of(URI.create("https://jetty.org/docs/"), "docs"), Arguments.of(URI.create("https://jetty.org/index.html"), "index.html"), Arguments.of(URI.create("https://jetty.org/docs.html?query=val#anchor"), "docs.html") );