Skip to content

Commit dbf7907

Browse files
committed
Correct header template, allow legacy package.html.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/cli/trunk@1439200 13f79535-47bb-0310-9956-ffa450edef68
1 parent d1690bd commit dbf7907

2 files changed

Lines changed: 15 additions & 15 deletions

File tree

src/conf/HEADER.txt

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
1-
^/\*\s*$
2-
^ \* Licensed to the Apache Software Foundation \(ASF\) under one\s*$
3-
^ \* or more contributor license agreements. See the NOTICE file\s*$
4-
^ \* distributed with this work for additional information\s*$
5-
^ \* regarding copyright ownership. The ASF licenses this file\s*$
6-
^ \* to you under the Apache License, Version 2.0 \(the\s*$
7-
^ \* "License"\)\; you may not use this file except in compliance\s*$
8-
^ \* with the License. You may obtain a copy of the License at\s*$
1+
^/\*\*\s*$
2+
^ \* Licensed to the Apache Software Foundation \(ASF\) under one or more\s*$
3+
^ \* contributor license agreements. See the NOTICE file distributed with\s*$
4+
^ \* this work for additional information regarding copyright ownership.\s*$
5+
^ \* The ASF licenses this file to You under the Apache License, Version 2.0\s*$
6+
^ \* \(the \"License\"\); you may not use this file except in compliance with\s*$
7+
^ \* the License. You may obtain a copy of the License at\s*$
98
^ \*\s*$
109
^ \*\s+http://www\.apache\.org/licenses/LICENSE-2\.0\s*$
1110
^ \*\s*$
12-
^ \* Unless required by applicable law or agreed to in writing,\s*$
13-
^ \* software distributed under the License is distributed on an\s*$
14-
^ \* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\s*$
15-
^ \* KIND, either express or implied. See the License for the\s*$
16-
^ \* specific language governing permissions and limitations\s*$
17-
^ \* under the License.\s*$
11+
^ \* Unless required by applicable law or agreed to in writing, software\s*$
12+
^ \* distributed under the License is distributed on an "AS IS" BASIS,\s*$
13+
^ \* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\s*$
14+
^ \* See the License for the specific language governing permissions and\s*$
15+
^ \* limitations under the License.\s*$
1816
^ \*/\s*$
1917
^\s*$

src/conf/checkstyle.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ limitations under the License.
2727

2828
<!-- Checks that a package.html file exists for each package. -->
2929
<!-- See http://checkstyle.sourceforge.net/config_javadoc.html#JavadocPackage -->
30-
<module name="JavadocPackage"/>
30+
<module name="JavadocPackage">
31+
<property name="allowLegacy" value="true" />
32+
</module>
3133

3234
<!-- Checks whether files end with a new line. -->
3335
<!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->

0 commit comments

Comments
 (0)