Merge from upstream

.mvn/wrapper/maven-wrapper.properties

@@ -1,19 +1,3 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-wrapperVersion=3.3.2
+wrapperVersion=3.3.4
 distributionType=only-script
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.10/apache-maven-3.9.10-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip

.sdkmanrc

@@ -1,3 +1,3 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
-java=17.0.15-librca
+java=17.0.18-librca

pom.xml

@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.5.3</version>
+		<version>4.0.2</version>
 	</parent>
 	<groupId>io.spring.start</groupId>
 	<artifactId>start-parent</artifactId>
@@ -33,7 +33,7 @@
 	<properties>
 		<revision>0.0.1-SNAPSHOT</revision>
 		<disable.checks>false</disable.checks>
-		<spring-initializr.version>0.22.1-SNAPSHOT</spring-initializr.version>
+		<spring-initializr.version>0.24.0-SNAPSHOT</spring-initializr.version>
 		<spring-javaformat.version>0.0.47</spring-javaformat.version>
 	</properties>
 
@@ -88,7 +88,7 @@
 			<dependency>
 				<groupId>com.azure.spring</groupId>
 				<artifactId>spring-cloud-azure-dependencies</artifactId>
-				<version>5.22.0</version>
+				<version>7.0.0</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -101,7 +101,7 @@
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>flatten-maven-plugin</artifactId>
-					<version>1.7.0</version>
+					<version>1.7.1</version>
 				</plugin>
 				<plugin>
 					<groupId>io.spring.javaformat</groupId>
@@ -141,7 +141,7 @@
 						<dependency>
 							<groupId>com.puppycrawl.tools</groupId>
 							<artifactId>checkstyle</artifactId>
-							<version>10.21.4</version>
+							<version>10.26.1</version>
 						</dependency>
 						<dependency>
 							<groupId>io.spring.javaformat</groupId>
@@ -155,16 +155,6 @@
 					<artifactId>frontend-maven-plugin</artifactId>
 					<version>1.15.1</version>
 				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-resources-plugin</artifactId>
-					<version>3.3.1</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-surefire-plugin</artifactId>
-					<version>3.5.3</version>
-				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>

start-client/src/components/common/builder/FieldInput.js

@@ -1,9 +1,9 @@
 import PropTypes from 'prop-types'
 import React from 'react'
 
-function FieldInput({ id, text, value, onChange, disabled, inputRef }) {
+function FieldInput({ id, text, value, onChange, disabled, inputRef, className }) {
   return (
-    <div className='control control-inline'>
+    <div className={`control control-inline ${className || ''}`}>
       <label htmlFor={id}>{text}</label>
       <input
         type='text'
@@ -21,6 +21,7 @@ function FieldInput({ id, text, value, onChange, disabled, inputRef }) {
 FieldInput.defaultProps = {
   disabled: false,
   inputRef: null,
+  className: null,
 }
 
 FieldInput.propTypes = {
@@ -32,6 +33,7 @@ FieldInput.propTypes = {
     PropTypes.func,
     PropTypes.shape({ current: PropTypes.instanceOf(Element) }),
   ]),
+  className: PropTypes.string,
   disabled: PropTypes.bool,
 }
 

start-client/src/components/common/builder/Fields.js

@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types'
 import get from 'lodash/get'
-import React, { useContext, useRef, useState, useEffect } from 'react'
+import React, {useContext, useEffect, useRef, useState} from 'react'
 
 import Actions from './Actions'
 import Control from './Control'
@@ -9,10 +9,10 @@ import FieldInput from './FieldInput'
 import FieldRadio from './FieldRadio'
 import Warnings from './Warnings'
 import useWindowsUtils from '../../utils/WindowsUtils'
-import { AppContext } from '../../reducer/App'
-import { Button, Radio } from '../form'
-import { Dependency } from '../dependency'
-import { InitializrContext } from '../../reducer/Initializr'
+import {AppContext} from '../../reducer/App'
+import {Button, Radio} from '../form'
+import {Dependency} from '../dependency'
+import {InitializrContext} from '../../reducer/Initializr'
 
 function Fields({
   onSubmit,

start-client/src/components/common/layout/SideLeft.js

@@ -209,6 +209,16 @@ function SideLeft() {
                           Leave feedback
                         </a>
                       </li>
+                      <li>
+                        <a
+                          id='ql-help-migration2'
+                          target='_blank'
+                          rel='noopener noreferrer'
+                          href='https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-4.0-Migration-Guide'
+                        >
+                          Migrate Spring Boot 3.5 to 4.0
+                        </a>
+                      </li>
                     </ul>
                   </div>
                   <div className='is-mobile'>

start-client/src/components/reducer/__tests__/Initializr.js

@@ -31,6 +31,7 @@ describe('COMPLETE action', () => {
           packaging: '',
           packageName: '',
           java: '',
+          configurationFileFormat: '',
         },
         dependencies: [],
       },
@@ -46,9 +47,9 @@ describe('COMPLETE action', () => {
         defaultValues,
       },
     })
-    // expect(get(result, 'share')).toBe(
-    //   name='Dev&namespace=DevNamespace&description=Development%20project%20application&steeltoeVersion=3.0.2&dotNetFramework=netcoreapp3.1&dotNetTemplate=&language=csharp&packaging=zip'
-    // )
+    expect(get(result, 'share')).toBe(
+      name='Dev&namespace=DevNamespace&description=Development%20project%20application&steeltoeVersion=3.0.2&dotNetFramework=netcoreapp3.1&dotNetTemplate=&language=csharp&packaging=zip'
+    )
     // expect(get(result, 'values.project')).toBe('maven-project')
     expect(get(result, 'values.language')).toBe('csharp')
     expect(get(result, 'values.steeltoeVersion')).toBe('3.0.2')
@@ -181,6 +182,17 @@ describe('UPDATE action', () => {
     })
     expect(get(result, 'values.meta.packaging')).toBe('war')
   })
+  it('should reduce the state (configuration file format)', () => {
+    const result = reducer(state, {
+      type: 'UPDATE',
+      payload: {
+        meta: {
+          configurationFileFormat: 'yaml',
+        },
+      },
+    })
+    expect(get(result, 'values.meta.configurationFileFormat')).toBe('yaml')
+  })
   it('should reduce the state (meta packageName)', () => {
     const result = reducer(state, {
       type: 'UPDATE',

start-client/src/components/utils/ApiUtils.js

@@ -22,7 +22,7 @@ export const getInfo = function getInfo(url) {
     fetch(`${url}`, {
       method: 'GET',
       headers: {
-        Accept: 'application/vnd.initializr.v2.2+json',
+        Accept: 'application/vnd.initializr.v2.3+json',
       },
     })
       .then(