From c6ebd9793a4db31a7bee3616c9b249e13ae7b492 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Wed, 25 Dec 2024 20:13:11 -0500 Subject: [PATCH 1/4] Remove old pom exclusion as noted fixed with plugin 4.4 release --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c9171d02c..4e3cea2db 100644 --- a/pom.xml +++ b/pom.xml @@ -419,8 +419,7 @@ limitations under the License. **/release-pom.xml docs/** .config/** - - **/*.checkstyle + .vscode/** From 5cd30cdd15a4976ad6bbaf30d6db6f30db1f029e Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 12 Jan 2025 17:49:06 -0500 Subject: [PATCH 2/4] [default] Add few extra items to pom related items to ignore and sort them - pom.xml.tag and pom.xml.next are new to ignore - sorted release-pom.xml to end --- .../main/java/com/mycila/maven/plugin/license/Default.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/Default.java b/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/Default.java index b3914f1b8..35f258abd 100755 --- a/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/Default.java +++ b/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/Default.java @@ -114,9 +114,11 @@ private Default() { "**/test-output/**", "**/release.properties", "**/dependency-reduced-pom.xml", - "**/release-pom.xml", + "**/pom.xml.tag", "**/pom.xml.releaseBackup", "**/pom.xml.versionsBackup", + "**/pom.xml.next", + "**/release-pom.xml", // angular files "**/.angular/**", From 8756db1d26edba17f93e914e2ee43291ba9c0ffe Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 12 Jan 2025 17:49:25 -0500 Subject: [PATCH 3/4] [default] Add .vscode folder to ignore --- .../src/main/java/com/mycila/maven/plugin/license/Default.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/Default.java b/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/Default.java index 35f258abd..06c504747 100755 --- a/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/Default.java +++ b/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/Default.java @@ -150,6 +150,9 @@ private Default() { // Netbeans "**/nb-configuration.xml", + // VSCode + "**/.vscode/**", + // Hibernate Validator Annotation Processor "**/.factorypath", From 23e688bda6bd2c44dad3f9b98ff33e6c5cc84a63 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 12 Jan 2025 17:50:12 -0500 Subject: [PATCH 4/4] [pom] Remove release-pom.xml as in defaults for some time --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4e3cea2db..33cbe75da 100644 --- a/pom.xml +++ b/pom.xml @@ -416,7 +416,6 @@ limitations under the License. src/test/resources/** - **/release-pom.xml docs/** .config/**