diff --git a/gwt-parent/gwt-originals-parent/airline-gwt/pom.xml b/gwt-parent/gwt-originals-parent/airline-gwt/pom.xml
index d47b20b44..1cadb517f 100644
--- a/gwt-parent/gwt-originals-parent/airline-gwt/pom.xml
+++ b/gwt-parent/gwt-originals-parent/airline-gwt/pom.xml
@@ -184,6 +184,9 @@
   <profiles>
     <profile>
       <id>grader</id>
+      <activation>
+        <activeByDefault>${grader}</activeByDefault>
+      </activation>
       <build>
         <plugins>
           <plugin>
@@ -198,6 +201,7 @@
                 <version>Summer2017</version>
               </docletArtifact>
               <useStandardDocletOptions>false</useStandardDocletOptions>
+              <show>private</show>
             </configuration>
           </plugin>
         </plugins>
diff --git a/gwt-parent/gwt-originals-parent/apptbook-gwt/pom.xml b/gwt-parent/gwt-originals-parent/apptbook-gwt/pom.xml
index 322896514..a9fbb16e4 100644
--- a/gwt-parent/gwt-originals-parent/apptbook-gwt/pom.xml
+++ b/gwt-parent/gwt-originals-parent/apptbook-gwt/pom.xml
@@ -185,6 +185,9 @@
   <profiles>
     <profile>
       <id>grader</id>
+      <activation>
+        <activeByDefault>${grader}</activeByDefault>
+      </activation>
       <build>
         <plugins>
           <plugin>
@@ -199,6 +202,7 @@
                 <version>Summer2017</version>
               </docletArtifact>
               <useStandardDocletOptions>false</useStandardDocletOptions>
+              <show>private</show>
             </configuration>
           </plugin>
         </plugins>
diff --git a/gwt-parent/gwt-originals-parent/phonebill-gwt/pom.xml b/gwt-parent/gwt-originals-parent/phonebill-gwt/pom.xml
index e6e5b6752..07c71a891 100644
--- a/gwt-parent/gwt-originals-parent/phonebill-gwt/pom.xml
+++ b/gwt-parent/gwt-originals-parent/phonebill-gwt/pom.xml
@@ -184,6 +184,9 @@
   <profiles>
     <profile>
       <id>grader</id>
+      <activation>
+        <activeByDefault>${grader}</activeByDefault>
+      </activation>
       <build>
         <plugins>
           <plugin>
@@ -198,6 +201,7 @@
                 <version>Summer2017</version>
               </docletArtifact>
               <useStandardDocletOptions>false</useStandardDocletOptions>
+              <show>private</show>
             </configuration>
           </plugin>
         </plugins>
diff --git a/projects-parent/archetypes-parent/airline-archetype/src/main/resources/archetype-resources/pom.xml b/projects-parent/archetypes-parent/airline-archetype/src/main/resources/archetype-resources/pom.xml
index 0e777c976..9f9c68d3b 100644
--- a/projects-parent/archetypes-parent/airline-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/projects-parent/archetypes-parent/airline-archetype/src/main/resources/archetype-resources/pom.xml
@@ -127,6 +127,9 @@
   <profiles>
     <profile>
       <id>grader</id>
+      <activation>
+        <activeByDefault>${grader}</activeByDefault>
+      </activation>
       <build>
         <plugins>
           <plugin>
@@ -141,6 +144,7 @@
                 <version>Summer2017</version>
               </docletArtifact>
               <useStandardDocletOptions>false</useStandardDocletOptions>
+              <show>private</show>
             </configuration>
           </plugin>
         </plugins>
