From a462939de6dde6e41a28e557fd168fcd662bf30e Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Wed, 5 Oct 2022 14:48:39 +1000 Subject: [PATCH 1/2] change package name to org.codehaus.plexus.build.incremental Signed-off-by: Olivier Lamy --- pom.xml | 2 +- .../plexus/build/incremental/BuildContext.java | 2 +- .../plexus/build/incremental/DefaultBuildContext.java | 6 +++--- .../plexus/build/incremental/EmptyScanner.java | 2 +- .../plexus/build/incremental/ThreadBuildContext.java | 8 ++++---- .../plexus/build/incremental/version.properties | 0 .../build/incremental/test/TestFullBuildContext.java | 4 ++-- .../incremental/test/TestIncrementalBuildContext.java | 6 +++--- 8 files changed, 15 insertions(+), 15 deletions(-) rename src/main/java/org/{sonatype => codehaus}/plexus/build/incremental/BuildContext.java (99%) rename src/main/java/org/{sonatype => codehaus}/plexus/build/incremental/DefaultBuildContext.java (97%) rename src/main/java/org/{sonatype => codehaus}/plexus/build/incremental/EmptyScanner.java (97%) rename src/main/java/org/{sonatype => codehaus}/plexus/build/incremental/ThreadBuildContext.java (92%) rename src/main/resources/org/{sonatype => codehaus}/plexus/build/incremental/version.properties (100%) rename src/test/java/org/{sonatype => codehaus}/plexus/build/incremental/test/TestFullBuildContext.java (89%) rename src/test/java/org/{sonatype => codehaus}/plexus/build/incremental/test/TestIncrementalBuildContext.java (96%) diff --git a/pom.xml b/pom.xml index 208c291..99dbb3e 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ See the Apache License Version 2.0 for the specific language governing permissio plexus-build-api - 1.0.1-SNAPSHOT + 1.0.0-SNAPSHOT scm:git:https://github.com/codehaus-plexus/plexus-build-api.git diff --git a/src/main/java/org/sonatype/plexus/build/incremental/BuildContext.java b/src/main/java/org/codehaus/plexus/build/incremental/BuildContext.java similarity index 99% rename from src/main/java/org/sonatype/plexus/build/incremental/BuildContext.java rename to src/main/java/org/codehaus/plexus/build/incremental/BuildContext.java index 285acfa..b4e2cae 100644 --- a/src/main/java/org/sonatype/plexus/build/incremental/BuildContext.java +++ b/src/main/java/org/codehaus/plexus/build/incremental/BuildContext.java @@ -10,7 +10,7 @@ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the Apache License Version 2.0 for the specific language governing permissions and limitations there under. */ -package org.sonatype.plexus.build.incremental; +package org.codehaus.plexus.build.incremental; import java.io.File; import java.io.IOException; diff --git a/src/main/java/org/sonatype/plexus/build/incremental/DefaultBuildContext.java b/src/main/java/org/codehaus/plexus/build/incremental/DefaultBuildContext.java similarity index 97% rename from src/main/java/org/sonatype/plexus/build/incremental/DefaultBuildContext.java rename to src/main/java/org/codehaus/plexus/build/incremental/DefaultBuildContext.java index 93a5e52..69612bd 100644 --- a/src/main/java/org/sonatype/plexus/build/incremental/DefaultBuildContext.java +++ b/src/main/java/org/codehaus/plexus/build/incremental/DefaultBuildContext.java @@ -11,15 +11,15 @@ See the Apache License Version 2.0 for the specific language governing permissions and limitations there under. */ -package org.sonatype.plexus.build.incremental; +package org.codehaus.plexus.build.incremental; import javax.inject.Named; import javax.inject.Singleton; import java.io.File; -import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; +import java.nio.file.Files; import java.util.List; import org.codehaus.plexus.util.DirectoryScanner; @@ -69,7 +69,7 @@ public boolean hasDelta(List relpaths) { /** {@inheritDoc} */ public OutputStream newFileOutputStream(File file) throws IOException { - return new FileOutputStream(file); + return Files.newOutputStream(file.toPath()); } /** {@inheritDoc} */ diff --git a/src/main/java/org/sonatype/plexus/build/incremental/EmptyScanner.java b/src/main/java/org/codehaus/plexus/build/incremental/EmptyScanner.java similarity index 97% rename from src/main/java/org/sonatype/plexus/build/incremental/EmptyScanner.java rename to src/main/java/org/codehaus/plexus/build/incremental/EmptyScanner.java index 52838a3..94914fb 100644 --- a/src/main/java/org/sonatype/plexus/build/incremental/EmptyScanner.java +++ b/src/main/java/org/codehaus/plexus/build/incremental/EmptyScanner.java @@ -11,7 +11,7 @@ See the Apache License Version 2.0 for the specific language governing permissions and limitations there under. */ -package org.sonatype.plexus.build.incremental; +package org.codehaus.plexus.build.incremental; import java.io.File; import java.util.Comparator; diff --git a/src/main/java/org/sonatype/plexus/build/incremental/ThreadBuildContext.java b/src/main/java/org/codehaus/plexus/build/incremental/ThreadBuildContext.java similarity index 92% rename from src/main/java/org/sonatype/plexus/build/incremental/ThreadBuildContext.java rename to src/main/java/org/codehaus/plexus/build/incremental/ThreadBuildContext.java index ec19717..4a53b8c 100644 --- a/src/main/java/org/sonatype/plexus/build/incremental/ThreadBuildContext.java +++ b/src/main/java/org/codehaus/plexus/build/incremental/ThreadBuildContext.java @@ -11,7 +11,7 @@ See the Apache License Version 2.0 for the specific language governing permissions and limitations there under. */ -package org.sonatype.plexus.build.incremental; +package org.codehaus.plexus.build.incremental; import java.io.File; import java.io.IOException; @@ -23,7 +23,7 @@ /** * BuildContext implementation that delegates actual work to thread-local * build context set using {@link #setThreadBuildContext(BuildContext)}. - * {@link org.sonatype.plexus.build.incremental.DefaultBuildContext} is used if no thread local build context was set. + * {@link DefaultBuildContext} is used if no thread local build context was set. * * Note that plexus component metadata is not generated for this implementation. * Apparently, older version of plexus used by maven-filtering and likely @@ -47,7 +47,7 @@ protected BuildContext initialValue() { /** *

