From 649edd3a376819312d5e4552a90e83b4dbdc4929 Mon Sep 17 00:00:00 2001
From: Clebert Suconic <clebertsuconic@apache.org>
Date: Thu, 10 Sep 2015 13:56:20 -0400
Subject: [PATCH] improving jdk detection and javadoc options

The build wasn't working at this stage unless I specified release due to some javadoc issues
What could break builds after releases
---
 pom.xml | 67 +++++++++++++++++++++++++++++++--------------------------
 1 file changed, 37 insertions(+), 30 deletions(-)

diff --git a/pom.xml b/pom.xml
index c06e961a46..f26dd51c54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,6 +33,26 @@
       <module>artemis-protocols</module>
       <module>artemis-dto</module>
       <module>artemis-boot</module>
+      <module>artemis-web</module>
+      <module>artemis-website</module>
+      <module>artemis-cli</module>
+      <module>artemis-commons</module>
+      <module>artemis-selector</module>
+      <module>artemis-core-client</module>
+      <module>artemis-server</module>
+      <module>artemis-jms-client</module>
+      <module>artemis-jms-server</module>
+      <module>artemis-native</module>
+      <module>artemis-journal</module>
+      <module>artemis-ra</module>
+      <module>artemis-rest</module>
+      <module>artemis-service-extensions</module>
+      <module>artemis-maven-plugin</module>
+      <module>integration/activemq-spring-integration</module>
+      <module>integration/activemq-aerogear-integration</module>
+      <module>integration/activemq-vertx-integration</module>
+      <module>artemis-distribution</module>
+      <module>tests</module>
    </modules>
 
    <name>ActiveMQ Artemis Parent</name>
@@ -482,6 +502,23 @@
                <javac-compiler-id>javac</javac-compiler-id>
            </properties>
         </profile>
+      <profile>
+         <id>jdk18</id>
+         <activation>
+            <jdk>1.8</jdk>
+         </activation>
+         <build>
+            <plugins>
+               <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-javadoc-plugin</artifactId>
+                  <configuration>
+                     <additionalparam>-Xdoclint:none</additionalparam>
+                  </configuration>
+               </plugin>
+            </plugins>
+         </build>
+      </profile>
       <profile>
          <id>dev</id>
          <modules>
@@ -517,29 +554,6 @@
          <activation>
             <activeByDefault>true</activeByDefault>
          </activation>
-         <modules>
-            <module>artemis-dto</module>
-            <module>artemis-web</module>
-            <module>artemis-website</module>
-            <module>artemis-cli</module>
-            <module>artemis-commons</module>
-            <module>artemis-selector</module>
-            <module>artemis-core-client</module>
-            <module>artemis-server</module>
-            <module>artemis-jms-client</module>
-            <module>artemis-jms-server</module>
-            <module>artemis-native</module>
-            <module>artemis-journal</module>
-            <module>artemis-ra</module>
-            <module>artemis-rest</module>
-            <module>artemis-service-extensions</module>
-            <module>artemis-maven-plugin</module>
-            <module>integration/activemq-spring-integration</module>
-            <module>integration/activemq-aerogear-integration</module>
-            <module>integration/activemq-vertx-integration</module>
-            <module>artemis-distribution</module>
-            <module>tests</module>
-         </modules>
       </profile>
       <profile>
          <id>release</id>
@@ -594,13 +608,6 @@
                      </execution>
                   </executions>
                </plugin>
-               <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-javadoc-plugin</artifactId>
-                  <configuration>
-                     <additionalparam>-Xdoclint:none</additionalparam>
-                  </configuration>
-               </plugin>
             </plugins>
          </build>
       </profile>