Upgrade to spring-javaformat 0.0.28 and downgrade to Checkstyle 8.41
In order to be able to use text blocks and other new Java language features, we are upgrading to a recent version of Checkstyle. The latest version of spring-javaformat-checkstyle (0.0.28) is built against Checkstyle 8.32 which does not include support for language features such as text blocks. Support for text blocks was added in Checkstyle 8.36. In addition, there is a binary compatibility issue between spring-javaformat-checkstyle 0.0.28 and Checkstyle 8.42. Thus we cannot use Checkstyle 8.42 or higher. In this commit, we therefore upgrade to spring-javaformat-checkstyle 0.0.28 and downgrade to Checkstyle 8.41. This change is being applied to `5.3.x` as well as `main` in order to benefit from the enhanced checking provided in more recent versions of Checkstyle. Closes gh-27481
This commit is contained in:
@@ -61,7 +61,6 @@ public interface StompWebSocketEndpointRegistration {
|
||||
* that do not allow to check request origin (Iframe based transports) are
|
||||
* disabled. As a consequence, IE 6 to 9 are not supported when origins are
|
||||
* restricted.
|
||||
*
|
||||
* @since 4.1.2
|
||||
* @see #setAllowedOriginPatterns(String...)
|
||||
* @see <a href="https://tools.ietf.org/html/rfc6454">RFC 6454: The Web Origin Concept</a>
|
||||
|
||||
@@ -63,7 +63,6 @@ public interface WebSocketHandlerRegistration {
|
||||
* that do not allow to check request origin (Iframe based transports) are
|
||||
* disabled. As a consequence, IE 6 to 9 are not supported when origins are
|
||||
* restricted.
|
||||
*
|
||||
* @since 4.1.2
|
||||
* @see #setAllowedOriginPatterns(String...)
|
||||
* @see <a href="https://tools.ietf.org/html/rfc6454">RFC 6454: The Web Origin Concept</a>
|
||||
|
||||
@@ -82,7 +82,6 @@ public class OriginHandshakeInterceptor implements HandshakeInterceptor {
|
||||
* that do not allow to check request origin (Iframe based transports) are
|
||||
* disabled. As a consequence, IE 6 to 9 are not supported when origins are
|
||||
* restricted.
|
||||
*
|
||||
* @see #setAllowedOriginPatterns(Collection)
|
||||
* @see <a href="https://tools.ietf.org/html/rfc6454">RFC 6454: The Web Origin Concept</a>
|
||||
*/
|
||||
|
||||
@@ -325,7 +325,6 @@ public abstract class AbstractSockJsService implements SockJsService, CorsConfig
|
||||
* that do not allow to check request origin (Iframe based transports) are
|
||||
* disabled. As a consequence, IE 6 to 9 are not supported when origins are
|
||||
* restricted.
|
||||
*
|
||||
* @since 4.1.2
|
||||
* @see #setAllowedOriginPatterns(Collection)
|
||||
* @see <a href="https://tools.ietf.org/html/rfc6454">RFC 6454: The Web Origin Concept</a>
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.web.socket.handler;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.web.socket.messaging;
|
||||
|
||||
import java.nio.charset.StandardCharsets;
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.web.socket.messaging;
|
||||
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.web.socket.server.support;
|
||||
|
||||
import java.util.Collections;
|
||||
|
||||
Reference in New Issue
Block a user