Skip to content

Commit 4031507

Browse files
committed
MapR [SPARK-1286] Pyspark + Panda integration doesn't work (apache#1199)
1 parent f183227 commit 4031507

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@
199199
<failureaccess.version>1.0.1</failureaccess.version>
200200
<netlib.ludovic.dev.version>3.0.3</netlib.ludovic.dev.version>
201201
<commons-codec.version>1.16.1</commons-codec.version>
202-
<commons-compress.version>1.23.0</commons-compress.version>
202+
<commons-compress.version>1.26.1</commons-compress.version>
203203
<commons-io.version>2.16.1</commons-io.version>
204204
<!-- org.apache.commons/commons-lang/-->
205205
<commons-lang2.version>2.6</commons-lang2.version>
@@ -230,12 +230,12 @@
230230
<bouncycastle.version>1.77</bouncycastle.version>
231231
<bc-fips.version>1.0.2.4</bc-fips.version>
232232
<tink.version>1.9.0</tink.version>
233-
<netty.version>4.1.96.Final</netty.version>
233+
<netty.version>4.1.108.Final</netty.version>
234234
<!--
235235
If you are changing Arrow version specification, please check
236236
./python/pyspark/sql/pandas/utils.py, and ./python/setup.py too.
237237
-->
238-
<arrow.version>12.0.1</arrow.version>
238+
<arrow.version>16.0.8</arrow.version>
239239
<ammonite.version>2.5.9</ammonite.version>
240240

241241
<!-- org.fusesource.leveldbjni will be used except on arm64 platform. -->

project/SparkBuild.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1127,7 +1127,9 @@ object ExcludedDependencies {
11271127
excludeDependencies ++= Seq(
11281128
ExclusionRule(organization = "com.sun.jersey"),
11291129
ExclusionRule("javax.servlet", "javax.servlet-api"),
1130-
ExclusionRule("javax.ws.rs", "jsr311-api"))
1130+
ExclusionRule("javax.ws.rs", "jsr311-api"),
1131+
ExclusionRule("io.netty", "netty-handler"),
1132+
ExclusionRule("io.netty", "netty-transport-native-epoll"))
11311133
)
11321134
}
11331135

0 commit comments

Comments
 (0)