This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch update_license
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/update_license by this push:
new bd2c8b5 add jdk-11 support
bd2c8b5 is described below
commit bd2c8b58f7e93e48c905b20766fc82987e524c5e
Author: qiaojialin <[email protected]>
AuthorDate: Wed Mar 13 20:07:43 2019 +0800
add jdk-11 support
---
.mvn/wrapper/MavenWrapperDownloader.java | 2 +-
License | 23 +++++++++++++++++++----
pom.xml | 16 ++++++++++++++++
3 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/.mvn/wrapper/MavenWrapperDownloader.java
b/.mvn/wrapper/MavenWrapperDownloader.java
index 5f7a1c2..a22fe2e 100644
--- a/.mvn/wrapper/MavenWrapperDownloader.java
+++ b/.mvn/wrapper/MavenWrapperDownloader.java
@@ -24,7 +24,7 @@ public class MavenWrapperDownloader {
* Default URL to download the maven-wrapper.jar from, if no 'downloadUrl'
is provided.
*/
private static final String DEFAULT_DOWNLOAD_URL =
-
"https://repo1.maven.org/maven2/io/takari/maven-wrapper/0.2.1/maven-wrapper-0.2.1.jar";;
+
"https://repo1.maven.org/maven2/io/takari/maven-wrapper/0.5.3/maven-wrapper-0.5.3.jar";;
/**
* Path to the maven-wrapper.properties file, which might contain a
downloadUrl property to
diff --git a/License b/License
index 1de8428..0fcf816 100644
--- a/License
+++ b/License
@@ -236,6 +236,7 @@ org.apache.commons:commons-lang3:3.1
org.apache.thrift:libthrift:0.9.3
org.xerial.snappy:snappy-java:1.0.5-M1
com.alibaba:fastjson:1.2.31
+com.sun.xml.fastinfoset:FastInfoset:1.2.14
BSD 2-Clause
@@ -251,17 +252,31 @@ org.antlr:antlr-runtime:3.5.2
MIT License
------------
+------------
org.slf4j:slf4j-api
org.mockito:mockito-all:1.10.19
+EDL 1.0
+------------
+com.sun.istack:istack-commons-runtime:3.0.6
+
+
EPL 1.0
------------
+------------
ch.qos.logback:logback-classic:1.1.11
ch.qos.logback:logback-core:1.1.11
EPL 2.0
------------
-junit:junit:4.12
\ No newline at end of file
+------------
+junit:junit:4.12
+
+
+CDDL 1.1
+------------
+javax.annotation:javax.annotation-api:1.3.2
+javax.activation:javax.activation-api:1.2.0
+javax.xml.bind:jaxb-api:2.4.0-b180725.0427
+org.glassfish.jaxb:jaxb-runtime:2.4.0-b180725.0644
+org.jvnet.staxex:stax-ex:1.8
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index e211627..13350d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,6 +110,22 @@
<version>1.10.19</version>
<scope>test</scope>
</dependency>
+ <!-- for jdk-11 -->
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.4.0-b180725.0427</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.4.0-b180725.0644</version>
+ </dependency>
</dependencies>
<modules>
<module>tsfile</module>
