Start work on Spring Boot 3.5
This commit is contained in:
Andy Wilkinson
parent
383f1964e6
commit
214e0281a9
@ -27,7 +27,7 @@ jobs:
|
||||
- name: Deploy
|
||||
uses: spring-io/artifactory-deploy-action@dc1913008c0599f0c4b1fdafb6ff3c502b3565ea # v0.0.2
|
||||
with:
|
||||
build-name: ${{ vars.COMMERCIAL && format('spring-boot-commercial-{0}', '3.4.x') || format('spring-boot-{0}', '3.4.x') }}
|
||||
build-name: ${{ vars.COMMERCIAL && format('spring-boot-commercial-{0}', '3.5.x') || format('spring-boot-{0}', '3.5.x') }}
|
||||
folder: 'deployment-repository'
|
||||
password: ${{ vars.COMMERCIAL && secrets.COMMERCIAL_ARTIFACTORY_PASSWORD || secrets.ARTIFACTORY_PASSWORD }}
|
||||
project: ${{ vars.COMMERCIAL && 'spring' }}
|
||||
|
||||
@ -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.4.x"
|
||||
label="Spring Boot 3.4.x">
|
||||
name="spring.boot.3.5.x"
|
||||
label="Spring Boot 3.5.x">
|
||||
<setupTask
|
||||
xsi:type="setup:VariableTask"
|
||||
type="FOLDER"
|
||||
|
||||
@ -4,7 +4,7 @@ require 'net/http'
|
||||
require 'yaml'
|
||||
require 'logger'
|
||||
|
||||
$main_branch = "3.4.x"
|
||||
$main_branch = "3.5.x"
|
||||
|
||||
$log = Logger.new(STDOUT)
|
||||
$log.level = Logger::WARN
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
version=3.4.2-SNAPSHOT
|
||||
version=3.5.0-SNAPSHOT
|
||||
latestVersion=true
|
||||
spring.build-type=oss
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@ description = "Spring Boot Dependencies"
|
||||
bom {
|
||||
effectiveBomArtifact()
|
||||
upgrade {
|
||||
policy = "same-minor-version"
|
||||
policy = "same-major-version"
|
||||
gitHub {
|
||||
issueLabels = ["type: dependency-upgrade"]
|
||||
}
|
||||
|
||||
@ -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.3.xsd">
|
||||
https://www.springframework.org/schema/layers/layers-3.5.xsd">
|
||||
<application>
|
||||
<into layer="configuration">
|
||||
<include>**/application*.*</include>
|
||||
|
||||
@ -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.3.xsd">
|
||||
https://www.springframework.org/schema/layers/layers-3.5.xsd">
|
||||
<application>
|
||||
<into layer="configuration">
|
||||
<include>**/application*.*</include>
|
||||
|
||||
@ -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>
|
||||
@ -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.3.xsd">
|
||||
https://www.springframework.org/schema/boot/layers/layers-3.5.xsd">
|
||||
<dependencies>
|
||||
<into layer="my-deps" />
|
||||
</dependencies>
|
||||
|
||||
@ -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.3.xsd">
|
||||
https://www.springframework.org/schema/boot/layers/layers-3.5.xsd">
|
||||
<application>
|
||||
<into layer="my-resources">
|
||||
<include>META-INF/resources/**</include>
|
||||
|
||||
@ -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.3.xsd">
|
||||
https://www.springframework.org/schema/boot/layers/layers-3.5.xsd">
|
||||
<application>
|
||||
<into layer="my-layer" />
|
||||
</application>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user