Skip to content

Commit 4900505

Browse files
wilkinsonawilkinsona
committed
Merge branch '2.0.x' into 2.1.x
2 parents 2c1bd6f + 507b00d commit 4900505

File tree

51 files changed

+61
-61
lines changed

Some content is hidden

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

51 files changed

+61
-61
lines changed

Diff for: ‎.settings-template.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
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>

Diff for: ‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/mappings/non-annotated.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<entity-mappings xmlns="http://xmlns.jcp.org/xml/ns/persistence/orm"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence/orm http://xmlns.jcp.org/xml/ns/persistence/orm_2_1.xsd"
4+
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence/orm https://www.oracle.com/webfolder/technetwork/jsc/xml/ns/persistence/orm_2_1.xsd"
55
version="2.1">
66
<entity class="org.springframework.boot.autoconfigure.orm.jpa.mapping.NonAnnotatedEntity">
77
<table name="NON_ANNOTATED"/>

Diff for: ‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/persistence.xml

+1-1
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>

Diff for: ‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/changelog/db.changelog-override.xml

+2-2
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">

Diff for: ‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/early-init-test.xml

+1-1
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}" />

Diff for: ‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/ehcache3.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
xmlns='http://www.ehcache.org/v3'
44
xmlns:jsr107='http://www.ehcache.org/v3/jsr107'
55
xsi:schemaLocation="
6-
http://www.ehcache.org/v3 http://www.ehcache.org/schema/ehcache-core-3.1.xsd
7-
http://www.ehcache.org/v3/jsr107 http://www.ehcache.org/schema/ehcache-107-ext-3.1.xsd">
6+
http://www.ehcache.org/v3 https://www.ehcache.org/schema/ehcache-core-3.1.xsd
7+
http://www.ehcache.org/v3/jsr107 https://www.ehcache.org/schema/ehcache-107-ext-3.1.xsd">
88

99
<cache-template name="example">
1010
<heap unit="entries">200</heap>

Diff for: ‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/condition/factorybean.xml

+1-1
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">

Diff for: ‎spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/condition/foo.xml

+1-1
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" />

Diff for: ‎spring-boot-project/spring-boot-cli/samples/runner.xml

+1-1
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

Diff for: ‎spring-boot-project/spring-boot-cli/src/main/assembly/jar-with-dependencies.xml

+1-1
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>

Diff for: ‎spring-boot-project/spring-boot-cli/src/test/resources/.m2/settings.xml

+2-2
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>

Diff for: ‎spring-boot-project/spring-boot-cli/src/test/resources/maven-settings/active-profile-repositories/.m2/settings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<mirrors>
44
<mirror>
55
<id>my-mirror</id>
6-
<url>http://maven.example.com/mirror</url>
6+
<url>https://maven.example.com/mirror</url>
77
<mirrorOf>my-server</mirrorOf>
88
</mirror>
99
</mirrors>

Diff for: ‎spring-boot-project/spring-boot-cli/src/test/resources/maven-settings/basic/.m2/settings.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<mirrors>
44
<mirror>
55
<id>my-mirror</id>
6-
<url>http://maven.example.com/mirror</url>
6+
<url>https://maven.example.com/mirror</url>
77
<mirrorOf>my-server</mirrorOf>
88
</mirror>
99
</mirrors>
@@ -39,7 +39,7 @@
3939
<repositories>
4040
<repository>
4141
<id>example-repository</id>
42-
<url>http://repo.example.com</url>
42+
<url>https://repo.example.com</url>
4343
</repository>
4444
</repositories>
4545
</profile>

Diff for: ‎spring-boot-project/spring-boot-cli/src/test/resources/maven-settings/encrypted/.m2/settings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<mirrors>
44
<mirror>
55
<id>my-mirror</id>
6-
<url>http://maven.example.com/mirror</url>
6+
<url>https://maven.example.com/mirror</url>
77
<mirrorOf>my-server</mirrorOf>
88
</mirror>
99
</mirrors>

Diff for: ‎spring-boot-project/spring-boot-cli/src/test/resources/maven-settings/property-interpolation/.m2/settings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
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
<localRepository>${foo}/repository</localRepository>
77

Diff for: ‎spring-boot-project/spring-boot-docs/src/main/docbook/xsl/xslthl-config.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
<highlighter id="properties" file="./xslthl/properties-hl.xml" />
2020
<highlighter id="json" file="./xslthl/json-hl.xml" />
2121
<highlighter id="yaml" file="./xslthl/yaml-hl.xml" />
22-
<namespace prefix="xslthl" uri="http://xslthl.sf.net" />
22+
<namespace prefix="xslthl" uri="http://xslthl.sourceforge.net/" />
2323
</xslthl-config>

