diff --git a/.github/workflows/build-and-deploy-snapshot.yml b/.github/workflows/build-and-deploy-snapshot.yml index 002f6eb34ac..23a10e5d049 100644 --- a/.github/workflows/build-and-deploy-snapshot.yml +++ b/.github/workflows/build-and-deploy-snapshot.yml @@ -30,7 +30,7 @@ jobs: - name: Deploy uses: spring-io/artifactory-deploy-action@926d7f7cc810569395346bf3a4d91b380b3e355b # v0.0.4 with: - build-name: ${{ vars.COMMERCIAL && format('spring-boot-commercial-{0}', '4.1.x') || format('spring-boot-{0}', '4.1.x') }} + build-name: ${{ vars.COMMERCIAL && format('spring-boot-commercial-{0}', '4.2.x') || format('spring-boot-{0}', '4.2.x') }} folder: 'deployment-repository' password: ${{ vars.COMMERCIAL && secrets.COMMERCIAL_ARTIFACTORY_PASSWORD || secrets.ARTIFACTORY_PASSWORD }} project: ${{ vars.COMMERCIAL && 'spring' }} diff --git a/.github/workflows/release-milestone.yml b/.github/workflows/release-milestone.yml index c61954bd398..4c33a2566a7 100644 --- a/.github/workflows/release-milestone.yml +++ b/.github/workflows/release-milestone.yml @@ -2,8 +2,8 @@ name: Release Milestone on: push: tags: - - v4.1.0-M[0-9] - - v4.1.0-RC[0-9] + - v4.2.0-M[0-9] + - v4.2.0-RC[0-9] permissions: contents: read concurrency: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 32d2629ae99..13612d1d5ac 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,7 +2,7 @@ name: Release on: push: tags: - - v4.1.[0-9]+ + - v4.2.[0-9]+ permissions: contents: read concurrency: diff --git a/build-plugin/spring-boot-maven-plugin/src/intTest/projects/jar-layered-custom-name/jar-layers-configuration/src/main/resources/META-INF/spring/layers/custom.xml b/build-plugin/spring-boot-maven-plugin/src/intTest/projects/jar-layered-custom-name/jar-layers-configuration/src/main/resources/META-INF/spring/layers/custom.xml index 434cd9fbb7f..a3e5e930dfa 100644 --- a/build-plugin/spring-boot-maven-plugin/src/intTest/projects/jar-layered-custom-name/jar-layers-configuration/src/main/resources/META-INF/spring/layers/custom.xml +++ b/build-plugin/spring-boot-maven-plugin/src/intTest/projects/jar-layered-custom-name/jar-layers-configuration/src/main/resources/META-INF/spring/layers/custom.xml @@ -1,7 +1,7 @@ + https://www.springframework.org/schema/boot/layers/layers-4.2.xsd"> **/application*.* diff --git a/build-plugin/spring-boot-maven-plugin/src/intTest/projects/jar-layered-custom/jar/src/layers.xml b/build-plugin/spring-boot-maven-plugin/src/intTest/projects/jar-layered-custom/jar/src/layers.xml index 77bfa58e8d4..13e53361616 100644 --- a/build-plugin/spring-boot-maven-plugin/src/intTest/projects/jar-layered-custom/jar/src/layers.xml +++ b/build-plugin/spring-boot-maven-plugin/src/intTest/projects/jar-layered-custom/jar/src/layers.xml @@ -1,7 +1,7 @@ + https://www.springframework.org/schema/layers/layers-4.2.xsd"> **/application*.* diff --git a/build-plugin/spring-boot-maven-plugin/src/intTest/projects/war-layered-custom/war/src/layers.xml b/build-plugin/spring-boot-maven-plugin/src/intTest/projects/war-layered-custom/war/src/layers.xml index 77bfa58e8d4..13e53361616 100644 --- a/build-plugin/spring-boot-maven-plugin/src/intTest/projects/war-layered-custom/war/src/layers.xml +++ b/build-plugin/spring-boot-maven-plugin/src/intTest/projects/war-layered-custom/war/src/layers.xml @@ -1,7 +1,7 @@ + https://www.springframework.org/schema/layers/layers-4.2.xsd"> **/application*.* diff --git a/build-plugin/spring-boot-maven-plugin/src/main/resources/META-INF/spring/layers/default.xml b/build-plugin/spring-boot-maven-plugin/src/main/resources/META-INF/spring/layers/default.xml index 0d2fedf8334..c94067c8abe 100644 --- a/build-plugin/spring-boot-maven-plugin/src/main/resources/META-INF/spring/layers/default.xml +++ b/build-plugin/spring-boot-maven-plugin/src/main/resources/META-INF/spring/layers/default.xml @@ -1,7 +1,7 @@ + https://www.springframework.org/schema/boot/layers/layers-4.2.xsd"> org/springframework/boot/loader/** diff --git a/build-plugin/spring-boot-maven-plugin/src/main/xsd/layers-4.2.xsd b/build-plugin/spring-boot-maven-plugin/src/main/xsd/layers-4.2.xsd new file mode 100644 index 00000000000..20219b9bd8b --- /dev/null +++ b/build-plugin/spring-boot-maven-plugin/src/main/xsd/layers-4.2.xsd @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/build-plugin/spring-boot-maven-plugin/src/test/resources/dependencies-layer-no-filter.xml b/build-plugin/spring-boot-maven-plugin/src/test/resources/dependencies-layer-no-filter.xml index abd81ae6adb..563e476cf36 100644 --- a/build-plugin/spring-boot-maven-plugin/src/test/resources/dependencies-layer-no-filter.xml +++ b/build-plugin/spring-boot-maven-plugin/src/test/resources/dependencies-layer-no-filter.xml @@ -1,7 +1,7 @@ + https://www.springframework.org/schema/boot/layers/layers-4.2.xsd"> diff --git a/build-plugin/spring-boot-maven-plugin/src/test/resources/layers.xml b/build-plugin/spring-boot-maven-plugin/src/test/resources/layers.xml index f4921f54f10..be1771b98d8 100644 --- a/build-plugin/spring-boot-maven-plugin/src/test/resources/layers.xml +++ b/build-plugin/spring-boot-maven-plugin/src/test/resources/layers.xml @@ -1,7 +1,7 @@ + https://www.springframework.org/schema/boot/layers/layers-4.2.xsd"> META-INF/resources/** diff --git a/build-plugin/spring-boot-maven-plugin/src/test/resources/resource-layer-no-filter.xml b/build-plugin/spring-boot-maven-plugin/src/test/resources/resource-layer-no-filter.xml index e256884d6f0..5f71408c561 100644 --- a/build-plugin/spring-boot-maven-plugin/src/test/resources/resource-layer-no-filter.xml +++ b/build-plugin/spring-boot-maven-plugin/src/test/resources/resource-layer-no-filter.xml @@ -1,7 +1,7 @@ + https://www.springframework.org/schema/boot/layers/layers-4.2.xsd"> diff --git a/eclipse/spring-boot-project.setup b/eclipse/spring-boot-project.setup index 8486022ea6e..8f93185b394 100644 --- a/eclipse/spring-boot-project.setup +++ b/eclipse/spring-boot-project.setup @@ -10,8 +10,8 @@ xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0" xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0" xsi:schemaLocation="http://www.eclipse.org/oomph/setup/jdt/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/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 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/SetupWorkingSets.ecore" - name="spring.boot.4.1.x" - label="Spring Boot 4.1.x"> + name="spring.boot.4.2.x" + label="Spring Boot 4.2.x">