Switch to codehaus plexus-build-api 1.1.0

Author: gnodet

modello-core/pom.xml

@@ -15,7 +15,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.sonatype.plexus</groupId>
+      <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-build-api</artifactId>
     </dependency>
     <dependency>

modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java

@@ -44,7 +44,7 @@
 import org.codehaus.plexus.PlexusConstants;
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.util.io.CachingWriter;
-import org.sonatype.plexus.build.incremental.BuildContext;
+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;

modello-maven-plugin/pom.xml

@@ -123,7 +123,7 @@
       <artifactId>modello-plugin-velocity</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.sonatype.plexus</groupId>
+      <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-build-api</artifactId>
     </dependency>
   </dependencies>

modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloGeneratorMojo.java

@@ -42,7 +42,7 @@
 import org.codehaus.modello.model.Model;
 import org.codehaus.modello.model.ModelValidationException;
 import org.codehaus.plexus.util.StringUtils;
-import org.sonatype.plexus.build.incremental.BuildContext;
+import org.codehaus.plexus.build.BuildContext;
 
 /**
  * @author <a href="mailto:[email protected]">Trygve Laugst&oslash;l</a>

modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloConvertersMojoTest.java

@@ -23,8 +23,9 @@
  */
 
 import org.codehaus.modello.core.ModelloCore;
+import org.codehaus.plexus.ContainerConfiguration;
 import org.codehaus.plexus.PlexusTestCase;
-import org.sonatype.plexus.build.incremental.BuildContext;
+import org.codehaus.plexus.build.BuildContext;
 import org.codehaus.plexus.util.FileUtils;
 
 import java.io.File;
@@ -105,4 +106,9 @@ public void testModelloConvertersMojo()
         assertFalse( "The generated java file doesn't exist: '" + javaFile.getAbsolutePath() + "'.",
                      javaFile.exists() );
     }
+
+    @Override
+    protected void customizeContainerConfiguration(ContainerConfiguration containerConfiguration) {
+        containerConfiguration.setClassPathScanning("cache");
+    }
 }

modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloJavaMojoTest.java

@@ -23,8 +23,9 @@
  */
 
 import org.codehaus.modello.core.ModelloCore;
+import org.codehaus.plexus.ContainerConfiguration;
 import org.codehaus.plexus.PlexusTestCase;
-import org.sonatype.plexus.build.incremental.BuildContext;
+import org.codehaus.plexus.build.BuildContext;
 import org.codehaus.plexus.util.FileUtils;
 
 import java.io.File;
@@ -100,4 +101,9 @@ public void testModelloJavaMojo()
         assertFalse( "The generated java file shouldn't exist: '" + javaFile.getAbsolutePath() + "'.",
                      javaFile.exists() );
     }
+
+    @Override
+    protected void customizeContainerConfiguration(ContainerConfiguration containerConfiguration) {
+        containerConfiguration.setClassPathScanning("cache");
+    }
 }

modello-plugins/modello-plugin-java/pom.xml

@@ -19,7 +19,7 @@
       <artifactId>plexus-utils</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.sonatype.plexus</groupId>
+      <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-build-api</artifactId>
     </dependency>
 

modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java

@@ -32,6 +32,7 @@
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
+import org.codehaus.plexus.ContainerConfiguration;
 import org.codehaus.plexus.PlexusTestCase;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.ReaderFactory;
@@ -117,4 +118,9 @@ protected SAXParser createSaxParserWithSchema( String generatedXsdName ) throws
                                new File( getOutputDirectory(), generatedXsdName ) );
         return saxParser;
     }
+
+    @Override
+    protected void customizeContainerConfiguration(ContainerConfiguration containerConfiguration) {
+        containerConfiguration.setClassPathScanning("cache");
+    }
 }

pom.xml

@@ -337,9 +337,9 @@
         <version>3.5.1</version>
       </dependency>
       <dependency>
-        <groupId>org.sonatype.plexus</groupId>
+        <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-build-api</artifactId>
-        <version>0.0.7</version>
+        <version>1.1.0</version>
       </dependency>
       <dependency>
         <groupId>junit</groupId>