Diff for: ‎spring-boot-project/spring-boot-docs/src/main/docbook/xsl/xslthl/bourne-hl.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Syntax highlighting definition for SH
55
66
xslthl - XSLT Syntax Highlighting
7-
http://sourceforge.net/projects/xslthl/
7+
https://sourceforge.net/projects/xslthl/
88
Copyright (C) 2010 Mathieu Malaterre
99
1010
This software is provided 'as-is', without any express or implied

Diff for: ‎spring-boot-project/spring-boot-docs/src/main/docbook/xsl/xslthl/c-hl.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Syntax highlighting definition for C
44
55
xslthl - XSLT Syntax Highlighting
6-
http://sourceforge.net/projects/xslthl/
6+
https://sourceforge.net/projects/xslthl/
77
Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks
88
99
This software is provided 'as-is', without any express or implied

Diff for: ‎spring-boot-project/spring-boot-docs/src/main/docbook/xsl/xslthl/cpp-hl.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Syntax highlighting definition for C++
55
66
xslthl - XSLT Syntax Highlighting
7-
http://sourceforge.net/projects/xslthl/
7+
https://sourceforge.net/projects/xslthl/
88
Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks
99
1010
This software is provided 'as-is', without any express or implied

Diff for: ‎spring-boot-project/spring-boot-docs/src/main/docbook/xsl/xslthl/csharp-hl.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Syntax highlighting definition for C#
55
66
xslthl - XSLT Syntax Highlighting
7-
http://sourceforge.net/projects/xslthl/
7+
https://sourceforge.net/projects/xslthl/
88
Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks
99
1010
This software is provided 'as-is', without any express or implied

Diff for: ‎spring-boot-project/spring-boot-docs/src/main/docbook/xsl/xslthl/css-hl.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Syntax highlighting definition for CSS files
55
66
xslthl - XSLT Syntax Highlighting
7-
http://sourceforge.net/projects/xslthl/
7+
https://sourceforge.net/projects/xslthl/
88
Copyright (C) 2011-2012 Martin Hujer, Michiel Hendriks
99
1010
This software is provided 'as-is', without any express or implied
@@ -26,7 +26,7 @@ freely, subject to the following restrictions:
2626
Martin Hujer <mhujer at users.sourceforge.net>
2727
Michiel Hendriks <elmuerte at users.sourceforge.net>
2828
29-
Reference: http://www.w3.org/TR/CSS21/propidx.html
29+
Reference: https://www.w3.org/TR/CSS21/propidx.html
3030
3131
-->
3232
<highlighters>

