Skip to content

Commit a732aca

Browse files
committed
Merge pull request #16311 from Spring Operator
* gh-16311: Polish "Use HTTPS for external links from XML files where possible" Use HTTPS for external links from XML files where possible
2 parents 7b044b2 + 24afa59 commit a732aca

File tree

48 files changed

+75
-75
lines changed

Some content is hidden

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

48 files changed

+75
-75
lines changed

.settings-template.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
22
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
3+
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 https://maven.apache.org/xsd/settings-1.0.0.xsd">
44
<profiles>
55
<profile>
66
<id>snapshot</id>
77
<repositories>
88
<repository>
99
<id>spring-ext</id>
10-
<url>http://repo.spring.io/ext-release-local/</url>
10+
<url>https://repo.spring.io/ext-release-local/</url>
1111
<releases>
1212
<enabled>true</enabled>
1313
</releases>
@@ -18,15 +18,15 @@
1818
<repository>
1919
<id>spring-milestones</id>
2020
<name>Spring Milestones</name>
21-
<url>http://repo.spring.io/milestone</url>
21+
<url>https://repo.spring.io/milestone</url>
2222
<snapshots>
2323
<enabled>false</enabled>
2424
</snapshots>
2525
</repository>
2626
<repository>
2727
<id>spring-snapshots</id>
2828
<name>Spring Snapshots</name>
29-
<url>http://repo.spring.io/snapshot</url>
29+
<url>https://repo.spring.io/snapshot</url>
3030
<snapshots>
3131
<enabled>true</enabled>
3232
</snapshots>
@@ -46,15 +46,15 @@
4646
<pluginRepository>
4747
<id>spring-milestones</id>
4848
<name>Spring Milestones</name>
49-
<url>http://repo.spring.io/milestone</url>
49+
<url>https://repo.spring.io/milestone</url>
5050
<snapshots>
5151
<enabled>false</enabled>
5252
</snapshots>
5353
</pluginRepository>
5454
<pluginRepository>
5555
<id>spring-snapshots</id>
5656
<name>Spring Snapshots</name>
57-
<url>http://repo.spring.io/snapshot</url>
57+
<url>https://repo.spring.io/snapshot</url>
5858
<snapshots>
5959
<enabled>true</enabled>
6060
</snapshots>
@@ -66,7 +66,7 @@
6666
<repositories>
6767
<repository>
6868
<id>spring-ext</id>
69-
<url>http://repo.spring.io/ext-release-local/</url>
69+
<url>https://repo.spring.io/ext-release-local/</url>
7070
<releases>
7171
<enabled>true</enabled>
7272
</releases>
@@ -87,7 +87,7 @@
8787
<repository>
8888
<id>spring-milestones</id>
8989
<name>Spring Milestones</name>
90-
<url>http://repo.spring.io/milestone</url>
90+
<url>https://repo.spring.io/milestone</url>
9191
<snapshots>
9292
<enabled>false</enabled>
9393
</snapshots>
@@ -97,7 +97,7 @@
9797
<pluginRepository>
9898
<id>spring-milestones</id>
9999
<name>Spring Milestones</name>
100-
<url>http://repo.spring.io/snapshot</url>
100+
<url>https://repo.spring.io/snapshot</url>
101101
<snapshots>
102102
<enabled>false</enabled>
103103
</snapshots>
@@ -109,7 +109,7 @@
109109
<repositories>
110110
<repository>
111111
<id>spring-ext</id>
112-
<url>http://repo.spring.io/ext-release-local/</url>
112+
<url>https://repo.spring.io/ext-release-local/</url>
113113
<releases>
114114
<enabled>true</enabled>
115115
</releases>

spring-boot-autoconfigure/src/test/resources/META-INF/persistence.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
2+
<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence https://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
33
<persistence-unit name="manually-configured">
44
<class>org.springframework.boot.autoconfigure.orm.jpa.test.City</class>
55
<exclude-unlisted-classes>true</exclude-unlisted-classes>

spring-boot-autoconfigure/src/test/resources/db/changelog/db.changelog-override.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
55
xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
6-
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.0.xsd
7-
http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
6+
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.0.xsd
7+
http://www.liquibase.org/xml/ns/dbchangelog-ext https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
88

99
<changeSet id="1" author="marceloverdijk">
1010
<createTable tableName="customer">

spring-boot-autoconfigure/src/test/resources/early-init-test.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<beans xmlns="http://www.springframework.org/schema/beans"
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
5+
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
66

77
<bean id="earlyInit" class="org.springframework.boot.autoconfigure.EarlyInitFactoryBean" >
88
<property name="propertyFromConfig" value="${foo}" />

spring-boot-autoconfigure/src/test/resources/infinispan.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="urn:infinispan:config:7.1 http://www.infinispan.org/schemas/infinispan-config-7.1.xsd"
3+
xsi:schemaLocation="urn:infinispan:config:7.1 https://infinispan.org/schemas/infinispan-config-7.1.xsd"
44
xmlns="urn:infinispan:config:7.1">
55

66
<!-- ************************************** -->

spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/condition/factorybean.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<beans xmlns="http://www.springframework.org/schema/beans"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
4+
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
55

66
<bean id="example"
77
class="org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBeanTests.ExampleFactoryBean">

spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/condition/foo.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<beans xmlns="http://www.springframework.org/schema/beans"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
4+
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
55

66
<bean id="foo" class="java.lang.String">
77
<constructor-arg value="foo" />

spring-boot-cli/samples/runner.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<beans xmlns="http://www.springframework.org/schema/beans"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
4+
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
55

66
<bean id="runner" class="org.test.Runner"/>
77

spring-boot-cli/src/main/assembly/jar-with-dependencies.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<assembly
33
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
5+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 https://maven.apache.org/xsd/assembly-1.1.2.xsd">
66
<id>full</id>
77
<formats>
88
<format>jar</format>

spring-boot-cli/src/test/resources/.m2/settings.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
22
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
4-
http://maven.apache.org/xsd/settings-1.0.0.xsd">
4+
https://maven.apache.org/xsd/settings-1.0.0.xsd">
55

66
<mirrors>
77
<mirror>
88
<id>central-mirror</id>
9-
<url>http://central-mirror.example.com/maven2</url>
9+
<url>https://central-mirror.example.com/maven2</url>
1010
<mirrorOf>central</mirrorOf>
1111
</mirror>
1212
</mirrors>

0 commit comments

Comments
 (0)