Skip to content

Commit 8947fd4

Browse files
authored
Merge pull request apache#596 from mapr/SPARK-651
MapR [SPARK-651] Replacing joda-time-*.jar with joda-time-2.10.3.jar.
2 parents 871c3ee + e69ecc4 commit 8947fd4

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

core/src/test/resources/spark-events/app-20180109111548-0000

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

core/src/test/resources/spark-events/application_1516285256255_0012

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

dev/deps/spark-deps-hadoop-2.6

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ jersey-server-2.22.2.jar
119119
jetty-6.1.26.jar
120120
jetty-util-6.1.26.jar
121121
jline-2.14.6.jar
122-
joda-time-2.9.3.jar
122+
joda-time-2.10.3.jar
123123
jodd-core-3.5.2.jar
124124
jpam-1.1.jar
125125
json4s-ast_2.11-3.5.3.jar

dev/deps/spark-deps-hadoop-2.7

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ jersey-guava-2.22.2.jar
117117
jersey-media-jaxb-2.22.2.jar
118118
jersey-server-2.22.2.jar
119119
jline-2.14.6.jar
120-
joda-time-2.9.3.jar
120+
joda-time-2.10.3.jar
121121
jodd-core-3.5.2.jar
122122
jpam-1.1.jar
123123
json4s-ast_2.11-3.5.3.jar

dev/deps/spark-deps-hadoop-3.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ jersey-server-2.22.2.jar
120120
jetty-webapp-9.3.24.v20180605.jar
121121
jetty-xml-9.3.24.v20180605.jar
122122
jline-2.14.6.jar
123-
joda-time-2.9.3.jar
123+
joda-time-2.10.3.jar
124124
jodd-core-3.5.2.jar
125125
jpam-1.1.jar
126126
json-smart-2.3.jar

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@
184184
<datanucleus-core.version>4.1.6</datanucleus-core.version>
185185
<janino.version>3.0.9</janino.version>
186186
<jersey.version>2.22.2</jersey.version>
187-
<joda.version>2.9.3</joda.version>
187+
<joda.version>2.10.3</joda.version>
188188
<jodd.version>3.5.2</jodd.version>
189189
<jsr305.version>1.3.9</jsr305.version>
190190
<libthrift.version>0.12.0</libthrift.version>

0 commit comments

Comments
 (0)