diff --git a/modello-maven-plugin/pom.xml b/modello-maven-plugin/pom.xml
index 1f639a0d1..f02a2b2d3 100644
--- a/modello-maven-plugin/pom.xml
+++ b/modello-maven-plugin/pom.xml
@@ -18,6 +18,12 @@
${mavenVersion}
+
+
+ false
+
+
org.codehaus.modello
@@ -172,6 +178,9 @@
run-its
+
+ true
+
@@ -221,13 +230,15 @@
features
-
+
verify
pre-site
${basedir}/src/test/verifier/site-verifications.xml
+ ${verifyFeaturesSite}
diff --git a/modello-maven-plugin/src/test/verifier/site-verifications.xml b/modello-maven-plugin/src/test/verifier/site-verifications.xml
index c360bc47a..88c2e9ea6 100644
--- a/modello-maven-plugin/src/test/verifier/site-verifications.xml
+++ b/modello-maven-plugin/src/test/verifier/site-verifications.xml
@@ -2,7 +2,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/verifications/1.0.0 http://maven.apache.org/xsd/verifications-1.0.0.xsd">
-
+
target/it/features/target/site/index.html
diff --git a/modello-plugins/modello-plugin-dom4j/src/test/verifiers/dom4j/Dom4jVerifier.java b/modello-plugins/modello-plugin-dom4j/src/test/verifiers/dom4j/Dom4jVerifier.java
index 81918ae6f..adf783ef9 100644
--- a/modello-plugins/modello-plugin-dom4j/src/test/verifiers/dom4j/Dom4jVerifier.java
+++ b/modello-plugins/modello-plugin-dom4j/src/test/verifiers/dom4j/Dom4jVerifier.java
@@ -226,10 +226,6 @@ public void verifyWriter()
String actualXml = buffer.toString();
actualXml = actualXml.replaceAll( "(\r\n)|(\r)", "\n" );
-// System.out.println( expectedXml );
-//
-// System.err.println( actualXml );
-
Assertions.assertEquals( expectedXml.trim(), actualXml.trim() );
MavenDom4jReader reader = new MavenDom4jReader();
diff --git a/modello-plugins/modello-plugin-jackson/src/test/java/org/codehaus/modello/plugin/jackson/JacksonGeneratorTest.java b/modello-plugins/modello-plugin-jackson/src/test/java/org/codehaus/modello/plugin/jackson/JacksonGeneratorTest.java
index 19edfa9e5..e25d5dc52 100644
--- a/modello-plugins/modello-plugin-jackson/src/test/java/org/codehaus/modello/plugin/jackson/JacksonGeneratorTest.java
+++ b/modello-plugins/modello-plugin-jackson/src/test/java/org/codehaus/modello/plugin/jackson/JacksonGeneratorTest.java
@@ -67,9 +67,6 @@ public void testJacksonGenerator() throws Throwable {
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.jackson.JacksonVerifier");
}
}
diff --git a/modello-plugins/modello-plugin-sax/src/test/java/org/codehaus/modello/plugin/sax/SaxGeneratorTest.java b/modello-plugins/modello-plugin-sax/src/test/java/org/codehaus/modello/plugin/sax/SaxGeneratorTest.java
index 896e68ecb..d713fef7c 100644
--- a/modello-plugins/modello-plugin-sax/src/test/java/org/codehaus/modello/plugin/sax/SaxGeneratorTest.java
+++ b/modello-plugins/modello-plugin-sax/src/test/java/org/codehaus/modello/plugin/sax/SaxGeneratorTest.java
@@ -94,9 +94,6 @@ public void testXpp3Generator() throws Throwable {
compileGeneratedSources();
- // 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.sax.SaxVerifier");
}
}
diff --git a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxDomGeneratorTest.java b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxDomGeneratorTest.java
index e302d5a8a..f479dcdca 100644
--- a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxDomGeneratorTest.java
+++ b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxDomGeneratorTest.java
@@ -57,9 +57,6 @@ public void testJavaGenerator() throws Throwable {
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.StaxFeaturesDomVerifier");
}
}
diff --git a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxGeneratorTest.java b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxGeneratorTest.java
index ef7dc1267..d36cb0a3b 100644
--- a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxGeneratorTest.java
+++ b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxGeneratorTest.java
@@ -56,9 +56,6 @@ public void testJavaGenerator() throws Throwable {
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");
}
}
diff --git a/modello-plugins/modello-plugin-stax/src/test/verifiers/stax/StaxVerifier.java b/modello-plugins/modello-plugin-stax/src/test/verifiers/stax/StaxVerifier.java
index ebcf8f316..81c89b175 100644
--- a/modello-plugins/modello-plugin-stax/src/test/verifiers/stax/StaxVerifier.java
+++ b/modello-plugins/modello-plugin-stax/src/test/verifiers/stax/StaxVerifier.java
@@ -240,10 +240,6 @@ public void verifyWriter()
String actualXml = buffer.toString();
-// System.out.println( expectedXml );
-//
-// System.out.println( actualXml );
-
Assertions.assertEquals( cleanLineEndings( expectedXml.trim() ), scrubXmlDeclQuotes( actualXml.trim() ) );
MavenStaxReader reader = new MavenStaxReader();
diff --git a/modello-plugins/modello-plugin-xdoc/src/test/java/org/codehaus/modello/plugin/xdoc/XdocGeneratorTest.java b/modello-plugins/modello-plugin-xdoc/src/test/java/org/codehaus/modello/plugin/xdoc/XdocGeneratorTest.java
index bfb9b0a00..bd0af4ac1 100644
--- a/modello-plugins/modello-plugin-xdoc/src/test/java/org/codehaus/modello/plugin/xdoc/XdocGeneratorTest.java
+++ b/modello-plugins/modello-plugin-xdoc/src/test/java/org/codehaus/modello/plugin/xdoc/XdocGeneratorTest.java
@@ -130,10 +130,6 @@ private void checkMavenXdocGenerator() throws Exception {
Map parameters = getModelloParameters("4.0.0");
modello.generate(model, "xdoc", parameters);
-
- // addDependency( "modello", "modello-core", "1.0-SNAPSHOT" );
-
- // verify( "org.codehaus.modello.generator.xml.cdoc.XdocVerifier", "xdoc" );
checkInternalLinks("maven.xml");
String content = FileUtils.fileRead(new File(getOutputDirectory(), "maven.xml"), "UTF-8");
diff --git a/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/AbstractElementTest.java b/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/AbstractElementTest.java
index cfa5fb639..4bc9efb01 100644
--- a/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/AbstractElementTest.java
+++ b/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/AbstractElementTest.java
@@ -55,9 +55,5 @@ public void testAbstract() throws Throwable {
modello.generate(model, "java", parameters);
modello.generate(model, "xpp3-writer", parameters);
modello.generate(model, "xpp3-reader", parameters);
-
- // addDependency( "org.codehaus.modello", "modello-core", getModelloVersion() );
-
- // compile( generatedSources, classes );
}
}
diff --git a/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/Xpp3GeneratorTest.java b/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/Xpp3GeneratorTest.java
index 9d4c652fd..627cd69de 100644
--- a/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/Xpp3GeneratorTest.java
+++ b/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/Xpp3GeneratorTest.java
@@ -97,9 +97,6 @@ public void testXpp3Generator() throws Throwable {
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.xpp3.Xpp3Verifier");
}
}
diff --git a/modello-plugins/modello-plugin-xsd/src/test/java/org/codehaus/modello/plugin/xsd/ChangesXsdGeneratorTest.java b/modello-plugins/modello-plugin-xsd/src/test/java/org/codehaus/modello/plugin/xsd/ChangesXsdGeneratorTest.java
index ad45e9ea4..bc0977452 100755
--- a/modello-plugins/modello-plugin-xsd/src/test/java/org/codehaus/modello/plugin/xsd/ChangesXsdGeneratorTest.java
+++ b/modello-plugins/modello-plugin-xsd/src/test/java/org/codehaus/modello/plugin/xsd/ChangesXsdGeneratorTest.java
@@ -53,11 +53,6 @@ public void testXsdGenerator() throws Throwable {
modello.generate(model, "xsd", parameters);
- // addDependency( "modello", "modello-core", "1.0-SNAPSHOT" );
-
// TODO write verifier that compiles generated schema: use jaxp
-
- // verify( "org.codehaus.modello.generator.xml.xsd.XsdVerifier", "xsd" );
-
}
}
diff --git a/modello-plugins/modello-plugin-xsd/src/test/java/org/codehaus/modello/plugin/xsd/XsdGeneratorTest.java b/modello-plugins/modello-plugin-xsd/src/test/java/org/codehaus/modello/plugin/xsd/XsdGeneratorTest.java
index 6e2758f3a..437b80b70 100644
--- a/modello-plugins/modello-plugin-xsd/src/test/java/org/codehaus/modello/plugin/xsd/XsdGeneratorTest.java
+++ b/modello-plugins/modello-plugin-xsd/src/test/java/org/codehaus/modello/plugin/xsd/XsdGeneratorTest.java
@@ -93,10 +93,6 @@ public void testXsdGenerator() throws Throwable {
modello.generate(model, "xsd", parameters);
- // addDependency( "modello", "modello-core", "1.0-SNAPSHOT" );
-
// TODO write verfier which compile generated schema : use jaxp
-
- // verify( "org.codehaus.modello.generator.xml.xsd.XsdVerifier", "xsd" );
}
}
diff --git a/modello-test/src/main/java/org/codehaus/modello/AbstractModelloJavaGeneratorTest.java b/modello-test/src/main/java/org/codehaus/modello/AbstractModelloJavaGeneratorTest.java
index 4c73d8362..753d6a0a8 100755
--- a/modello-test/src/main/java/org/codehaus/modello/AbstractModelloJavaGeneratorTest.java
+++ b/modello-test/src/main/java/org/codehaus/modello/AbstractModelloJavaGeneratorTest.java
@@ -31,7 +31,6 @@
import java.io.File;
import java.io.IOException;
-import java.io.InputStream;
import java.io.UncheckedIOException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -45,7 +44,6 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import java.util.Properties;
import java.util.jar.Attributes;
import java.util.jar.JarFile;
import java.util.jar.Manifest;
@@ -97,21 +95,6 @@ protected File getOutputClasses() {
return new File(super.getOutputDirectory(), "classes");
}
- protected String getModelloVersion() throws IOException {
- Properties properties = new Properties(System.getProperties());
-
- if (properties.getProperty("version") == null) {
- InputStream is = this.getClass()
- .getResourceAsStream("/META-INF/maven/org.codehaus.modello/modello-test/pom.properties");
-
- if (is != null) {
- properties.load(is);
- }
- }
-
- return properties.getProperty("version");
- }
-
protected void compileGeneratedSources() throws IOException {
compileGeneratedSources(getName(), 8);
}
diff --git a/pom.xml b/pom.xml
index 650cae2cd..9f8e229b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -440,7 +440,7 @@
org.codehaus.modello
modello-maven-plugin
- 2.4.0
+ 2.8.0
src/main/mdo/modello.mdo