Give every verifier a package and a unique class name

modello-plugins/modello-plugin-converters/src/test/java/org/codehaus/modello/plugin/converters/ConverterGeneratorTest.java

@@ -54,12 +54,9 @@ public void testConverterGenerator() throws Throwable {
 
         generateConverterClasses(getXmlResourceReader("/features.mdo"), "1.0.0", "1.1.0");
 
-        addDependency("org.codehaus.woodstox", "stax2-api");
-        addDependency("com.fasterxml.woodstox", "woodstox-core");
-
         compileGeneratedSources();
 
-        verifyCompiledGeneratedSources("ConvertersVerifier");
+        verifyCompiledGeneratedSources("org.codehaus.modello.generator.converters.ConvertersVerifier");
     }
 
     private void generateConverterClasses(Reader modelReader, String fromVersion, String toVersion) throws Throwable {

modello-plugins/modello-plugin-converters/src/test/verifiers/converters/ConvertersVerifier.java

@@ -1,3 +1,5 @@
+package org.codehaus.modello.generator.converters;
+
 /*
  * Copyright (c) 2004, Codehaus.org
  *

modello-plugins/modello-plugin-dom4j/src/test/java/org/codehaus/modello/plugin/dom4j/Dom4jGeneratorTest.java

@@ -93,8 +93,6 @@ public void testDom4jGenerator() throws Throwable {
         modello.generate(model, "dom4j-writer", parameters);
         modello.generate(model, "dom4j-reader", parameters);
 
-        addDependency("dom4j", "dom4j");
-
         compileGeneratedSources();
 
         verifyCompiledGeneratedSources("org.codehaus.modello.generator.xml.dom4j.Dom4jVerifier");

modello-plugins/modello-plugin-dom4j/src/test/java/org/codehaus/modello/plugin/dom4j/FeaturesDom4jGeneratorTest.java

@@ -54,8 +54,6 @@ public void testJavaGenerator() throws Throwable {
         modello.generate(model, "dom4j-writer", parameters);
         modello.generate(model, "dom4j-reader", parameters);
 
-        addDependency("dom4j", "dom4j");
-        addDependency("org.xmlunit", "xmlunit-core");
         compileGeneratedSources(8);
 
         verifyCompiledGeneratedSources("org.codehaus.modello.generator.xml.dom4j.Dom4jFeaturesVerifier");

modello-plugins/modello-plugin-jackson/src/test/java/org/codehaus/modello/plugin/jackson/JacksonGeneratorTest.java

@@ -65,10 +65,6 @@ public void testJacksonGenerator() throws Throwable {
         modello.generate(model, "jackson-writer", parameters);
         modello.generate(model, "jackson-reader", parameters);
 
-        addDependency("com.fasterxml.jackson.core", "jackson-core");
-        addDependency("com.fasterxml.jackson.core", "jackson-databind");
-        // looks like jackson-databind requires jackson-annotations to run...
-        addDependency("com.fasterxml.jackson.core", "jackson-annotations");
         compileGeneratedSources(8);
 
         // TODO: see why without this, version system property is set to "2.4.1" value after verify

modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/AnnotationsJavaGeneratorTest.java

@@ -52,10 +52,8 @@ public void testJavaGeneratorWithAnnotations() throws Throwable {
 
         modello.generate(model, "java", parameters);
 
-        addDependency("javax.xml.bind", "jaxb-api");
-        addDependency("javax.persistence", "persistence-api");
         compileGeneratedSources(8);
 
-        verifyCompiledGeneratedSources("AnnotationsVerifier");
+        verifyCompiledGeneratedSources("org.codehaus.modello.generator.java.AnnotationsVerifier");
     }
 }

modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/AssociationGeneratorTest.java

@@ -54,6 +54,6 @@ public void testJavaGenerator() throws Throwable {
 
         compileGeneratedSources();
 
-        verifyCompiledGeneratedSources("OneToManyAssociationVerifier");
+        verifyCompiledGeneratedSources("org.codehaus.modello.generator.java.OneToManyAssociationVerifier");
     }
 }

modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/BiDirectionalOverrideJavaGeneratorTest.java

@@ -50,6 +50,6 @@ public void testJavaGenerator() throws Throwable {
 
         compileGeneratedSources();
 
-        verifyCompiledGeneratedSources("JavaVerifier");
+        verifyCompiledGeneratedSources("org.codehaus.modello.generator.java.BidirectionalJavaVerifier");
     }
 }

modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/FeaturesJava5GeneratorTest.java

@@ -54,6 +54,6 @@ public void testJavaGenerator() throws Throwable {
 
         compileGeneratedSources("features", 8);
 
-        verifyCompiledGeneratedSources("JavaVerifier");
+        verifyCompiledGeneratedSources("org.codehaus.modello.generator.java.FeaturesJavaVerifier");
     }
 }

modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/FeaturesVersionJavaGeneratorTest.java

@@ -64,6 +64,6 @@ public void testJavaGenerator() throws Throwable {
 
         compileGeneratedSources();
 
-        verifyCompiledGeneratedSources("JavaVerifier");
+        verifyCompiledGeneratedSources("org.codehaus.modello.generator.java.FeaturesVersionJavaVerifier");
     }
 }

modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/InterfaceAssociationTest.java

@@ -29,6 +29,6 @@ public void testJavaGenerator() throws Throwable {
 
         compileGeneratedSources(8);
 
-        verifyCompiledGeneratedSources("InterfaceAssociationVerifier");
+        verifyCompiledGeneratedSources("org.codehaus.modello.generator.java.InterfaceAssociationVerifier");
     }
 }

modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/JavaGeneratorTest.java

@@ -54,6 +54,6 @@ public void testJavaGenerator() throws Throwable {
 
         compileGeneratedSources();
 
-        verifyCompiledGeneratedSources("JavaVerifier");
+        verifyCompiledGeneratedSources("org.codehaus.modello.generator.java.JavaVerifier");
     }
 }

modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/LocationsJavaGeneratorTest.java

@@ -54,6 +54,6 @@ public void testLocations() throws Throwable {
 
         compileGeneratedSources(8);
 
-        verifyCompiledGeneratedSources("JavaLocationsVerifier");
+        verifyCompiledGeneratedSources("org.codehaus.modello.generator.java.JavaLocationsVerifier");
     }
 }

modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/PackageVersionJavaTest.java

@@ -56,6 +56,6 @@ public void testThatTheCorrectVersionIsInThePackageName() throws Throwable {
 
         compileGeneratedSources();
 
-        verifyCompiledGeneratedSources("PackageVersionVerifier");
+        verifyCompiledGeneratedSources("org.codehaus.modello.generator.java.PackageVersionVerifier");
     }
 }

modello-plugins/modello-plugin-java/src/test/verifiers/annotations/AnnotationsVerifier.java

@@ -1,3 +1,5 @@
+package org.codehaus.modello.generator.java;
+
 import java.lang.annotation.Annotation;
 
 /*

modello-plugins/modello-plugin-java/src/test/verifiers/bidirectional/JavaVerifier.java → modello-plugins/modello-plugin-java/src/test/verifiers/bidirectional/BidirectionalJavaVerifier.java

@@ -1,3 +1,5 @@
+package org.codehaus.modello.generator.java;
+
 import org.codehaus.modello.plugin.java.Role;
 import org.codehaus.modello.tests.bidiroverride.BiRole;
 import org.codehaus.modello.verifier.Verifier;
@@ -6,7 +8,7 @@
 
 import java.util.List;
 
-public class JavaVerifier
+public class BidirectionalJavaVerifier
     extends Verifier
 {
     public void verify()

modello-plugins/modello-plugin-java/src/test/verifiers/features-version/JavaVerifier.java → modello-plugins/modello-plugin-java/src/test/verifiers/features-version/FeaturesVersionJavaVerifier.java

@@ -1,3 +1,5 @@
+package org.codehaus.modello.generator.java;
+
 /*
  * Copyright (c) 2004, Codehaus.org
  *
@@ -28,7 +30,7 @@
 /**
  * @author Herve Boutemy
  */
-public class JavaVerifier
+public class FeaturesVersionJavaVerifier
     extends Verifier
 {
     public void verify()

modello-plugins/modello-plugin-java/src/test/verifiers/features/JavaVerifier.java → modello-plugins/modello-plugin-java/src/test/verifiers/features/FeaturesJavaVerifier.java

@@ -1,3 +1,5 @@
+package org.codehaus.modello.generator.java;
+
 /*
  * Copyright (c) 2004, Codehaus.org
  *
@@ -68,7 +70,7 @@
 /**
  * @author Herve Boutemy
  */
-public class JavaVerifier
+public class FeaturesJavaVerifier
     extends Verifier
 {
     public void verify()

modello-plugins/modello-plugin-java/src/test/verifiers/interfaceAssociationTest/InterfaceAssociationVerifier.java

@@ -1,3 +1,5 @@
+package org.codehaus.modello.generator.java;
+
 import org.junit.jupiter.api.Assertions;
 
 import org.codehaus.modello.ifaceassociation.package1.IPerson;

modello-plugins/modello-plugin-java/src/test/verifiers/java/JavaVerifier.java

@@ -1,3 +1,5 @@
+package org.codehaus.modello.generator.java;
+
 /*
  * Copyright (c) 2004, Codehaus.org
  *

modello-plugins/modello-plugin-java/src/test/verifiers/locations/JavaLocationsVerifier.java

@@ -1,3 +1,5 @@
+package org.codehaus.modello.generator.java;
+
 /*
  * Copyright (c) 2004, Codehaus.org
  *

modello-plugins/modello-plugin-java/src/test/verifiers/oneToManyAssociation/OneToManyAssociationVerifier.java

@@ -1,3 +1,5 @@
+package org.codehaus.modello.generator.java;
+
 import org.codehaus.modello.association.package1.ListSetMapProperties;
 import org.codehaus.modello.association.package1.Person;
 import org.codehaus.modello.association.package2.Location;

modello-plugins/modello-plugin-java/src/test/verifiers/packageversion/PackageVersionVerifier.java

@@ -1,3 +1,5 @@
+package org.codehaus.modello.generator.java;
+
 /*
  * Copyright (c) 2004, Codehaus.org
  *

modello-plugins/modello-plugin-jdom/src/test/java/org/codehaus/modello/plugin/jdom/FeaturesJDOMGeneratorTest.java

@@ -54,8 +54,6 @@ public void testJavaGenerator() throws Throwable {
         modello.generate(model, "stax-reader", parameters);
         modello.generate(model, "jdom-writer", parameters);
 
-        addDependency("org.jdom", "jdom");
-        addDependency("org.xmlunit", "xmlunit-core");
         compileGeneratedSources();
 
         verifyCompiledGeneratedSources("org.codehaus.modello.generator.xml.jdom.JDOMFeaturesVerifier");

modello-plugins/modello-plugin-jdom/src/test/java/org/codehaus/modello/plugin/jdom/RootClassnameJDOMGeneratorTest.java

@@ -55,7 +55,6 @@ public void testJavaGenerator() throws Throwable {
         modello.generate(model, "java", parameters);
         modello.generate(model, "jdom-writer", parameters);
 
-        addDependency("org.jdom", "jdom");
         compileGeneratedSources();
 
         // If the code compiles successfully, the test passes

modello-plugins/modello-plugin-sax/src/test/java/org/codehaus/modello/plugin/sax/SaxGeneratorTest.java

@@ -92,7 +92,6 @@ public void testXpp3Generator() throws Throwable {
         modello.generate(model, "java", parameters);
         modello.generate(model, "sax-writer", parameters);
 
-        addDependency("org.xmlunit", "xmlunit-core");
         compileGeneratedSources();
 
         // TODO: see why without this, version system property is set to "2.4.1" value after verify

modello-plugins/modello-plugin-snakeyaml/src/test/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlGeneratorTest.java

@@ -52,7 +52,6 @@ public void testYamlGenerator() throws Throwable {
         modello.generate(model, "snakeyaml-writer", parameters);
         modello.generate(model, "snakeyaml-reader", parameters);
 
-        addDependency("org.yaml", "snakeyaml");
         compileGeneratedSources();
     }
 }

modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/AbstractStaxGeneratorTestCase.java

@@ -73,9 +73,6 @@ protected void verifyModel(Model model, String className, String[] versions) thr
             }
         }
 
-        addDependency("org.codehaus.woodstox", "stax2-api");
-        addDependency("com.fasterxml.woodstox", "woodstox-core");
-
         compileGeneratedSources();
 
         verifyCompiledGeneratedSources(className);

modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxDomGeneratorTest.java

@@ -55,15 +55,11 @@ public void testJavaGenerator() throws Throwable {
         modello.generate(model, "stax-writer", parameters);
         modello.generate(model, "stax-reader", parameters);
 
-        addDependency("org.codehaus.woodstox", "stax2-api");
-        addDependency("com.fasterxml.woodstox", "woodstox-core");
-        addDependency("org.xmlunit", "xmlunit-core");
-
         compileGeneratedSources(8);
 
         // TODO: see why without this, version system property is set to "2.4.1" value after verify
         System.setProperty("version", getModelloVersion());
 
-        verifyCompiledGeneratedSources("org.codehaus.modello.generator.xml.stax.StaxFeaturesVerifier");
+        verifyCompiledGeneratedSources("org.codehaus.modello.generator.xml.stax.StaxFeaturesDomVerifier");
     }
 }

modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxGeneratorTest.java

@@ -54,10 +54,6 @@ public void testJavaGenerator() throws Throwable {
         modello.generate(model, "stax-writer", parameters);
         modello.generate(model, "stax-reader", parameters);
 
-        addDependency("org.codehaus.woodstox", "stax2-api");
-        addDependency("com.fasterxml.woodstox", "woodstox-core");
-        addDependency("org.xmlunit", "xmlunit-core");
-
         compileGeneratedSources(8);
 
         // TODO: see why without this, version system property is set to "2.4.1" value after verify

modello-plugins/modello-plugin-stax/src/test/verifiers/features-dom/StaxFeaturesVerifier.java → modello-plugins/modello-plugin-stax/src/test/verifiers/features-dom/StaxFeaturesDomVerifier.java

@@ -53,7 +53,7 @@
 /**
  * @author Herve Boutemy
  */
-public class StaxFeaturesVerifier
+public class StaxFeaturesDomVerifier
     extends Verifier
 {
     public void verify()

modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/FeaturesXpp3DomGeneratorTest.java

@@ -56,9 +56,8 @@ public void testJavaGenerator() throws Throwable {
         modello.generate(model, "xpp3-writer", parameters);
         modello.generate(model, "xpp3-reader", parameters);
 
-        addDependency("org.xmlunit", "xmlunit-core");
         compileGeneratedSources(8);
 
-        verifyCompiledGeneratedSources("org.codehaus.modello.generator.xml.xpp3.Xpp3FeaturesVerifier");
+        verifyCompiledGeneratedSources("org.codehaus.modello.generator.xml.xpp3.Xpp3FeaturesDomVerifier");
     }
 }

modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/FeaturesXpp3GeneratorTest.java

@@ -54,7 +54,6 @@ public void testJavaGenerator() throws Throwable {
         modello.generate(model, "xpp3-writer", parameters);
         modello.generate(model, "xpp3-reader", parameters);
 
-        addDependency("org.xmlunit", "xmlunit-core");
         compileGeneratedSources(8);
 
         verifyCompiledGeneratedSources("org.codehaus.modello.generator.xml.xpp3.Xpp3FeaturesVerifier");

modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/Xpp3GeneratorTest.java

@@ -95,7 +95,6 @@ public void testXpp3Generator() throws Throwable {
         modello.generate(model, "xpp3-writer", parameters);
         modello.generate(model, "xpp3-reader", parameters);
 
-        addDependency("org.xmlunit", "xmlunit-core");
         compileGeneratedSources(8);
 
         // TODO: see why without this, version system property is set to "2.4.1" value after verify

modello-plugins/modello-plugin-xpp3/src/test/verifiers/features-dom/Xpp3FeaturesVerifier.java → modello-plugins/modello-plugin-xpp3/src/test/verifiers/features-dom/Xpp3FeaturesDomVerifier.java

@@ -51,7 +51,7 @@
 /**
  * @author Herve Boutemy
  */
-public class Xpp3FeaturesVerifier
+public class Xpp3FeaturesDomVerifier
     extends Verifier
 {
     public void verify()

modello-plugins/pom.xml

@@ -61,28 +61,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-dependency-plugin</artifactId>
-          <executions>
-            <execution>
-              <id>copy-test-libs</id>
-              <goals>
-                <goal>copy-dependencies</goal>
-              </goals>
-              <phase>process-test-resources</phase>
-              <configuration>
-                <outputDirectory>${project.build.directory}/test-libs</outputDirectory>
-                <excludeTransitive>false</excludeTransitive>
-                <stripVersion>true</stripVersion>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
 </project>

modello-test/pom.xml

@@ -12,9 +12,7 @@
   <description>Modello Test Package contains the basis to create Modello generator unit-tests, including sample models
     and xml files to test every feature for every plugin.</description>
 
-  <properties>
-    <plexus.compiler.version>2.16.2</plexus.compiler.version>
-  </properties>
+  <properties />
   <dependencies>
     <dependency>
       <groupId>org.eclipse.sisu</groupId>
@@ -28,16 +26,6 @@
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-xml</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-compiler-javac</artifactId>
-      <version>${plexus.compiler.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-compiler-api</artifactId>
-      <version>${plexus.compiler.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-testing</artifactId>