diff --git a/projects-parent/archetypes-parent/airline-archetype/src/test/resources/projects/javadoc/archetype.properties b/projects-parent/archetypes-parent/airline-archetype/src/test/resources/projects/javadoc/archetype.properties
new file mode 100644
index 000000000..f9cc500b7
--- /dev/null
+++ b/projects-parent/archetypes-parent/airline-archetype/src/test/resources/projects/javadoc/archetype.properties
@@ -0,0 +1,5 @@
+package=it.pkg.javadoc
+version=0.1-SNAPSHOT
+groupId=javadoc.archetype.it
+artifactId=javadoc
+grader=true
diff --git a/projects-parent/archetypes-parent/airline-archetype/src/test/resources/projects/javadoc/goal.txt b/projects-parent/archetypes-parent/airline-archetype/src/test/resources/projects/javadoc/goal.txt
new file mode 100644
index 000000000..780912245
--- /dev/null
+++ b/projects-parent/archetypes-parent/airline-archetype/src/test/resources/projects/javadoc/goal.txt
@@ -0,0 +1 @@
+javadoc:javadoc
\ No newline at end of file
diff --git a/projects-parent/archetypes-parent/airline-archetype/src/test/resources/projects/javadoc/verify.groovy b/projects-parent/archetypes-parent/airline-archetype/src/test/resources/projects/javadoc/verify.groovy
new file mode 100644
index 000000000..8734fe4f7
--- /dev/null
+++ b/projects-parent/archetypes-parent/airline-archetype/src/test/resources/projects/javadoc/verify.groovy
@@ -0,0 +1,11 @@
+File buildLog = new File(basedir, "project/javadoc/build.log");
+if (!buildLog.isFile()) {
+  throw new FileNotFoundException("Couldn't find build log: " + buildLog)
+}
+
+String logText = buildLog.text
+
+def expectedJavaDoc = "The main class for the CS410J airline Project"
+if (!logText.contains(expectedJavaDoc)) {
+  throw new IllegalStateException("Didn't find expected JavaDoc: " + expectedJavaDoc)
+}
diff --git a/projects-parent/archetypes-parent/airline-gwt-archetype/src/main/resources/archetype-resources/pom.xml b/projects-parent/archetypes-parent/airline-gwt-archetype/src/main/resources/archetype-resources/pom.xml
index a631296dd..33f427eaa 100644
--- a/projects-parent/archetypes-parent/airline-gwt-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/projects-parent/archetypes-parent/airline-gwt-archetype/src/main/resources/archetype-resources/pom.xml
@@ -183,6 +183,9 @@
   <profiles>
     <profile>
       <id>grader</id>
+      <activation>
+        <activeByDefault>${grader}</activeByDefault>
+      </activation>
       <build>
         <plugins>
           <plugin>
@@ -197,6 +200,7 @@
                 <version>Summer2017</version>
               </docletArtifact>
               <useStandardDocletOptions>false</useStandardDocletOptions>
+              <show>private</show>
             </configuration>
           </plugin>
         </plugins>
diff --git a/projects-parent/archetypes-parent/airline-gwt-archetype/src/test/resources/projects/javadoc/archetype.properties b/projects-parent/archetypes-parent/airline-gwt-archetype/src/test/resources/projects/javadoc/archetype.properties
new file mode 100644
index 000000000..f9cc500b7
--- /dev/null
+++ b/projects-parent/archetypes-parent/airline-gwt-archetype/src/test/resources/projects/javadoc/archetype.properties
@@ -0,0 +1,5 @@
+package=it.pkg.javadoc
+version=0.1-SNAPSHOT
+groupId=javadoc.archetype.it
+artifactId=javadoc
+grader=true
diff --git a/projects-parent/archetypes-parent/airline-gwt-archetype/src/test/resources/projects/javadoc/goal.txt b/projects-parent/archetypes-parent/airline-gwt-archetype/src/test/resources/projects/javadoc/goal.txt
new file mode 100644
index 000000000..780912245
--- /dev/null
+++ b/projects-parent/archetypes-parent/airline-gwt-archetype/src/test/resources/projects/javadoc/goal.txt
@@ -0,0 +1 @@
+javadoc:javadoc
\ No newline at end of file
diff --git a/projects-parent/archetypes-parent/airline-gwt-archetype/src/test/resources/projects/javadoc/verify.groovy b/projects-parent/archetypes-parent/airline-gwt-archetype/src/test/resources/projects/javadoc/verify.groovy
new file mode 100644
index 000000000..418caaf7e
--- /dev/null
+++ b/projects-parent/archetypes-parent/airline-gwt-archetype/src/test/resources/projects/javadoc/verify.groovy
@@ -0,0 +1,11 @@
+File buildLog = new File(basedir, "project/javadoc/build.log");
+if (!buildLog.isFile()) {
+  throw new FileNotFoundException("Couldn't find build log: " + buildLog)
+}
+
+String logText = buildLog.text
+
+def expectedJavaDoc = "A basic GWT class that makes sure that we can send an airline back"
+if (!logText.contains(expectedJavaDoc)) {
+  throw new IllegalStateException("Didn't find expected JavaDoc: " + expectedJavaDoc)
+}
diff --git a/projects-parent/archetypes-parent/airline-web-archetype/src/main/resources/archetype-resources/pom.xml b/projects-parent/archetypes-parent/airline-web-archetype/src/main/resources/archetype-resources/pom.xml
index 9f441abb7..7df6c6519 100644
--- a/projects-parent/archetypes-parent/airline-web-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/projects-parent/archetypes-parent/airline-web-archetype/src/main/resources/archetype-resources/pom.xml
@@ -188,6 +188,9 @@
   <profiles>
     <profile>
       <id>grader</id>
+      <activation>
+        <activeByDefault>${grader}</activeByDefault>
+      </activation>
       <build>
         <plugins>
           <plugin>
@@ -202,6 +205,7 @@
                 <version>Summer2017</version>
               </docletArtifact>
               <useStandardDocletOptions>false</useStandardDocletOptions>
