Skip to content

Commit d8f8ae8

Browse files
wilkinsonawilkinsona
committed
Merge pull request #16245 from Spring Operator
* gh-16245: Polish "Update build and setup configuration to use HTTPS" Update build and setup configuration to use HTTPS Closes gh-16245
2 parents 6f87975 + c2002e7 commit d8f8ae8

File tree

240 files changed

+618
-642
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

240 files changed

+618
-642
lines changed

‎eclipse/spring-boot-project.setup

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<setup:Project
33
xmi:version="2.0"
4-
xmlns:xmi="http://www.omg.org/XMI"
4+
xmlns:xmi="https://www.omg.org/XMI"
55
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
66
xmlns:jdt="http://www.eclipse.org/oomph/setup/jdt/1.0"
77
xmlns:maven="http://www.eclipse.org/oomph/setup/maven/1.0"
88
xmlns:predicates="http://www.eclipse.org/oomph/predicates/1.0"
9-
xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
10-
xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0"
9+
xmlns:setup="https://www.eclipse.org/oomph/setup/1.0"
10+
xmlns:setup.p2="https://www.eclipse.org/oomph/setup/p2/1.0"
1111
xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0"
1212
xmlns:workingsets="http://www.eclipse.org/oomph/workingsets/1.0"
13-
xsi:schemaLocation="http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/maven/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Maven.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore http://www.eclipse.org/oomph/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/WorkingSets.ecore"
13+
xsi:schemaLocation="http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/maven/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Maven.ecore http://www.eclipse.org/oomph/predicates/1.0 https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore http://www.eclipse.org/oomph/workingsets/1.0 https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/WorkingSets.ecore"
1414
name="spring.boot.1.5.x"
1515
label="Spring Boot 1.5.x">
1616
<setupTask
@@ -60,8 +60,6 @@
6060
name="org.eclipse.platform.feature.group"/>
6161
<requirement
6262
name="org.eclipse.jdt.feature.group"/>
63-
<requirement
64-
name="AnyEditTools.feature.group"/>
6563
<requirement
6664
name="io.spring.javaformat.eclipse.feature.feature.group"/>
6765
<requirement
@@ -79,17 +77,15 @@
7977
<requirement
8078
name="org.sonatype.m2e.buildhelper.feature.feature.group"/>
8179
<repository
82-
url="http://download.eclipse.org/technology/epp/packages/oxygen/R/"/>
83-
<repository
84-
url="http://download.eclipse.org/releases/oxygen/"/>
80+
url="https://download.eclipse.org/technology/epp/packages/oxygen/R/"/>
8581
<repository
86-
url="http://andrei.gmxhome.de/eclipse/"/>
82+
url="https://download.eclipse.org/releases/oxygen/"/>
8783
<repository
8884
url="https://dl.bintray.com/spring/javaformat-eclipse/"/>
8985
<repository
90-
url="http://download.eclipse.org/egit/github/updates/"/>
86+
url="https://download.eclipse.org/egit/github/updates/"/>
9187
<repository
92-
url="http://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-buildhelper/0.15.0/N/0.15.0.201207090124/"/>
88+
url="https://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-buildhelper/0.15.0/N/0.15.0.201207090124/"/>
9389
<description>
9490
Install the tools needed in the IDE to work with the
9591
source code for ${scope.project.label}
@@ -153,18 +149,6 @@
153149
pattern="spring-boot-.*-test.*"/>
154150
</workingSet>
155151
</setupTask>
156-
<setupTask
157-
xsi:type="setup:CompoundTask"
158-
name="de.loskutov.anyedit.AnyEditTools">
159-
<setupTask
160-
xsi:type="setup:PreferenceTask"
161-
key="/instance/de.loskutov.anyedit.AnyEditTools/org.eclipse.jdt.ui.editor.tab.width"
162-
value="4"/>
163-
<setupTask
164-
xsi:type="setup:PreferenceTask"
165-
key="/instance/de.loskutov.anyedit.AnyEditTools/saveAndAddLine"
166-
value="true"/>
167-
</setupTask>
168152
<setupTask
169153
xsi:type="setup:CompoundTask"
170154
name="org.eclipse.jdt.ui">

