diff --git a/build.gradle b/build.gradle index b7728e7bdac6701cbe7c6f6ad447802353e35ee1..947d86aef320a42391a443d4acaf64bc102027eb 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/${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[] } @@ -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 89082cc8da766b5f66506e76c17b982f6b443ed9..484a24669f3fa214d2fe3844b7184fece6d170fe 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 1145e112a661e9e6de36858891c78a35f48dcb09..23a668f9f4456d3285f74fb395748eb6afb7efb9 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 8ba6e975fedaee545edb67f4962930f8be1ba15b..a036e4185bc1ef6138a8b800a3087d1c3f0e1ded 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 c682fbc2a415e53c60a7a566286a461b32489fac..f0f9c8d85518f58055374097ab7035285d0170b3 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