You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by bu...@apache.org on 2020/02/23 12:11:53 UTC
[cxf] branch master updated: fix compilation on Java 8 after Java
13+ fix (#641)
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new f2208f2 fix compilation on Java 8 after Java 13+ fix (#641)
f2208f2 is described below
commit f2208f20249b6598134e2b0885d87ab75817f2e2
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Sun Feb 23 15:11:00 2020 +0300
fix compilation on Java 8 after Java 13+ fix (#641)
---
parent/pom.xml | 10 +++++-----
rt/management/pom.xml | 36 ++++++++++++++++++++++++------------
2 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 2e91c44..30f308e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2806,13 +2806,13 @@
</build>
</profile>
<profile>
- <id>java9-plus</id>
- <properties>
+ <id>java9-plus</id>
+ <properties>
<org.apache.cxf.transport.websocket.atmosphere.disabled>true</org.apache.cxf.transport.websocket.atmosphere.disabled>
<cxf.jdk.version>11</cxf.jdk.version>
- </properties>
- <activation>
- <jdk>[9,)</jdk>
+ </properties>
+ <activation>
+ <jdk>[9,)</jdk>
</activation>
<build>
<plugins>
diff --git a/rt/management/pom.xml b/rt/management/pom.xml
index 246df7b..f63f3bf 100644
--- a/rt/management/pom.xml
+++ b/rt/management/pom.xml
@@ -85,18 +85,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <showDeprecation>${cxf.compile.show.deprecation}</showDeprecation>
- <showWarnings>true</showWarnings>
- <compilerArgs>
- <arg>${cxf.compile.flags}</arg>
- <arg>--add-exports</arg><arg>java.rmi/sun.rmi.registry=ALL-UNNAMED</arg>
- </compilerArgs>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-xjc-plugin</artifactId>
<version>${cxf.xjc-utils.version}</version>
@@ -132,4 +120,28 @@
</plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>java9-plus</id>
+ <activation>
+ <jdk>[9,)</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <showDeprecation>${cxf.compile.show.deprecation}</showDeprecation>
+ <showWarnings>true</showWarnings>
+ <compilerArgs>
+ <arg>${cxf.compile.flags}</arg>
+ <arg>--add-exports</arg><arg>java.rmi/sun.rmi.registry=ALL-UNNAMED</arg>
+ </compilerArgs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>