From 59097d6b7d9d8ead04f69a36b40a7291ac25a318 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Tue, 23 May 2023 14:10:36 +0200 Subject: [PATCH 1/2] Switch to codehaus plexus-build-api 1.1.0 --- modello-core/pom.xml | 2 +- .../codehaus/modello/plugin/AbstractModelloGenerator.java | 2 +- modello-maven-plugin/pom.xml | 2 +- .../modello/maven/AbstractModelloGeneratorMojo.java | 2 +- .../codehaus/modello/maven/ModelloConvertersMojoTest.java | 8 +++++++- .../org/codehaus/modello/maven/ModelloJavaMojoTest.java | 8 +++++++- modello-plugins/modello-plugin-java/pom.xml | 2 +- .../codehaus/modello/AbstractModelloGeneratorTest.java | 6 ++++++ pom.xml | 4 ++-- 9 files changed, 27 insertions(+), 9 deletions(-) diff --git a/modello-core/pom.xml b/modello-core/pom.xml index 5d0b6cd37..b43cf25c2 100644 --- a/modello-core/pom.xml +++ b/modello-core/pom.xml @@ -13,7 +13,7 @@ - org.sonatype.plexus + org.codehaus.plexus plexus-build-api diff --git a/modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java b/modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java index 334e16e8d..bb59b439e 100644 --- a/modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java +++ b/modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java @@ -43,6 +43,7 @@ import org.codehaus.modello.model.Version; import org.codehaus.plexus.PlexusConstants; import org.codehaus.plexus.PlexusContainer; +import org.codehaus.plexus.build.BuildContext; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; import org.codehaus.plexus.context.Context; import org.codehaus.plexus.context.ContextException; @@ -50,7 +51,6 @@ import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable; import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.io.CachingWriter; -import org.sonatype.plexus.build.incremental.BuildContext; /** * @author Jason van Zyl diff --git a/modello-maven-plugin/pom.xml b/modello-maven-plugin/pom.xml index 0120e9de9..e5ec6abec 100644 --- a/modello-maven-plugin/pom.xml +++ b/modello-maven-plugin/pom.xml @@ -121,7 +121,7 @@ modello-plugin-velocity - org.sonatype.plexus + org.codehaus.plexus plexus-build-api diff --git a/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloGeneratorMojo.java b/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloGeneratorMojo.java index 51b75a126..762b57845 100644 --- a/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloGeneratorMojo.java +++ b/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloGeneratorMojo.java @@ -41,8 +41,8 @@ import org.codehaus.modello.core.ModelloCore; import org.codehaus.modello.model.Model; import org.codehaus.modello.model.ModelValidationException; +import org.codehaus.plexus.build.BuildContext; import org.codehaus.plexus.util.StringUtils; -import org.sonatype.plexus.build.incremental.BuildContext; /** * @author Trygve Laugstøl diff --git a/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloConvertersMojoTest.java b/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloConvertersMojoTest.java index 23f466d3f..779f178dd 100644 --- a/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloConvertersMojoTest.java +++ b/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloConvertersMojoTest.java @@ -26,9 +26,10 @@ import java.util.Arrays; import org.codehaus.modello.core.ModelloCore; +import org.codehaus.plexus.ContainerConfiguration; import org.codehaus.plexus.PlexusTestCase; +import org.codehaus.plexus.build.BuildContext; import org.codehaus.plexus.util.FileUtils; -import org.sonatype.plexus.build.incremental.BuildContext; /** * @author Brett Porter @@ -98,4 +99,9 @@ public void testModelloConvertersMojo() throws Exception { assertFalse("The generated java file doesn't exist: '" + javaFile.getAbsolutePath() + "'.", javaFile.exists()); } + + @Override + protected void customizeContainerConfiguration(ContainerConfiguration containerConfiguration) { + containerConfiguration.setClassPathScanning("cache"); + } } diff --git a/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloJavaMojoTest.java b/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloJavaMojoTest.java index bb5bb7cff..f15b4031a 100644 --- a/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloJavaMojoTest.java +++ b/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloJavaMojoTest.java @@ -26,9 +26,10 @@ import java.util.Arrays; import org.codehaus.modello.core.ModelloCore; +import org.codehaus.plexus.ContainerConfiguration; import org.codehaus.plexus.PlexusTestCase; +import org.codehaus.plexus.build.BuildContext; import org.codehaus.plexus.util.FileUtils; -import org.sonatype.plexus.build.incremental.BuildContext; /** * @author Trygve Laugstøl @@ -96,4 +97,9 @@ public void testModelloJavaMojo() throws Exception { assertFalse( "The generated java file shouldn't exist: '" + javaFile.getAbsolutePath() + "'.", javaFile.exists()); } + + @Override + protected void customizeContainerConfiguration(ContainerConfiguration containerConfiguration) { + containerConfiguration.setClassPathScanning("cache"); + } } diff --git a/modello-plugins/modello-plugin-java/pom.xml b/modello-plugins/modello-plugin-java/pom.xml index 3efc100e2..60ed55907 100644 --- a/modello-plugins/modello-plugin-java/pom.xml +++ b/modello-plugins/modello-plugin-java/pom.xml @@ -17,7 +17,7 @@ plexus-utils - org.sonatype.plexus + org.codehaus.plexus plexus-build-api diff --git a/modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java b/modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java index e71231fb4..f46cece1a 100644 --- a/modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java +++ b/modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java @@ -32,6 +32,7 @@ import java.util.Optional; import java.util.Properties; +import org.codehaus.plexus.ContainerConfiguration; import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.ReaderFactory; @@ -107,4 +108,9 @@ protected SAXParser createSaxParserWithSchema(String generatedXsdName) new File(getOutputDirectory(), generatedXsdName)); return saxParser; } + + @Override + protected void customizeContainerConfiguration(ContainerConfiguration containerConfiguration) { + containerConfiguration.setClassPathScanning("cache"); + } } diff --git a/pom.xml b/pom.xml index ffa153ba8..746897019 100644 --- a/pom.xml +++ b/pom.xml @@ -342,9 +342,9 @@ 3.5.1 - org.sonatype.plexus + org.codehaus.plexus plexus-build-api - 0.0.7 + 1.1.0 junit From 13f3dab176bd9530340d5a69604b458d080f2559 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Fri, 2 Jun 2023 10:06:52 +0200 Subject: [PATCH 2/2] Switch to codehaus plexus-build-api 1.2.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 746897019..feff1fe2b 100644 --- a/pom.xml +++ b/pom.xml @@ -344,7 +344,7 @@ org.codehaus.plexus plexus-build-api - 1.1.0 + 1.2.0 junit