+              <show>private</show>
             </configuration>
           </plugin>
         </plugins>
diff --git a/projects-parent/archetypes-parent/airline-web-archetype/src/test/resources/projects/javadoc/archetype.properties b/projects-parent/archetypes-parent/airline-web-archetype/src/test/resources/projects/javadoc/archetype.properties
new file mode 100644
index 000000000..f9cc500b7
--- /dev/null
+++ b/projects-parent/archetypes-parent/airline-web-archetype/src/test/resources/projects/javadoc/archetype.properties
@@ -0,0 +1,5 @@
+package=it.pkg.javadoc
+version=0.1-SNAPSHOT
+groupId=javadoc.archetype.it
+artifactId=javadoc
+grader=true
diff --git a/projects-parent/archetypes-parent/airline-web-archetype/src/test/resources/projects/javadoc/goal.txt b/projects-parent/archetypes-parent/airline-web-archetype/src/test/resources/projects/javadoc/goal.txt
new file mode 100644
index 000000000..780912245
--- /dev/null
+++ b/projects-parent/archetypes-parent/airline-web-archetype/src/test/resources/projects/javadoc/goal.txt
@@ -0,0 +1 @@
+javadoc:javadoc
\ No newline at end of file
diff --git a/projects-parent/archetypes-parent/airline-web-archetype/src/test/resources/projects/javadoc/verify.groovy b/projects-parent/archetypes-parent/airline-web-archetype/src/test/resources/projects/javadoc/verify.groovy
new file mode 100644
index 000000000..c8a7444cb
--- /dev/null
+++ b/projects-parent/archetypes-parent/airline-web-archetype/src/test/resources/projects/javadoc/verify.groovy
@@ -0,0 +1,11 @@
+File buildLog = new File(basedir, "project/javadoc/build.log");
+if (!buildLog.isFile()) {
+  throw new FileNotFoundException("Couldn't find build log: " + buildLog)
+}
+
+String logText = buildLog.text
+
+def expectedJavaDoc = "A helper class for accessing the rest client."
+if (!logText.contains(expectedJavaDoc)) {
+  throw new IllegalStateException("Didn't find expected JavaDoc: " + expectedJavaDoc)
+}
diff --git a/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/archetype-resources/pom.xml b/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/archetype-resources/pom.xml
index ba9cace5c..243919b4f 100644
--- a/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/archetype-resources/pom.xml
@@ -127,6 +127,9 @@
   <profiles>
     <profile>
       <id>grader</id>
+      <activation>
+        <activeByDefault>${grader}</activeByDefault>
+      </activation>
       <build>
         <plugins>
           <plugin>
diff --git a/projects-parent/archetypes-parent/apptbook-archetype/src/test/resources/projects/javadoc/archetype.properties b/projects-parent/archetypes-parent/apptbook-archetype/src/test/resources/projects/javadoc/archetype.properties
new file mode 100644
index 000000000..f9cc500b7
--- /dev/null
+++ b/projects-parent/archetypes-parent/apptbook-archetype/src/test/resources/projects/javadoc/archetype.properties
@@ -0,0 +1,5 @@
+package=it.pkg.javadoc
+version=0.1-SNAPSHOT
+groupId=javadoc.archetype.it
+artifactId=javadoc
+grader=true
diff --git a/projects-parent/archetypes-parent/apptbook-archetype/src/test/resources/projects/javadoc/goal.txt b/projects-parent/archetypes-parent/apptbook-archetype/src/test/resources/projects/javadoc/goal.txt
new file mode 100644
index 000000000..780912245
--- /dev/null
+++ b/projects-parent/archetypes-parent/apptbook-archetype/src/test/resources/projects/javadoc/goal.txt
@@ -0,0 +1 @@
+javadoc:javadoc
\ No newline at end of file
diff --git a/projects-parent/archetypes-parent/apptbook-archetype/src/test/resources/projects/javadoc/verify.groovy b/projects-parent/archetypes-parent/apptbook-archetype/src/test/resources/projects/javadoc/verify.groovy
new file mode 100644
index 000000000..378c6e9ed
--- /dev/null
+++ b/projects-parent/archetypes-parent/apptbook-archetype/src/test/resources/projects/javadoc/verify.groovy
@@ -0,0 +1,13 @@
+package projects.javadoc
+
+File buildLog = new File(basedir, "project/javadoc/build.log");
+if (!buildLog.isFile()) {
+  throw new FileNotFoundException("Couldn't find build log: " + buildLog)
+}
+
+String logText = buildLog.text
+
+def expectedJavaDoc = "The main class for the CS410J appointment book Project"
+if (!logText.contains(expectedJavaDoc)) {
+  throw new IllegalStateException("Didn't find expected JavaDoc: " + expectedJavaDoc)
+}
diff --git a/projects-parent/archetypes-parent/apptbook-gwt-archetype/src/main/resources/archetype-resources/pom.xml b/projects-parent/archetypes-parent/apptbook-gwt-archetype/src/main/resources/archetype-resources/pom.xml
index db1d3be99..d08007055 100644
--- a/projects-parent/archetypes-parent/apptbook-gwt-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/projects-parent/archetypes-parent/apptbook-gwt-archetype/src/main/resources/archetype-resources/pom.xml
@@ -197,6 +197,9 @@
   <profiles>
     <profile>
       <id>grader</id>
