You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by mc...@apache.org on 2022/05/13 07:17:57 UTC

[hop] branch master updated: HOP-3837 : Beam Dataflow serialization error HOP-3839 : Beam Dataflow BigQuery libraries need updating HOP-3840 : Update Apache Beam API to 2.38.0 HOP-3932 : Allow identification of Apache Hop pipelines on GCP Dataflow

This is an automated email from the ASF dual-hosted git repository.

mcasters pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hop.git


The following commit(s) were added to refs/heads/master by this push:
     new f9b690ff9c HOP-3837 : Beam Dataflow serialization error HOP-3839 : Beam Dataflow BigQuery libraries need updating HOP-3840 : Update Apache Beam API to 2.38.0 HOP-3932 : Allow identification of Apache Hop pipelines on GCP Dataflow
     new e555e2ebea Merge pull request #1485 from mattcasters/master
f9b690ff9c is described below

commit f9b690ff9c71319690968131331b4fa0b77b4a2c
Author: Matt Casters <ma...@gmail.com>
AuthorDate: Fri May 13 09:15:18 2022 +0200

    HOP-3837 : Beam Dataflow serialization error
    HOP-3839 : Beam Dataflow BigQuery libraries need updating
    HOP-3840 : Update Apache Beam API to 2.38.0
    HOP-3932 : Allow identification of Apache Hop pipelines on GCP Dataflow
---
 assemblies/plugins/tech/azure/pom.xml                   | 11 +++++++++++
 assemblies/plugins/transforms/json/pom.xml              | 17 +++++++++++------
 .../plugins/transforms/json/src/assembly/assembly.xml   |  1 +
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/assemblies/plugins/tech/azure/pom.xml b/assemblies/plugins/tech/azure/pom.xml
index 4688d42372..a386888ab0 100644
--- a/assemblies/plugins/tech/azure/pom.xml
+++ b/assemblies/plugins/tech/azure/pom.xml
@@ -37,6 +37,7 @@
     <properties>
         <azure-storage.version>8.6.6</azure-storage.version>
         <azure-eventhubs.version>3.2.2</azure-eventhubs.version>
+        <json-smart.version>2.4.8</json-smart.version>
     </properties>
 
     <dependencies>
@@ -57,6 +58,16 @@
             <artifactId>joda-time</artifactId>
             <version>${joda-time.version}</version>
         </dependency>
+        <dependency>
+            <groupId>net.minidev</groupId>
+            <artifactId>json-smart</artifactId>
+            <version>${json-smart.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>net.minidev</groupId>
+            <artifactId>accessors-smart</artifactId>
+            <version>${json-smart.version}</version>
+        </dependency>
 
         <!-- Azure VFS -->
 
diff --git a/assemblies/plugins/transforms/json/pom.xml b/assemblies/plugins/transforms/json/pom.xml
index 7d2be73801..6d784f607d 100644
--- a/assemblies/plugins/transforms/json/pom.xml
+++ b/assemblies/plugins/transforms/json/pom.xml
@@ -43,7 +43,7 @@
         <javax.servlet-api.version>3.0.1</javax.servlet-api.version>
         <dependency.com.tinkerpop.blueprints.version>2.6.0</dependency.com.tinkerpop.blueprints.version>
         <dependency.org.powermock.version>2.0.9</dependency.org.powermock.version>
-        <json-smart.version>2.3</json-smart.version>
+        <json-smart.version>2.4.8</json-smart.version>
         <json-path.version>2.1.0</json-path.version>
         <jackson-core.version>${jackson-databind.version}</jackson-core.version>
         <jackson-databind.version>2.12.1</jackson-databind.version>
@@ -57,6 +57,16 @@
             <artifactId>hop-transforms-json</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>net.minidev</groupId>
+            <artifactId>json-smart</artifactId>
+            <version>${json-smart.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>net.minidev</groupId>
+            <artifactId>accessors-smart</artifactId>
+            <version>${json-smart.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.googlecode.json-simple</groupId>
             <artifactId>json-simple</artifactId>
@@ -77,11 +87,6 @@
             <artifactId>json-path</artifactId>
             <version>${json-path.version}</version>
         </dependency>
-        <dependency>
-            <groupId>net.minidev</groupId>
-            <artifactId>json-smart</artifactId>
-            <version>${json-smart.version}</version>
-        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/assemblies/plugins/transforms/json/src/assembly/assembly.xml b/assemblies/plugins/transforms/json/src/assembly/assembly.xml
index e2de15d665..545fae2ba6 100644
--- a/assemblies/plugins/transforms/json/src/assembly/assembly.xml
+++ b/assemblies/plugins/transforms/json/src/assembly/assembly.xml
@@ -52,6 +52,7 @@
             <includes>
                 <include>com.jayway.jsonpath:json-path:jar</include>
                 <include>net.minidev:json-smart:jar</include>
+                <include>net.minidev:accessors-smart:jar</include>
             </includes>
         </dependencySet>
     </dependencySets>