From 63abaa4cd2e84f6ee2aa5274fe97b67121f08c48 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <wilkinsona@vmware.com>
Date: Mon, 23 Jan 2023 11:52:32 +0000
Subject: [PATCH] Start working on 3.1.0

---
 README.adoc                                   |   2 +-
 ci/README.adoc                                |   2 +-
 ci/parameters.yml                             |   2 +-
 ci/pipeline.yml                               |   4 +-
 eclipse/spring-boot-project.setup             |   4 +-
 git/hooks/prepare-forward-merge               |   2 +-
 gradle.properties                             |   2 +-
 .../jar-layered-custom/jar/src/layers.xml     |   2 +-
 .../war-layered-custom/war/src/layers.xml     |   2 +-
 .../src/main/xsd/layers-3.1.xsd               | 100 ++++++++++++++++++
 .../dependencies-layer-no-filter.xml          |   2 +-
 .../src/test/resources/layers.xml             |   4 +-
 .../resources/resource-layer-no-filter.xml    |   2 +-
 13 files changed, 115 insertions(+), 15 deletions(-)
 create mode 100644 spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/xsd/layers-3.1.xsd

diff --git a/README.adoc b/README.adoc
index d4ff285819..b0e635135a 100755
--- a/README.adoc
+++ b/README.adoc
@@ -1,4 +1,4 @@
-= Spring Boot image:https://ci.spring.io/api/v1/teams/spring-boot/pipelines/spring-boot-3.0.x/jobs/build/badge["Build Status", link="https://ci.spring.io/teams/spring-boot/pipelines/spring-boot-3.0.x?groups=Build"] image:https://badges.gitter.im/Join Chat.svg["Chat",link="https://gitter.im/spring-projects/spring-boot?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"] image:https://img.shields.io/badge/Revved%20up%20by-Gradle%20Enterprise-06A0CE?logo=Gradle&labelColor=02303A["Revved up by Gradle Enterprise", link="https://ge.spring.io/scans?&search.rootProjectNames=Spring%20Boot%20Build&search.rootProjectNames=spring-boot-build"]
+= Spring Boot image:https://ci.spring.io/api/v1/teams/spring-boot/pipelines/spring-boot-3.1.x/jobs/build/badge["Build Status", link="https://ci.spring.io/teams/spring-boot/pipelines/spring-boot-3.1.x?groups=Build"] image:https://badges.gitter.im/Join Chat.svg["Chat",link="https://gitter.im/spring-projects/spring-boot?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"] image:https://img.shields.io/badge/Revved%20up%20by-Gradle%20Enterprise-06A0CE?logo=Gradle&labelColor=02303A["Revved up by Gradle Enterprise", link="https://ge.spring.io/scans?&search.rootProjectNames=Spring%20Boot%20Build&search.rootProjectNames=spring-boot-build"]
 :docs: https://docs.spring.io/spring-boot/docs/current-SNAPSHOT/reference
 :github: https://github.com/spring-projects/spring-boot
 
diff --git a/ci/README.adoc b/ci/README.adoc
index 2bfb9d39ff..4601e84e0b 100644
--- a/ci/README.adoc
+++ b/ci/README.adoc
@@ -11,7 +11,7 @@ The pipeline can be deployed using the following command:
 
 [source]
 ----
-$ fly -t spring-boot set-pipeline -p spring-boot-3.0.x -c ci/pipeline.yml -l ci/parameters.yml
+$ fly -t spring-boot set-pipeline -p spring-boot-3.1.x -c ci/pipeline.yml -l ci/parameters.yml
 ----
 
 NOTE: This assumes that you have credhub integration configured with the appropriate
diff --git a/ci/parameters.yml b/ci/parameters.yml
index bd4c132526..5bc1412be5 100644
--- a/ci/parameters.yml
+++ b/ci/parameters.yml
@@ -4,7 +4,7 @@ homebrew-tap-repo: "https://github.com/spring-io/homebrew-tap.git"
 docker-hub-organization: "springci"
 artifactory-server: "https://repo.spring.io"
 branch: "main"
