Skip to content

Commit 214e028

Browse files
wilkinsonawilkinsona
committed
Start work on Spring Boot 3.5
1 parent 383f196 commit 214e028

File tree

11 files changed

+111
-11
lines changed

11 files changed

+111
-11
lines changed

‎.github/workflows/build-and-deploy-snapshot.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Deploy
2828
uses: spring-io/artifactory-deploy-action@dc1913008c0599f0c4b1fdafb6ff3c502b3565ea # v0.0.2
2929
with:
30-
build-name: ${{ vars.COMMERCIAL && format('spring-boot-commercial-{0}', '3.4.x') || format('spring-boot-{0}', '3.4.x') }}
30+
build-name: ${{ vars.COMMERCIAL && format('spring-boot-commercial-{0}', '3.5.x') || format('spring-boot-{0}', '3.5.x') }}
3131
folder: 'deployment-repository'
3232
password: ${{ vars.COMMERCIAL && secrets.COMMERCIAL_ARTIFACTORY_PASSWORD || secrets.ARTIFACTORY_PASSWORD }}
3333
project: ${{ vars.COMMERCIAL && 'spring' }}

‎eclipse/spring-boot-project.setup‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0"
1212
xmlns:workingsets="http://www.eclipse.org/oomph/workingsets/1.0"
1313
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/buildship/oomph/1.0 https://raw.githubusercontent.com/eclipse/buildship/master/org.eclipse.buildship.oomph/model/GradleImport-1.0.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"
14-
name="spring.boot.3.4.x"
15-
label="Spring Boot 3.4.x">
14+
name="spring.boot.3.5.x"
15+
label="Spring Boot 3.5.x">
1616
<setupTask
1717
xsi:type="setup:VariableTask"
1818
type="FOLDER"

‎git/hooks/prepare-forward-merge‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ require 'net/http'
44
require 'yaml'
55
require 'logger'
66

7-
$main_branch = "3.4.x"
7+
$main_branch = "3.5.x"
88

99
$log = Logger.new(STDOUT)
1010
$log.level = Logger::WARN

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version=3.4.2-SNAPSHOT
1+
version=3.5.0-SNAPSHOT
22
latestVersion=true
33
spring.build-type=oss
44

