Skip to content

Commit 3c3f51c

Browse files
Merge pull request #145 from data-integrations/build-fix
[CDAP-21027] fix build by moving hadoop libraries to provided scope
2 parents f8e94c0 + 7b835ca commit 3c3f51c

File tree

2 files changed

+30
-2
lines changed

2 files changed

+30
-2
lines changed

adls-plugins/pom.xml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,22 @@
3131
<dependency>
3232
<groupId>org.apache.avro</groupId>
3333
<artifactId>avro-mapred</artifactId>
34-
<version>1.11.4</version>
34+
<version>${avro.version}</version>
35+
<exclusions>
36+
<exclusion>
37+
<groupId>com.fasterxml.jackson.core</groupId>
38+
<artifactId>jackson-core</artifactId>
39+
</exclusion>
40+
<exclusion>
41+
<groupId>com.fasterxml.jackson.core</groupId>
42+
<artifactId>jackson-databind</artifactId>
43+
</exclusion>
44+
</exclusions>
45+
</dependency>
46+
<dependency>
47+
<groupId>com.fasterxml.jackson.core</groupId>
48+
<artifactId>jackson-databind</artifactId>
49+
<version>${jackson.databind.version}</version>
3550
</dependency>
3651
<dependency>
3752
<groupId>junit</groupId>

pom.xml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,8 @@
105105
<cdap.version>6.11.0-SNAPSHOT</cdap.version>
106106
<hadoop.version>3.3.6</hadoop.version>
107107
<cdap.plugin.version>2.13.0-SNAPSHOT</cdap.plugin.version>
108+
<jackson.databind.version>2.13.4.2</jackson.databind.version>
109+
<avro.version>1.11.4</avro.version>
108110
<widgets.dir>widgets</widgets.dir>
109111
<docs.dir>docs</docs.dir>
110112
<!-- properties for script build step that creates the config files for the artifacts -->
@@ -119,6 +121,17 @@
119121
<groupId>org.apache.hadoop</groupId>
120122
<artifactId>hadoop-client</artifactId>
121123
<version>${hadoop.version}</version>
124+
<scope>provided</scope>
125+
<exclusions>
126+
<exclusion>
127+
<groupId>org.apache.avro</groupId>
128+
<artifactId>avro</artifactId>
129+
</exclusion>
130+
<exclusion>
131+
<groupId>org.slf4j</groupId>
132+
<artifactId>slf4j-reload4j</artifactId>
133+
</exclusion>
134+
</exclusions>
122135
</dependency>
123136
<dependency>
124137
<groupId>io.cdap.cdap</groupId>
@@ -130,7 +143,7 @@
130143
<groupId>io.cdap.cdap</groupId>
131144
<artifactId>hydrator-test</artifactId>
132145
<version>${cdap.version}</version>
133-
<scope>provided</scope>
146+
<scope>test</scope>
134147
</dependency>
135148
<dependency>
136149
<groupId>io.cdap.cdap</groupId>

0 commit comments

Comments
 (0)