From 085f7231f7e39621e9b0eba58e771397528a7909 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Fri, 30 Sep 2022 22:40:48 -0400 Subject: [PATCH 1/3] http to https XSI --- pom.xml | 2 +- src/it/copy-file/pom.xml | 2 +- src/it/match-file-content/pom.xml | 2 +- src/it/match-filename/pom.xml | 2 +- src/it/match-properties/pom.xml | 2 +- src/it/match-property/pom.xml | 2 +- src/it/match-text/pom.xml | 2 +- src/it/move-file/pom.xml | 2 +- src/it/replace-file-content/pom.xml | 2 +- src/it/replace-properties/pom.xml | 2 +- src/it/replace-property/pom.xml | 2 +- src/it/replace-text/pom.xml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 2b3f260..4c3d503 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.inteligr8 diff --git a/src/it/copy-file/pom.xml b/src/it/copy-file/pom.xml index ad7a099..c895868 100644 --- a/src/it/copy-file/pom.xml +++ b/src/it/copy-file/pom.xml @@ -2,7 +2,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.inteligr8 diff --git a/src/it/match-file-content/pom.xml b/src/it/match-file-content/pom.xml index ed3f9b7..76a08eb 100644 --- a/src/it/match-file-content/pom.xml +++ b/src/it/match-file-content/pom.xml @@ -2,7 +2,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.inteligr8 diff --git a/src/it/match-filename/pom.xml b/src/it/match-filename/pom.xml index 51dfe10..30d4741 100644 --- a/src/it/match-filename/pom.xml +++ b/src/it/match-filename/pom.xml @@ -2,7 +2,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.inteligr8 diff --git a/src/it/match-properties/pom.xml b/src/it/match-properties/pom.xml index 04260db..03e9b24 100644 --- a/src/it/match-properties/pom.xml +++ b/src/it/match-properties/pom.xml @@ -2,7 +2,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.inteligr8 diff --git a/src/it/match-property/pom.xml b/src/it/match-property/pom.xml index 5f4da36..bea5f4c 100644 --- a/src/it/match-property/pom.xml +++ b/src/it/match-property/pom.xml @@ -2,7 +2,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.inteligr8 diff --git a/src/it/match-text/pom.xml b/src/it/match-text/pom.xml index 4232291..5501931 100644 --- a/src/it/match-text/pom.xml +++ b/src/it/match-text/pom.xml @@ -2,7 +2,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.inteligr8 diff --git a/src/it/move-file/pom.xml b/src/it/move-file/pom.xml index bdaf7c2..7d8c250 100644 --- a/src/it/move-file/pom.xml +++ b/src/it/move-file/pom.xml @@ -2,7 +2,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.inteligr8 diff --git a/src/it/replace-file-content/pom.xml b/src/it/replace-file-content/pom.xml index ec9d186..8041c62 100644 --- a/src/it/replace-file-content/pom.xml +++ b/src/it/replace-file-content/pom.xml @@ -2,7 +2,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.inteligr8 diff --git a/src/it/replace-properties/pom.xml b/src/it/replace-properties/pom.xml index 0e749e7..1e026be 100644 --- a/src/it/replace-properties/pom.xml +++ b/src/it/replace-properties/pom.xml @@ -2,7 +2,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.inteligr8 diff --git a/src/it/replace-property/pom.xml b/src/it/replace-property/pom.xml index b179130..369202e 100644 --- a/src/it/replace-property/pom.xml +++ b/src/it/replace-property/pom.xml @@ -2,7 +2,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.inteligr8 diff --git a/src/it/replace-text/pom.xml b/src/it/replace-text/pom.xml index 677e52c..5483ba2 100644 --- a/src/it/replace-text/pom.xml +++ b/src/it/replace-text/pom.xml @@ -2,7 +2,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.inteligr8 From 0af54252922574df07f478f1718e2c394ee1da63 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Sat, 1 Oct 2022 21:27:36 -0400 Subject: [PATCH 2/3] minor spacing fixes --- pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4c3d503..f7771f4 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,4 @@ - @@ -239,5 +238,4 @@ - From 434045f5d160d27db1a7f9b38aeb3c97c6fbd2de Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Sat, 4 Mar 2023 16:03:05 -0500 Subject: [PATCH 3/3] updated to Maven v3.9.0 --- pom.xml | 7 ++++--- .../java/com/inteligr8/maven/regex/AbstractRegexMojo.java | 5 ----- .../com/inteligr8/maven/regex/MatchFileContentMojo.java | 2 +- .../com/inteligr8/maven/regex/ReplaceFileContentMojo.java | 2 +- .../com/inteligr8/nio/DelimitedReadableByteChannel.java | 3 --- 5 files changed, 6 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index f7771f4..15c7d96 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,5 @@ + @@ -42,7 +43,7 @@ UTF-8 1.8 1.8 - 3.6.3 + 3.9.0 @@ -54,7 +55,7 @@ org.apache.maven.shared file-management - 3.0.0 + 3.1.0 org.apache.maven @@ -65,7 +66,7 @@ org.apache.maven.plugin-tools maven-plugin-annotations - 3.6.0 + 3.7.1 provided diff --git a/src/main/java/com/inteligr8/maven/regex/AbstractRegexMojo.java b/src/main/java/com/inteligr8/maven/regex/AbstractRegexMojo.java index c70872b..e8db16b 100644 --- a/src/main/java/com/inteligr8/maven/regex/AbstractRegexMojo.java +++ b/src/main/java/com/inteligr8/maven/regex/AbstractRegexMojo.java @@ -16,8 +16,6 @@ package com.inteligr8.maven.regex; import java.util.Properties; -import javax.annotation.OverridingMethodsMustInvokeSuper; - import org.apache.maven.execution.MavenSession; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; @@ -63,17 +61,14 @@ public abstract class AbstractRegexMojo extends AbstractMojo { protected abstract void go() throws MojoExecutionException, MojoFailureException; - @OverridingMethodsMustInvokeSuper protected void validateParamsPreNormalization() throws MojoFailureException { this.getLog().debug("Validating parameters before their normalization"); } - @OverridingMethodsMustInvokeSuper protected void normalizeParameters() throws MojoFailureException { this.getLog().debug("Normalizing parameters"); } - @OverridingMethodsMustInvokeSuper protected void validateParamsPostNormalization() throws MojoFailureException { this.getLog().debug("Validating parameters after their normalization"); } diff --git a/src/main/java/com/inteligr8/maven/regex/MatchFileContentMojo.java b/src/main/java/com/inteligr8/maven/regex/MatchFileContentMojo.java index 1b45d10..bbe438c 100644 --- a/src/main/java/com/inteligr8/maven/regex/MatchFileContentMojo.java +++ b/src/main/java/com/inteligr8/maven/regex/MatchFileContentMojo.java @@ -53,7 +53,7 @@ public class MatchFileContentMojo extends AbstractMatchMojo { } private boolean matchesContentInFileSet() throws MojoExecutionException { - FileSetManager fsman = new FileSetManager(this.getLog()); + FileSetManager fsman = new FileSetManager(); Path basepath = this.project.getBasedir().toPath(); try { diff --git a/src/main/java/com/inteligr8/maven/regex/ReplaceFileContentMojo.java b/src/main/java/com/inteligr8/maven/regex/ReplaceFileContentMojo.java index 9487c85..c5530e6 100644 --- a/src/main/java/com/inteligr8/maven/regex/ReplaceFileContentMojo.java +++ b/src/main/java/com/inteligr8/maven/regex/ReplaceFileContentMojo.java @@ -47,7 +47,7 @@ public class ReplaceFileContentMojo extends AbstractReplaceMojo { private boolean replaceContentInFileSet() throws MojoExecutionException { boolean didReplace = false; - FileSetManager fsman = new FileSetManager(this.getLog()); + FileSetManager fsman = new FileSetManager(); Path basepath = this.project.getBasedir().toPath(); try { diff --git a/src/main/java/com/inteligr8/nio/DelimitedReadableByteChannel.java b/src/main/java/com/inteligr8/nio/DelimitedReadableByteChannel.java index 7f90068..77541ea 100644 --- a/src/main/java/com/inteligr8/nio/DelimitedReadableByteChannel.java +++ b/src/main/java/com/inteligr8/nio/DelimitedReadableByteChannel.java @@ -23,8 +23,6 @@ import java.nio.charset.CharsetDecoder; import java.util.HashSet; import java.util.Set; -import javax.annotation.OverridingMethodsMustInvokeSuper; - public class DelimitedReadableByteChannel implements ReadableByteChannel { private final CharBuffer buffer; @@ -50,7 +48,6 @@ public class DelimitedReadableByteChannel implements ReadableByteChannel { } @Override - @OverridingMethodsMustInvokeSuper public void close() throws IOException { this.rbchannel.close(); }