+      <activation>
+        <activeByDefault>${grader}</activeByDefault>
+      </activation>
       <build>
         <plugins>
           <plugin>
@@ -211,6 +214,7 @@
                 <version>Summer2017</version>
               </docletArtifact>
               <useStandardDocletOptions>false</useStandardDocletOptions>
+              <show>private</show>
             </configuration>
           </plugin>
         </plugins>
diff --git a/projects-parent/archetypes-parent/apptbook-gwt-archetype/src/test/resources/projects/javadoc/archetype.properties b/projects-parent/archetypes-parent/apptbook-gwt-archetype/src/test/resources/projects/javadoc/archetype.properties
new file mode 100644
index 000000000..f9cc500b7
--- /dev/null
+++ b/projects-parent/archetypes-parent/apptbook-gwt-archetype/src/test/resources/projects/javadoc/archetype.properties
@@ -0,0 +1,5 @@
+package=it.pkg.javadoc
+version=0.1-SNAPSHOT
+groupId=javadoc.archetype.it
+artifactId=javadoc
+grader=true
diff --git a/projects-parent/archetypes-parent/apptbook-gwt-archetype/src/test/resources/projects/javadoc/goal.txt b/projects-parent/archetypes-parent/apptbook-gwt-archetype/src/test/resources/projects/javadoc/goal.txt
new file mode 100644
index 000000000..780912245
--- /dev/null
+++ b/projects-parent/archetypes-parent/apptbook-gwt-archetype/src/test/resources/projects/javadoc/goal.txt
@@ -0,0 +1 @@
+javadoc:javadoc
\ No newline at end of file
diff --git a/projects-parent/archetypes-parent/apptbook-gwt-archetype/src/test/resources/projects/javadoc/verify.groovy b/projects-parent/archetypes-parent/apptbook-gwt-archetype/src/test/resources/projects/javadoc/verify.groovy
new file mode 100644
index 000000000..4d091ca6c
--- /dev/null
+++ b/projects-parent/archetypes-parent/apptbook-gwt-archetype/src/test/resources/projects/javadoc/verify.groovy
@@ -0,0 +1,11 @@
+File buildLog = new File(basedir, "project/javadoc/build.log");
+if (!buildLog.isFile()) {
+  throw new FileNotFoundException("Couldn't find build log: " + buildLog)
+}
+
+String logText = buildLog.text
+
+def expectedJavaDoc = "A basic GWT class that makes sure that we can send an appointment book"
+if (!logText.contains(expectedJavaDoc)) {
+  throw new IllegalStateException("Didn't find expected JavaDoc: " + expectedJavaDoc)
+}
diff --git a/projects-parent/archetypes-parent/apptbook-web-archetype/src/main/resources/archetype-resources/pom.xml b/projects-parent/archetypes-parent/apptbook-web-archetype/src/main/resources/archetype-resources/pom.xml
index f0b098942..7ed675694 100644
--- a/projects-parent/archetypes-parent/apptbook-web-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/projects-parent/archetypes-parent/apptbook-web-archetype/src/main/resources/archetype-resources/pom.xml
@@ -188,6 +188,9 @@
   <profiles>
     <profile>
       <id>grader</id>
+      <activation>
+        <activeByDefault>${grader}</activeByDefault>
+      </activation>
       <build>
         <plugins>
           <plugin>
@@ -202,6 +205,7 @@
                 <version>Summer2017</version>
               </docletArtifact>
               <useStandardDocletOptions>false</useStandardDocletOptions>
+              <show>private</show>
             </configuration>
           </plugin>
         </plugins>
