From e6f757e44f779f05abf647c41422d8d4bdf867ac Mon Sep 17 00:00:00 2001
From: Ingo Weiss <ingo@redhat.com>
Date: Mon, 10 Apr 2017 09:40:12 +0100
Subject: [PATCH] [ARTEMIS-861] Artemis 1.5 compilation fails with IBM JDK

Issue: https://issues.apache.org/jira/browse/ARTEMIS-861
---
 artemis-selector/pom.xml | 32 ++++++++++++++++++++++++++++++++
 pom.xml                  | 31 +++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+)

diff --git a/artemis-selector/pom.xml b/artemis-selector/pom.xml
index 651aee9161..c283774690 100644
--- a/artemis-selector/pom.xml
+++ b/artemis-selector/pom.xml
@@ -47,6 +47,38 @@
       </dependency>
    </dependencies>
 
+   <profiles>
+      <profile>
+         <id>ibm-jdk8</id>
+         <activation>
+            <jdk>1.8</jdk>
+            <property>
+               <name>java.vendor</name>
+               <value>IBM Corporation</value>
+            </property>
+         </activation>
+         <build>
+            <plugins>
+               <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-javadoc-plugin</artifactId>
+                  <configuration>
+                     <additionalparam>-Xdoclint:none</additionalparam>
+                  </configuration>
+               </plugin>
+               <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-compiler-plugin</artifactId>
+                  <!-- version 3.2 is having problems with the APT processor resulting in
+                    java.lang.IllegalStateException: endPosTable already set  -->
+                  <version>3.1</version>
+                  <configuration combine.self="override"></configuration>
+               </plugin>
+            </plugins>
+         </build>
+      </profile>
+   </profiles>
+
    <build>
       <resources>
          <resource>
diff --git a/pom.xml b/pom.xml
index 3f636ec48c..7eff36e3d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -688,6 +688,37 @@
                <javac-compiler-id>javac</javac-compiler-id>
            </properties>
         </profile>
+      <!-- Google Error Prone has issues with IBM JDK 8 -->
+      <!-- See ARTEMIS-861 -->
+      <profile>
+         <id>ibm-jdk8</id>
+         <activation>
+            <jdk>1.8</jdk>
+            <property>
+               <name>java.vendor</name>
+               <value>IBM Corporation</value>
+            </property>
+         </activation>
+         <build>
+            <plugins>
+               <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-javadoc-plugin</artifactId>
+                  <configuration>
+                     <additionalparam>-Xdoclint:none</additionalparam>
+                  </configuration>
+               </plugin>
+               <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-compiler-plugin</artifactId>
+                  <!-- version 3.2 is having problems with the APT processor resulting in
+                    java.lang.IllegalStateException: endPosTable already set  -->
+                  <version>3.1</version>
+                  <configuration combine.self="override"></configuration>
+               </plugin>
+            </plugins>
+         </build>
+      </profile>
       <profile>
          <id>jdk18</id>
          <activation>