From 60377b1c399ffc68544399f4c8ff28e0de3c75e0 Mon Sep 17 00:00:00 2001 From: Spring Operator Date: Tue, 5 Mar 2019 21:57:14 -0600 Subject: [PATCH 1/2] URL Cleanup This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener). # Fixed URLs ## Fixed But Review Recommended These URLs were fixed, but the https status was not OK. However, the https status was the same as the http request or http redirected to an https URL, so they were migrated. Your review is recommended. * http://quartz-scheduler.org/api/2.2.1/ (301) migrated to: https://www.quartz-scheduler.org/api/2.2.1/ ([https](https://quartz-scheduler.org/api/2.2.1/) result 404). ## Fixed Success These URLs were fixed successfully. * http://dist.springsource.com/snapshot/STS/nightly-distributions.html migrated to: https://dist.springsource.com/snapshot/STS/nightly-distributions.html ([https](https://dist.springsource.com/snapshot/STS/nightly-distributions.html) result 200). * http://docs.jboss.org/jbossas/javadoc/4.0.5/connector/ migrated to: https://docs.jboss.org/jbossas/javadoc/4.0.5/connector/ ([https](https://docs.jboss.org/jbossas/javadoc/4.0.5/connector/) result 200). * http://docs.jboss.org/jbossas/javadoc/7.1.2.Final/ migrated to: https://docs.jboss.org/jbossas/javadoc/7.1.2.Final/ ([https](https://docs.jboss.org/jbossas/javadoc/7.1.2.Final/) result 200). * http://docs.oracle.com/cd/E13222_01/wls/docs90/javadocs/ migrated to: https://docs.oracle.com/cd/E13222_01/wls/docs90/javadocs/ ([https](https://docs.oracle.com/cd/E13222_01/wls/docs90/javadocs/) result 200). * http://docs.oracle.com/javaee/7/api/ migrated to: https://docs.oracle.com/javaee/7/api/ ([https](https://docs.oracle.com/javaee/7/api/) result 200). * http://docs.oracle.com/javase/8/docs/api/ migrated to: https://docs.oracle.com/javase/8/docs/api/ ([https](https://docs.oracle.com/javase/8/docs/api/) result 200). * http://fasterxml.github.io/jackson-core/javadoc/2.9/ migrated to: https://fasterxml.github.io/jackson-core/javadoc/2.9/ ([https](https://fasterxml.github.io/jackson-core/javadoc/2.9/) result 200). * http://fasterxml.github.io/jackson-databind/javadoc/2.9/ migrated to: https://fasterxml.github.io/jackson-databind/javadoc/2.9/ ([https](https://fasterxml.github.io/jackson-databind/javadoc/2.9/) result 200). * http://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.9/ migrated to: https://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.9/ ([https](https://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.9/) result 200). * http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/ migrated to: https://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/ ([https](https://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/) result 200). * http://issues.gradle.org/browse/GRADLE-1116 migrated to: https://issues.gradle.org/browse/GRADLE-1116 ([https](https://issues.gradle.org/browse/GRADLE-1116) result 200). * http://projectreactor.io/docs/core/release/api/ migrated to: https://projectreactor.io/docs/core/release/api/ ([https](https://projectreactor.io/docs/core/release/api/) result 200). * http://tiles.apache.org/framework/apidocs/ migrated to: https://tiles.apache.org/framework/apidocs/ ([https](https://tiles.apache.org/framework/apidocs/) result 200). * http://tiles.apache.org/tiles-request/apidocs/ migrated to: https://tiles.apache.org/tiles-request/apidocs/ ([https](https://tiles.apache.org/tiles-request/apidocs/) result 200). * http://www.apache.org/licenses/LICENSE-2.0 migrated to: https://www.apache.org/licenses/LICENSE-2.0 ([https](https://www.apache.org/licenses/LICENSE-2.0) result 200). * http://www.eclipse.org/ajdt/downloads/ migrated to: https://www.eclipse.org/ajdt/downloads/ ([https](https://www.eclipse.org/ajdt/downloads/) result 200). * http://www.eclipse.org/aspectj/doc/released/aspectj5rt-api/ migrated to: https://www.eclipse.org/aspectj/doc/released/aspectj5rt-api/ ([https](https://www.eclipse.org/aspectj/doc/released/aspectj5rt-api/) result 200). * http://www.reactive-streams.org/reactive-streams-1.0.1-javadoc/ migrated to: https://www.reactive-streams.org/reactive-streams-1.0.1-javadoc/ ([https](https://www.reactive-streams.org/reactive-streams-1.0.1-javadoc/) result 200). * http://docs.spring.io/spring-framework/docs migrated to: https://docs.spring.io/spring-framework/docs ([https](https://docs.spring.io/spring-framework/docs) result 301). * http://download.eclipse.org/eclipse/downloads migrated to: https://download.eclipse.org/eclipse/downloads ([https](https://download.eclipse.org/eclipse/downloads) result 301). * http://glassfish.java.net/nonav/docs/v3/api/ migrated to: https://glassfish.java.net/nonav/docs/v3/api/ ([https](https://glassfish.java.net/nonav/docs/v3/api/) result 301). * http://pic.dhe.ibm.com/infocenter/wasinfo/v7r0/topic/com.ibm.websphere.javadoc.doc/web/apidocs/ migrated to: https://pic.dhe.ibm.com/infocenter/wasinfo/v7r0/topic/com.ibm.websphere.javadoc.doc/web/apidocs/ ([https](https://pic.dhe.ibm.com/infocenter/wasinfo/v7r0/topic/com.ibm.websphere.javadoc.doc/web/apidocs/) result 301). * http://projects.spring.io/spring-framework migrated to: https://projects.spring.io/spring-framework ([https](https://projects.spring.io/spring-framework) result 301). * http://springframework.org/schema migrated to: https://springframework.org/schema ([https](https://springframework.org/schema) result 301). * http://ehcache.org/apidocs/2.10.4 (301) migrated to: https://www.ehcache.org/apidocs/2.10.4 ([https](https://ehcache.org/apidocs/2.10.4) result 301). * http://spring.io/tools/sts/all migrated to: https://spring.io/tools/sts/all ([https](https://spring.io/tools/sts/all) result 302). --- build.gradle | 32 ++++++++++++++++---------------- gradle/docs.gradle | 10 +++++----- gradle/ide.gradle | 2 +- gradle/publish-maven.gradle | 4 ++-- import-into-eclipse.bat | 8 ++++---- import-into-eclipse.sh | 8 ++++---- 6 files changed, 32 insertions(+), 32 deletions(-) diff --git a/build.gradle b/build.gradle index ae07c8049b..29f21bcc28 100644 --- a/build.gradle +++ b/build.gradle @@ -176,22 +176,22 @@ configure(allprojects) { project -> } ext.javadocLinks = [ - "http://docs.oracle.com/javase/8/docs/api/", - "http://docs.oracle.com/javaee/7/api/", - "http://docs.oracle.com/cd/E13222_01/wls/docs90/javadocs/", // CommonJ - "http://pic.dhe.ibm.com/infocenter/wasinfo/v7r0/topic/com.ibm.websphere.javadoc.doc/web/apidocs/", - "http://glassfish.java.net/nonav/docs/v3/api/", - "http://docs.jboss.org/jbossas/javadoc/4.0.5/connector/", - "http://docs.jboss.org/jbossas/javadoc/7.1.2.Final/", - "http://tiles.apache.org/tiles-request/apidocs/", - "http://tiles.apache.org/framework/apidocs/", - "http://www.eclipse.org/aspectj/doc/released/aspectj5rt-api/", - "http://ehcache.org/apidocs/2.10.4", - "http://quartz-scheduler.org/api/2.2.1/", - "http://fasterxml.github.io/jackson-core/javadoc/2.9/", - "http://fasterxml.github.io/jackson-databind/javadoc/2.9/", - "http://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.9/", - "http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/", + "https://docs.oracle.com/javase/8/docs/api/", + "https://docs.oracle.com/javaee/7/api/", + "https://docs.oracle.com/cd/E13222_01/wls/docs90/javadocs/", // CommonJ + "https://pic.dhe.ibm.com/infocenter/wasinfo/v7r0/topic/com.ibm.websphere.javadoc.doc/web/apidocs/", + "https://glassfish.java.net/nonav/docs/v3/api/", + "https://docs.jboss.org/jbossas/javadoc/4.0.5/connector/", + "https://docs.jboss.org/jbossas/javadoc/7.1.2.Final/", + "https://tiles.apache.org/tiles-request/apidocs/", + "https://tiles.apache.org/framework/apidocs/", + "https://www.eclipse.org/aspectj/doc/released/aspectj5rt-api/", + "https://www.ehcache.org/apidocs/2.10.4", + "https://www.quartz-scheduler.org/api/2.2.1/", + "https://fasterxml.github.io/jackson-core/javadoc/2.9/", + "https://fasterxml.github.io/jackson-databind/javadoc/2.9/", + "https://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.9/", + "https://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/", "https://junit.org/junit4/javadoc/4.12/", "https://junit.org/junit5/docs/${junitJupiterVersion}/api/" ] as String[] diff --git a/gradle/docs.gradle b/gradle/docs.gradle index 8102dfb550..3e67b9093d 100644 --- a/gradle/docs.gradle +++ b/gradle/docs.gradle @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * https://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -72,10 +72,10 @@ dokka { packageListUrl = new File(buildDir, "api/package-list").toURI().toURL() } externalDocumentationLink { - url = new URL("http://projectreactor.io/docs/core/release/api/") + url = new URL("https://projectreactor.io/docs/core/release/api/") } externalDocumentationLink { - url = new URL("http://www.reactive-streams.org/reactive-streams-1.0.1-javadoc/") + url = new URL("https://www.reactive-streams.org/reactive-streams-1.0.1-javadoc/") } } @@ -114,7 +114,7 @@ task docsZip(type: Zip, dependsOn: ['api', 'asciidoctor', 'dokka']) { baseName = "spring-framework" classifier = "docs" description = "Builds -${classifier} archive containing api and reference " + - "for deployment at http://docs.spring.io/spring-framework/docs." + "for deployment at https://docs.spring.io/spring-framework/docs." from("src/dist") { include "changelog.txt" @@ -142,7 +142,7 @@ task schemaZip(type: Zip) { baseName = "spring-framework" classifier = "schema" description = "Builds -${classifier} archive containing all " + - "XSDs for deployment at http://springframework.org/schema." + "XSDs for deployment at https://springframework.org/schema." duplicatesStrategy 'exclude' moduleProjects.each { subproject -> def Properties schemas = new Properties(); diff --git a/gradle/ide.gradle b/gradle/ide.gradle index 469733d7a5..982dfbc697 100644 --- a/gradle/ide.gradle +++ b/gradle/ide.gradle @@ -11,7 +11,7 @@ eclipse.jdt { } // Replace classpath entries with project dependencies (GRADLE-1116) -// http://issues.gradle.org/browse/GRADLE-1116 +// https://issues.gradle.org/browse/GRADLE-1116 eclipse.classpath.file.whenMerged { classpath -> def regexp = /.*?\/([^\/]+)\/build\/([^\/]+\/)+(?:main|test)/ // only match those that end in main or test (avoids removing necessary entries like build/classes/jaxb) def projectOutputDependencies = classpath.entries.findAll { entry -> entry.path =~ regexp } diff --git a/gradle/publish-maven.gradle b/gradle/publish-maven.gradle index 249d23f4ce..29f94af04d 100644 --- a/gradle/publish-maven.gradle +++ b/gradle/publish-maven.gradle @@ -30,12 +30,12 @@ def customizePom(pom, gradleProject) { url = "https://github.com/spring-projects/spring-framework" organization { name = "Spring IO" - url = "http://projects.spring.io/spring-framework" + url = "https://projects.spring.io/spring-framework" } licenses { license { name "Apache License, Version 2.0" - url "http://www.apache.org/licenses/LICENSE-2.0" + url "https://www.apache.org/licenses/LICENSE-2.0" distribution "repo" } } diff --git a/import-into-eclipse.bat b/import-into-eclipse.bat index b6532a169d..a5c8b0496b 100644 --- a/import-into-eclipse.bat +++ b/import-into-eclipse.bat @@ -18,10 +18,10 @@ echo. echo If you need to download and install Eclipse or STS, please do that now echo by visiting one of the following sites: echo. -echo - Eclipse downloads: http://download.eclipse.org/eclipse/downloads -echo - STS downloads: http://spring.io/tools/sts/all -echo - STS nightly builds: http://dist.springsource.com/snapshot/STS/nightly-distributions.html -echo - ADJT: http://www.eclipse.org/ajdt/downloads/ +echo - Eclipse downloads: https://download.eclipse.org/eclipse/downloads +echo - STS downloads: https://spring.io/tools/sts/all +echo - STS nightly builds: https://dist.springsource.com/snapshot/STS/nightly-distributions.html +echo - ADJT: https://www.eclipse.org/ajdt/downloads/ echo - Groovy Eclipse: https://github.com/groovy/groovy-eclipse/wiki echo. echo Otherwise, press enter and we'll begin. diff --git a/import-into-eclipse.sh b/import-into-eclipse.sh index b513f0754f..d91f2d15bc 100755 --- a/import-into-eclipse.sh +++ b/import-into-eclipse.sh @@ -19,10 +19,10 @@ This script has been tested against: If you need to download and install Eclipse or STS, please do that now by visiting one of the following sites: -- Eclipse downloads: http://download.eclipse.org/eclipse/downloads -- STS downloads: http://spring.io/tools/sts/all -- STS nightly builds: http://dist.springsource.com/snapshot/STS/nightly-distributions.html -- ADJT: http://www.eclipse.org/ajdt/downloads/ +- Eclipse downloads: https://download.eclipse.org/eclipse/downloads +- STS downloads: https://spring.io/tools/sts/all +- STS nightly builds: https://dist.springsource.com/snapshot/STS/nightly-distributions.html +- ADJT: https://www.eclipse.org/ajdt/downloads/ - Groovy Eclipse: https://github.com/groovy/groovy-eclipse/wiki Once Eclipse/STS is installed, press enter, and we'll begin. From 8e654d52ffeec0a1c5af8856220f1e560fe0c56c Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Tue, 12 Mar 2019 17:18:46 +0100 Subject: [PATCH 2/2] Manual URL Cleanup Closes gh-22521 --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 29f21bcc28..347bfb6697 100644 --- a/build.gradle +++ b/build.gradle @@ -186,8 +186,8 @@ configure(allprojects) { project -> "https://tiles.apache.org/tiles-request/apidocs/", "https://tiles.apache.org/framework/apidocs/", "https://www.eclipse.org/aspectj/doc/released/aspectj5rt-api/", - "https://www.ehcache.org/apidocs/2.10.4", - "https://www.quartz-scheduler.org/api/2.2.1/", + "https://www.ehcache.org/apidocs/2.10.4/", + "https://www.quartz-scheduler.org/api/2.3.0/", "https://fasterxml.github.io/jackson-core/javadoc/2.9/", "https://fasterxml.github.io/jackson-databind/javadoc/2.9/", "https://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.9/",