Merge remote-tracking branch 'upstream/master' into release0.99 release0.99 0.99-rc4
authorHans Van Akelyen <hans.van.akelyen@gmail.com>
Tue, 27 Jul 2021 12:59:19 +0000 (14:59 +0200)
committerHans Van Akelyen <hans.van.akelyen@gmail.com>
Tue, 27 Jul 2021 12:59:19 +0000 (14:59 +0200)
17 files changed:
1  2 
assemblies/plugins/databases/googlebigquery-assemblies/pom.xml
assemblies/plugins/databases/postgresql-assemblies/pom.xml
assemblies/plugins/dist/pom.xml
assemblies/plugins/engines/beam/pom.xml
assemblies/plugins/tech/google/pom.xml
assemblies/plugins/tech/neo4j/pom.xml
assemblies/plugins/transforms/mongodb/pom.xml
assemblies/plugins/transforms/pom.xml
core/pom.xml
plugins/databases/postgresql/pom.xml
plugins/engines/beam/pom.xml
plugins/tech/google/pom.xml
plugins/tech/neo4j/pom.xml
plugins/transforms/mongodb/pom.xml
plugins/transforms/pgbulkloader/pom.xml
plugins/transforms/pgbulkloader/src/main/java/org/apache/hop/pipeline/transforms/pgbulkloader/PGBulkLoaderDialog.java
plugins/transforms/pom.xml

Simple merge
Simple merge
Simple merge
diff --cc core/pom.xml
Simple merge
Simple merge
index 56f30bda7d2ebe59bf343cc4827daa49f70b0666,b8c9e4ab01c61ee8167af087983e5f5860e29a50..3d8b41a225407c2fef82a0e7214bff43589fba59
      <dependency>
        <groupId>org.apache.hop</groupId>
        <artifactId>hop-transform-rowgenerator</artifactId>
 -      <version>1.0-SNAPSHOT</version>
 +      <version>0.99</version>
      </dependency>
  
+     <dependency>
+       <groupId>commons-codec</groupId>
+       <artifactId>commons-codec</artifactId>
+       <version>1.14</version>
+     </dependency>
      <!-- The Apache Beam dependencies -->
  
      <dependency>
Simple merge
Simple merge
index 2e250ac523d38315c8cf9886e571e25ccea25950,f85cf1814b694349de5c4b32c650e100bb4835fd..f8ea2b44b304e7fb88b13f22074d0c8a7950f2b8
    <parent>
      <groupId>org.apache.hop</groupId>
      <artifactId>hop-plugins-transforms</artifactId>
 -    <version>1.0-SNAPSHOT</version>
 +    <version>0.99</version>
    </parent>
  
-   <artifactId>hop-transforms-mongodb</artifactId>
+   <artifactId>hop-transform-mongodb</artifactId>
    <name>Hop Plugins Transforms MongoDB</name>
    <packaging>jar</packaging>
  
Simple merge