From d09b755ff2d353cf163c265a4be72257024015a6 Mon Sep 17 00:00:00 2001
From: McKnight-42 <matthew.mcknight@dbtlabs.com>
Date: Mon, 29 Jul 2024 13:12:50 -0500
Subject: [PATCH 1/4] update core install

---
 dev-requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-requirements.txt b/dev-requirements.txt
index f57f64d5d..26522411a 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -1,6 +1,6 @@
 # install latest changes in dbt-core
 # TODO: how to automate switching from develop to version branches?
-git+https://github.com/dbt-labs/dbt-core.git@1.8.latest#egg=dbt-core&subdirectory=core
+git+https://github.com/dbt-labs/dbt-core.git#egg=dbt-core&subdirectory=core
 git+https://github.com/dbt-labs/dbt-common.git
 git+https://github.com/dbt-labs/dbt-adapters.git
 git+https://github.com/dbt-labs/dbt-adapters.git#subdirectory=dbt-tests-adapter

From 648937c0c9862d6ee1059e992624e2a5454378aa Mon Sep 17 00:00:00 2001
From: McKnight-42 <matthew.mcknight@dbtlabs.com>
Date: Tue, 30 Jul 2024 15:09:53 -0500
Subject: [PATCH 2/4] update netcat install

---
 dagger/spark-container/install_spark.sh | 2 +-
 docker/Dockerfile                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dagger/spark-container/install_spark.sh b/dagger/spark-container/install_spark.sh
index 476f362a9..3e19610ca 100755
--- a/dagger/spark-container/install_spark.sh
+++ b/dagger/spark-container/install_spark.sh
@@ -4,7 +4,7 @@ SPARK_VERSION=3.1.3
 HADOOP_VERSION=3.2
 
 apt-get update && \
-apt-get install -y wget netcat procps libpostgresql-jdbc-java && \
+apt-get install -y wget netcat -openbsd procps libpostgresql-jdbc-java && \
 wget -q "https://archive.apache.org/dist/spark/spark-${SPARK_VERSION}/spark-${SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz" && \
 tar xzf "spark-${SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz" && \
 rm "spark-${SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz" && \
diff --git a/docker/Dockerfile b/docker/Dockerfile
index bb4d378ed..d555dd1cd 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -13,7 +13,7 @@ ENV SPARK_HOME /usr/spark
 ENV PATH="/usr/spark/bin:/usr/spark/sbin:${PATH}"
 
 RUN apt-get update && \
-    apt-get install -y wget netcat procps libpostgresql-jdbc-java && \
+    apt-get install -y wget netcat -openbsd procps libpostgresql-jdbc-java && \
     wget -q "http://archive.apache.org/dist/spark/spark-${SPARK_VERSION}/spark-${SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz" && \
     tar xzf "spark-${SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz" && \
     rm "spark-${SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz" && \

From 03a0b7685c48b156664c2311db50aa32c027564d Mon Sep 17 00:00:00 2001
From: McKnight-42 <matthew.mcknight@dbtlabs.com>
Date: Tue, 30 Jul 2024 15:16:25 -0500
Subject: [PATCH 3/4] slight change to possibly unneeded -openbsd callout

---
 dagger/spark-container/install_spark.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dagger/spark-container/install_spark.sh b/dagger/spark-container/install_spark.sh
index 3e19610ca..476f362a9 100755
--- a/dagger/spark-container/install_spark.sh
+++ b/dagger/spark-container/install_spark.sh
@@ -4,7 +4,7 @@ SPARK_VERSION=3.1.3
 HADOOP_VERSION=3.2
 
 apt-get update && \
-apt-get install -y wget netcat -openbsd procps libpostgresql-jdbc-java && \
+apt-get install -y wget netcat procps libpostgresql-jdbc-java && \
 wget -q "https://archive.apache.org/dist/spark/spark-${SPARK_VERSION}/spark-${SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz" && \
 tar xzf "spark-${SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz" && \
 rm "spark-${SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz" && \

From cd5305fe97b80ac0713da4213337767fe6c1fb94 Mon Sep 17 00:00:00 2001
From: McKnight-42 <matthew.mcknight@dbtlabs.com>
Date: Tue, 30 Jul 2024 16:30:20 -0500
Subject: [PATCH 4/4] remove space

---
 dagger/spark-container/install_spark.sh | 2 +-
 docker/Dockerfile                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dagger/spark-container/install_spark.sh b/dagger/spark-container/install_spark.sh
index 476f362a9..a9816020d 100755
--- a/dagger/spark-container/install_spark.sh
+++ b/dagger/spark-container/install_spark.sh
@@ -4,7 +4,7 @@ SPARK_VERSION=3.1.3
 HADOOP_VERSION=3.2
 
 apt-get update && \
-apt-get install -y wget netcat procps libpostgresql-jdbc-java && \
+apt-get install -y wget netcat-openbsd procps libpostgresql-jdbc-java && \
 wget -q "https://archive.apache.org/dist/spark/spark-${SPARK_VERSION}/spark-${SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz" && \
 tar xzf "spark-${SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz" && \
 rm "spark-${SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz" && \
diff --git a/docker/Dockerfile b/docker/Dockerfile
index d555dd1cd..49138af50 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -13,7 +13,7 @@ ENV SPARK_HOME /usr/spark
 ENV PATH="/usr/spark/bin:/usr/spark/sbin:${PATH}"
 
 RUN apt-get update && \
-    apt-get install -y wget netcat -openbsd procps libpostgresql-jdbc-java && \
+    apt-get install -y wget netcat-openbsd procps libpostgresql-jdbc-java && \
     wget -q "http://archive.apache.org/dist/spark/spark-${SPARK_VERSION}/spark-${SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz" && \
     tar xzf "spark-${SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz" && \
     rm "spark-${SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz" && \