Skip to content

Commit 268bf14

Browse files
a-robertssrowen
authored andcommitted
[SPARK-16751] Upgrade derby to 10.12.1.1
Version of derby upgraded based on important security info at VersionEye. Test scope added so we don't include it in our final package anyway. NB: I think this should be backported to all previous releases as it is a security problem https://www.versioneye.com/java/org.apache.derby:derby/10.11.1.1 The CVE number is 2015-1832. I also suggest we add a SECURITY tag for JIRAs Existing tests with the change making sure that we see no new failures. I checked derby 10.12.x and not derby 10.11.x is downloaded to our ~/.m2 folder. I then used dev/make-distribution.sh and checked the dist/jars folder for Spark 2.0: no derby jar is present. I don't know if this would also remove it from the assembly jar in our 1.x branches. Author: Adam Roberts <aroberts@uk.ibm.com> Closes #14379 from a-roberts/patch-4. (cherry picked from commit 04a2c07) Signed-off-by: Sean Owen <sowen@cloudera.com>
1 parent efad4aa commit 268bf14

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

dev/deps/spark-deps-hadoop-2.2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ curator-recipes-2.4.0.jar
4646
datanucleus-api-jdo-3.2.6.jar
4747
datanucleus-core-3.2.10.jar
4848
datanucleus-rdbms-3.2.9.jar
49-
derby-10.11.1.1.jar
49+
derby-10.12.1.1.jar
5050
eigenbase-properties-1.1.5.jar
5151
guava-14.0.1.jar
5252
guice-3.0.jar

dev/deps/spark-deps-hadoop-2.3

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ curator-recipes-2.4.0.jar
4848
datanucleus-api-jdo-3.2.6.jar
4949
datanucleus-core-3.2.10.jar
5050
datanucleus-rdbms-3.2.9.jar
51-
derby-10.11.1.1.jar
51+
derby-10.12.1.1.jar
5252
eigenbase-properties-1.1.5.jar
5353
guava-14.0.1.jar
5454
guice-3.0.jar

dev/deps/spark-deps-hadoop-2.4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ curator-recipes-2.4.0.jar
4848
datanucleus-api-jdo-3.2.6.jar
4949
datanucleus-core-3.2.10.jar
5050
datanucleus-rdbms-3.2.9.jar
51-
derby-10.11.1.1.jar
51+
derby-10.12.1.1.jar
5252
eigenbase-properties-1.1.5.jar
5353
guava-14.0.1.jar
5454
guice-3.0.jar

dev/deps/spark-deps-hadoop-2.6

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ curator-recipes-2.6.0.jar
5252
datanucleus-api-jdo-3.2.6.jar
5353
datanucleus-core-3.2.10.jar
5454
datanucleus-rdbms-3.2.9.jar
55-
derby-10.11.1.1.jar
55+
derby-10.12.1.1.jar
5656
eigenbase-properties-1.1.5.jar
5757
gson-2.2.4.jar
5858
guava-14.0.1.jar

dev/deps/spark-deps-hadoop-2.7

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ curator-recipes-2.6.0.jar
5252
datanucleus-api-jdo-3.2.6.jar
5353
datanucleus-core-3.2.10.jar
5454
datanucleus-rdbms-3.2.9.jar
55-
derby-10.11.1.1.jar
55+
derby-10.12.1.1.jar
5656
eigenbase-properties-1.1.5.jar
5757
gson-2.2.4.jar
5858
guava-14.0.1.jar

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
<hive.version>1.2.1.spark2</hive.version>
135135
<!-- Version used for internal directory structure -->
136136
<hive.version.short>1.2.1</hive.version.short>
137-
<derby.version>10.11.1.1</derby.version>
137+
<derby.version>10.12.1.1</derby.version>
138138
<parquet.version>1.7.0</parquet.version>
139139
<hive.parquet.version>1.6.0</hive.parquet.version>
140140
<jetty.version>9.2.16.v20160414</jetty.version>

0 commit comments

Comments
 (0)