diff --git a/maven-archetype-quickstart/src/main/resources-filtered/archetype-resources/pom.xml b/maven-archetype-quickstart/src/main/resources-filtered/archetype-resources/pom.xml
index 3b9f8ef..41ab7e5 100644
--- a/maven-archetype-quickstart/src/main/resources-filtered/archetype-resources/pom.xml
+++ b/maven-archetype-quickstart/src/main/resources-filtered/archetype-resources/pom.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-#macro( compilerProperties $jcv )
+#macro( compilerProperties $javaCompilerVersion )
 #set( $Double = 0.0 )
-#if ( $Double.valueOf($jcv) > 8 )
-    <maven.compiler.release>${jcv}</maven.compiler.release>
+#if ( $Double.valueOf($javaCompilerVersion) > 8 )
+    <maven.compiler.release>${javaCompilerVersion}</maven.compiler.release>
 #else
-    <maven.compiler.source>${jcv}</maven.compiler.source>
-    <maven.compiler.target>${jcv}</maven.compiler.target>
+    <maven.compiler.source>${javaCompilerVersion}</maven.compiler.source>
+    <maven.compiler.target>${javaCompilerVersion}</maven.compiler.target>
 #end
 #end
 #macro( junit $ver )
@@ -46,7 +46,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 #if ( ${javaCompilerVersion} == $null )
-#compilerProperties( "1.8" )
+#compilerProperties( "1.7" )
 #else
 #compilerProperties( ${javaCompilerVersion} )
 #end
diff --git a/maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.12/archetype.properties b/maven-archetype-quickstart/src/test/resources/projects/it-java-8-junit-4.12/archetype.properties
similarity index 82%
rename from maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.12/archetype.properties
rename to maven-archetype-quickstart/src/test/resources/projects/it-java-8-junit-4.12/archetype.properties
index 57dffc9..64ac86a 100644
--- a/maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.12/archetype.properties
+++ b/maven-archetype-quickstart/src/test/resources/projects/it-java-8-junit-4.12/archetype.properties
@@ -2,5 +2,5 @@ groupId=archetype.it
 artifactId=java-8-junit-412-quickstart
 version=0.1-SNAPSHOT
 package=it.pkg
-javaCompilerVersion=1.7
+javaCompilerVersion=1.8
 junitVersion=4.12
diff --git a/maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.12/goal.txt b/maven-archetype-quickstart/src/test/resources/projects/it-java-8-junit-4.12/goal.txt
similarity index 100%
rename from maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.12/goal.txt
rename to maven-archetype-quickstart/src/test/resources/projects/it-java-8-junit-4.12/goal.txt
diff --git a/maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.12/reference/.mvn/jvm.config b/maven-archetype-quickstart/src/test/resources/projects/it-java-8-junit-4.12/reference/.mvn/jvm.config
similarity index 100%
rename from maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.12/reference/.mvn/jvm.config
rename to maven-archetype-quickstart/src/test/resources/projects/it-java-8-junit-4.12/reference/.mvn/jvm.config
diff --git a/maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.12/reference/.mvn/maven.config b/maven-archetype-quickstart/src/test/resources/projects/it-java-8-junit-4.12/reference/.mvn/maven.config
similarity index 100%
rename from maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.12/reference/.mvn/maven.config
rename to maven-archetype-quickstart/src/test/resources/projects/it-java-8-junit-4.12/reference/.mvn/maven.config
diff --git a/maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.12/reference/pom.xml b/maven-archetype-quickstart/src/test/resources/projects/it-java-8-junit-4.12/reference/pom.xml
similarity index 95%
rename from maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.12/reference/pom.xml
rename to maven-archetype-quickstart/src/test/resources/projects/it-java-8-junit-4.12/reference/pom.xml
index cfd0d9b..61a23c6 100644
--- a/maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.12/reference/pom.xml
+++ b/maven-archetype-quickstart/src/test/resources/projects/it-java-8-junit-4.12/reference/pom.xml
@@ -13,8 +13,8 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
 
   <dependencies>
