use last plexus compiler version
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1418527 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/modello-plugin-redback-registry/pom.xml b/modello-plugin-redback-registry/pom.xml
index a9aa2a2..c2a4576 100644
--- a/modello-plugin-redback-registry/pom.xml
+++ b/modello-plugin-redback-registry/pom.xml
@@ -79,7 +79,13 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-compiler-api</artifactId>
- <version>1.8.6</version>
+ <version>2.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-compiler-javac</artifactId>
+ <version>2.1</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/components/registry/modello/AbstractRegistryGeneratorTestCase.java b/modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/components/registry/modello/AbstractRegistryGeneratorTestCase.java
index dcd7d65..b2a96ec 100644
--- a/modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/components/registry/modello/AbstractRegistryGeneratorTestCase.java
+++ b/modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/components/registry/modello/AbstractRegistryGeneratorTestCase.java
@@ -121,7 +121,7 @@
}
String[] sourceDirectories =
- new String[]{getTestPath( "src/test/verifiers/" + getName() ), generatedSources.getAbsolutePath()};
+ new String[]{ getTestPath( "src/test/verifiers/" + getName() ), generatedSources.getAbsolutePath() };
org.codehaus.plexus.compiler.Compiler compiler = new JavacCompiler();
@@ -133,16 +133,20 @@
configuration.setSourceVersion( "1.5" );
configuration.setTargetVersion( "1.5" );
- List messages = compiler.compile( configuration );
+ List<CompilerMessage> messages = compiler.performCompile( configuration ).getCompilerMessages();
- for ( Iterator it = messages.iterator(); it.hasNext(); )
+ int error = 0;
+
+ for ( CompilerMessage message : messages )
{
- CompilerError message = (CompilerError) it.next();
-
System.out.println( message.getFile() + "[" + message.getStartLine() + "," + message.getStartColumn() +
"]: " + message.getMessage() );
+ if ( message.getKind() == CompilerMessage.Kind.ERROR )
+ {
+ error++;
+ }
}
- assertEquals( "There was compilation errors.", 0, messages.size() );
+ assertEquals( "There was compilation errors.", 0, error );
}
}