diff --git a/projects-parent/archetypes-parent/apptbook-web-archetype/src/test/resources/projects/javadoc/archetype.properties b/projects-parent/archetypes-parent/apptbook-web-archetype/src/test/resources/projects/javadoc/archetype.properties
new file mode 100644
index 000000000..f9cc500b7
--- /dev/null
+++ b/projects-parent/archetypes-parent/apptbook-web-archetype/src/test/resources/projects/javadoc/archetype.properties
@@ -0,0 +1,5 @@
+package=it.pkg.javadoc
+version=0.1-SNAPSHOT
+groupId=javadoc.archetype.it
+artifactId=javadoc
+grader=true
diff --git a/projects-parent/archetypes-parent/apptbook-web-archetype/src/test/resources/projects/javadoc/goal.txt b/projects-parent/archetypes-parent/apptbook-web-archetype/src/test/resources/projects/javadoc/goal.txt
new file mode 100644
index 000000000..780912245
--- /dev/null
+++ b/projects-parent/archetypes-parent/apptbook-web-archetype/src/test/resources/projects/javadoc/goal.txt
@@ -0,0 +1 @@
+javadoc:javadoc
\ No newline at end of file
diff --git a/projects-parent/archetypes-parent/apptbook-web-archetype/src/test/resources/projects/javadoc/verify.groovy b/projects-parent/archetypes-parent/apptbook-web-archetype/src/test/resources/projects/javadoc/verify.groovy
new file mode 100644
index 000000000..5872baba4
--- /dev/null
+++ b/projects-parent/archetypes-parent/apptbook-web-archetype/src/test/resources/projects/javadoc/verify.groovy
@@ -0,0 +1,11 @@
+File buildLog = new File(basedir, "project/javadoc/build.log");
+if (!buildLog.isFile()) {
+  throw new FileNotFoundException("Couldn't find build log: " + buildLog)
+}
+
+String logText = buildLog.text
+
+def expectedJavaDoc = "A helper class for accessing the rest client"
+if (!logText.contains(expectedJavaDoc)) {
+  throw new IllegalStateException("Didn't find expected JavaDoc: " + expectedJavaDoc)
+}
diff --git a/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/archetype-resources/pom.xml b/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/archetype-resources/pom.xml
index 720e610e9..cf65cc3af 100644
--- a/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/archetype-resources/pom.xml
@@ -122,6 +122,9 @@
   <profiles>
     <profile>
       <id>grader</id>
+      <activation>
+        <activeByDefault>${grader}</activeByDefault>
+      </activation>
       <build>
         <plugins>
           <plugin>
@@ -136,6 +139,7 @@
                 <version>Summer2017</version>
               </docletArtifact>
               <useStandardDocletOptions>false</useStandardDocletOptions>
+              <show>private</show>
             </configuration>
           </plugin>
         </plugins>
diff --git a/projects-parent/archetypes-parent/phonebill-archetype/src/test/resources/projects/javadoc/archetype.properties b/projects-parent/archetypes-parent/phonebill-archetype/src/test/resources/projects/javadoc/archetype.properties
new file mode 100644
index 000000000..f9cc500b7
--- /dev/null
+++ b/projects-parent/archetypes-parent/phonebill-archetype/src/test/resources/projects/javadoc/archetype.properties
@@ -0,0 +1,5 @@
+package=it.pkg.javadoc
+version=0.1-SNAPSHOT
+groupId=javadoc.archetype.it
+artifactId=javadoc
+grader=true
diff --git a/projects-parent/archetypes-parent/phonebill-archetype/src/test/resources/projects/javadoc/goal.txt b/projects-parent/archetypes-parent/phonebill-archetype/src/test/resources/projects/javadoc/goal.txt
new file mode 100644
index 000000000..780912245
--- /dev/null
+++ b/projects-parent/archetypes-parent/phonebill-archetype/src/test/resources/projects/javadoc/goal.txt
@@ -0,0 +1 @@
+javadoc:javadoc
\ No newline at end of file
diff --git a/projects-parent/archetypes-parent/phonebill-archetype/src/test/resources/projects/javadoc/verify.groovy b/projects-parent/archetypes-parent/phonebill-archetype/src/test/resources/projects/javadoc/verify.groovy
new file mode 100644
index 000000000..91326382e
--- /dev/null
+++ b/projects-parent/archetypes-parent/phonebill-archetype/src/test/resources/projects/javadoc/verify.groovy
@@ -0,0 +1,11 @@
+File buildLog = new File(basedir, "project/javadoc/build.log");
+if (!buildLog.isFile()) {
+  throw new FileNotFoundException("Couldn't find build log: " + buildLog)
+}
+
+String logText = buildLog.text
+
+def expectedJavaDoc = "The main class for the CS410J Phone Bill Project"
+if (!logText.contains(expectedJavaDoc)) {
+  throw new IllegalStateException("Didn't find expected JavaDoc: " + expectedJavaDoc)
+}
diff --git a/projects-parent/archetypes-parent/phonebill-gwt-archetype/src/main/resources/archetype-resources/pom.xml b/projects-parent/archetypes-parent/phonebill-gwt-archetype/src/main/resources/archetype-resources/pom.xml
index 16d912de3..b62dac8ea 100644
--- a/projects-parent/archetypes-parent/phonebill-gwt-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/projects-parent/archetypes-parent/phonebill-gwt-archetype/src/main/resources/archetype-resources/pom.xml
@@ -184,6 +184,9 @@
   <profiles>
     <profile>
       <id>grader</id>