diff --git a/maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.12/reference/src/main/java/it/pkg/App.java b/maven-archetype-quickstart/src/test/resources/projects/it-java-8-junit-4.12/reference/src/main/java/it/pkg/App.java
similarity index 100%
rename from maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.12/reference/src/main/java/it/pkg/App.java
rename to maven-archetype-quickstart/src/test/resources/projects/it-java-8-junit-4.12/reference/src/main/java/it/pkg/App.java
diff --git a/maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.12/reference/src/test/java/it/pkg/AppTest.java b/maven-archetype-quickstart/src/test/resources/projects/it-java-8-junit-4.12/reference/src/test/java/it/pkg/AppTest.java
similarity index 100%
rename from maven-archetype-quickstart/src/test/resources/projects/it-java-7-junit-4.12/reference/src/test/java/it/pkg/AppTest.java
rename to maven-archetype-quickstart/src/test/resources/projects/it-java-8-junit-4.12/reference/src/test/java/it/pkg/AppTest.java
diff --git a/maven-archetype-quickstart/src/test/resources/projects/it-java-7/archetype.properties b/maven-archetype-quickstart/src/test/resources/projects/it-java-8/archetype.properties
similarity index 78%
rename from maven-archetype-quickstart/src/test/resources/projects/it-java-7/archetype.properties
rename to maven-archetype-quickstart/src/test/resources/projects/it-java-8/archetype.properties
index c9870c6..c8706aa 100644
--- a/maven-archetype-quickstart/src/test/resources/projects/it-java-7/archetype.properties
+++ b/maven-archetype-quickstart/src/test/resources/projects/it-java-8/archetype.properties
@@ -2,4 +2,4 @@ groupId=archetype.it
 artifactId=java-8-quickstart
 version=0.1-SNAPSHOT
 package=it.pkg
-javaCompilerVersion=1.7
+javaCompilerVersion=1.8
diff --git a/maven-archetype-quickstart/src/test/resources/projects/it-java-7/goal.txt b/maven-archetype-quickstart/src/test/resources/projects/it-java-8/goal.txt
similarity index 100%
rename from maven-archetype-quickstart/src/test/resources/projects/it-java-7/goal.txt
rename to maven-archetype-quickstart/src/test/resources/projects/it-java-8/goal.txt
diff --git a/maven-archetype-quickstart/src/test/resources/projects/it-java-7/reference/.mvn/jvm.config b/maven-archetype-quickstart/src/test/resources/projects/it-java-8/reference/.mvn/jvm.config
similarity index 100%
rename from maven-archetype-quickstart/src/test/resources/projects/it-java-7/reference/.mvn/jvm.config
rename to maven-archetype-quickstart/src/test/resources/projects/it-java-8/reference/.mvn/jvm.config
diff --git a/maven-archetype-quickstart/src/test/resources/projects/it-java-7/reference/.mvn/maven.config b/maven-archetype-quickstart/src/test/resources/projects/it-java-8/reference/.mvn/maven.config
similarity index 100%
rename from maven-archetype-quickstart/src/test/resources/projects/it-java-7/reference/.mvn/maven.config
rename to maven-archetype-quickstart/src/test/resources/projects/it-java-8/reference/.mvn/maven.config
diff --git a/maven-archetype-quickstart/src/test/resources/projects/it-java-7/reference/pom.xml b/maven-archetype-quickstart/src/test/resources/projects/it-java-8/reference/pom.xml
similarity index 95%
rename from maven-archetype-quickstart/src/test/resources/projects/it-java-7/reference/pom.xml
rename to maven-archetype-quickstart/src/test/resources/projects/it-java-8/reference/pom.xml
index a92c65d..26aba1c 100644
--- a/maven-archetype-quickstart/src/test/resources/projects/it-java-7/reference/pom.xml
+++ b/maven-archetype-quickstart/src/test/resources/projects/it-java-8/reference/pom.xml
@@ -13,8 +13,8 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
 
   <dependencies>
diff --git a/maven-archetype-quickstart/src/test/resources/projects/it-java-7/reference/src/main/java/it/pkg/App.java b/maven-archetype-quickstart/src/test/resources/projects/it-java-8/reference/src/main/java/it/pkg/App.java
similarity index 100%
rename from maven-archetype-quickstart/src/test/resources/projects/it-java-7/reference/src/main/java/it/pkg/App.java
rename to maven-archetype-quickstart/src/test/resources/projects/it-java-8/reference/src/main/java/it/pkg/App.java
diff --git a/maven-archetype-quickstart/src/test/resources/projects/it-java-7/reference/src/test/java/it/pkg/AppTest.java b/maven-archetype-quickstart/src/test/resources/projects/it-java-8/reference/src/test/java/it/pkg/AppTest.java
similarity index 100%
rename from maven-archetype-quickstart/src/test/resources/projects/it-java-7/reference/src/test/java/it/pkg/AppTest.java
rename to maven-archetype-quickstart/src/test/resources/projects/it-java-8/reference/src/test/java/it/pkg/AppTest.java