Skip to content

Commit cfc6cb4

Browse files
wilkinsonawilkinsona
committed
Prepare branch for early work on 4.0
1 parent 682dbe9 commit cfc6cb4

File tree

11 files changed

+110
-50
lines changed

11 files changed

+110
-50
lines changed

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

+2-13
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Build and Deploy Snapshot
22
on:
33
push:
44
branches:
5-
- main
5+
- 4.0.x
66
concurrency:
77
group: ${{ github.workflow }}-${{ github.ref }}
88
jobs:
@@ -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.5.x') || format('spring-boot-{0}', '3.5.x') }}
30+
build-name: ${{ vars.COMMERCIAL && format('spring-boot-commercial-{0}', '4.0.x') || format('spring-boot-{0}', '4.0.x') }}
3131
folder: 'deployment-repository'
3232
password: ${{ vars.COMMERCIAL && secrets.COMMERCIAL_ARTIFACTORY_PASSWORD || secrets.ARTIFACTORY_PASSWORD }}
3333
project: ${{ vars.COMMERCIAL && 'spring' }}
@@ -46,17 +46,6 @@ jobs:
4646
webhook-url: ${{ secrets.GOOGLE_CHAT_WEBHOOK_URL }}
4747
outputs:
4848
version: ${{ steps.build-and-publish.outputs.version }}
49-
trigger-docs-build:
50-
name: Trigger Docs Build
51-
needs: build-and-deploy-snapshot
52-
permissions:
53-
actions: write
54-
runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
55-
steps:
56-
- name: Run Deploy Docs Workflow
57-
env:
58-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
59-
run: gh workflow run deploy-docs.yml --repo spring-projects/spring-boot -r docs-build -f build-refname=${{ github.ref_name }} -f build-version=${{ needs.build-and-deploy-snapshot.outputs.version }}
6049
verify:
6150
name: Verify
6251
needs: build-and-deploy-snapshot

‎.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: CI
22
on:
33
push:
44
branches:
5-
- main
5+
- 4.0.x
66
jobs:
77
ci:
88
name: '${{ matrix.os.name}} | Java ${{ matrix.java.version}}'

‎.github/workflows/run-system-tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Run System Tests
22
on:
33
push:
44
branches:
5-
- main
5+
- 4.0.x
66
jobs:
77
run-system-tests:
88
name: 'Java ${{ matrix.java.version}}'

‎.github/workflows/trigger-docs-build.yml

-29
This file was deleted.

‎gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version=3.5.0-SNAPSHOT
1+
version=4.0.0-SNAPSHOT
22
latestVersion=true
33
spring.build-type=oss
44

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

+1-1
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.5.xsd">
4+
https://www.springframework.org/schema/layers/layers-4.0.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

+1-1
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.5.xsd">
4+
https://www.springframework.org/schema/layers/layers-4.0.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-4.0.xsd

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

+1-1
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.5.xsd">
4+
https://www.springframework.org/schema/boot/layers/layers-4.0.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

+1-1
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.5.xsd">
4+
https://www.springframework.org/schema/boot/layers/layers-4.0.xsd">
55
<application>
66
<into layer="my-resources">
77
<include>META-INF/resources/**</include>

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

+1-1
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.5.xsd">
4+
https://www.springframework.org/schema/boot/layers/layers-4.0.xsd">
55
<application>
66
<into layer="my-layer" />
77
</application>

0 commit comments

Comments
 (0)