Skip to content

Commit ae9ca1f

Browse files
authored
Merge pull request #3855 from jansupol/copyright
Fix copyright check using new plugin version
2 parents c15de11 + bfbfb84 commit ae9ca1f

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

etc/config/copyright-exclude

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ jaxb.index
3535
/etc/jersey-1-migrated-tests
3636
/etc/config/copyright-exclude
3737
/etc/config/copyright.txt
38+
/etc/config/edl-copyright.txt
3839
/LICENSE.md
3940
/third-party-license-readme.txt
4041
nb-configuration.xml

etc/config/edl-copyright.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/*
2+
* Copyright (c) YYYY Oracle and/or its affiliates. All rights reserved.
3+
*
4+
* This program and the accompanying materials are made available under the
5+
* terms of the Eclipse Distribution License v. 1.0, which is available at
6+
* http://www.eclipse.org/org/documents/edl-v10.php.
7+
*
8+
* SPDX-License-Identifier: BSD-3-Clause
9+
*/

pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@
569569
<plugin>
570570
<groupId>org.glassfish.copyright</groupId>
571571
<artifactId>glassfish-copyright-maven-plugin</artifactId>
572-
<version>1.39</version>
572+
<version>1.49</version>
573573
<configuration>
574574
<excludeFile>etc/config/copyright-exclude</excludeFile>
575575
<!--svn|mercurial|git - defaults to svn-->
@@ -585,6 +585,7 @@
585585
<!-- check that year is correct -->
586586
<ignoreYear>false</ignoreYear>
587587
<templateFile>etc/config/copyright.txt</templateFile>
588+
<bsdTemplateFile>etc/config/edl-copyright.txt</bsdTemplateFile>
588589
</configuration>
589590
</plugin>
590591
<plugin>

0 commit comments

Comments
 (0)