Skip to content

Commit d9bc3b7

Browse files
committed
Merge branch 'spring-operator-polish-urls-build-4.3.x' into 4.3.x
2 parents 6030014 + 0adabdb commit d9bc3b7

File tree

5 files changed

+30
-30
lines changed

5 files changed

+30
-30
lines changed

build.gradle

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -186,27 +186,27 @@ configure(allprojects) { project ->
186186
}
187187

188188
ext.javadocLinks = [
189-
"http://docs.oracle.com/javase/8/docs/api/",
190-
"http://docs.oracle.com/javaee/7/api/",
191-
"http://docs.oracle.com/cd/E13222_01/wls/docs90/javadocs/", // CommonJ
192-
"http://pic.dhe.ibm.com/infocenter/wasinfo/v7r0/topic/com.ibm.websphere.javadoc.doc/web/apidocs/",
193-
"http://glassfish.java.net/nonav/docs/v3/api/",
194-
"http://docs.jboss.org/jbossas/javadoc/4.0.5/connector/",
195-
"http://docs.jboss.org/jbossas/javadoc/7.1.2.Final/",
196-
"http://commons.apache.org/proper/commons-lang/javadocs/api-2.5/",
197-
"http://commons.apache.org/proper/commons-codec/apidocs/",
198-
"http://commons.apache.org/proper/commons-dbcp/apidocs/",
199-
"http://portals.apache.org/pluto/portlet-2.0-apidocs/",
200-
"http://tiles.apache.org/tiles-request/apidocs/",
201-
"http://tiles.apache.org/framework/apidocs/",
202-
"http://www.eclipse.org/aspectj/doc/released/aspectj5rt-api/",
203-
"http://ehcache.org/apidocs/${ehcacheVersion}",
204-
"http://ehcache.org/apidocs/${ehcache3Version}",
205-
"http://quartz-scheduler.org/api/2.2.1/",
206-
"http://fasterxml.github.io/jackson-core/javadoc/2.8/",
207-
"http://fasterxml.github.io/jackson-databind/javadoc/2.8/",
208-
"http://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.8/",
209-
"http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/",
189+
"https://docs.oracle.com/javase/8/docs/api/",
190+
"https://docs.oracle.com/javaee/7/api/",
191+
"https://docs.oracle.com/cd/E13222_01/wls/docs90/javadocs/", // CommonJ
192+
"https://pic.dhe.ibm.com/infocenter/wasinfo/v7r0/topic/com.ibm.websphere.javadoc.doc/web/apidocs/",
193+
"https://glassfish.java.net/nonav/docs/v3/api/",
194+
"https://docs.jboss.org/jbossas/javadoc/4.0.5/connector/",
195+
"https://docs.jboss.org/jbossas/javadoc/7.1.2.Final/",
196+
"https://commons.apache.org/proper/commons-lang/javadocs/api-2.5/",
197+
"https://commons.apache.org/proper/commons-codec/apidocs/",
198+
"https://commons.apache.org/proper/commons-dbcp/apidocs/",
199+
"https://portals.apache.org/pluto/portlet-2.0-apidocs/",
200+
"https://tiles.apache.org/tiles-request/apidocs/",
201+
"https://tiles.apache.org/framework/apidocs/",
202+
"https://www.eclipse.org/aspectj/doc/released/aspectj5rt-api/",
203+
"https://www.ehcache.org/apidocs/${ehcacheVersion}/",
204+
"https://www.ehcache.org/apidocs/${ehcache3Version}/",
205+
"https://www.quartz-scheduler.org/api/2.2.3/",
206+
"https://fasterxml.github.io/jackson-core/javadoc/2.8/",
207+
"https://fasterxml.github.io/jackson-databind/javadoc/2.8/",
208+
"https://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.8/",
209+
"https://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/",
210210
"https://junit.org/junit4/javadoc/${junitVersion}/"
211211
] as String[]
212212
}
@@ -1246,7 +1246,7 @@ configure(rootProject) {
12461246
baseName = "spring-framework"
12471247
classifier = "docs"
12481248
description = "Builds -${classifier} archive containing api and reference " +
1249-
"for deployment at http://static.springframework.org/spring-framework/docs."
1249+
"for deployment at https://docs.spring.io/spring-framework/docs."
12501250

12511251
from("src/dist") {
12521252
include "changelog.txt"
@@ -1266,7 +1266,7 @@ configure(rootProject) {
12661266
baseName = "spring-framework"
12671267
classifier = "schema"
12681268
description = "Builds -${classifier} archive containing all " +
1269-
"XSDs for deployment at http://springframework.org/schema."
1269+
"XSDs for deployment at https://springframework.org/schema."
12701270
duplicatesStrategy 'exclude'
12711271
moduleProjects.each { subproject ->
12721272
def Properties schemas = new Properties();

gradle/ide.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ eclipse.jdt {
1111
}
1212

1313
// Replace classpath entries with project dependencies (GRADLE-1116)
14-
// http://issues.gradle.org/browse/GRADLE-1116
14+
// https://issues.gradle.org/browse/GRADLE-1116
1515
eclipse.classpath.file.whenMerged { classpath ->
1616
def regexp = /.*?\/([^\/]+)\/build\/[^\/]+\/(?:main|test)/ // only match those that end in main or test (avoids removing necessary entries like build/classes/jaxb)
1717
def projectOutputDependencies = classpath.entries.findAll { entry -> entry.path =~ regexp }

gradle/publish-maven.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ def customizePom(pom, gradleProject) {
2525
url = "https://github.com/spring-projects/spring-framework"
2626
organization {
2727
name = "Spring IO"
28-
url = "http://projects.spring.io/spring-framework"
28+
url = "https://projects.spring.io/spring-framework"
2929
}
3030
licenses {
3131
license {
3232
name "Apache License, Version 2.0"
33-
url "http://www.apache.org/licenses/LICENSE-2.0"
33+
url "https://www.apache.org/licenses/LICENSE-2.0"
3434
distribution "repo"
3535
}
3636
}

import-into-eclipse.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ echo been tested against STS %STS_TEST_VERSION%), but at the minimum you will
1717
echo need Eclipse + AJDT.
1818
echo.
1919
echo If you need to download and install STS, please do that now by
20-
echo visiting http://spring.io/tools/sts/all
20+
echo visiting https://spring.io/tools/sts/all
2121
echo.
2222
echo Otherwise, press enter and we'll begin.
2323

import-into-eclipse.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ This script has been tested against:
1919
If you need to download and install Eclipse or STS, please do that now
2020
by visiting one of the following sites:
2121
22-
- Eclipse downloads: http://download.eclipse.org/eclipse/downloads
23-
- STS downloads: http://spring.io/tools/sts/all
24-
- STS nightly builds: http://dist.springsource.com/snapshot/STS/nightly-distributions.html
22+
- Eclipse downloads: https://download.eclipse.org/eclipse/downloads
23+
- STS downloads: https://spring.io/tools/sts/all
24+
- STS nightly builds: https://dist.springsource.com/snapshot/STS/nightly-distributions.html
2525
2626
If you need to install a recent CI build for AJDT (i.e., so that the
2727
spring-aspects module properly compiles in Eclipse/STS), click on the

0 commit comments

Comments
 (0)