You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2018/07/13 08:17:51 UTC
[cxf] branch master updated: [CXF-7741]disable corba and cdi-owb
for java9plus profile so then full build with Java 9, 10, 11 can also pass
This is an automated email from the ASF dual-hosted git repository.
ffang 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 057f4dc [CXF-7741]disable corba and cdi-owb for java9plus profile so then full build with Java 9,10,11 can also pass
057f4dc is described below
commit 057f4dc521f02227d7b36bbb508835a9edb69e15
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Fri Jul 13 16:17:36 2018 +0800
[CXF-7741]disable corba and cdi-owb for java9plus profile so then full build with Java 9,10,11 can also pass
---
rt/bindings/pom.xml | 32 ++++++++++++++++++++++++++------
systests/cdi/pom.xml | 29 ++++++++++++++++++++++++-----
2 files changed, 50 insertions(+), 11 deletions(-)
diff --git a/rt/bindings/pom.xml b/rt/bindings/pom.xml
index f1076af..6dbb680 100644
--- a/rt/bindings/pom.xml
+++ b/rt/bindings/pom.xml
@@ -29,10 +29,30 @@
<artifactId>cxf-rt</artifactId>
<version>3.3.0-SNAPSHOT</version>
</parent>
- <modules>
- <module>soap</module>
- <module>xml</module>
- <module>coloc</module>
- <module>corba</module>
- </modules>
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>soap</module>
+ <module>xml</module>
+ <module>coloc</module>
+ <module>corba</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>java9plus</id>
+ <activation>
+ <jdk>[9,)</jdk>
+ </activation>
+ <modules>
+ <!--java.corba was removed from jdk11 and can't find an external equivalent-->
+ <module>soap</module>
+ <module>xml</module>
+ <module>coloc</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
diff --git a/systests/cdi/pom.xml b/systests/cdi/pom.xml
index d9c0f87..b391996 100644
--- a/systests/cdi/pom.xml
+++ b/systests/cdi/pom.xml
@@ -37,11 +37,6 @@
<cxf.tomcat.version>8.0.32</cxf.tomcat.version>
<cxf.openwebbeans.version>1.7.4</cxf.openwebbeans.version>
</properties>
- <modules>
- <module>base</module>
- <module>cdi-weld</module>
- <module>cdi-owb</module>
- </modules>
<dependencyManagement>
<dependencies>
<dependency>
@@ -165,4 +160,28 @@
</plugins>
</pluginManagement>
</build>
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>base</module>
+ <module>cdi-weld</module>
+ <module>cdi-owb</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>java9plus</id>
+ <activation>
+ <jdk>[9,)</jdk>
+ </activation>
+ <modules>
+ <!--need a new release from owb which can work with asm6.2-->
+ <module>base</module>
+ <module>cdi-weld</module>
+ </modules>
+ </profile>
+ </profiles>
</project>