From ade6d86b654586b19d4fd13108659d1b29694b7c Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 27 Mar 2018 18:02:52 +0200 Subject: [PATCH] Polish "Use secure connection to repositories" Closes gh-12629 --- .settings-template.xml | 18 +++++------ README.adoc | 2 +- .../RepositoryConfigurationFactory.java | 6 ++-- spring-boot-dependencies/pom.xml | 4 +-- .../src/main/asciidoc/build-tool-plugins.adoc | 10 +++---- .../src/main/asciidoc/deployment.adoc | 4 +-- .../src/main/asciidoc/getting-started.adoc | 30 +++++++++---------- .../src/main/asciidoc/using-spring-boot.adoc | 12 ++++---- spring-boot-samples/pom.xml | 10 +++---- .../spring-boot-sample-actuator/build.gradle | 12 ++++---- .../spring-boot-sample-ant/ivysettings.xml | 6 ++-- .../spring-boot-sample-logback/build.gradle | 12 ++++---- .../spring-boot-sample-profile/build.gradle | 12 ++++---- .../spring-boot-sample-simple/build.gradle | 12 ++++---- .../build.gradle | 12 ++++---- .../spring-boot-sample-web-ui/build.gradle | 12 ++++---- .../spring-boot-starter-data-gemfire/pom.xml | 2 +- .../src/it/sample/ivysettings.xml | 6 ++-- 18 files changed, 91 insertions(+), 91 deletions(-) diff --git a/.settings-template.xml b/.settings-template.xml index adf3aa28fa5..4aa66a76709 100644 --- a/.settings-template.xml +++ b/.settings-template.xml @@ -7,7 +7,7 @@ spring-ext - http://repo.spring.io/ext-release-local/ + https://repo.spring.io/ext-release-local/ true @@ -18,7 +18,7 @@ spring-milestones Spring Milestones - http://repo.spring.io/milestone + https://repo.spring.io/milestone false @@ -26,7 +26,7 @@ spring-snapshots Spring Snapshots - http://repo.spring.io/snapshot + https://repo.spring.io/snapshot true @@ -46,7 +46,7 @@ spring-milestones Spring Milestones - http://repo.spring.io/milestone + https://repo.spring.io/milestone false @@ -54,7 +54,7 @@ spring-snapshots Spring Snapshots - http://repo.spring.io/snapshot + https://repo.spring.io/snapshot true @@ -66,7 +66,7 @@ spring-ext - http://repo.spring.io/ext-release-local/ + https://repo.spring.io/ext-release-local/ true @@ -87,7 +87,7 @@ spring-milestones Spring Milestones - http://repo.spring.io/milestone + https://repo.spring.io/milestone false @@ -97,7 +97,7 @@ spring-milestones Spring Milestones - http://repo.spring.io/snapshot + https://repo.spring.io/snapshot false @@ -109,7 +109,7 @@ spring-ext - http://repo.spring.io/ext-release-local/ + https://repo.spring.io/ext-release-local/ true diff --git a/README.adoc b/README.adoc index cf7ea70640b..99f9cc7320a 100755 --- a/README.adoc +++ b/README.adoc @@ -91,7 +91,7 @@ requests. If you want to raise an issue, please follow the recommendations below == Building from Source You don't need to build from source to use Spring Boot (binaries in -http://repo.spring.io[repo.spring.io]), but if you want to try out the latest and +https://repo.spring.io[repo.spring.io]), but if you want to try out the latest and greatest, Spring Boot can be easily built with the https://github.com/takari/maven-wrapper[maven wrapper]. You also need JDK 1.8 (although Boot applications can run on Java 1.6). diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactory.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactory.java index aea0bf62e13..7dff3bb099e 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactory.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2015 the original author or authors. + * Copyright 2012-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -45,10 +45,10 @@ public final class RepositoryConfigurationFactory { "central", URI.create("https://repo.maven.apache.org/maven2/"), false); private static final RepositoryConfiguration SPRING_MILESTONE = new RepositoryConfiguration( - "spring-milestone", URI.create("http://repo.spring.io/milestone"), false); + "spring-milestone", URI.create("https://repo.spring.io/milestone"), false); private static final RepositoryConfiguration SPRING_SNAPSHOT = new RepositoryConfiguration( - "spring-snapshot", URI.create("http://repo.spring.io/snapshot"), true); + "spring-snapshot", URI.create("https://repo.spring.io/snapshot"), true); private RepositoryConfigurationFactory() { } diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index f8112b00e1f..28a97074aed 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -3043,7 +3043,7 @@ spring-milestones Spring Milestones - http://repo.spring.io/milestone + https://repo.spring.io/milestone false @@ -3051,7 +3051,7 @@ spring-snapshots Spring Snapshots - http://repo.spring.io/snapshot + https://repo.spring.io/snapshot true diff --git a/spring-boot-docs/src/main/asciidoc/build-tool-plugins.adoc b/spring-boot-docs/src/main/asciidoc/build-tool-plugins.adoc index 8e895237b23..4e89188c1de 100644 --- a/spring-boot-docs/src/main/asciidoc/build-tool-plugins.adoc +++ b/spring-boot-docs/src/main/asciidoc/build-tool-plugins.adoc @@ -85,11 +85,11 @@ If you are using a milestone or snapshot release you will also need to add appro spring-snapshots - http://repo.spring.io/snapshot + https://repo.spring.io/snapshot spring-milestones - http://repo.spring.io/milestone + https://repo.spring.io/milestone ---- @@ -189,8 +189,8 @@ the `spring-boot` plugin: ---- buildscript { repositories { - maven { url 'http://repo.spring.io/snapshot' } - maven { url 'http://repo.spring.io/milestone' } + maven { url 'https://repo.spring.io/snapshot' } + maven { url 'https://repo.spring.io/milestone' } } dependencies { classpath 'org.springframework.boot:spring-boot-gradle-plugin:{spring-boot-version}'' @@ -271,7 +271,7 @@ you need to mark the embedded container dependencies as belonging to the war plu repositories { jcenter() - maven { url "http://repo.spring.io/libs-snapshot" } + maven { url "https://repo.spring.io/libs-snapshot" } } dependencies { diff --git a/spring-boot-docs/src/main/asciidoc/deployment.adoc b/spring-boot-docs/src/main/asciidoc/deployment.adoc index 0e4ad4de646..2b8ed6c4b93 100644 --- a/spring-boot-docs/src/main/asciidoc/deployment.adoc +++ b/spring-boot-docs/src/main/asciidoc/deployment.adoc @@ -202,8 +202,8 @@ This should be everything you need. The most common workflow for Heroku deployme -----> Executing: mvn -B -DskipTests=true clean install [INFO] Scanning for projects... - Downloading: http://repo.spring.io/... - Downloaded: http://repo.spring.io/... (818 B at 1.8 KB/sec) + Downloading: https://repo.spring.io/... + Downloaded: https://repo.spring.io/... (818 B at 1.8 KB/sec) .... Downloaded: http://s3pository.heroku.com/jvm/... (152 KB at 595.3 KB/sec) [INFO] Installing /tmp/build_0c35a5d2-a067-4abc-a232-14b1fb7a8229/target/... diff --git a/spring-boot-docs/src/main/asciidoc/getting-started.adoc b/spring-boot-docs/src/main/asciidoc/getting-started.adoc index e3b6aecec86..a2ef0128cc4 100644 --- a/spring-boot-docs/src/main/asciidoc/getting-started.adoc +++ b/spring-boot-docs/src/main/asciidoc/getting-started.adoc @@ -172,22 +172,22 @@ ifeval::["{spring-boot-repo}" != "release"] spring-snapshots - http://repo.spring.io/snapshot + https://repo.spring.io/snapshot true spring-milestones - http://repo.spring.io/milestone + https://repo.spring.io/milestone spring-snapshots - http://repo.spring.io/snapshot + https://repo.spring.io/snapshot spring-milestones - http://repo.spring.io/milestone + https://repo.spring.io/milestone endif::[] @@ -234,8 +234,8 @@ ifeval::["{spring-boot-repo}" != "release"] buildscript { repositories { jcenter() - maven { url 'http://repo.spring.io/snapshot' } - maven { url 'http://repo.spring.io/milestone' } + maven { url 'https://repo.spring.io/snapshot' } + maven { url 'https://repo.spring.io/milestone' } } dependencies { classpath 'org.springframework.boot:spring-boot-gradle-plugin:{spring-boot-version}' @@ -254,8 +254,8 @@ endif::[] repositories { jcenter() ifeval::["{spring-boot-repo}" != "release"] - maven { url "http://repo.spring.io/snapshot" } - maven { url "http://repo.spring.io/milestone" } + maven { url "https://repo.spring.io/snapshot" } + maven { url "https://repo.spring.io/milestone" } endif::[] } @@ -282,10 +282,10 @@ way to get a Spring application off the ground. ==== Manual installation You can download the Spring CLI distribution from the Spring software repository: -* http://repo.spring.io/{spring-boot-repo}/org/springframework/boot/spring-boot-cli/{spring-boot-version}/spring-boot-cli-{spring-boot-version}-bin.zip[spring-boot-cli-{spring-boot-version}-bin.zip] -* http://repo.spring.io/{spring-boot-repo}/org/springframework/boot/spring-boot-cli/{spring-boot-version}/spring-boot-cli-{spring-boot-version}-bin.tar.gz[spring-boot-cli-{spring-boot-version}-bin.tar.gz] +* https://repo.spring.io/{spring-boot-repo}/org/springframework/boot/spring-boot-cli/{spring-boot-version}/spring-boot-cli-{spring-boot-version}-bin.zip[spring-boot-cli-{spring-boot-version}-bin.zip] +* https://repo.spring.io/{spring-boot-repo}/org/springframework/boot/spring-boot-cli/{spring-boot-version}/spring-boot-cli-{spring-boot-version}-bin.tar.gz[spring-boot-cli-{spring-boot-version}-bin.tar.gz] -Cutting edge http://repo.spring.io/snapshot/org/springframework/boot/spring-boot-cli/[snapshot distributions] +Cutting edge https://repo.spring.io/snapshot/org/springframework/boot/spring-boot-cli/[snapshot distributions] are also available. Once downloaded, follow the {github-raw}/spring-boot-cli/src/main/content/INSTALL.txt[INSTALL.txt] @@ -519,22 +519,22 @@ ifeval::["{spring-boot-repo}" != "release"] spring-snapshots - http://repo.spring.io/snapshot + https://repo.spring.io/snapshot true spring-milestones - http://repo.spring.io/milestone + https://repo.spring.io/milestone spring-snapshots - http://repo.spring.io/snapshot + https://repo.spring.io/snapshot spring-milestones - http://repo.spring.io/milestone + https://repo.spring.io/milestone endif::[] diff --git a/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc b/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc index 898287b43b6..46b65c4bf38 100644 --- a/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc +++ b/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc @@ -216,8 +216,8 @@ Maven, there is no "`super parent`" to import to share some configuration. ---- repositories { ifeval::["{spring-boot-repo}" != "release"] - maven { url "http://repo.spring.io/snapshot" } - maven { url "http://repo.spring.io/milestone" } + maven { url "https://repo.spring.io/snapshot" } + maven { url "https://repo.spring.io/milestone" } endif::[] ifeval::["{spring-boot-repo}" == "release"] jcenter() @@ -248,8 +248,8 @@ ifeval::["{spring-boot-repo}" != "release"] buildscript { repositories { jcenter() - maven { url 'http://repo.spring.io/snapshot' } - maven { url 'http://repo.spring.io/milestone' } + maven { url 'https://repo.spring.io/snapshot' } + maven { url 'https://repo.spring.io/milestone' } } dependencies { classpath 'org.springframework.boot:spring-boot-gradle-plugin:{spring-boot-version}' @@ -263,8 +263,8 @@ endif::[] repositories { jcenter() ifeval::["{spring-boot-repo}" != "release"] - maven { url 'http://repo.spring.io/snapshot' } - maven { url 'http://repo.spring.io/milestone' } + maven { url 'https://repo.spring.io/snapshot' } + maven { url 'https://repo.spring.io/milestone' } endif::[] } diff --git a/spring-boot-samples/pom.xml b/spring-boot-samples/pom.xml index d8f88531258..fd639f24e6e 100644 --- a/spring-boot-samples/pom.xml +++ b/spring-boot-samples/pom.xml @@ -238,7 +238,7 @@ spring-snapshots Spring Snapshots - http://repo.spring.io/snapshot + https://repo.spring.io/snapshot true @@ -246,7 +246,7 @@ spring-milestones Spring Milestones - http://repo.spring.io/milestone + https://repo.spring.io/milestone false @@ -256,7 +256,7 @@ spring-snapshots Spring Snapshots - http://repo.spring.io/snapshot + https://repo.spring.io/snapshot true @@ -264,7 +264,7 @@ spring-milestones Spring Milestones - http://repo.spring.io/milestone + https://repo.spring.io/milestone false @@ -272,7 +272,7 @@ spring-releases Spring Releases - http://repo.spring.io/release + https://repo.spring.io/release false diff --git a/spring-boot-samples/spring-boot-sample-actuator/build.gradle b/spring-boot-samples/spring-boot-sample-actuator/build.gradle index 37a46e87575..cf0aab89f1c 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/build.gradle +++ b/spring-boot-samples/spring-boot-sample-actuator/build.gradle @@ -6,9 +6,9 @@ buildscript { // NOTE: You should declare only repositories that you need here mavenLocal() mavenCentral() - maven { url "http://repo.spring.io/release" } - maven { url "http://repo.spring.io/milestone" } - maven { url "http://repo.spring.io/snapshot" } + maven { url "https://repo.spring.io/release" } + maven { url "https://repo.spring.io/milestone" } + maven { url "https://repo.spring.io/snapshot" } } dependencies { classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}") @@ -31,9 +31,9 @@ repositories { // NOTE: You should declare only repositories that you need here mavenLocal() mavenCentral() - maven { url "http://repo.spring.io/release" } - maven { url "http://repo.spring.io/milestone" } - maven { url "http://repo.spring.io/snapshot" } + maven { url "https://repo.spring.io/release" } + maven { url "https://repo.spring.io/milestone" } + maven { url "https://repo.spring.io/snapshot" } } dependencies { diff --git a/spring-boot-samples/spring-boot-sample-ant/ivysettings.xml b/spring-boot-samples/spring-boot-sample-ant/ivysettings.xml index 4127a506e8c..e2e5a05f731 100644 --- a/spring-boot-samples/spring-boot-sample-ant/ivysettings.xml +++ b/spring-boot-samples/spring-boot-sample-ant/ivysettings.xml @@ -8,9 +8,9 @@ - - - + + + diff --git a/spring-boot-samples/spring-boot-sample-logback/build.gradle b/spring-boot-samples/spring-boot-sample-logback/build.gradle index fd202efdcba..74c87b8a5c6 100644 --- a/spring-boot-samples/spring-boot-sample-logback/build.gradle +++ b/spring-boot-samples/spring-boot-sample-logback/build.gradle @@ -6,9 +6,9 @@ buildscript { // NOTE: You should declare only repositories that you need here mavenLocal() mavenCentral() - maven { url "http://repo.spring.io/release" } - maven { url "http://repo.spring.io/milestone" } - maven { url "http://repo.spring.io/snapshot" } + maven { url "https://repo.spring.io/release" } + maven { url "https://repo.spring.io/milestone" } + maven { url "https://repo.spring.io/snapshot" } } dependencies { classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}") @@ -33,9 +33,9 @@ repositories { // NOTE: You should declare only repositories that you need here mavenLocal() mavenCentral() - maven { url "http://repo.spring.io/release" } - maven { url "http://repo.spring.io/milestone" } - maven { url "http://repo.spring.io/snapshot" } + maven { url "https://repo.spring.io/release" } + maven { url "https://repo.spring.io/milestone" } + maven { url "https://repo.spring.io/snapshot" } } dependencies { diff --git a/spring-boot-samples/spring-boot-sample-profile/build.gradle b/spring-boot-samples/spring-boot-sample-profile/build.gradle index d7272a214fc..327940943fe 100644 --- a/spring-boot-samples/spring-boot-sample-profile/build.gradle +++ b/spring-boot-samples/spring-boot-sample-profile/build.gradle @@ -6,9 +6,9 @@ buildscript { // NOTE: You should declare only repositories that you need here mavenLocal() mavenCentral() - maven { url "http://repo.spring.io/release" } - maven { url "http://repo.spring.io/milestone" } - maven { url "http://repo.spring.io/snapshot" } + maven { url "https://repo.spring.io/release" } + maven { url "https://repo.spring.io/milestone" } + maven { url "https://repo.spring.io/snapshot" } } dependencies { classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}") @@ -41,9 +41,9 @@ repositories { // NOTE: You should declare only repositories that you need here mavenLocal() mavenCentral() - maven { url "http://repo.spring.io/release" } - maven { url "http://repo.spring.io/milestone" } - maven { url "http://repo.spring.io/snapshot" } + maven { url "https://repo.spring.io/release" } + maven { url "https://repo.spring.io/milestone" } + maven { url "https://repo.spring.io/snapshot" } } dependencies { diff --git a/spring-boot-samples/spring-boot-sample-simple/build.gradle b/spring-boot-samples/spring-boot-sample-simple/build.gradle index fd202efdcba..74c87b8a5c6 100644 --- a/spring-boot-samples/spring-boot-sample-simple/build.gradle +++ b/spring-boot-samples/spring-boot-sample-simple/build.gradle @@ -6,9 +6,9 @@ buildscript { // NOTE: You should declare only repositories that you need here mavenLocal() mavenCentral() - maven { url "http://repo.spring.io/release" } - maven { url "http://repo.spring.io/milestone" } - maven { url "http://repo.spring.io/snapshot" } + maven { url "https://repo.spring.io/release" } + maven { url "https://repo.spring.io/milestone" } + maven { url "https://repo.spring.io/snapshot" } } dependencies { classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}") @@ -33,9 +33,9 @@ repositories { // NOTE: You should declare only repositories that you need here mavenLocal() mavenCentral() - maven { url "http://repo.spring.io/release" } - maven { url "http://repo.spring.io/milestone" } - maven { url "http://repo.spring.io/snapshot" } + maven { url "https://repo.spring.io/release" } + maven { url "https://repo.spring.io/milestone" } + maven { url "https://repo.spring.io/snapshot" } } dependencies { diff --git a/spring-boot-samples/spring-boot-sample-web-static/build.gradle b/spring-boot-samples/spring-boot-sample-web-static/build.gradle index 3ea96124ec0..20f1a3319f0 100644 --- a/spring-boot-samples/spring-boot-sample-web-static/build.gradle +++ b/spring-boot-samples/spring-boot-sample-web-static/build.gradle @@ -6,9 +6,9 @@ buildscript { // NOTE: You should declare only repositories that you need here mavenLocal() mavenCentral() - maven { url "http://repo.spring.io/release" } - maven { url "http://repo.spring.io/milestone" } - maven { url "http://repo.spring.io/snapshot" } + maven { url "https://repo.spring.io/release" } + maven { url "https://repo.spring.io/milestone" } + maven { url "https://repo.spring.io/snapshot" } } dependencies { classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}") @@ -31,9 +31,9 @@ repositories { // NOTE: You should declare only repositories that you need here mavenLocal() mavenCentral() - maven { url "http://repo.spring.io/release" } - maven { url "http://repo.spring.io/milestone" } - maven { url "http://repo.spring.io/snapshot" } + maven { url "https://repo.spring.io/release" } + maven { url "https://repo.spring.io/milestone" } + maven { url "https://repo.spring.io/snapshot" } } configurations { diff --git a/spring-boot-samples/spring-boot-sample-web-ui/build.gradle b/spring-boot-samples/spring-boot-sample-web-ui/build.gradle index f92232a322a..592efd1ff37 100644 --- a/spring-boot-samples/spring-boot-sample-web-ui/build.gradle +++ b/spring-boot-samples/spring-boot-sample-web-ui/build.gradle @@ -7,9 +7,9 @@ buildscript { // NOTE: You should declare only repositories that you need here mavenLocal() mavenCentral() - maven { url "http://repo.spring.io/release" } - maven { url "http://repo.spring.io/milestone" } - maven { url "http://repo.spring.io/snapshot" } + maven { url "https://repo.spring.io/release" } + maven { url "https://repo.spring.io/milestone" } + maven { url "https://repo.spring.io/snapshot" } } dependencies { classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}") @@ -36,9 +36,9 @@ repositories { // NOTE: You should declare only repositories that you need here mavenLocal() mavenCentral() - maven { url "http://repo.spring.io/release" } - maven { url "http://repo.spring.io/milestone" } - maven { url "http://repo.spring.io/snapshot" } + maven { url "https://repo.spring.io/release" } + maven { url "https://repo.spring.io/milestone" } + maven { url "https://repo.spring.io/snapshot" } } dependencies { diff --git a/spring-boot-starters/spring-boot-starter-data-gemfire/pom.xml b/spring-boot-starters/spring-boot-starter-data-gemfire/pom.xml index 925b37c708b..50fbdaa4bb6 100644 --- a/spring-boot-starters/spring-boot-starter-data-gemfire/pom.xml +++ b/spring-boot-starters/spring-boot-starter-data-gemfire/pom.xml @@ -37,7 +37,7 @@ repo.spring.io - http://repo.spring.io/libs-release + https://repo.spring.io/libs-release true diff --git a/spring-boot-tools/spring-boot-antlib/src/it/sample/ivysettings.xml b/spring-boot-tools/spring-boot-antlib/src/it/sample/ivysettings.xml index 72631b8ba83..7db494eea25 100644 --- a/spring-boot-tools/spring-boot-antlib/src/it/sample/ivysettings.xml +++ b/spring-boot-tools/spring-boot-antlib/src/it/sample/ivysettings.xml @@ -8,9 +8,9 @@ - - - + + +