fix ci for jdk11 (#160)
diff --git a/.travis.yml b/.travis.yml
index 609030b..96bcaf3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,8 +29,3 @@
- curl -i -F randomname=randomname -F file=@output.log https://uguu.se/api.php\?d\=upload-tool
after_success:
- bash <(curl -s https://codecov.io/bash)
-
-jobs:
- allow_failures:
- - jdk: openjdk11
- env: JAVA_BASE_IMAGE=openjdk:11
diff --git a/java/dubbo-samples-docker/pom.xml b/java/dubbo-samples-docker/pom.xml
index e17cd4b..8107e05 100644
--- a/java/dubbo-samples-docker/pom.xml
+++ b/java/dubbo-samples-docker/pom.xml
@@ -209,6 +209,20 @@
</plugins>
</build>
</profile>
+ <!-- For jdk 11 above JavaEE annotation -->
+ <profile>
+ <id>javax.annotation</id>
+ <activation>
+ <jdk>[1.11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.3.2</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
<build>
diff --git a/java/dubbo-samples-grpc/dubbo-samples-ssl/dubbo-samples-grpc-ssl-consumer/pom.xml b/java/dubbo-samples-grpc/dubbo-samples-ssl/dubbo-samples-grpc-ssl-consumer/pom.xml
index e36714e..79d7df9 100644
--- a/java/dubbo-samples-grpc/dubbo-samples-ssl/dubbo-samples-grpc-ssl-consumer/pom.xml
+++ b/java/dubbo-samples-grpc/dubbo-samples-ssl/dubbo-samples-grpc-ssl-consumer/pom.xml
@@ -132,6 +132,20 @@
</plugins>
</build>
</profile>
+ <!-- For jdk 11 above JavaEE annotation -->
+ <profile>
+ <id>javax.annotation</id>
+ <activation>
+ <jdk>[1.11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.3.2</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
<build>
diff --git a/java/dubbo-samples-grpc/dubbo-samples-ssl/dubbo-samples-grpc-ssl-provider/pom.xml b/java/dubbo-samples-grpc/dubbo-samples-ssl/dubbo-samples-grpc-ssl-provider/pom.xml
index bb1d0b7..a2bb50e 100644
--- a/java/dubbo-samples-grpc/dubbo-samples-ssl/dubbo-samples-grpc-ssl-provider/pom.xml
+++ b/java/dubbo-samples-grpc/dubbo-samples-ssl/dubbo-samples-grpc-ssl-provider/pom.xml
@@ -132,6 +132,20 @@
</plugins>
</build>
</profile>
+ <!-- For jdk 11 above JavaEE annotation -->
+ <profile>
+ <id>javax.annotation</id>
+ <activation>
+ <jdk>[1.11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.3.2</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
<build>
diff --git a/java/dubbo-samples-http/pom.xml b/java/dubbo-samples-http/pom.xml
index fa577de..4ef4e78 100644
--- a/java/dubbo-samples-http/pom.xml
+++ b/java/dubbo-samples-http/pom.xml
@@ -29,7 +29,7 @@
<properties>
<source.level>1.8</source.level>
<target.level>1.8</target.level>
- <dubbo.version>2.7.5</dubbo.version>
+ <dubbo.version>2.7.7-SNAPSHOT</dubbo.version>
<spring.version>4.3.16.RELEASE</spring.version>
<junit.version>4.12</junit.version>
<docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
@@ -42,8 +42,6 @@
<servlet.container.1>tomcat</servlet.container.1>
<servlet.port.2>8081</servlet.port.2>
<servlet.container.2>jetty</servlet.container.2>
- <servlet.version>3.0.1</servlet.version>
- <tomcat.version>7.0.88</tomcat.version>
<zookeeper.port>2181</zookeeper.port>
<main-class>org.apache.dubbo.samples.http.HttpProvider</main-class>
</properties>
@@ -77,31 +75,26 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>${servlet.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
- <version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>9.4.11.v20180605</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>9.4.11.v20180605</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>${spring.version}</version>
</dependency>
<dependency>
@@ -266,6 +259,20 @@
</plugins>
</build>
</profile>
+ <!-- For jdk 11 above JavaEE annotation -->
+ <profile>
+ <id>javax.annotation</id>
+ <activation>
+ <jdk>[1.11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.3.2</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
<build>
diff --git a/java/dubbo-samples-sentinel/pom.xml b/java/dubbo-samples-sentinel/pom.xml
index f175507..1d1b7ce 100644
--- a/java/dubbo-samples-sentinel/pom.xml
+++ b/java/dubbo-samples-sentinel/pom.xml
@@ -221,6 +221,20 @@
</plugins>
</build>
</profile>
+ <!-- For jdk 11 above JavaEE annotation -->
+ <profile>
+ <id>javax.annotation</id>
+ <activation>
+ <jdk>[1.11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.3.2</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
<build>
diff --git a/java/dubbo-samples-spring-boot-hystrix/pom.xml b/java/dubbo-samples-spring-boot-hystrix/pom.xml
index 3770cdb..32df3b4 100644
--- a/java/dubbo-samples-spring-boot-hystrix/pom.xml
+++ b/java/dubbo-samples-spring-boot-hystrix/pom.xml
@@ -212,6 +212,20 @@
</plugins>
</build>
</profile>
+ <!-- For jdk 11 above JavaEE annotation -->
+ <profile>
+ <id>javax.annotation</id>
+ <activation>
+ <jdk>[1.11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.3.2</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
<build>
