You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ff...@apache.org on 2018/08/30 09:30:48 UTC
[karaf] branch master updated: [KARAF-5882]ensure
karaf-soap-example can build and run with JDK11
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/karaf.git
The following commit(s) were added to refs/heads/master by this push:
new be73af6 [KARAF-5882]ensure karaf-soap-example can build and run with JDK11
be73af6 is described below
commit be73af6a7fbce4021bcfb5dfe4eab9419aa3a7d2
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Thu Aug 30 17:30:32 2018 +0800
[KARAF-5882]ensure karaf-soap-example can build and run with JDK11
---
examples/karaf-itest-example/pom.xml | 4 +-
.../karaf-profile-example-registry/pom.xml | 4 +-
examples/karaf-rest-example/pom.xml | 4 +-
examples/karaf-soap-example/pom.xml | 4 +-
pom.xml | 61 +++-------------------
5 files changed, 15 insertions(+), 62 deletions(-)
diff --git a/examples/karaf-itest-example/pom.xml b/examples/karaf-itest-example/pom.xml
index 7f48f5f..6fc2d17 100644
--- a/examples/karaf-itest-example/pom.xml
+++ b/examples/karaf-itest-example/pom.xml
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>apache-karaf</artifactId>
- <version>4.2.0</version>
+ <version>${project.version}</version>
<scope>test</scope>
<type>tar.gz</type>
</dependency>
@@ -106,4 +106,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/examples/karaf-profile-example/karaf-profile-example-registry/pom.xml b/examples/karaf-profile-example/karaf-profile-example-registry/pom.xml
index 7c9dce4..ea95a9a 100644
--- a/examples/karaf-profile-example/karaf-profile-example-registry/pom.xml
+++ b/examples/karaf-profile-example/karaf-profile-example-registry/pom.xml
@@ -34,7 +34,7 @@
<properties>
<activemq.version>5.14.3</activemq.version>
<camel.version>2.18.1</camel.version>
- <cxf.version>3.1.9</cxf.version>
+ <cxf.version>3.2.6</cxf.version>
</properties>
<build>
@@ -56,4 +56,4 @@
</resources>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/examples/karaf-rest-example/pom.xml b/examples/karaf-rest-example/pom.xml
index 06aa537..8a31ef9 100644
--- a/examples/karaf-rest-example/pom.xml
+++ b/examples/karaf-rest-example/pom.xml
@@ -40,8 +40,8 @@
</modules>
<properties>
- <cxf.version>[3,4)</cxf.version>
+ <cxf.version>3.2.6</cxf.version>
<jackson.version>2.9.4</jackson.version>
</properties>
-</project>
\ No newline at end of file
+</project>
diff --git a/examples/karaf-soap-example/pom.xml b/examples/karaf-soap-example/pom.xml
index 662ef32..06f50f7 100644
--- a/examples/karaf-soap-example/pom.xml
+++ b/examples/karaf-soap-example/pom.xml
@@ -40,7 +40,7 @@
</modules>
<properties>
- <cxf.version>[3,4)</cxf.version>
+ <cxf.version>3.2.6</cxf.version>
</properties>
-</project>
\ No newline at end of file
+</project>
diff --git a/pom.xml b/pom.xml
index f41e1aa..ed42319 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2377,60 +2377,13 @@
<activation>
<jdk>[9,)</jdk>
</activation>
- <!--dependencies>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.3.0</version>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- <version>${jaxb.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>txw2</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jsr173_api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml</groupId>
- <artifactId>jsr173</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies-->
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+ <version>1.1.3</version>
+ </dependency>
+ </dependencies>
</profile>
</profiles>
</project>