+      <activation>
+        <activeByDefault>${grader}</activeByDefault>
+      </activation>
       <build>
         <plugins>
           <plugin>
@@ -198,6 +201,7 @@
                 <version>Summer2017</version>
               </docletArtifact>
               <useStandardDocletOptions>false</useStandardDocletOptions>
+              <show>private</show>
             </configuration>
           </plugin>
         </plugins>
diff --git a/projects-parent/archetypes-parent/phonebill-gwt-archetype/src/test/resources/projects/javadoc/archetype.properties b/projects-parent/archetypes-parent/phonebill-gwt-archetype/src/test/resources/projects/javadoc/archetype.properties
new file mode 100644
index 000000000..f9cc500b7
--- /dev/null
+++ b/projects-parent/archetypes-parent/phonebill-gwt-archetype/src/test/resources/projects/javadoc/archetype.properties
@@ -0,0 +1,5 @@
+package=it.pkg.javadoc
+version=0.1-SNAPSHOT
+groupId=javadoc.archetype.it
+artifactId=javadoc
+grader=true
diff --git a/projects-parent/archetypes-parent/phonebill-gwt-archetype/src/test/resources/projects/javadoc/goal.txt b/projects-parent/archetypes-parent/phonebill-gwt-archetype/src/test/resources/projects/javadoc/goal.txt
new file mode 100644
index 000000000..780912245
--- /dev/null
+++ b/projects-parent/archetypes-parent/phonebill-gwt-archetype/src/test/resources/projects/javadoc/goal.txt
@@ -0,0 +1 @@
+javadoc:javadoc
\ No newline at end of file
diff --git a/projects-parent/archetypes-parent/phonebill-gwt-archetype/src/test/resources/projects/javadoc/verify.groovy b/projects-parent/archetypes-parent/phonebill-gwt-archetype/src/test/resources/projects/javadoc/verify.groovy
new file mode 100644
index 000000000..dda0254b4
--- /dev/null
+++ b/projects-parent/archetypes-parent/phonebill-gwt-archetype/src/test/resources/projects/javadoc/verify.groovy
@@ -0,0 +1,11 @@
+File buildLog = new File(basedir, "project/javadoc/build.log");
+if (!buildLog.isFile()) {
+  throw new FileNotFoundException("Couldn't find build log: " + buildLog)
+}
+
+String logText = buildLog.text
+
+def expectedJavaDoc = "A basic GWT class that makes sure that we can send an Phone Bill back"
+if (!logText.contains(expectedJavaDoc)) {
+  throw new IllegalStateException("Didn't find expected JavaDoc: " + expectedJavaDoc)
+}
diff --git a/projects-parent/archetypes-parent/phonebill-web-archetype/src/main/resources/archetype-resources/pom.xml b/projects-parent/archetypes-parent/phonebill-web-archetype/src/main/resources/archetype-resources/pom.xml
index 076b81829..ae591e5b9 100644
--- a/projects-parent/archetypes-parent/phonebill-web-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/projects-parent/archetypes-parent/phonebill-web-archetype/src/main/resources/archetype-resources/pom.xml
@@ -189,6 +189,9 @@
   <profiles>
     <profile>
       <id>grader</id>
+      <activation>
+        <activeByDefault>${grader}</activeByDefault>
+      </activation>
       <build>
         <plugins>
           <plugin>
@@ -203,6 +206,7 @@
                 <version>Summer2017</version>
               </docletArtifact>
               <useStandardDocletOptions>false</useStandardDocletOptions>
+              <show>private</show>
             </configuration>
           </plugin>
         </plugins>