-milestone: "3.0.x"
+milestone: "3.1.x"
 build-name: "spring-boot"
 concourse-url: "https://ci.spring.io"
 task-timeout: 2h00m
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index 48c62a3b48..2a98d8b34e 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -642,7 +642,7 @@ jobs:
         <<: *sdkman-task-params
         RELEASE_TYPE: RELEASE
         BRANCH: ((branch))
-        LATEST_GA: true
+        LATEST_GA: false
 - name: update-homebrew-tap
   serial: true
   plan:
@@ -658,7 +658,7 @@ jobs:
       image: ci-image
       file: git-repo/ci/tasks/update-homebrew-tap.yml
       params:
-        LATEST_GA: true
+        LATEST_GA: false
     - put: homebrew-tap-repo
       params:
         repository: updated-homebrew-tap-repo
diff --git a/eclipse/spring-boot-project.setup b/eclipse/spring-boot-project.setup
index 910f36e38d..da1ce403de 100644
--- a/eclipse/spring-boot-project.setup
+++ b/eclipse/spring-boot-project.setup
@@ -11,8 +11,8 @@
     xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0"
     xmlns:workingsets="http://www.eclipse.org/oomph/workingsets/1.0"
     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"
-    name="spring.boot.3.0.x"
-    label="Spring Boot 3.0.x">
+    name="spring.boot.3.1.x"
+    label="Spring Boot 3.1.x">
   <setupTask
       xsi:type="setup:VariableTask"
       type="FOLDER"
diff --git a/git/hooks/prepare-forward-merge b/git/hooks/prepare-forward-merge
index 2b049790d4..e9f03a32b5 100755
--- a/git/hooks/prepare-forward-merge
+++ b/git/hooks/prepare-forward-merge
@@ -4,7 +4,7 @@ require 'net/http'
 require 'yaml'
 require 'logger'
 
-$main_branch = "3.0.x"
+$main_branch = "3.1.x"
 
 $log = Logger.new(STDOUT)
 $log.level = Logger::WARN
diff --git a/gradle.properties b/gradle.properties
index b2f18ccc52..3559e88020 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=3.0.3-SNAPSHOT
+version=3.1.0-SNAPSHOT
 
 org.gradle.caching=true
 org.gradle.parallel=true
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/jar-layered-custom/jar/src/layers.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/jar-layered-custom/jar/src/layers.xml
index 0872a9d516..418078fe42 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/jar-layered-custom/jar/src/layers.xml
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/jar-layered-custom/jar/src/layers.xml
@@ -1,7 +1,7 @@
 <layers xmlns="http://www.springframework.org/schema/boot/layers"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/boot/layers
-					  https://www.springframework.org/schema/layers/layers-3.0.xsd">
+					  https://www.springframework.org/schema/layers/layers-3.1.xsd">
 	<application>
 		<into layer="configuration">
 			<include>**/application*.*</include>
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/war-layered-custom/war/src/layers.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/war-layered-custom/war/src/layers.xml
index 0872a9d516..418078fe42 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/war-layered-custom/war/src/layers.xml
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/war-layered-custom/war/src/layers.xml
@@ -1,7 +1,7 @@
 <layers xmlns="http://www.springframework.org/schema/boot/layers"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/boot/layers
