root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Merge branch 'spring-operator-polish-urls-build-5.1.x' into 5.1.x

This commit is contained in:
Sam Brannen 2019-03-12 18:36:04 +01:00
parent 78bdb58356 7eb1a421f7
commit 00196ea14a
4 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
build.gradle
View File

@ -175,22 +175,22 @@ configure(allprojects) { project ->
} }
ext.javadocLinks = [ ext.javadocLinks = [
"http://docs.oracle.com/javase/8/docs/api/", "https://docs.oracle.com/javase/8/docs/api/",
"http://docs.oracle.com/javaee/7/api/", "https://docs.oracle.com/javaee/7/api/",
"http://docs.oracle.com/cd/E13222_01/wls/docs90/javadocs/", // CommonJ "https://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/", "https://pic.dhe.ibm.com/infocenter/wasinfo/v7r0/topic/com.ibm.websphere.javadoc.doc/web/apidocs/",
"http://glassfish.java.net/nonav/docs/v3/api/", "https://glassfish.java.net/nonav/docs/v3/api/",
"http://docs.jboss.org/jbossas/javadoc/4.0.5/connector/", "https://docs.jboss.org/jbossas/javadoc/4.0.5/connector/",
"http://docs.jboss.org/jbossas/javadoc/7.1.2.Final/", "https://docs.jboss.org/jbossas/javadoc/7.1.2.Final/",
"http://tiles.apache.org/tiles-request/apidocs/", "https://tiles.apache.org/tiles-request/apidocs/",
"http://tiles.apache.org/framework/apidocs/", "https://tiles.apache.org/framework/apidocs/",
"http://www.eclipse.org/aspectj/doc/released/aspectj5rt-api/", "https://www.eclipse.org/aspectj/doc/released/aspectj5rt-api/",
"http://ehcache.org/apidocs/2.10.4", "https://www.ehcache.org/apidocs/2.10.4",
"http://quartz-scheduler.org/api/2.2.1/", "https://www.quartz-scheduler.org/api/2.3.0/",
"http://fasterxml.github.io/jackson-core/javadoc/2.9/", "https://fasterxml.github.io/jackson-core/javadoc/2.9/",
"http://fasterxml.github.io/jackson-databind/javadoc/2.9/", "https://fasterxml.github.io/jackson-databind/javadoc/2.9/",
"http://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.9/", "https://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.9/",
"http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/", "https://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/",
"https://junit.org/junit4/javadoc/4.12/", "https://junit.org/junit4/javadoc/4.12/",
"https://junit.org/junit5/docs/${junit5Version}/api/" "https://junit.org/junit5/docs/${junit5Version}/api/"
] as String[] ] as String[]

10
gradle/docs.gradle
View File

@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * 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 * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * 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() packageListUrl = new File(buildDir, "api/package-list").toURI().toURL()
} }
externalDocumentationLink { externalDocumentationLink {
url = new URL("http://projectreactor.io/docs/core/release/api/") url = new URL("https://projectreactor.io/docs/core/release/api/")
} }
externalDocumentationLink { 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" baseName = "spring-framework"
classifier = "docs" classifier = "docs"
description = "Builds -${classifier} archive containing api and reference " + 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") { from("src/dist") {
include "changelog.txt" include "changelog.txt"
@ -142,7 +142,7 @@ task schemaZip(type: Zip) {
baseName = "spring-framework" baseName = "spring-framework"
classifier = "schema" classifier = "schema"
description = "Builds -${classifier} archive containing all " + description = "Builds -${classifier} archive containing all " +
"XSDs for deployment at http://springframework.org/schema." "XSDs for deployment at https://springframework.org/schema."
duplicatesStrategy 'exclude' duplicatesStrategy 'exclude'
moduleProjects.each { subproject -> moduleProjects.each { subproject ->
def Properties schemas = new Properties(); def Properties schemas = new Properties();

2
gradle/ide.gradle
View File

@ -11,7 +11,7 @@ eclipse.jdt {
} }
// Replace classpath entries with project dependencies (GRADLE-1116) // 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 -> 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 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 } def projectOutputDependencies = classpath.entries.findAll { entry -> entry.path =~ regexp }

4
gradle/publish-maven.gradle
View File

@ -30,12 +30,12 @@ def customizePom(pom, gradleProject) {
url = "https://github.com/spring-projects/spring-framework" url = "https://github.com/spring-projects/spring-framework"
organization { organization {
name = "Spring IO" name = "Spring IO"
url = "http://projects.spring.io/spring-framework" url = "https://projects.spring.io/spring-framework"
} }
licenses { licenses {
license { license {
name "Apache License, Version 2.0" 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" distribution "repo"
} }
} }