diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 84534fe4260..1e139741721 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -20,10 +20,9 @@ Information regarding source code management, builds, coding standards, and more - [https://www.eclipse.org/jetty/documentation/current/advanced-contributing.html](https://www.eclipse.org/jetty/documentation/current/advanced-contributing.html) -The canonical Jetty git repository is located at git.eclipse.org and we are unable -to directly merge pull requests into the GitHub mirrored repository. -Providing you have completed the contributors agreement mentioned below we will -endeavor to pull your commit into Jetty proper. +The canonical Jetty git repository is located at GitHub. Providing you have +completed the contributors agreement mentioned below we will endeavor to pull +your commit into Jetty proper. Contributor License Agreement ------------------------------ diff --git a/aggregates/jetty-all-compact3/pom.xml b/aggregates/jetty-all-compact3/pom.xml index 1af2650c12c..e05b2f3118f 100644 --- a/aggregates/jetty-all-compact3/pom.xml +++ b/aggregates/jetty-all-compact3/pom.xml @@ -97,7 +97,7 @@ http://eclipse.org/jetty ${user.name} org.eclipse.jetty - http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/tree/NOTICE.txt + https://raw.githubusercontent.com/eclipse/jetty.project/master/NOTICE.txt Jetty diff --git a/aggregates/jetty-websocket-all/pom.xml b/aggregates/jetty-websocket-all/pom.xml index 3c9c2689b83..c3b349062ec 100644 --- a/aggregates/jetty-websocket-all/pom.xml +++ b/aggregates/jetty-websocket-all/pom.xml @@ -70,7 +70,7 @@ http://eclipse.org/jetty ${user.name} org.eclipse.jetty - http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/tree/NOTICE.txt + https://raw.githubusercontent.com/eclipse/jetty.project/master/NOTICE.txt Jetty diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ExampleServerXml.java b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ExampleServerXml.java index 73f1073551a..c8d8eedb91a 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ExampleServerXml.java +++ b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ExampleServerXml.java @@ -25,7 +25,7 @@ import org.eclipse.jetty.xml.XmlConfiguration; * Configures and Starts a Jetty server from an XML declaration. *

* See exampleserver.xml *

*/ diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/FileServerXml.java b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/FileServerXml.java index 8461342675e..fe051dc084f 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/FileServerXml.java +++ b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/FileServerXml.java @@ -30,7 +30,7 @@ import org.eclipse.jetty.xml.XmlConfiguration; *

*

* See fileserver.xml *

*/ diff --git a/jetty-server/src/main/config/modules/ssl.mod b/jetty-server/src/main/config/modules/ssl.mod index 04e2d400c28..335667fae52 100644 --- a/jetty-server/src/main/config/modules/ssl.mod +++ b/jetty-server/src/main/config/modules/ssl.mod @@ -13,7 +13,7 @@ etc/jetty-ssl.xml etc/jetty-ssl-context.xml [files] -http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/src/test/config/etc/keystore?id=${jetty.tag.version}|etc/keystore +https://raw.githubusercontent.com/eclipse/jetty.project/master/jetty-server/src/test/config/etc/keystore?id=${jetty.tag.version}|etc/keystore [ini-template] ### TLS(SSL) Connector Configuration @@ -89,4 +89,3 @@ http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/ ## To configure Includes / Excludes for Cipher Suites or Protocols see tweak-ssl.xml example at ## https://www.eclipse.org/jetty/documentation/current/configuring-ssl.html#configuring-sslcontextfactory-cipherSuites - diff --git a/jetty-start/src/test/resources/assert-home-with-http2.txt b/jetty-start/src/test/resources/assert-home-with-http2.txt index f02d1649c79..a8f4683492d 100644 --- a/jetty-start/src/test/resources/assert-home-with-http2.txt +++ b/jetty-start/src/test/resources/assert-home-with-http2.txt @@ -73,7 +73,7 @@ JVM|-Xmx1024m # Downloads DOWNLOAD|maven://org.mortbay.jetty.alpn/alpn-boot/8.1.3.v20150130|lib/alpn/alpn-boot-8.1.3.v20150130.jar -DOWNLOAD|http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/src/test/config/etc/keystore?id=master|etc/keystore +DOWNLOAD|https://raw.githubusercontent.com/eclipse/jetty.project/master/jetty-server/src/test/config/etc/keystore?id=master|etc/keystore # Files FILE|lib/ diff --git a/jetty-start/src/test/resources/dist-home/modules/ssl.mod b/jetty-start/src/test/resources/dist-home/modules/ssl.mod index 809543f94f7..5d829c31d80 100644 --- a/jetty-start/src/test/resources/dist-home/modules/ssl.mod +++ b/jetty-start/src/test/resources/dist-home/modules/ssl.mod @@ -13,7 +13,7 @@ etc/jetty-ssl.xml etc/jetty-ssl-context.xml [files] -http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/src/test/config/etc/keystore?id=${jetty.tag.version}|etc/keystore +https://raw.githubusercontent.com/eclipse/jetty.project/master/jetty-server/src/test/config/etc/keystore?id=${jetty.tag.version}|etc/keystore [ini-template] ### TLS(SSL) Connector Configuration @@ -80,4 +80,3 @@ jetty.ssl.port=8443 ## Whether cipher order is significant (since java 8 only) # jetty.sslContext.useCipherSuitesOrder=true - diff --git a/jetty-start/src/test/resources/jetty-version.properties b/jetty-start/src/test/resources/jetty-version.properties index 968f6fc4a4a..35277561658 100644 --- a/jetty-start/src/test/resources/jetty-version.properties +++ b/jetty-start/src/test/resources/jetty-version.properties @@ -1 +1 @@ -jetty.version=9.3 \ No newline at end of file +jetty.version=9.3 diff --git a/jetty-start/src/test/resources/usecases/http2.assert.txt b/jetty-start/src/test/resources/usecases/http2.assert.txt index d5baccccbb9..7c21f5abc3e 100644 --- a/jetty-start/src/test/resources/usecases/http2.assert.txt +++ b/jetty-start/src/test/resources/usecases/http2.assert.txt @@ -34,7 +34,7 @@ PROP|jetty.sslContext.trustStorePassword=sundae # The Downloads DOWNLOAD|maven://org.mortbay.jetty.alpn/alpn-boot/8.1.3.v20150130|lib/alpn/alpn-boot-8.1.3.v20150130.jar -DOWNLOAD|http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/src/test/config/etc/keystore?id=master|etc/keystore +DOWNLOAD|https://raw.githubusercontent.com/eclipse/jetty.project/master/jetty-server/src/test/config/etc/keystore?id=master|etc/keystore # The Bootlib BOOTLIB|-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.3.v20150130.jar diff --git a/tests/test-webapps/test-jaas-webapp/src/main/webapp/index.html b/tests/test-webapps/test-jaas-webapp/src/main/webapp/index.html index 777e76f18b6..aa4df43c17a 100644 --- a/tests/test-webapps/test-jaas-webapp/src/main/webapp/index.html +++ b/tests/test-webapps/test-jaas-webapp/src/main/webapp/index.html @@ -24,7 +24,7 @@ $JETTY_BASE/start.ini file instead. The jetty demo-base already has JAAS enabled in the start.ini file.

The full source of this demonstration is available here.

+href="https://github.com/eclipse/jetty.project/blob/master/tests/test-webapps/test-jaas-webapp">here.

Using the Demo

diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/index.html b/tests/test-webapps/test-jetty-webapp/src/main/webapp/index.html index 08ab563da31..d7d2a3a54f2 100644 --- a/tests/test-webapps/test-jetty-webapp/src/main/webapp/index.html +++ b/tests/test-webapps/test-jetty-webapp/src/main/webapp/index.html @@ -18,7 +18,7 @@

Welcome to Jetty 9

-This is the Test webapp for the Jetty 9 HTTP Server and Servlet Container. +This is the Test webapp for the Jetty 9 HTTP Server and Servlet Container. It is configured as a jetty base directory in $JETTY_HOME/demo_base.

@@ -32,7 +32,7 @@ It is configured as a jetty base directory in $JETTY_HOME/demo_base.
  • Session
  • Cookie
    • -
  • Comet Chat Examples: +
  • Comet Chat Examples: