mathieucarbou · mathieucarbou · Jan 28, 2025 · Sep 2, 2024 · Jan 28, 2025
diff --git a/.config/checkstyle.xml b/.config/checkstyle.xml
@@ -259,4 +259,4 @@
     </module>
     <module name="SingleLineJavadoc"/>
   </module>
-</module>
+</module>
diff --git a/.config/style.intellij-idea.xml b/.config/style.intellij-idea.xml
@@ -20,4 +20,4 @@
       <option name="TAB_SIZE" value="2" />
     </indentOptions>
   </codeStyleSettings>
-</code_scheme>
+</code_scheme>
diff --git a/.gitattributes b/.gitattributes
@@ -45,4 +45,4 @@ license-maven-plugin/src/test/resources/unknown/header.txt text eol=crlf
 license-maven-plugin/src/test/resources/update/doc1.txt text eol=crlf
 license-maven-plugin/src/test/resources/update/doc2.txt text eol=crlf
 license-maven-plugin/src/test/resources/update/issue48/test1.php text eol=crlf
-license-maven-plugin/src/test/resources/update/issue48/test2.php text eol=crlf
+license-maven-plugin/src/test/resources/update/issue48/test2.php text eol=crlf
diff --git a/...s/src/main/resources/META-INF/services/com.mycila.maven.plugin.license.PropertiesProvider b/...s/src/main/resources/META-INF/services/com.mycila.maven.plugin.license.PropertiesProvider
@@ -1 +1 @@
-com.mycila.maven.plugin.license.fs.CopyrightRangeProvider
+com.mycila.maven.plugin.license.fs.CopyrightRangeProvider
diff --git a/license-maven-plugin-git/src/main/java/com/mycila/maven/plugin/license/git/GitLookup.java b/license-maven-plugin-git/src/main/java/com/mycila/maven/plugin/license/git/GitLookup.java
@@ -314,4 +314,4 @@ private String getAuthorEmailFromCommit(RevCommit commit) {
   public void close() {
     repository.close();
   }
-}
+}
diff --git a/...t/src/main/resources/META-INF/services/com.mycila.maven.plugin.license.PropertiesProvider b/...t/src/main/resources/META-INF/services/com.mycila.maven.plugin.license.PropertiesProvider
@@ -1,2 +1,2 @@
 com.mycila.maven.plugin.license.git.CopyrightRangeProvider
-com.mycila.maven.plugin.license.git.CopyrightAuthorProvider
+com.mycila.maven.plugin.license.git.CopyrightAuthorProvider
diff --git a/...nse-maven-plugin-git/src/test/java/com/mycila/maven/plugin/license/git/GitLookupTest.java b/...nse-maven-plugin-git/src/test/java/com/mycila/maven/plugin/license/git/GitLookupTest.java
@@ -261,4 +261,4 @@ private void assertCreation(GitLookup provider, String relativePath, int expecte
     Assertions.assertEquals(expected, actual);
   }
 
-}
+}
diff --git a/...n/src/main/resources/META-INF/services/com.mycila.maven.plugin.license.PropertiesProvider b/...n/src/main/resources/META-INF/services/com.mycila.maven.plugin.license.PropertiesProvider
@@ -1 +1 @@
-com.mycila.maven.plugin.license.svn.SVNPropertiesProvider
+com.mycila.maven.plugin.license.svn.SVNPropertiesProvider
diff --git a/license-maven-plugin/src/it/legacy-config-and-license-set/invoker.properties b/license-maven-plugin/src/it/legacy-config-and-license-set/invoker.properties
@@ -1 +1 @@
-invoker.goals=license:format
+invoker.goals=license:format
diff --git a/license-maven-plugin/src/it/legacy-config-and-license-set/mock-license-1.txt b/license-maven-plugin/src/it/legacy-config-and-license-set/mock-license-1.txt
@@ -1,2 +1,2 @@
 This is the 1st
-mock license
+mock license
diff --git a/license-maven-plugin/src/it/legacy-config-and-license-set/mock-license-2.txt b/license-maven-plugin/src/it/legacy-config-and-license-set/mock-license-2.txt
@@ -1,2 +1,2 @@
 This is the 2nd
-mock license
+mock license
diff --git a/license-maven-plugin/src/it/legacy-config-and-license-set/pom.xml b/license-maven-plugin/src/it/legacy-config-and-license-set/pom.xml
@@ -50,4 +50,4 @@
     </plugins>
   </build>
 
-</project>
+</project>
diff --git a/license-maven-plugin/src/it/legacy-config-and-license-set/setup.groovy b/license-maven-plugin/src/it/legacy-config-and-license-set/setup.groovy
@@ -20,4 +20,4 @@ for (final String filename : ALL_FILES) {
   Files.copy(unformattedJavaFile, unformattedJavaFile.resolveSibling(filename + ".bak"))
 }
 
-return true;
+return true;
diff --git a/license-maven-plugin/src/it/legacy-config/invoker.properties b/license-maven-plugin/src/it/legacy-config/invoker.properties
@@ -1 +1 @@
-invoker.goals=license:format
+invoker.goals=license:format
diff --git a/license-maven-plugin/src/it/legacy-config/mock-license.txt b/license-maven-plugin/src/it/legacy-config/mock-license.txt
@@ -1,2 +1,2 @@
 This is a
-mock license
+mock license
diff --git a/license-maven-plugin/src/it/legacy-config/pom.xml b/license-maven-plugin/src/it/legacy-config/pom.xml
@@ -30,4 +30,4 @@
     </plugins>
   </build>
 
-</project>
+</project>
diff --git a/license-maven-plugin/src/it/legacy-config/setup.groovy b/license-maven-plugin/src/it/legacy-config/setup.groovy
@@ -16,4 +16,4 @@ if (!Files.exists(unformattedJavaFile)) {
 
 Files.copy(unformattedJavaFile, unformattedJavaFile.resolveSibling("Unformatted1.java.bak"))
 
-return true;
+return true;
diff --git a/license-maven-plugin/src/it/multi-license/invoker.properties b/license-maven-plugin/src/it/multi-license/invoker.properties
@@ -1 +1 @@
-invoker.goals=license:format
+invoker.goals=license:format
diff --git a/license-maven-plugin/src/it/multi-license/mock-license-1.txt b/license-maven-plugin/src/it/multi-license/mock-license-1.txt
@@ -1,2 +1,2 @@
 This is the 1st
-mock license
+mock license
diff --git a/license-maven-plugin/src/it/multi-license/mock-license-2.txt b/license-maven-plugin/src/it/multi-license/mock-license-2.txt
@@ -1,2 +1,2 @@
 This is the 2nd
-mock license
+mock license
diff --git a/license-maven-plugin/src/it/multi-license/mock-license-3.txt b/license-maven-plugin/src/it/multi-license/mock-license-3.txt
@@ -1,2 +1,2 @@
 This is the 3rd
-mock license
+mock license
diff --git a/license-maven-plugin/src/it/multi-license/pom.xml b/license-maven-plugin/src/it/multi-license/pom.xml
@@ -41,4 +41,4 @@
     </plugins>
   </build>
 
-</project>
+</project>
diff --git a/license-maven-plugin/src/it/multi-license/setup.groovy b/license-maven-plugin/src/it/multi-license/setup.groovy
@@ -16,4 +16,4 @@ if (!Files.exists(unformattedJavaFile)) {
 
 Files.copy(unformattedJavaFile, unformattedJavaFile.resolveSibling("Unformatted1.java.bak"))
 
-return true;
+return true;
diff --git a/license-maven-plugin/src/it/pom-properties/invoker.properties b/license-maven-plugin/src/it/pom-properties/invoker.properties
@@ -1 +1 @@
-invoker.goals=license:format
+invoker.goals=license:format
diff --git a/license-maven-plugin/src/it/single-licence-set/invoker.properties b/license-maven-plugin/src/it/single-licence-set/invoker.properties
@@ -1 +1 @@
-invoker.goals=license:format
+invoker.goals=license:format
diff --git a/license-maven-plugin/src/it/single-licence-set/mock-license.txt b/license-maven-plugin/src/it/single-licence-set/mock-license.txt
@@ -1,2 +1,2 @@
 This is a
-mock license
+mock license
diff --git a/license-maven-plugin/src/it/single-licence-set/pom.xml b/license-maven-plugin/src/it/single-licence-set/pom.xml
@@ -34,4 +34,4 @@
     </plugins>
   </build>
 
-</project>
+</project>
diff --git a/license-maven-plugin/src/it/single-licence-set/setup.groovy b/license-maven-plugin/src/it/single-licence-set/setup.groovy
@@ -16,4 +16,4 @@ if (!Files.exists(unformattedJavaFile)) {
 
 Files.copy(unformattedJavaFile, unformattedJavaFile.resolveSibling("Unformatted1.java.bak"))
 
-return true;
+return true;
diff --git a/license-maven-plugin/src/it/tri-license-set-with-includes/mock-license-1.txt b/license-maven-plugin/src/it/tri-license-set-with-includes/mock-license-1.txt
@@ -1,2 +1,2 @@
 This is the 1st
-mock license
+mock license
diff --git a/license-maven-plugin/src/it/tri-license-set-with-includes/mock-license-2.txt b/license-maven-plugin/src/it/tri-license-set-with-includes/mock-license-2.txt
@@ -1,2 +1,2 @@
 This is the 2nd
-mock license
+mock license
diff --git a/license-maven-plugin/src/it/tri-license-set-with-includes/mock-license-3.txt b/license-maven-plugin/src/it/tri-license-set-with-includes/mock-license-3.txt
@@ -1,2 +1,2 @@
 This is the 3rd
-mock license
+mock license
diff --git a/license-maven-plugin/src/it/tri-license-set-with-includes/pom.xml b/license-maven-plugin/src/it/tri-license-set-with-includes/pom.xml
@@ -56,4 +56,4 @@
     </plugins>
   </build>
 
-</project>
+</project>
diff --git a/license-maven-plugin/src/it/tri-license-set/invoker.properties b/license-maven-plugin/src/it/tri-license-set/invoker.properties
@@ -1 +1 @@
-invoker.goals=license:format
+invoker.goals=license:format
diff --git a/license-maven-plugin/src/it/tri-license-set/mock-license-1.txt b/license-maven-plugin/src/it/tri-license-set/mock-license-1.txt
@@ -1,2 +1,2 @@
 This is the 1st
-mock license
+mock license
diff --git a/license-maven-plugin/src/it/tri-license-set/mock-license-2.txt b/license-maven-plugin/src/it/tri-license-set/mock-license-2.txt
@@ -1,2 +1,2 @@
 This is the 2nd
-mock license
+mock license
diff --git a/license-maven-plugin/src/it/tri-license-set/mock-license-3.txt b/license-maven-plugin/src/it/tri-license-set/mock-license-3.txt
@@ -1,2 +1,2 @@
 This is the 3rd
-mock license
+mock license
diff --git a/license-maven-plugin/src/it/tri-license-set/pom.xml b/license-maven-plugin/src/it/tri-license-set/pom.xml
@@ -56,4 +56,4 @@
     </plugins>
   </build>
 
-</project>
+</project>
diff --git a/license-maven-plugin/src/it/tri-license-set/setup.groovy b/license-maven-plugin/src/it/tri-license-set/setup.groovy
@@ -20,4 +20,4 @@ for (final String filename : ALL_FILES) {
   Files.copy(unformattedJavaFile, unformattedJavaFile.resolveSibling(filename + ".bak"))
 }
 
-return true;
+return true;
diff --git a/...main/java/com/mycila/maven/plugin/license/dependencies/AbstractLicensePolicyEnforcer.java b/...main/java/com/mycila/maven/plugin/license/dependencies/AbstractLicensePolicyEnforcer.java
@@ -30,4 +30,4 @@ protected AbstractLicensePolicyEnforcer(final LicensePolicy policy) {
   public LicensePolicy getPolicy() {
     return policy;
   }
-}
+}
diff --git a/.../main/java/com/mycila/maven/plugin/license/dependencies/DefaultLicensePolicyEnforcer.java b/.../main/java/com/mycila/maven/plugin/license/dependencies/DefaultLicensePolicyEnforcer.java
@@ -23,4 +23,4 @@ public class DefaultLicensePolicyEnforcer extends ArtifactLicensePolicyEnforcer
   public DefaultLicensePolicyEnforcer() {
     super(new LicensePolicy(LicensePolicy.Rule.DENY, LicensePolicy.Type.ARTIFACT_PATTERN, "*"));
   }
-}
+}
diff --git a/...ven-plugin/src/main/java/com/mycila/maven/plugin/license/dependencies/LicenseMessage.java b/...ven-plugin/src/main/java/com/mycila/maven/plugin/license/dependencies/LicenseMessage.java
@@ -22,4 +22,4 @@ public interface LicenseMessage {
   String WARN_POLICY_DENIED = "Some licenses were denied by policy:";
   String INFO_LICENSE_IMPL = "Checking licenses in dependencies using";
   String INFO_DEPS_DISCOVERED = "Discovered dependencies after filtering";
-}
+}
diff --git a/...n/java/com/mycila/maven/plugin/license/dependencies/LicenseNameLicensePolicyEnforcer.java b/...n/java/com/mycila/maven/plugin/license/dependencies/LicenseNameLicensePolicyEnforcer.java
@@ -36,4 +36,4 @@ public boolean apply(final License target) {
   public Class<?> getType() {
     return License.class;
   }
-}
+}
diff --git a/...gin/src/main/java/com/mycila/maven/plugin/license/dependencies/LicensePolicyEnforcer.java b/...gin/src/main/java/com/mycila/maven/plugin/license/dependencies/LicensePolicyEnforcer.java
@@ -25,4 +25,4 @@ public interface LicensePolicyEnforcer<T> {
   public boolean apply(final T target);
 
   public Class<?> getType();
-}
+}
diff --git a/...c/main/java/com/mycila/maven/plugin/license/dependencies/LicensePolicyEnforcerResult.java b/...c/main/java/com/mycila/maven/plugin/license/dependencies/LicensePolicyEnforcerResult.java
@@ -70,4 +70,4 @@ public License getLicense() {
   public String toString() {
     return String.format("%s [%s] %s", getArtifact(), getLicense().getName(), getPolicy());
   }
-}
+}
diff --git a/...in/java/com/mycila/maven/plugin/license/dependencies/LicenseURLLicensePolicyEnforcer.java b/...in/java/com/mycila/maven/plugin/license/dependencies/LicenseURLLicensePolicyEnforcer.java
@@ -36,4 +36,4 @@ public boolean apply(final License target) {
   public Class<?> getType() {
     return License.class;
   }
-}
+}
diff --git a/license-maven-plugin/src/main/resources/com/mycila/maven/plugin/license/templates/BSD-3.txt b/license-maven-plugin/src/main/resources/com/mycila/maven/plugin/license/templates/BSD-3.txt
@@ -21,4 +21,4 @@ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/license-maven-plugin/src/main/resources/com/mycila/maven/plugin/license/templates/BSD-4.txt b/license-maven-plugin/src/main/resources/com/mycila/maven/plugin/license/templates/BSD-4.txt
@@ -24,4 +24,4 @@ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/...e-maven-plugin/src/main/resources/com/mycila/maven/plugin/license/templates/UNLICENSE.txt b/...e-maven-plugin/src/main/resources/com/mycila/maven/plugin/license/templates/UNLICENSE.txt
@@ -21,4 +21,4 @@ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 
-For more information, please refer to <http://unlicense.org>
+For more information, please refer to <http://unlicense.org>
diff --git a/license-maven-plugin/src/main/resources/com/mycila/maven/plugin/license/templates/WTFPL.txt b/license-maven-plugin/src/main/resources/com/mycila/maven/plugin/license/templates/WTFPL.txt
@@ -1,4 +1,4 @@
 Copyright © ${year} ${owner} <${email}>
 This work is free. You can redistribute it and/or modify it under the
 terms of the Do What The Fuck You Want To Public License, Version 2,
-as published by Sam Hocevar. See http://www.wtfpl.net/ for more details.
+as published by Sam Hocevar. See http://www.wtfpl.net/ for more details.
diff --git a/license-maven-plugin/src/test/java/com/mycila/maven/plugin/license/RemoveMojoTest.java b/license-maven-plugin/src/test/java/com/mycila/maven/plugin/license/RemoveMojoTest.java
@@ -59,13 +59,13 @@ void test_remove_xml_txt() throws Exception {
     remove.project = new MavenProjectStub();
     remove.execute();
 
-    Assertions.assertEquals(FileUtils.read(new File(tmp, "doc9.xml"), Charset.defaultCharset()), "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\r\n" +
+    Assertions.assertEquals("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\r\n" +
         "\r\n" +
         "\r\n" +
         "\r\n" +
         "<web-app>\r\n" +
         "\r\n" +
-        "</web-app>\r\n");
+        "</web-app>\r\n", FileUtils.read(new File(tmp, "doc9.xml"), Charset.defaultCharset()));
     Assertions.assertEquals("some data\r\nand other data\r\n", FileUtils.read(new File(tmp, "doc3.txt"), Charset.defaultCharset()));
   }
 
@@ -83,9 +83,9 @@ void test_remove_script_style() throws Exception {
     remove.project = new MavenProjectStub();
     remove.execute();
 
-    Assertions.assertEquals(FileUtils.read(new File(tmp, "issue44.rb"), Charset.defaultCharset()), "ruby code here" + LS + "and other data" + LS + "");
-    Assertions.assertEquals(FileUtils.read(new File(tmp, "issue44-2.rb"), Charset.defaultCharset()), "# code comment" + LS + "ruby code here" + LS + "and other data" + LS + "");
-    Assertions.assertEquals(FileUtils.read(new File(tmp, "issue44-3.rb"), Charset.defaultCharset()), "# code comment" + LS + "ruby code here" + LS + "and other data" + LS + "");
+    Assertions.assertEquals("ruby code here" + LS + "and other data" + LS + "", FileUtils.read(new File(tmp, "issue44.rb"), Charset.defaultCharset()));
+    Assertions.assertEquals("# code comment" + LS + "ruby code here" + LS + "and other data" + LS + "", FileUtils.read(new File(tmp, "issue44-2.rb"), Charset.defaultCharset()));
+    Assertions.assertEquals("# code comment" + LS + "ruby code here" + LS + "and other data" + LS + "", FileUtils.read(new File(tmp, "issue44-3.rb"), Charset.defaultCharset()));
   }
 
   @Test
@@ -100,9 +100,9 @@ void test_remove_multiline() throws Exception {
     remove.project = new MavenProjectStub();
     remove.execute();
 
-    Assertions.assertEquals(FileUtils.read(new File(tmp, "test.xml"), Charset.defaultCharset()), "<assembly>" + LS + "" +
+    Assertions.assertEquals("<assembly>" + LS + "" +
         "  <id>project</id>" + LS + "" +
-        "</assembly>" + LS + "");
+        "</assembly>" + LS + "", FileUtils.read(new File(tmp, "test.xml"), Charset.defaultCharset()));
   }
 
   @Test
@@ -117,11 +117,11 @@ void test_js_1() throws Exception {
     remove.project = new MavenProjectStub();
     remove.execute();
 
-    Assertions.assertEquals(FileUtils.read(new File(tmp, "test1.js"), Charset.defaultCharset()), "/**" + LS + "" +
+    Assertions.assertEquals("/**" + LS + "" +
         " * jrunscript JavaScript built-in functions and objects." + LS + "" +
         " */" + LS + "" +
         "" + LS + "" +
-        "function a(){}");
+        "function a(){}", FileUtils.read(new File(tmp, "test1.js"), Charset.defaultCharset()).trim());
   }
 
   @Test
@@ -136,11 +136,11 @@ void test_js_2() throws Exception {
     remove.project = new MavenProjectStub();
     remove.execute();
 
-    Assertions.assertEquals(FileUtils.read(new File(tmp, "test2.js"), Charset.defaultCharset()), "/**" + LS + "" +
+    Assertions.assertEquals("/**" + LS + "" +
         " * jrunscript JavaScript built-in functions and objects." + LS + "" +
         " */" + LS + "" +
         "" + LS + "" +
-        "function a(){}");
+        "function a(){}", FileUtils.read(new File(tmp, "test2.js"), Charset.defaultCharset()).trim());
   }
 
   @Test

diff --git a/license-maven-plugin/src/test/java/com/mycila/maven/plugin/license/ReportTest.java b/license-maven-plugin/src/test/java/com/mycila/maven/plugin/license/ReportTest.java
@@ -89,7 +89,7 @@ void test_check_json() throws Exception {
     }
 
     String processed = unixify(FileUtils.read(plugin.reportLocation, Charset.defaultCharset()));
-    String expected = FileUtils.read(new File("src/test/resources/issues/issue-122/check.json"), Charset.defaultCharset());
+    String expected = FileUtils.read(new File("src/test/resources/issues/issue-122/check.json"), Charset.defaultCharset()).trim();
     assertThat(processed).isEqualTo(expected);
   }
 
@@ -129,7 +129,7 @@ void test_format_json() throws Exception {
     plugin.execute();
 
     String processed = unixify(FileUtils.read(plugin.reportLocation, Charset.defaultCharset()));
-    String expected = FileUtils.read(new File("src/test/resources/issues/issue-122/format.json"), Charset.defaultCharset());
+    String expected = FileUtils.read(new File("src/test/resources/issues/issue-122/format.json"), Charset.defaultCharset()).trim();
     assertThat(processed).isEqualTo(expected);
   }
 
@@ -169,7 +169,7 @@ void test_remove_json() throws Exception {
     plugin.execute();
 
     String processed = unixify(FileUtils.read(plugin.reportLocation, Charset.defaultCharset()));
-    String expected = FileUtils.read(new File("src/test/resources/issues/issue-122/remove.json"), Charset.defaultCharset());
+    String expected = FileUtils.read(new File("src/test/resources/issues/issue-122/remove.json"), Charset.defaultCharset()).trim();
     assertThat(processed).isEqualTo(expected);
   }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		com.mycila.maven.plugin.license.fs.CopyrightRangeProvider
		com.mycila.maven.plugin.license.fs.CopyrightRangeProvider
-Original file line number
+Diff line change
@@ Expand Up / @@ -314,4 +314,4 @@ private String getAuthorEmailFromCommit(RevCommit commit) { @@
       public void close() {
         repository.close();
       }
-    }
+    }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		com.mycila.maven.plugin.license.svn.SVNPropertiesProvider
		com.mycila.maven.plugin.license.svn.SVNPropertiesProvider
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		invoker.goals=license:format
		invoker.goals=license:format
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,4 +16,4 @@ if (!Files.exists(unformattedJavaFile)) {

		Files.copy(unformattedJavaFile, unformattedJavaFile.resolveSibling("Unformatted1.java.bak"))

		return true;
		return true;