From c9c554b8342ccc9142ed6925053fce461bd39ca4 Mon Sep 17 00:00:00 2001 From: Spring Operator Date: Tue, 5 Mar 2019 23:48:47 -0600 Subject: [PATCH 1/2] Update build and setup configuration to use HTTPS See gh-16106 --- eclipse/spring-boot-project.setup | 28 +++++++++---------- mvnw | 2 +- mvnw.cmd | 2 +- .../spring-boot-dependencies/pom.xml | 4 +-- .../spring-boot-parent/pom.xml | 2 +- .../spring-boot-gradle-plugin/build.gradle | 2 +- .../pom.xml | 2 +- .../conf/CentOS/6.9-a23bced6/Dockerfile | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/eclipse/spring-boot-project.setup b/eclipse/spring-boot-project.setup index f12f9a6591..ce7f78926b 100644 --- a/eclipse/spring-boot-project.setup +++ b/eclipse/spring-boot-project.setup @@ -1,16 +1,16 @@ + url="https://download.eclipse.org/technology/epp/packages/oxygen/R/"/> + url="https://download.eclipse.org/releases/oxygen/"/> + url="https://download.eclipse.org/egit/github/updates/"/> + url="https://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-buildhelper/0.15.0/N/0.15.0.201207090124/"/> + url="https://dist.springsource.com/release/TOOLS/update/e4.7"/> Install the tools needed in the IDE to work with the source code for ${scope.project.label} diff --git a/mvnw b/mvnw index 5bf251c077..2d1e3cfa2f 100755 --- a/mvnw +++ b/mvnw @@ -8,7 +8,7 @@ # "License"); you may not use this file except in compliance # with the License. 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 distributed under the License is distributed on an diff --git a/mvnw.cmd b/mvnw.cmd index 019bd74d76..86846aea59 100755 --- a/mvnw.cmd +++ b/mvnw.cmd @@ -7,7 +7,7 @@ @REM "License"); you may not use this file except in compliance @REM with the License. You may obtain a copy of the License at @REM -@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM https://www.apache.org/licenses/LICENSE-2.0 @REM @REM Unless required by applicable law or agreed to in writing, @REM software distributed under the License is distributed on an diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index b254750eb4..d66e59405c 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -17,7 +17,7 @@ Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 @@ -28,7 +28,7 @@ Pivotal info@pivotal.io Pivotal Software, Inc. - http://www.spring.io + https://www.spring.io diff --git a/spring-boot-project/spring-boot-parent/pom.xml b/spring-boot-project/spring-boot-parent/pom.xml index 097887b6b6..2ae43ac073 100644 --- a/spring-boot-project/spring-boot-parent/pom.xml +++ b/spring-boot-project/spring-boot-parent/pom.xml @@ -32,7 +32,7 @@ 0.1.0.RELEASE - http://github.com/spring-projects/spring-boot + https://github.com/spring-projects/spring-boot scm:git:git://github.com/spring-projects/spring-boot.git scm:git:ssh://git@github.com/spring-projects/spring-boot.git diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle index 537272b4dd..7f398750fb 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle @@ -46,7 +46,7 @@ javadoc { author() stylesheetFile = file('src/main/javadoc/spring-javadoc.css') links = [ - 'http://docs.oracle.com/javase/8/docs/api/', + 'https://docs.oracle.com/javase/8/docs/api/', 'https://docs.gradle.org/current/javadoc/' ] } diff --git a/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml index fa65949863..91bdad22a9 100644 --- a/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml +++ b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml @@ -14,7 +14,7 @@ ${basedir}/../../.. 12.0.0.Final wildfly12x - http://download.jboss.org/wildfly/${wildfly.version}/wildfly-${wildfly.version}.zip + https://download.jboss.org/wildfly/${wildfly.version}/wildfly-${wildfly.version}.zip diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/6.9-a23bced6/Dockerfile b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/6.9-a23bced6/Dockerfile index 71ca8d2235..f4856452b6 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/6.9-a23bced6/Dockerfile +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/conf/CentOS/6.9-a23bced6/Dockerfile @@ -4,6 +4,6 @@ RUN yum install -y wget && \ yum install -y system-config-services && \ yum install -y curl && \ wget --output-document jdk.rpm \ - http://cdn.azul.com/zulu/bin/zulu8.21.0.1-jdk8.0.131-linux.x86_64.rpm && \ + https://cdn.azul.com/zulu/bin/zulu8.21.0.1-jdk8.0.131-linux.x86_64.rpm && \ yum --nogpg localinstall -y jdk.rpm && \ rm -f jdk.rpm From 19275fd9d620ea5296f6bcc912aa0224bfc5be6e Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 12 Mar 2019 10:04:18 +0000 Subject: [PATCH 2/2] Drop AnyEdit from Eclipse setup as it is not available over HTTPS See gh-16106 --- eclipse/spring-boot-project.setup | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/eclipse/spring-boot-project.setup b/eclipse/spring-boot-project.setup index ce7f78926b..a6ef29a09e 100644 --- a/eclipse/spring-boot-project.setup +++ b/eclipse/spring-boot-project.setup @@ -60,8 +60,6 @@ name="org.eclipse.platform.feature.group"/> - - - - - -