From 61003ca6fb40d9be4ebf5a059115f34797c8f341 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Wed, 24 Feb 2016 16:21:31 +0000
Subject: [PATCH] OPENDJ-2689 Update copyright plugin
---
opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-3.java | 2
opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-6.java | 0
opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-9.xsl | 16 ++++++++
opendj-sdk/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/UpdateCopyrightMojo.java | 6 +-
opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-3.java | 0
opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-5.txt | 2
opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-2.java | 0
opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-5.java | 0
/dev/null | 29 --------------
opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-4.h | 2
opendj-sdk/opendj-copyright-maven-plugin/src/test/java/org/forgerock/maven/UpdateCopyrightTestCase.java | 6 +--
opendj-sdk/pom.xml | 14 -------
opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-6.txt | 2
opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-4.java | 0
opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-7.html | 19 +++++++++
opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-1.java | 0
opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-2.c | 1
opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-8.xml | 18 +++++++++
opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-1.java | 0
19 files changed, 62 insertions(+), 55 deletions(-)
diff --git a/opendj-sdk/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/UpdateCopyrightMojo.java b/opendj-sdk/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/UpdateCopyrightMojo.java
index 411d170..a362ae3 100644
--- a/opendj-sdk/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/UpdateCopyrightMojo.java
+++ b/opendj-sdk/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/UpdateCopyrightMojo.java
@@ -313,7 +313,7 @@
* Number of lines to add after the line which contains the lineBeforeCopyrightToken.
* Used only if a new copyright line is needed.
*/
- @Parameter(required = true, defaultValue = "2")
+ @Parameter(required = true, defaultValue = "1")
private Integer nbLinesToSkip;
/**
@@ -321,11 +321,11 @@
* copyright section. Used only if a new copyright or portion copyright is
* needed.
*/
- @Parameter(required = true, defaultValue = "6")
+ @Parameter(required = true, defaultValue = "1")
private Integer numberSpaceIdentation;
/** The last non empty commented line before the copyright section. */
- @Parameter(required = true, defaultValue = "CDDL\\s+HEADER\\s+END")
+ @Parameter(required = true, defaultValue = "\\\"Portions Copyright \\[year\\] \\[name of copyright owner\\]\\\"")
private String lineBeforeCopyrightRegExp;
/** The regular expression which identifies a copyrighted line. */
diff --git a/opendj-sdk/opendj-copyright-maven-plugin/src/test/java/org/forgerock/maven/UpdateCopyrightTestCase.java b/opendj-sdk/opendj-copyright-maven-plugin/src/test/java/org/forgerock/maven/UpdateCopyrightTestCase.java
index 994ff1c..d71bc81 100644
--- a/opendj-sdk/opendj-copyright-maven-plugin/src/test/java/org/forgerock/maven/UpdateCopyrightTestCase.java
+++ b/opendj-sdk/opendj-copyright-maven-plugin/src/test/java/org/forgerock/maven/UpdateCopyrightTestCase.java
@@ -48,7 +48,7 @@
private static final String CURRENT_YEAR = Integer.toString(Calendar.getInstance().get(Calendar.YEAR));
private static final String RESOURCE_DIR = "src/test/resources/files/";
- private static final String[] TEST_FOLDERS = { "openam-copyrights", "opendj-copyrights", "openidm-copyrights"};
+ private static final String[] TEST_FOLDERS = { "forgerock-copyrights", "openidm-copyrights"};
/** Customs tags in tests files. */
private static final String MUST_BE_REMOVED_TAG = "MUST BE REMOVED:";
@@ -73,9 +73,7 @@
// New copyright end String
{ TEST_FOLDERS[0], "Portions\\s+Copyright\\s+\\[year\\]\\s+\\[name\\s+of\\s+copyright\\s+owner\\]",
1, 1, "Portions copyright", "Copyright", "ForgeRock\\s+AS", "ForgeRock AS." },
- { TEST_FOLDERS[1], "CDDL\\s+HEADER\\s+END", 1, 6, "Portions Copyright", "Copyright",
- "ForgeRock\\s+AS\\.", "ForgeRock AS." },
- { TEST_FOLDERS[2],
+ { TEST_FOLDERS[1],
"DO\\s+NOT\\s+ALTER\\s+OR\\s+REMOVE\\s+COPYRIGHT\\s+NOTICES\\s+OR\\s+THIS\\s+HEADER.", 1, 1,
"Portions Copyrighted", "Copyright (c)", "ForgeRock\\s+AS\\.",
"ForgeRock AS. All rights reserved." }
diff --git a/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openam-copyrights/openam-bad-copyright-1.txt b/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-1.java
similarity index 100%
rename from opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openam-copyrights/openam-bad-copyright-1.txt
rename to opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-1.java
diff --git a/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openam-copyrights/openam-bad-copyright-2.txt b/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-2.c
similarity index 99%
rename from opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openam-copyrights/openam-bad-copyright-2.txt
rename to opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-2.c
index e8020b8..e89d838 100644
--- a/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openam-copyrights/openam-bad-copyright-2.txt
+++ b/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-2.c
@@ -16,4 +16,3 @@
MUST BE REMOVED: Copyright 2010 ForgeRock AS.
EXPECTED OUTPUT: Copyright 2010-YEAR ForgeRock AS.
-
\ No newline at end of file
diff --git a/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openam-copyrights/openam-bad-copyright-3.txt b/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-3.java
similarity index 99%
rename from opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openam-copyrights/openam-bad-copyright-3.txt
rename to opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-3.java
index f829e82..7f738e2 100644
--- a/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openam-copyrights/openam-bad-copyright-3.txt
+++ b/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-3.java
@@ -13,4 +13,4 @@
*
*/
- EXPECTED OUTPUT: Copyright YEAR ForgeRock AS.
\ No newline at end of file
+ EXPECTED OUTPUT: Copyright YEAR ForgeRock AS.
diff --git a/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openam-copyrights/openam-bad-copyright-4.txt b/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-4.h
similarity index 99%
rename from opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openam-copyrights/openam-bad-copyright-4.txt
rename to opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-4.h
index 44007f7..9bf2ebe 100644
--- a/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openam-copyrights/openam-bad-copyright-4.txt
+++ b/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-4.h
@@ -14,4 +14,4 @@
* Copyright 2010 Old Copyright Owner Inc.
*/
- EXPECTED OUTPUT: Portions copyright YEAR ForgeRock AS.
\ No newline at end of file
+ EXPECTED OUTPUT: Portions copyright YEAR ForgeRock AS.
diff --git a/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openam-copyrights/openam-bad-copyright-5.txt b/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-5.txt
similarity index 99%
rename from opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openam-copyrights/openam-bad-copyright-5.txt
rename to opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-5.txt
index 8efdebd..d785efa 100644
--- a/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openam-copyrights/openam-bad-copyright-5.txt
+++ b/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-5.txt
@@ -15,4 +15,4 @@
* copyright 2013-2014 Old copyright owner Inc.
*/
- EXPECTED OUTPUT: Portions copyright YEAR ForgeRock AS.
\ No newline at end of file
+ EXPECTED OUTPUT: Portions copyright YEAR ForgeRock AS.
diff --git a/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openam-copyrights/openam-bad-copyright-6.txt b/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-6.txt
similarity index 99%
rename from opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openam-copyrights/openam-bad-copyright-6.txt
rename to opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-6.txt
index 29824e6..edffc95 100644
--- a/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openam-copyrights/openam-bad-copyright-6.txt
+++ b/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-6.txt
@@ -17,4 +17,4 @@
*/
MUST BE REMOVED: Portions copyright 2013-2014 ForgeRock AS.
-EXPECTED OUTPUT: Portions copyright 2013-YEAR ForgeRock AS.
\ No newline at end of file
+EXPECTED OUTPUT: Portions copyright 2013-YEAR ForgeRock AS.
diff --git a/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-7.html b/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-7.html
new file mode 100644
index 0000000..93f92af
--- /dev/null
+++ b/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-7.html
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ! The contents of this file are subject to the terms of the Common Development and
+ ! Distribution License (the License). You may not use this file except in compliance with the
+ ! License.
+ !
+ ! You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
+ ! specific language governing permission and limitations under the License.
+ !
+ ! When distributing Covered Software, include this CDDL Header Notice in each file and include
+ ! the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
+ ! Header, with the fields enclosed by brackets [] replaced by your own identifying
+ ! information: "Portions Copyright [year] [name of copyright owner]".
+ !
+ ! Copyright 2012-2014 ForgeRock AS.
+-->
+
+MUST BE REMOVED: Copyright 2012-2014 ForgeRock AS.
+EXPECTED OUTPUT: Copyright 2012-YEAR ForgeRock AS.
diff --git a/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-8.xml b/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-8.xml
new file mode 100644
index 0000000..66a3306
--- /dev/null
+++ b/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-8.xml
@@ -0,0 +1,18 @@
+<!--
+ The contents of this file are subject to the terms of the Common Development and
+ Distribution License (the License). You may not use this file except in compliance with the
+ License.
+
+ You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
+ specific language governing permission and limitations under the License.
+
+ When distributing Covered Software, include this CDDL Header Notice in each file and include
+ the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
+ Header, with the fields enclosed by brackets [] replaced by your own identifying
+ information: "Portions Copyright [year] [name of copyright owner]".
+
+ Copyright 2013 ForgeRock AS.
+ -->
+
+MUST BE REMOVED: Copyright 2013 ForgeRock AS.
+EXPECTED OUTPUT: Copyright 2013-YEAR ForgeRock AS.
diff --git a/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-9.xsl b/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-9.xsl
new file mode 100644
index 0000000..dc3b26e
--- /dev/null
+++ b/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-9.xsl
@@ -0,0 +1,16 @@
+<!--
+ ~ The contents of this file are subject to the terms of the Common Development and
+ ~ Distribution License (the License). You may not use this file except in compliance with the
+ ~ License.
+ ~
+ ~ You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
+ ~ specific language governing permission and limitations under the License.
+ ~
+ ~ When distributing Covered Software, include this CDDL Header Notice in each file and include
+ ~ the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
+ ~ Header, with the fields enclosed by brackets [] replaced by your own identifying
+ ~ information: "Portions Copyright [year] [name of copyright owner]".
+ ~
+-->
+
+EXPECTED OUTPUT: Copyright YEAR ForgeRock AS.
diff --git a/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-1.txt b/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-1.txt
deleted file mode 100644
index 06a8eb1..0000000
--- a/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-1.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ! CDDL HEADER START
- !
- ! The contents of this file are subject to the terms of the
- ! Common Development and Distribution License, Version 1.0 only
- ! (the "License"). You may not use this file except in compliance
- ! with the License.
- !
- ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- ! or http://forgerock.org/license/CDDLv1.0.html.
- ! See the License for the specific language governing permissions
- ! and limitations under the License.
- !
- ! When distributing Covered Code, include this CDDL HEADER in each
- ! file and include the License file at legal-notices/CDDLv1_0.txt.
- ! If applicable, add the following below this CDDL HEADER, with the
- ! fields enclosed by brackets "[]" replaced with your own identifying
- ! information:
- ! Portions Copyright [yyyy] [name of copyright owner]
- !
- ! CDDL HEADER END
- !
- ! Copyright 2012-2014 ForgeRock AS.
--->
-
-MUST BE REMOVED: Copyright 2012-2014 ForgeRock AS.
-EXPECTED OUTPUT: Copyright 2012-YEAR ForgeRock AS.
\ No newline at end of file
diff --git a/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-2.txt b/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-2.txt
deleted file mode 100644
index 4c140eb..0000000
--- a/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-2.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- * Copyright 2013 ForgeRock AS.
- */
-
-MUST BE REMOVED: Copyright 2013 ForgeRock AS.
-EXPECTED OUTPUT: Copyright 2013-YEAR ForgeRock AS.
\ No newline at end of file
diff --git a/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-3.txt b/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-3.txt
deleted file mode 100644
index e5f6721..0000000
--- a/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-3.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- */
-
-EXPECTED OUTPUT: Copyright YEAR ForgeRock AS.
\ No newline at end of file
diff --git a/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-4.txt b/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-4.txt
deleted file mode 100644
index 322dbb0..0000000
--- a/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-4.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * The contents of this file are subject to the terms of the Common Development and
- * Distribution License (the License). You may not use this file except in compliance with the
- * License.
- *
- * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
- * specific language governing permission and limitations under the License.
- *
- * When distributing Covered Software, include this CDDL Header Notice in each file and include
- * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
- * Header, with the fields enclosed by brackets [] replaced by your own identifying
- * information: "Portions Copyright [year] [name of copyright owner]".
- *
- * Copyright 2010-2013 Old Copyright Owner Inc.
- */
-
-EXPECTED OUTPUT: Portions Copyright YEAR ForgeRock AS.
\ No newline at end of file
diff --git a/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-5.txt b/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-5.txt
deleted file mode 100644
index 1c120bb..0000000
--- a/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-5.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- * Copyright 2010-2012 Very Old copyright owner Inc.
- * Copyright 2013-2014 Old copyright owner Inc.
- */
-
-EXPECTED OUTPUT: Portions Copyright YEAR ForgeRock AS.
\ No newline at end of file
diff --git a/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-6.txt b/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-6.txt
deleted file mode 100644
index 0c3a822..0000000
--- a/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-6.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- * Copyright 2008-2010 Very Old copyright owner Inc.
- * Portions Copyright 2011-2012 Old copyright owner Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
- */
-
-MUST BE REMOVED: Portions Copyright 2013-2014 ForgeRock AS.
-EXPECTED OUTPUT: Portions Copyright 2013-YEAR ForgeRock AS.
\ No newline at end of file
diff --git a/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-1.txt b/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-1.java
similarity index 100%
rename from opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-1.txt
rename to opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-1.java
diff --git a/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-2.txt b/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-2.java
similarity index 100%
rename from opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-2.txt
rename to opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-2.java
diff --git a/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-3.txt b/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-3.java
similarity index 100%
rename from opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-3.txt
rename to opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-3.java
diff --git a/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-4.txt b/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-4.java
similarity index 100%
rename from opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-4.txt
rename to opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-4.java
diff --git a/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-5.txt b/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-5.java
similarity index 100%
rename from opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-5.txt
rename to opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-5.java
diff --git a/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-6.txt b/opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-6.java
similarity index 100%
rename from opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-6.txt
rename to opendj-sdk/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-6.java
diff --git a/opendj-sdk/pom.xml b/opendj-sdk/pom.xml
index 64227c9..d4c9331 100644
--- a/opendj-sdk/pom.xml
+++ b/opendj-sdk/pom.xml
@@ -295,20 +295,6 @@
<goals>
<goal>update-copyright</goal>
</goals>
- <configuration>
- <!-- We need to accept the second part of the following regular
- ! expression for submodules:
- ! * opendj-rest2ldap
- !
- ! Please note that the regexp
- ! '\"Portions Copyright \[year\] \[name of copyright owner\]\"'
- ! must never be found before 'CDDL HEADER END' in other submodules,
- ! otherwise the plugin will fail.
- -->
- <lineBeforeCopyrightRegExp>
- (CDDL HEADER END|\"Portions Copyright \[year\] \[name of copyright owner\]\")
- </lineBeforeCopyrightRegExp>
- </configuration>
</execution>
</executions>
</plugin>
--
Gitblit v1.10.0