getContext.

* - * @return a {@link org.sonatype.plexus.build.incremental.BuildContext} object. + * @return a {@link BuildContext} object. */ public static BuildContext getContext() { return threadContext.get(); @@ -56,7 +56,7 @@ public static BuildContext getContext() { /** *

setThreadBuildContext.

* - * @param context a {@link org.sonatype.plexus.build.incremental.BuildContext} object. + * @param context a {@link BuildContext} object. */ public static void setThreadBuildContext(BuildContext context) { threadContext.set(context); diff --git a/src/main/resources/org/sonatype/plexus/build/incremental/version.properties b/src/main/resources/org/codehaus/plexus/build/incremental/version.properties similarity index 100% rename from src/main/resources/org/sonatype/plexus/build/incremental/version.properties rename to src/main/resources/org/codehaus/plexus/build/incremental/version.properties diff --git a/src/test/java/org/sonatype/plexus/build/incremental/test/TestFullBuildContext.java b/src/test/java/org/codehaus/plexus/build/incremental/test/TestFullBuildContext.java similarity index 89% rename from src/test/java/org/sonatype/plexus/build/incremental/test/TestFullBuildContext.java rename to src/test/java/org/codehaus/plexus/build/incremental/test/TestFullBuildContext.java index 00e602c..8710d42 100644 --- a/src/test/java/org/sonatype/plexus/build/incremental/test/TestFullBuildContext.java +++ b/src/test/java/org/codehaus/plexus/build/incremental/test/TestFullBuildContext.java @@ -11,11 +11,11 @@ See the Apache License Version 2.0 for the specific language governing permissions and limitations there under. */ -package org.sonatype.plexus.build.incremental.test; +package org.codehaus.plexus.build.incremental.test; import java.util.Map; -import org.sonatype.plexus.build.incremental.DefaultBuildContext; +import org.codehaus.plexus.build.incremental.DefaultBuildContext; public class TestFullBuildContext extends DefaultBuildContext { diff --git a/src/test/java/org/sonatype/plexus/build/incremental/test/TestIncrementalBuildContext.java b/src/test/java/org/codehaus/plexus/build/incremental/test/TestIncrementalBuildContext.java similarity index 96% rename from src/test/java/org/sonatype/plexus/build/incremental/test/TestIncrementalBuildContext.java rename to src/test/java/org/codehaus/plexus/build/incremental/test/TestIncrementalBuildContext.java index fea2f91..a878480 100644 --- a/src/test/java/org/sonatype/plexus/build/incremental/test/TestIncrementalBuildContext.java +++ b/src/test/java/org/codehaus/plexus/build/incremental/test/TestIncrementalBuildContext.java @@ -11,7 +11,7 @@ See the Apache License Version 2.0 for the specific language governing permissions and limitations there under. */ -package org.sonatype.plexus.build.incremental.test; +package org.codehaus.plexus.build.incremental.test; import java.io.File; import java.io.FileOutputStream; @@ -27,7 +27,7 @@ import org.codehaus.plexus.util.DirectoryScanner; import org.codehaus.plexus.util.Scanner; -import org.sonatype.plexus.build.incremental.BuildContext; +import org.codehaus.plexus.build.incremental.BuildContext; public class TestIncrementalBuildContext implements BuildContext { @@ -52,7 +52,7 @@ public String[] getIncludedDirectories() { } public String[] getIncludedFiles() { - return (String[]) files.toArray(new String[files.size()]); + return (String[]) files.toArray(new String[0]); } public void scan() { From 328f428c072f46ab0c8dcd5ac5bc3e79fb913fa8 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Wed, 5 Oct 2022 15:23:07 +1000 Subject: [PATCH 2/2] change package to org.codehaus.plexus.build Signed-off-by: Olivier Lamy --- .../plexus/build/{incremental => }/BuildContext.java | 2 +- .../plexus/build/{incremental => }/DefaultBuildContext.java | 2 +- .../plexus/build/{incremental => }/EmptyScanner.java | 2 +- .../plexus/build/{incremental => }/ThreadBuildContext.java | 6 +++--- .../plexus/build/{incremental => }/version.properties | 0 .../build/{incremental => }/test/TestFullBuildContext.java | 4 ++-- .../{incremental => }/test/TestIncrementalBuildContext.java | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) rename src/main/java/org/codehaus/plexus/build/{incremental => }/BuildContext.java (99%) rename src/main/java/org/codehaus/plexus/build/{incremental => }/DefaultBuildContext.java (98%) rename src/main/java/org/codehaus/plexus/build/{incremental => }/EmptyScanner.java (97%) rename src/main/java/org/codehaus/plexus/build/{incremental => }/ThreadBuildContext.java (95%) rename src/main/resources/org/codehaus/plexus/build/{incremental => }/version.properties (100%) rename src/test/java/org/codehaus/plexus/build/{incremental => }/test/TestFullBuildContext.java (89%) rename src/test/java/org/codehaus/plexus/build/{incremental => }/test/TestIncrementalBuildContext.java (98%) diff --git a/src/main/java/org/codehaus/plexus/build/incremental/BuildContext.java b/src/main/java/org/codehaus/plexus/build/BuildContext.java similarity index 99% rename from src/main/java/org/codehaus/plexus/build/incremental/BuildContext.java rename to src/main/java/org/codehaus/plexus/build/BuildContext.java index b4e2cae..48fee34 100644 --- a/src/main/java/org/codehaus/plexus/build/incremental/BuildContext.java +++ b/src/main/java/org/codehaus/plexus/build/BuildContext.java @@ -10,7 +10,7 @@ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the Apache License Version 2.0 for the specific language governing permissions and limitations there under. */ -package org.codehaus.plexus.build.incremental; +package org.codehaus.plexus.build; import java.io.File; import java.io.IOException; diff --git a/src/main/java/org/codehaus/plexus/build/incremental/DefaultBuildContext.java b/src/main/java/org/codehaus/plexus/build/DefaultBuildContext.java similarity index 98% rename from src/main/java/org/codehaus/plexus/build/incremental/DefaultBuildContext.java rename to src/main/java/org/codehaus/plexus/build/DefaultBuildContext.java index 69612bd..049ae0e 100644 --- a/src/main/java/org/codehaus/plexus/build/incremental/DefaultBuildContext.java +++ b/src/main/java/org/codehaus/plexus/build/DefaultBuildContext.java @@ -11,7 +11,7 @@ See the Apache License Version 2.0 for the specific language governing permissions and limitations there under. */ -package org.codehaus.plexus.build.incremental; +package org.codehaus.plexus.build; import javax.inject.Named; import javax.inject.Singleton; diff --git a/src/main/java/org/codehaus/plexus/build/incremental/EmptyScanner.java b/src/main/java/org/codehaus/plexus/build/EmptyScanner.java similarity index 97% rename from src/main/java/org/codehaus/plexus/build/incremental/EmptyScanner.java rename to src/main/java/org/codehaus/plexus/build/EmptyScanner.java index 94914fb..106b9d9 100644 --- a/src/main/java/org/codehaus/plexus/build/incremental/EmptyScanner.java +++ b/src/main/java/org/codehaus/plexus/build/EmptyScanner.java @@ -11,7 +11,7 @@ See the Apache License Version 2.0 for the specific language governing permissions and limitations there under. */ -package org.codehaus.plexus.build.incremental; +package org.codehaus.plexus.build; import java.io.File; import java.util.Comparator; diff --git a/src/main/java/org/codehaus/plexus/build/incremental/ThreadBuildContext.java b/src/main/java/org/codehaus/plexus/build/ThreadBuildContext.java similarity index 95% rename from src/main/java/org/codehaus/plexus/build/incremental/ThreadBuildContext.java rename to src/main/java/org/codehaus/plexus/build/ThreadBuildContext.java index 4a53b8c..24a92cc 100644 --- a/src/main/java/org/codehaus/plexus/build/incremental/ThreadBuildContext.java +++ b/src/main/java/org/codehaus/plexus/build/ThreadBuildContext.java @@ -11,7 +11,7 @@ See the Apache License Version 2.0 for the specific language governing permissions and limitations there under. */ -package org.codehaus.plexus.build.incremental; +package org.codehaus.plexus.build; import java.io.File; import java.io.IOException; @@ -143,12 +143,12 @@ public void removeMessages(File file) { /** {@inheritDoc} */ public void addWarning(File file, int line, int column, String message, Throwable cause) { - addMessage(file, line, column, message, BuildContext.SEVERITY_WARNING, cause); + addMessage(file, line, column, message, SEVERITY_WARNING, cause); } /** {@inheritDoc} */ public void addError(File file, int line, int column, String message, Throwable cause) { - addMessage(file, line, column, message, BuildContext.SEVERITY_ERROR, cause); + addMessage(file, line, column, message, SEVERITY_ERROR, cause); } /** {@inheritDoc} */ diff --git a/src/main/resources/org/codehaus/plexus/build/incremental/version.properties b/src/main/resources/org/codehaus/plexus/build/version.properties similarity index 100% rename from src/main/resources/org/codehaus/plexus/build/incremental/version.properties rename to src/main/resources/org/codehaus/plexus/build/version.properties diff --git a/src/test/java/org/codehaus/plexus/build/incremental/test/TestFullBuildContext.java b/src/test/java/org/codehaus/plexus/build/test/TestFullBuildContext.java similarity index 89% rename from src/test/java/org/codehaus/plexus/build/incremental/test/TestFullBuildContext.java rename to src/test/java/org/codehaus/plexus/build/test/TestFullBuildContext.java index 8710d42..be30fe9 100644 --- a/src/test/java/org/codehaus/plexus/build/incremental/test/TestFullBuildContext.java +++ b/src/test/java/org/codehaus/plexus/build/test/TestFullBuildContext.java @@ -11,11 +11,11 @@ See the Apache License Version 2.0 for the specific language governing permissions and limitations there under. */ -package org.codehaus.plexus.build.incremental.test; +package org.codehaus.plexus.build.test; import java.util.Map; -import org.codehaus.plexus.build.incremental.DefaultBuildContext; +import org.codehaus.plexus.build.DefaultBuildContext; public class TestFullBuildContext extends DefaultBuildContext { diff --git a/src/test/java/org/codehaus/plexus/build/incremental/test/TestIncrementalBuildContext.java b/src/test/java/org/codehaus/plexus/build/test/TestIncrementalBuildContext.java similarity index 98% rename from src/test/java/org/codehaus/plexus/build/incremental/test/TestIncrementalBuildContext.java rename to src/test/java/org/codehaus/plexus/build/test/TestIncrementalBuildContext.java index a878480..2779d31 100644 --- a/src/test/java/org/codehaus/plexus/build/incremental/test/TestIncrementalBuildContext.java +++ b/src/test/java/org/codehaus/plexus/build/test/TestIncrementalBuildContext.java @@ -11,7 +11,7 @@ See the Apache License Version 2.0 for the specific language governing permissions and limitations there under. */ -package org.codehaus.plexus.build.incremental.test; +package org.codehaus.plexus.build.test; import java.io.File; import java.io.FileOutputStream; @@ -25,9 +25,9 @@ import java.util.Map; import java.util.Set; +import org.codehaus.plexus.build.BuildContext; import org.codehaus.plexus.util.DirectoryScanner; import org.codehaus.plexus.util.Scanner; -import org.codehaus.plexus.build.incremental.BuildContext; public class TestIncrementalBuildContext implements BuildContext {