Skip to content

Commit 12be837

Browse files
author
Jialin Qiao
authored
fix LICENSE-binary (#1471)
1 parent 3129985 commit 12be837

File tree

5 files changed

+67
-45
lines changed

5 files changed

+67
-45
lines changed

LICENSE-binary

+57-14
Original file line numberDiff line numberDiff line change
@@ -216,17 +216,60 @@ following license. See licenses/ for text of these licenses.
216216
Apache Software Foundation License 2.0
217217
--------------------------------------
218218
commons-cli:commons-cli:1.3.1
219-
commons-io:commons-io:2.5
219+
commons-codec:commons-codec:1.13
220220
org.apache.commons:commons-collections4:4.0
221-
org.apache.commons:commons-lang3:3.1
222-
org.apache.thrift:libthrift:0.9.3
223-
org.xerial.snappy:snappy-java:1.0.5-M1
221+
commons-io:commons-io:2.5
222+
org.apache.commons:commons-lang3:3.8.1
223+
commons-lang:commons-lang:2.6
224+
com.nimbusds:content-type:2.0
224225
com.alibaba:fastjson:1.2.70
225-
com.sun.xml.fastinfoset:FastInfoset:1.2.14
226-
io.airlift.airline:0.8
226+
it.unimi.dsi:fastutil:7.0.6
227227
com.google.guava.guava:21.0
228-
org.fusesource.leveldbjni:leveldbjni-all:1.8
228+
com.fasterxml.jackson.core:jackson-annotations:2.10.0
229+
com.fasterxml.jackson.core:jackson-core:2.10.0
230+
com.fasterxml.jackson.core:jackson-databind:2.10.0
229231
javax.inject:javax.inject:1
232+
com.github.stephenc.jcip:jcip-annotations:1.0-1
233+
org.eclipse.jetty:jetty-http:9.4.24.v20191120
234+
org.eclipse.jetty:jetty-io:9.4.24.v20191120
235+
org.eclipse.jetty:jetty-security:9.4.24.v20191120
236+
org.eclipse.jetty:jetty-server:9.4.24.v20191120
237+
org.eclipse.jetty:jetty-servlet:9.4.24.v20191120
238+
org.eclipse.jetty:jetty-util:9.4.24.v20191120
239+
org.eclipse.jetty:jetty-webapp:9.4.24.v20191120
240+
org.eclipse.jetty:jetty-xml:9.4.24.v20191120
241+
io.jsonwebtoken:jjwt-api:0.10.7
242+
io.jsonwebtoken:jjwt-impl:0.10.7
243+
io.jsonwebtoken:jjwt-jackson:0.10.7
244+
net.minidev:json-smart:2.3
245+
com.google.code.findbugs:jsr305:3.0.2
246+
com.nimbusds:lang-tag:1.4.4
247+
com.librato.metrics:librato-java:2.1.0
248+
org.apache.thrift:libthrift:0.13.0
249+
io.dropwizard.metrics:metrics-core:3.2.6
250+
io.dropwizard.metrics:metrics-json:3.2.6
251+
io.dropwizard.metrics:metrics-jvm:3.2.6
252+
com.librato.metrics:metrics-librato:5.1.0
253+
io.moquette:moquette-broker:0.13
254+
io.netty:netty-buffer:4.1.22.Final
255+
io.netty:netty-codec:4.1.22.Final
256+
io.netty:netty-codec-http:4.1.22.Final
257+
io.netty:netty-codec-mqtt:4.1.22.Final
258+
io.netty:netty-common:4.1.22.Final
259+
io.netty:netty-handler:4.1.22.Final
260+
io.netty:netty-resolver:4.1.22.Final
261+
io.netty:netty-transport:4.1.22.Final
262+
io.netty:netty-transport-native-epoll:4.1.22.Final:linux-x86_64
263+
io.netty:netty-transport-native-unix-common:4.1.22.Final
264+
com.nimbusds:nimbus-jose-jwt:8.14.1
265+
com.nimbusds:oauth2-oidc-sdk:8.3
266+
org.osgi:org.osgi.core:6.0.0
267+
org.osgi:osgi.cmpn:6.0.0
268+
org.ops4j.pax.jdbc:pax-jdbc-common:1.4.5
269+
org.xerial.snappy:snappy-java:1.1.7.2
270+
com.clearspring.analytics:stream:2.9.5
271+
io.airlift.airline:0.8
272+
net.minidev:accessors-smart:1.2
230273

231274

232275
BSD 2-Clause
@@ -237,28 +280,28 @@ jline:jline:2.14.5
237280
BSD 3-Clause
238281
------------
239282
org.antlr:antlr-runtime:4.8-1
283+
org.ow2.asm:asm:5.0.4
284+
org.jline:jline:3.10.0
240285

241286

242287
MIT License
243288
------------
244289
org.slf4j:slf4j-api
245290
me.tongfei:progressbar:0.7.3
246-
247-
248-
EDL 1.0
249-
------------
250-
com.sun.istack:istack-commons-runtime:3.0.6
251-
org.jvnet.staxex:stax-ex:1.8
291+
com.bugsnag:bugsnag:3.6.1
292+
org.slf4j:jcl-over-slf4j:1.7.25
252293

253294

254295
EPL 1.0
255296
------------
297+
com.h2database:h2-mvstore:1.4.199
256298
ch.qos.logback:logback-classic:1.1.11
257299
ch.qos.logback:logback-core:1.1.11
258300

301+
259302
CDDL 1.1
260303
------------
261304
javax.annotation:javax.annotation-api:1.3.2
262-
javax.activation:javax.activation-api:1.2.0
305+
javax.servlet:javax.servlet-api:3.1.0
263306
javax.xml.bind:jaxb-api:2.4.0-b180725.0427
264307
org.glassfish.jaxb:jaxb-runtime:2.4.0-b180725.0644

hive-connector/pom.xml

-5
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,6 @@
8787
<artifactId>hadoop-annotations</artifactId>
8888
<version>${hadoop2.version}</version>
8989
</dependency>
90-
<dependency>
91-
<groupId>io.dropwizard.metrics</groupId>
92-
<artifactId>metrics-core</artifactId>
93-
<version>3.1.2</version>
94-
</dependency>
9590
<dependency>
9691
<groupId>org.apache.avro</groupId>
9792
<artifactId>avro</artifactId>

licenses/EDL License 1.0

-11
This file was deleted.

pom.xml

-15
Original file line numberDiff line numberDiff line change
@@ -184,26 +184,11 @@
184184
<artifactId>jackson-module-scala_2.11</artifactId>
185185
<version>${jackson.version}</version>
186186
</dependency>
187-
<dependency>
188-
<groupId>com.google.code.findbugs</groupId>
189-
<artifactId>jsr305</artifactId>
190-
<version>3.0.2</version>
191-
</dependency>
192187
<dependency>
193188
<groupId>com.google.guava</groupId>
194189
<artifactId>guava</artifactId>
195190
<version>${guava.version}</version>
196191
</dependency>
197-
<dependency>
198-
<groupId>com.sun.istack</groupId>
199-
<artifactId>istack-commons-runtime</artifactId>
200-
<version>3.0.8</version>
201-
</dependency>
202-
<dependency>
203-
<groupId>com.sun.xml.fastinfoset</groupId>
204-
<artifactId>FastInfoset</artifactId>
205-
<version>1.2.16</version>
206-
</dependency>
207192
<dependency>
208193
<groupId>commons-lang</groupId>
209194
<artifactId>commons-lang</artifactId>

server/pom.xml

+10
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,12 @@
9090
<dependency>
9191
<groupId>io.airlift</groupId>
9292
<artifactId>airline</artifactId>
93+
<exclusions>
94+
<exclusion>
95+
<groupId>com.google.code.findbugs</groupId>
96+
<artifactId>jsr305</artifactId>
97+
</exclusion>
98+
</exclusions>
9399
</dependency>
94100
<dependency>
95101
<groupId>org.eclipse.jetty</groupId>
@@ -128,6 +134,10 @@
128134
<groupId>org.slf4j</groupId>
129135
<artifactId>slf4j-log4j12</artifactId>
130136
</exclusion>
137+
<exclusion>
138+
<groupId>com.zaxxer</groupId>
139+
<artifactId>HikariCP</artifactId>
140+
</exclusion>
131141
</exclusions>
132142
</dependency>
133143
<!-- for mocked test-->

0 commit comments

Comments
 (0)