Skip to content

Commit 7ed5838

Browse files
Smith-Cruise839224346
Smith-Cruise
and
839224346
authored
[Enhancement][Cherry-Pick][Branch-3.3] Fix cve problems in java-extensions module (backport StarRocks#49425) (StarRocks#49607)
Signed-off-by: Smith Cruise <[email protected]> Co-authored-by: Yi <[email protected]>
1 parent fe229b5 commit 7ed5838

File tree

32 files changed

+686
-1087
lines changed

32 files changed

+686
-1087
lines changed

‎build.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -539,6 +539,8 @@ if [ ${BUILD_BE} -eq 1 ]; then
539539
# remove zookeeper
540540
rm -f ${STARROCKS_OUTPUT}/be/lib/hadoop/common/lib/zookeeper-3.8.3.jar
541541
rm -f ${STARROCKS_OUTPUT}/be/lib/hadoop/hdfs/lib/zookeeper-3.8.3.jar
542+
rm -f ${STARROCKS_OUTPUT}/be/lib/hadoop/common/lib/avro-1.9.2.jar
543+
rm -f ${STARROCKS_OUTPUT}/be/lib/hadoop/hdfs/lib/avro-1.9.2.jar
542544

543545
MSG="${MSG} √ ${MSG_BE}"
544546
fi

‎java-extensions/common-runtime/pom.xml

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@
1212
<artifactId>common-runtime</artifactId>
1313

1414
<properties>
15-
<maven.compiler.source>8</maven.compiler.source>
16-
<maven.compiler.target>8</maven.compiler.target>
1715
<java-extensions.home>${basedir}/../</java-extensions.home>
18-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1916
</properties>
2017

2118
<dependencies>
@@ -29,15 +26,6 @@
2926
<build>
3027
<finalName>starrocks-common-runtime</finalName>
3128
<plugins>
32-
<plugin>
33-
<groupId>org.apache.maven.plugins</groupId>
34-
<artifactId>maven-compiler-plugin</artifactId>
35-
<version>${compiler-plugin.version}</version>
36-
<configuration>
37-
<source>${java.version}</source>
38-
<target>${java.version}</target>
39-
</configuration>
40-
</plugin>
4129
<!-- copy all dependency libs to target lib dir -->
4230
<plugin>
4331
<groupId>org.apache.maven.plugins</groupId>
@@ -57,27 +45,6 @@
5745
</execution>
5846
</executions>
5947
</plugin>
60-
<plugin>
61-
<groupId>org.apache.maven.plugins</groupId>
62-
<artifactId>maven-assembly-plugin</artifactId>
63-
<version>3.1.1</version>
64-
65-
<configuration>
66-
<descriptorRefs>
67-
<descriptorRef>jar-with-dependencies</descriptorRef>
68-
</descriptorRefs>
69-
</configuration>
70-
71-
<executions>
72-
<execution>
73-
<id>make-assembly</id>
74-
<phase>package</phase>
75-
<goals>
76-
<goal>single</goal>
77-
</goals>
78-
</execution>
79-
</executions>
80-
</plugin>
8148
</plugins>
8249
</build>
8350
</project>

‎java-extensions/hadoop-ext/pom.xml

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,14 @@
1414
<packaging>jar</packaging>
1515

1616
<properties>
17-
<maven.compiler.source>8</maven.compiler.source>
18-
<maven.compiler.target>8</maven.compiler.target>
1917
<java-extensions.home>${basedir}/../</java-extensions.home>
20-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
21-
<iceberg.version>1.5.0</iceberg.version>
2218
</properties>
2319

2420
<dependencies>
2521
<dependency>
2622
<groupId>org.apache.hadoop</groupId>
2723
<artifactId>hadoop-common</artifactId>
28-
<version>${hadoop.version}</version>
29-
<exclusions>
30-
<exclusion>
31-
<groupId>org.apache.zookeeper</groupId>
32-
<artifactId>zookeeper</artifactId>
33-
</exclusion>
34-
</exclusions>
24+
<scope>provided</scope>
3525
</dependency>
3626

3727
<dependency>
@@ -58,16 +48,5 @@
5848

5949
<build>
6050
<finalName>starrocks-hadoop-ext</finalName>
61-
<plugins>
62-
<plugin>
63-
<groupId>org.apache.maven.plugins</groupId>
64-
<artifactId>maven-compiler-plugin</artifactId>
65-
<version>${compiler-plugin.version}</version>
66-
<configuration>
67-
<source>${java.version}</source>
68-
<target>${java.version}</target>
69-
</configuration>
70-
</plugin>
71-
</plugins>
7251
</build>
7352
</project>

‎java-extensions/hive-reader/pom.xml

Lines changed: 25 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -11,119 +11,79 @@
1111
<packaging>jar</packaging>
1212

1313
<properties>
14-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
15-
<slf4j.version>1.7.36</slf4j.version>
1614
<guava.version>32.0.1-jre</guava.version>
1715
<java-extensions.home>${basedir}/../</java-extensions.home>
1816
<avro.version>1.11.3</avro.version>
19-
<junit.version>4.13.1</junit.version>
20-
<hive-apache.version>3.1.2-22</hive-apache.version>
2117
</properties>
2218

2319
<dependencies>
2420
<dependency>
25-
<groupId>org.apache.avro</groupId>
26-
<artifactId>avro</artifactId>
27-
<version>${avro.version}</version>
21+
<groupId>com.starrocks</groupId>
22+
<artifactId>jni-connector</artifactId>
2823
</dependency>
2924

3025
<dependency>
31-
<groupId>com.google.guava</groupId>
32-
<artifactId>guava</artifactId>
33-
<version>${guava.version}</version>
26+
<groupId>org.apache.hadoop</groupId>
27+
<artifactId>hadoop-mapreduce-client-core</artifactId>
3428
</dependency>
3529

3630
<dependency>
37-
<groupId>org.slf4j</groupId>
38-
<artifactId>slf4j-api</artifactId>
39-
<version>${slf4j.version}</version>
40-
</dependency>
41-
<dependency>
42-
<groupId>org.apache.logging.log4j</groupId>
43-
<artifactId>log4j-slf4j-impl</artifactId>
44-
<version>${log4j.version}</version>
31+
<groupId>org.apache.hadoop</groupId>
32+
<artifactId>hadoop-common</artifactId>
4533
</dependency>
34+
4635
<dependency>
47-
<groupId>org.slf4j</groupId>
48-
<artifactId>slf4j-log4j12</artifactId>
49-
<version>${slf4j.version}</version>
36+
<groupId>org.apache.hadoop</groupId>
37+
<artifactId>hadoop-aws</artifactId>
5038
</dependency>
39+
5140
<dependency>
5241
<groupId>org.apache.logging.log4j</groupId>
5342
<artifactId>log4j-api</artifactId>
54-
<version>${log4j.version}</version>
5543
</dependency>
5644
<dependency>
5745
<groupId>org.apache.logging.log4j</groupId>
5846
<artifactId>log4j-core</artifactId>
59-
<version>${log4j.version}</version>
60-
</dependency>
61-
62-
<dependency>
63-
<groupId>com.starrocks</groupId>
64-
<artifactId>jni-connector</artifactId>
65-
<version>1.0.0</version>
66-
<scope>compile</scope>
6747
</dependency>
6848

69-
7049
<dependency>
71-
<groupId>junit</groupId>
72-
<artifactId>junit</artifactId>
73-
<version>${junit.version}</version>
74-
<scope>test</scope>
50+
<groupId>org.junit.jupiter</groupId>
51+
<artifactId>junit-jupiter</artifactId>
7552
</dependency>
7653

7754
<dependency>
78-
<groupId>org.apache.hadoop</groupId>
79-
<artifactId>hadoop-mapreduce-client-core</artifactId>
80-
<version>${hadoop.version}</version>
55+
<groupId>io.trino.hive</groupId>
56+
<artifactId>hive-apache</artifactId>
8157
</dependency>
8258

8359
<dependency>
84-
<groupId>org.apache.hadoop</groupId>
85-
<artifactId>hadoop-common</artifactId>
86-
<version>${hadoop.version}</version>
60+
<groupId>org.apache.avro</groupId>
61+
<artifactId>avro</artifactId>
62+
<version>${avro.version}</version>
8763
<exclusions>
8864
<exclusion>
89-
<groupId>org.apache.zookeeper</groupId>
90-
<artifactId>zookeeper</artifactId>
65+
<groupId>org.apache.commons</groupId>
66+
<artifactId>commons-compress</artifactId>
9167
</exclusion>
9268
</exclusions>
9369
</dependency>
9470

9571
<dependency>
96-
<groupId>io.trino.hive</groupId>
97-
<artifactId>hive-apache</artifactId>
98-
<version>${hive-apache.version}</version>
72+
<groupId>org.apache.avro</groupId>
73+
<artifactId>avro-mapred</artifactId>
74+
<version>${avro.version}</version>
9975
</dependency>
10076

10177
<dependency>
102-
<groupId>org.apache.hadoop</groupId>
103-
<artifactId>hadoop-aws</artifactId>
104-
<version>${hadoop.version}</version>
105-
<exclusions>
106-
<exclusion>
107-
<groupId>software.amazon.awssdk</groupId>
108-
<artifactId>bundle</artifactId>
109-
</exclusion>
110-
</exclusions>
78+
<groupId>com.google.guava</groupId>
79+
<artifactId>guava</artifactId>
80+
<version>${guava.version}</version>
11181
</dependency>
112-
11382
</dependencies>
11483

11584
<build>
11685
<finalName>starrocks-hive-reader</finalName>
11786
<plugins>
118-
<plugin>
119-
<groupId>org.apache.maven.plugins</groupId>
120-
<artifactId>maven-compiler-plugin</artifactId>
121-
<version>${compiler-plugin.version}</version>
122-
<configuration>
123-
<source>${java.version}</source>
124-
<target>${java.version}</target>
125-
</configuration>
126-
</plugin>
12787
<!-- copy all dependency libs to target lib dir -->
12888
<plugin>
12989
<groupId>org.apache.maven.plugins</groupId>
@@ -143,27 +103,6 @@
143103
</execution>
144104
</executions>
145105
</plugin>
146-
<plugin>
147-
<groupId>org.apache.maven.plugins</groupId>
148-
<artifactId>maven-assembly-plugin</artifactId>
149-
<version>3.1.1</version>
150-
151-
<configuration>
152-
<descriptorRefs>
153-
<descriptorRef>jar-with-dependencies</descriptorRef>
154-
</descriptorRefs>
155-
</configuration>
156-
157-
<executions>
158-
<execution>
159-
<id>make-assembly</id>
160-
<phase>package</phase>
161-
<goals>
162-
<goal>single</goal>
163-
</goals>
164-
</execution>
165-
</executions>
166-
</plugin>
167106
</plugins>
168107
</build>
169108
</project>

0 commit comments

Comments
 (0)