Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Francesco Nigro 2019-06-20 11:44:53 +02:00 committed by Clebert Suconic
parent ef24c0f6ef
commit 417ee543fd
6 changed files with 47 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
artemis-dto/pom.xml
View File

@ -99,9 +99,6 @@
<exclude name="**/.git/**" /> <exclude name="**/.git/**" />
<exclude name="**/.svn/**" /> <exclude name="**/.svn/**" />
</schemagen> </schemagen>
<replace file="${project.build.directory}/schema/org.apache.activemq/dto/activemq.xsd"
token="xmlns:xs=&quot;http://www.w3.org/2001/XMLSchema&quot;"
value="xmlns=&quot;http://www.w3.org/2001/XMLSchema&quot; xmlns:xs=&quot;http://www.w3.org/2001/XMLSchema&quot;"/>
<copy todir="${project.build.directory}/classes"> <copy todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/schema" /> <fileset dir="${project.build.directory}/schema" />
</copy> </copy>
@ -128,11 +125,6 @@
<artifactId>jaxb-jxc</artifactId> <artifactId>jaxb-jxc</artifactId>
<version>${version.jaxb}</version> <version>${version.jaxb}</version>
</dependency> </dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>2.3.2</version>
</dependency>
</dependencies> </dependencies>
</plugin> </plugin>
</plugins> </plugins>

1
artemis-dto/src/main/java/org/apache/activemq/artemis/dto/package-info.java
View File

@ -18,7 +18,6 @@
* The JAXB POJOs for the XML configuration of ActiveMQ Artemis broker * The JAXB POJOs for the XML configuration of ActiveMQ Artemis broker
*/ */
@javax.xml.bind.annotation.XmlSchema( @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", namespace = "http://activemq.org/schema",
elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.apache.activemq.artemis.dto; package org.apache.activemq.artemis.dto;

2
artemis-features/pom.xml
View File

@ -26,7 +26,7 @@
<name>ActiveMQ Artemis Features</name> <name>ActiveMQ Artemis Features</name>
<properties> <properties>
<karaf.version>4.2.3</karaf.version> <karaf.version>4.1.1</karaf.version>
</properties> </properties>
<dependencies> <dependencies>

48
artemis-selector/pom.xml
View File

@ -84,16 +84,15 @@
</plugins> </plugins>
</build> </build>
</profile> </profile>
<profile> </profiles>
<id>jdk8</id>
<activation>
<jdk>1.8</jdk>
<property>
<name>java.vendor</name>
<value>!IBM Corporation</value>
</property>
</activation>
<build> <build>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -105,37 +104,6 @@
</compilerArgs> </compilerArgs>
</configuration> </configuration>
</plugin> </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>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
<plugins>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>javacc-maven-plugin</artifactId> <artifactId>javacc-maven-plugin</artifactId>

13
artemis-website/pom.xml
View File

@ -92,7 +92,7 @@
<plugin> <plugin>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.0</version> <version>2.10.1</version>
<executions> <executions>
<execution> <execution>
<id>javadoc-jar</id> <id>javadoc-jar</id>
@ -101,8 +101,6 @@
<goal>jar</goal> <goal>jar</goal>
</goals> </goals>
<configuration> <configuration>
<doclint>none</doclint>
<additionalOptions>${forceHtml4}</additionalOptions>
<useStandardDocletOptions>true</useStandardDocletOptions> <useStandardDocletOptions>true</useStandardDocletOptions>
<minmemory>128m</minmemory> <minmemory>128m</minmemory>
<maxmemory>512m</maxmemory> <maxmemory>512m</maxmemory>
@ -131,15 +129,6 @@
</build> </build>
<profiles> <profiles>
<profile>
<id>jdk11</id>
<activation>
<jdk>11</jdk>
</activation>
<properties>
<forceHtml4>-html4</forceHtml4>
</properties>
</profile>
<profile> <profile>
<id>release</id> <id>release</id>
<build> <build>

102
pom.xml
View File

@ -75,7 +75,7 @@
<staging.siteURL>scp://people.apache.org/x1/www/activemq.apache.org</staging.siteURL> <staging.siteURL>scp://people.apache.org/x1/www/activemq.apache.org</staging.siteURL>
<activemq-artemis-native-version>1.0.0</activemq-artemis-native-version> <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> <pax.exam.version>4.9.1</pax.exam.version>
<commons.config.version>2.4</commons.config.version> <commons.config.version>2.4</commons.config.version>
<commons.lang.version>3.0</commons.lang.version> <commons.lang.version>3.0</commons.lang.version>
@ -867,10 +867,6 @@
<id>jdk18</id> <id>jdk18</id>
<activation> <activation>
<jdk>1.8</jdk> <jdk>1.8</jdk>
<property>
<name>java.vendor</name>
<value>!IBM Corporation</value>
</property>
</activation> </activation>
<build> <build>
<plugins> <plugins>
@ -881,68 +877,6 @@
<additionalparam>-Xdoclint:none</additionalparam> <additionalparam>-Xdoclint:none</additionalparam>
</configuration> </configuration>
</plugin> </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> </plugins>
</build> </build>
</profile> </profile>
@ -1400,6 +1334,40 @@
</execution> </execution>
</executions> </executions>
</plugin> </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> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId> <artifactId>maven-clean-plugin</artifactId>