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 2019/06/20 15:41:15 UTC
[activemq-artemis] branch master updated: ARTEMIS-2354 Fix
compilation issues on JDK 8
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/master by this push:
new 417ee54 ARTEMIS-2354 Fix compilation issues on JDK 8
new 087cd6b This closes #2720
417ee54 is described below
commit 417ee543fd22d889df28795c8eba4ed69ed91464
Author: Francesco Nigro <ni...@gmail.com>
AuthorDate: Thu Jun 20 11:44:53 2019 +0200
ARTEMIS-2354 Fix compilation issues on JDK 8
This reverts partially commit f8d3a8f2 to include only
the changes that makes possible to run tests with JDK 11:
compile on JDK 11 is outside the scope of the issue.
JDK 11 compilation requires Karaf upgrade, that will
break compatibility with Aether on integration-tests.
---
artemis-dto/pom.xml | 8 --
.../apache/activemq/artemis/dto/package-info.java | 1 -
artemis-features/pom.xml | 2 +-
artemis-selector/pom.xml | 52 ++---------
artemis-website/pom.xml | 13 +--
pom.xml | 102 +++++++--------------
6 files changed, 47 insertions(+), 131 deletions(-)
diff --git a/artemis-dto/pom.xml b/artemis-dto/pom.xml
index f0780dd..27fecd9 100644
--- a/artemis-dto/pom.xml
+++ b/artemis-dto/pom.xml
@@ -99,9 +99,6 @@
<exclude name="**/.git/**" />
<exclude name="**/.svn/**" />
</schemagen>
- <replace file="${project.build.directory}/schema/org.apache.activemq/dto/activemq.xsd"
- token="xmlns:xs="http://www.w3.org/2001/XMLSchema""
- value="xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema""/>
<copy todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/schema" />
</copy>
@@ -128,11 +125,6 @@
<artifactId>jaxb-jxc</artifactId>
<version>${version.jaxb}</version>
</dependency>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <version>2.3.2</version>
- </dependency>
</dependencies>
</plugin>
</plugins>
diff --git a/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/package-info.java b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/package-info.java
index 7055bfb..0a8b297 100644
--- a/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/package-info.java
+++ b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/package-info.java
@@ -18,7 +18,6 @@
* The JAXB POJOs for the XML configuration of ActiveMQ Artemis broker
*/
@javax.xml.bind.annotation.XmlSchema(
- xmlns = {@javax.xml.bind.annotation.XmlNs(prefix = "xs", namespaceURI = "http://www.w3.org/2001/XMLSchema")},
namespace = "http://activemq.org/schema",
elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.apache.activemq.artemis.dto;
diff --git a/artemis-features/pom.xml b/artemis-features/pom.xml
index 7afbbf6..283608c 100644
--- a/artemis-features/pom.xml
+++ b/artemis-features/pom.xml
@@ -26,7 +26,7 @@
<name>ActiveMQ Artemis Features</name>
<properties>
- <karaf.version>4.2.3</karaf.version>
+ <karaf.version>4.1.1</karaf.version>
</properties>
<dependencies>
diff --git a/artemis-selector/pom.xml b/artemis-selector/pom.xml
index 4a61be5..fc267c3 100644
--- a/artemis-selector/pom.xml
+++ b/artemis-selector/pom.xml
@@ -84,48 +84,6 @@
</plugins>
</build>
</profile>
- <profile>
- <id>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-compiler-plugin</artifactId>
- <configuration>
- <compilerArgs>
- <!-- TODO: do this only for generated-sources -->
- <arg>-Xep:MissingOverride:WARN</arg>
- </compilerArgs>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>jdk11</id>
- <activation>
- <jdk>11</jdk>
- <property>
- <name>java.vendor</name>
- <value>!IBM Corporation</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
<build>
@@ -137,6 +95,16 @@
</resources>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <compilerArgs>
+ <!-- TODO: do this only for generated-sources -->
+ <arg>-Xep:MissingOverride:WARN</arg>
+ </compilerArgs>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>javacc-maven-plugin</artifactId>
<version>2.6</version>
diff --git a/artemis-website/pom.xml b/artemis-website/pom.xml
index 7ee2087..3ceda36 100644
--- a/artemis-website/pom.xml
+++ b/artemis-website/pom.xml
@@ -92,7 +92,7 @@
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.1.0</version>
+ <version>2.10.1</version>
<executions>
<execution>
<id>javadoc-jar</id>
@@ -101,8 +101,6 @@
<goal>jar</goal>
</goals>
<configuration>
- <doclint>none</doclint>
- <additionalOptions>${forceHtml4}</additionalOptions>
<useStandardDocletOptions>true</useStandardDocletOptions>
<minmemory>128m</minmemory>
<maxmemory>512m</maxmemory>
@@ -132,15 +130,6 @@
<profiles>
<profile>
- <id>jdk11</id>
- <activation>
- <jdk>11</jdk>
- </activation>
- <properties>
- <forceHtml4>-html4</forceHtml4>
- </properties>
- </profile>
- <profile>
<id>release</id>
<build>
<plugins>
diff --git a/pom.xml b/pom.xml
index c1125b8..95fe5b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,7 +75,7 @@
<staging.siteURL>scp://people.apache.org/x1/www/activemq.apache.org</staging.siteURL>
<activemq-artemis-native-version>1.0.0</activemq-artemis-native-version>
- <karaf.version>4.2.3</karaf.version>
+ <karaf.version>4.0.6</karaf.version>
<pax.exam.version>4.9.1</pax.exam.version>
<commons.config.version>2.4</commons.config.version>
<commons.lang.version>3.0</commons.lang.version>
@@ -867,10 +867,6 @@
<id>jdk18</id>
<activation>
<jdk>1.8</jdk>
- <property>
- <name>java.vendor</name>
- <value>!IBM Corporation</value>
- </property>
</activation>
<build>
<plugins>
@@ -881,68 +877,6 @@
<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>
- <!-- Enable Google's Error-Prone https://github.com/google/error-prone -->
- <configuration>
- <showWarnings>true</showWarnings>
- <forceJavacCompilerUse>true</forceJavacCompilerUse>
- <compilerId>${javac-compiler-id}</compilerId>
- <compilerArgs>
- <arg>-Xep:MissingOverride:ERROR</arg>
- <arg>-Xep:NonAtomicVolatileUpdate:ERROR</arg>
- <arg>-Xep:SynchronizeOnNonFinalField:ERROR</arg>
- <arg>-Xep:StaticAccessedFromInstance:ERROR</arg>
- <arg>-Xep:SynchronizeOnNonFinalField:ERROR</arg>
- <arg>-Xep:WaitNotInLoop:ERROR</arg>
- <arg>-Xdiags:verbose</arg>
- </compilerArgs>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-compiler-javac-errorprone</artifactId>
- <version>2.8</version>
- </dependency>
- <dependency>
- <groupId>com.google.errorprone</groupId>
- <artifactId>error_prone_core</artifactId>
- <version>2.0.9</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>jdk11</id>
- <activation>
- <jdk>11</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>
- </plugin>
</plugins>
</build>
</profile>
@@ -1402,6 +1336,40 @@
</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>
+ <!-- Enable Google's Error-Prone https://github.com/google/error-prone -->
+ <configuration>
+ <showWarnings>true</showWarnings>
+ <forceJavacCompilerUse>true</forceJavacCompilerUse>
+ <compilerId>${javac-compiler-id}</compilerId>
+ <compilerArgs>
+ <arg>-Xep:MissingOverride:ERROR</arg>
+ <arg>-Xep:NonAtomicVolatileUpdate:ERROR</arg>
+ <arg>-Xep:SynchronizeOnNonFinalField:ERROR</arg>
+ <arg>-Xep:StaticAccessedFromInstance:ERROR</arg>
+ <arg>-Xep:SynchronizeOnNonFinalField:ERROR</arg>
+ <arg>-Xep:WaitNotInLoop:ERROR</arg>
+ <arg>-Xdiags:verbose</arg>
+ </compilerArgs>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-compiler-javac-errorprone</artifactId>
+ <version>2.8</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ <version>2.0.9</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>2.5</version>
</plugin>