diff --git a/projects-parent/archetypes-parent/phonebill-web-archetype/src/test/resources/projects/javadoc/archetype.properties b/projects-parent/archetypes-parent/phonebill-web-archetype/src/test/resources/projects/javadoc/archetype.properties
new file mode 100644
index 000000000..f9cc500b7
--- /dev/null
+++ b/projects-parent/archetypes-parent/phonebill-web-archetype/src/test/resources/projects/javadoc/archetype.properties
@@ -0,0 +1,5 @@
+package=it.pkg.javadoc
+version=0.1-SNAPSHOT
+groupId=javadoc.archetype.it
+artifactId=javadoc
+grader=true
diff --git a/projects-parent/archetypes-parent/phonebill-web-archetype/src/test/resources/projects/javadoc/goal.txt b/projects-parent/archetypes-parent/phonebill-web-archetype/src/test/resources/projects/javadoc/goal.txt
new file mode 100644
index 000000000..780912245
--- /dev/null
+++ b/projects-parent/archetypes-parent/phonebill-web-archetype/src/test/resources/projects/javadoc/goal.txt
@@ -0,0 +1 @@
+javadoc:javadoc
\ No newline at end of file
diff --git a/projects-parent/archetypes-parent/phonebill-web-archetype/src/test/resources/projects/javadoc/verify.groovy b/projects-parent/archetypes-parent/phonebill-web-archetype/src/test/resources/projects/javadoc/verify.groovy
new file mode 100644
index 000000000..c8a7444cb
--- /dev/null
+++ b/projects-parent/archetypes-parent/phonebill-web-archetype/src/test/resources/projects/javadoc/verify.groovy
@@ -0,0 +1,11 @@
+File buildLog = new File(basedir, "project/javadoc/build.log");
+if (!buildLog.isFile()) {
+  throw new FileNotFoundException("Couldn't find build log: " + buildLog)
+}
+
+String logText = buildLog.text
+
+def expectedJavaDoc = "A helper class for accessing the rest client."
+if (!logText.contains(expectedJavaDoc)) {
+  throw new IllegalStateException("Didn't find expected JavaDoc: " + expectedJavaDoc)
+}
diff --git a/projects-parent/archetypes-parent/student-archetype/src/main/resources/archetype-resources/pom.xml b/projects-parent/archetypes-parent/student-archetype/src/main/resources/archetype-resources/pom.xml
index 9b7e26cad..501b8ed17 100644
--- a/projects-parent/archetypes-parent/student-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/projects-parent/archetypes-parent/student-archetype/src/main/resources/archetype-resources/pom.xml
@@ -117,4 +117,33 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
+  <profiles>
+    <profile>
+      <id>grader</id>
+      <activation>
+        <activeByDefault>${grader}</activeByDefault>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <version>2.9</version>
+            <configuration>
+              <doclet>edu.pdx.cs410J.grader.APIDocumentationDoclet</doclet>
+              <docletArtifact>
+                <groupId>edu.pdx.cs410J</groupId>
+                <artifactId>grader</artifactId>
+                <version>Summer2017</version>
+              </docletArtifact>
+              <useStandardDocletOptions>false</useStandardDocletOptions>
+              <show>private</show>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>
diff --git a/projects-parent/archetypes-parent/student-archetype/src/test/resources/projects/javadoc/archetype.properties b/projects-parent/archetypes-parent/student-archetype/src/test/resources/projects/javadoc/archetype.properties
new file mode 100644
index 000000000..f9cc500b7
--- /dev/null
+++ b/projects-parent/archetypes-parent/student-archetype/src/test/resources/projects/javadoc/archetype.properties
@@ -0,0 +1,5 @@
+package=it.pkg.javadoc
+version=0.1-SNAPSHOT
+groupId=javadoc.archetype.it
+artifactId=javadoc
+grader=true
diff --git a/projects-parent/archetypes-parent/student-archetype/src/test/resources/projects/javadoc/goal.txt b/projects-parent/archetypes-parent/student-archetype/src/test/resources/projects/javadoc/goal.txt
new file mode 100644
index 000000000..780912245
--- /dev/null
+++ b/projects-parent/archetypes-parent/student-archetype/src/test/resources/projects/javadoc/goal.txt
@@ -0,0 +1 @@
+javadoc:javadoc
\ No newline at end of file
diff --git a/projects-parent/archetypes-parent/student-archetype/src/test/resources/projects/javadoc/verify.groovy b/projects-parent/archetypes-parent/student-archetype/src/test/resources/projects/javadoc/verify.groovy
new file mode 100644
index 000000000..a60308b03
--- /dev/null
+++ b/projects-parent/archetypes-parent/student-archetype/src/test/resources/projects/javadoc/verify.groovy
@@ -0,0 +1,11 @@
+File buildLog = new File(basedir, "project/javadoc/build.log");
+if (!buildLog.isFile()) {
+  throw new FileNotFoundException("Couldn't find build log: " + buildLog)
+}
+
+String logText = buildLog.text
+
+def expectedJavaDoc = "This class is represents a <code>Student</code>."
+if (!logText.contains(expectedJavaDoc)) {
+  throw new IllegalStateException("Didn't find expected JavaDoc: " + expectedJavaDoc)
+}
diff --git a/projects-parent/originals-parent/airline-web/pom.xml b/projects-parent/originals-parent/airline-web/pom.xml
index bac403000..d158dc6c3 100644
--- a/projects-parent/originals-parent/airline-web/pom.xml
+++ b/projects-parent/originals-parent/airline-web/pom.xml
@@ -189,6 +189,9 @@
   <profiles>
     <profile>
       <id>grader</id>
+      <activation>
+        <activeByDefault>${grader}</activeByDefault>
+      </activation>
       <build>
         <plugins>
           <plugin>
@@ -203,6 +206,7 @@
                 <version>Summer2017</version>
               </docletArtifact>
               <useStandardDocletOptions>false</useStandardDocletOptions>
