Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion azure
Submodule azure updated 2 files
+9 −0 adls-plugins/pom.xml
+8 −31 pom.xml
2 changes: 1 addition & 1 deletion condition-plugins
1 change: 0 additions & 1 deletion format-parquet/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@
<dependency>
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-avro</artifactId>
<version>1.12.0</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
Expand Down
2 changes: 1 addition & 1 deletion google-cloud
Submodule google-cloud updated 76 files
+24 −2 docs/GCSFile-batchsource.md
+93 −110 pom.xml
+14 −0 src/e2e-test/features/bigquery/sink/BigQuerySinkError.feature
+50 −0 src/e2e-test/features/bigquery/sink/BigQuerySink_WithMacro.feature
+151 −0 src/e2e-test/features/bigquery/sink/BigQueryToBigQuerySink.feature
+1 −1 src/e2e-test/features/gcs/sink/GCSSinkError.feature
+2 −2 src/e2e-test/features/gcsmove/GCSMoveErrorScenarios.feature
+2 −1 src/e2e-test/java/io/cdap/plugin/bigquery/runners/multitablerunner/TestRunner.java
+2 −1 src/e2e-test/java/io/cdap/plugin/bigquery/runners/multitablerunner/TestRunnerRequired.java
+2 −1 src/e2e-test/java/io/cdap/plugin/bigquery/runners/sinkrunner/TestRunner.java
+2 −1 src/e2e-test/java/io/cdap/plugin/bigquery/runners/sinkrunner/TestRunnerRequired.java
+2 −1 src/e2e-test/java/io/cdap/plugin/bigquery/runners/sourcerunner/TestRunner.java
+2 −1 src/e2e-test/java/io/cdap/plugin/bigquery/runners/sourcerunner/TestRunnerRequired.java
+2 −1 src/e2e-test/java/io/cdap/plugin/bigqueryexecute/runner/TestRunner.java
+2 −1 src/e2e-test/java/io/cdap/plugin/bigqueryexecute/runner/TestRunnerRequired.java
+2 −1 src/e2e-test/java/io/cdap/plugin/bigtable/runners/TestRunner.java
+2 −1 src/e2e-test/java/io/cdap/plugin/bigtable/runners/TestRunnerRequired.java
+3 −2 src/e2e-test/java/io/cdap/plugin/common/runners/cmekrunner/TestRunner.java
+3 −2 src/e2e-test/java/io/cdap/plugin/common/runners/cmekrunner/TestRunnerRequired.java
+3 −2 src/e2e-test/java/io/cdap/plugin/common/runners/common/TestRunnerRequired.java
+13 −8 src/e2e-test/java/io/cdap/plugin/common/stepsdesign/TestSetupHooks.java
+2 −1 src/e2e-test/java/io/cdap/plugin/datastore/runner/TestRunner.java
+2 −1 src/e2e-test/java/io/cdap/plugin/datastore/runner/TestRunnerRequired.java
+2 −1 src/e2e-test/java/io/cdap/plugin/gcs/runners/sinkrunner/TestRunner.java
+2 −1 src/e2e-test/java/io/cdap/plugin/gcs/runners/sinkrunner/TestRunnerRequired.java
+2 −1 src/e2e-test/java/io/cdap/plugin/gcs/runners/sourcerunner/TestRunner.java
+2 −1 src/e2e-test/java/io/cdap/plugin/gcs/runners/sourcerunner/TestRunnerRequired.java
+2 −1 src/e2e-test/java/io/cdap/plugin/gcscopy/runners/TestRunner.java
+2 −1 src/e2e-test/java/io/cdap/plugin/gcscopy/runners/TestRunnerRequired.java
+2 −1 src/e2e-test/java/io/cdap/plugin/gcscreate/runners/TestRunner.java
+2 −1 src/e2e-test/java/io/cdap/plugin/gcscreate/runners/TestRunnerRequired.java
+2 −1 src/e2e-test/java/io/cdap/plugin/gcsdelete/runners/TestRunner.java
+2 −1 src/e2e-test/java/io/cdap/plugin/gcsdelete/runners/TestRunnerRequired.java
+2 −1 src/e2e-test/java/io/cdap/plugin/gcsmove/runners/TestRunner.java
+2 −1 src/e2e-test/java/io/cdap/plugin/gcsmove/runners/TestRunnerRequired.java
+1 −1 src/e2e-test/java/io/cdap/plugin/gcsmove/stepsdesign/GCSMove.java
+2 −1 src/e2e-test/java/io/cdap/plugin/pubsub/runners/sinkrunner/TestRunner.java
+2 −1 src/e2e-test/java/io/cdap/plugin/pubsub/runners/sinkrunner/TestRunnerRequired.java
+2 −1 src/e2e-test/java/io/cdap/plugin/spanner/runners/sinkrunner/TestRunner.java
+2 −1 src/e2e-test/java/io/cdap/plugin/spanner/runners/sourcerunner/TestRunner.java
+2 −1 src/e2e-test/java/io/cdap/plugin/spanner/runners/sourcerunner/TestRunnerRequired.java
+9 −0 src/e2e-test/resources/pluginParameters.properties
+15 −16 src/main/java/io/cdap/plugin/gcp/bigquery/sink/AbstractBigQuerySink.java
+65 −1 src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQuerySinkUtils.java
+10 −3 src/main/java/io/cdap/plugin/gcp/bigquery/source/BigQuerySource.java
+30 −7 src/main/java/io/cdap/plugin/gcp/bigquery/source/BigQuerySourceUtils.java
+7 −8 src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySQLEngine.java
+28 −0 src/main/java/io/cdap/plugin/gcp/bigquery/util/BigQueryUtil.java
+73 −0 src/main/java/io/cdap/plugin/gcp/bigtable/common/BigtableErrorDetailsProvider.java
+4 −0 src/main/java/io/cdap/plugin/gcp/bigtable/sink/BigtableSink.java
+10 −1 src/main/java/io/cdap/plugin/gcp/bigtable/source/BigtableSource.java
+11 −22 src/main/java/io/cdap/plugin/gcp/common/GCPErrorDetailsProvider.java
+58 −0 src/main/java/io/cdap/plugin/gcp/common/GCPErrorDetailsProviderUtil.java
+10 −1 src/main/java/io/cdap/plugin/gcp/common/GCPUtils.java
+49 −0 src/main/java/io/cdap/plugin/gcp/common/ServerErrorException.java
+83 −0 src/main/java/io/cdap/plugin/gcp/crypto/EncryptedFileSystem.java
+10 −10 src/main/java/io/cdap/plugin/gcp/dataplex/sink/DataplexBatchSink.java
+2 −1 src/main/java/io/cdap/plugin/gcp/dataplex/source/DataplexBatchSource.java
+100 −0 src/main/java/io/cdap/plugin/gcp/datastore/common/DatastoreErrorDetailsProvider.java
+0 −32 src/main/java/io/cdap/plugin/gcp/datastore/exception/DatastoreExecutionException.java
+4 −0 src/main/java/io/cdap/plugin/gcp/datastore/sink/DatastoreSink.java
+1 −2 src/main/java/io/cdap/plugin/gcp/datastore/source/DatastoreInputFormat.java
+6 −0 src/main/java/io/cdap/plugin/gcp/datastore/source/DatastoreSource.java
+72 −14 src/main/java/io/cdap/plugin/gcp/gcs/ServiceAccountAccessTokenProvider.java
+34 −1 src/main/java/io/cdap/plugin/gcp/gcs/source/GCSSource.java
+58 −0 src/main/java/io/cdap/plugin/gcp/spanner/common/SpannerErrorDetailsProvider.java
+7 −2 src/main/java/io/cdap/plugin/gcp/spanner/sink/RecordToMutationTransformer.java
+5 −0 src/main/java/io/cdap/plugin/gcp/spanner/sink/SpannerSink.java
+6 −1 src/main/java/io/cdap/plugin/gcp/spanner/source/PartitionInputSplit.java
+11 −7 src/main/java/io/cdap/plugin/gcp/spanner/source/ResultSetToRecordTransformer.java
+6 −1 src/main/java/io/cdap/plugin/gcp/spanner/source/SpannerInputFormat.java
+6 −0 src/main/java/io/cdap/plugin/gcp/spanner/source/SpannerSource.java
+2 −1 src/test/java/io/cdap/plugin/gcp/bigquery/sink/BigQuerySinkUtilsTest.java
+70 −1 src/test/java/io/cdap/plugin/gcp/gcs/ServiceAccountAccessTokenProviderTest.java
+2 −2 src/test/java/io/cdap/plugin/gcp/spanner/source/ResultSetToRecordTransformerTest.java
+70 −1 widgets/GCSFile-batchsource.json
2 changes: 1 addition & 1 deletion kafka-plugins
Submodule kafka-plugins updated 1 files
+18 −28 pom.xml
13 changes: 13 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,9 @@
<netty-http.version>1.3.0</netty-http.version>
<spark.version>3.3.2</spark.version>
<jackson.databind.version>2.13.4.2</jackson.databind.version>
<json-smart.version>2.4.11</json-smart.version>
<parquet.version>1.12.3</parquet.version>
<netty3.version>3.10.6.Final</netty3.version>
<testSourceLocation>${project.basedir}/src/test/java/</testSourceLocation>
</properties>

Expand All @@ -133,6 +136,16 @@

<dependencyManagement>
<dependencies>
<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
<version>${json-smart.version}</version>
</dependency>
<dependency>
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-avro</artifactId>
<version>${parquet.version}</version>
</dependency>
Comment on lines +139 to +148

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

The pull request title indicates an upgrade for Jackson and Netty dependency versions, but the corresponding properties <jackson.databind.version> and <netty.version> in the parent pom.xml have not been updated.

If these properties are not updated in the parent POM, modules inheriting from it (such as format-parquet or other core modules) will continue to use the older versions, potentially leading to version mismatches or classpath issues with the upgraded submodules (azure, kafka-plugins).

Additionally, please consider defining a property for the json-smart version (e.g., ${json-smart.version}) in the <properties> section of the parent POM to keep it consistent with other dependency versions.

Suggested change
<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
<version>2.4.11</version>
</dependency>
<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
<version>${json-smart.version}</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Expand Down
Loading