Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chore/#303 adjust license template #697

Merged
merged 5 commits into from
Dec 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .config/checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,11 @@ page at http://checkstyle.sourceforge.net/config.html -->
<property name="optional" value="true"/>
</module>

<module name="Header">
<property name="headerFile" value=".config/irs.header"/>
<!-- Checks that the license header is present. -->
<module name="RegexpHeader">
<property name="fileExtensions" value="java"/>
<property name="headerFile" value=".config/irs.header"/>
<property name="multiLines" value="2, 3, 4, 5, 6"/>
</module>

<!-- Checks that there are no tab characters in the file. -->
Expand Down
46 changes: 23 additions & 23 deletions .config/irs.header
Original file line number Diff line number Diff line change
@@ -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
********************************************************************************/
^/\*\*{79}$
^ \* 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$
^ \*{79}\*\/$
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ target/
### IntelliJ IDEA ###
.idea
!.idea/codeStyles/
!.idea/copyright/*
!.idea/fileTemplates/
*.iws
*.iml
Expand Down
6 changes: 6 additions & 0 deletions .idea/copyright/IRS.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions .idea/copyright/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 0 additions & 21 deletions .idea/fileTemplates/includes/File Header.java

This file was deleted.

4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@
<!-- Plugins -->
<spotbugs-plugin.version>4.7.3.2</spotbugs-plugin.version>
<findsecbugs-plugin.version>1.12.0</findsecbugs-plugin.version>
<checkstyle-plugin.version>3.3.0</checkstyle-plugin.version>
<checkstyle.version>10.12.4</checkstyle.version>
<checkstyle-plugin.version>3.3.1</checkstyle-plugin.version>
<checkstyle.version>10.12.6</checkstyle.version>
<jacoco.version>0.8.10</jacoco.version>
<pmd-plugin.version>3.19.0</pmd-plugin.version>
<owasp-plugin.version>8.2.1</owasp-plugin.version>
Expand Down