Merge branch 'main' into catskan/add-ingress-template-fix

airbytehq · Dec 6, 2024 · fc47692 · fc47692
2 parents d403d73 + 14b6f0a
commit fc47692
Show file tree

Hide file tree

Showing 2,343 changed files with 417,088 additions and 56,138 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -5,7 +5,7 @@ parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-[a-z]+)?
 serialize = 
 	{major}.{minor}.{patch}
 
-[bumpversion:file:.env]
+[bumpversion:file:.version]
 search = VERSION=dev
 replace = VERSION={new_version}
 

diff --git a/.env b/.env
diff --git a/.env.dev b/.env.dev
diff --git a/.version b/.version
@@ -0,0 +1 @@
+VERSION=dev
diff --git a/airbyte-analytics/build.gradle.kts b/airbyte-analytics/build.gradle.kts
@@ -16,6 +16,7 @@ dependencies {
   api(project(":oss:airbyte-commons"))
   api(project(":oss:airbyte-config:config-models"))
   api(project(":oss:airbyte-api:server-api"))
+  api(project(":oss:airbyte-data"))
 
   testAnnotationProcessor(platform(libs.micronaut.platform))
   testAnnotationProcessor(libs.bundles.micronaut.test.annotation.processor)
@@ -29,4 +30,4 @@ dependencies {
   testImplementation(libs.mockk)
   testImplementation(libs.kotlin.test.runner.junit5)
   testRuntimeOnly(libs.junit.jupiter.engine)
-}
+}