-					  https://www.springframework.org/schema/layers/layers-3.0.xsd">
+					  https://www.springframework.org/schema/layers/layers-3.1.xsd">
 	<application>
 		<into layer="configuration">
 			<include>**/application*.*</include>
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/xsd/layers-3.1.xsd b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/xsd/layers-3.1.xsd
new file mode 100644
index 0000000000..20219b9bd8
--- /dev/null
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/xsd/layers-3.1.xsd
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<xsd:schema elementFormDefault="qualified"
+	xmlns="http://www.springframework.org/schema/boot/layers"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="http://www.springframework.org/schema/boot/layers">
+	<xsd:element name="layers" type="layersType" />
+	<xsd:complexType name="layersType">
+		<xsd:sequence>
+			<xsd:element name="application" type="applicationType" minOccurs="0"/>
+			<xsd:element name="dependencies" type="dependenciesType" minOccurs="0"/>
+			<xsd:element name="layerOrder" type="layerOrderType" minOccurs="0"/>
+		</xsd:sequence>
+	</xsd:complexType>
+	<xsd:complexType name="applicationType">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	The 'into layer' selections that should be applied to application classes and resources.
+				]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:sequence maxOccurs="unbounded">
+			<xsd:element name="into" type="intoType" />
+		</xsd:sequence>
+	</xsd:complexType>
+	<xsd:complexType name="dependenciesType">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	The 'into layer' selections that should be applied to dependencies.
+				]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:sequence maxOccurs="unbounded">
+			<xsd:element name="into" type="dependenciesIntoType" />
+		</xsd:sequence>
+	</xsd:complexType>
+	<xsd:complexType name="layerOrderType">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	The order that layers should be added (starting with the least frequently changed layer).
+				]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:sequence>
+			<xsd:element name="layer" maxOccurs="unbounded">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The layer name.
+				]]></xsd:documentation>
+				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:restriction base="xsd:string">
+						<xsd:minLength value="1" />
+					</xsd:restriction>
+				</xsd:simpleType>
+			</xsd:element>
+		</xsd:sequence>
+	</xsd:complexType>
+	<xsd:complexType name="intoType">
+		<xsd:choice maxOccurs="unbounded">
+			<xsd:element type="xsd:string" name="include"
+				minOccurs="0" maxOccurs="unbounded">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	Pattern of the elements to include.
+			]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+			<xsd:element type="xsd:string" name="exclude"
+				minOccurs="0" maxOccurs="unbounded">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	Pattern of the elements to exclude.
+			]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+		</xsd:choice>
+		<xsd:attribute type="xsd:string" name="layer"
+			use="required" />
+	</xsd:complexType>
+	<xsd:complexType name="dependenciesIntoType">
+		<xsd:complexContent>
+			<xsd:extension base="intoType">
+				<xsd:choice minOccurs="0">
+					<xsd:element type="xsd:string" name="includeModuleDependencies" minOccurs="0">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+	Include dependencies on other modules in the build.
+							]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:element>
+					<xsd:element type="xsd:string" name="excludeModuleDependencies" minOccurs="0">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+	Exclude dependencies on other modules in the build.
+							]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+</xsd:schema>
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/dependencies-layer-no-filter.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/dependencies-layer-no-filter.xml
index 3aa112ccc4..1398e83202 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/dependencies-layer-no-filter.xml
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/dependencies-layer-no-filter.xml
@@ -1,7 +1,7 @@
 <layers xmlns="http://www.springframework.org/schema/boot/layers"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/boot/layers
-					  https://www.springframework.org/schema/boot/layers/layers-3.0.xsd">
+					  https://www.springframework.org/schema/boot/layers/layers-3.1.xsd">
 	<dependencies>
 		<into layer="my-deps" />
 	</dependencies>
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/layers.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/layers.xml
index bce86b5f13..b7427f83a7 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/layers.xml
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/layers.xml
@@ -1,7 +1,7 @@
 <layers xmlns="http://www.springframework.org/schema/boot/layers"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/boot/layers
-					  https://www.springframework.org/schema/boot/layers/layers-3.0.xsd">
+					  https://www.springframework.org/schema/boot/layers/layers-3.1.xsd">
 	<application>
 		<into layer="my-resources">
 			<include>META-INF/resources/**</include>
@@ -32,5 +32,5 @@
 		<layer>my-resources</layer>
 		<layer>configuration</layer>
 		<layer>application</layer>
-	</layerOrder>	
+	</layerOrder>
 </layers>
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/resource-layer-no-filter.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/resource-layer-no-filter.xml
index 5eda6311ef..0614492c49 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/resource-layer-no-filter.xml
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/resource-layer-no-filter.xml
@@ -1,7 +1,7 @@
 <layers xmlns="http://www.springframework.org/schema/boot/layers"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/boot/layers
-					  https://www.springframework.org/schema/boot/layers/layers-3.0.xsd">
+					  https://www.springframework.org/schema/boot/layers/layers-3.1.xsd">
 	<application>
 		<into layer="my-layer" />
 	</application>