From 412cd83c3aaa15de860daf878e9c880ec77f1ea4 Mon Sep 17 00:00:00 2001 From: Spring Operator Date: Tue, 5 Mar 2019 21:56:12 -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). # HTTP URLs that Could Not Be Fixed These URLs were unable to be fixed. Please review them to see if they can be manually resolved. * http://aopalliance.sourceforge.net/doc/ (200) migrated to: http://aopalliance.sourceforge.net/doc/ ([https](https://aopalliance.sourceforge.net/doc/) result AnnotatedConnectException). # 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://jira.codehaus.org/browse/JIBX-465 (UnknownHostException) migrated to: https://jira.codehaus.org/browse/JIBX-465 ([https](https://jira.codehaus.org/browse/JIBX-465) result UnknownHostException). * http://quartz-scheduler.org/api/2.2.0/ (301) migrated to: https://www.quartz-scheduler.org/api/2.2.0/ ([https](https://quartz-scheduler.org/api/2.2.0/) result 404). ## Fixed Success These URLs were fixed successfully. * http://commons.apache.org/proper/commons-codec/apidocs/ migrated to: https://commons.apache.org/proper/commons-codec/apidocs/ ([https](https://commons.apache.org/proper/commons-codec/apidocs/) result 200). * http://commons.apache.org/proper/commons-dbcp/apidocs/ migrated to: https://commons.apache.org/proper/commons-dbcp/apidocs/ ([https](https://commons.apache.org/proper/commons-dbcp/apidocs/) result 200). * http://commons.apache.org/proper/commons-lang/javadocs/api-2.5/ migrated to: https://commons.apache.org/proper/commons-lang/javadocs/api-2.5/ ([https](https://commons.apache.org/proper/commons-lang/javadocs/api-2.5/) result 200). * 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-dataformat-xml/javadoc/2.3.0/ migrated to: https://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.3.0/ ([https](https://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.3.0/) 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://portals.apache.org/pluto/portlet-2.0-apidocs/ migrated to: https://portals.apache.org/pluto/portlet-2.0-apidocs/ ([https](https://portals.apache.org/pluto/portlet-2.0-apidocs/) 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.txt migrated to: https://www.apache.org/licenses/LICENSE-2.0.txt ([https](https://www.apache.org/licenses/LICENSE-2.0.txt) 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://ehcache.org/apidocs/ (301) migrated to: https://www.ehcache.org/apidocs/ ([https](https://ehcache.org/apidocs/) result 200). * http://static.springframework.org/spring-framework/docs (301) migrated to: https://docs.spring.io/spring-framework/docs ([https](https://static.springframework.org/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://fasterxml.github.com/jackson-core/javadoc/2.3.0/ migrated to: https://fasterxml.github.com/jackson-core/javadoc/2.3.0/ ([https](https://fasterxml.github.com/jackson-core/javadoc/2.3.0/) result 301). * http://fasterxml.github.com/jackson-databind/javadoc/2.3.0/ migrated to: https://fasterxml.github.com/jackson-databind/javadoc/2.3.0/ ([https](https://fasterxml.github.com/jackson-databind/javadoc/2.3.0/) 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://spring.io/tools/sts/all migrated to: https://spring.io/tools/sts/all ([https](https://spring.io/tools/sts/all) result 302). --- build.gradle | 46 ++++++++++++++++++------------------- gradle/ide.gradle | 2 +- gradle/publish-maven.gradle | 4 ++-- import-into-eclipse.bat | 2 +- import-into-eclipse.sh | 6 ++--- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/build.gradle b/build.gradle index b7728e7bda..8589f26acb 100644 --- a/build.gradle +++ b/build.gradle @@ -163,27 +163,27 @@ 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://commons.apache.org/proper/commons-lang/javadocs/api-2.5/", - "http://commons.apache.org/proper/commons-codec/apidocs/", - "http://commons.apache.org/proper/commons-dbcp/apidocs/", - "http://portals.apache.org/pluto/portlet-2.0-apidocs/", - "http://tiles.apache.org/tiles-request/apidocs/", - "http://tiles.apache.org/framework/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://commons.apache.org/proper/commons-lang/javadocs/api-2.5/", + "https://commons.apache.org/proper/commons-codec/apidocs/", + "https://commons.apache.org/proper/commons-dbcp/apidocs/", + "https://portals.apache.org/pluto/portlet-2.0-apidocs/", + "https://tiles.apache.org/tiles-request/apidocs/", + "https://tiles.apache.org/framework/apidocs/", "http://aopalliance.sourceforge.net/doc/", - "http://www.eclipse.org/aspectj/doc/released/aspectj5rt-api/", - "http://ehcache.org/apidocs/", - "http://quartz-scheduler.org/api/2.2.0/", - "http://fasterxml.github.com/jackson-core/javadoc/2.3.0/", - "http://fasterxml.github.com/jackson-databind/javadoc/2.3.0/", - "http://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.3.0/", - "http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/" + "https://www.eclipse.org/aspectj/doc/released/aspectj5rt-api/", + "https://www.ehcache.org/apidocs/", + "https://www.quartz-scheduler.org/api/2.2.0/", + "https://fasterxml.github.com/jackson-core/javadoc/2.3.0/", + "https://fasterxml.github.com/jackson-databind/javadoc/2.3.0/", + "https://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.3.0/", + "https://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/" ] as String[] } @@ -532,7 +532,7 @@ project("spring-oxm") { compileTestJava { // necessary to avoid java.lang.VerifyError on jibx compilation - // see http://jira.codehaus.org/browse/JIBX-465 + // see https://jira.codehaus.org/browse/JIBX-465 sourceCompatibility = 1.6 targetCompatibility = 1.6 } @@ -1208,7 +1208,7 @@ configure(rootProject) { baseName = "spring-framework" classifier = "docs" description = "Builds -${classifier} archive containing api and reference " + - "for deployment at http://static.springframework.org/spring-framework/docs." + "for deployment at https://docs.spring.io/spring-framework/docs." from("src/dist") { include "changelog.txt" @@ -1228,7 +1228,7 @@ configure(rootProject) { 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 89082cc8da..484a24669f 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 1145e112a6..23a668f9f4 100644 --- a/gradle/publish-maven.gradle +++ b/gradle/publish-maven.gradle @@ -25,12 +25,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 "The Apache Software License, Version 2.0" - url "http://www.apache.org/licenses/LICENSE-2.0.txt" + url "https://www.apache.org/licenses/LICENSE-2.0.txt" distribution "repo" } } diff --git a/import-into-eclipse.bat b/import-into-eclipse.bat index 8ba6e975fe..a036e4185b 100644 --- a/import-into-eclipse.bat +++ b/import-into-eclipse.bat @@ -17,7 +17,7 @@ echo been tested against STS %STS_TEST_VERSION%), but at the minimum you will echo need Eclipse + AJDT. echo. echo If you need to download and install STS, please do that now by -echo visiting http://spring.io/tools/sts/all +echo visiting https://spring.io/tools/sts/all echo. echo Otherwise, press enter and we'll begin. diff --git a/import-into-eclipse.sh b/import-into-eclipse.sh index c682fbc2a4..f0f9c8d855 100755 --- a/import-into-eclipse.sh +++ b/import-into-eclipse.sh @@ -19,9 +19,9 @@ 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 +- 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 If you need to install a recent CI build for AJDT (i.e., so that the spring-aspects module properly compiles in Eclipse/STS), click on the From 91df01115dcaaf9f37642113da8715c74b3c8800 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Tue, 12 Mar 2019 14:33:52 +0100 Subject: [PATCH 2/2] Manual URL Cleanup Closes gh-22518 --- build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 8589f26acb..947d86aef3 100644 --- a/build.gradle +++ b/build.gradle @@ -178,10 +178,10 @@ configure(allprojects) { project -> "https://tiles.apache.org/framework/apidocs/", "http://aopalliance.sourceforge.net/doc/", "https://www.eclipse.org/aspectj/doc/released/aspectj5rt-api/", - "https://www.ehcache.org/apidocs/", - "https://www.quartz-scheduler.org/api/2.2.0/", - "https://fasterxml.github.com/jackson-core/javadoc/2.3.0/", - "https://fasterxml.github.com/jackson-databind/javadoc/2.3.0/", + "https://www.ehcache.org/apidocs/${ehcacheVersion}/", + "https://www.quartz-scheduler.org/api/2.2.2/", + "https://fasterxml.github.io/jackson-core/javadoc/2.3.0/", + "https://fasterxml.github.io/jackson-databind/javadoc/2.3.0/", "https://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.3.0/", "https://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/" ] as String[]