From 37485108e8227540cf421d78bd8b06e1c2241aeb Mon Sep 17 00:00:00 2001 From: Jaro Hartmann Date: Thu, 14 Dec 2023 12:00:08 +0100 Subject: [PATCH 1/5] chore(checkstyle): Change header check to regex template --- .config/checkstyle.xml | 6 ++++-- .config/irs.header | 46 +++++++++++++++++++++--------------------- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/.config/checkstyle.xml b/.config/checkstyle.xml index 20b398685d..ea93e02b93 100644 --- a/.config/checkstyle.xml +++ b/.config/checkstyle.xml @@ -21,9 +21,11 @@ page at http://checkstyle.sourceforge.net/config.html --> - - + + + + diff --git a/.config/irs.header b/.config/irs.header index 57c9ef7b4f..a302648e0d 100644 --- a/.config/irs.header +++ b/.config/irs.header @@ -1,23 +1,23 @@ -/******************************************************************************** - * Copyright (c) 2021,2022,2023 - * 2022: ZF Friedrichshafen AG - * 2022: ISTOS GmbH - * 2022,2023: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - * 2022,2023: BOSCH AG - * Copyright (c) 2021,2022,2023 Contributors to the Eclipse Foundation - * - * See the NOTICE file(s) distributed with this work for additional - * information regarding copyright ownership. - * - * This program and the accompanying materials are made available under the - * terms of the Apache License, Version 2.0 which is available 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. - * - * SPDX-License-Identifier: Apache-2.0 - ********************************************************************************/ \ No newline at end of file +^/\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*$ +^ \* Copyright \(c\) 2021,2022,2023$ +^ \* 2022: ZF Friedrichshafen AG$ +^ \* 2022: ISTOS GmbH$ +^ \* 2022,2023: Bayerische Motoren Werke Aktiengesellschaft \(BMW AG\)$ +^ \* 2022,2023: BOSCH AG$ +^ \* Copyright \(c\) 2021,2022,2023 Contributors to the Eclipse Foundation$ +^ \*$ +^ \* See the NOTICE file\(s\) distributed with this work for additional$ +^ \* information regarding copyright ownership\.$ +^ \*$ +^ \* This program and the accompanying materials are made available under the$ +^ \* terms of the Apache License, Version 2\.0 which is available 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\.$ +^ \*$ +^ \* SPDX-License-Identifier: Apache-2\.0$ +^ \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*/$ \ No newline at end of file From 2141310209beca800698ecf83d723316c18be3ac Mon Sep 17 00:00:00 2001 From: Jaro Hartmann Date: Thu, 14 Dec 2023 12:01:59 +0100 Subject: [PATCH 2/5] chore(dependencies): Update checkstyle maven plugin --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 94fe3611df..8529dfd266 100644 --- a/pom.xml +++ b/pom.xml @@ -109,8 +109,8 @@ 4.7.3.2 1.12.0 - 3.3.0 - 10.12.4 + 3.3.1 + 10.12.6 0.8.10 3.19.0 8.2.1 From 7cb993e5fb67647cf0ceb75f7a5ff76b5f689665 Mon Sep 17 00:00:00 2001 From: Jaro Hartmann Date: Thu, 14 Dec 2023 12:05:52 +0100 Subject: [PATCH 3/5] chore(ide):[#303] Add copyright header settings for IntelliJ --- .gitignore | 1 + .idea/copyright/IRS.xml | 6 ++++++ .idea/copyright/profiles_settings.xml | 17 +++++++++++++++ .idea/fileTemplates/includes/File Header.java | 21 ------------------- 4 files changed, 24 insertions(+), 21 deletions(-) create mode 100644 .idea/copyright/IRS.xml create mode 100644 .idea/copyright/profiles_settings.xml delete mode 100644 .idea/fileTemplates/includes/File Header.java diff --git a/.gitignore b/.gitignore index 11f143f595..aa50006305 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ target/ ### IntelliJ IDEA ### .idea !.idea/codeStyles/ +!.idea/copyright/* !.idea/fileTemplates/ *.iws *.iml diff --git a/.idea/copyright/IRS.xml b/.idea/copyright/IRS.xml new file mode 100644 index 0000000000..314e3da789 --- /dev/null +++ b/.idea/copyright/IRS.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000000..7df3f1489e --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/fileTemplates/includes/File Header.java b/.idea/fileTemplates/includes/File Header.java deleted file mode 100644 index de0d3db064..0000000000 --- a/.idea/fileTemplates/includes/File Header.java +++ /dev/null @@ -1,21 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2021,2022 - * 2022: Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - * 2022: ZF Friedrichshafen AG - * 2022: ISTOS GmbH - * Copyright (c) 2021,2022 Contributors to the Eclipse Foundation - * - * See the NOTICE file(s) distributed with this work for additional - * information regarding copyright ownership. - * - * This program and the accompanying materials are made available under the - * terms of the Apache License, Version 2.0 which is available 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. - * - * SPDX-License-Identifier: Apache-2.0 - ********************************************************************************/ \ No newline at end of file From 8a6c751ff9ba5a26186c2397f08be49a0b3d861e Mon Sep 17 00:00:00 2001 From: Jaro Hartmann Date: Thu, 14 Dec 2023 12:26:18 +0100 Subject: [PATCH 4/5] chore(checkstyle): Add simplify header template --- .config/irs.header | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.config/irs.header b/.config/irs.header index a302648e0d..0f980cfdaa 100644 --- a/.config/irs.header +++ b/.config/irs.header @@ -1,4 +1,4 @@ -^/\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*$ +^/\*\*{79}$ ^ \* Copyright \(c\) 2021,2022,2023$ ^ \* 2022: ZF Friedrichshafen AG$ ^ \* 2022: ISTOS GmbH$ @@ -20,4 +20,4 @@ ^ \* under the License\.$ ^ \*$ ^ \* SPDX-License-Identifier: Apache-2\.0$ -^ \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*/$ \ No newline at end of file +^ \*{79}\*\/$ \ No newline at end of file From 5f142d863d36169550d2629caa9c832f0dd6b74e Mon Sep 17 00:00:00 2001 From: Jaro Hartmann Date: Thu, 14 Dec 2023 14:30:48 +0100 Subject: [PATCH 5/5] chore(ide):[#303] Add copyright header settings for IntelliJ --- .idea/copyright/IRS.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.idea/copyright/IRS.xml b/.idea/copyright/IRS.xml index 314e3da789..f4e71761c5 100644 --- a/.idea/copyright/IRS.xml +++ b/.idea/copyright/IRS.xml @@ -1,6 +1,6 @@ - \ No newline at end of file