tchekai704
/
src-spring-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

4.1.x
Sam Brannen 6 years ago
parent
c0fd92c131 91df01115d
commit
11fc10282d
5 changed files with 30 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 46
      build.gradle
  2. 2
      gradle/ide.gradle
  3. 4
      gradle/publish-maven.gradle
  4. 2
      import-into-eclipse.bat
  5. 6
      import-into-eclipse.sh

46
build.gradle
Unescape View File

@ -163,27 +163,27 @@ 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://commons.apache.org/proper/commons-lang/javadocs/api-2.5/", "https://commons.apache.org/proper/commons-lang/javadocs/api-2.5/",
"http://commons.apache.org/proper/commons-codec/apidocs/", "https://commons.apache.org/proper/commons-codec/apidocs/",
"http://commons.apache.org/proper/commons-dbcp/apidocs/", "https://commons.apache.org/proper/commons-dbcp/apidocs/",
"http://portals.apache.org/pluto/portlet-2.0-apidocs/", "https://portals.apache.org/pluto/portlet-2.0-apidocs/",
"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://aopalliance.sourceforge.net/doc/", "http://aopalliance.sourceforge.net/doc/",
"http://www.eclipse.org/aspectj/doc/released/aspectj5rt-api/", "https://www.eclipse.org/aspectj/doc/released/aspectj5rt-api/",
"http://ehcache.org/apidocs/", "https://www.ehcache.org/apidocs/${ehcacheVersion}/",
"http://quartz-scheduler.org/api/2.2.0/", "https://www.quartz-scheduler.org/api/2.2.2/",
"http://fasterxml.github.com/jackson-core/javadoc/2.3.0/", "https://fasterxml.github.io/jackson-core/javadoc/2.3.0/",
"http://fasterxml.github.com/jackson-databind/javadoc/2.3.0/", "https://fasterxml.github.io/jackson-databind/javadoc/2.3.0/",
"http://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.3.0/", "https://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.3.0/",
"http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/" "https://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/"
] as String[] ] as String[]
} }
@ -532,7 +532,7 @@ project("spring-oxm") {
compileTestJava { compileTestJava {
// necessary to avoid java.lang.VerifyError on jibx compilation // 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 sourceCompatibility = 1.6
targetCompatibility = 1.6 targetCompatibility = 1.6
} }
@ -1208,7 +1208,7 @@ configure(rootProject) {
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://static.springframework.org/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"
@ -1228,7 +1228,7 @@ configure(rootProject) {
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
Unescape 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
Unescape View File

@ -25,12 +25,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 "The Apache Software License, Version 2.0" 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" distribution "repo"
} }
} }

2
import-into-eclipse.bat
Unescape View File

@ -17,7 +17,7 @@ echo been tested against STS %STS_TEST_VERSION%), but at the minimum you will
echo need Eclipse + AJDT. echo need Eclipse + AJDT.
echo. echo.
echo If you need to download and install STS, please do that now by 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.
echo Otherwise, press enter and we'll begin. echo Otherwise, press enter and we'll begin.

6
import-into-eclipse.sh
Unescape View File

@ -19,9 +19,9 @@ This script has been tested against:
If you need to download and install Eclipse or STS, please do that now If you need to download and install Eclipse or STS, please do that now
by visiting one of the following sites: by visiting one of the following sites:
- Eclipse downloads: http://download.eclipse.org/eclipse/downloads - Eclipse downloads: https://download.eclipse.org/eclipse/downloads
- STS downloads: http://spring.io/tools/sts/all - STS downloads: https://spring.io/tools/sts/all
- STS nightly builds: http://dist.springsource.com/snapshot/STS/nightly-distributions.html - 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 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 spring-aspects module properly compiles in Eclipse/STS), click on the

Write Preview
Loading…
Cancel
Save