Skip to content

Commit 621a831

Browse files
authored
TEZ-4435: use jackson v2 - jackson v1 is EOL and full of security issues (#231) (PJ Fanning reviewed by Laszlo Bodor, Ayush Saxena)
1 parent 5e31e4d commit 621a831

File tree

3 files changed

+30
-3
lines changed

3 files changed

+30
-3
lines changed

pom.xml

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,10 @@
7070
<frontend-maven-plugin.version>1.8.0</frontend-maven-plugin.version>
7171
<findbugs-maven-plugin.version>3.0.5</findbugs-maven-plugin.version>
7272
<maven-checkstyle-plugin.version>3.1.1</maven-checkstyle-plugin.version>
73+
<maven-enforcer-plugin.version>3.0.0</maven-enforcer-plugin.version>
7374
<checkstyle.version>8.35</checkstyle.version>
7475
<dependency-check-maven.version>1.3.6</dependency-check-maven.version>
76+
<restrict-imports.enforcer.version>2.0.0</restrict-imports.enforcer.version>
7577
<test.build.data>${project.build.directory}/tmp</test.build.data>
7678
</properties>
7779
<scm>
@@ -1001,7 +1003,14 @@
10011003
<plugin>
10021004
<groupId>org.apache.maven.plugins</groupId>
10031005
<artifactId>maven-enforcer-plugin</artifactId>
1004-
<inherited>false</inherited>
1006+
<version>${maven-enforcer-plugin.version}</version>
1007+
<dependencies>
1008+
<dependency>
1009+
<groupId>de.skuzzle.enforcer</groupId>
1010+
<artifactId>restrict-imports-enforcer-rule</artifactId>
1011+
<version>${restrict-imports.enforcer.version}</version>
1012+
</dependency>
1013+
</dependencies>
10051014
<executions>
10061015
<execution>
10071016
<id>clean</id>
@@ -1019,6 +1028,24 @@
10191028
</rules>
10201029
</configuration>
10211030
</execution>
1031+
<execution>
1032+
<id>banned-illegal-imports</id>
1033+
<phase>process-sources</phase>
1034+
<goals>
1035+
<goal>enforce</goal>
1036+
</goals>
1037+
<configuration>
1038+
<rules>
1039+
<RestrictImports>
1040+
<includeTestCode>true</includeTestCode>
1041+
<reason>Use Fasterxml Jackson 2 dependency in place of org.codehaus Jackson 1</reason>
1042+
<bannedImports>
1043+
<bannedImport>org.codehaus.jackson.**</bannedImport>
1044+
</bannedImports>
1045+
</RestrictImports>
1046+
</rules>
1047+
</configuration>
1048+
</execution>
10221049
</executions>
10231050
</plugin>
10241051
<plugin>

tez-plugins/tez-protobuf-history-plugin/src/main/java/org/apache/tez/dag/history/logging/proto/DagManifesFileScanner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
import java.util.List;
2929
import java.util.Map;
3030

31+
import com.fasterxml.jackson.databind.ObjectMapper;
3132
import org.apache.commons.io.IOUtils;
3233
import org.apache.hadoop.fs.FileStatus;
3334
import org.apache.hadoop.security.UserGroupInformation;
3435
import org.apache.tez.dag.api.TezConfiguration;
3536
import org.apache.tez.dag.history.logging.proto.HistoryLoggerProtos.ManifestEntryProto;
36-
import org.codehaus.jackson.map.ObjectMapper;
3737
import org.slf4j.Logger;
3838
import org.slf4j.LoggerFactory;
3939

tez-plugins/tez-protobuf-history-plugin/src/main/java/org/apache/tez/dag/history/logging/proto/HistoryEventProtoConverter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.util.Map.Entry;
2525
import java.util.TreeMap;
2626

27+
import com.fasterxml.jackson.databind.ObjectMapper;
2728
import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
2829
import org.apache.hadoop.yarn.api.records.ApplicationId;
2930
import org.apache.tez.common.ATSConstants;
@@ -58,7 +59,6 @@
5859
import org.apache.tez.dag.records.TezTaskAttemptID;
5960
import org.apache.tez.dag.records.TezTaskID;
6061
import org.apache.tez.dag.records.TezVertexID;
61-
import org.codehaus.jackson.map.ObjectMapper;
6262
import org.slf4j.Logger;
6363
import org.slf4j.LoggerFactory;
6464

0 commit comments

Comments
 (0)