source-e2e-test: adopt CDK 0.20.4 (#35231)

airbytehq · Feb 14, 2024 · fd0b77e · fd0b77e
1 parent c1c8088
commit fd0b77e
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 35 deletions.
diff --git a/airbyte-integrations/connectors/source-e2e-test-cloud/build.gradle b/airbyte-integrations/connectors/source-e2e-test-cloud/build.gradle
@@ -1,29 +1,17 @@
 plugins {
-    id 'application'
     id 'airbyte-java-connector'
 }
 
 airbyteJavaConnector {
-    cdkVersionRequired = '0.7.7'
+    cdkVersionRequired = '0.20.4'
     features = ['db-sources']
     useLocalCdk = false
 }
 
-//remove once upgrading the CDK version to 0.4.x or later
-java {
-    compileJava {
-        options.compilerArgs.remove("-Werror")
-    }
-}
-
-airbyteJavaConnector.addCdkDependencies()
-
 application {
     mainClass = 'io.airbyte.integrations.source.e2e_test.CloudTestingSources'
 }
 
 dependencies {
     implementation project(':airbyte-integrations:connectors:source-e2e-test')
-
-    integrationTestJavaImplementation project(':airbyte-integrations:connectors:source-e2e-test-cloud')
 }
diff --git a/airbyte-integrations/connectors/source-e2e-test-cloud/metadata.yaml b/airbyte-integrations/connectors/source-e2e-test-cloud/metadata.yaml
@@ -2,7 +2,7 @@ data:
   connectorSubtype: api
   connectorType: source
   definitionId: 50bd8338-7c4e-46f1-8c7f-3ef95de19fdd
-  dockerImageTag: 2.2.0
+  dockerImageTag: 2.2.1
   dockerRepository: airbyte/source-e2e-test-cloud
   githubIssueLabel: source-e2e-test-cloud
   icon: airbyte.svg

diff --git a/airbyte-integrations/connectors/source-e2e-test/build.gradle b/airbyte-integrations/connectors/source-e2e-test/build.gradle
@@ -1,39 +1,20 @@
 plugins {
-    id 'application'
     id 'airbyte-java-connector'
 }
 
 airbyteJavaConnector {
-    cdkVersionRequired = '0.7.7'
+    cdkVersionRequired = '0.20.4'
     features = ['db-sources']
     useLocalCdk = false
 }
 
-//remove once upgrading the CDK version to 0.4.x or later
-java {
-    compileTestJava {
-        options.compilerArgs.remove("-Werror")
-    }
-    compileJava {
-        options.compilerArgs.remove("-Werror")
-    }
-}
-
-airbyteJavaConnector.addCdkDependencies()
-
 application {
     mainClass = 'io.airbyte.integrations.source.e2e_test.TestingSources'
 }
 
 dependencies {
-    implementation 'org.apache.commons:commons-lang3:3.11'
-    implementation 'com.networknt:json-schema-validator:1.0.72'
-
     // random Json object generation from Json schema
     // https://github.com/airbytehq/jsongenerator
     implementation 'net.jimblackler.jsonschemafriend:core:0.12.1'
-    implementation 'org.mozilla:rhino-engine:1.7.14'
     implementation group: 'com.github.airbytehq', name: 'jsongenerator', version: '1.0.2'
-
-    integrationTestJavaImplementation project(':airbyte-integrations:connectors:source-e2e-test')
 }
diff --git a/airbyte-integrations/connectors/source-e2e-test/metadata.yaml b/airbyte-integrations/connectors/source-e2e-test/metadata.yaml
@@ -2,7 +2,7 @@ data:
   connectorSubtype: api
   connectorType: source
   definitionId: d53f9084-fa6b-4a5a-976c-5b8392f4ad8a
-  dockerImageTag: 2.2.0
+  dockerImageTag: 2.2.1
   dockerRepository: airbyte/source-e2e-test
   githubIssueLabel: source-e2e-test
   icon: airbyte.svg

diff --git a/...-test/src/test/java/io/airbyte/integrations/source/e2e_test/SpeedBenchmarkSourceTest.java b/...-test/src/test/java/io/airbyte/integrations/source/e2e_test/SpeedBenchmarkSourceTest.java
@@ -98,6 +98,7 @@ void testDiscover() throws Exception {
   }
 
   @Test
+  @SuppressWarnings("try")
   void testSource() throws Exception {
     final SpeedBenchmarkSource speedBenchmarkSource = new SpeedBenchmarkSource();
 

diff --git a/docs/integrations/sources/e2e-test-cloud.md b/docs/integrations/sources/e2e-test-cloud.md
@@ -30,6 +30,7 @@ The OSS and Cloud variants have the same version number. The Cloud variant was i
 
 | Version | Date       | Pull request                                             | Notes                                               |
 |---------|------------|----------------------------------------------------------|-----------------------------------------------------|
+| 2.2.1   | 2024-02-13 | [35231](https://github.com/airbytehq/airbyte/pull/35231)           | Adopt JDK 0.20.4.                                                                                     |
 | 2.1.5   | 2023-10-06 | [31092](https://github.com/airbytehq/airbyte/pull/31092) | Bring in changes from oss                           |
 | 2.1.4   | 2023-03-01 | [23656](https://github.com/airbytehq/airbyte/pull/23656) | Fix inheritance between e2e-test and e2e-test-cloud |
 | 0.1.0   | 2021-07-23 | [9720](https://github.com/airbytehq/airbyte/pull/9720)   | Initial release.                                    |
diff --git a/docs/integrations/sources/e2e-test.md b/docs/integrations/sources/e2e-test.md
@@ -72,6 +72,7 @@ The OSS and Cloud variants have the same version number. The Cloud variant was i
 
 | Version | Date       | Pull request                                                       | Notes                                                                                                 |
 |---------|------------| ------------------------------------------------------------------ |-------------------------------------------------------------------------------------------------------|
+| 2.2.1   | 2024-02-13 | [35231](https://github.com/airbytehq/airbyte/pull/35231)           | Adopt JDK 0.20.4.                                                                                     |
 | 2.2.0   | 2023-12-18 | [33485](https://github.com/airbytehq/airbyte/pull/33485)           | Remove LEGACY state                                                                                   |
 | 2.1.5   | 2023-10-04 | [31092](https://github.com/airbytehq/airbyte/pull/31092)           | Bump jsonschemafriend dependency version to fix bug                                                   |
 | 2.1.4   | 2023-03-01 | [23656](https://github.com/airbytehq/airbyte/pull/23656)           | Add speed benchmark mode to e2e test                                                                  |
-Original file line number
+Diff line change
@@ Expand Up / @@ -98,6 +98,7 @@ void testDiscover() throws Exception { @@
       }
       @Test
+      @SuppressWarnings("try")
       void testSource() throws Exception {
         final SpeedBenchmarkSource speedBenchmarkSource = new SpeedBenchmarkSource();
@@ Expand Down @@