Skip to content

Commit 4e9fc8e

Browse files
sschuberthsschuberth
committed
reporter: Align the formatting of multi-line comments in FreeMarker files
Signed-off-by: Sebastian Schuberth <[email protected]>
1 parent f470c7c commit 4e9fc8e

File tree

3 files changed

+51
-51
lines changed

3 files changed

+51
-51
lines changed

‎reporter/src/main/resources/templates/asciidoc/defect_report.ftl

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
[#--
2-
Copyright (C) 2021 The ORT Project Authors (see <https://github.com/oss-review-toolkit/ort/blob/main/NOTICE>)
2+
Copyright (C) 2021 The ORT Project Authors (see <https://github.com/oss-review-toolkit/ort/blob/main/NOTICE>)
33
4-
Licensed under the Apache License, Version 2.0 (the "License");
5-
you may not use this file except in compliance with the License.
6-
You may obtain a copy of the License at
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
77
8-
https://www.apache.org/licenses/LICENSE-2.0
8+
https://www.apache.org/licenses/LICENSE-2.0
99
10-
Unless required by applicable law or agreed to in writing, software
11-
distributed under the License is distributed on an "AS IS" BASIS,
12-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
See the License for the specific language governing permissions and
14-
limitations under the License.
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
1515
16-
SPDX-License-Identifier: Apache-2.0
17-
License-Filename: LICENSE
16+
SPDX-License-Identifier: Apache-2.0
17+
License-Filename: LICENSE
1818
--]
1919

2020
[#assign ModelExtensions = statics['org.ossreviewtoolkit.model.utils.ExtensionsKt']]

‎reporter/src/main/resources/templates/asciidoc/disclosure_document.ftl

+27-27
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
[#--
2-
Copyright (C) 2020 The ORT Project Authors (see <https://github.com/oss-review-toolkit/ort/blob/main/NOTICE>)
2+
Copyright (C) 2020 The ORT Project Authors (see <https://github.com/oss-review-toolkit/ort/blob/main/NOTICE>)
33
4-
Licensed under the Apache License, Version 2.0 (the "License");
5-
you may not use this file except in compliance with the License.
6-
You may obtain a copy of the License at
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
77
8-
https://www.apache.org/licenses/LICENSE-2.0
8+
https://www.apache.org/licenses/LICENSE-2.0
99
10-
Unless required by applicable law or agreed to in writing, software
11-
distributed under the License is distributed on an "AS IS" BASIS,
12-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
See the License for the specific language governing permissions and
14-
limitations under the License.
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
1515
16-
SPDX-License-Identifier: Apache-2.0
17-
License-Filename: LICENSE
16+
SPDX-License-Identifier: Apache-2.0
17+
License-Filename: LICENSE
1818
--]
1919

2020
[#--
21-
The AsciiDoc file generated by this template consists of the following sections:
21+
The AsciiDoc file generated by this template consists of the following sections:
2222
23-
* The licenses and associated copyrights for all projects merged into a single list.
24-
* The archived license files, licenses and associated copyrights for dependencies listed by package.
25-
* An Appendix of license texts of all above licenses
23+
* The licenses and associated copyrights for all projects merged into a single list.
24+
* The archived license files, licenses and associated copyrights for dependencies listed by package.
25+
* An Appendix of license texts of all above licenses
2626
27-
Excluded projects and packages are ignored.
27+
Excluded projects and packages are ignored.
2828
--]
2929

3030
[#assign ModelExtensions = statics['org.ossreviewtoolkit.model.utils.ExtensionsKt']]
@@ -38,8 +38,8 @@ Excluded projects and packages are ignored.
3838
THIS DOCUMENT SHOULD NOT BE DISTRIBUTED UNTIL THESE PROBLEMS ARE RESOLVED."?replace("\n", " ")]
3939

4040
[#--
41-
The alert role needs to be defined in the pdf-theme file, where the color can be customized.
42-
If not present, the text is displayed normally.
41+
The alert role needs to be defined in the pdf-theme file, where the color can be customized.
42+
If not present, the text is displayed normally.
4343
--]
4444
= [#if helper.hasUnresolvedIssues() || helper.hasUnresolvedRuleViolations()][.alert]#${errorTitle}#[#else] Disclosure Document[/#if]
4545
:author-name: OSS Review Toolkit
@@ -54,8 +54,10 @@ The applicable license information is listed below:
5454

5555
<<<
5656

57-
[#--Merge the licenses and copyrights of all projects into a single list. The default LicenseView.ALL is used because--]
58-
[#--projects cannot have a concluded license (compare with the handling of packages below). --]
57+
[#--
58+
Merge the licenses and copyrights of all projects into a single list. The default LicenseView.ALL is used because
59+
projects cannot have a concluded license (compare with the handling of packages below).
60+
--]
5961

6062
[#assign mergedLicenses = helper.mergeLicenses(projects)]
6163
== Project Licenses
@@ -102,9 +104,9 @@ License File: <<${ModelExtensions.toPurl(package.id)} ${licenseFile.path}, ${lic
102104

103105
[/#list]
104106
[#--
105-
Filter the licenses of the package using LicenseView.CONCLUDED_OR_DECLARED_AND_DETECTED. This is the default view which
106-
ignores declared and detected licenses if a license conclusion for the package was made. If copyrights were detected
107-
for a concluded license those statements are kept.
107+
Filter the licenses of the package using LicenseView.CONCLUDED_OR_DECLARED_AND_DETECTED. This is the default view
108+
which ignores declared and detected licenses if a license conclusion for the package was made. If copyrights were
109+
detected for a concluded license those statements are kept.
108110
--]
109111
[#assign
110112
resolvedLicenses = package.licensesNotInLicenseFiles(
@@ -136,9 +138,7 @@ The following licenses and copyrights were found in the source code of this pack
136138
[/#if]
137139
[/#list]
138140
<<<
139-
[#--
140-
Append the text of all licenses that have been listed in the above lists for licenses and coppyrights
141-
--]
141+
[#-- Append the text of all licenses that have been listed in the above lists for licenses and copyrights. --]
142142
[appendix]
143143
== License Texts
144144

‎reporter/src/main/resources/templates/asciidoc/vulnerability_report.ftl

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
[#--
2-
Copyright (C) 2020 The ORT Project Authors (see <https://github.com/oss-review-toolkit/ort/blob/main/NOTICE>)
2+
Copyright (C) 2020 The ORT Project Authors (see <https://github.com/oss-review-toolkit/ort/blob/main/NOTICE>)
33
4-
Licensed under the Apache License, Version 2.0 (the "License");
5-
you may not use this file except in compliance with the License.
6-
You may obtain a copy of the License at
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
77
8-
https://www.apache.org/licenses/LICENSE-2.0
8+
https://www.apache.org/licenses/LICENSE-2.0
99
10-
Unless required by applicable law or agreed to in writing, software
11-
distributed under the License is distributed on an "AS IS" BASIS,
12-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
See the License for the specific language governing permissions and
14-
limitations under the License.
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
1515
16-
SPDX-License-Identifier: Apache-2.0
17-
License-Filename: LICENSE
16+
SPDX-License-Identifier: Apache-2.0
17+
License-Filename: LICENSE
1818
--]
1919

2020
[#assign ModelExtensions = statics['org.ossreviewtoolkit.model.utils.ExtensionsKt']]

0 commit comments

Comments
 (0)