From ad35e1994bd382d023d1b42041765dd2a68d2183 Mon Sep 17 00:00:00 2001
From: Andy Seaborne <andy@apache.org>
Date: Sat, 4 Nov 2017 12:16:44 +0000
Subject: [PATCH] JENA-1408: Merge -Pbootstrap in -Pdev; no javadoc in -Pdev

---
 jena-project/pom.xml | 17 +++++++++++++++++
 pom.xml              | 36 ++----------------------------------
 2 files changed, 19 insertions(+), 34 deletions(-)

diff --git a/jena-project/pom.xml b/jena-project/pom.xml
index f7c55a3ac2f..b784f003239 100644
--- a/jena-project/pom.xml
+++ b/jena-project/pom.xml
@@ -115,6 +115,23 @@
         </plugins>
       </build>
     </profile>
+
+    <profile>
+      <id>dev</id>
+      <build>
+        <plugins>
+          <!-- For -Pdev :: don't create javadoc. -->
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <configuration>
+              <skip>true</skip>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
   </profiles>
 
   <!-- Version management -->
diff --git a/pom.xml b/pom.xml
index 2e5eac49f4c..757d09d49c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,8 +68,8 @@
       -->
       <modules>
         <module>jena-project</module>
-        <!-- <module>jena-shaded-guava</module>   -->
-        <!-- <module>jena-iri</module>            -->
+        <module>jena-shaded-guava</module>
+        <module>jena-iri</module>
         <module>jena-base</module>
         
         <module>jena-core</module>
@@ -105,38 +105,6 @@
       </modules>
     </profile>
 
-    <profile>
-      <!-- Build to get started, up to Fuseki2.
-           Includes modules skipped by "dev".
-           Use this (or a full build) when building locally
-           and there are no SNAPSHOTs in the "snapshots" repository.
-           This profile does a more complete "dev" build,
-           does not assume anything is already built,
-           and does not include the longer running modules.
-      -->
-      <id>bootstrap</id>
-      <modules>
-        <module>jena-project</module>
-        <module>jena-shaded-guava</module>
-        <module>jena-iri</module> 
-        <module>jena-base</module>
-        <module>jena-core</module>
-        <module>jena-arq</module>
-        <module>jena-rdfconnection</module>
-        <module>jena-tdb</module>
-        <module>jena-db</module>
-        <module>apache-jena-libs</module>
-        <module>jena-text</module>
-        <!--<module>jena-text-es</module>-->
-        <module>jena-spatial</module>
-
-        <module>jena-cmds</module>
-        <module>jena-fuseki2</module>
-
-        <module>jena-integration-tests</module>
-      </modules>
-    </profile>
-    
     <profile>
       <!--
           This is the complete profile, it builds everything including slow