‎mvnw

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# "License"); you may not use this file except in compliance
99
# with the License. You may obtain a copy of the License at
1010
#
11-
# http://www.apache.org/licenses/LICENSE-2.0
11+
# https://www.apache.org/licenses/LICENSE-2.0
1212
#
1313
# Unless required by applicable law or agreed to in writing,
1414
# software distributed under the License is distributed on an

‎mvnw.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
@REM "License"); you may not use this file except in compliance
88
@REM with the License. You may obtain a copy of the License at
99
@REM
10-
@REM http://www.apache.org/licenses/LICENSE-2.0
10+
@REM https://www.apache.org/licenses/LICENSE-2.0
1111
@REM
1212
@REM Unless required by applicable law or agreed to in writing,
1313
@REM software distributed under the License is distributed on an

‎pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>org.springframework.boot</groupId>
55
<artifactId>spring-boot-build</artifactId>
66
<version>1.5.20.BUILD-SNAPSHOT</version>
77
<packaging>pom</packaging>
88
<name>Spring Boot Build</name>
99
<description>Spring Boot Build</description>
10-
<url>http://projects.spring.io/spring-boot/</url>
10+
<url>https://projects.spring.io/spring-boot/</url>
1111
<organization>
1212
<name>Pivotal Software, Inc.</name>
13-
<url>http://www.spring.io</url>
13+
<url>https://www.spring.io</url>
1414
</organization>
1515
<licenses>
1616
<license>
1717
<name>Apache License, Version 2.0</name>
18-
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
18+
<url>https://www.apache.org/licenses/LICENSE-2.0</url>
1919
</license>
2020
</licenses>
2121
<scm>
@@ -27,7 +27,7 @@
2727
<name>Phillip Webb</name>
2828
<email>pwebb at pivotal.io</email>
2929
<organization>Pivotal Software, Inc.</organization>
30-
<organizationUrl>http://www.spring.io</organizationUrl>
30+
<organizationUrl>https://www.spring.io</organizationUrl>
3131
<roles>
3232
<role>Project lead</role>
3333
</roles>
@@ -37,7 +37,7 @@
3737
<name>Dave Syer</name>
3838
<email>dsyer at pivotal.io</email>
3939
<organization>Pivotal Software, Inc.</organization>
40-
<organizationUrl>http://www.spring.io</organizationUrl>
40+
<organizationUrl>https://www.spring.io</organizationUrl>
4141
<roles>
4242
<role>Project lead</role>
4343
</roles>

‎spring-boot-actuator-docs/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
55
<groupId>org.springframework.boot</groupId>
@@ -12,7 +12,7 @@
1212
<description>Spring Boot Actuator Docs</description>
1313
<organization>
1414
<name>Pivotal Software, Inc.</name>
15-
<url>http://www.spring.io</url>
15+
<url>https://www.spring.io</url>
1616
</organization>
1717
<properties>
1818
<main.basedir>${basedir}/..</main.basedir>

‎spring-boot-actuator/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
55
<groupId>org.springframework.boot</groupId>
@@ -10,10 +10,10 @@
1010
<artifactId>spring-boot-actuator</artifactId>
1111
<name>Spring Boot Actuator</name>
1212
<description>Spring Boot Actuator</description>
13-
<url>http://projects.spring.io/spring-boot/</url>
13+
<url>https://projects.spring.io/spring-boot/</url>
1414
<organization>
1515
<name>Pivotal Software, Inc.</name>
16-
<url>http://www.spring.io</url>
16+
<url>https://www.spring.io</url>
1717
</organization>
1818
<properties>
1919
<main.basedir>${basedir}/..</main.basedir>