‎spring-boot-project/spring-boot-dependencies/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ description = "Spring Boot Dependencies"
88
bom {
99
effectiveBomArtifact()
1010
upgrade {
11-
policy = "same-minor-version"
11+
policy = "same-major-version"
1212
gitHub {
1313
issueLabels = ["type: dependency-upgrade"]
1414
}

‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/jar-layered-custom/jar/src/layers.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<layers xmlns="http://www.springframework.org/schema/boot/layers"
22
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="http://www.springframework.org/schema/boot/layers
4-
https://www.springframework.org/schema/layers/layers-3.3.xsd">
4+
https://www.springframework.org/schema/layers/layers-3.5.xsd">
55
<application>
66
<into layer="configuration">
77
<include>**/application*.*</include>

‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/war-layered-custom/war/src/layers.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<layers xmlns="http://www.springframework.org/schema/boot/layers"
22
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="http://www.springframework.org/schema/boot/layers
4-
https://www.springframework.org/schema/layers/layers-3.3.xsd">
4+
https://www.springframework.org/schema/layers/layers-3.5.xsd">
55
<application>
66
<into layer="configuration">
77
<include>**/application*.*</include>

‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/xsd/layers-3.5.xsd‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<xsd:schema elementFormDefault="qualified"
3+
xmlns="http://www.springframework.org/schema/boot/layers"
4+
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
5+
targetNamespace="http://www.springframework.org/schema/boot/layers">
6+
<xsd:element name="layers" type="layersType" />
7+
<xsd:complexType name="layersType">
8+
<xsd:sequence>
9+
<xsd:element name="application" type="applicationType" minOccurs="0"/>
10+
<xsd:element name="dependencies" type="dependenciesType" minOccurs="0"/>
11+
<xsd:element name="layerOrder" type="layerOrderType" minOccurs="0"/>
12+
</xsd:sequence>
13+
</xsd:complexType>
14+
<xsd:complexType name="applicationType">
15+
<xsd:annotation>
16+
<xsd:documentation><![CDATA[
17+
The 'into layer' selections that should be applied to application classes and resources.
18+
]]></xsd:documentation>
19+
</xsd:annotation>
20+
<xsd:sequence maxOccurs="unbounded">
21+
<xsd:element name="into" type="intoType" />
22+
</xsd:sequence>
23+
</xsd:complexType>
24+
<xsd:complexType name="dependenciesType">
25+
<xsd:annotation>
26+
<xsd:documentation><![CDATA[
27+
The 'into layer' selections that should be applied to dependencies.
28+
]]></xsd:documentation>
29+
</xsd:annotation>
30+
<xsd:sequence maxOccurs="unbounded">
31+
<xsd:element name="into" type="dependenciesIntoType" />
32+
</xsd:sequence>
33+
</xsd:complexType>
34+
<xsd:complexType name="layerOrderType">
35+
<xsd:annotation>
36+
<xsd:documentation><![CDATA[
37+
The order that layers should be added (starting with the least frequently changed layer).
38+
]]></xsd:documentation>
39+
</xsd:annotation>
40+
<xsd:sequence>
41+
<xsd:element name="layer" maxOccurs="unbounded">
42+
<xsd:annotation>
43+
<xsd:documentation><![CDATA[
44+
The layer name.
45+
]]></xsd:documentation>
46+
</xsd:annotation>
47+
<xsd:simpleType>
48+
<xsd:restriction base="xsd:string">
49+
<xsd:minLength value="1" />
50+
</xsd:restriction>
51+
</xsd:simpleType>
52+
</xsd:element>
53+
</xsd:sequence>
54+
</xsd:complexType>
55+
<xsd:complexType name="intoType">
56+
<xsd:choice maxOccurs="unbounded">
57+
<xsd:element type="xsd:string" name="include"
58+
minOccurs="0" maxOccurs="unbounded">
59+
<xsd:annotation>
60+
<xsd:documentation><![CDATA[
61+
Pattern of the elements to include.
62+
]]></xsd:documentation>
63+
</xsd:annotation>
64+
</xsd:element>
65+
<xsd:element type="xsd:string" name="exclude"
66+
minOccurs="0" maxOccurs="unbounded">
67+
<xsd:annotation>
68+
<xsd:documentation><![CDATA[
69+
Pattern of the elements to exclude.
70+
]]></xsd:documentation>
71+
</xsd:annotation>
72+
</xsd:element>
73+
</xsd:choice>
74+
<xsd:attribute type="xsd:string" name="layer"
75+
use="required" />
76+
</xsd:complexType>
77+
<xsd:complexType name="dependenciesIntoType">
78+
<xsd:complexContent>
79+
<xsd:extension base="intoType">
80+
<xsd:choice minOccurs="0">
81+
<xsd:element type="xsd:string" name="includeModuleDependencies" minOccurs="0">
82+
<xsd:annotation>
83+
<xsd:documentation><![CDATA[
84+
Include dependencies on other modules in the build.
85+
]]></xsd:documentation>
86+
</xsd:annotation>
87+
</xsd:element>
88+
<xsd:element type="xsd:string" name="excludeModuleDependencies" minOccurs="0">
89+
<xsd:annotation>
90+
<xsd:documentation><![CDATA[
91+
Exclude dependencies on other modules in the build.
92+
]]></xsd:documentation>
93+
</xsd:annotation>
94+
</xsd:element>
95+
</xsd:choice>
96+
</xsd:extension>
97+
</xsd:complexContent>
98+
</xsd:complexType>
99+
100+
</xsd:schema>

‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/dependencies-layer-no-filter.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<layers xmlns="http://www.springframework.org/schema/boot/layers"
22
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="http://www.springframework.org/schema/boot/layers
4-
https://www.springframework.org/schema/boot/layers/layers-3.3.xsd">
4+
https://www.springframework.org/schema/boot/layers/layers-3.5.xsd">
55
<dependencies>
66
<into layer="my-deps" />
77
</dependencies>

‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/layers.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<layers xmlns="http://www.springframework.org/schema/boot/layers"
22
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="http://www.springframework.org/schema/boot/layers
4-
https://www.springframework.org/schema/boot/layers/layers-3.3.xsd">
4+
https://www.springframework.org/schema/boot/layers/layers-3.5.xsd">
55
<application>
66
<into layer="my-resources">
77
<include>META-INF/resources/**</include>

0 commit comments

Comments
 (0)