From c6688a2704cae69a72e554b667cf6c45c8b671e2 Mon Sep 17 00:00:00 2001 From: Spring Operator Date: Tue, 5 Mar 2019 21:27:28 -0600 Subject: [PATCH] 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://junit.sourceforge.net/javadoc/ (200) migrated to: http://junit.sourceforge.net/javadoc/ ([https](https://junit.sourceforge.net/javadoc/) result AnnotatedConnectException). * http://www.261consulting.com (200) migrated to: http://www.261consulting.com ([https](https://www.261consulting.com) result ConnectTimeoutException). # 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://forums.gradle.org/gradle/topics/after_upgrade_gradle_to_2_0_version_the_maven_pom_not_support_build_property (301) migrated to: https://discuss.gradle.org/gradle/topics/after_upgrade_gradle_to_2_0_version_the_maven_pom_not_support_build_property ([https](https://forums.gradle.org/gradle/topics/after_upgrade_gradle_to_2_0_version_the_maven_pom_not_support_build_property) result 404). * http://download.java.net/maven/2/ (301) migrated to: https://download.java.net/maven/2/ ([https](https://download.java.net/maven/2/) result 404). ## Fixed Success These URLs were fixed successfully. * 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-logging/apidocs/ migrated to: https://commons.apache.org/proper/commons-logging/apidocs/ ([https](https://commons.apache.org/proper/commons-logging/apidocs/) result 200). * http://commons.apache.org/proper/commons-pool/apidocs/ migrated to: https://commons.apache.org/proper/commons-pool/apidocs/ ([https](https://commons.apache.org/proper/commons-pool/apidocs/) result 200). * http://docs.oracle.com/javase/7/docs/api/ migrated to: https://docs.oracle.com/javase/7/docs/api/ ([https](https://docs.oracle.com/javase/7/docs/api/) result 200). * http://docs.spring.io/spring/docs/3.2.x/javadoc-api/ migrated to: https://docs.spring.io/spring/docs/3.2.x/javadoc-api/ ([https](https://docs.spring.io/spring/docs/3.2.x/javadoc-api/) result 200). * http://logging.apache.org/log4j/1.2/apidocs/ migrated to: https://logging.apache.org/log4j/1.2/apidocs/ ([https](https://logging.apache.org/log4j/1.2/apidocs/) result 200). * http://springsource.org/ (301) migrated to: https://spring.io ([https](https://springsource.org/) 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.jayway.com migrated to: https://www.jayway.com ([https](https://www.jayway.com) result 200). * http://static.springframework.org/spring-ldap/docs (301) migrated to: https://docs.spring.io/spring-ldap/docs ([https](https://static.springframework.org/spring-ldap/docs) result 301). * http://repo.springsource.org/libs-snapshot migrated to: https://repo.springsource.org/libs-snapshot ([https](https://repo.springsource.org/libs-snapshot) result 301). * http://www.springframework.org/ldap migrated to: https://www.springframework.org/ldap ([https](https://www.springframework.org/ldap) result 301). # Ignored These URLs were intentionally ignored. * http://maven.apache.org/POM/4.0.0 * http://maven.apache.org/xsd/maven-4.0.0.xsd * http://www.w3.org/2001/XMLSchema-instance --- build.gradle | 14 +++++++------- gradle/maven-deployment.gradle | 12 ++++++------ samples/odm/pom.xml | 8 ++++---- samples/plain/pom.xml | 8 ++++---- samples/user-admin/pom.xml | 8 ++++---- test/integration-tests-spring20/build.gradle | 2 +- test/integration-tests-spring25/build.gradle | 2 +- test/integration-tests-spring30/build.gradle | 2 +- test/integration-tests/build.gradle | 2 +- 9 files changed, 29 insertions(+), 29 deletions(-) diff --git a/build.gradle b/build.gradle index 02a99892..a06471bb 100644 --- a/build.gradle +++ b/build.gradle @@ -37,12 +37,12 @@ allprojects { ext.snapshotBuild = version.endsWith('SNAPSHOT') ext.javadocLinks = [ - "http://docs.oracle.com/javase/7/docs/api/", - "http://docs.spring.io/spring/docs/3.2.x/javadoc-api/", - "http://logging.apache.org/log4j/1.2/apidocs/", - "http://commons.apache.org/proper/commons-logging/apidocs/", - "http://commons.apache.org/proper/commons-dbcp/apidocs/", - "http://commons.apache.org/proper/commons-pool/apidocs/", + "https://docs.oracle.com/javase/7/docs/api/", + "https://docs.spring.io/spring/docs/3.2.x/javadoc-api/", + "https://logging.apache.org/log4j/1.2/apidocs/", + "https://commons.apache.org/proper/commons-logging/apidocs/", + "https://commons.apache.org/proper/commons-dbcp/apidocs/", + "https://commons.apache.org/proper/commons-pool/apidocs/", "http://junit.sourceforge.net/javadoc/", ] as String[] } @@ -130,7 +130,7 @@ task docsZip(type: Zip, dependsOn: asciidoctor) { baseName = "spring-ldap" classifier = "docs" description = "Builds -${classifier} archive containing api and reference " + - "for deployment at http://static.springframework.org/spring-ldap/docs." + "for deployment at https://docs.spring.io/spring-ldap/docs." from("src/dist") { include "changelog.txt" diff --git a/gradle/maven-deployment.gradle b/gradle/maven-deployment.gradle index 2c2eae5c..5a5f0c66 100644 --- a/gradle/maven-deployment.gradle +++ b/gradle/maven-deployment.gradle @@ -25,15 +25,15 @@ def customizePom(pom, gradleProject) { packaging = "war" } description = gradleProject.name - url = 'http://www.springframework.org/ldap' + url = 'https://www.springframework.org/ldap' organization { name = 'SpringSource' - url = 'http://springsource.org/' + url = 'https://spring.io' } 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' } } @@ -60,7 +60,7 @@ def customizePom(pom, gradleProject) { name = "Ulrik Sandberg" email = "ulrik.sandberg@jayway.com" organization = "Jayway" - organizationUrl = "http://www.jayway.com" + organizationUrl = "https://www.jayway.com" } } contributors { @@ -88,13 +88,13 @@ def customizePom(pom, gradleProject) { repositories { repository { id 'spring-snasphot' - url 'http://repo.springsource.org/libs-snapshot' + url 'https://repo.springsource.org/libs-snapshot' } } } } - // http://forums.gradle.org/gradle/topics/after_upgrade_gradle_to_2_0_version_the_maven_pom_not_support_build_property + // https://discuss.gradle.org/gradle/topics/after_upgrade_gradle_to_2_0_version_the_maven_pom_not_support_build_property pom.withXml { def plugins = asNode().appendNode('build').appendNode('plugins') plugins diff --git a/samples/odm/pom.xml b/samples/odm/pom.xml index 26c064c8..9f206002 100644 --- a/samples/odm/pom.xml +++ b/samples/odm/pom.xml @@ -7,15 +7,15 @@ war spring-ldap-odm-sample spring-ldap-odm-sample - http://www.springframework.org/ldap + https://www.springframework.org/ldap SpringSource - http://springsource.org/ + https://spring.io The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt + https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -37,7 +37,7 @@ Ulrik Sandberg ulrik.sandberg@jayway.com Jayway - http://www.jayway.com + https://www.jayway.com diff --git a/samples/plain/pom.xml b/samples/plain/pom.xml index 2cbe9962..e83f2742 100644 --- a/samples/plain/pom.xml +++ b/samples/plain/pom.xml @@ -7,15 +7,15 @@ war spring-ldap-plain-sample spring-ldap-plain-sample - http://www.springframework.org/ldap + https://www.springframework.org/ldap SpringSource - http://springsource.org/ + https://spring.io The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt + https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -37,7 +37,7 @@ Ulrik Sandberg ulrik.sandberg@jayway.com Jayway - http://www.jayway.com + https://www.jayway.com diff --git a/samples/user-admin/pom.xml b/samples/user-admin/pom.xml index 4f24b10e..c93dde0b 100644 --- a/samples/user-admin/pom.xml +++ b/samples/user-admin/pom.xml @@ -7,15 +7,15 @@ war spring-ldap-user-admin-sample spring-ldap-user-admin-sample - http://www.springframework.org/ldap + https://www.springframework.org/ldap SpringSource - http://springsource.org/ + https://spring.io The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt + https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -37,7 +37,7 @@ Ulrik Sandberg ulrik.sandberg@jayway.com Jayway - http://www.jayway.com + https://www.jayway.com diff --git a/test/integration-tests-spring20/build.gradle b/test/integration-tests-spring20/build.gradle index 6cd761db..1159aee0 100644 --- a/test/integration-tests-spring20/build.gradle +++ b/test/integration-tests-spring20/build.gradle @@ -1,6 +1,6 @@ repositories { mavenCentral() - maven { url "http://download.java.net/maven/2/" } + maven { url "https://download.java.net/maven/2/" } } apply from: JAVA_SCRIPT diff --git a/test/integration-tests-spring25/build.gradle b/test/integration-tests-spring25/build.gradle index 6eb88928..dac70b82 100644 --- a/test/integration-tests-spring25/build.gradle +++ b/test/integration-tests-spring25/build.gradle @@ -1,6 +1,6 @@ repositories { mavenCentral() - maven { url "http://download.java.net/maven/2/" } + maven { url "https://download.java.net/maven/2/" } } apply from: JAVA_SCRIPT diff --git a/test/integration-tests-spring30/build.gradle b/test/integration-tests-spring30/build.gradle index dae367b2..d360bca7 100644 --- a/test/integration-tests-spring30/build.gradle +++ b/test/integration-tests-spring30/build.gradle @@ -1,6 +1,6 @@ repositories { mavenCentral() - maven { url "http://download.java.net/maven/2/" } + maven { url "https://download.java.net/maven/2/" } } apply from: JAVA_SCRIPT diff --git a/test/integration-tests/build.gradle b/test/integration-tests/build.gradle index 5e882579..e1f56105 100644 --- a/test/integration-tests/build.gradle +++ b/test/integration-tests/build.gradle @@ -1,5 +1,5 @@ repositories { - maven { url "http://download.java.net/maven/2/" } + maven { url "https://download.java.net/maven/2/" } } apply from: JAVA_SCRIPT