You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2017/06/01 15:28:13 UTC
[1/2] activemq-artemis git commit: This closes #1310
Repository: activemq-artemis
Updated Branches:
refs/heads/1.x 9334ed8b9 -> 06ee68c0a
This closes #1310
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/06ee68c0
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/06ee68c0
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/06ee68c0
Branch: refs/heads/1.x
Commit: 06ee68c0a312bf94caebcba2b3e30ad46016c5a1
Parents: 9334ed8 c6747a5
Author: Clebert Suconic <cl...@apache.org>
Authored: Thu Jun 1 11:27:59 2017 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Jun 1 11:27:59 2017 -0400
----------------------------------------------------------------------
artemis-selector/pom.xml | 32 ++++++++++++++++++++++++++++++++
pom.xml | 31 +++++++++++++++++++++++++++++++
2 files changed, 63 insertions(+)
----------------------------------------------------------------------
[2/2] activemq-artemis git commit: [ARTEMIS-861] Artemis 1.5
compilation fails with IBM JDK
Posted by cl...@apache.org.
[ARTEMIS-861] Artemis 1.5 compilation fails with IBM JDK
Issue: https://issues.apache.org/jira/browse/ARTEMIS-861
(cherry picked from commit e6f757e44f779f05abf647c41422d8d4bdf867ac)
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/c6747a58
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/c6747a58
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/c6747a58
Branch: refs/heads/1.x
Commit: c6747a58eaab0bb60acad4d626279765ed9e5ea6
Parents: 9334ed8
Author: Ingo Weiss <in...@redhat.com>
Authored: Mon Apr 10 09:40:12 2017 +0100
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Jun 1 11:27:59 2017 -0400
----------------------------------------------------------------------
artemis-selector/pom.xml | 32 ++++++++++++++++++++++++++++++++
pom.xml | 31 +++++++++++++++++++++++++++++++
2 files changed, 63 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c6747a58/artemis-selector/pom.xml
----------------------------------------------------------------------
diff --git a/artemis-selector/pom.xml b/artemis-selector/pom.xml
index 18dc94a..858705d 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>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c6747a58/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2c7138c..87d0bdc 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>