Diff for: ‎spring-boot-project/spring-boot-docs/src/main/docbook/xsl/xslthl/html-hl.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
myxml-hl.xml - konfigurace zvyraznovace XML, ktera zvlast zvyrazni
88
HTML elementy a XSL elementy
99
10-
This file has been customized for the Asciidoctor project (http://asciidoctor.org).
10+
This file has been customized for the Asciidoctor project (https://asciidoctor.org).
1111
-->
1212
<highlighters>
1313
<highlighter type="xml">

Diff for: ‎spring-boot-project/spring-boot-docs/src/main/docbook/xsl/xslthl/ini-hl.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Syntax highlighting definition for ini files
55
66
xslthl - XSLT Syntax Highlighting
7-
http://sourceforge.net/projects/xslthl/
7+
https://sourceforge.net/projects/xslthl/
88
Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks
99
1010
This software is provided 'as-is', without any express or implied

Diff for: ‎spring-boot-project/spring-boot-docs/src/main/docbook/xsl/xslthl/java-hl.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Syntax highlighting definition for Java
55
66
xslthl - XSLT Syntax Highlighting
7-
http://sourceforge.net/projects/xslthl/
7+
https://sourceforge.net/projects/xslthl/
88
Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks
99
1010
This software is provided 'as-is', without any express or implied

Diff for: ‎spring-boot-project/spring-boot-docs/src/main/docbook/xsl/xslthl/javascript-hl.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Syntax highlighting definition for JavaScript
55
66
xslthl - XSLT Syntax Highlighting
7-
http://sourceforge.net/projects/xslthl/
7+
https://sourceforge.net/projects/xslthl/
88
Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks
99
1010
This software is provided 'as-is', without any express or implied

Diff for: ‎spring-boot-project/spring-boot-docs/src/main/docbook/xsl/xslthl/perl-hl.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Syntax highlighting definition for Perl
55
66
xslthl - XSLT Syntax Highlighting
7-
http://sourceforge.net/projects/xslthl/
7+
https://sourceforge.net/projects/xslthl/
88
Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks
99
1010
This software is provided 'as-is', without any express or implied

Diff for: ‎spring-boot-project/spring-boot-docs/src/main/docbook/xsl/xslthl/php-hl.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Syntax highlighting definition for PHP
55
66
xslthl - XSLT Syntax Highlighting
7-
http://sourceforge.net/projects/xslthl/
7+
https://sourceforge.net/projects/xslthl/
88
Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks
99
1010
This software is provided 'as-is', without any express or implied

Diff for: ‎spring-boot-project/spring-boot-docs/src/main/docbook/xsl/xslthl/properties-hl.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Syntax highlighting definition for Java
55
66
xslthl - XSLT Syntax Highlighting
7-
http://sourceforge.net/projects/xslthl/
7+
https://sourceforge.net/projects/xslthl/
88
Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks
99
1010
This software is provided 'as-is', without any express or implied

Diff for: ‎spring-boot-project/spring-boot-docs/src/main/docbook/xsl/xslthl/python-hl.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Syntax highlighting definition for Python
55
66
xslthl - XSLT Syntax Highlighting
7-
http://sourceforge.net/projects/xslthl/
7+
https://sourceforge.net/projects/xslthl/
88
Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks
99
1010
This software is provided 'as-is', without any express or implied

Diff for: ‎spring-boot-project/spring-boot-docs/src/main/docbook/xsl/xslthl/ruby-hl.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Syntax highlighting definition for Ruby
55
66
xslthl - XSLT Syntax Highlighting
7-
http://sourceforge.net/projects/xslthl/
7+
https://sourceforge.net/projects/xslthl/
88
Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks
99
1010
This software is provided 'as-is', without any express or implied

Diff for: ‎spring-boot-project/spring-boot-docs/src/main/docbook/xsl/xslthl/sql2003-hl.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Syntax highlighting definition for SQL:1999
55
66
xslthl - XSLT Syntax Highlighting
7-
http://sourceforge.net/projects/xslthl/
7+
https://sourceforge.net/projects/xslthl/
88
Copyright (C) 2012 Michiel Hendriks, Martin Hujer, k42b3
99
1010
This software is provided 'as-is', without any express or implied

Diff for: ‎spring-boot-project/spring-boot-starters/src/main/assembly/starter-poms-assembly.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
22
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
3+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 https://maven.apache.org/xsd/assembly-1.1.3.xsd">
44
<id>starter-poms</id>
55
<formats>
66
<format>zip</format>

Diff for: ‎spring-boot-project/spring-boot-test/src/test/resources/org/springframework/boot/test/SpringApplicationConfigurationXmlConventionConfigurationTests-context.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
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" xmlns:context="http://www.springframework.org/schema/context"
4-
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
5-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
4+
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
5+
http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd">
66

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

Diff for: ‎spring-boot-project/spring-boot-test/src/test/resources/org/springframework/boot/test/context/SpringBootTestXmlConventionConfigurationTests-context.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
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" xmlns:context="http://www.springframework.org/schema/context"
4-
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
5-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
4+
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
5+
http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd">
66

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

Diff for: ‎spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-jar/src/main/assembly/jar-with-dependencies.xml

+1-1
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>

Diff for: ‎spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-props-lib/src/main/assembly/app.xml

+1-1
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>app</id>
77
<formats>
88
<format>jar</format>

Diff for: ‎spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-props-lib/src/main/assembly/dependencies.xml

+1-1
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>dependencies</id>
77
<formats>
88
<format>jar</format>

Diff for: ‎spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-props/src/main/assembly/jar-with-dependencies.xml

+1-1
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>

Diff for: ‎spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/resources/root/META-INF/spring/application.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
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
</beans>

Diff for: ‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/site.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<project xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
2+
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 https://maven.apache.org/xsd/decoration-1.0.0.xsd">
33
<body>
44
<menu name="Overview">
55
<item name="Introduction" href="index.html"/>

Diff for: ‎spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/context/embedded/tomcat/empty-web.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
5-
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
5+
https://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
66
</web-app>

Diff for: ‎spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/context/properties/testProperties.xml

+1-1
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
77
id="org.springframework.boot.context.properties.ConfigurationPropertiesTests$BasicProperties"

0 commit comments

Comments
 (0)