Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
pulsar
提交
3bd574ac
pulsar
项目概览
apache
/
pulsar
通知
129
Star
40
Fork
3
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Wiki
1
Wiki
分析
仓库
DevOps
项目成员
Pages
pulsar
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Pages
分析
分析
仓库分析
DevOps
Wiki
1
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
提交
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
3bd574ac
编写于
7月 13, 2020
作者:
M
Matteo Merli
提交者:
xiaolong.ran
7月 29, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update Jackson to 2.11.1 and ensure all dependencies are pinned
Signed-off-by:
N
xiaolong.ran
<
rxl@apache.org
>
上级
0128acba
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
91 addition
and
55 deletion
+91
-55
distribution/server/src/assemble/LICENSE.bin.txt
distribution/server/src/assemble/LICENSE.bin.txt
+9
-9
examples/spark/pom.xml
examples/spark/pom.xml
+0
-18
pom.xml
pom.xml
+56
-2
pulsar-common/src/main/java/org/apache/pulsar/common/util/FieldParser.java
.../main/java/org/apache/pulsar/common/util/FieldParser.java
+5
-1
pulsar-sql/pom.xml
pulsar-sql/pom.xml
+0
-7
pulsar-sql/presto-distribution/LICENSE
pulsar-sql/presto-distribution/LICENSE
+19
-16
pulsar-sql/presto-distribution/pom.xml
pulsar-sql/presto-distribution/pom.xml
+2
-2
未找到文件。
distribution/server/src/assemble/LICENSE.bin.txt
浏览文件 @
3bd574ac
...
@@ -312,14 +312,14 @@ The Apache Software License, Version 2.0
...
@@ -312,14 +312,14 @@ The Apache Software License, Version 2.0
* JCommander -- com.beust-jcommander-1.48.jar
* JCommander -- com.beust-jcommander-1.48.jar
* High Performance Primitive Collections for Java -- com.carrotsearch-hppc-0.7.3.jar
* High Performance Primitive Collections for Java -- com.carrotsearch-hppc-0.7.3.jar
* Jackson
* Jackson
- com.fasterxml.jackson.core-jackson-annotations-2.1
0
.1.jar
- com.fasterxml.jackson.core-jackson-annotations-2.1
1
.1.jar
- com.fasterxml.jackson.core-jackson-core-2.1
0
.1.jar
- com.fasterxml.jackson.core-jackson-core-2.1
1
.1.jar
- com.fasterxml.jackson.core-jackson-databind-2.1
0
.1.jar
- com.fasterxml.jackson.core-jackson-databind-2.1
1
.1.jar
- com.fasterxml.jackson.dataformat-jackson-dataformat-yaml-2.1
0
.1.jar
- com.fasterxml.jackson.dataformat-jackson-dataformat-yaml-2.1
1
.1.jar
- com.fasterxml.jackson.jaxrs-jackson-jaxrs-base-2.1
0
.1.jar
- com.fasterxml.jackson.jaxrs-jackson-jaxrs-base-2.1
1
.1.jar
- com.fasterxml.jackson.jaxrs-jackson-jaxrs-json-provider-2.1
0
.1.jar
- com.fasterxml.jackson.jaxrs-jackson-jaxrs-json-provider-2.1
1
.1.jar
- com.fasterxml.jackson.module-jackson-module-jaxb-annotations-2.1
0
.1.jar
- com.fasterxml.jackson.module-jackson-module-jaxb-annotations-2.1
1
.1.jar
- com.fasterxml.jackson.module-jackson-module-jsonSchema-2.1
0
.1.jar
- com.fasterxml.jackson.module-jackson-module-jsonSchema-2.1
1
.1.jar
* Caffeine -- com.github.ben-manes.caffeine-caffeine-2.6.2.jar
* Caffeine -- com.github.ben-manes.caffeine-caffeine-2.6.2.jar
* Proto Google Common Protos -- com.google.api.grpc-proto-google-common-protos-1.12.0.jar
* Proto Google Common Protos -- com.google.api.grpc-proto-google-common-protos-1.12.0.jar
* Gson -- com.google.code.gson-gson-2.8.2.jar
* Gson -- com.google.code.gson-gson-2.8.2.jar
...
@@ -431,7 +431,7 @@ The Apache Software License, Version 2.0
...
@@ -431,7 +431,7 @@ The Apache Software License, Version 2.0
- org.eclipse.jetty.websocket-websocket-common-9.4.29.v20200521.jar
- org.eclipse.jetty.websocket-websocket-common-9.4.29.v20200521.jar
- org.eclipse.jetty.websocket-websocket-server-9.4.29.v20200521.jar
- org.eclipse.jetty.websocket-websocket-server-9.4.29.v20200521.jar
- org.eclipse.jetty.websocket-websocket-servlet-9.4.29.v20200521.jar
- org.eclipse.jetty.websocket-websocket-servlet-9.4.29.v20200521.jar
* SnakeYaml -- org.yaml-snakeyaml-1.2
4
.jar
* SnakeYaml -- org.yaml-snakeyaml-1.2
6
.jar
* RocksDB - org.rocksdb-rocksdbjni-5.13.3.jar
* RocksDB - org.rocksdb-rocksdbjni-5.13.3.jar
* HttpClient
* HttpClient
- org.apache.httpcomponents-httpclient-4.5.5.jar
- org.apache.httpcomponents-httpclient-4.5.5.jar
...
...
examples/spark/pom.xml
浏览文件 @
3bd574ac
...
@@ -28,32 +28,14 @@
...
@@ -28,32 +28,14 @@
<version>
2.6.0
</version>
<version>
2.6.0
</version>
</parent>
</parent>
<groupId>
org.apache.pulsar.examples
</groupId>
<artifactId>
spark
</artifactId>
<artifactId>
spark
</artifactId>
<name>
Pulsar Examples :: Spark
</name>
<name>
Pulsar Examples :: Spark
</name>
<properties>
<properties>
<maven.compiler.target>
1.8
</maven.compiler.target>
<maven.compiler.target>
1.8
</maven.compiler.target>
<maven.compiler.source>
1.8
</maven.compiler.source>
<maven.compiler.source>
1.8
</maven.compiler.source>
<jaskson.version>
2.6.5
</jaskson.version>
</properties>
</properties>
<dependencies>
<dependencies>
<dependency>
<groupId>
com.fasterxml.jackson.core
</groupId>
<artifactId>
jackson-core
</artifactId>
<version>
${jaskson.version}
</version>
</dependency>
<dependency>
<groupId>
com.fasterxml.jackson.core
</groupId>
<artifactId>
jackson-databind
</artifactId>
<version>
${jaskson.version}
</version>
</dependency>
<dependency>
<groupId>
com.fasterxml.jackson.core
</groupId>
<artifactId>
jackson-annotations
</artifactId>
<version>
${jaskson.version}
</version>
</dependency>
<dependency>
<dependency>
<groupId>
org.apache.pulsar
</groupId>
<groupId>
org.apache.pulsar
</groupId>
...
...
pom.xml
浏览文件 @
3bd574ac
...
@@ -171,8 +171,8 @@ flexible messaging model and an intuitive client API.</description>
...
@@ -171,8 +171,8 @@ flexible messaging model and an intuitive client API.</description>
<log4j2.version>
2.10.0
</log4j2.version>
<log4j2.version>
2.10.0
</log4j2.version>
<bouncycastle.version>
1.60
</bouncycastle.version>
<bouncycastle.version>
1.60
</bouncycastle.version>
<bouncycastlefips.version>
1.0.2
</bouncycastlefips.version>
<bouncycastlefips.version>
1.0.2
</bouncycastlefips.version>
<jackson.version>
2.1
0
.1
</jackson.version>
<jackson.version>
2.1
1
.1
</jackson.version>
<jackson.databind.version>
2.1
0
.1
</jackson.databind.version>
<jackson.databind.version>
2.1
1
.1
</jackson.databind.version>
<reflections.version>
0.9.11
</reflections.version>
<reflections.version>
0.9.11
</reflections.version>
<swagger.version>
1.5.21
</swagger.version>
<swagger.version>
1.5.21
</swagger.version>
<puppycrawl.checkstyle.version>
6.19
</puppycrawl.checkstyle.version>
<puppycrawl.checkstyle.version>
6.19
</puppycrawl.checkstyle.version>
...
@@ -743,6 +743,30 @@ flexible messaging model and an intuitive client API.</description>
...
@@ -743,6 +743,30 @@ flexible messaging model and an intuitive client API.</description>
<version>
${jackson.databind.version}
</version>
<version>
${jackson.databind.version}
</version>
</dependency>
</dependency>
<dependency>
<groupId>
com.fasterxml.jackson.module
</groupId>
<artifactId>
jackson-module-scala_2.10
</artifactId>
<version>
${jackson.version}
</version>
</dependency>
<dependency>
<groupId>
com.fasterxml.jackson.module
</groupId>
<artifactId>
jackson-module-scala_2.11
</artifactId>
<version>
${jackson.version}
</version>
</dependency>
<dependency>
<groupId>
com.fasterxml.jackson.module
</groupId>
<artifactId>
jackson-module-paranamer
</artifactId>
<version>
${jackson.version}
</version>
</dependency>
<dependency>
<groupId>
com.fasterxml.jackson.module
</groupId>
<artifactId>
jackson-module-parameter-names
</artifactId>
<version>
${jackson.version}
</version>
</dependency>
<dependency>
<dependency>
<groupId>
com.fasterxml.jackson.module
</groupId>
<groupId>
com.fasterxml.jackson.module
</groupId>
<artifactId>
jackson-module-jaxb-annotations
</artifactId>
<artifactId>
jackson-module-jaxb-annotations
</artifactId>
...
@@ -767,12 +791,42 @@ flexible messaging model and an intuitive client API.</description>
...
@@ -767,12 +791,42 @@ flexible messaging model and an intuitive client API.</description>
<version>
${jackson.version}
</version>
<version>
${jackson.version}
</version>
</dependency>
</dependency>
<dependency>
<groupId>
com.fasterxml.jackson.datatype
</groupId>
<artifactId>
jackson-datatype-jdk8
</artifactId>
<version>
${jackson.version}
</version>
</dependency>
<dependency>
<groupId>
com.fasterxml.jackson.datatype
</groupId>
<artifactId>
jackson-datatype-jsr310
</artifactId>
<version>
${jackson.version}
</version>
</dependency>
<dependency>
<dependency>
<groupId>
com.fasterxml.jackson.dataformat
</groupId>
<groupId>
com.fasterxml.jackson.dataformat
</groupId>
<artifactId>
jackson-dataformat-yaml
</artifactId>
<artifactId>
jackson-dataformat-yaml
</artifactId>
<version>
${jackson.version}
</version>
<version>
${jackson.version}
</version>
</dependency>
</dependency>
<dependency>
<groupId>
com.fasterxml.jackson.dataformat
</groupId>
<artifactId>
jackson-dataformat-csv
</artifactId>
<version>
${jackson.version}
</version>
</dependency>
<dependency>
<groupId>
com.fasterxml.jackson.dataformat
</groupId>
<artifactId>
jackson-dataformat-cbor
</artifactId>
<version>
${jackson.version}
</version>
</dependency>
<dependency>
<groupId>
com.fasterxml.jackson.dataformat
</groupId>
<artifactId>
jackson-dataformat-smile
</artifactId>
<version>
${jackson.version}
</version>
</dependency>
<dependency>
<dependency>
<groupId>
com.fasterxml.jackson.module
</groupId>
<groupId>
com.fasterxml.jackson.module
</groupId>
<artifactId>
jackson-module-jsonSchema
</artifactId>
<artifactId>
jackson-module-jsonSchema
</artifactId>
...
...
pulsar-common/src/main/java/org/apache/pulsar/common/util/FieldParser.java
浏览文件 @
3bd574ac
...
@@ -22,6 +22,8 @@ import static com.google.common.base.Preconditions.checkArgument;
...
@@ -22,6 +22,8 @@ import static com.google.common.base.Preconditions.checkArgument;
import
static
com
.
google
.
common
.
base
.
Preconditions
.
checkNotNull
;
import
static
com
.
google
.
common
.
base
.
Preconditions
.
checkNotNull
;
import
static
java
.
lang
.
String
.
format
;
import
static
java
.
lang
.
String
.
format
;
import
com.fasterxml.jackson.databind.AnnotationIntrospector
;
import
com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector
;
import
com.fasterxml.jackson.databind.util.EnumResolver
;
import
com.fasterxml.jackson.databind.util.EnumResolver
;
import
com.google.common.collect.Lists
;
import
com.google.common.collect.Lists
;
import
com.google.common.collect.Sets
;
import
com.google.common.collect.Sets
;
...
@@ -57,6 +59,8 @@ public final class FieldParser {
...
@@ -57,6 +59,8 @@ public final class FieldParser {
private
static
final
Map
<
String
,
Method
>
CONVERTERS
=
new
HashMap
<>();
private
static
final
Map
<
String
,
Method
>
CONVERTERS
=
new
HashMap
<>();
private
static
final
Map
<
Class
<?>,
Class
<?>>
WRAPPER_TYPES
=
new
HashMap
<>();
private
static
final
Map
<
Class
<?>,
Class
<?>>
WRAPPER_TYPES
=
new
HashMap
<>();
private
static
final
AnnotationIntrospector
ANNOTATION_INTROSPECTOR
=
new
JacksonAnnotationIntrospector
();
static
{
static
{
// Preload converters and wrapperTypes.
// Preload converters and wrapperTypes.
initConverters
();
initConverters
();
...
@@ -97,7 +101,7 @@ public final class FieldParser {
...
@@ -97,7 +101,7 @@ public final class FieldParser {
if
(
to
.
isEnum
())
{
if
(
to
.
isEnum
())
{
// Converting string to enum
// Converting string to enum
EnumResolver
r
=
EnumResolver
.
constructUsingToString
((
Class
<
Enum
<?>>)
to
,
null
);
EnumResolver
r
=
EnumResolver
.
constructUsingToString
((
Class
<
Enum
<?>>)
to
,
ANNOTATION_INTROSPECTOR
);
T
value
=
(
T
)
r
.
findEnum
((
String
)
from
);
T
value
=
(
T
)
r
.
findEnum
((
String
)
from
);
if
(
value
==
null
)
{
if
(
value
==
null
)
{
throw
new
RuntimeException
(
"Invalid value '"
+
from
+
"' for enum "
+
to
);
throw
new
RuntimeException
(
"Invalid value '"
+
from
+
"' for enum "
+
to
);
...
...
pulsar-sql/pom.xml
浏览文件 @
3bd574ac
...
@@ -31,13 +31,6 @@
...
@@ -31,13 +31,6 @@
<artifactId>
pulsar-sql
</artifactId>
<artifactId>
pulsar-sql
</artifactId>
<name>
Pulsar SQL :: Parent
</name>
<name>
Pulsar SQL :: Parent
</name>
<properties>
<jackson.version>
2.8.11
</jackson.version>
<!--fix Security Vulnerabilities-->
<!--https://www.cvedetails.com/vulnerability-list/vendor_id-15866/product_id-42991/Fasterxml-Jackson-databind.html-->
<jackson.databind.version>
2.8.11.4
</jackson.databind.version>
</properties>
<modules>
<modules>
<module>
presto-pulsar
</module>
<module>
presto-pulsar
</module>
<module>
presto-pulsar-plugin
</module>
<module>
presto-pulsar-plugin
</module>
...
...
pulsar-sql/presto-distribution/LICENSE
浏览文件 @
3bd574ac
...
@@ -207,17 +207,19 @@ This projects includes binary packages with the following licenses:
...
@@ -207,17 +207,19 @@ This projects includes binary packages with the following licenses:
The Apache Software License, Version 2.0
The Apache Software License, Version 2.0
* Jackson
* Jackson
- jackson-annotations-2.8.11.jar
- jackson-annotations-2.11.1.jar
- jackson-core-2.8.11.jar
- jackson-core-2.11.1.jar
- jackson-databind-2.8.11.4.jar
- jackson-databind-2.11.1.jar
- jackson-dataformat-smile-2.8.11.jar
- jackson-dataformat-smile-2.11.1.jar
- jackson-datatype-guava-2.8.11.jar
- jackson-datatype-guava-2.11.1.jar
- jackson-datatype-guava-2.8.11.jar
- jackson-datatype-jdk8-2.11.1.jar
- jackson-datatype-jdk8-2.8.11.jar
- jackson-datatype-joda-2.11.1.jar
- jackson-datatype-jdk8-2.8.11.jar
- jackson-datatype-jsr310-2.11.1.jar
- jackson-datatype-joda-2.8.11.jar
- jackson-dataformat-yaml-2.11.1.jar
- jackson-datatype-jsr310-2.8.11.jar
- jackson-jaxrs-base-2.11.1.jar
- jackson-dataformat-yaml-2.8.11.jar
- jackson-jaxrs-json-provider-2.11.1.jar
- jackson-module-jaxb-annotations-2.11.1.jar
- jackson-module-jsonSchema-2.11.1.jar
* Guava
* Guava
- guava-25.1-jre.jar
- guava-25.1-jre.jar
* Google Guice
* Google Guice
...
@@ -385,7 +387,7 @@ The Apache Software License, Version 2.0
...
@@ -385,7 +387,7 @@ The Apache Software License, Version 2.0
* RocksDB JNI
* RocksDB JNI
- rocksdbjni-5.13.3.jar
- rocksdbjni-5.13.3.jar
* SnakeYAML
* SnakeYAML
- snakeyaml-1.
17
.jar
- snakeyaml-1.
26
.jar
* Bean Validation API
* Bean Validation API
- validation-api-1.1.0.Final.jar
- validation-api-1.1.0.Final.jar
* Objectsize
* Objectsize
...
@@ -427,10 +429,7 @@ The Apache Software License, Version 2.0
...
@@ -427,10 +429,7 @@ The Apache Software License, Version 2.0
* GSON
* GSON
- gson-2.8.2.jar
- gson-2.8.2.jar
* Jackson
* Jackson
- jackson-jaxrs-base-2.8.11.jar
- jackson-module-parameter-names-2.10.0.jar
- jackson-jaxrs-json-provider-2.8.11.jar
- jackson-module-jaxb-annotations-2.8.11.jar
- jackson-module-jsonSchema-2.8.11.jar
* Java Assist
* Java Assist
- javassist-3.25.0-GA.jar
- javassist-3.25.0-GA.jar
* Jetty
* Jetty
...
@@ -499,6 +498,8 @@ CDDL-1.1 -- licenses/LICENSE-CDDL-1.1.txt
...
@@ -499,6 +498,8 @@ CDDL-1.1 -- licenses/LICENSE-CDDL-1.1.txt
- javax.annotation-api-1.2.jar
- javax.annotation-api-1.2.jar
- javax.annotation-api-1.3.1.jar
- javax.annotation-api-1.3.1.jar
- javax.activation-1.2.0.jar
- javax.activation-1.2.0.jar
- javax.activation-api-1.2.0.jar
- jakarta.activation-api-1.2.1.jar
* HK2 - Dependency Injection Kernel
* HK2 - Dependency Injection Kernel
- hk2-api-2.5.0-b42.jar
- hk2-api-2.5.0-b42.jar
- hk2-locator-2.5.0-b42.jar
- hk2-locator-2.5.0-b42.jar
...
@@ -533,6 +534,8 @@ CDDL-1.1 -- licenses/LICENSE-CDDL-1.1.txt
...
@@ -533,6 +534,8 @@ CDDL-1.1 -- licenses/LICENSE-CDDL-1.1.txt
- logback-core-1.2.3.jar
- logback-core-1.2.3.jar
* MIME Streaming Extension
* MIME Streaming Extension
- mimepull-1.9.6.jar
- mimepull-1.9.6.jar
* XML Bind API
- jakarta.xml.bind-api-2.3.2.jar
Public Domain (CC0) -- licenses/LICENSE-CC0.txt
Public Domain (CC0) -- licenses/LICENSE-CC0.txt
* HdrHistogram
* HdrHistogram
...
...
pulsar-sql/presto-distribution/pom.xml
浏览文件 @
3bd574ac
...
@@ -42,10 +42,10 @@
...
@@ -42,10 +42,10 @@
<!-- Launcher properties -->
<!-- Launcher properties -->
<main-class>
com.facebook.presto.server.PrestoServer
</main-class>
<main-class>
com.facebook.presto.server.PrestoServer
</main-class>
<process-name>
${project.artifactId}
</process-name>
<process-name>
${project.artifactId}
</process-name>
<jackson.version>
2.
8.1
1
</jackson.version>
<jackson.version>
2.
11.
1
</jackson.version>
<!--fix Security Vulnerabilities-->
<!--fix Security Vulnerabilities-->
<!--https://www.cvedetails.com/vulnerability-list/vendor_id-15866/product_id-42991/Fasterxml-Jackson-databind.html-->
<!--https://www.cvedetails.com/vulnerability-list/vendor_id-15866/product_id-42991/Fasterxml-Jackson-databind.html-->
<jackson.databind.version>
2.
8.11.4
</jackson.databind.version>
<jackson.databind.version>
2.
11.1
</jackson.databind.version>
<com.ning.async.http.client.version>
1.9.40
</com.ning.async.http.client.version>
<com.ning.async.http.client.version>
1.9.40
</com.ning.async.http.client.version>
<maven.version>
3.0.5
</maven.version>
<maven.version>
3.0.5
</maven.version>
<guava.version>
25.1-jre
</guava.version>
<guava.version>
25.1-jre
</guava.version>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录