未验证 提交 c1472cb3 编写于 作者: H HTHou

Merge branch 'master' of https://github.com/apache/incubator-iotdb into hot_compaction

......@@ -216,17 +216,60 @@ following license. See licenses/ for text of these licenses.
Apache Software Foundation License 2.0
--------------------------------------
commons-cli:commons-cli:1.3.1
commons-io:commons-io:2.5
commons-codec:commons-codec:1.13
org.apache.commons:commons-collections4:4.0
org.apache.commons:commons-lang3:3.1
org.apache.thrift:libthrift:0.9.3
org.xerial.snappy:snappy-java:1.0.5-M1
commons-io:commons-io:2.5
org.apache.commons:commons-lang3:3.8.1
commons-lang:commons-lang:2.6
com.nimbusds:content-type:2.0
com.alibaba:fastjson:1.2.70
com.sun.xml.fastinfoset:FastInfoset:1.2.14
io.airlift.airline:0.8
it.unimi.dsi:fastutil:7.0.6
com.google.guava.guava:21.0
org.fusesource.leveldbjni:leveldbjni-all:1.8
com.fasterxml.jackson.core:jackson-annotations:2.10.0
com.fasterxml.jackson.core:jackson-core:2.10.0
com.fasterxml.jackson.core:jackson-databind:2.10.0
javax.inject:javax.inject:1
com.github.stephenc.jcip:jcip-annotations:1.0-1
org.eclipse.jetty:jetty-http:9.4.24.v20191120
org.eclipse.jetty:jetty-io:9.4.24.v20191120
org.eclipse.jetty:jetty-security:9.4.24.v20191120
org.eclipse.jetty:jetty-server:9.4.24.v20191120
org.eclipse.jetty:jetty-servlet:9.4.24.v20191120
org.eclipse.jetty:jetty-util:9.4.24.v20191120
org.eclipse.jetty:jetty-webapp:9.4.24.v20191120
org.eclipse.jetty:jetty-xml:9.4.24.v20191120
io.jsonwebtoken:jjwt-api:0.10.7
io.jsonwebtoken:jjwt-impl:0.10.7
io.jsonwebtoken:jjwt-jackson:0.10.7
net.minidev:json-smart:2.3
com.google.code.findbugs:jsr305:3.0.2
com.nimbusds:lang-tag:1.4.4
com.librato.metrics:librato-java:2.1.0
org.apache.thrift:libthrift:0.13.0
io.dropwizard.metrics:metrics-core:3.2.6
io.dropwizard.metrics:metrics-json:3.2.6
io.dropwizard.metrics:metrics-jvm:3.2.6
com.librato.metrics:metrics-librato:5.1.0
io.moquette:moquette-broker:0.13
io.netty:netty-buffer:4.1.22.Final
io.netty:netty-codec:4.1.22.Final
io.netty:netty-codec-http:4.1.22.Final
io.netty:netty-codec-mqtt:4.1.22.Final
io.netty:netty-common:4.1.22.Final
io.netty:netty-handler:4.1.22.Final
io.netty:netty-resolver:4.1.22.Final
io.netty:netty-transport:4.1.22.Final
io.netty:netty-transport-native-epoll:4.1.22.Final:linux-x86_64
io.netty:netty-transport-native-unix-common:4.1.22.Final
com.nimbusds:nimbus-jose-jwt:8.14.1
com.nimbusds:oauth2-oidc-sdk:8.3
org.osgi:org.osgi.core:6.0.0
org.osgi:osgi.cmpn:6.0.0
org.ops4j.pax.jdbc:pax-jdbc-common:1.4.5
org.xerial.snappy:snappy-java:1.1.7.2
com.clearspring.analytics:stream:2.9.5
io.airlift.airline:0.8
net.minidev:accessors-smart:1.2
BSD 2-Clause
......@@ -237,28 +280,28 @@ jline:jline:2.14.5
BSD 3-Clause
------------
org.antlr:antlr-runtime:4.8-1
org.ow2.asm:asm:5.0.4
org.jline:jline:3.10.0
MIT License
------------
org.slf4j:slf4j-api
me.tongfei:progressbar:0.7.3
EDL 1.0
------------
com.sun.istack:istack-commons-runtime:3.0.6
org.jvnet.staxex:stax-ex:1.8
com.bugsnag:bugsnag:3.6.1
org.slf4j:jcl-over-slf4j:1.7.25
EPL 1.0
------------
com.h2database:h2-mvstore:1.4.199
ch.qos.logback:logback-classic:1.1.11
ch.qos.logback:logback-core:1.1.11
CDDL 1.1
------------
javax.annotation:javax.annotation-api:1.3.2
javax.activation:javax.activation-api:1.2.0
javax.servlet:javax.servlet-api:3.1.0
javax.xml.bind:jaxb-api:2.4.0-b180725.0427
org.glassfish.jaxb:jaxb-runtime:2.4.0-b180725.0644
\ No newline at end of file
......@@ -87,11 +87,6 @@
<artifactId>hadoop-annotations</artifactId>
<version>${hadoop2.version}</version>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
<version>3.1.2</version>
</dependency>
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
......
Eclipse Distribution License - v 1.0
Copyright (c) 2007, Eclipse Foundation, Inc. and its licensors.
All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
Neither the name of the Eclipse Foundation, Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
......@@ -184,26 +184,11 @@
<artifactId>jackson-module-scala_2.11</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>3.0.2</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>com.sun.istack</groupId>
<artifactId>istack-commons-runtime</artifactId>
<version>3.0.8</version>
</dependency>
<dependency>
<groupId>com.sun.xml.fastinfoset</groupId>
<artifactId>FastInfoset</artifactId>
<version>1.2.16</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
......
......@@ -90,6 +90,12 @@
<dependency>
<groupId>io.airlift</groupId>
<artifactId>airline</artifactId>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
......@@ -128,6 +134,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- for mocked test-->
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册