This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 692d753 Polish apache/dubbo#5793 : jdk11, No application config found
or it's not a valid config! (#6071)
692d753 is described below
commit 692d7530e09e14a87ebed6608d4d21cb5634e39f
Author: Mercy Ma <mercybl...@gmail.com>
AuthorDate: Tue Apr 28 09:04:23 2020 +0800
Polish apache/dubbo#5793 : jdk11, No application config found or it's not a
valid config! (#6071)
---
dubbo-common/pom.xml | 23 +++++++----------------
dubbo-dependencies-bom/pom.xml | 8 ++++++++
2 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/dubbo-common/pom.xml b/dubbo-common/pom.xml
index 2ac4880..44d9fab 100644
--- a/dubbo-common/pom.xml
+++ b/dubbo-common/pom.xml
@@ -15,7 +15,8 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.dubbo</groupId>
@@ -66,21 +67,11 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
+ <!-- Common Annotations API -->
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ </dependency>
</dependencies>
- <profiles>
- <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.1</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
</project>
\ No newline at end of file
diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index 916bdd4..9bf5a1c 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -110,6 +110,7 @@
<thrift_version>0.12.0</thrift_version>
<hessian_version>4.0.38</hessian_version>
<protobuf-java_version>3.6.0</protobuf-java_version>
+ <javax_annotation-api_version>1.3.2</javax_annotation-api_version>
<servlet_version>3.1.0</servlet_version>
<jetty_version>9.4.11.v20180605</jetty_version>
<validation_version>1.1.0.Final</validation_version>
@@ -328,6 +329,13 @@
<artifactId>protobuf-java-util</artifactId>
<version>${protobuf-java_version}</version>
</dependency>
+ <!-- Common Annotations API -->
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${javax_annotation-api_version}</version>
+ </dependency>
+ <!-- Servlet API -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
