From 0744f12ec2c48ba47f0e141d1405eb9872d043d6 Mon Sep 17 00:00:00 2001
From: Hai Nguyen <quanghai.ng1512@gmail.com>
Date: Fri, 20 Oct 2023 20:13:34 +0700
Subject: [PATCH 1/2] fix: Support param timeout when persisting

Signed-off-by: Hai Nguyen <quanghai.ng1512@gmail.com>
---
 .../contrib/bytewax/bytewax_materialization_dataflow.py       | 4 +---
 setup.py                                                      | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/sdk/python/feast/infra/materialization/contrib/bytewax/bytewax_materialization_dataflow.py b/sdk/python/feast/infra/materialization/contrib/bytewax/bytewax_materialization_dataflow.py
index bf5229303a..fe2a7f35c1 100644
--- a/sdk/python/feast/infra/materialization/contrib/bytewax/bytewax_materialization_dataflow.py
+++ b/sdk/python/feast/infra/materialization/contrib/bytewax/bytewax_materialization_dataflow.py
@@ -2,7 +2,6 @@
 
 import pyarrow as pa
 import pyarrow.parquet as pq
-import s3fs
 from bytewax.dataflow import Dataflow  # type: ignore
 from bytewax.execution import cluster_main
 from bytewax.inputs import ManualInputConfig, distribute
@@ -29,8 +28,7 @@ def __init__(
         self._run_dataflow()
 
     def process_path(self, path):
-        fs = s3fs.S3FileSystem()
-        dataset = pq.ParquetDataset(path, filesystem=fs, use_legacy_dataset=False)
+        dataset = pq.ParquetDataset(path, use_legacy_dataset=False)
         batches = []
         for fragment in dataset.fragments:
             for batch in fragment.to_table().to_batches():
diff --git a/setup.py b/setup.py
index 047100f03e..7b6f96f573 100644
--- a/setup.py
+++ b/setup.py
@@ -91,6 +91,7 @@
     "google-cloud-datastore>=2.1.0,<3",
     "google-cloud-storage>=1.34.0,<3",
     "google-cloud-bigtable>=2.11.0,<3",
+    "gcsfs",
 ]
 
 REDIS_REQUIRED = [
@@ -158,7 +159,6 @@
         "moto",
         "mypy>=0.981,<0.990",
         "avro==1.10.0",
-        "gcsfs>=0.4.0,<=2022.01.0",
         "urllib3>=1.25.4,<2",
         "psutil==5.9.0",
         "py>=1.11.0",  # https://github.com/pytest-dev/pytest/issues/10420

From 81b4268e682321c1d66bd8ef67bf099ad6c2d0fd Mon Sep 17 00:00:00 2001
From: Hai Nguyen <quanghai.ng1512@gmail.com>
Date: Fri, 20 Oct 2023 20:46:35 +0700
Subject: [PATCH 2/2] fix: fix java integration test

Signed-off-by: Hai Nguyen <quanghai.ng1512@gmail.com>
---
 java/pom.xml | 2 +-
 setup.py     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/java/pom.xml b/java/pom.xml
index 245d2d7cc6..3a94e5f19c 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -61,7 +61,7 @@
         <swagger.core.version>1.5.24</swagger.core.version>
         <okhttp.version>3.14.7</okhttp.version>
         <commons.lang3.version>3.10</commons.lang3.version>
-        <jackson.version>2.12.6</jackson.version>
+        <jackson.version>2.14.0</jackson.version>
         <javax.xml.bind.version>2.3.1</javax.xml.bind.version>
         <javax.annotation.version>1.3.2</javax.annotation.version>
         <javax.validation.version>2.0.1.Final</javax.validation.version>
diff --git a/setup.py b/setup.py
index 7b6f96f573..9fbc2bc2cd 100644
--- a/setup.py
+++ b/setup.py
@@ -159,6 +159,7 @@
         "moto",
         "mypy>=0.981,<0.990",
         "avro==1.10.0",
+        "gcsfs",
         "urllib3>=1.25.4,<2",
         "psutil==5.9.0",
         "py>=1.11.0",  # https://github.com/pytest-dev/pytest/issues/10420