‎spring-boot-autoconfigure/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
55
<groupId>org.springframework.boot</groupId>
@@ -10,10 +10,10 @@
1010
<artifactId>spring-boot-autoconfigure</artifactId>
1111
<name>Spring Boot AutoConfigure</name>
1212
<description>Spring Boot AutoConfigure</description>
13-
<url>http://projects.spring.io/spring-boot/</url>
13+
<url>https://projects.spring.io/spring-boot/</url>
1414
<organization>
1515
<name>Pivotal Software, Inc.</name>
16-
<url>http://www.spring.io</url>
16+
<url>https://www.spring.io</url>
1717
</organization>
1818
<properties>
1919
<main.basedir>${basedir}/..</main.basedir>

‎spring-boot-cli/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
55
<groupId>org.springframework.boot</groupId>
@@ -10,10 +10,10 @@
1010
<artifactId>spring-boot-cli</artifactId>
1111
<name>Spring Boot CLI</name>
1212
<description>Spring Boot CLI</description>
13-
<url>http://projects.spring.io/spring-boot/</url>
13+
<url>https://projects.spring.io/spring-boot/</url>
1414
<organization>
1515
<name>Pivotal Software, Inc.</name>
16-
<url>http://www.spring.io</url>
16+
<url>https://www.spring.io</url>
1717
</organization>
1818
<properties>
1919
<main.basedir>${basedir}/..</main.basedir>

‎spring-boot-dependencies/pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>org.springframework.boot</groupId>
55
<artifactId>spring-boot-dependencies</artifactId>
66
<version>1.5.20.BUILD-SNAPSHOT</version>
77
<packaging>pom</packaging>
88
<name>Spring Boot Dependencies</name>
99
<description>Spring Boot Dependencies</description>
10-
<url>http://projects.spring.io/spring-boot/</url>
10+
<url>https://projects.spring.io/spring-boot/</url>
1111
<organization>
1212
<name>Pivotal Software, Inc.</name>
13-
<url>http://www.spring.io</url>
13+
<url>https://www.spring.io</url>
1414
</organization>
1515
<licenses>
1616
<license>
1717
<name>Apache License, Version 2.0</name>
18-
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
18+
<url>https://www.apache.org/licenses/LICENSE-2.0</url>
1919
</license>
2020
</licenses>
2121
<scm>
@@ -27,7 +27,7 @@
2727
<name>Phillip Webb</name>
2828
<email>pwebb at pivotal.io</email>
2929
<organization>Pivotal Software, Inc.</organization>
30-
<organizationUrl>http://www.spring.io</organizationUrl>
30+
<organizationUrl>https://www.spring.io</organizationUrl>
3131
<roles>
3232
<role>Project lead</role>
3333
</roles>
@@ -37,7 +37,7 @@
3737
<name>Dave Syer</name>
3838
<email>dsyer at pivotal.io</email>
3939
<organization>Pivotal Software, Inc.</organization>
40-
<organizationUrl>http://www.spring.io</organizationUrl>
40+
<organizationUrl>https://www.spring.io</organizationUrl>
4141
<roles>
4242
<role>Project lead</role>
4343
</roles>

‎spring-boot-deployment-tests/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
55
<groupId>org.springframework.boot</groupId>
@@ -11,10 +11,10 @@
1111
<packaging>pom</packaging>
1212
<name>Spring Boot Deployment Tests</name>
1313
<description>Spring Boot Deployment Tests</description>
14-
<url>http://projects.spring.io/spring-boot/</url>
14+
<url>https://projects.spring.io/spring-boot/</url>
1515
<organization>
1616
<name>Pivotal Software, Inc.</name>
17-
<url>http://www.spring.io</url>
17+
<url>https://www.spring.io</url>
1818
</organization>
1919
<properties>
2020
<main.basedir>${basedir}/..</main.basedir>

0 commit comments

Comments
 (0)