+              <show>private</show>
             </configuration>
           </plugin>
         </plugins>
diff --git a/projects-parent/originals-parent/airline/pom.xml b/projects-parent/originals-parent/airline/pom.xml
index 6fc440595..774abce5f 100644
--- a/projects-parent/originals-parent/airline/pom.xml
+++ b/projects-parent/originals-parent/airline/pom.xml
@@ -126,6 +126,9 @@
   <profiles>
     <profile>
       <id>grader</id>
+      <activation>
+        <activeByDefault>${grader}</activeByDefault>
+      </activation>
       <build>
         <plugins>
           <plugin>
@@ -140,6 +143,7 @@
                 <version>Summer2017</version>
               </docletArtifact>
               <useStandardDocletOptions>false</useStandardDocletOptions>
+              <show>private</show>
             </configuration>
           </plugin>
         </plugins>
diff --git a/projects-parent/originals-parent/apptbook-web/pom.xml b/projects-parent/originals-parent/apptbook-web/pom.xml
index 650fbf038..a0e2f4be5 100644
--- a/projects-parent/originals-parent/apptbook-web/pom.xml
+++ b/projects-parent/originals-parent/apptbook-web/pom.xml
@@ -187,6 +187,9 @@
   <profiles>
     <profile>
       <id>grader</id>
+      <activation>
+        <activeByDefault>${grader}</activeByDefault>
+      </activation>
       <build>
         <plugins>
           <plugin>
@@ -201,6 +204,7 @@
                 <version>Summer2017</version>
               </docletArtifact>
               <useStandardDocletOptions>false</useStandardDocletOptions>
+              <show>private</show>
             </configuration>
           </plugin>
         </plugins>
diff --git a/projects-parent/originals-parent/apptbook/pom.xml b/projects-parent/originals-parent/apptbook/pom.xml
index cb5a894bd..4647c9aa0 100644
--- a/projects-parent/originals-parent/apptbook/pom.xml
+++ b/projects-parent/originals-parent/apptbook/pom.xml
@@ -126,6 +126,9 @@
   <profiles>
     <profile>
       <id>grader</id>
+      <activation>
+        <activeByDefault>${grader}</activeByDefault>
+      </activation>
       <build>
         <plugins>
           <plugin>
diff --git a/projects-parent/originals-parent/phonebill-web/pom.xml b/projects-parent/originals-parent/phonebill-web/pom.xml
index 593ecba8f..0ab0e679b 100644
--- a/projects-parent/originals-parent/phonebill-web/pom.xml
+++ b/projects-parent/originals-parent/phonebill-web/pom.xml
@@ -187,6 +187,9 @@
   <profiles>
     <profile>
       <id>grader</id>
+      <activation>
+        <activeByDefault>${grader}</activeByDefault>
+      </activation>
       <build>
         <plugins>
           <plugin>
@@ -201,6 +204,7 @@
                 <version>Summer2017</version>
               </docletArtifact>
               <useStandardDocletOptions>false</useStandardDocletOptions>
+              <show>private</show>
             </configuration>
           </plugin>
         </plugins>
diff --git a/projects-parent/originals-parent/phonebill/pom.xml b/projects-parent/originals-parent/phonebill/pom.xml
index f27bd40cd..7e0dc399e 100644
--- a/projects-parent/originals-parent/phonebill/pom.xml
+++ b/projects-parent/originals-parent/phonebill/pom.xml
@@ -121,6 +121,9 @@
   <profiles>
     <profile>
       <id>grader</id>
+      <activation>
+        <activeByDefault>${grader}</activeByDefault>
+      </activation>
       <build>
         <plugins>
           <plugin>
@@ -135,6 +138,7 @@
                 <version>Summer2017</version>
               </docletArtifact>
               <useStandardDocletOptions>false</useStandardDocletOptions>
+              <show>private</show>
             </configuration>
           </plugin>
         </plugins>
diff --git a/projects-parent/originals-parent/student/pom.xml b/projects-parent/originals-parent/student/pom.xml
index 7bc1f2e0e..cbed48633 100644
--- a/projects-parent/originals-parent/student/pom.xml
+++ b/projects-parent/originals-parent/student/pom.xml
@@ -116,4 +116,33 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
+  <profiles>
+    <profile>
+      <id>grader</id>
+      <activation>
+        <activeByDefault>${grader}</activeByDefault>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <version>2.9</version>
+            <configuration>
+              <doclet>edu.pdx.cs410J.grader.APIDocumentationDoclet</doclet>
+              <docletArtifact>
+                <groupId>edu.pdx.cs410J</groupId>
+                <artifactId>grader</artifactId>
+                <version>Summer2017</version>
+              </docletArtifact>
+              <useStandardDocletOptions>false</useStandardDocletOptions>
+              <show>private</show>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>