From a023c7b4cfeae0b89a5bca0d5a6cebd1fcc72692 Mon Sep 17 00:00:00 2001 From: izeye Date: Fri, 27 May 2022 23:51:14 +0900 Subject: [PATCH] Upgrade to Spring Java Format 0.0.33 This commit also adds missing package-info.java files to unpublished javadoc for the Asciidoctor extension. See gh-811 --- .springjavaformatconfig | 1 + config/checkstyle/checkstyle-suppressions.xml | 1 + gradle.properties | 2 +- .../restdocs/asciidoctor/package-info.java | 20 +++++++++++++++++++ .../restdocs/asciidoctor/package-info.java | 20 +++++++++++++++++++ .../restdocs/asciidoctor/package-info.java | 20 +++++++++++++++++++ .../restdocs/asciidoctor/package-info.java | 20 +++++++++++++++++++ 7 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 .springjavaformatconfig create mode 100644 spring-restdocs-asciidoctor-1.5/src/main/java/org/springframework/restdocs/asciidoctor/package-info.java create mode 100644 spring-restdocs-asciidoctor-1.6/src/main/java/org/springframework/restdocs/asciidoctor/package-info.java create mode 100644 spring-restdocs-asciidoctor-2.x/src/main/java/org/springframework/restdocs/asciidoctor/package-info.java create mode 100644 spring-restdocs-asciidoctor-support/src/main/java/org/springframework/restdocs/asciidoctor/package-info.java diff --git a/.springjavaformatconfig b/.springjavaformatconfig new file mode 100644 index 00000000..6d408bb8 --- /dev/null +++ b/.springjavaformatconfig @@ -0,0 +1 @@ +java-baseline=8 diff --git a/config/checkstyle/checkstyle-suppressions.xml b/config/checkstyle/checkstyle-suppressions.xml index a391a865..85f240e2 100644 --- a/config/checkstyle/checkstyle-suppressions.xml +++ b/config/checkstyle/checkstyle-suppressions.xml @@ -4,4 +4,5 @@ "https://checkstyle.org/dtds/suppressions_1_2.dtd"> + diff --git a/gradle.properties b/gradle.properties index d7e678cc..196c6e44 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,5 +13,5 @@ asciidoctorj23Version=2.3.0 asciidoctorj24Version=2.4.3 asciidoctorj25Version=2.5.1 -javaFormatVersion=0.0.29 +javaFormatVersion=0.0.33 jmustacheVersion=1.12 diff --git a/spring-restdocs-asciidoctor-1.5/src/main/java/org/springframework/restdocs/asciidoctor/package-info.java b/spring-restdocs-asciidoctor-1.5/src/main/java/org/springframework/restdocs/asciidoctor/package-info.java new file mode 100644 index 00000000..fd03600b --- /dev/null +++ b/spring-restdocs-asciidoctor-1.5/src/main/java/org/springframework/restdocs/asciidoctor/package-info.java @@ -0,0 +1,20 @@ +/* + * Copyright 2014-2022 the original author or authors. + * + * Licensed 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 + * + * https://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. + */ + +/** + * Support for Asciidoctor. + */ +package org.springframework.restdocs.asciidoctor; diff --git a/spring-restdocs-asciidoctor-1.6/src/main/java/org/springframework/restdocs/asciidoctor/package-info.java b/spring-restdocs-asciidoctor-1.6/src/main/java/org/springframework/restdocs/asciidoctor/package-info.java new file mode 100644 index 00000000..fd03600b --- /dev/null +++ b/spring-restdocs-asciidoctor-1.6/src/main/java/org/springframework/restdocs/asciidoctor/package-info.java @@ -0,0 +1,20 @@ +/* + * Copyright 2014-2022 the original author or authors. + * + * Licensed 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 + * + * https://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. + */ + +/** + * Support for Asciidoctor. + */ +package org.springframework.restdocs.asciidoctor; diff --git a/spring-restdocs-asciidoctor-2.x/src/main/java/org/springframework/restdocs/asciidoctor/package-info.java b/spring-restdocs-asciidoctor-2.x/src/main/java/org/springframework/restdocs/asciidoctor/package-info.java new file mode 100644 index 00000000..fd03600b --- /dev/null +++ b/spring-restdocs-asciidoctor-2.x/src/main/java/org/springframework/restdocs/asciidoctor/package-info.java @@ -0,0 +1,20 @@ +/* + * Copyright 2014-2022 the original author or authors. + * + * Licensed 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 + * + * https://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. + */ + +/** + * Support for Asciidoctor. + */ +package org.springframework.restdocs.asciidoctor; diff --git a/spring-restdocs-asciidoctor-support/src/main/java/org/springframework/restdocs/asciidoctor/package-info.java b/spring-restdocs-asciidoctor-support/src/main/java/org/springframework/restdocs/asciidoctor/package-info.java new file mode 100644 index 00000000..fd03600b --- /dev/null +++ b/spring-restdocs-asciidoctor-support/src/main/java/org/springframework/restdocs/asciidoctor/package-info.java @@ -0,0 +1,20 @@ +/* + * Copyright 2014-2022 the original author or authors. + * + * Licensed 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 + * + * https://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. + */ + +/** + * Support for Asciidoctor. + */ +package org.springframework.restdocs.asciidoctor;