Skip to content

Commit 02e58c2

Browse files
gibchikafaFabio Buso
andauthored
[HWORKS-2203] Spark 3.5 (#42)
* Hopsfy spark-3.5 * Drop Index support, not compatible with the hive version * DaysWritableV2 * Exclude com.vlkan:flatbuffers:1.2.0 dependency from build * Apply uniffle changes * Reduce number of event logs flushes (#26) * [HWORKS-1405] Get correct hive version in spark (#40) * Timestamp incompatibility Spark/Hive/Hudi - Hive fix - release 3.1.1.3 * Bump hive version to 3.0.0.13.5 (#39) * Change hadoop version * Add Hops Repo * Change version to 3.5.8 * Change kafka version to 2.6.0 * Change version to 3.5.5 * Add org.codehaus.jackson * Reset kafka version to 3.4.1 * Exclude flatbuffers from hive --------- Co-authored-by: Fabio Buso <fabio@logicalclocks.com>
1 parent 357f4ad commit 02e58c2

File tree

61 files changed

+475
-214
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+475
-214
lines changed

R/pkg/DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: SparkR
22
Type: Package
3-
Version: 3.5.8
3+
Version: 3.5.5
44
Title: R Front End for 'Apache Spark'
55
Description: Provides an R Front end for 'Apache Spark' <https://spark.apache.org>.
66
Authors@R:

assembly/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.12</artifactId>
24-
<version>3.5.8-SNAPSHOT</version>
24+
<version>3.5.5</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

@@ -137,7 +137,7 @@
137137
<version>${project.version}</version>
138138
</dependency>
139139
<dependency>
140-
<groupId>org.apache.hadoop</groupId>
140+
<groupId>${hadoop.group}</groupId>
141141
<artifactId>hadoop-yarn-server-web-proxy</artifactId>
142142
</dependency>
143143
</dependencies>

assembly/src/main/assembly/assembly.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@
8383
<useProjectArtifact>false</useProjectArtifact>
8484
<excludes>
8585
<exclude>org.apache.hadoop:*:jar</exclude>
86+
<exclude>io.hops:*:jar</exclude>
87+
<exclude>io.hops.metadata:*:jar</exclude>
8688
<exclude>org.apache.spark:*:jar</exclude>
8789
<exclude>org.apache.zookeeper:*:jar</exclude>
8890
<exclude>org.apache.avro:*:jar</exclude>

common/kvstore/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.12</artifactId>
25-
<version>3.5.8-SNAPSHOT</version>
25+
<version>3.5.5</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

common/network-common/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.12</artifactId>
25-
<version>3.5.8-SNAPSHOT</version>
25+
<version>3.5.5</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

common/network-shuffle/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.12</artifactId>
25-
<version>3.5.8-SNAPSHOT</version>
25+
<version>3.5.5</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

common/network-yarn/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.12</artifactId>
25-
<version>3.5.8-SNAPSHOT</version>
25+
<version>3.5.5</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

@@ -64,12 +64,12 @@
6464

6565
<!-- Provided dependencies -->
6666
<dependency>
67-
<groupId>org.apache.hadoop</groupId>
67+
<groupId>${hadoop.group}</groupId>
6868
<artifactId>hadoop-client-api</artifactId>
6969
<version>${hadoop.version}</version>
7070
</dependency>
7171
<dependency>
72-
<groupId>org.apache.hadoop</groupId>
72+
<groupId>${hadoop.group}</groupId>
7373
<artifactId>hadoop-client-runtime</artifactId>
7474
<version>${hadoop.version}</version>
7575
</dependency>

common/sketch/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.12</artifactId>
25-
<version>3.5.8-SNAPSHOT</version>
25+
<version>3.5.5</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

common/tags/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.12</artifactId>
25-
<version>3.5.8-SNAPSHOT</version>
25+
<version>3.5.5</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

common/unsafe/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.12</artifactId>
25-
<version>3.5.8-SNAPSHOT</version>
25+
<version>3.5.5</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

0 commit comments

Comments
 (0)