diff --git a/.dockerignore b/.dockerignore index acdf2f6d562..b404469ffe4 100644 --- a/.dockerignore +++ b/.dockerignore @@ -4,10 +4,9 @@ # Allow files and directories !/assemblies/client/target/hop-* !/assemblies/client/target/hop -!/assemblies/lib-jdbc !/integration-tests/scripts !/assemblies/web/target -!/assemblies/plugins/dist/target +!/assemblies/plugins/target !/docker !/rest !google-key-apache-hop-it.json \ No newline at end of file diff --git a/.gitignore b/.gitignore index 93a8f5c2e2f..e2ff3459282 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,5 @@ integration-tests/spreadsheet/files/exel-multi-part_4.xlsx integration-tests/json/output integration-tests/mdi/files/excelwriter-mdi-test.xlsx integration-tests/spreadsheet/files/sample-file-append.xlsx + +assemblies/debug/audit \ No newline at end of file diff --git a/assemblies/client/pom.xml b/assemblies/client/pom.xml index ed6cec93b90..df8f9da8d4e 100644 --- a/assemblies/client/pom.xml +++ b/assemblies/client/pom.xml @@ -26,14 +26,12 @@ hop-client pom - Hop Client ${org.eclipse.platform.version} ${org.eclipse.platform.version} ${org.eclipse.platform.version} - ${org.eclipse.platform.version} ${org.eclipse.platform.version} @@ -41,87 +39,45 @@ org.apache.hop - hop-assemblies-libs + hop-assemblies-plugins ${project.version} zip - - - * - * - - org.apache.hop - hop-assemblies-libs-beam + hop-assemblies-static ${project.version} zip - - - * - * - - org.apache.hop - hop-assemblies-libs-jdbc + hop-core ${project.version} zip - - - * - * - - org.apache.hop - hop-assemblies-plugins-dist + hop-engine ${project.version} zip - - - * - * - - org.apache.hop - hop-assemblies-samples + hop-engine-beam ${project.version} zip - - - * - * - - org.apache.hop - hop-assemblies-static + hop-engines-beam ${project.version} zip - - - * - * - - org.apache.hop - hop-engine-beam + hop-ui ${project.version} - jar - - - * - * - - + zip @@ -130,96 +86,6 @@ hop-ui-rcp ${project.version} - - org.eclipse.jetty - jetty-jaas - ${jetty.version} - - - * - * - - - - - org.eclipse.jetty - jetty-security - ${jetty.version} - - - * - * - - - - - - - org.eclipse.jetty - jetty-server - ${jetty.version} - - - org.eclipse.jetty.orbit - * - - - - - org.eclipse.jetty - jetty-servlet - ${jetty.version} - - - * - * - - - - - org.eclipse.jetty - jetty-servlets - ${jetty.version} - - - * - * - - - - - org.eclipse.jetty - jetty-util - ${jetty.version} - - - * - * - - - - - org.eclipse.jetty - jetty-webapp - ${jetty.version} - - - * - * - - - - - org.eclipse.jetty - jetty-xml - ${jetty.version} - - - * - * - - - org.eclipse.platform org.eclipse.swt.cocoa.macosx.aarch64 @@ -253,8 +119,6 @@ - - org.eclipse.platform org.eclipse.swt.gtk.linux.x86_64 diff --git a/assemblies/client/src/assembly/assembly.xml b/assemblies/client/src/assembly/assembly.xml index 28e51f2be09..03113e029f1 100644 --- a/assemblies/client/src/assembly/assembly.xml +++ b/assemblies/client/src/assembly/assembly.xml @@ -37,43 +37,27 @@ org.apache.hop:hop-assemblies-static:zip org.apache.hop:hop-assemblies-samples:zip - org.apache.hop:hop-assemblies-plugins-dist:zip + org.apache.hop:hop-assemblies-plugins:zip + org.apache.hop:hop-core:zip + org.apache.hop:hop-engine:zip + org.apache.hop:hop-ui:zip + org.apache.hop:hop-engine-beam:zip + org.apache.hop:hop-engines-beam:zip true . false false - - org.apache.hop:hop-assemblies-libs:zip + org.apache.hop:hop-ui-rcp:jar - true lib/core - false - false - - - - - org.apache.hop:hop-assemblies-libs-beam:zip - - true - lib/beam - false - false - - - - - org.apache.hop:hop-assemblies-libs-jdbc:zip - - true - lib/jdbc - false + true false + @@ -120,23 +104,5 @@ false false - - - org.apache.hop:hop-ui-rcp - org.eclipse.jetty:* - javax.servlet:javax.servlet-api - - lib/core - true - false - - - - org.apache.hop:hop-engine-beam - - lib/beam - true - false - \ No newline at end of file diff --git a/assemblies/core/lib/pom.xml b/assemblies/core/lib/pom.xml deleted file mode 100644 index a4c494a270e..00000000000 --- a/assemblies/core/lib/pom.xml +++ /dev/null @@ -1,244 +0,0 @@ - - - - 4.0.0 - - - org.apache.hop - hop-assemblies-core - 2.10.0-SNAPSHOT - - - hop-assemblies-core-libs - pom - - Hop Assemblies Core Libraries - - - 2.1.1 - 2.6.0 - 1.10 - 4.0.0 - 2.1 - - - 1.0 - 1.2.0 - - - 4.3.18 - 1.13.1 - 2.3.1 - 2.3.1 - - - - - - - com.databricks - spark-avro_2.11 - ${databricks.version} - - - * - * - - - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - - - * - * - - - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - * - * - - - - - com.tinkerpop.blueprints - blueprints-core - ${blueprints-core.version} - - - * - * - - - - - commons-configuration - commons-configuration - ${commons-configuration.version} - - - * - * - - - - - net.sf.flexjson - flexjson - ${flexjson.version} - - - * - * - - - - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - - - * - * - - - - - - org.apache.hop - hop-core - ${project.version} - - - org.apache.hop - hop-engine - ${project.version} - - - javax.servlet - * - - - - - - org.apache.hop - hop-ui - ${project.version} - - - org.eclipse.platform - * - - - - - - org.glassfish.tyrus.bundles - tyrus-standalone-client - ${tyrus-standalone-client.version} - - - * - * - - - - - - org.ow2.asm - asm - ${asm.version} - - - * - * - - - - - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - slf4j-nop - ${slf4j.version} - - - - xerces - xercesImpl - - - - - - - - maven-dependency-plugin - - - copy-libs - - copy-dependencies - - prepare-package - - compile - ${assembly.dir} - - - - - - - diff --git a/assemblies/core/pom.xml b/assemblies/core/pom.xml deleted file mode 100644 index 37184196832..00000000000 --- a/assemblies/core/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - 4.0.0 - - - org.apache.hop - hop-assemblies - 2.10.0-SNAPSHOT - - - hop-assemblies-core - pom - - Hop Assemblies Core - - - lib - - diff --git a/assemblies/debug/pom.xml b/assemblies/debug/pom.xml index 3d2cda3b7bd..67cbd3fa806 100644 --- a/assemblies/debug/pom.xml +++ b/assemblies/debug/pom.xml @@ -27,144 +27,386 @@ hop-assemblies-debug pom - Hop Assemblies Debug - - ${org.eclipse.platform.version} - - ${org.eclipse.platform.version} - ${org.eclipse.platform.version} - - + + org.apache.hop + hop-action-abort + ${project.version} + provided + + + org.apache.hop + hop-action-addresultfilenames + ${project.version} + provided + + + org.apache.hop + hop-action-as400command + ${project.version} + provided + + + org.apache.hop + hop-action-checkdbconnection + ${project.version} + provided + + + org.apache.hop + hop-action-checkfilelocked + ${project.version} + provided + + + org.apache.hop + hop-action-columnsexist + ${project.version} + provided + + + org.apache.hop + hop-action-copyfiles + ${project.version} + provided + + + org.apache.hop + hop-action-copymoveresultfilenames + ${project.version} + provided + + + org.apache.hop + hop-action-createfile + ${project.version} + provided + + + org.apache.hop + hop-action-createfolder + ${project.version} + provided + + + org.apache.hop + hop-action-delay + ${project.version} + provided + + + org.apache.hop + hop-action-deletefile + ${project.version} + provided + + + org.apache.hop + hop-action-deletefiles + ${project.version} + provided + + + org.apache.hop + hop-action-deletefolders + ${project.version} + provided + + + org.apache.hop + hop-action-deleteresultfilenames + ${project.version} + provided + + + org.apache.hop + hop-action-dostounix + ${project.version} + provided + + + org.apache.hop + hop-action-eval + ${project.version} + provided + + + org.apache.hop + hop-action-evalfilesmetrics + ${project.version} + provided + + + org.apache.hop + hop-action-evaluatetablecontent + ${project.version} + provided + + + org.apache.hop + hop-action-filecompare + ${project.version} + provided + + + org.apache.hop + hop-action-fileexists + ${project.version} + provided + + + org.apache.hop + hop-action-filesexist + ${project.version} + provided + + + org.apache.hop + hop-action-folderisempty + ${project.version} + provided + + + org.apache.hop + hop-action-folderscompare + ${project.version} + provided + + + org.apache.hop + hop-action-ftp + ${project.version} + provided + + + org.apache.hop + hop-action-getpop + ${project.version} + provided + + + org.apache.hop + hop-action-http + ${project.version} + provided + + + org.apache.hop + hop-action-mail + ${project.version} + provided + + + org.apache.hop + hop-action-mailvalidator + ${project.version} + provided + + + org.apache.hop + hop-action-movefiles + ${project.version} + provided + + + org.apache.hop + hop-action-msgboxinfo + ${project.version} + provided + + + org.apache.hop + hop-action-mssqlbulkload + ${project.version} + provided + + + org.apache.hop + hop-action-mysqlbulkfile + ${project.version} + provided + + + org.apache.hop + hop-action-mysqlbulkload + ${project.version} + provided + + + org.apache.hop + hop-action-pgpfiles + ${project.version} + provided + + + org.apache.hop + hop-action-ping + ${project.version} + provided + + + org.apache.hop + hop-action-pipeline + ${project.version} + provided + + + org.apache.hop + hop-action-repeat + ${project.version} + provided + + + org.apache.hop + hop-action-sendnagiospassivecheck + ${project.version} + provided + + + org.apache.hop + hop-action-setvariables + ${project.version} + provided + + + org.apache.hop + hop-action-shell + ${project.version} + provided + + + org.apache.hop + hop-action-simpleeval + ${project.version} + provided + + + org.apache.hop + hop-action-snmptrap + ${project.version} + provided + + + org.apache.hop + hop-action-snowflake + ${project.version} + provided + + + org.apache.hop + hop-action-sql + ${project.version} + provided + + + org.apache.hop + hop-action-success + ${project.version} + provided + + + org.apache.hop + hop-action-tableexists + ${project.version} + provided + + + org.apache.hop + hop-action-telnet + ${project.version} + provided + + + org.apache.hop + hop-action-truncatetables + ${project.version} + provided + + + org.apache.hop + hop-action-unzip + ${project.version} + provided + + + org.apache.hop + hop-action-waitforfile + ${project.version} + provided + + + org.apache.hop + hop-action-waitforsql + ${project.version} + provided + + + org.apache.hop + hop-action-webserviceavailable + ${project.version} + provided + + + org.apache.hop + hop-action-workflow + ${project.version} + provided + + + org.apache.hop + hop-action-writetofile + ${project.version} + provided + + + org.apache.hop + hop-action-writetolog + ${project.version} + provided + + + org.apache.hop + hop-action-xml + ${project.version} + provided + + + org.apache.hop + hop-action-zipfile + ${project.version} + provided + org.apache.hop hop-core ${project.version} - compile + provided org.apache.hop hop-engine ${project.version} - compile + provided org.apache.hop hop-ui ${project.version} - compile - - - - - org.apache.xmlgraphics - xmlgraphics-commons - 2.7 - - - * - * - - + provided org.apache.hop hop-ui-rcp ${project.version} - runtime + provided + + + org.eclipse.platform + ${swt.artifactId} + ${org.eclipse.platform.version} + provided - - - - - - - - - swt-unix - - - unix - - - - linux - org.eclipse.swt.gtk.linux.x86_64 - - - - - org.eclipse.platform - ${swt.artifactId} - ${org.eclipse.platform.version} - - - * - * - - - - - - - - swt-mac - - - mac - - - - mac - org.eclipse.swt.cocoa.macosx.x86_64 - - - - - org.eclipse.platform - ${swt.artifactId} - ${org.eclipse.platform.version} - - - * - * - - - - - - - - swt-windows - - - windows - - - - windows - org.eclipse.swt.win32.win32.x86_64 - - - - - - org.eclipse.platform - ${swt.artifactId} - ${org.eclipse.platform.version} - - - * - * - - - - - - - - diff --git a/assemblies/lib-beam/pom.xml b/assemblies/lib-beam/pom.xml deleted file mode 100644 index 8277276ec76..00000000000 --- a/assemblies/lib-beam/pom.xml +++ /dev/null @@ -1,684 +0,0 @@ - - - - 4.0.0 - - - org.apache.hop - hop-assemblies - 2.10.0-SNAPSHOT - - - hop-assemblies-libs-beam - pom - - Hop Assemblies Beam Libraries - - - - com.esotericsoftware - kryo - ${kryo.version} - - - * - * - - - - - com.esotericsoftware - kryo-shaded - 4.0.2 - - - com.esotericsoftware - minlog - ${minlog.version} - - - * - * - - - - - com.fasterxml.woodstox - woodstox-core - ${woodstox.version} - - - * - * - - - - - com.github.luben - zstd-jni - 1.5.2-2 - - - * - * - - - - - com.google.api-client - google-api-client - ${google-api-client.version} - - - * - * - - - - - com.google.api.grpc - proto-google-common-protos - 2.14.0 - - - * - * - - - - - com.google.auth - google-auth-library-credentials - ${google-auth-library-credentials.version} - - - * - * - - - - - com.google.auth - google-auth-library-oauth2-http - ${google-auth-library-oauth2-http.version} - - - * - * - - - - - com.google.code.gson - gson - ${gson.version} - - - * - * - - - - - com.google.http-client - google-http-client - ${google-http-client.version} - - - * - * - - - - - com.google.http-client - google-http-client-gson - ${google-http-client.version} - - - * - * - - - - - com.google.protobuf - protobuf-java - ${protobuf.version} - - - * - * - - - - - com.google.protobuf - protobuf-java-util - ${protobuf.version} - - - * - * - - - - - com.googlecode.json-simple - json-simple - ${json-simple.version} - - - * - * - - - - - com.ning - compress-lzf - 1.1 - - - * - * - - - - - com.thoughtworks.paranamer - paranamer - ${paranamer.version} - - - com.typesafe.akka - akka-protobuf_2.11 - ${akka.version} - - - * - * - - - - - com.typesafe.akka - akka-slf4j_2.11 - ${akka.version} - - - * - * - - - - - io.dropwizard.metrics - metrics-core - ${metrics.version} - - - * - * - - - - - io.dropwizard.metrics - metrics-jvm - ${metrics.version} - - - * - * - - - - - io.dropwizard.metrics - metrics-logback - ${metrics.version} - - - * - * - - - - - io.grpc - grpc-alts - ${grpc.version} - - - * - * - - - - - io.grpc - grpc-api - ${grpc.version} - - - * - * - - - - - io.grpc - grpc-auth - ${grpc.version} - - - * - * - - - - - io.grpc - grpc-context - ${grpc.version} - - - * - * - - - - - io.grpc - grpc-core - ${grpc.version} - - - * - * - - - - - io.grpc - grpc-grpclb - ${grpc.version} - - - * - * - - - - - io.grpc - grpc-netty - ${grpc.version} - - - * - * - - - - - io.grpc - grpc-netty-shaded - ${grpc.version} - - - * - * - - - - - io.grpc - grpc-protobuf - ${grpc.version} - - - * - * - - - - - io.grpc - grpc-protobuf-lite - ${grpc.version} - - - * - * - - - - - io.grpc - grpc-stub - ${grpc.version} - - - * - * - - - - - - - - - - - - - - - - io.netty - netty-all - ${netty.version} - - - io.opencensus - opencensus-api - ${opencensus-api.version} - - - * - * - - - - - io.opencensus - opencensus-contrib-http-util - ${opencensus-contrib-http-util.version} - - - * - * - - - - - io.perfmark - perfmark-api - ${perfmark.version} - - - * - * - - - - - joda-time - joda-time - ${joda-time.version} - - - * - * - - - - - org.apache.avro - avro - ${avro.version} - - - * - * - - - - - org.apache.beam - beam-runners-direct-java - ${apache-beam.version} - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.module - jackson-module-scala_2.11 - - - - - - org.apache.beam - beam-sdks-java-core - ${apache-beam.version} - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.module - jackson-module-scala_2.11 - - - log4j - log4j - - - org.apache.beam - beam-model-fn-execution - - - org.apache.beam - beam-sdks-java-transform-service-launcher - - - org.apache.logging.log4j - log4j-api - - - org.apache.logging.log4j - log4j-core - - - org.xerial.snappy - * - - - - - org.apache.beam - beam-vendor-bytebuddy-1_11_0 - 0.1 - - - * - * - - - - - org.apache.curator - curator-client - ${curator.version} - - - log4j - log4j - - - org.apache.logging.log4j - log4j-api - - - org.apache.logging.log4j - log4j-core - - - - - org.apache.curator - curator-framework - ${curator.version} - - - * - * - - - - - org.apache.curator - curator-recipes - ${curator.version} - - - * - * - - - - - org.apache.logging.log4j - log4j-api - ${log4j.version} - - - org.apache.logging.log4j - log4j-core - 2.19.0 - - - * - * - - - - - org.apache.zookeeper - zookeeper - ${zookeeper.version} - - - * - * - - - - - org.hamcrest - hamcrest - 2.1 - - - org.json4s - json4s-ast_2.12 - ${json4s.version} - - - * - * - - - - - org.json4s - json4s-core_2.12 - ${json4s.version} - - - * - * - - - - - org.json4s - json4s-jackson_2.12 - ${json4s.version} - - - * - * - - - - - org.json4s - json4s-scalap_2.12 - ${json4s.version} - - - * - * - - - - - org.scala-lang - scala-library - ${scala.version} - - - org.slf4j - slf4j-api - ${slf4j.version} - - - * - * - - - - - - - - - maven-dependency-plugin - - - copy-libs - - copy-dependencies - - prepare-package - - compile - ${assembly.dir} - - - - - - - diff --git a/assemblies/lib-jdbc/pom.xml b/assemblies/lib-jdbc/pom.xml deleted file mode 100644 index e8aa1864fed..00000000000 --- a/assemblies/lib-jdbc/pom.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - 4.0.0 - - - org.apache.hop - hop-assemblies - 2.10.0-SNAPSHOT - - - hop-assemblies-libs-jdbc - pom - - Hop Assemblies Libraries JDBC - - - 0.6.0-patch4 - 2.7.0 - 10.16.1.1 - 0.10.2 - 2.2.224 - 2.7.2 - 20.0.6 - 3.3 - 12.4.1.jre11 - 42.7.2 - 2.1.0.28 - 3.14.3 - 3.43.0.0 - - - - - com.amazon.redshift - redshift-jdbc42 - ${redshift.version} - - - com.clickhouse - clickhouse-jdbc - ${clickhouse.jdbc.version} - - all - - - * - * - - - - - com.h2database - h2 - ${h2.version} - - - com.microsoft.sqlserver - mssql-jdbc - ${mssqlnative.version} - - - io.crate - crate-jdbc - ${cratedb-jdbc.version} - - - monetdb - monetdb-jdbc - ${monetdb.version} - - - net.sf.jt400 - jt400 - ${jt400.version} - - - net.snowflake - snowflake-jdbc - ${snowflake.jdbc.version} - - - org.apache.derby - derbyclient - ${derby.version} - - - org.duckdb - duckdb_jdbc - ${duckdb.version} - - - org.hsqldb - hsqldb - ${hyersonic.version} - - - org.postgresql - postgresql - ${postgresql.version} - - - org.xerial - sqlite-jdbc - ${sqlite.version} - - - - - - - true - - - false - - clojars - Clojars - https://clojars.org/repo/ - - - - - - - maven-dependency-plugin - - - copy-libs - - copy-dependencies - - prepare-package - - compile - ${assembly.dir} - - - - - - - diff --git a/assemblies/lib/pom.xml b/assemblies/lib/pom.xml deleted file mode 100644 index ed90f654e29..00000000000 --- a/assemblies/lib/pom.xml +++ /dev/null @@ -1,300 +0,0 @@ - - - - 4.0.0 - - - org.apache.hop - hop-assemblies - 2.10.0-SNAPSHOT - - - hop-assemblies-libs - pom - - Hop Assemblies Libraries - - - 2.1.1 - - - - - 2.6.0 - 1.10 - 4.0.0 - 2.1 - 1.2.1 - - - 4.3.18 - 1.13.1 - - - - - - com.databricks - spark-avro_2.11 - ${databricks.version} - - - * - * - - - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - - - com.fasterxml.jackson.module - jackson-module-jaxb-annotations - - - - - com.fasterxml.woodstox - woodstox-core - ${woodstox.version} - - - com.squareup.okhttp3 - okhttp - ${okhttp.version} - - - org.jetbrains.kotlin - * - - - - - com.squareup.okio - okio - ${okio.version} - - - * - * - - - - - com.sun.activation - jakarta.activation - ${jakarta-mail.version} - - - com.sun.mail - jakarta.mail - ${jakarta-mail.version} - - - com.tinkerpop.blueprints - blueprints-core - ${blueprints-core.version} - - - * - * - - - - - commons-configuration - commons-configuration - ${commons-configuration.version} - - - * - * - - - - - net.bytebuddy - byte-buddy - ${byte-buddy.version} - compile - - - * - * - - - - - net.sf.flexjson - flexjson - ${flexjson.version} - - - * - * - - - - - org.apache.hadoop - hadoop-hdfs-client - ${hadoop.version} - - - org.apache.hop - hop-core - ${project.version} - - - org.apache.hop - hop-engine - ${project.version} - - - javax.servlet - * - - - org.eclipse.jetty - * - - - - - org.apache.hop - hop-misc-static-schema - ${project.version} - - - org.apache.hop - hop-ui - ${project.version} - - - org.eclipse.platform - * - - - - - - - org.apache.xmlgraphics - xmlgraphics-commons - 2.7 - - - * - * - - - - - org.eclipse.platform - org.eclipse.core.commands - ${org.eclipse.commands.version} - - - * - * - - - - - - - org.eclipse.platform - org.eclipse.equinox.common - ${org.eclipse.equinox.version} - - - * - * - - - - - org.glassfish.tyrus.bundles - tyrus-standalone-client - ${tyrus-standalone-client.version} - - - * - * - - - - - org.ow2.asm - asm - ${asm.version} - - - * - * - - - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - slf4j-nop - ${slf4j.version} - - - org.yaml - snakeyaml - ${snakeyaml.version} - - - - - xerces - xercesImpl - - - - - - - - maven-dependency-plugin - - - copy-libs - - copy-dependencies - - prepare-package - - compile - ${assembly.dir} - - - - - - - diff --git a/assemblies/plugins/dist/pom.xml b/assemblies/plugins/dist/pom.xml deleted file mode 100644 index a3d02bb3949..00000000000 --- a/assemblies/plugins/dist/pom.xml +++ /dev/null @@ -1,3483 +0,0 @@ - - - - 4.0.0 - - org.apache.hop - hop-assemblies-plugins - 2.10.0-SNAPSHOT - - - hop-assemblies-plugins-dist - - Hop Assemblies Plugins Dist - - - - - - - org.apache.hop - hop-action-abort - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-addresultfilenames - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-as400command - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-checkdbconnection - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-checkfilelocked - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-columnsexist - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-copyfiles - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-copymoveresultfilenames - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-createfile - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-createfolder - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-delay - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-deletefile - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-deletefiles - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-deletefolders - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-deleteresultfilenames - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-dostounix - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-eval - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-evalfilesmetrics - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-evaluatetablecontent - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-filecompare - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-fileexists - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-filesexist - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-folderisempty - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-folderscompare - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-ftp - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-getpop - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-http - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-mail - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-mailvalidator - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-movefiles - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-msgboxinfo - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-mssqlbulkload - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-mysqlbulkfile - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-mysqlbulkload - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-pgpfiles - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-ping - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-pipeline - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-repeat - 2.10.0-SNAPSHOT - zip - - - * - * - - - - - - org.apache.hop - hop-action-sendnagiospassivecheck - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-setvariables - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-shell - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-simpleeval - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-snmptrap - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-snowflake - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-sql - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-success - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-tableexists - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-telnet - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-truncatetables - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-unzip - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-waitforfile - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-waitforsql - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-webserviceavailable - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-workflow - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-writetofile - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-writetolog - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-xml - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-action-zipfile - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-access - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-as400 - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-cache - ${project.version} - zip - - - * - * - - - - - - - - org.apache.hop - hop-databases-clickhouse - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-cockroachdb - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-cratedb - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-db2 - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-derby - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-doris - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-duckdb - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-exasol4 - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-firebird - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-generic - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-googlebigquery - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-greenplum - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-h2 - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-hive - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-hypersonic - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-infobright - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-informix - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-ingres - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-interbase - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-iris - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-kingbasees - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-mariadb - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-monetdb - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-mssql - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-mssqlnative - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-mysql - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-netezza - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-oracle - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-oraclerdb - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-postgresql - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-redshift - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-sapdb - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-snowflake - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-sqlbase - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-sqlite - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-sybase - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-sybaseiq - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-teradata - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-universe - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-vectorwise - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-databases-vertica - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-engines-beam - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-misc-async - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-misc-debug - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-misc-git - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-misc-import - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-misc-passwords - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-misc-projects - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-misc-reflection - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-misc-testing - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-tech-avro - 2.10.0-SNAPSHOT - zip - - - * - * - - - - - - org.apache.hop - hop-tech-aws - 2.10.0-SNAPSHOT - zip - - - * - * - - - - - - org.apache.hop - hop-tech-azure - 2.10.0-SNAPSHOT - zip - - - * - * - - - - - - org.apache.hop - hop-tech-cassandra - 2.10.0-SNAPSHOT - zip - - - * - * - - - - - - org.apache.hop - hop-tech-dropbox - 2.10.0-SNAPSHOT - zip - - - * - * - - - - - - org.apache.hop - hop-tech-google - 2.10.0-SNAPSHOT - zip - - - * - * - - - - - - org.apache.hop - hop-tech-neo4j - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-tech-parquet - ${project.version} - zip - - - * - * - - - - - - - - org.apache.hop - hop-transform-abort - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-addsequence - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-analyticquery - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-append - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-blockingtransform - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-blockuntiltransformsfinish - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-calculator - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-changefileencoding - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-checksum - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-clonerow - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-closure - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-coalesce - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-columnexists - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-combinationlookup - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-concatfields - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-constant - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-cratedbbulkloader - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-creditcardvalidator - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-cubeinput - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-cubeoutput - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-databasejoin - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-databaselookup - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-datagrid - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-dbproc - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-delay - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-delete - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-denormaliser - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-detectemptystream - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-detectlastrow - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-dimensionlookup - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-dorisbulkloader - ${project.version} - zip - - - * - * - - - - - org.apache.hop - hop-transform-drools - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-dynamicsqlrow - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-edi2xml - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-excel - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-execinfo - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-execprocess - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-execsqlrow - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-fake - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-fieldschangesequence - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-fieldsplitter - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-fileexists - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-filelocked - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-filemetadata - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-filesfromresult - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-filestoresult - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-filterrows - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-flattener - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-formula - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-fuzzymatch - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-getfilenames - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-getfilesrowcount - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-getsubfolders - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-gettablenames - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-getvariable - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-groupby - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-http - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-httppost - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-ifnull - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-insertupdate - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-janino - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-javascript - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-jdbc-metadata - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-joinrows - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-json - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-kafka - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-ldap - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-loadfileinput - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-mail - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-mailinput - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-mapping - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-memgroupby - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-mergejoin - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-mergerows - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-metadata - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-metainject - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-metastructure - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-monetdbbulkloader - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-mongodb - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-multimerge - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-normaliser - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-nullif - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-numberrange - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-orabulkloader - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-pgbulkloader - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-pgp - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-pipelineexecutor - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-processfiles - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-propertyinput - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-propertyoutput - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-randomvalue - 2.10.0-SNAPSHOT - zip - - - * - * - - - - - - org.apache.hop - hop-transform-regexeval - 2.10.0-SNAPSHOT - zip - - - * - * - - - - - - org.apache.hop - hop-transform-replacestring - 2.10.0-SNAPSHOT - zip - - - * - * - - - - - - org.apache.hop - hop-transform-reservoirsampling - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-rest - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-rowgenerator - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-rowsfromresult - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-rowstoresult - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-salesforce - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-samplerows - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-sasinput - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-schemamapping - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-script - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-selectvalues - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-serverstatus - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-setvalueconstant - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-setvaluefield - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-setvariable - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-snowflake-bulkloader - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-sort - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-sortedmerge - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-splitfieldtorows - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-splunk - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-sql - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-sqlfileoutput - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-ssh - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-standardizephonenumber - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-streamlookup - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-streamschemamerge - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-stringcut - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-stringoperations - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-switchcase - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-synchronizeaftermerge - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-systemdata - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-tablecompare - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-tableexists - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-tableinput - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-tableoutput - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-terafast - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-textfile - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-tika - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-tokenreplacement - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-uniquerows - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-uniquerowsbyhashset - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-update - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-validator - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-valuemapper - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-verticabulkloader - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-webserviceavailable - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-webservices - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-workflowexecutor - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-writetolog - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-xml - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-yamlinput - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-transform-zipfile - ${project.version} - zip - - - * - * - - - - - - org.apache.hop - hop-valuetypes-json - ${project.version} - zip - - - * - * - - - - - - diff --git a/assemblies/plugins/pom.xml b/assemblies/plugins/pom.xml index dc22c469c14..85fa3bf4a78 100644 --- a/assemblies/plugins/pom.xml +++ b/assemblies/plugins/pom.xml @@ -27,11 +27,1598 @@ hop-assemblies-plugins pom - Hop Assemblies Plugins - - dist - - + + + org.apache.hop + hop-action-abort + ${project.version} + zip + + + org.apache.hop + hop-action-addresultfilenames + ${project.version} + zip + + + org.apache.hop + hop-action-as400command + ${project.version} + zip + + + org.apache.hop + hop-action-checkdbconnection + ${project.version} + zip + + + org.apache.hop + hop-action-checkfilelocked + ${project.version} + zip + + + org.apache.hop + hop-action-columnsexist + ${project.version} + zip + + + org.apache.hop + hop-action-copyfiles + ${project.version} + zip + + + org.apache.hop + hop-action-copymoveresultfilenames + ${project.version} + zip + + + org.apache.hop + hop-action-createfile + ${project.version} + zip + + + org.apache.hop + hop-action-createfolder + ${project.version} + zip + + + org.apache.hop + hop-action-delay + ${project.version} + zip + + + org.apache.hop + hop-action-deletefile + ${project.version} + zip + + + org.apache.hop + hop-action-deletefiles + ${project.version} + zip + + + org.apache.hop + hop-action-deletefolders + ${project.version} + zip + + + org.apache.hop + hop-action-deleteresultfilenames + ${project.version} + zip + + + org.apache.hop + hop-action-dostounix + ${project.version} + zip + + + org.apache.hop + hop-action-eval + ${project.version} + zip + + + org.apache.hop + hop-action-evalfilesmetrics + ${project.version} + zip + + + org.apache.hop + hop-action-evaluatetablecontent + ${project.version} + zip + + + org.apache.hop + hop-action-filecompare + ${project.version} + zip + + + org.apache.hop + hop-action-fileexists + ${project.version} + zip + + + org.apache.hop + hop-action-filesexist + ${project.version} + zip + + + org.apache.hop + hop-action-folderisempty + ${project.version} + zip + + + org.apache.hop + hop-action-folderscompare + ${project.version} + zip + + + org.apache.hop + hop-action-ftp + ${project.version} + zip + + + org.apache.hop + hop-action-getpop + ${project.version} + zip + + + org.apache.hop + hop-action-http + ${project.version} + zip + + + org.apache.hop + hop-action-mail + ${project.version} + zip + + + org.apache.hop + hop-action-mailvalidator + ${project.version} + zip + + + org.apache.hop + hop-action-movefiles + ${project.version} + zip + + + org.apache.hop + hop-action-msgboxinfo + ${project.version} + zip + + + org.apache.hop + hop-action-mssqlbulkload + ${project.version} + zip + + + org.apache.hop + hop-action-mysqlbulkfile + ${project.version} + zip + + + org.apache.hop + hop-action-mysqlbulkload + ${project.version} + zip + + + org.apache.hop + hop-action-pgpfiles + ${project.version} + zip + + + org.apache.hop + hop-action-ping + ${project.version} + zip + + + org.apache.hop + hop-action-pipeline + ${project.version} + zip + + + org.apache.hop + hop-action-repeat + ${project.version} + zip + + + org.apache.hop + hop-action-sendnagiospassivecheck + ${project.version} + zip + + + org.apache.hop + hop-action-setvariables + ${project.version} + zip + + + org.apache.hop + hop-action-shell + ${project.version} + zip + + + org.apache.hop + hop-action-simpleeval + ${project.version} + zip + + + org.apache.hop + hop-action-snmptrap + ${project.version} + zip + + + org.apache.hop + hop-action-snowflake + ${project.version} + zip + + + org.apache.hop + hop-action-sql + ${project.version} + zip + + + org.apache.hop + hop-action-success + ${project.version} + zip + + + org.apache.hop + hop-action-tableexists + ${project.version} + zip + + + org.apache.hop + hop-action-telnet + ${project.version} + zip + + + org.apache.hop + hop-action-truncatetables + ${project.version} + zip + + + org.apache.hop + hop-action-unzip + ${project.version} + zip + + + org.apache.hop + hop-action-waitforfile + ${project.version} + zip + + + org.apache.hop + hop-action-waitforsql + ${project.version} + zip + + + org.apache.hop + hop-action-webserviceavailable + ${project.version} + zip + + + org.apache.hop + hop-action-workflow + ${project.version} + zip + + + org.apache.hop + hop-action-writetofile + ${project.version} + zip + + + org.apache.hop + hop-action-writetolog + ${project.version} + zip + + + org.apache.hop + hop-action-xml + ${project.version} + zip + + + org.apache.hop + hop-action-zipfile + ${project.version} + zip + + + org.apache.hop + hop-databases-access + ${project.version} + zip + + + org.apache.hop + hop-databases-as400 + ${project.version} + zip + + + org.apache.hop + hop-databases-cache + ${project.version} + zip + + + org.apache.hop + hop-databases-clickhouse + ${project.version} + zip + + + org.apache.hop + hop-databases-cockroachdb + ${project.version} + zip + + + org.apache.hop + hop-databases-cratedb + ${project.version} + zip + + + org.apache.hop + hop-databases-db2 + ${project.version} + zip + + + org.apache.hop + hop-databases-derby + ${project.version} + zip + + + org.apache.hop + hop-databases-doris + ${project.version} + zip + + + org.apache.hop + hop-databases-duckdb + ${project.version} + zip + + + org.apache.hop + hop-databases-exasol4 + ${project.version} + zip + + + org.apache.hop + hop-databases-firebird + ${project.version} + zip + + + org.apache.hop + hop-databases-generic + ${project.version} + zip + + + org.apache.hop + hop-databases-googlebigquery + ${project.version} + zip + + + org.apache.hop + hop-databases-greenplum + ${project.version} + zip + + + org.apache.hop + hop-databases-h2 + ${project.version} + zip + + + org.apache.hop + hop-databases-hive + ${project.version} + zip + + + org.apache.hop + hop-databases-hypersonic + ${project.version} + zip + + + org.apache.hop + hop-databases-infobright + ${project.version} + zip + + + org.apache.hop + hop-databases-informix + ${project.version} + zip + + + org.apache.hop + hop-databases-ingres + ${project.version} + zip + + + org.apache.hop + hop-databases-interbase + ${project.version} + zip + + + org.apache.hop + hop-databases-iris + ${project.version} + zip + + + org.apache.hop + hop-databases-kingbasees + ${project.version} + zip + + + org.apache.hop + hop-databases-mariadb + ${project.version} + zip + + + org.apache.hop + hop-databases-monetdb + ${project.version} + zip + + + org.apache.hop + hop-databases-mssql + ${project.version} + zip + + + org.apache.hop + hop-databases-mssqlnative + ${project.version} + zip + + + org.apache.hop + hop-databases-mysql + ${project.version} + zip + + + org.apache.hop + hop-databases-netezza + ${project.version} + zip + + + org.apache.hop + hop-databases-oracle + ${project.version} + zip + + + org.apache.hop + hop-databases-oraclerdb + ${project.version} + zip + + + org.apache.hop + hop-databases-postgresql + ${project.version} + zip + + + org.apache.hop + hop-databases-redshift + ${project.version} + zip + + + org.apache.hop + hop-databases-sapdb + ${project.version} + zip + + + org.apache.hop + hop-databases-snowflake + ${project.version} + zip + + + org.apache.hop + hop-databases-sqlbase + ${project.version} + zip + + + org.apache.hop + hop-databases-sqlite + ${project.version} + zip + + + org.apache.hop + hop-databases-sybase + ${project.version} + zip + + + org.apache.hop + hop-databases-sybaseiq + ${project.version} + zip + + + org.apache.hop + hop-databases-teradata + ${project.version} + zip + + + org.apache.hop + hop-databases-universe + ${project.version} + zip + + + org.apache.hop + hop-databases-vectorwise + ${project.version} + zip + + + org.apache.hop + hop-databases-vertica + ${project.version} + zip + + + org.apache.hop + hop-misc-async + ${project.version} + zip + + + org.apache.hop + hop-misc-debug + ${project.version} + zip + + + org.apache.hop + hop-misc-git + ${project.version} + zip + + + org.apache.hop + hop-misc-import + ${project.version} + zip + + + org.apache.hop + hop-misc-passwords + ${project.version} + zip + + + org.apache.hop + hop-misc-projects + ${project.version} + zip + + + org.apache.hop + hop-misc-reflection + ${project.version} + zip + + + org.apache.hop + hop-misc-static-schema + ${project.version} + zip + + + org.apache.hop + hop-misc-testing + ${project.version} + zip + + + org.apache.hop + hop-tech-avro + ${project.version} + zip + + + org.apache.hop + hop-tech-aws + ${project.version} + zip + + + org.apache.hop + hop-tech-azure + ${project.version} + zip + + + org.apache.hop + hop-tech-cassandra + ${project.version} + zip + + + org.apache.hop + hop-tech-dropbox + ${project.version} + zip + + + org.apache.hop + hop-tech-google + ${project.version} + zip + + + org.apache.hop + hop-tech-neo4j + ${project.version} + zip + + + org.apache.hop + hop-tech-parquet + ${project.version} + zip + + + org.apache.hop + hop-transform-abort + ${project.version} + zip + + + org.apache.hop + hop-transform-addsequence + ${project.version} + zip + + + org.apache.hop + hop-transform-analyticquery + ${project.version} + zip + + + org.apache.hop + hop-transform-append + ${project.version} + zip + + + org.apache.hop + hop-transform-blockingtransform + ${project.version} + zip + + + org.apache.hop + hop-transform-blockuntiltransformsfinish + ${project.version} + zip + + + org.apache.hop + hop-transform-calculator + ${project.version} + zip + + + org.apache.hop + hop-transform-changefileencoding + ${project.version} + zip + + + org.apache.hop + hop-transform-checksum + ${project.version} + zip + + + org.apache.hop + hop-transform-clonerow + ${project.version} + zip + + + org.apache.hop + hop-transform-closure + ${project.version} + zip + + + org.apache.hop + hop-transform-coalesce + ${project.version} + zip + + + org.apache.hop + hop-transform-columnexists + ${project.version} + zip + + + org.apache.hop + hop-transform-combinationlookup + ${project.version} + zip + + + org.apache.hop + hop-transform-concatfields + ${project.version} + zip + + + org.apache.hop + hop-transform-constant + ${project.version} + zip + + + org.apache.hop + hop-transform-cratedbbulkloader + ${project.version} + zip + + + org.apache.hop + hop-transform-creditcardvalidator + ${project.version} + zip + + + org.apache.hop + hop-transform-cubeinput + ${project.version} + zip + + + org.apache.hop + hop-transform-cubeoutput + ${project.version} + zip + + + org.apache.hop + hop-transform-databasejoin + ${project.version} + zip + + + org.apache.hop + hop-transform-databaselookup + ${project.version} + zip + + + org.apache.hop + hop-transform-datagrid + ${project.version} + zip + + + org.apache.hop + hop-transform-dbproc + ${project.version} + zip + + + org.apache.hop + hop-transform-delay + ${project.version} + zip + + + org.apache.hop + hop-transform-delete + ${project.version} + zip + + + org.apache.hop + hop-transform-denormaliser + ${project.version} + zip + + + org.apache.hop + hop-transform-detectemptystream + ${project.version} + zip + + + org.apache.hop + hop-transform-detectlastrow + ${project.version} + zip + + + org.apache.hop + hop-transform-dimensionlookup + ${project.version} + zip + + + org.apache.hop + hop-transform-dorisbulkloader + ${project.version} + zip + + + org.apache.hop + hop-transform-drools + ${project.version} + zip + + + org.apache.hop + hop-transform-dynamicsqlrow + ${project.version} + zip + + + org.apache.hop + hop-transform-edi2xml + ${project.version} + zip + + + org.apache.hop + hop-transform-excel + ${project.version} + zip + + + org.apache.hop + hop-transform-execinfo + ${project.version} + zip + + + org.apache.hop + hop-transform-execprocess + ${project.version} + zip + + + org.apache.hop + hop-transform-execsqlrow + ${project.version} + zip + + + org.apache.hop + hop-transform-fake + ${project.version} + zip + + + org.apache.hop + hop-transform-fieldschangesequence + ${project.version} + zip + + + org.apache.hop + hop-transform-fieldsplitter + ${project.version} + zip + + + org.apache.hop + hop-transform-fileexists + ${project.version} + zip + + + org.apache.hop + hop-transform-filelocked + ${project.version} + zip + + + org.apache.hop + hop-transform-filemetadata + ${project.version} + zip + + + org.apache.hop + hop-transform-filesfromresult + ${project.version} + zip + + + org.apache.hop + hop-transform-filestoresult + ${project.version} + zip + + + org.apache.hop + hop-transform-filterrows + ${project.version} + zip + + + org.apache.hop + hop-transform-flattener + ${project.version} + zip + + + org.apache.hop + hop-transform-formula + ${project.version} + zip + + + org.apache.hop + hop-transform-fuzzymatch + ${project.version} + zip + + + org.apache.hop + hop-transform-getfilenames + ${project.version} + zip + + + org.apache.hop + hop-transform-getfilesrowcount + ${project.version} + zip + + + org.apache.hop + hop-transform-getsubfolders + ${project.version} + zip + + + org.apache.hop + hop-transform-gettablenames + ${project.version} + zip + + + org.apache.hop + hop-transform-getvariable + ${project.version} + zip + + + org.apache.hop + hop-transform-groupby + ${project.version} + zip + + + org.apache.hop + hop-transform-http + ${project.version} + zip + + + org.apache.hop + hop-transform-httppost + ${project.version} + zip + + + org.apache.hop + hop-transform-ifnull + ${project.version} + zip + + + org.apache.hop + hop-transform-insertupdate + ${project.version} + zip + + + org.apache.hop + hop-transform-janino + ${project.version} + zip + + + org.apache.hop + hop-transform-javascript + ${project.version} + zip + + + org.apache.hop + hop-transform-jdbc-metadata + ${project.version} + zip + + + org.apache.hop + hop-transform-joinrows + ${project.version} + zip + + + org.apache.hop + hop-transform-json + ${project.version} + zip + + + org.apache.hop + hop-transform-kafka + ${project.version} + zip + + + org.apache.hop + hop-transform-ldap + ${project.version} + zip + + + org.apache.hop + hop-transform-loadfileinput + ${project.version} + zip + + + org.apache.hop + hop-transform-mail + ${project.version} + zip + + + org.apache.hop + hop-transform-mailinput + ${project.version} + zip + + + org.apache.hop + hop-transform-mapping + ${project.version} + zip + + + org.apache.hop + hop-transform-memgroupby + ${project.version} + zip + + + org.apache.hop + hop-transform-mergejoin + ${project.version} + zip + + + org.apache.hop + hop-transform-mergerows + ${project.version} + zip + + + org.apache.hop + hop-transform-metadata + ${project.version} + zip + + + org.apache.hop + hop-transform-metainject + ${project.version} + zip + + + org.apache.hop + hop-transform-metastructure + ${project.version} + zip + + + org.apache.hop + hop-transform-monetdbbulkloader + ${project.version} + zip + + + org.apache.hop + hop-transform-mongodb + ${project.version} + zip + + + org.apache.hop + hop-transform-multimerge + ${project.version} + zip + + + org.apache.hop + hop-transform-normaliser + ${project.version} + zip + + + org.apache.hop + hop-transform-nullif + ${project.version} + zip + + + org.apache.hop + hop-transform-numberrange + ${project.version} + zip + + + org.apache.hop + hop-transform-orabulkloader + ${project.version} + zip + + + org.apache.hop + hop-transform-pgbulkloader + ${project.version} + zip + + + org.apache.hop + hop-transform-pgp + ${project.version} + zip + + + org.apache.hop + hop-transform-pipelineexecutor + ${project.version} + zip + + + org.apache.hop + hop-transform-processfiles + ${project.version} + zip + + + org.apache.hop + hop-transform-propertyinput + ${project.version} + zip + + + org.apache.hop + hop-transform-propertyoutput + ${project.version} + zip + + + org.apache.hop + hop-transform-randomvalue + ${project.version} + zip + + + org.apache.hop + hop-transform-regexeval + ${project.version} + zip + + + org.apache.hop + hop-transform-replacestring + ${project.version} + zip + + + org.apache.hop + hop-transform-reservoirsampling + ${project.version} + zip + + + org.apache.hop + hop-transform-rest + ${project.version} + zip + + + org.apache.hop + hop-transform-rowgenerator + ${project.version} + zip + + + org.apache.hop + hop-transform-rowsfromresult + ${project.version} + zip + + + org.apache.hop + hop-transform-rowstoresult + ${project.version} + zip + + + org.apache.hop + hop-transform-salesforce + ${project.version} + zip + + + org.apache.hop + hop-transform-samplerows + ${project.version} + zip + + + org.apache.hop + hop-transform-sasinput + ${project.version} + zip + + + org.apache.hop + hop-transform-schemamapping + ${project.version} + zip + + + org.apache.hop + hop-transform-script + ${project.version} + zip + + + org.apache.hop + hop-transform-selectvalues + ${project.version} + zip + + + org.apache.hop + hop-transform-serverstatus + ${project.version} + zip + + + org.apache.hop + hop-transform-setvalueconstant + ${project.version} + zip + + + org.apache.hop + hop-transform-setvaluefield + ${project.version} + zip + + + org.apache.hop + hop-transform-setvariable + ${project.version} + zip + + + org.apache.hop + hop-transform-snowflake-bulkloader + ${project.version} + zip + + + org.apache.hop + hop-transform-sort + ${project.version} + zip + + + org.apache.hop + hop-transform-sortedmerge + ${project.version} + zip + + + org.apache.hop + hop-transform-splitfieldtorows + ${project.version} + zip + + + org.apache.hop + hop-transform-splunk + ${project.version} + zip + + + org.apache.hop + hop-transform-sql + ${project.version} + zip + + + org.apache.hop + hop-transform-sqlfileoutput + ${project.version} + zip + + + org.apache.hop + hop-transform-ssh + ${project.version} + zip + + + org.apache.hop + hop-transform-standardizephonenumber + ${project.version} + zip + + + org.apache.hop + hop-transform-streamlookup + ${project.version} + zip + + + org.apache.hop + hop-transform-streamschemamerge + ${project.version} + zip + + + org.apache.hop + hop-transform-stringcut + ${project.version} + zip + + + org.apache.hop + hop-transform-stringoperations + ${project.version} + zip + + + org.apache.hop + hop-transform-switchcase + ${project.version} + zip + + + org.apache.hop + hop-transform-synchronizeaftermerge + ${project.version} + zip + + + org.apache.hop + hop-transform-systemdata + ${project.version} + zip + + + org.apache.hop + hop-transform-tablecompare + ${project.version} + zip + + + org.apache.hop + hop-transform-tableexists + ${project.version} + zip + + + org.apache.hop + hop-transform-tableinput + ${project.version} + zip + + + org.apache.hop + hop-transform-tableoutput + ${project.version} + zip + + + org.apache.hop + hop-transform-terafast + ${project.version} + zip + + + org.apache.hop + hop-transform-textfile + ${project.version} + zip + + + org.apache.hop + hop-transform-tika + ${project.version} + zip + + + org.apache.hop + hop-transform-tokenreplacement + ${project.version} + zip + + + org.apache.hop + hop-transform-uniquerows + ${project.version} + zip + + + org.apache.hop + hop-transform-uniquerowsbyhashset + ${project.version} + zip + + + org.apache.hop + hop-transform-update + ${project.version} + zip + + + org.apache.hop + hop-transform-validator + ${project.version} + zip + + + org.apache.hop + hop-transform-valuemapper + ${project.version} + zip + + + org.apache.hop + hop-transform-verticabulkloader + ${project.version} + zip + + + org.apache.hop + hop-transform-webserviceavailable + ${project.version} + zip + + + org.apache.hop + hop-transform-webservices + ${project.version} + zip + + + org.apache.hop + hop-transform-workflowexecutor + ${project.version} + zip + + + org.apache.hop + hop-transform-writetolog + ${project.version} + zip + + + org.apache.hop + hop-transform-xml + ${project.version} + zip + + + org.apache.hop + hop-transform-yamlinput + ${project.version} + zip + + + org.apache.hop + hop-transform-zipfile + ${project.version} + zip + + + org.apache.hop + hop-valuetypes-json + ${project.version} + zip + + diff --git a/assemblies/plugins/dist/src/assembly/assembly.xml b/assemblies/plugins/src/assembly/assembly.xml similarity index 98% rename from assemblies/plugins/dist/src/assembly/assembly.xml rename to assemblies/plugins/src/assembly/assembly.xml index 75778719812..ed458154b5b 100644 --- a/assemblies/plugins/dist/src/assembly/assembly.xml +++ b/assemblies/plugins/src/assembly/assembly.xml @@ -24,7 +24,7 @@ zip true - plugins + . diff --git a/assemblies/pom.xml b/assemblies/pom.xml index aa2222dd227..4b3e3f4be61 100644 --- a/assemblies/pom.xml +++ b/assemblies/pom.xml @@ -28,18 +28,12 @@ hop-assemblies 2.10.0-SNAPSHOT pom - Hop Assemblies client - core debug - lib - lib-beam - lib-jdbc plugins - samples static web diff --git a/assemblies/samples/pom.xml b/assemblies/samples/pom.xml deleted file mode 100644 index f28d022f230..00000000000 --- a/assemblies/samples/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - 4.0.0 - - - org.apache.hop - hop-assemblies - 2.10.0-SNAPSHOT - - - hop-assemblies-samples - pom - - Hop Assemblies Samples - - - - org.apache.hop - hop-plugins - 2.10.0-SNAPSHOT - pom - - - diff --git a/assemblies/samples/src/assembly/assembly.xml b/assemblies/samples/src/assembly/assembly.xml deleted file mode 100644 index cf89a8c5bb2..00000000000 --- a/assemblies/samples/src/assembly/assembly.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - samples - - zip - - - false - - - - ${project.basedir}/../../plugins/target/hop-plugins-${project.version}/src/main/samples/ - - config/projects/samples/ - - - - diff --git a/assemblies/web/pom.xml b/assemblies/web/pom.xml index 316edcd5596..a9d8ada865f 100644 --- a/assemblies/web/pom.xml +++ b/assemblies/web/pom.xml @@ -26,7 +26,6 @@ hop-assemblies-web pom - Hop Assemblies Web @@ -34,77 +33,11 @@ - - org.apache.hop - hop-assemblies-libs - ${project.version} - zip - - - * - * - - - - - org.apache.hop - hop-assemblies-libs-beam - ${project.version} - zip - - - * - * - - - - - org.apache.hop - hop-assemblies-plugins-dist - ${project.version} - zip - - - * - * - - - - - org.apache.hop - hop-assemblies-samples - ${project.version} - zip - - - * - * - - - org.apache.hop hop-assemblies-static ${project.version} zip - - - * - * - - - - - org.apache.hop - hop-engine-beam - 2.10.0-SNAPSHOT - jar - - - * - * - - diff --git a/assemblies/web/src/assembly/assembly.xml b/assemblies/web/src/assembly/assembly.xml index 1e59110abbb..b28d1e24f53 100644 --- a/assemblies/web/src/assembly/assembly.xml +++ b/assemblies/web/src/assembly/assembly.xml @@ -56,36 +56,6 @@ - - - - org.apache.hop:hop-assemblies-libs:zip - - true - WEB-INF/lib - false - false - - - - - org.apache.hop:hop-assemblies-libs-beam:zip - - true - WEB-INF/lib - false - false - - - - - org.apache.hop:hop-engine-beam - - WEB-INF/lib - false - false - - @@ -113,15 +83,5 @@ false false - - - - org.apache.hop:hop-assemblies-samples:zip - - true - . - false - false - diff --git a/core/pom.xml b/core/pom.xml index 3323b018425..754edf1a38d 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -25,27 +25,25 @@ hop-core - 2.10.0-SNAPSHOT jar - Hop Core - 4.4 - 1.4 - 2.14.0 - 2.6 - 3.9.0 - 1.5.7 - 2.9.0 - 3.28.0-GA - 1.1.1 - 4.3.2.RELEASE - - 1.3.04 - 1.5 + 1.17 + + + + org.apache.hop + hop-libs + ${project.version} + pom + import + + + + com.fasterxml.jackson.core @@ -59,23 +57,10 @@ com.fasterxml.jackson.dataformat jackson-dataformat-avro - ${jackson.version} com.google.code.gson gson - ${gson.version} - - - * - * - - - - - com.google.guava - failureaccess - 1.0.1 com.google.guava @@ -84,18 +69,6 @@ com.googlecode.json-simple json-simple - ${json-simple.version} - - - * - * - - - - - com.jcraft - jsch - 0.1.55 * @@ -103,45 +76,13 @@ - - commons-beanutils - commons-beanutils - commons-codec commons-codec - - commons-dbcp - commons-dbcp - ${commons-dbcp.version} - - - * - * - - - - - commons-httpclient - commons-httpclient - 3.1 - - - commons-io - commons-io - ${commons-io.version} - - - * - * - - - commons-lang commons-lang - ${commons-lang.version} * @@ -153,65 +94,25 @@ commons-logging commons-logging - - commons-net - commons-net - ${commons-net.version} - - - * - * - - - - - commons-pool - commons-pool - ${commons-pool.version} - - - * - * - - - io.smallrye jandex - ${jandex.version} - - ognl - ognl - ${ognl.version} - - - * - * - - - - - org.apache.avro avro - ${avro.version} org.apache.commons commons-collections4 - ${commons-collections4.version} - org.apache.commons commons-compress org.apache.commons - commons-lang3 - ${commons-lang3.version} + commons-vfs2 * @@ -219,15 +120,9 @@ - - org.apache.commons - commons-vfs2 - ${commons-vfs2.version} - org.apache.httpcomponents httpclient - ${httpclient.version} * @@ -238,7 +133,14 @@ org.apache.httpcomponents httpcore - ${httpccore.version} + + + org.apache.httpcomponents.client5 + httpclient5 + + + org.apache.logging.log4j + log4j-core org.apache.xmlgraphics @@ -427,33 +329,9 @@ - - org.connectbot - sshlib - ${sshlib.version} - compile - - - * - * - - - org.eclipse.jetty jetty-util - ${jetty.version} - - - * - * - - - - - org.javassist - javassist - ${javassist.version} * @@ -468,73 +346,38 @@ org.slf4j slf4j-api - ${slf4j.version} compile org.slf4j slf4j-nop - ${slf4j.version} compile - - xerces - xercesImpl - ${xerces.version} - - - * - * - - - xml-apis xml-apis-ext - ${xml-apis-ext.version} - - - * - * - - com.fasterxml.jackson.dataformat jackson-dataformat-xml - 2.13.5 test - com.fasterxml.woodstox - woodstox-core - ${woodstox.version} + org.javassist + javassist test - javax.xml.stream - stax-api + * + * - - org.hamcrest - java-hamcrest - test - - - org.springframework - spring-test - ${spring.framework.version} - test - xmlunit xmlunit - ${xmlunit.version} test - diff --git a/assemblies/lib/src/assembly/assembly.xml b/core/src/assembly/assembly.xml similarity index 70% rename from assemblies/lib/src/assembly/assembly.xml rename to core/src/assembly/assembly.xml index 8cb87f0fc27..bd345f08955 100644 --- a/assemblies/lib/src/assembly/assembly.xml +++ b/core/src/assembly/assembly.xml @@ -17,18 +17,16 @@ --> - libs + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd"> + hop-core zip - true - . - - - ${assembly.dir} + lib/core + + . - - + + \ No newline at end of file diff --git a/core/src/main/java/org/apache/hop/core/vfs/HopVfs.java b/core/src/main/java/org/apache/hop/core/vfs/HopVfs.java index 0ab620a6418..3332b9e2acd 100644 --- a/core/src/main/java/org/apache/hop/core/vfs/HopVfs.java +++ b/core/src/main/java/org/apache/hop/core/vfs/HopVfs.java @@ -136,8 +136,8 @@ private static DefaultFileSystemManager createFileSystemManager() throws HopExce fsm.addProvider("zip", new org.apache.commons.vfs2.provider.zip.ZipFileProvider()); fsm.addProvider("gz", new org.apache.commons.vfs2.provider.gzip.GzipFileProvider()); fsm.addProvider("jar", new org.apache.commons.vfs2.provider.jar.JarFileProvider()); - fsm.addProvider("http", new org.apache.commons.vfs2.provider.http.HttpFileProvider()); - fsm.addProvider("https", new org.apache.commons.vfs2.provider.https.HttpsFileProvider()); + fsm.addProvider("http", new org.apache.commons.vfs2.provider.http5.Http5FileProvider()); + fsm.addProvider("https", new org.apache.commons.vfs2.provider.http5s.Http5sFileProvider()); fsm.addProvider("ftp", new org.apache.commons.vfs2.provider.ftp.FtpFileProvider()); fsm.addProvider("ftps", new org.apache.commons.vfs2.provider.ftps.FtpsFileProvider()); fsm.addProvider("sftp", new org.apache.commons.vfs2.provider.sftp.SftpFileProvider()); diff --git a/docker/Dockerfile.web b/docker/Dockerfile.web index ee638798974..86157a36250 100644 --- a/docker/Dockerfile.web +++ b/docker/Dockerfile.web @@ -69,8 +69,10 @@ RUN rm -rf webapps/* \ # Copy resources COPY ./assemblies/web/target/webapp/ "${CATALINA_HOME}"/webapps/ROOT/ -COPY ./assemblies/plugins/dist/target/plugins "${CATALINA_HOME}"/plugins -COPY ./assemblies/lib-jdbc/target/jdbc-drivers/ "${CATALINA_HOME}"/jdbc-drivers +COPY ./assemblies/client/target/hop/lib/core "${CATALINA_HOME}"/webapps/ROOT/WEB-INF/lib +COPY ./assemblies/client/target/hop/lib/beam "${CATALINA_HOME}"/webapps/ROOT/WEB-INF/lib +COPY ./assemblies/client/target/hop/plugins "${CATALINA_HOME}"/plugins +COPY ./assemblies/client/target/hop/lib/jdbc/ "${CATALINA_HOME}"/jdbc-drivers COPY --chown=hop ./docker/resources/run-web.sh /tmp/ # Fix hop-config.json diff --git a/docker/integration-tests/Dockerfile.unit-tests b/docker/integration-tests/Dockerfile.unit-tests index bcf7efed652..7f568f780ab 100644 --- a/docker/integration-tests/Dockerfile.unit-tests +++ b/docker/integration-tests/Dockerfile.unit-tests @@ -96,5 +96,3 @@ ENV GOOGLE_APPLICATION_CREDENTIALS="/tmp/google-key-apache-hop-it.json" WORKDIR /home/${JENKINS_USER} # CMD ["/bin/bash"] ENTRYPOINT [] - - diff --git a/docs/hop-dev-manual/modules/ROOT/pages/apache-release/promoting-a-release.adoc b/docs/hop-dev-manual/modules/ROOT/pages/apache-release/promoting-a-release.adoc index fbe288d49dd..66f44d71b6a 100644 --- a/docs/hop-dev-manual/modules/ROOT/pages/apache-release/promoting-a-release.adoc +++ b/docs/hop-dev-manual/modules/ROOT/pages/apache-release/promoting-a-release.adoc @@ -65,7 +65,7 @@ first take a copy of the source code release and build the software ---- unzip ./assemblies/client/target/hop-client-*.zip -d ./assemblies/client/target/ unzip ./assemblies/web/target/hop.war -d ./assemblies/web/target/webapp -unzip ./assemblies/plugins/dist/target/hop-assemblies-*.zip -d ./assemblies/plugins/dist/target/ +unzip ./assemblies/plugins/target/hop-assemblies-*.zip -d ./assemblies/plugins/target/ unzip -j ./assemblies/lib-jdbc/target/hop-assemblies-*.zip -d ./assemblies/lib-jdbc/target/jdbc-drivers # Create image (make sure to add correct version) diff --git a/engine-beam/pom.xml b/engine-beam/pom.xml index c6480534382..4775982299f 100644 --- a/engine-beam/pom.xml +++ b/engine-beam/pom.xml @@ -26,217 +26,70 @@ hop-engine-beam jar + Hop Engine Beam - - 2.5.32 - 1.1.1 - 3.7.0-M11 - 1.3.1 - + + + + org.apache.beam + beam-sdks-java-google-cloud-platform-bom + ${apache-beam.version} + pom + import + + + org.apache.hop + hop-libs + ${project.version} + pom + import + + + - com.esotericsoftware - minlog - ${minlog.version} - - - com.github.luben - zstd-jni - 1.5.2-2 - - - com.google.api.grpc - proto-google-common-protos - 2.14.0 - - - com.google.code.gson - gson - ${gson.version} - - - com.google.protobuf - protobuf-java - ${protobuf.version} - - - com.google.protobuf - protobuf-java-util - ${protobuf.version} - - - com.google.protobuf - protobuf-javalite - ${protobuf.version} - - - com.googlecode.json-simple - json-simple - ${json-simple.version} + org.apache.beam + beam-sdks-java-core - * + com.fasterxml.jackson.core * + + com.google.errorprone + error_prone_annotations + + + org.apache.beam + beam-sdks-java-transform-service-launcher + + + org.checkerframework + checker-qual + - - com.ning - compress-lzf - 1.1 - - - - com.typesafe.akka - akka-protobuf_2.11 - ${akka.version} - - - com.typesafe.akka - akka-slf4j_2.11 - ${akka.version} - - - commons-digester - commons-digester - 1.8.1 - - - io.dropwizard.metrics - metrics-core - ${metrics.version} - - - io.dropwizard.metrics - metrics-jvm - ${metrics.version} - - - io.dropwizard.metrics - metrics-logback - ${metrics.version} - - - io.grpc - grpc-alts - ${grpc.version} - - - io.grpc - grpc-api - ${grpc.version} - - - io.grpc - grpc-auth - ${grpc.version} - - - io.grpc - grpc-context - ${grpc.version} - - - io.grpc - grpc-core - ${grpc.version} - - - io.grpc - grpc-grpclb - ${grpc.version} - - - io.grpc - grpc-netty - ${grpc.version} - - - io.grpc - grpc-netty-shaded - ${grpc.version} - - - io.grpc - grpc-protobuf - ${grpc.version} - - - io.grpc - grpc-protobuf-lite - ${grpc.version} - - - io.grpc - grpc-stub - ${grpc.version} - - - joda-time - joda-time - ${joda-time.version} - - - org.apache.beam - beam-sdks-java-core - ${apache-beam.version} - - - org.apache.beam - beam-vendor-bytebuddy-1_11_0 - 0.1 - - - org.apache.curator - curator-client - ${curator.version} - - - org.apache.curator - curator-framework - ${curator.version} - - - org.apache.curator - curator-recipes - ${curator.version} - - org.apache.hop hop-core - 2.10.0-SNAPSHOT + ${project.version} + provided org.apache.hop hop-engine - 2.10.0-SNAPSHOT + ${project.version} + provided - org.apache.logging.log4j - log4j-core - 2.19.0 - - - org.json4s - json4s-ast_2.12 - ${json4s.version} - - - org.json4s - json4s-core_2.12 - ${json4s.version} - - - org.json4s - json4s-jackson_2.12 - ${json4s.version} - - - org.json4s - json4s-scalap_2.12 - ${json4s.version} + org.apache.hop + hop-core + ${project.version} + tests + test-jar + test + diff --git a/assemblies/lib-beam/src/assembly/assembly.xml b/engine-beam/src/assembly/assembly.xml similarity index 70% rename from assemblies/lib-beam/src/assembly/assembly.xml rename to engine-beam/src/assembly/assembly.xml index 73298e8f93f..0f58e2063f2 100644 --- a/assemblies/lib-beam/src/assembly/assembly.xml +++ b/engine-beam/src/assembly/assembly.xml @@ -17,18 +17,16 @@ --> - libs-beam + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd"> + hop-engine-beam zip - true - . - - - ${assembly.dir} + lib/core + + . - - + + \ No newline at end of file diff --git a/engine/pom.xml b/engine/pom.xml index aad3fa7cb28..aca4dc6aca7 100644 --- a/engine/pom.xml +++ b/engine/pom.xml @@ -25,311 +25,46 @@ hop-engine - 2.10.0-SNAPSHOT jar - Hop Engine - 1.2 - 4.4 - 1.7 - 2.9.0 - 1.3.2 - 1.1 - 2.1.6 - 2.38 - 1.1.1 - 1.2.0 - 1.2.0 - 6.0.0 - 4.6.3 + 1.9.0 + 4.0.2 + 2.43 + 1.1.10.5 + + + + org.apache.hop + hop-libs + ${project.version} + pom + import + + + + com.fasterxml.jackson.core jackson-annotations - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-databind - - - com.google.guava - guava - - - com.googlecode.json-simple - json-simple - ${json-simple.version} - - - * - * - - - - - - - commons-beanutils - commons-beanutils - - - commons-cli - commons-cli - ${commons-cli.version} - - - * - * - - - - - commons-lang - commons-lang - 2.6 - - - commons-logging - commons-logging - commons-validator commons-validator ${commons-validator.version} - - - * - * - - info.picocli picocli - ${picocli-version} - - - javax.annotation - javax.annotation-api - ${javax.annotation-api.version} - - - org.apache.commons - commons-collections4 - ${commons-collections4.version} - - - org.apache.commons - commons-math3 - 3.6.1 - - - org.apache.commons - commons-vfs2 - ${commons-vfs2.version} - - - - org.apache.hop - hop-core - ${project.version} - - - - org.apache.httpcomponents - httpclient - ${httpclient.version} - org.apache.xmlgraphics - batik-anim - ${batik.version} - - - * - * - - - - - org.apache.xmlgraphics - batik-awt-util - ${batik.version} - - - * - * - - - - - - - org.apache.xmlgraphics - batik-bridge - ${batik.version} - - - * - * - - - - - org.apache.xmlgraphics - batik-codec - ${batik.version} - - - * - * - - - - - org.apache.xmlgraphics - batik-constants - ${batik.version} - - - * - * - - - - - org.apache.xmlgraphics - batik-css - ${batik.version} - - - * - * - - - - - org.apache.xmlgraphics - batik-dom - ${batik.version} - - - * - * - - - - - org.apache.xmlgraphics - batik-ext - ${batik.version} - - - * - * - - - - - org.apache.xmlgraphics - batik-gvt - ${batik.version} - - - * - * - - - - - org.apache.xmlgraphics - batik-i18n - ${batik.version} - - - * - * - - - - - org.apache.xmlgraphics - batik-parser - ${batik.version} - - - * - * - - - - - org.apache.xmlgraphics - batik-script - ${batik.version} - - - * - * - - - - - org.apache.xmlgraphics - batik-svg-dom - ${batik.version} - - - * - * - - - - - org.apache.xmlgraphics - batik-svggen - ${batik.version} - - - * - * - - - - - org.apache.xmlgraphics - batik-transcoder - ${batik.version} - - - * - * - - - - - org.apache.xmlgraphics - batik-util - ${batik.version} - - - * - * - - - - - org.apache.xmlgraphics - batik-xml - ${batik.version} + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta.xml.bind-api.version} * @@ -340,90 +75,34 @@ org.eclipse.jetty jetty-jaas - ${jetty.version} - - - * - * - - org.eclipse.jetty jetty-security - ${jetty.version} - - - * - * - - org.eclipse.jetty jetty-server - ${jetty.version} - - - org.eclipse.jetty.orbit - * - - org.eclipse.jetty jetty-servlet - ${jetty.version} - - - * - * - - org.eclipse.jetty jetty-servlets - ${jetty.version} - - - * - * - - org.eclipse.jetty jetty-util - ${jetty.version} - - - * - * - - org.eclipse.jetty jetty-webapp - ${jetty.version} - - - * - * - - org.eclipse.jetty jetty-xml - ${jetty.version} - - - * - * - - org.glassfish.jersey.connectors @@ -434,56 +113,26 @@ org.glassfish.jersey.containers jersey-container-servlet ${jersey2.version} - - - * - * - - org.glassfish.jersey.containers jersey-container-servlet-core ${jersey2.version} - - - * - * - - org.glassfish.jersey.core jersey-client ${jersey2.version} - - - * - * - - org.glassfish.jersey.core jersey-common ${jersey2.version} - - - * - * - - org.glassfish.jersey.core jersey-server ${jersey2.version} - - - * - * - - org.glassfish.jersey.inject @@ -500,15 +149,6 @@ org.mozilla rhino - - org.osgi - osgi.core - ${osgi-core.version} - - - org.owasp.encoder - encoder - org.xerial.snappy snappy-java @@ -518,14 +158,14 @@ org.apache.hop hop-core ${project.version} - tests - test-jar - test + provided - org.hamcrest - hamcrest-core - 2.2 + org.apache.hop + hop-core + ${project.version} + tests + test-jar test diff --git a/assemblies/lib-jdbc/src/assembly/assembly.xml b/engine/src/assembly/assembly.xml similarity index 70% rename from assemblies/lib-jdbc/src/assembly/assembly.xml rename to engine/src/assembly/assembly.xml index 41709fe1855..930be2ce2b3 100644 --- a/assemblies/lib-jdbc/src/assembly/assembly.xml +++ b/engine/src/assembly/assembly.xml @@ -17,18 +17,16 @@ --> - libs-jdbc + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd"> + hop-engine zip - true - . - - - ${assembly.dir} + lib/core + + . - - + + \ No newline at end of file diff --git a/engine/src/main/java/org/apache/hop/pipeline/transform/TransformStatus.java b/engine/src/main/java/org/apache/hop/pipeline/transform/TransformStatus.java index 47b29a9bea2..924eea1cff1 100644 --- a/engine/src/main/java/org/apache/hop/pipeline/transform/TransformStatus.java +++ b/engine/src/main/java/org/apache/hop/pipeline/transform/TransformStatus.java @@ -18,13 +18,13 @@ package org.apache.hop.pipeline.transform; import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.xml.bind.annotation.XmlRootElement; import java.text.DecimalFormat; import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import javax.xml.bind.annotation.XmlRootElement; import org.apache.hop.core.Const; import org.apache.hop.core.exception.HopException; import org.apache.hop.core.row.IRowMeta; diff --git a/engine/src/main/java/org/apache/hop/www/GetExecutionInfoServlet.java b/engine/src/main/java/org/apache/hop/www/GetExecutionInfoServlet.java index 6f7743b7ed6..bed0447d937 100644 --- a/engine/src/main/java/org/apache/hop/www/GetExecutionInfoServlet.java +++ b/engine/src/main/java/org/apache/hop/www/GetExecutionInfoServlet.java @@ -17,13 +17,13 @@ package org.apache.hop.www; +import jakarta.xml.bind.DataBindingException; import java.io.IOException; import java.io.PrintWriter; import java.util.List; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.xml.bind.DataBindingException; import org.apache.commons.lang.StringUtils; import org.apache.hop.core.Const; import org.apache.hop.core.annotations.HopServerServlet; diff --git a/engine/src/main/java/org/apache/hop/www/HopServerObjectEntry.java b/engine/src/main/java/org/apache/hop/www/HopServerObjectEntry.java index 97c3b123921..a28d6a94d04 100644 --- a/engine/src/main/java/org/apache/hop/www/HopServerObjectEntry.java +++ b/engine/src/main/java/org/apache/hop/www/HopServerObjectEntry.java @@ -17,8 +17,8 @@ package org.apache.hop.www; +import jakarta.xml.bind.annotation.XmlRootElement; import java.util.Comparator; -import javax.xml.bind.annotation.XmlRootElement; /** A carte object entry in the pipeline or workflow maps */ @XmlRootElement diff --git a/engine/src/main/java/org/apache/hop/www/jaxrs/NVPair.java b/engine/src/main/java/org/apache/hop/www/jaxrs/NVPair.java index a3916ced1c0..3b48c970ce8 100644 --- a/engine/src/main/java/org/apache/hop/www/jaxrs/NVPair.java +++ b/engine/src/main/java/org/apache/hop/www/jaxrs/NVPair.java @@ -17,7 +17,7 @@ package org.apache.hop.www.jaxrs; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement public class NVPair { diff --git a/engine/src/main/java/org/apache/hop/www/jaxrs/PipelineStatus.java b/engine/src/main/java/org/apache/hop/www/jaxrs/PipelineStatus.java index 7ca0d21cd0c..058b4d82f4f 100644 --- a/engine/src/main/java/org/apache/hop/www/jaxrs/PipelineStatus.java +++ b/engine/src/main/java/org/apache/hop/www/jaxrs/PipelineStatus.java @@ -17,9 +17,9 @@ package org.apache.hop.www.jaxrs; +import jakarta.xml.bind.annotation.XmlRootElement; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlRootElement; import org.apache.hop.pipeline.transform.TransformStatus; @XmlRootElement diff --git a/engine/src/main/java/org/apache/hop/www/jaxrs/ServerStatus.java b/engine/src/main/java/org/apache/hop/www/jaxrs/ServerStatus.java index 84aca7b6b9d..8a0894d01c5 100644 --- a/engine/src/main/java/org/apache/hop/www/jaxrs/ServerStatus.java +++ b/engine/src/main/java/org/apache/hop/www/jaxrs/ServerStatus.java @@ -17,10 +17,10 @@ package org.apache.hop.www.jaxrs; +import jakarta.xml.bind.annotation.XmlRootElement; import java.lang.management.OperatingSystemMXBean; import java.lang.management.RuntimeMXBean; import java.lang.management.ThreadMXBean; -import javax.xml.bind.annotation.XmlRootElement; import org.apache.hop.core.Const; import org.apache.hop.core.exception.HopException; import org.apache.hop.core.util.Utils; diff --git a/engine/src/main/java/org/apache/hop/www/jaxrs/WorkflowStatus.java b/engine/src/main/java/org/apache/hop/www/jaxrs/WorkflowStatus.java index ae480c2b46f..ac5b6f4c6e6 100644 --- a/engine/src/main/java/org/apache/hop/www/jaxrs/WorkflowStatus.java +++ b/engine/src/main/java/org/apache/hop/www/jaxrs/WorkflowStatus.java @@ -17,7 +17,7 @@ package org.apache.hop.www.jaxrs; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement public class WorkflowStatus { diff --git a/integration-tests/database/main-0002-copy-driver-for-generic.hwf b/integration-tests/database/main-0002-copy-driver-for-generic.hwf index 79bd4f8aa79..d3897813818 100644 --- a/integration-tests/database/main-0002-copy-driver-for-generic.hwf +++ b/integration-tests/database/main-0002-copy-driver-for-generic.hwf @@ -35,14 +35,14 @@ limitations under the License. SPECIAL - N - 0 - 0 - 60 + 1 12 + 60 + 0 0 + N + 0 1 - 1 N 50 50 @@ -63,7 +63,7 @@ limitations under the License. N - EMPTY_SOURCE_URL-0-${user.dir}/plugins/databases/postgresql/lib/ + EMPTY_SOURCE_URL-0-${user.dir}/lib/jdbc/ LOCAL-SOURCE-FILE-0 EMPTY_DEST_URL-0-${user.dir}/lib/core/ LOCAL-DEST-FILE-0 diff --git a/integration-tests/mdi/files/excelwriter-mdi-test.xlsx b/integration-tests/mdi/files/excelwriter-mdi-test.xlsx index 02d18495b2e..b1d6ec2293f 100644 Binary files a/integration-tests/mdi/files/excelwriter-mdi-test.xlsx and b/integration-tests/mdi/files/excelwriter-mdi-test.xlsx differ diff --git a/integration-tests/transforms/main-0038-getfilename.hwf b/integration-tests/transforms/main-0038-getfilename.hwf index b8b57bf0d35..0b6608b0a75 100644 --- a/integration-tests/transforms/main-0038-getfilename.hwf +++ b/integration-tests/transforms/main-0038-getfilename.hwf @@ -35,14 +35,14 @@ limitations under the License. SPECIAL - N - 0 - 0 - 60 + 1 12 + 60 + 0 0 + N + 0 1 - 1 N 128 128 @@ -53,24 +53,22 @@ limitations under the License. PIPELINE - ${PROJECT_HOME}/0038-getfilenames-basic.hpl - N - N - N - N - N - - N N - Basic - N - Y + N + N N - local + N + ${PROJECT_HOME}/0038-getfilenames-basic.hpl + Basic Y + N + local + N + N + Y N 304 128 @@ -81,24 +79,22 @@ limitations under the License. PIPELINE - ${PROJECT_HOME}/0038-getfilenames-fromfield.hpl - N - N - N - N - N - - N N - Basic - N - Y + N + N N - local + N + ${PROJECT_HOME}/0038-getfilenames-fromfield.hpl + Basic Y + N + local + N + N + Y N 480 128 @@ -109,24 +105,22 @@ limitations under the License. PIPELINE - ${PROJECT_HOME}/0038-getfilenames-regexp.hpl - N - N - N - N - N - - N N - Basic - N - Y + N + N N - local + N + ${PROJECT_HOME}/0038-getfilenames-regexp.hpl + Basic Y + N + local + N + N + Y N 656 128 @@ -137,24 +131,22 @@ limitations under the License. PIPELINE - ${PROJECT_HOME}/0038-getfilenames-nofiles-exception.hpl - N - N - N - N - N - - N N - Basic - N - Y + N + N N - local + N + ${PROJECT_HOME}/0038-getfilenames-nofiles-exception.hpl + Basic Y + N + local + N + N + Y N 864 128 @@ -175,24 +167,24 @@ limitations under the License. PIPELINE - ${PROJECT_HOME}/0038-getfilenames-limit.hpl - N - N - N - N - N - - N N - Basic - N - Y + N + N N - direct + N + ${PROJECT_HOME}/0038-getfilenames-limit.hpl + + + Basic Y + N + local + N + N + Y N 1040 128 diff --git a/integration-tests/transforms/main-0042-formula-datetime.hwf b/integration-tests/transforms/main-0042-formula-datetime.hwf index ebcea9573a8..0f42b87cdf9 100644 --- a/integration-tests/transforms/main-0042-formula-datetime.hwf +++ b/integration-tests/transforms/main-0042-formula-datetime.hwf @@ -35,14 +35,14 @@ limitations under the License. SPECIAL - N - 0 - 0 - 60 + 1 12 + 60 + 0 0 + N + 0 1 - 1 N 50 50 @@ -53,24 +53,24 @@ limitations under the License. PIPELINE - ${PROJECT_HOME}/0042-formula-datetime.hpl - N - N - N - N - N - - N N - Basic - N - Y + N + N N - direct + N + ${PROJECT_HOME}/0042-formula-datetime.hpl + + + Basic Y + N + local + N + N + Y N 192 48 diff --git a/integration-tests/transforms/main-0068-enhanced-json-2927.hwf b/integration-tests/transforms/main-0068-enhanced-json-2927.hwf index 30fae18c058..85402ba77bf 100644 --- a/integration-tests/transforms/main-0068-enhanced-json-2927.hwf +++ b/integration-tests/transforms/main-0068-enhanced-json-2927.hwf @@ -114,7 +114,7 @@ limitations under the License. Y N - direct + local N N Y diff --git a/integration-tests/transforms/project-config.json b/integration-tests/transforms/project-config.json index 899c6c10927..6a91171e1c8 100644 --- a/integration-tests/transforms/project-config.json +++ b/integration-tests/transforms/project-config.json @@ -1,15 +1,13 @@ { - "metadataBaseFolder": "${PROJECT_HOME}/metadata", - "unitTestsBasePath": "${PROJECT_HOME}", - "dataSetsCsvFolder": "${PROJECT_HOME}/datasets", - "enforcingExecutionInHome": true, - "config": { - "variables": [ - { - "name": "HOP_LICENSE_HEADER_FILE", - "value": "${PROJECT_HOME}/../asf-header.txt", - "description": "This will automatically serialize the ASF license header into pipelines and workflows in the integration test projects" - } - ] + "metadataBaseFolder" : "${PROJECT_HOME}/metadata", + "unitTestsBasePath" : "${PROJECT_HOME}", + "dataSetsCsvFolder" : "${PROJECT_HOME}/datasets", + "enforcingExecutionInHome" : true, + "config" : { + "variables" : [ { + "name" : "HOP_LICENSE_HEADER_FILE", + "value" : "${PROJECT_HOME}/../asf-header.txt", + "description" : "This will automatically serialize the ASF license header into pipelines and workflows in the integration test projects" + } ] } } \ No newline at end of file diff --git a/lib-jdbc/pom.xml b/lib-jdbc/pom.xml new file mode 100644 index 00000000000..1aaa84ff522 --- /dev/null +++ b/lib-jdbc/pom.xml @@ -0,0 +1,114 @@ + + + + 4.0.0 + + + org.apache.hop + hop + 2.10.0-SNAPSHOT + + + hop-libs-jdbc + pom + Hop JDBC Libraries + + + 2.7.0 + 10.16.1.1 + 2.7.3 + 20.0.7 + 3.3 + 9.0.0 + 42.7.2 + 2.1.0.29 + 3.17.0 + 23.3.0-0 + + + + + + com.amazon.redshift + redshift-jdbc42 + ${redshift.version} + + + com.vertica.jdbc + vertica-jdbc + ${vertica.jdbc.version} + + + io.crate + crate-jdbc + ${cratedb-jdbc.version} + + + com.fasterxml.jackson.core + * + + + com.google.guava + * + + + org.slf4j + * + + + + + monetdb + monetdb-jdbc + ${monetdb.version} + + + net.sf.jt400 + jt400 + ${jt400.version} + + + net.snowflake + snowflake-jdbc + ${snowflake.jdbc.version} + + + org.apache.derby + derbyclient + ${derby.version} + + + org.hsqldb + hsqldb + ${hsqldb.version} + + + org.postgresql + postgresql + ${postgresql.version} + + + com.mysql + mysql-connector-j + ${mysql.version} + provided + + + + + diff --git a/lib/pom.xml b/lib/pom.xml new file mode 100644 index 00000000000..4e045e0b50f --- /dev/null +++ b/lib/pom.xml @@ -0,0 +1,579 @@ + + + + 4.0.0 + + + org.apache.hop + hop + 2.10.0-SNAPSHOT + + + hop-libs + 2.10.0-SNAPSHOT + pom + Hop Libraries + + + 2.4.9 + 2.5.32 + 1.16.3 + 3.4.3 + 9.7 + 1.11.3 + 1.12.347 + 2.1.1 + 2.6.0 + 0.1 + 1.9.4 + 1.15 + 4.4 + 1.26.0 + 1.10 + 1.11.0 + 1.4 + 1.5 + 2.14.0 + 2.6 + 3.12.0 + 1.1.3 + 3.6.1 + 3.9.0 + 1.5.7 + 2.9.0 + 5.4.0 + 4.0.0 + 1.2 + 2.0.13 + 1.0.1 + 2.1 + 2.46.1 + 2.2.0 + 2.13.0 + v2-rev20240229-2.0.0 + v1-rev20240311-2.0.0 + 1.12.1 + 1.12.1 + 2.15.0 + 1.42.3 + 1.34.1 + 1.60.1 + 2.10 + 32.1.2-jre + 2.3.9 + 4.4.15 + 4.5.13 + 5.3.1 + 4.0.4 + 2.15.0 + 2.0.1 + 3.1.0 + 3.28.0-GA + 4.0.1 + 9.4.41.v20210516 + 2.12.1 + 0.2.18 + 1.1.1 + 1.1.1 + 2.5.0 + 3.7.0-M11 + 2.4.0 + 3.7.1 + 5.3.0 + 2.23.1 + 1.8.0 + 4.2.12 + 1.3.1 + 3.3.4 + 4.12.0 + 3.9.0 + 0.31.1 + 0.31.1 + 1.2.1 + 2.8 + 0.26.0 + 4.6.3 + 5.2.4 + 3.25.2 + 1.7.14 + 2.12.17 + 2.0.4 + 2.0 + 4.3.2.RELEASE + 4.3.18 + 1.13.1 + 6.4.0 + 2.12.2 + 1.3.04 + 1.5 + 3.8.4 + + + + + + com.amazonaws + aws-java-sdk-core + ${aws-java-sdk.version} + + + com.amazonaws + aws-java-sdk-emr + ${aws-java-sdk.version} + + + com.amazonaws + aws-java-sdk-iam + ${aws-java-sdk.version} + + + com.amazonaws + aws-java-sdk-pricing + ${aws-java-sdk.version} + + + com.amazonaws + aws-java-sdk-redshift + ${aws-java-sdk.version} + + + com.amazonaws + aws-java-sdk-s3 + ${aws-java-sdk.version} + + + com.databricks + spark-avro_2.11 + ${databricks.version} + + + com.epam + parso + ${epam-parso-version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + com.fasterxml.jackson.dataformat + jackson-dataformat-avro + ${jackson.version} + + + com.fasterxml.jackson.dataformat + jackson-dataformat-cbor + ${jackson.version} + + + com.fasterxml.jackson.dataformat + jackson-dataformat-smile + ${jackson.version} + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + ${jackson.version} + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + ${jackson.version} + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-base + ${jackson.version} + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + ${jackson.version} + + + com.fasterxml.jackson.jr + jackson-jr-objects + ${jackson.version} + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + ${jackson.version} + + + com.github.albfernandez + juniversalchardet + ${juniversalchardet.version} + + + com.github.mwiede + jsch + ${jsch.version} + + + com.google.code.gson + gson + ${gson.version} + + + com.google.guava + guava + ${guava.version} + + + com.googlecode.json-simple + json-simple + ${json-simple.version} + + + com.healthmarketscience.jackcess + jackcess + ${jackcess.version} + + + com.squareup.okhttp3 + okhttp + ${okhttp.version} + + + com.squareup.okio + okio + ${okio.version} + + + com.sun.activation + jakarta.activation + ${jakarta-mail.version} + + + com.sun.mail + jakarta.mail + ${jakarta-mail.version} + + + com.tinkerpop.blueprints + blueprints-core + ${blueprints-core.version} + + + com.wcohen + com.wcohen.secondstring + ${com.wcohen.secondstring.version} + + + commons-codec + commons-codec + ${commons-codec.version} + + + commons-configuration + commons-configuration + ${commons-configuration.version} + + + commons-fileupload + commons-fileupload + ${commons-fileupload.version} + + + commons-io + commons-io + ${commons-io.version} + + + commons-lang + commons-lang + ${commons-lang.version} + + + commons-logging + commons-logging + ${commons-logging.version} + + + info.picocli + picocli + ${picocli-version} + + + net.bytebuddy + byte-buddy + ${byte-buddy.version} + + + net.minidev + json-smart + ${json-smart.version} + + + net.sf.flexjson + flexjson + ${flexjson.version} + + + org.apache.avro + avro + ${avro.version} + + + com.fasterxml.jackson.core + * + + + org.slf4j + * + + + + + org.apache.commons + commons-collections4 + ${commons-collections4.version} + + + org.apache.commons + commons-compress + ${commons-compress.version} + + + org.apache.commons + commons-csv + ${commons-csv.version} + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + + + org.apache.commons + commons-math3 + ${commons-math3.version} + + + org.apache.commons + commons-vfs2 + ${commons-vfs2.version} + + + org.apache.hadoop + hadoop-hdfs-client + ${hadoop.version} + + + org.apache.hop + hop-core + ${project.version} + + + org.apache.hop + hop-engine + ${project.version} + + + org.apache.hop + hop-misc-static-schema + ${project.version} + + + org.apache.hop + hop-ui + ${project.version} + + + org.apache.httpcomponents + httpclient + ${httpclient.version} + + + org.apache.httpcomponents + httpcore + ${httpccore.version} + + + org.apache.httpcomponents.client5 + httpclient5 + ${httpclient5.version} + + + org.slf4j + slf4j-api + + + + + org.apache.kafka + kafka-clients + ${kafka-clients.version} + + + org.slf4j + * + + + + + org.apache.logging.log4j + log4j-core + ${log4j.version} + + + org.apache.poi + poi + ${poi.version} + + + org.apache.poi + poi-ooxml + ${poi.version} + + + org.eclipse.jetty + jetty-jaas + ${jetty.version} + + + org.eclipse.jetty + jetty-security + ${jetty.version} + + + org.eclipse.jetty + jetty-server + ${jetty.version} + + + org.eclipse.jetty + jetty-servlet + ${jetty.version} + + + org.eclipse.jetty + jetty-servlets + ${jetty.version} + + + org.eclipse.jetty + jetty-util + ${jetty.version} + + + org.eclipse.jetty + jetty-webapp + ${jetty.version} + + + org.eclipse.jetty + jetty-xml + ${jetty.version} + + + org.eclipse.platform + org.eclipse.core.commands + ${org.eclipse.commands.version} + + + org.eclipse.platform + org.eclipse.equinox.common + ${org.eclipse.equinox.version} + + + org.glassfish.tyrus.bundles + tyrus-standalone-client + ${tyrus-standalone-client.version} + + + org.javassist + javassist + ${javassist.version} + + + org.mozilla + rhino + ${rhino.version} + + + org.ow2.asm + asm + ${asm.version} + + + org.ow2.asm + asm-commons + ${asm.version} + + + org.ow2.asm + asm-tree + ${asm.version} + + + org.ow2.asm + asm-util + ${asm.version} + + + org.owasp.encoder + encoder + ${encoder.version} + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.slf4j + slf4j-nop + ${slf4j.version} + + + org.yaml + snakeyaml + ${snakeyaml.version} + + + xerces + xercesImpl + ${xerces.version} + + + xml-apis + xml-apis-ext + ${xml-apis-ext.version} + + + xmlunit + xmlunit + ${xmlunit.version} + + + + + diff --git a/plugins/actions/abort/pom.xml b/plugins/actions/abort/pom.xml index 0a1a02bac8e..79f6efa9e24 100644 --- a/plugins/actions/abort/pom.xml +++ b/plugins/actions/abort/pom.xml @@ -27,7 +27,6 @@ hop-action-abort jar - Hop Plugins Actions Abort diff --git a/plugins/actions/abort/src/assembly/assembly.xml b/plugins/actions/abort/src/assembly/assembly.xml index 85e308289ca..ee4f3946480 100644 --- a/plugins/actions/abort/src/assembly/assembly.xml +++ b/plugins/actions/abort/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/abort + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/abort true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-abort:jar + plugins/actions/abort \ No newline at end of file diff --git a/plugins/actions/addresultfilenames/src/assembly/assembly.xml b/plugins/actions/addresultfilenames/src/assembly/assembly.xml index c2450729592..027fcb91771 100644 --- a/plugins/actions/addresultfilenames/src/assembly/assembly.xml +++ b/plugins/actions/addresultfilenames/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/addresultfilenames + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/addresultfilenames true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-addresultfilenames:jar + plugins/actions/addresultfilenames \ No newline at end of file diff --git a/plugins/actions/as400command/pom.xml b/plugins/actions/as400command/pom.xml index 1d82df5acc1..e91f95395e5 100644 --- a/plugins/actions/as400command/pom.xml +++ b/plugins/actions/as400command/pom.xml @@ -29,12 +29,24 @@ jar Hop Plugins Actions AS/400 Command + + + + org.apache.hop + hop-libs-jdbc + ${project.version} + pom + import + + + + net.sf.jt400 jt400 - 10.5 compile + diff --git a/plugins/actions/as400command/src/assembly/assembly.xml b/plugins/actions/as400command/src/assembly/assembly.xml index 1fdae64dd3f..089033d5396 100644 --- a/plugins/actions/as400command/src/assembly/assembly.xml +++ b/plugins/actions/as400command/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/as400command + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/as400command true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-as400command:jar + plugins/actions/as400command \ No newline at end of file diff --git a/plugins/actions/checkdbconnection/pom.xml b/plugins/actions/checkdbconnection/pom.xml index 05cf1bab7ca..416ec3e28d4 100644 --- a/plugins/actions/checkdbconnection/pom.xml +++ b/plugins/actions/checkdbconnection/pom.xml @@ -27,7 +27,6 @@ hop-action-checkdbconnection jar - Hop Plugins Actions Check Db connections diff --git a/plugins/actions/checkdbconnection/src/assembly/assembly.xml b/plugins/actions/checkdbconnection/src/assembly/assembly.xml index 822646da5cc..50ee8a525b4 100644 --- a/plugins/actions/checkdbconnection/src/assembly/assembly.xml +++ b/plugins/actions/checkdbconnection/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/checkdbconnection + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/checkdbconnection true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-checkdbconnection:jar + plugins/actions/checkdbconnection \ No newline at end of file diff --git a/plugins/actions/checkfilelocked/pom.xml b/plugins/actions/checkfilelocked/pom.xml index 74ca3cc59da..3935e7d9b87 100644 --- a/plugins/actions/checkfilelocked/pom.xml +++ b/plugins/actions/checkfilelocked/pom.xml @@ -27,7 +27,6 @@ hop-action-checkfilelocked jar - Hop Plugins Actions Check file locked diff --git a/plugins/actions/checkfilelocked/src/assembly/assembly.xml b/plugins/actions/checkfilelocked/src/assembly/assembly.xml index 4a647d21d43..8734ef0ab9f 100644 --- a/plugins/actions/checkfilelocked/src/assembly/assembly.xml +++ b/plugins/actions/checkfilelocked/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/checkfilelocked + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/checkfilelocked true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-checkfilelocked:jar + plugins/actions/checkfilelocked \ No newline at end of file diff --git a/plugins/actions/columnsexist/pom.xml b/plugins/actions/columnsexist/pom.xml index e3dd2204457..3c7957eb989 100644 --- a/plugins/actions/columnsexist/pom.xml +++ b/plugins/actions/columnsexist/pom.xml @@ -27,7 +27,6 @@ hop-action-columnsexist jar - Hop Plugins Actions Columns exist in a table diff --git a/plugins/actions/columnsexist/src/assembly/assembly.xml b/plugins/actions/columnsexist/src/assembly/assembly.xml index a08de56abe8..60726baa401 100644 --- a/plugins/actions/columnsexist/src/assembly/assembly.xml +++ b/plugins/actions/columnsexist/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/columnsexist + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/columnsexist true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-columnsexist:jar + plugins/actions/columnsexist \ No newline at end of file diff --git a/plugins/actions/copyfiles/src/assembly/assembly.xml b/plugins/actions/copyfiles/src/assembly/assembly.xml index 5851f09d52c..60aa68cd436 100644 --- a/plugins/actions/copyfiles/src/assembly/assembly.xml +++ b/plugins/actions/copyfiles/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/copyfiles + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/copyfiles true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-copyfiles:jar + plugins/actions/copyfiles \ No newline at end of file diff --git a/plugins/actions/copymoveresultfilenames/src/assembly/assembly.xml b/plugins/actions/copymoveresultfilenames/src/assembly/assembly.xml index 9e84ff9c4fb..f4851fc39af 100644 --- a/plugins/actions/copymoveresultfilenames/src/assembly/assembly.xml +++ b/plugins/actions/copymoveresultfilenames/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/copymoveresultfilenames + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/copymoveresultfilenames true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-copymoveresultfilenames:jar + plugins/actions/copymoveresultfilenames \ No newline at end of file diff --git a/plugins/actions/createfile/src/assembly/assembly.xml b/plugins/actions/createfile/src/assembly/assembly.xml index 1fbae09acf1..b96535449dd 100644 --- a/plugins/actions/createfile/src/assembly/assembly.xml +++ b/plugins/actions/createfile/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/createfile + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/createfile true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-createfile:jar + plugins/actions/createfile \ No newline at end of file diff --git a/plugins/actions/createfolder/src/assembly/assembly.xml b/plugins/actions/createfolder/src/assembly/assembly.xml index b51631ff4e6..427bfabc30e 100644 --- a/plugins/actions/createfolder/src/assembly/assembly.xml +++ b/plugins/actions/createfolder/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/createfolder + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/createfolder true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-createfolder:jar + plugins/actions/createfolder \ No newline at end of file diff --git a/plugins/actions/delay/src/assembly/assembly.xml b/plugins/actions/delay/src/assembly/assembly.xml index a9128a69237..eb857d75f03 100644 --- a/plugins/actions/delay/src/assembly/assembly.xml +++ b/plugins/actions/delay/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/delay + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/delay true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-delay:jar + plugins/actions/delay \ No newline at end of file diff --git a/plugins/actions/deletefile/src/assembly/assembly.xml b/plugins/actions/deletefile/src/assembly/assembly.xml index be1432c5954..b9a9d19d607 100644 --- a/plugins/actions/deletefile/src/assembly/assembly.xml +++ b/plugins/actions/deletefile/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/deletefile + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/deletefile true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-deletefile:jar + plugins/actions/deletefile \ No newline at end of file diff --git a/plugins/actions/deletefiles/src/assembly/assembly.xml b/plugins/actions/deletefiles/src/assembly/assembly.xml index 8399fc976f6..cef36dee544 100644 --- a/plugins/actions/deletefiles/src/assembly/assembly.xml +++ b/plugins/actions/deletefiles/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/deletefiles + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/deletefiles true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-deletefiles:jar + plugins/actions/deletefiles \ No newline at end of file diff --git a/plugins/actions/deletefolders/src/assembly/assembly.xml b/plugins/actions/deletefolders/src/assembly/assembly.xml index 9e334bb8a62..738dd8af0ec 100644 --- a/plugins/actions/deletefolders/src/assembly/assembly.xml +++ b/plugins/actions/deletefolders/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/deletefolders + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/deletefolders true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-deletefolders:jar + plugins/actions/deletefolders \ No newline at end of file diff --git a/plugins/actions/deleteresultfilenames/src/assembly/assembly.xml b/plugins/actions/deleteresultfilenames/src/assembly/assembly.xml index 92178f1707d..de66833c1b6 100644 --- a/plugins/actions/deleteresultfilenames/src/assembly/assembly.xml +++ b/plugins/actions/deleteresultfilenames/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/deleteresultfilenames + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/deleteresultfilenames true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-deleteresultfilenames:jar + plugins/actions/deleteresultfilenames \ No newline at end of file diff --git a/plugins/actions/dostounix/src/assembly/assembly.xml b/plugins/actions/dostounix/src/assembly/assembly.xml index 30befe5364e..72a92d6341b 100644 --- a/plugins/actions/dostounix/src/assembly/assembly.xml +++ b/plugins/actions/dostounix/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/dostounix + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/dostounix true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-dostounix:jar + plugins/actions/dostounix \ No newline at end of file diff --git a/plugins/actions/eval/src/assembly/assembly.xml b/plugins/actions/eval/src/assembly/assembly.xml index 4069f7f8370..ab6510557fc 100644 --- a/plugins/actions/eval/src/assembly/assembly.xml +++ b/plugins/actions/eval/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/eval + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/eval true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-eval:jar + plugins/actions/eval \ No newline at end of file diff --git a/plugins/actions/evalfilesmetrics/src/assembly/assembly.xml b/plugins/actions/evalfilesmetrics/src/assembly/assembly.xml index 2ae20a0b88a..0c22d3c847e 100644 --- a/plugins/actions/evalfilesmetrics/src/assembly/assembly.xml +++ b/plugins/actions/evalfilesmetrics/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/evalfilesmetrics + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/evalfilesmetrics true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-evalfilesmetrics:jar + plugins/actions/evalfilesmetrics \ No newline at end of file diff --git a/plugins/actions/evaluatetablecontent/src/assembly/assembly.xml b/plugins/actions/evaluatetablecontent/src/assembly/assembly.xml index 2fd51cef6b8..2aa5936a8f2 100644 --- a/plugins/actions/evaluatetablecontent/src/assembly/assembly.xml +++ b/plugins/actions/evaluatetablecontent/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/evaluatetablecontent + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/evaluatetablecontent true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-evaluatetablecontent:jar + plugins/actions/evaluatetablecontent \ No newline at end of file diff --git a/plugins/actions/filecompare/src/assembly/assembly.xml b/plugins/actions/filecompare/src/assembly/assembly.xml index bb191d1c848..09c00f85643 100644 --- a/plugins/actions/filecompare/src/assembly/assembly.xml +++ b/plugins/actions/filecompare/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/filecompare + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/filecompare true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-filecompare:jar + plugins/actions/filecompare \ No newline at end of file diff --git a/plugins/actions/fileexists/src/assembly/assembly.xml b/plugins/actions/fileexists/src/assembly/assembly.xml index dfd8e13779a..16d6fe6dde9 100644 --- a/plugins/actions/fileexists/src/assembly/assembly.xml +++ b/plugins/actions/fileexists/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/fileexists + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/fileexists true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-fileexists:jar + plugins/actions/fileexists \ No newline at end of file diff --git a/plugins/actions/filesexist/src/assembly/assembly.xml b/plugins/actions/filesexist/src/assembly/assembly.xml index 3c0c7952f75..ad25a25b4b9 100644 --- a/plugins/actions/filesexist/src/assembly/assembly.xml +++ b/plugins/actions/filesexist/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/filesexist + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/filesexist true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-filesexist:jar + plugins/actions/filesexist \ No newline at end of file diff --git a/plugins/actions/folderisempty/src/assembly/assembly.xml b/plugins/actions/folderisempty/src/assembly/assembly.xml index 2f9200cac73..ca85051122e 100644 --- a/plugins/actions/folderisempty/src/assembly/assembly.xml +++ b/plugins/actions/folderisempty/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/folderisempty + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/folderisempty true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-folderisempty:jar + plugins/actions/folderisempty \ No newline at end of file diff --git a/plugins/actions/folderscompare/src/assembly/assembly.xml b/plugins/actions/folderscompare/src/assembly/assembly.xml index d0f57a3d0bd..c6b7bd97d7d 100644 --- a/plugins/actions/folderscompare/src/assembly/assembly.xml +++ b/plugins/actions/folderscompare/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/folderscompare + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/folderscompare true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-folderscompare:jar + plugins/actions/folderscompare \ No newline at end of file diff --git a/plugins/actions/ftp/pom.xml b/plugins/actions/ftp/pom.xml index 695ce26ca3a..1999bf2c56e 100644 --- a/plugins/actions/ftp/pom.xml +++ b/plugins/actions/ftp/pom.xml @@ -34,7 +34,23 @@ 3.9.0 + + + + org.apache.hop + hop-libs + ${project.version} + pom + import + + + + + + com.github.mwiede + jsch + commons-net commons-net diff --git a/plugins/actions/ftp/src/assembly/assembly.xml b/plugins/actions/ftp/src/assembly/assembly.xml index f63c5fca5da..7aeaa9bca8b 100644 --- a/plugins/actions/ftp/src/assembly/assembly.xml +++ b/plugins/actions/ftp/src/assembly/assembly.xml @@ -16,36 +16,51 @@ ~ --> - + hop-action-ftp zip - actions/ftp + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/ftp true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + + + com.github.mwiede:jsch:jar + + lib/core + false + false + + + + commons-net:commons-net:jar + + plugins/actions/ftp/lib + false + false + org.apache.hop:hop-action-ftp:jar + plugins/actions/ftp diff --git a/plugins/actions/getpop/pom.xml b/plugins/actions/getpop/pom.xml index 948715ca1e7..9192bec5ba7 100644 --- a/plugins/actions/getpop/pom.xml +++ b/plugins/actions/getpop/pom.xml @@ -30,20 +30,22 @@ Hop Plugins Actions Get mails (POP3/IMAP) - - 1.4.7 - + + + + org.apache.hop + hop-libs + ${project.version} + pom + import + + + - - com.sun.activation - jakarta.activation - ${jakarta-mail.version} - com.sun.mail jakarta.mail - ${jakarta-mail.version} diff --git a/plugins/actions/getpop/src/assembly/assembly.xml b/plugins/actions/getpop/src/assembly/assembly.xml index 6b8662c12d0..63279a6acfe 100644 --- a/plugins/actions/getpop/src/assembly/assembly.xml +++ b/plugins/actions/getpop/src/assembly/assembly.xml @@ -23,27 +23,34 @@ zip - actions/getpop + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/getpop true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + + + runtime + lib/core + false + false + org.apache.hop:hop-action-getpop:jar + plugins/actions/getpop \ No newline at end of file diff --git a/plugins/actions/http/pom.xml b/plugins/actions/http/pom.xml index f293e0bc42f..5f1609d8f29 100644 --- a/plugins/actions/http/pom.xml +++ b/plugins/actions/http/pom.xml @@ -27,7 +27,6 @@ hop-action-http jar - Hop Plugins Actions HTTP diff --git a/plugins/actions/http/src/assembly/assembly.xml b/plugins/actions/http/src/assembly/assembly.xml index e5a8fffd181..ddf28545c9b 100644 --- a/plugins/actions/http/src/assembly/assembly.xml +++ b/plugins/actions/http/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/http + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/http true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-http:jar + plugins/actions/http \ No newline at end of file diff --git a/plugins/actions/mail/pom.xml b/plugins/actions/mail/pom.xml index 781875309dc..f62c5e1a7c3 100644 --- a/plugins/actions/mail/pom.xml +++ b/plugins/actions/mail/pom.xml @@ -30,16 +30,22 @@ Hop Plugins Actions Mail + + + + org.apache.hop + hop-libs + ${project.version} + pom + import + + + + - - com.sun.activation - jakarta.activation - ${jakarta-mail.version} - com.sun.mail jakarta.mail - ${jakarta-mail.version} diff --git a/plugins/actions/mail/src/assembly/assembly.xml b/plugins/actions/mail/src/assembly/assembly.xml index b333d8e3a60..2c58c305257 100644 --- a/plugins/actions/mail/src/assembly/assembly.xml +++ b/plugins/actions/mail/src/assembly/assembly.xml @@ -23,27 +23,34 @@ zip - actions/mail + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/mail true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + + + runtime + lib/core + false + false + org.apache.hop:hop-action-mail:jar + plugins/actions/mail \ No newline at end of file diff --git a/plugins/actions/mailvalidator/src/assembly/assembly.xml b/plugins/actions/mailvalidator/src/assembly/assembly.xml index 170491a35ac..16d1056cf28 100644 --- a/plugins/actions/mailvalidator/src/assembly/assembly.xml +++ b/plugins/actions/mailvalidator/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/mailvalidator + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/mailvalidator true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-mailvalidator:jar + plugins/actions/mailvalidator \ No newline at end of file diff --git a/plugins/actions/movefiles/pom.xml b/plugins/actions/movefiles/pom.xml index 623c8d9845c..4ffbc705de9 100644 --- a/plugins/actions/movefiles/pom.xml +++ b/plugins/actions/movefiles/pom.xml @@ -27,10 +27,26 @@ hop-action-movefiles jar - Hop Plugins Actions Move files + + + + org.apache.hop + hop-libs + ${project.version} + pom + import + + + + + + commons-io + commons-io + provided + com.azure azure-storage-blob @@ -39,8 +55,8 @@ org.apache.hop - hop-plugins-tech-azure - ${project.parent.version} + hop-tech-azure + ${project.version} test diff --git a/plugins/actions/movefiles/src/assembly/assembly.xml b/plugins/actions/movefiles/src/assembly/assembly.xml index 622bb0452b2..c9992454d37 100644 --- a/plugins/actions/movefiles/src/assembly/assembly.xml +++ b/plugins/actions/movefiles/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/movefiles + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/movefiles true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-movefiles:jar + plugins/actions/movefiles \ No newline at end of file diff --git a/plugins/actions/msgboxinfo/pom.xml b/plugins/actions/msgboxinfo/pom.xml index 80ac836f708..4809c24967c 100644 --- a/plugins/actions/msgboxinfo/pom.xml +++ b/plugins/actions/msgboxinfo/pom.xml @@ -27,7 +27,6 @@ hop-action-msgboxinfo jar - Hop Plugins Actions Display Msgbox Info diff --git a/plugins/actions/msgboxinfo/src/assembly/assembly.xml b/plugins/actions/msgboxinfo/src/assembly/assembly.xml index 1ed526c58a8..a330ea96d5a 100644 --- a/plugins/actions/msgboxinfo/src/assembly/assembly.xml +++ b/plugins/actions/msgboxinfo/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/msgboxinfo + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/msgboxinfo true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-msgboxinfo:jar + plugins/actions/msgboxinfo \ No newline at end of file diff --git a/plugins/actions/mssqlbulkload/src/assembly/assembly.xml b/plugins/actions/mssqlbulkload/src/assembly/assembly.xml index f0c5cd0ae0a..9946287bfbc 100644 --- a/plugins/actions/mssqlbulkload/src/assembly/assembly.xml +++ b/plugins/actions/mssqlbulkload/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/mssqlbulkload + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/mssqlbulkload true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-mssqlbulkload:jar + plugins/actions/mssqlbulkload \ No newline at end of file diff --git a/plugins/actions/mysqlbulkfile/pom.xml b/plugins/actions/mysqlbulkfile/pom.xml index 2030d9a57ed..7797e9844bb 100644 --- a/plugins/actions/mysqlbulkfile/pom.xml +++ b/plugins/actions/mysqlbulkfile/pom.xml @@ -27,7 +27,6 @@ hop-action-mysqlbulkfile jar - Hop Plugins Actions Bulk load from MySQL into file diff --git a/plugins/actions/mysqlbulkfile/src/assembly/assembly.xml b/plugins/actions/mysqlbulkfile/src/assembly/assembly.xml index e0470a12fb0..8762921aafa 100644 --- a/plugins/actions/mysqlbulkfile/src/assembly/assembly.xml +++ b/plugins/actions/mysqlbulkfile/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/mysqlbulkfile + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/mysqlbulkfile true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-mysqlbulkfile:jar + plugins/actions/mysqlbulkfile \ No newline at end of file diff --git a/plugins/actions/mysqlbulkload/pom.xml b/plugins/actions/mysqlbulkload/pom.xml index bc54ddb8fde..716d5e42988 100644 --- a/plugins/actions/mysqlbulkload/pom.xml +++ b/plugins/actions/mysqlbulkload/pom.xml @@ -27,7 +27,6 @@ hop-action-mysqlbulkload jar - Hop Plugins Actions Bulk load into MySQL diff --git a/plugins/actions/mysqlbulkload/src/assembly/assembly.xml b/plugins/actions/mysqlbulkload/src/assembly/assembly.xml index 5e137c65470..82e121548ba 100644 --- a/plugins/actions/mysqlbulkload/src/assembly/assembly.xml +++ b/plugins/actions/mysqlbulkload/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/mysqlbulkload + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/mysqlbulkload true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-mysqlbulkload:jar + plugins/actions/mysqlbulkload \ No newline at end of file diff --git a/plugins/actions/pgpfiles/pom.xml b/plugins/actions/pgpfiles/pom.xml index 26cc7c75d4b..e0d53e88b21 100644 --- a/plugins/actions/pgpfiles/pom.xml +++ b/plugins/actions/pgpfiles/pom.xml @@ -27,7 +27,6 @@ hop-action-pgpfiles jar - Hop Plugins Actions Encrypt/Decrypt/Verify files with PGP diff --git a/plugins/actions/pgpfiles/src/assembly/assembly.xml b/plugins/actions/pgpfiles/src/assembly/assembly.xml index 3f832b02b49..5353c444d02 100644 --- a/plugins/actions/pgpfiles/src/assembly/assembly.xml +++ b/plugins/actions/pgpfiles/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/pgpfiles + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/pgpfiles true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-pgpfiles:jar + plugins/actions/pgpfiles \ No newline at end of file diff --git a/plugins/actions/ping/pom.xml b/plugins/actions/ping/pom.xml index fffc33930f5..29d37aca266 100644 --- a/plugins/actions/ping/pom.xml +++ b/plugins/actions/ping/pom.xml @@ -27,7 +27,6 @@ hop-action-ping jar - Hop Plugins Actions Ping a host diff --git a/plugins/actions/ping/src/assembly/assembly.xml b/plugins/actions/ping/src/assembly/assembly.xml index 30dc995e370..b60846a09ad 100644 --- a/plugins/actions/ping/src/assembly/assembly.xml +++ b/plugins/actions/ping/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/ping + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/ping true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-ping:jar + plugins/actions/ping \ No newline at end of file diff --git a/plugins/actions/pipeline/pom.xml b/plugins/actions/pipeline/pom.xml index dcaa5163288..046cb3943c4 100644 --- a/plugins/actions/pipeline/pom.xml +++ b/plugins/actions/pipeline/pom.xml @@ -27,7 +27,6 @@ hop-action-pipeline jar - Hop Plugins Actions Pipeline diff --git a/plugins/actions/pipeline/src/assembly/assembly.xml b/plugins/actions/pipeline/src/assembly/assembly.xml index 6ffac5a10de..102503f7ad8 100644 --- a/plugins/actions/pipeline/src/assembly/assembly.xml +++ b/plugins/actions/pipeline/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/pipeline + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/pipeline true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-pipeline:jar + plugins/actions/pipeline \ No newline at end of file diff --git a/plugins/actions/pom.xml b/plugins/actions/pom.xml index e3fbd46269e..cbb9b671425 100644 --- a/plugins/actions/pom.xml +++ b/plugins/actions/pom.xml @@ -26,9 +26,7 @@ hop-plugins-actions - 2.10.0-SNAPSHOT pom - Hop Plugins Actions @@ -91,73 +89,4 @@ xml zipfile - - - - 4.3.2.RELEASE - - - - - - org.apache.hop - hop-core - ${project.version} - provided - - - org.apache.hop - hop-core - ${project.version} - test - test - - - org.apache.hop - hop-core - ${project.version} - test-jar - test - - - org.apache.hop - hop-engine - ${project.version} - test-jar - test - - - - - - - org.apache.hop - hop-core - compile - - - org.apache.hop - hop-ui - 2.10.0-SNAPSHOT - compile - - - org.apache.hop - hop-core - test-jar - test - - - org.apache.hop - hop-engine - test-jar - test - - - org.springframework - spring-test - ${spring.framework.version} - test - - diff --git a/plugins/actions/repeat/pom.xml b/plugins/actions/repeat/pom.xml index 5874b9c7fa9..f6030a22745 100644 --- a/plugins/actions/repeat/pom.xml +++ b/plugins/actions/repeat/pom.xml @@ -27,7 +27,6 @@ hop-action-repeat jar - Hop Plugins Actions Repeat diff --git a/plugins/actions/repeat/src/assembly/assembly.xml b/plugins/actions/repeat/src/assembly/assembly.xml index 09642645513..5b95773652a 100644 --- a/plugins/actions/repeat/src/assembly/assembly.xml +++ b/plugins/actions/repeat/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/repeat + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/repeat true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-repeat:jar + plugins/actions/repeat diff --git a/plugins/actions/sendnagiospassivecheck/src/assembly/assembly.xml b/plugins/actions/sendnagiospassivecheck/src/assembly/assembly.xml index 9e0275101d8..68ada91255a 100644 --- a/plugins/actions/sendnagiospassivecheck/src/assembly/assembly.xml +++ b/plugins/actions/sendnagiospassivecheck/src/assembly/assembly.xml @@ -23,33 +23,34 @@ zip - actions/sendnagiospassivecheck + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/sendnagiospassivecheck true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-sendnagiospassivecheck:jar + plugins/actions/sendnagiospassivecheck - lib com.googlecode.jsendnsca:jsendnsca:jar + plugins/actions/sendnagiospassivecheck/lib diff --git a/plugins/actions/setvariables/pom.xml b/plugins/actions/setvariables/pom.xml index 9aae1cafa8a..c5e625856ed 100644 --- a/plugins/actions/setvariables/pom.xml +++ b/plugins/actions/setvariables/pom.xml @@ -27,7 +27,6 @@ hop-action-setvariables jar - Hop Plugins Actions Set variables diff --git a/plugins/actions/setvariables/src/assembly/assembly.xml b/plugins/actions/setvariables/src/assembly/assembly.xml index d46e011b25e..9d63ebc07b5 100644 --- a/plugins/actions/setvariables/src/assembly/assembly.xml +++ b/plugins/actions/setvariables/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/setvariables + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/setvariables true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-setvariables:jar + plugins/actions/setvariables \ No newline at end of file diff --git a/plugins/actions/shell/pom.xml b/plugins/actions/shell/pom.xml index 9fe3943b87b..55ff6216316 100644 --- a/plugins/actions/shell/pom.xml +++ b/plugins/actions/shell/pom.xml @@ -27,7 +27,6 @@ hop-action-shell jar - Hop Plugins Actions Shell diff --git a/plugins/actions/shell/src/assembly/assembly.xml b/plugins/actions/shell/src/assembly/assembly.xml index 726c3955db2..a599c24b7c2 100644 --- a/plugins/actions/shell/src/assembly/assembly.xml +++ b/plugins/actions/shell/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/shell + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/shell true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-shell:jar + plugins/actions/shell \ No newline at end of file diff --git a/plugins/actions/simpleeval/pom.xml b/plugins/actions/simpleeval/pom.xml index fa033c4e038..6646f2bc828 100644 --- a/plugins/actions/simpleeval/pom.xml +++ b/plugins/actions/simpleeval/pom.xml @@ -27,7 +27,6 @@ hop-action-simpleeval jar - Hop Plugins Actions Simple evaluation diff --git a/plugins/actions/simpleeval/src/assembly/assembly.xml b/plugins/actions/simpleeval/src/assembly/assembly.xml index 086049b99f8..f7ac7291e56 100644 --- a/plugins/actions/simpleeval/src/assembly/assembly.xml +++ b/plugins/actions/simpleeval/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/simpleeval + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/simpleeval true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-simpleeval:jar + plugins/actions/simpleeval \ No newline at end of file diff --git a/plugins/actions/snmptrap/pom.xml b/plugins/actions/snmptrap/pom.xml index ba45a9565ac..42bf4fcb19f 100644 --- a/plugins/actions/snmptrap/pom.xml +++ b/plugins/actions/snmptrap/pom.xml @@ -27,7 +27,6 @@ hop-action-snmptrap jar - Hop Plugins Actions Send SNMP trap diff --git a/plugins/actions/snmptrap/src/assembly/assembly.xml b/plugins/actions/snmptrap/src/assembly/assembly.xml index 0cdd599fd0e..0f953c6566c 100644 --- a/plugins/actions/snmptrap/src/assembly/assembly.xml +++ b/plugins/actions/snmptrap/src/assembly/assembly.xml @@ -23,33 +23,34 @@ zip - actions/snmptrap + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/snmptrap true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-snmptrap:jar + plugins/actions/snmptrap - lib org.snmp4j:snmp4j:jar + plugins/actions/snmptrap/lib \ No newline at end of file diff --git a/plugins/actions/snowflake/pom.xml b/plugins/actions/snowflake/pom.xml index b9704ba3d2b..238854ade61 100644 --- a/plugins/actions/snowflake/pom.xml +++ b/plugins/actions/snowflake/pom.xml @@ -27,7 +27,6 @@ hop-action-snowflake jar - Hop Plugins Actions SQL diff --git a/plugins/actions/snowflake/src/assembly/assembly.xml b/plugins/actions/snowflake/src/assembly/assembly.xml index e921b3f9721..a0f172900c7 100644 --- a/plugins/actions/snowflake/src/assembly/assembly.xml +++ b/plugins/actions/snowflake/src/assembly/assembly.xml @@ -23,33 +23,28 @@ zip - actions/snowflake + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/snowflake true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-snowflake:jar - - - lib - - net.snowflake:snowflake-jdbc:jar - + plugins/actions/snowflake \ No newline at end of file diff --git a/plugins/actions/sql/pom.xml b/plugins/actions/sql/pom.xml index f5c0c92b3f9..bd771ebfac2 100644 --- a/plugins/actions/sql/pom.xml +++ b/plugins/actions/sql/pom.xml @@ -27,7 +27,6 @@ hop-action-sql jar - Hop Plugins Actions SQL diff --git a/plugins/actions/sql/src/assembly/assembly.xml b/plugins/actions/sql/src/assembly/assembly.xml index f2a3fce1bad..26bf9083be8 100644 --- a/plugins/actions/sql/src/assembly/assembly.xml +++ b/plugins/actions/sql/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/sql + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/sql true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-sql:jar + plugins/actions/sql \ No newline at end of file diff --git a/plugins/actions/success/src/assembly/assembly.xml b/plugins/actions/success/src/assembly/assembly.xml index 1de36051c3d..cecf3c6b391 100644 --- a/plugins/actions/success/src/assembly/assembly.xml +++ b/plugins/actions/success/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/success + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/success true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-success:jar + plugins/actions/success \ No newline at end of file diff --git a/plugins/actions/tableexists/pom.xml b/plugins/actions/tableexists/pom.xml index 7701d37acd7..3ef260b29b6 100644 --- a/plugins/actions/tableexists/pom.xml +++ b/plugins/actions/tableexists/pom.xml @@ -27,7 +27,6 @@ hop-action-tableexists jar - Hop Plugins Actions Table exists diff --git a/plugins/actions/tableexists/src/assembly/assembly.xml b/plugins/actions/tableexists/src/assembly/assembly.xml index 29030e9b70b..61184f17c70 100644 --- a/plugins/actions/tableexists/src/assembly/assembly.xml +++ b/plugins/actions/tableexists/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/tableexists + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/tableexists true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-tableexists:jar + plugins/actions/tableexists \ No newline at end of file diff --git a/plugins/actions/telnet/src/assembly/assembly.xml b/plugins/actions/telnet/src/assembly/assembly.xml index d637a924046..36152b16b4d 100644 --- a/plugins/actions/telnet/src/assembly/assembly.xml +++ b/plugins/actions/telnet/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/telnet + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/telnet true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-telnet:jar + plugins/actions/telnet \ No newline at end of file diff --git a/plugins/actions/truncatetables/pom.xml b/plugins/actions/truncatetables/pom.xml index 88db9c9fb32..0126cdcfbb0 100644 --- a/plugins/actions/truncatetables/pom.xml +++ b/plugins/actions/truncatetables/pom.xml @@ -27,7 +27,6 @@ hop-action-truncatetables jar - Hop Plugins Actions Truncate tables diff --git a/plugins/actions/truncatetables/src/assembly/assembly.xml b/plugins/actions/truncatetables/src/assembly/assembly.xml index b9816c65cfa..e6ed272cbd4 100644 --- a/plugins/actions/truncatetables/src/assembly/assembly.xml +++ b/plugins/actions/truncatetables/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/truncatetables + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/truncatetables true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-truncatetables:jar + plugins/actions/truncatetables \ No newline at end of file diff --git a/plugins/actions/unzip/src/assembly/assembly.xml b/plugins/actions/unzip/src/assembly/assembly.xml index 7a3ad06dcd4..675a486fdf1 100644 --- a/plugins/actions/unzip/src/assembly/assembly.xml +++ b/plugins/actions/unzip/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/unzip + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/unzip true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-unzip:jar + plugins/actions/unzip \ No newline at end of file diff --git a/plugins/actions/waitforfile/pom.xml b/plugins/actions/waitforfile/pom.xml index 814f4b55725..18b0f37220f 100644 --- a/plugins/actions/waitforfile/pom.xml +++ b/plugins/actions/waitforfile/pom.xml @@ -27,7 +27,6 @@ hop-action-waitforfile jar - Hop Plugins Actions Wait for file diff --git a/plugins/actions/waitforfile/src/assembly/assembly.xml b/plugins/actions/waitforfile/src/assembly/assembly.xml index e12b6f9683a..f0467e6dc90 100644 --- a/plugins/actions/waitforfile/src/assembly/assembly.xml +++ b/plugins/actions/waitforfile/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/waitforfile + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/waitforfile true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-waitforfile:jar + plugins/actions/waitforfile \ No newline at end of file diff --git a/plugins/actions/waitforsql/pom.xml b/plugins/actions/waitforsql/pom.xml index 664f5d8de70..2169dd2195c 100644 --- a/plugins/actions/waitforsql/pom.xml +++ b/plugins/actions/waitforsql/pom.xml @@ -27,7 +27,6 @@ hop-action-waitforsql jar - Hop Plugins Actions Wait for SQL diff --git a/plugins/actions/waitforsql/src/assembly/assembly.xml b/plugins/actions/waitforsql/src/assembly/assembly.xml index 426b107e777..7e61094f627 100644 --- a/plugins/actions/waitforsql/src/assembly/assembly.xml +++ b/plugins/actions/waitforsql/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/waitforsql + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/waitforsql true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-waitforsql:jar + plugins/actions/waitforsql \ No newline at end of file diff --git a/plugins/actions/webserviceavailable/pom.xml b/plugins/actions/webserviceavailable/pom.xml index 21a4f229a3c..a0f83f802ef 100644 --- a/plugins/actions/webserviceavailable/pom.xml +++ b/plugins/actions/webserviceavailable/pom.xml @@ -27,7 +27,6 @@ hop-action-webserviceavailable jar - Hop Plugins Actions Check webservice availability diff --git a/plugins/actions/webserviceavailable/src/assembly/assembly.xml b/plugins/actions/webserviceavailable/src/assembly/assembly.xml index 6bb12aaf3e5..e4da20dda87 100644 --- a/plugins/actions/webserviceavailable/src/assembly/assembly.xml +++ b/plugins/actions/webserviceavailable/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/webserviceavailable + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/webserviceavailable true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-webserviceavailable:jar + plugins/actions/webserviceavailable \ No newline at end of file diff --git a/plugins/actions/workflow/pom.xml b/plugins/actions/workflow/pom.xml index 19f273e6c22..d58e7ec134f 100644 --- a/plugins/actions/workflow/pom.xml +++ b/plugins/actions/workflow/pom.xml @@ -26,7 +26,6 @@ hop-action-workflow jar - Hop Plugins Actions Workflow diff --git a/plugins/actions/workflow/src/assembly/assembly.xml b/plugins/actions/workflow/src/assembly/assembly.xml index b67f44762c5..f36176b7dd0 100644 --- a/plugins/actions/workflow/src/assembly/assembly.xml +++ b/plugins/actions/workflow/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/workflow + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/workflow true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-workflow:jar + plugins/actions/workflow \ No newline at end of file diff --git a/plugins/actions/writetofile/pom.xml b/plugins/actions/writetofile/pom.xml index 45a96b0ca1d..b495c478c92 100644 --- a/plugins/actions/writetofile/pom.xml +++ b/plugins/actions/writetofile/pom.xml @@ -27,7 +27,6 @@ hop-action-writetofile jar - Hop Plugins Actions Write to file diff --git a/plugins/actions/writetofile/src/assembly/assembly.xml b/plugins/actions/writetofile/src/assembly/assembly.xml index dc7c233329e..76140280509 100644 --- a/plugins/actions/writetofile/src/assembly/assembly.xml +++ b/plugins/actions/writetofile/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/writetofile + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/writetofile true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-writetofile:jar + plugins/actions/writetofile \ No newline at end of file diff --git a/plugins/actions/writetolog/pom.xml b/plugins/actions/writetolog/pom.xml index 4c06cd36548..5b09a16a06b 100644 --- a/plugins/actions/writetolog/pom.xml +++ b/plugins/actions/writetolog/pom.xml @@ -27,7 +27,6 @@ hop-action-writetolog jar - Hop Plugins Actions Write To Log diff --git a/plugins/actions/writetolog/src/assembly/assembly.xml b/plugins/actions/writetolog/src/assembly/assembly.xml index c011b11f0b3..4c4956b183c 100644 --- a/plugins/actions/writetolog/src/assembly/assembly.xml +++ b/plugins/actions/writetolog/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/writetolog + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/writetolog true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-writetolog:jar + plugins/actions/writetolog \ No newline at end of file diff --git a/plugins/actions/xml/pom.xml b/plugins/actions/xml/pom.xml index d25024a06fa..13d129073d7 100644 --- a/plugins/actions/xml/pom.xml +++ b/plugins/actions/xml/pom.xml @@ -27,20 +27,40 @@ hop-action-xml jar - Hop Plugins Actions XML + + 8.7 + + + + + + org.apache.hop + hop-libs + ${project.version} + pom + import + + + + net.sf.saxon saxon - 8.7 + ${saxon.version} org.apache.hop hop-transform-xml - 2.10.0-SNAPSHOT + ${project.version} compile + + xerces + xercesImpl + provided + diff --git a/plugins/actions/xml/src/assembly/assembly.xml b/plugins/actions/xml/src/assembly/assembly.xml index 891ca1ae770..76417297d61 100644 --- a/plugins/actions/xml/src/assembly/assembly.xml +++ b/plugins/actions/xml/src/assembly/assembly.xml @@ -23,44 +23,46 @@ zip - actions/xml + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/xml true ${project.basedir}/src/main/resources/dependencies.xml - . + plugins/actions/xml true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-xml:jar + plugins/actions/xml - lib - org.apache.hop:hop-transforms-xml:jar + net.sf.saxon:saxon:jar + plugins/actions/xml/lib - lib - net.sf.saxon:saxon:jar + xerces:xercesImpl:jar + xml-apis:xml-apis:jar + lib/core \ No newline at end of file diff --git a/plugins/actions/zipfile/src/assembly/assembly.xml b/plugins/actions/zipfile/src/assembly/assembly.xml index 47823a3e42b..9c500d721b8 100644 --- a/plugins/actions/zipfile/src/assembly/assembly.xml +++ b/plugins/actions/zipfile/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - actions/zipfile + . ${project.basedir}/src/main/resources/version.xml - . + plugins/actions/zipfile true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-action-zipfile:jar + plugins/actions/zipfile \ No newline at end of file diff --git a/plugins/databases/access/pom.xml b/plugins/databases/access/pom.xml index fcc3e016e97..ced16ad9ea0 100644 --- a/plugins/databases/access/pom.xml +++ b/plugins/databases/access/pom.xml @@ -26,19 +26,37 @@ hop-databases-access jar - Hop Plugins Databases Microsoft Access + + 5.0.1 + + + + + + org.apache.hop + hop-libs + ${project.version} + pom + import + + + + com.healthmarketscience.jackcess jackcess - ${jackcess.version} net.sf.ucanaccess ucanaccess - 5.0.1 + ${ucanaccess.version} + + + org.hsqldb + hsqldb diff --git a/plugins/databases/access/src/assembly/assembly.xml b/plugins/databases/access/src/assembly/assembly.xml index 5dbba5dd3dd..674779118e8 100644 --- a/plugins/databases/access/src/assembly/assembly.xml +++ b/plugins/databases/access/src/assembly/assembly.xml @@ -23,35 +23,38 @@ zip - databases/access + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/access true - - - lib - - **/* - - - org.apache.hop:hop-databases-access:jar + plugins/databases/access net.sf.ucanaccess:ucanaccess:jar - com.healthmarketscience.jackcess:jackcess:jar + + plugins/databases/access/lib + + + org.hsqldb:hsqldb:jar - lib + lib/jdbc + + + + com.healthmarketscience.jackcess:jackcess:jar + + lib/core diff --git a/plugins/databases/as400/pom.xml b/plugins/databases/as400/pom.xml index 4ed7023357f..359acc4b119 100644 --- a/plugins/databases/as400/pom.xml +++ b/plugins/databases/as400/pom.xml @@ -26,7 +26,6 @@ hop-databases-as400 jar - Hop Plugins Databases AS400 diff --git a/plugins/databases/as400/src/assembly/assembly.xml b/plugins/databases/as400/src/assembly/assembly.xml index 67b4e4e4cfa..0c5df22eb0c 100644 --- a/plugins/databases/as400/src/assembly/assembly.xml +++ b/plugins/databases/as400/src/assembly/assembly.xml @@ -23,27 +23,20 @@ zip - databases/as400 + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/as400 true - - - lib - - **/* - - - org.apache.hop:hop-databases-as400:jar + plugins/databases/as400 \ No newline at end of file diff --git a/plugins/databases/cache/pom.xml b/plugins/databases/cache/pom.xml index d0b0c75b912..d808417bf0f 100644 --- a/plugins/databases/cache/pom.xml +++ b/plugins/databases/cache/pom.xml @@ -25,8 +25,7 @@ hop-databases-cache - jar - Hop Plugins Databases InterSystems Cache + diff --git a/plugins/databases/cache/src/assembly/assembly.xml b/plugins/databases/cache/src/assembly/assembly.xml index 427470eed41..6b5eb711fbd 100644 --- a/plugins/databases/cache/src/assembly/assembly.xml +++ b/plugins/databases/cache/src/assembly/assembly.xml @@ -23,28 +23,21 @@ zip - databases/cache + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/cache true - - - lib - - **/* - - - org.apache.hop:hop-databases-cache:jar + plugins/databases/cache \ No newline at end of file diff --git a/plugins/databases/clickhouse/pom.xml b/plugins/databases/clickhouse/pom.xml index 44720cb4371..4514b86bbc1 100644 --- a/plugins/databases/clickhouse/pom.xml +++ b/plugins/databases/clickhouse/pom.xml @@ -26,7 +26,19 @@ hop-databases-clickhouse jar - Hop Plugins Databases ClickHouse + + 0.6.2 + + + + + com.clickhouse + clickhouse-jdbc + ${clickhouse.jdbc.version} + + all + + diff --git a/plugins/databases/clickhouse/src/assembly/assembly.xml b/plugins/databases/clickhouse/src/assembly/assembly.xml index ce9517fdfc8..ce5e5a85aca 100644 --- a/plugins/databases/clickhouse/src/assembly/assembly.xml +++ b/plugins/databases/clickhouse/src/assembly/assembly.xml @@ -23,27 +23,26 @@ zip - databases/clickhouse + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/clickhouse true - - - lib - - **/* - - - org.apache.hop:hop-databases-clickhouse:jar + plugins/databases/clickhouse + + + + com.clickhouse:clickhouse-jdbc:jar + + lib/jdbc diff --git a/plugins/databases/cockroachdb/pom.xml b/plugins/databases/cockroachdb/pom.xml index fd91f58c259..e5f5ebb3b5b 100644 --- a/plugins/databases/cockroachdb/pom.xml +++ b/plugins/databases/cockroachdb/pom.xml @@ -24,18 +24,10 @@ 2.10.0-SNAPSHOT - org.apache.hop hop-databases-cockroachdb - 2.10.0-SNAPSHOT - jar - Hop Plugins Databases CockroachDB - - 5.1.4 - - @@ -63,22 +55,4 @@ test - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.1.2 - - - - test-jar - - - - - - - diff --git a/plugins/databases/cockroachdb/src/assembly/assembly.xml b/plugins/databases/cockroachdb/src/assembly/assembly.xml index cd710b27349..eafb25d661c 100644 --- a/plugins/databases/cockroachdb/src/assembly/assembly.xml +++ b/plugins/databases/cockroachdb/src/assembly/assembly.xml @@ -22,33 +22,26 @@ zip - databases/cockroachdb + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/cockroachdb true ${project.basedir}/src/main/resources/dependencies.xml - . + plugins/databases/cockroachdb true - - - lib - - **/* - - - org.apache.hop:hop-databases-cockroachdb:jar + plugins/databases/cockroachdb diff --git a/plugins/databases/cratedb/pom.xml b/plugins/databases/cratedb/pom.xml index c09b98f0980..62854bb9d4b 100644 --- a/plugins/databases/cratedb/pom.xml +++ b/plugins/databases/cratedb/pom.xml @@ -24,33 +24,16 @@ 2.10.0-SNAPSHOT - org.apache.hop hop-databases-cratedb - 2.10.0-SNAPSHOT jar Hop Plugins Databases CrateDB - - 2.7.0 - - - - - - io.crate - crate-jdbc - ${cratedb-jdbc.version} - - - - - org.apache.hop hop-databases-postgresql ${project.version} - compile + provided io.crate @@ -65,21 +48,4 @@ - - - - org.apache.maven.plugins - maven-jar-plugin - 3.3.0 - - - - test-jar - - - - - - - diff --git a/plugins/databases/cratedb/src/assembly/assembly.xml b/plugins/databases/cratedb/src/assembly/assembly.xml index d6622da858f..033ef98d35a 100644 --- a/plugins/databases/cratedb/src/assembly/assembly.xml +++ b/plugins/databases/cratedb/src/assembly/assembly.xml @@ -23,32 +23,32 @@ zip - databases/cratedb + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/cratedb true ${project.basedir}/src/main/resources/dependencies.xml - . + plugins/databases/cratedb true - - - lib - - **/* - - - org.apache.hop:hop-databases-cratedb:jar + plugins/databases/cratedb + + + runtime + + org.apache.hop:hop-databases-cratedb:jar + + lib/jdbc diff --git a/plugins/databases/db2/pom.xml b/plugins/databases/db2/pom.xml index a728b50e907..f947da1a7a9 100644 --- a/plugins/databases/db2/pom.xml +++ b/plugins/databases/db2/pom.xml @@ -25,9 +25,7 @@ hop-databases-db2 - jar - Hop Plugins Databases DB2 diff --git a/plugins/databases/db2/src/assembly/assembly.xml b/plugins/databases/db2/src/assembly/assembly.xml index 7a4317aac37..278ebf3341b 100644 --- a/plugins/databases/db2/src/assembly/assembly.xml +++ b/plugins/databases/db2/src/assembly/assembly.xml @@ -23,28 +23,21 @@ zip - databases/db2 + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/db2 true - - - lib - - **/* - - - org.apache.hop:hop-databases-db2:jar + plugins/databases/db2 diff --git a/plugins/databases/derby/pom.xml b/plugins/databases/derby/pom.xml index f95dc3bb1f2..78d7e155f69 100644 --- a/plugins/databases/derby/pom.xml +++ b/plugins/databases/derby/pom.xml @@ -25,8 +25,14 @@ hop-databases-derby - jar - Hop Plugins Databases Apache Derby + + + + org.apache.derby + derbyclient + + + diff --git a/plugins/databases/derby/src/assembly/assembly.xml b/plugins/databases/derby/src/assembly/assembly.xml index 3bd556f0feb..54efcc88389 100644 --- a/plugins/databases/derby/src/assembly/assembly.xml +++ b/plugins/databases/derby/src/assembly/assembly.xml @@ -23,27 +23,26 @@ zip - databases/derby + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/derby true - - - lib - - **/* - - - org.apache.hop:hop-databases-derby:jar + plugins/databases/derby + + + + org.apache.derby:derbyclient:jar + + lib/jdbc diff --git a/plugins/databases/doris/pom.xml b/plugins/databases/doris/pom.xml index c37b596646e..83f1014d0a1 100644 --- a/plugins/databases/doris/pom.xml +++ b/plugins/databases/doris/pom.xml @@ -25,41 +25,21 @@ hop-databases-doris - jar - Hop Plugins Databases Apache Doris - - - - - mysql - mysql-connector-java - 8.0.28 - - - org.apache.hop - hop-databases-mysql - ${project.version} - compile - - - - - - - mysql - mysql-connector-java - 8.0.28 - org.apache.hop hop-databases-mysql ${project.version} compile + + com.mysql + mysql-connector-j + provided + diff --git a/plugins/databases/doris/src/assembly/assembly.xml b/plugins/databases/doris/src/assembly/assembly.xml index 2e2594025e3..6ed02bcbb5f 100644 --- a/plugins/databases/doris/src/assembly/assembly.xml +++ b/plugins/databases/doris/src/assembly/assembly.xml @@ -23,33 +23,26 @@ zip - databases/doris + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/doris true ${project.basedir}/src/main/resources/dependencies.xml - . + plugins/databases/doris true - - - - lib - - **/* - - - + org.apache.hop:hop-databases-doris:jar + plugins/databases/doris diff --git a/plugins/databases/duckdb/pom.xml b/plugins/databases/duckdb/pom.xml index 409891658e0..b2d212af088 100644 --- a/plugins/databases/duckdb/pom.xml +++ b/plugins/databases/duckdb/pom.xml @@ -25,16 +25,18 @@ hop-databases-duckdb - jar - Hop Plugins Databases DuckDB + + 1.0.0 + + org.duckdb duckdb_jdbc - 0.10.2 + ${duckdb.version} diff --git a/plugins/databases/duckdb/src/assembly/assembly.xml b/plugins/databases/duckdb/src/assembly/assembly.xml index dfbc830f3d0..836cbc5f626 100644 --- a/plugins/databases/duckdb/src/assembly/assembly.xml +++ b/plugins/databases/duckdb/src/assembly/assembly.xml @@ -23,27 +23,26 @@ zip - databases/duckdb + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/duckdb true - - - lib - - **/* - - - org.apache.hop:hop-databases-duckdb:jar + plugins/databases/duckdb + + + + org.duckdb:duckdb_jdbc:jar + + lib/jdbc diff --git a/plugins/databases/exasol4/pom.xml b/plugins/databases/exasol4/pom.xml index 8c7f7fdec47..d7aa9363879 100644 --- a/plugins/databases/exasol4/pom.xml +++ b/plugins/databases/exasol4/pom.xml @@ -26,7 +26,6 @@ hop-databases-exasol4 jar - Hop Plugins Databases Exasol diff --git a/plugins/databases/exasol4/src/assembly/assembly.xml b/plugins/databases/exasol4/src/assembly/assembly.xml index eac2bc265e4..58e221e2102 100644 --- a/plugins/databases/exasol4/src/assembly/assembly.xml +++ b/plugins/databases/exasol4/src/assembly/assembly.xml @@ -23,28 +23,21 @@ zip - databases/exasol4 + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/exasol4 true - - - - lib - - **/* - - - + org.apache.hop:hop-databases-exasol4:jar + plugins/databases/exasol4 diff --git a/plugins/databases/firebird/pom.xml b/plugins/databases/firebird/pom.xml index 8519314ac96..075b62938df 100644 --- a/plugins/databases/firebird/pom.xml +++ b/plugins/databases/firebird/pom.xml @@ -25,9 +25,7 @@ hop-databases-firebird - jar - Hop Plugins Databases Firebird diff --git a/plugins/databases/firebird/src/assembly/assembly.xml b/plugins/databases/firebird/src/assembly/assembly.xml index dcb95bb5307..4e2672a9740 100644 --- a/plugins/databases/firebird/src/assembly/assembly.xml +++ b/plugins/databases/firebird/src/assembly/assembly.xml @@ -23,28 +23,21 @@ zip - databases/firebird + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/firebird true - - - - lib - - **/* - - - + org.apache.hop:hop-databases-firebird:jar + plugins/databases/firebird \ No newline at end of file diff --git a/plugins/databases/generic/pom.xml b/plugins/databases/generic/pom.xml index 31fd3c553ff..95007349f19 100644 --- a/plugins/databases/generic/pom.xml +++ b/plugins/databases/generic/pom.xml @@ -25,9 +25,7 @@ hop-databases-generic - jar - Hop Plugins Databases Generic diff --git a/plugins/databases/generic/src/assembly/assembly.xml b/plugins/databases/generic/src/assembly/assembly.xml index 7a0aaa8ddbc..a402442be05 100644 --- a/plugins/databases/generic/src/assembly/assembly.xml +++ b/plugins/databases/generic/src/assembly/assembly.xml @@ -23,28 +23,21 @@ zip - databases/generic + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/generic true - - - - lib - - **/* - - - + org.apache.hop:hop-databases-generic:jar + plugins/databases/generic diff --git a/plugins/databases/googlebigquery/pom.xml b/plugins/databases/googlebigquery/pom.xml index 3ba67bc155e..cec28671eef 100644 --- a/plugins/databases/googlebigquery/pom.xml +++ b/plugins/databases/googlebigquery/pom.xml @@ -26,7 +26,6 @@ hop-databases-googlebigquery jar - Hop Plugins Databases Google BigQuery diff --git a/plugins/databases/googlebigquery/src/assembly/assembly.xml b/plugins/databases/googlebigquery/src/assembly/assembly.xml index 250dcb7ee46..653031bd70c 100644 --- a/plugins/databases/googlebigquery/src/assembly/assembly.xml +++ b/plugins/databases/googlebigquery/src/assembly/assembly.xml @@ -23,37 +23,21 @@ zip - databases/googlebigquery + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/googlebigquery true - - - - lib - - **/* - - - + org.apache.hop:hop-databases-googlebigquery:jar + plugins/databases/googlebigquery - - - com.google.api-client:google-api-client:jar - com.google.apis:google-api-services-bigquery:jar - com.google.http-client:google-http-client-jackson2:jar - com.google.oauth-client:google-oauth-client:jar - - lib - diff --git a/plugins/databases/greenplum/pom.xml b/plugins/databases/greenplum/pom.xml index 474b993677b..ca7f3016524 100644 --- a/plugins/databases/greenplum/pom.xml +++ b/plugins/databases/greenplum/pom.xml @@ -25,30 +25,10 @@ 2.10.0-SNAPSHOT - org.apache.hop hop-databases-greenplum - 2.10.0-SNAPSHOT - jar - Hop Plugins Databases Greenplum - - 5.1.4 - - - - - - - org.apache.hop - hop-databases-postgresql - ${project.version} - test - - - - org.apache.hop @@ -65,21 +45,4 @@ - - - - org.apache.maven.plugins - maven-jar-plugin - 3.1.2 - - - - test-jar - - - - - - - diff --git a/plugins/databases/greenplum/src/assembly/assembly.xml b/plugins/databases/greenplum/src/assembly/assembly.xml index a0745072ba8..b4f631091a6 100644 --- a/plugins/databases/greenplum/src/assembly/assembly.xml +++ b/plugins/databases/greenplum/src/assembly/assembly.xml @@ -23,33 +23,26 @@ zip - databases/greenplum + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/greenplum true ${project.basedir}/src/main/resources/dependencies.xml - . + plugins/databases/greenplum true - - - - lib - - **/* - - - + org.apache.hop:hop-databases-greenplum:jar + plugins/databases/greenplum diff --git a/plugins/databases/h2/pom.xml b/plugins/databases/h2/pom.xml index d3603df6bb7..b3c292d0b40 100644 --- a/plugins/databases/h2/pom.xml +++ b/plugins/databases/h2/pom.xml @@ -25,8 +25,19 @@ hop-databases-h2 - jar - Hop Plugins Databases H2 + + + 2.2.224 + + + + + com.h2database + h2 + ${h2.version} + + + diff --git a/plugins/databases/h2/src/assembly/assembly.xml b/plugins/databases/h2/src/assembly/assembly.xml index 7cd64cbeca3..94a90285437 100644 --- a/plugins/databases/h2/src/assembly/assembly.xml +++ b/plugins/databases/h2/src/assembly/assembly.xml @@ -23,27 +23,27 @@ zip - databases/h2 + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/h2 true - - - lib - - **/* - - - + org.apache.hop:hop-databases-h2:jar + plugins/databases/h2 + + + + com.h2database:h2:jar + + lib/jdbc diff --git a/plugins/databases/hive/pom.xml b/plugins/databases/hive/pom.xml index 20b610512ff..73239443265 100644 --- a/plugins/databases/hive/pom.xml +++ b/plugins/databases/hive/pom.xml @@ -26,64 +26,18 @@ hop-databases-hive jar - Hop Plugins Databases Apache Hive - 2.3.9 + 4.0.0 - - org.apache.hadoop - hadoop-client - ${hadoop.version} - - - org.apache.hadoop - hadoop-client-api - ${hadoop.version} - org.apache.hive hive-jdbc ${hive.version} - - - jdk.tools - jdk.tools - - - org.glassfish.web - javax.servlet.jsp - - - org.glassfish.web - javax.servlet.jsp - - - org.glassfish.web - javax.servlet.jsp - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.1.2 - - - - test-jar - - - - - - - diff --git a/plugins/databases/hive/src/assembly/assembly.xml b/plugins/databases/hive/src/assembly/assembly.xml index e01817c161d..3fa3f5137f1 100644 --- a/plugins/databases/hive/src/assembly/assembly.xml +++ b/plugins/databases/hive/src/assembly/assembly.xml @@ -23,32 +23,27 @@ zip - databases/hive + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/hive true + org.apache.hop:hop-databases-hive:jar + plugins/databases/hive - lib - org.apache.hive:hive-common:jar org.apache.hive:hive-jdbc:jar - org.apache.hive:hive-metastore:jar - org.apache.hive:hive-serde:jar - org.apache.hive:hive-service:jar - org.apache.hive:hive-service-rpc:jar - org.apache.hadoop:hadoop-client:jar - org.apache.thrift:libthrift:jar + plugins/databases/hive/lib diff --git a/plugins/databases/hypersonic/pom.xml b/plugins/databases/hypersonic/pom.xml index 91db7f73fed..d690c5a6cb2 100644 --- a/plugins/databases/hypersonic/pom.xml +++ b/plugins/databases/hypersonic/pom.xml @@ -26,7 +26,13 @@ hop-databases-hypersonic jar - Hop Plugins Databases Hypersonic + + + org.hsqldb + hsqldb + + + diff --git a/plugins/databases/hypersonic/src/assembly/assembly.xml b/plugins/databases/hypersonic/src/assembly/assembly.xml index be4a1536fa5..35068637389 100644 --- a/plugins/databases/hypersonic/src/assembly/assembly.xml +++ b/plugins/databases/hypersonic/src/assembly/assembly.xml @@ -23,27 +23,27 @@ zip - databases/hypersonic + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/hypersonic true - - - lib - - **/* - - - + org.apache.hop:hop-databases-hypersonic:jar + plugins/databases/hypersonic + + + + org.hsqldb:hsqldb:jar + + lib/jdbc diff --git a/plugins/databases/infobright/pom.xml b/plugins/databases/infobright/pom.xml index 1ca50460311..2ffb39a8b94 100644 --- a/plugins/databases/infobright/pom.xml +++ b/plugins/databases/infobright/pom.xml @@ -25,9 +25,7 @@ hop-databases-infobright - jar - Hop Plugins Databases Infobright @@ -39,20 +37,4 @@ - - - - org.apache.maven.plugins - maven-jar-plugin - 3.1.2 - - - - test-jar - - - - - - diff --git a/plugins/databases/infobright/src/assembly/assembly.xml b/plugins/databases/infobright/src/assembly/assembly.xml index 749f90825ea..6c3e4ae7a43 100644 --- a/plugins/databases/infobright/src/assembly/assembly.xml +++ b/plugins/databases/infobright/src/assembly/assembly.xml @@ -23,33 +23,26 @@ zip - databases/infobright + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/infobright true ${project.basedir}/src/main/resources/dependencies.xml - . + plugins/databases/infobright true - - - - lib - - **/* - - - + org.apache.hop:hop-databases-infobright:jar + plugins/databases/infobright diff --git a/plugins/databases/informix/pom.xml b/plugins/databases/informix/pom.xml index b090e7c7f1a..24706e52576 100644 --- a/plugins/databases/informix/pom.xml +++ b/plugins/databases/informix/pom.xml @@ -25,9 +25,7 @@ hop-databases-informix - jar - Hop Plugins Databases Informix diff --git a/plugins/databases/informix/src/assembly/assembly.xml b/plugins/databases/informix/src/assembly/assembly.xml index bbb0c0ed284..a957368f6ce 100644 --- a/plugins/databases/informix/src/assembly/assembly.xml +++ b/plugins/databases/informix/src/assembly/assembly.xml @@ -23,28 +23,21 @@ zip - databases/informix + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/informix true - - - - lib - - **/* - - - + org.apache.hop:hop-databases-informix:jar + plugins/databases/informix diff --git a/plugins/databases/ingres/pom.xml b/plugins/databases/ingres/pom.xml index 7e9db6747c2..3a2223d92de 100644 --- a/plugins/databases/ingres/pom.xml +++ b/plugins/databases/ingres/pom.xml @@ -25,9 +25,7 @@ hop-databases-ingres - jar - Hop Plugins Databases Ingres diff --git a/plugins/databases/ingres/src/assembly/assembly.xml b/plugins/databases/ingres/src/assembly/assembly.xml index 1c90b04a78f..2742e339e84 100644 --- a/plugins/databases/ingres/src/assembly/assembly.xml +++ b/plugins/databases/ingres/src/assembly/assembly.xml @@ -23,28 +23,21 @@ zip - databases/ingres + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/ingres true - - - - lib - - **/* - - - + org.apache.hop:hop-databases-ingres:jar + plugins/databases/ingres diff --git a/plugins/databases/interbase/pom.xml b/plugins/databases/interbase/pom.xml index b48e79bd873..f2bc8b91316 100644 --- a/plugins/databases/interbase/pom.xml +++ b/plugins/databases/interbase/pom.xml @@ -26,7 +26,6 @@ hop-databases-interbase jar - Hop Plugins Databases Interbase diff --git a/plugins/databases/interbase/src/assembly/assembly.xml b/plugins/databases/interbase/src/assembly/assembly.xml index f03b237cb8f..ce021047f97 100644 --- a/plugins/databases/interbase/src/assembly/assembly.xml +++ b/plugins/databases/interbase/src/assembly/assembly.xml @@ -23,28 +23,21 @@ zip - databases/interbase + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/interbase true - - - - lib - - **/* - - - + org.apache.hop:hop-databases-interbase:jar + plugins/databases/interbase diff --git a/plugins/databases/iris/pom.xml b/plugins/databases/iris/pom.xml index d48b8960ba6..18917901c21 100644 --- a/plugins/databases/iris/pom.xml +++ b/plugins/databases/iris/pom.xml @@ -25,8 +25,7 @@ hop-databases-iris - jar - Hop Plugins Databases InterSystems Iris + diff --git a/plugins/databases/iris/src/assembly/assembly.xml b/plugins/databases/iris/src/assembly/assembly.xml index 13b3d938dbe..8419bd22236 100644 --- a/plugins/databases/iris/src/assembly/assembly.xml +++ b/plugins/databases/iris/src/assembly/assembly.xml @@ -23,28 +23,21 @@ zip - databases/iris + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/iris true - - - - lib - - **/* - - - + org.apache.hop:hop-databases-iris:jar + plugins/databases/iris \ No newline at end of file diff --git a/plugins/databases/kingbasees/pom.xml b/plugins/databases/kingbasees/pom.xml index aee07631bef..b442e79da13 100644 --- a/plugins/databases/kingbasees/pom.xml +++ b/plugins/databases/kingbasees/pom.xml @@ -25,9 +25,7 @@ hop-databases-kingbasees - jar - Hop Plugins Databases KingbaseES diff --git a/plugins/databases/kingbasees/src/assembly/assembly.xml b/plugins/databases/kingbasees/src/assembly/assembly.xml index e5ba2a2b098..e993df00332 100644 --- a/plugins/databases/kingbasees/src/assembly/assembly.xml +++ b/plugins/databases/kingbasees/src/assembly/assembly.xml @@ -23,28 +23,21 @@ zip - databases/kingbasees + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/kingbasees true - - - - lib - - **/* - - - + org.apache.hop:hop-databases-kingbasees:jar + plugins/databases/kingbasees diff --git a/plugins/databases/mariadb/pom.xml b/plugins/databases/mariadb/pom.xml index fadcd23dc0b..698b7f4c2c1 100644 --- a/plugins/databases/mariadb/pom.xml +++ b/plugins/databases/mariadb/pom.xml @@ -25,28 +25,12 @@ hop-databases-mariadb - jar - Hop Plugins Databases MariaDB - - - - org.apache.hop - hop-databases-mysql - ${project.version} - test-jar - test - - - org.mariadb.jdbc - mariadb-java-client - 2.5.1 - test - - - + + 3.4.0 + @@ -55,6 +39,12 @@ ${project.version} compile + + org.mariadb.jdbc + mariadb-java-client + ${mariadb.version} + compile + org.apache.hop hop-databases-mysql @@ -62,30 +52,6 @@ test-jar test - - - org.mariadb.jdbc - mariadb-java-client - 2.5.1 - test - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.1.2 - - - - test-jar - - - - - - - diff --git a/plugins/databases/mariadb/src/assembly/assembly.xml b/plugins/databases/mariadb/src/assembly/assembly.xml index 7978b00f99f..5840c671fe3 100644 --- a/plugins/databases/mariadb/src/assembly/assembly.xml +++ b/plugins/databases/mariadb/src/assembly/assembly.xml @@ -23,33 +23,26 @@ zip - databases/mariadb + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/mariadb true ${project.basedir}/src/main/resources/dependencies.xml - . + plugins/databases/mariadb true - - - - lib - - **/* - - - + org.apache.hop:hop-databases-mariadb:jar + plugins/databases/mariadb diff --git a/plugins/databases/monetdb/pom.xml b/plugins/databases/monetdb/pom.xml index d5ea4457564..0a64d578b18 100644 --- a/plugins/databases/monetdb/pom.xml +++ b/plugins/databases/monetdb/pom.xml @@ -26,7 +26,26 @@ hop-databases-monetdb jar - Hop Plugins Databases Monet DB + + + monetdb + monetdb-jdbc + + + + + + + true + + + false + + clojars + Clojars + https://clojars.org/repo/ + + diff --git a/plugins/databases/monetdb/src/assembly/assembly.xml b/plugins/databases/monetdb/src/assembly/assembly.xml index c1810954c24..99250db4b42 100644 --- a/plugins/databases/monetdb/src/assembly/assembly.xml +++ b/plugins/databases/monetdb/src/assembly/assembly.xml @@ -16,33 +16,34 @@ ~ --> - + hop-databases-monetdb zip - databases/monetdb + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/monetdb true - - - lib - - **/* - - - + org.apache.hop:hop-databases-monetdb:jar + plugins/databases/monetdb + + + + monetdb:monetdb-jdbc:jar + + lib/jdbc diff --git a/plugins/databases/mssql/pom.xml b/plugins/databases/mssql/pom.xml index 7a5e88f2f6e..143cb29eb47 100644 --- a/plugins/databases/mssql/pom.xml +++ b/plugins/databases/mssql/pom.xml @@ -26,24 +26,6 @@ hop-databases-mssql jar - Hop Plugins Databases MS SQL Server - - - - org.apache.maven.plugins - maven-jar-plugin - 3.1.2 - - - - test-jar - - - - - - - diff --git a/plugins/databases/mssql/src/assembly/assembly.xml b/plugins/databases/mssql/src/assembly/assembly.xml index f24d53f0389..c34e8257a9a 100644 --- a/plugins/databases/mssql/src/assembly/assembly.xml +++ b/plugins/databases/mssql/src/assembly/assembly.xml @@ -23,28 +23,21 @@ zip - databases/mssql + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/mssql true - - - - lib - - **/* - - - + org.apache.hop:hop-databases-mssql:jar + plugins/databases/mssql diff --git a/plugins/databases/mssqlnative/pom.xml b/plugins/databases/mssqlnative/pom.xml index 2cd3a8ec5c0..6bb3aef9592 100644 --- a/plugins/databases/mssqlnative/pom.xml +++ b/plugins/databases/mssqlnative/pom.xml @@ -26,10 +26,18 @@ hop-databases-mssqlnative jar - Hop Plugins Databases MS SQL Server (native) + + 12.6.3.jre11 + + + + com.microsoft.sqlserver + mssql-jdbc + ${mssqlnative.version} + org.apache.hop hop-databases-mssql diff --git a/plugins/databases/mssqlnative/src/assembly/assembly.xml b/plugins/databases/mssqlnative/src/assembly/assembly.xml index cabd03fad08..7ae9a8eef4b 100644 --- a/plugins/databases/mssqlnative/src/assembly/assembly.xml +++ b/plugins/databases/mssqlnative/src/assembly/assembly.xml @@ -23,32 +23,32 @@ zip - databases/mssqlnative + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/mssqlnative true ${project.basedir}/src/main/resources/dependencies.xml - . + plugins/databases/mssqlnative true - - - lib - - **/* - - - + org.apache.hop:hop-databases-mssqlnative:jar + plugins/databases/mssqlnative + + + + com.microsoft.sqlserver:mssql-jdbc:jar + + lib/jdbc diff --git a/plugins/databases/mysql/pom.xml b/plugins/databases/mysql/pom.xml index 3c9ed4c0cf2..34b6e5d5a0a 100644 --- a/plugins/databases/mysql/pom.xml +++ b/plugins/databases/mysql/pom.xml @@ -31,27 +31,10 @@ - mysql - mysql-connector-java - 8.0.28 + com.mysql + mysql-connector-j + provided - - - - org.apache.maven.plugins - maven-jar-plugin - 3.1.2 - - - - test-jar - - - - - - - diff --git a/plugins/databases/mysql/src/assembly/assembly.xml b/plugins/databases/mysql/src/assembly/assembly.xml index b6dff6bc204..4245d17dce6 100644 --- a/plugins/databases/mysql/src/assembly/assembly.xml +++ b/plugins/databases/mysql/src/assembly/assembly.xml @@ -23,28 +23,21 @@ zip - databases/mysql + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/mysql true - - - - lib - - **/* - - - + org.apache.hop:hop-databases-mysql:jar + plugins/databases/mysql diff --git a/plugins/databases/netezza/pom.xml b/plugins/databases/netezza/pom.xml index 9bda0050113..ce5f65eb319 100644 --- a/plugins/databases/netezza/pom.xml +++ b/plugins/databases/netezza/pom.xml @@ -26,7 +26,6 @@ hop-databases-netezza jar - Hop Plugins Databases Netteza diff --git a/plugins/databases/netezza/src/assembly/assembly.xml b/plugins/databases/netezza/src/assembly/assembly.xml index df7ceb085f2..17a98a55faf 100644 --- a/plugins/databases/netezza/src/assembly/assembly.xml +++ b/plugins/databases/netezza/src/assembly/assembly.xml @@ -23,28 +23,21 @@ zip - databases/netezza + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/netezza true - - - - lib - - **/* - - - + org.apache.hop:hop-databases-netezza:jar + plugins/databases/netezza diff --git a/plugins/databases/oracle/pom.xml b/plugins/databases/oracle/pom.xml index 5a21b14c308..27a6ddfd704 100644 --- a/plugins/databases/oracle/pom.xml +++ b/plugins/databases/oracle/pom.xml @@ -26,7 +26,6 @@ hop-databases-oracle jar - Hop Plugins Databases Oracle diff --git a/plugins/databases/oracle/src/assembly/assembly.xml b/plugins/databases/oracle/src/assembly/assembly.xml index c9e8157ca51..671076e4b6e 100644 --- a/plugins/databases/oracle/src/assembly/assembly.xml +++ b/plugins/databases/oracle/src/assembly/assembly.xml @@ -23,28 +23,21 @@ zip - databases/oracle + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/oracle true - - - - lib - - **/* - - - + org.apache.hop:hop-databases-oracle:jar + plugins/databases/oracle diff --git a/plugins/databases/oraclerdb/pom.xml b/plugins/databases/oraclerdb/pom.xml index a81063100ba..7297c3b2125 100644 --- a/plugins/databases/oraclerdb/pom.xml +++ b/plugins/databases/oraclerdb/pom.xml @@ -26,7 +26,6 @@ hop-databases-oraclerdb jar - Hop Plugins Databases Oracle RDB diff --git a/plugins/databases/oraclerdb/src/assembly/assembly.xml b/plugins/databases/oraclerdb/src/assembly/assembly.xml index af47247bd1f..51bb19d307d 100644 --- a/plugins/databases/oraclerdb/src/assembly/assembly.xml +++ b/plugins/databases/oraclerdb/src/assembly/assembly.xml @@ -23,28 +23,21 @@ zip - databases/oraclerdb + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/oraclerdb true - - - - lib - - **/* - - - + org.apache.hop:hop-databases-oraclerdb:jar + plugins/databases/oraclerdb diff --git a/plugins/databases/pom.xml b/plugins/databases/pom.xml index 7eca39b5f5d..f30b28b0086 100644 --- a/plugins/databases/pom.xml +++ b/plugins/databases/pom.xml @@ -25,9 +25,7 @@ hop-plugins-databases - 2.10.0-SNAPSHOT pom - Hop Plugins Databases @@ -77,74 +75,16 @@ vertica - - - 4.3.2.RELEASE - - org.apache.hop - hop-core - ${project.version} - provided - - - org.apache.hop - hop-core + hop-libs-jdbc ${project.version} - test - test - - - org.apache.hop - hop-engine - ${project.version} - test-jar - test + pom + import - - - org.apache.hop - hop-core - compile - - - org.apache.hop - hop-ui - 2.10.0-SNAPSHOT - compile - - - javax.servlet - javax.servlet-api - ${javax.servlet-api.version} - test - - - org.apache.hop - hop-core - ${project.version} - test-jar - test - - - org.apache.hop - hop-engine - ${project.version} - test-jar - test - - - org.springframework - spring-test - ${spring.framework.version} - test - - - diff --git a/plugins/databases/postgresql/pom.xml b/plugins/databases/postgresql/pom.xml index 6c0095c155d..af73bd75c7a 100644 --- a/plugins/databases/postgresql/pom.xml +++ b/plugins/databases/postgresql/pom.xml @@ -25,52 +25,15 @@ 2.10.0-SNAPSHOT - org.apache.hop hop-databases-postgresql - 2.10.0-SNAPSHOT - jar - Hop Plugins Databases PostgreSQL - - 42.7.2 - - - - - - org.postgresql - postgresql - ${postgresql.version} - runtime - - - - org.postgresql postgresql - compile - - - - org.apache.maven.plugins - maven-jar-plugin - 3.1.2 - - - - test-jar - - - - - - - diff --git a/plugins/databases/postgresql/src/assembly/assembly.xml b/plugins/databases/postgresql/src/assembly/assembly.xml index 5191dafe417..331c6c03565 100644 --- a/plugins/databases/postgresql/src/assembly/assembly.xml +++ b/plugins/databases/postgresql/src/assembly/assembly.xml @@ -23,11 +23,11 @@ zip - databases/postgresql + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/postgresql true @@ -36,6 +36,13 @@ org.apache.hop:hop-databases-postgresql:jar + plugins/databases/postgresql + + + + org.postgresql:postgresql:jar + + lib/jdbc diff --git a/plugins/databases/redshift/pom.xml b/plugins/databases/redshift/pom.xml index fcdc9f66628..7bdb3984733 100644 --- a/plugins/databases/redshift/pom.xml +++ b/plugins/databases/redshift/pom.xml @@ -25,22 +25,18 @@ 2.10.0-SNAPSHOT - org.apache.hop hop-databases-redshift - 2.10.0-SNAPSHOT - jar - Hop Plugins Databases Redshift - org.apache.hop - hop-databases-postgresql + hop-libs-jdbc ${project.version} - test + pom + import @@ -49,39 +45,13 @@ org.apache.hop hop-databases-postgresql - compile + ${project.version} + + + com.amazon.redshift + redshift-jdbc42 + provided - - - - true - - - false - - mulesoft - Mulesoft - https://repository.mulesoft.org/nexus/content/repositories/public/ - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.1.2 - - - - test-jar - - - - - - - diff --git a/plugins/databases/redshift/src/assembly/assembly.xml b/plugins/databases/redshift/src/assembly/assembly.xml index 11fc360efd9..56574237277 100644 --- a/plugins/databases/redshift/src/assembly/assembly.xml +++ b/plugins/databases/redshift/src/assembly/assembly.xml @@ -23,32 +23,33 @@ zip - databases/redshift + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/redshift true ${project.basedir}/src/main/resources/dependencies.xml - . + plugins/databases/redshift true - - - lib - - **/* - - - + org.apache.hop:hop-databases-redshift:jar + plugins/databases/redshift + + + provided + + com.amazon.redshift:redshift-jdbc42:jar + + lib/jdbc diff --git a/plugins/databases/sapdb/pom.xml b/plugins/databases/sapdb/pom.xml index 1c1782aa860..5af913b980b 100644 --- a/plugins/databases/sapdb/pom.xml +++ b/plugins/databases/sapdb/pom.xml @@ -26,7 +26,6 @@ hop-databases-sapdb jar - Hop Plugins Databases MaxDB (SAP DB) diff --git a/plugins/databases/sapdb/src/assembly/assembly.xml b/plugins/databases/sapdb/src/assembly/assembly.xml index 38f37f3be10..228d96e6984 100644 --- a/plugins/databases/sapdb/src/assembly/assembly.xml +++ b/plugins/databases/sapdb/src/assembly/assembly.xml @@ -23,28 +23,22 @@ zip - databases/sapdb + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/sapdb true - - - lib - - **/* - - - + org.apache.hop:hop-databases-sapdb:jar + plugins/databases/sapdb \ No newline at end of file diff --git a/plugins/databases/snowflake/pom.xml b/plugins/databases/snowflake/pom.xml index a91c84ca5f2..e32e3f59fd9 100644 --- a/plugins/databases/snowflake/pom.xml +++ b/plugins/databases/snowflake/pom.xml @@ -26,14 +26,24 @@ hop-databases-snowflake jar - Hop Plugins Databases Snowflake + + + + org.apache.hop + hop-libs-jdbc + ${project.version} + pom + import + + + + - commons-validator - commons-validator - 1.6 + net.snowflake + snowflake-jdbc diff --git a/plugins/databases/snowflake/src/assembly/assembly.xml b/plugins/databases/snowflake/src/assembly/assembly.xml index b47ba394587..bf3bee7f009 100644 --- a/plugins/databases/snowflake/src/assembly/assembly.xml +++ b/plugins/databases/snowflake/src/assembly/assembly.xml @@ -23,27 +23,27 @@ zip - databases/snowflake + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/snowflake true - - - lib - - **/* - - - + org.apache.hop:hop-databases-snowflake:jar + plugins/databases/snowflake + + + + net.snowflake:snowflake-jdbc:jar + + lib/jdbc diff --git a/plugins/databases/sqlbase/pom.xml b/plugins/databases/sqlbase/pom.xml index ab353f223d5..4ab1251784a 100644 --- a/plugins/databases/sqlbase/pom.xml +++ b/plugins/databases/sqlbase/pom.xml @@ -26,7 +26,6 @@ hop-databases-sqlbase jar - Hop Plugins Databases Gupta SQLBase diff --git a/plugins/databases/sqlbase/src/assembly/assembly.xml b/plugins/databases/sqlbase/src/assembly/assembly.xml index 609c9bb1f40..27927815253 100644 --- a/plugins/databases/sqlbase/src/assembly/assembly.xml +++ b/plugins/databases/sqlbase/src/assembly/assembly.xml @@ -23,28 +23,21 @@ zip - databases/sqlbase + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/sqlbase true - - - - lib - - **/* - - - + org.apache.hop:hop-databases-sqlbase:jar + plugins/databases/sqlbase diff --git a/plugins/databases/sqlite/pom.xml b/plugins/databases/sqlite/pom.xml index ef4df2b97b1..53666c9dffe 100644 --- a/plugins/databases/sqlite/pom.xml +++ b/plugins/databases/sqlite/pom.xml @@ -26,7 +26,18 @@ hop-databases-sqlite jar - Hop Plugins Databases SQLite + + 3.46.0.0 + + + + + org.xerial + sqlite-jdbc + ${sqlite.version} + + + diff --git a/plugins/databases/sqlite/src/assembly/assembly.xml b/plugins/databases/sqlite/src/assembly/assembly.xml index cbf09deef8c..7a5137ae1f4 100644 --- a/plugins/databases/sqlite/src/assembly/assembly.xml +++ b/plugins/databases/sqlite/src/assembly/assembly.xml @@ -23,27 +23,27 @@ zip - databases/sqlite + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/sqlite true - - - lib - - **/* - - - + org.apache.hop:hop-databases-sqlite:jar + plugins/databases/sqlite + + + + org.xerial:sqlite-jdbc:jar + + lib/jdbc diff --git a/plugins/databases/sybase/pom.xml b/plugins/databases/sybase/pom.xml index bc11911e905..4da1091270b 100644 --- a/plugins/databases/sybase/pom.xml +++ b/plugins/databases/sybase/pom.xml @@ -25,18 +25,7 @@ hop-databases-sybase - jar - Hop Plugins Databases Sybase - - - org.apache.hop - hop-core - ${project.version} - compile - - - diff --git a/plugins/databases/sybase/src/assembly/assembly.xml b/plugins/databases/sybase/src/assembly/assembly.xml index b9470b270f7..51d284fa223 100644 --- a/plugins/databases/sybase/src/assembly/assembly.xml +++ b/plugins/databases/sybase/src/assembly/assembly.xml @@ -23,28 +23,21 @@ zip - databases/sybase + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/sybase true - - - - lib - - **/* - - - + org.apache.hop:hop-databases-sybase:jar + plugins/databases/sybase diff --git a/plugins/databases/sybaseiq/pom.xml b/plugins/databases/sybaseiq/pom.xml index 144ae903c7b..c61509dd377 100644 --- a/plugins/databases/sybaseiq/pom.xml +++ b/plugins/databases/sybaseiq/pom.xml @@ -25,7 +25,6 @@ hop-databases-sybaseiq - jar Hop Plugins Databases SybaseIQ diff --git a/plugins/databases/sybaseiq/src/assembly/assembly.xml b/plugins/databases/sybaseiq/src/assembly/assembly.xml index 7a224cc0d87..20c261d5f33 100644 --- a/plugins/databases/sybaseiq/src/assembly/assembly.xml +++ b/plugins/databases/sybaseiq/src/assembly/assembly.xml @@ -23,28 +23,21 @@ zip - databases/sybaseiq + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/sybaseiq true - - - - lib - - **/* - - - + org.apache.hop:hop-databases-sybaseiq:jar + plugins/databases/sybaseiq diff --git a/plugins/databases/teradata/pom.xml b/plugins/databases/teradata/pom.xml index e9682cffc8f..daecad42f6d 100644 --- a/plugins/databases/teradata/pom.xml +++ b/plugins/databases/teradata/pom.xml @@ -25,7 +25,6 @@ hop-databases-teradata - jar Hop Plugins Databases Teradata diff --git a/plugins/databases/teradata/src/assembly/assembly.xml b/plugins/databases/teradata/src/assembly/assembly.xml index 1451f219b76..1ea421a1659 100644 --- a/plugins/databases/teradata/src/assembly/assembly.xml +++ b/plugins/databases/teradata/src/assembly/assembly.xml @@ -23,28 +23,21 @@ zip - databases/teradata + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/teradata true - - - - lib - - **/* - - - + org.apache.hop:hop-databases-teradata:jar + plugins/databases/teradata diff --git a/plugins/databases/universe/pom.xml b/plugins/databases/universe/pom.xml index 8750de3ecaf..85f0abd6367 100644 --- a/plugins/databases/universe/pom.xml +++ b/plugins/databases/universe/pom.xml @@ -25,7 +25,6 @@ hop-databases-universe - jar Hop Plugins Databases UniVerse diff --git a/plugins/databases/universe/src/assembly/assembly.xml b/plugins/databases/universe/src/assembly/assembly.xml index 3b3d2aa85f3..bfd30c9c7ee 100644 --- a/plugins/databases/universe/src/assembly/assembly.xml +++ b/plugins/databases/universe/src/assembly/assembly.xml @@ -23,28 +23,21 @@ zip - databases/universe + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/universe true - - - - lib - - **/* - - - + org.apache.hop:hop-databases-universe:jar + plugins/databases/universe diff --git a/plugins/databases/vectorwise/pom.xml b/plugins/databases/vectorwise/pom.xml index 80df5d6b591..7d7a20ef982 100644 --- a/plugins/databases/vectorwise/pom.xml +++ b/plugins/databases/vectorwise/pom.xml @@ -25,27 +25,14 @@ hop-databases-vectorwise - jar - Hop Plugins Databases Vectorwise - - - - org.apache.hop - hop-databases-ingres - ${project.version} - test - - - - org.apache.hop hop-databases-ingres - compile + ${project.version} diff --git a/plugins/databases/vectorwise/src/assembly/assembly.xml b/plugins/databases/vectorwise/src/assembly/assembly.xml index 65832328adf..86ef3ecdafc 100644 --- a/plugins/databases/vectorwise/src/assembly/assembly.xml +++ b/plugins/databases/vectorwise/src/assembly/assembly.xml @@ -23,33 +23,26 @@ zip - databases/vectorwise + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/vectorwise true ${project.basedir}/src/main/resources/dependencies.xml - . + plugins/databases/vectorwise true - - - - lib - - **/* - - - + org.apache.hop:hop-databases-vectorwise:jar + plugins/databases/vectorwise diff --git a/plugins/databases/vertica/pom.xml b/plugins/databases/vertica/pom.xml index 612bd5b5d67..d61d5be69aa 100644 --- a/plugins/databases/vertica/pom.xml +++ b/plugins/databases/vertica/pom.xml @@ -24,10 +24,8 @@ 2.10.0-SNAPSHOT - org.apache.hop hop-databases-vertica - 2.10.0-SNAPSHOT - + jar Hop Plugins Databases Vertica diff --git a/plugins/databases/vertica/src/assembly/assembly.xml b/plugins/databases/vertica/src/assembly/assembly.xml index 7d2ad7aeb53..78e503a51c5 100644 --- a/plugins/databases/vertica/src/assembly/assembly.xml +++ b/plugins/databases/vertica/src/assembly/assembly.xml @@ -23,28 +23,21 @@ zip - databases/vertica + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/vertica true - - - - lib - - **/* - - - + org.apache.hop:hop-databases-vertica:jar + plugins/databases/vertica diff --git a/plugins/engines/beam/pom.xml b/plugins/engines/beam/pom.xml index 88245a6c837..6c12df69c47 100644 --- a/plugins/engines/beam/pom.xml +++ b/plugins/engines/beam/pom.xml @@ -25,650 +25,1011 @@ hop-engines-beam - 2.10.0-SNAPSHOT jar - Hop Plugins Engines Beam - 2.14.2 - 2.7.0 - - 1.1.1 - - 0.9.3 + 3.5.1 + + + + org.apache.beam + beam-sdks-java-google-cloud-platform-bom + ${apache-beam.version} + pom + import + + + org.apache.hop + hop-libs + ${project.version} + pom + import + + + + - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - com.fasterxml.jackson.module - jackson-module-scala_2.12 - ${jackson.version} - - - com.google.api.grpc - proto-google-iam-v1 - 1.6.10 - com.google.auto.service auto-service - 1.0-rc4 + 1.1.1 + + + com.google.guava + * + + com.google.cloud google-cloud-bigquery - 1.128.3 - - - com.google.cloud - google-cloud-storage - ${google-cloud-storage.version} com.fasterxml.jackson.core - jackson-core + * - com.fasterxml.jackson.core - jackson-databind + com.google.code.findbugs + jsr305 + + + com.google.errorprone + error_prone_annotations - com.fasterxml.jackson.module - jackson-module-scala_2.11 + com.google.flatbuffers + flatbuffers-java + + + com.google.guava + * + + + commons-codec + * + + + net.bytebuddy + byte-buddy + + + org.apache.arrow + * + + + org.apache.httpcomponents + * + + + org.checkerframework + checker-compat-qual + + + org.checkerframework + checker-qual + + + org.checkerframework + checker-qual + + + org.conscrypt + conscrypt-openjdk-uber + + + org.slf4j + * - - com.google.cloud.bigtable - bigtable-hbase-beam - ${bigtable-hbase-beam.version} - - - com.google.cloud.bigtable - bigtable-metrics-api - 1.26.3 - - - - com.googlecode.json-simple - json-simple - ${json-simple.version} + com.google.cloud + google-cloud-bigtable - * + com.google.errorprone + error_prone_annotations + + + com.google.guava + failureaccess + + + org.apache.httpcomponents * + + org.checkerframework + checker-qual + - - - commons-codec - commons-codec - 1.15 - - - io.grpc - grpc-alts - ${grpc.version} - - io.grpc - grpc-api - ${grpc.version} + org.apache.beam + beam-runners-direct-java + + + com.fasterxml.jackson.core + * + + + org.apache.beam + beam-model-pipeline + + + org.apache.beam + beam-vendor-grpc-1_60_1 + + + org.apache.beam + beam-vendor-guava-32_1_2-jre + + + org.slf4j + * + + - io.grpc - grpc-auth - ${grpc.version} + org.apache.beam + beam-runners-flink-1.16 + + + args4j + args4j + + + com.fasterxml.jackson.core + * + + + com.google.code.findbugs + jsr305 + + + com.google.guava + guava + + + com.twitter + chill-java + + + commons-collections + commons-collections + + + commons-compress + * + + + commons-io + commons-io + + + org.apache.beam + beam-model-fn-execution + + + org.apache.beam + beam-model-job-management + + + org.apache.beam + beam-model-pipeline + + + org.apache.beam + beam-runners-java-job-service + + + org.apache.beam + beam-sdks-java-core + + + org.apache.beam + beam-vendor-grpc-1_60_1 + + + org.apache.beam + beam-vendor-guava-32_1_2-jre + + + org.apache.commons + commons-compress + + + org.apache.commons + commons-lang3 + + + org.apache.commons + commons-math3 + + + org.apache.httpcomponents + * + + + org.checkerframework + checker-qual + + + org.javassist + javassist + + + org.lz4 + lz4-java + + + org.slf4j + * + + + org.xerial.snappy + * + + + org.xerial.snappy + * + + - io.grpc - grpc-context - ${grpc.version} + org.apache.beam + beam-runners-google-cloud-dataflow-java + + + com.fasterxml.jackson.core + * + + + com.google.code.findbugs + jsr305 + + + com.google.errorprone + error_prone_annotations + + + com.google.guava + guava + + + com.google.guava + listenablefuture + + + commons-codec + * + + + net.bytebuddy + byte-buddy + + + org.apache.avro + * + + + org.apache.beam + beam-model-pipeline + + + org.apache.beam + beam-sdks-java-core + + + org.apache.beam + beam-vendor-grpc-1_60_1 + + + org.apache.beam + beam-vendor-guava-32_1_2-jre + + + org.apache.httpcomponents + * + + + org.checkerframework + checker-compat-qual + + + org.checkerframework + checker-qual + + + org.slf4j + * + + - io.grpc - grpc-core - ${grpc.version} + org.apache.beam + beam-runners-spark-3 + + + args4j + args4j + + + com.fasterxml.jackson.core + * + + + org.apache.beam + beam-model-fn-execution + + + org.apache.beam + beam-model-job-management + + + org.apache.beam + beam-model-pipeline + + + org.apache.beam + beam-runners-java-job-service + + + org.apache.beam + beam-sdks-java-core + + + org.apache.beam + beam-vendor-grpc-1_60_1 + + + org.apache.beam + beam-vendor-guava-32_1_2-jre + + + org.apache.commons + commons-lang3 + + + org.checkerframework + checker-qual + + + org.slf4j + * + + - io.grpc - grpc-grpclb - ${grpc.version} + org.apache.beam + beam-sdks-java-extensions-join-library + + + * + * + + - io.grpc - grpc-netty - ${grpc.version} + org.apache.beam + beam-sdks-java-io-azure + + + com.fasterxml.jackson.core + * + + + com.google.guava + guava + + + commons-io + commons-io + + + net.minidev + accessors-smart + + + net.minidev + json-smart + + + org.apache.beam + beam-sdks-java-core + + + org.apache.beam + beam-vendor-guava-32_1_2-jre + + + org.apache.commons + commons-lang3 + + + org.checkerframework + checker-qual + + + org.ow2.asm + asm + + + org.slf4j + * + + - io.grpc - grpc-netty-shaded - ${grpc.version} + org.apache.beam + beam-sdks-java-io-google-cloud-platform + + + com.fasterxml.jackson.core + * + + + com.google.api + * + + + com.google.api-client + * + + + com.google.api.grpc + * + + + com.google.api.grpc + proto-google-cloud-datastore-v1 + + + com.google.api.grpc + proto-google-cloud-firestore-v1 + + + com.google.api.grpc + proto-google-cloud-spanner-admin-database-v1 + + + com.google.api.grpc + proto-google-cloud-spanner-v1 + + + com.google.apis + * + + + com.google.auth + * + + + com.google.cloud + * + + + com.google.cloud + google-cloud-firestore + + + com.google.cloud + google-cloud-spanner + + + com.google.cloud.bigtable + * + + + com.google.cloud.datastore + datastore-v1-proto-client + + + com.google.code.findbugs + jsr305 + + + com.google.code.gson + gson + + + com.google.errorprone + error_prone_annotations + + + com.google.flogger + * + + + com.google.guava + * + + + com.google.http-client + * + + + com.google.oauth-client + * + + + com.google.protobuf + * + + + commons-codec + commons-codec + + + io.grpc + * + + + io.netty + * + + + net.bytebuddy + byte-buddy + + + org.apache.arrow + * + + + org.apache.avro + * + + + org.apache.beam + * + + + org.apache.beam + beam-model-fn-execution + + + org.apache.beam + beam-model-job-management + + + org.apache.beam + beam-model-pipeline + + + org.apache.beam + beam-sdks-java-core + + + org.apache.beam + beam-vendor-grpc-1_60_1 + + + org.apache.beam + beam-vendor-guava-32_1_2-jre + + + org.apache.commons + commons-compress + + + org.apache.httpcomponents + * + + + org.checkerframework + checker-qual + + + org.conscrypt + conscrypt-openjdk-uber + + + org.slf4j + * + + - io.grpc - grpc-protobuf - ${grpc.version} + org.apache.beam + beam-sdks-java-io-hadoop-common + + + * + * + + - io.grpc - grpc-protobuf-lite - ${grpc.version} + org.apache.beam + beam-sdks-java-io-hadoop-file-system + + + * + * + + - io.grpc - grpc-stub - ${grpc.version} + org.apache.beam + beam-sdks-java-io-hcatalog + + + * + * + + - - org.apache.beam - beam-runners-direct-java - ${apache-beam.version} + beam-sdks-java-io-kafka - com.fasterxml.jackson.core - jackson-core + com.fasterxml.jackson.core + * + + + com.google.api.grpc + gapic-google-cloud-storage-v2 - com.fasterxml.jackson.core - jackson-databind + com.google.errorprone + error_prone_annotations - com.fasterxml.jackson.module - jackson-module-scala_2.11 + com.google.guava + failureaccess - - - - org.apache.beam - beam-runners-flink-1.16 - ${apache-beam.version} - - com.fasterxml.jackson.core - jackson-core + com.google.guava + guava - com.fasterxml.jackson.core - jackson-databind + org.apache.avro + * - com.fasterxml.jackson.module - jackson-module-scala_2.11 + org.apache.beam + beam-model-fn-execution - - - - org.apache.beam - beam-runners-google-cloud-dataflow-java - ${apache-beam.version} - - com.fasterxml.jackson.core - jackson-core + org.apache.beam + beam-model-fn-execution - com.fasterxml.jackson.core - jackson-databind + org.apache.beam + beam-model-job-management - com.fasterxml.jackson.module - jackson-module-scala_2.11 + org.apache.beam + beam-model-pipeline - io.grpc - * + org.apache.beam + beam-sdks-java-core - - - - org.apache.beam - beam-runners-spark-3 - ${apache-beam.version} - - com.fasterxml.jackson.core - jackson-core + org.apache.beam + beam-sdks-java-harness - com.fasterxml.jackson.core - jackson-databind + org.apache.beam + beam-vendor-grpc-1_60_1 - com.fasterxml.jackson.module - jackson-module-scala_2.11 + org.apache.beam + beam-vendor-guava-32_1_2-jre - - - - org.apache.beam - beam-sdks-java-extensions-join-library - ${apache-beam.version} - - com.fasterxml.jackson.core - jackson-core + org.apache.commons + commons-compress - com.fasterxml.jackson.core - jackson-databind + org.checkerframework + checker-qual - com.fasterxml.jackson.module - jackson-module-scala_2.11 + org.slf4j + * org.apache.beam - beam-sdks-java-io-amazon-web-services - ${apache-beam.version} - - - org.apache.beam - beam-sdks-java-io-azure - ${apache-beam.version} - - - org.apache.beam - beam-sdks-java-io-hadoop-common - ${apache-beam.version} + beam-sdks-java-io-kinesis com.fasterxml.jackson.core - jackson-core + * - com.fasterxml.jackson.core - jackson-databind + com.google.guava + * - com.fasterxml.jackson.module - jackson-module-scala_2.11 + commons-codec + commons-codec - - - - org.apache.beam - beam-sdks-java-io-hadoop-file-system - ${apache-beam.version} - - com.fasterxml.jackson.core - jackson-core + commons-io + commons-io - com.fasterxml.jackson.core - jackson-databind + commons-lang + commons-lang - com.fasterxml.jackson.module - jackson-module-scala_2.11 + commons-logging + commons-logging - - - - org.apache.beam - beam-sdks-java-io-hcatalog - ${apache-beam.version} - - * - * + org.apache.beam + beam-sdks-java-core - - - - org.apache.beam - beam-sdks-java-io-kafka - ${apache-beam.version} - - com.fasterxml.jackson.core - jackson-core + org.apache.beam + beam-vendor-guava-32_1_2-jre - com.fasterxml.jackson.core - jackson-databind + org.apache.commons + commons-lang3 + + + org.apache.httpcomponents + * + + + org.checkerframework + checker-qual - com.fasterxml.jackson.module - jackson-module-scala_2.11 + org.slf4j + * - - org.apache.beam - beam-sdks-java-io-kinesis - ${apache-beam.version} - - org.apache.beam beam-sdks-java-io-synthetic - ${apache-beam.version} com.fasterxml.jackson.core - jackson-core + * - com.fasterxml.jackson.core - jackson-databind + org.apache.beam + beam-sdks-java-core - com.fasterxml.jackson.module - jackson-module-scala_2.11 + org.apache.beam + beam-vendor-guava-32_1_2-jre - - - - org.apache.beam - beam-vendor-guava-32_1_2-jre - 0.1 - - - org.apache.hadoop - hadoop-client - ${hadoop.version} - - - org.apache.hadoop - hadoop-client-api - ${hadoop.version} - - - org.apache.hive - hive-common - ${hive.version} - - * - * + org.apache.commons + commons-math3 - - - - org.apache.hive - hive-exec - ${hive.version} - core - - * - * + org.checkerframework + checker-qual - - - - org.apache.hive - hive-metastore - ${hive.version} - - * + org.slf4j * - org.apache.hive - hive-serde - ${hive.version} + org.apache.hive.hcatalog + hive-hcatalog-core + 3.1.3 - * + com.fasterxml.jackson.core * - - - - org.apache.hive - hive-service-rpc - ${hive.version} - - * + com.google.code.findbugs + jsr305 + + + com.google.guava * - - - - org.apache.hive - hive-storage-api - ${hive-storage.version} - - * + commons-beanutils + commons-beanutils + + + commons-codec + commons-codec + + + commons-collections + commons-collections + + + commons-io + commons-io + + + commons-lang + commons-lang + + + commons-logging + commons-logging + + + jakarta.activation + jakarta.activation-api + + + log4j + log4j + + + net.minidev + json-smart + + + org.apache.avro * - - - - org.apache.hive - spark-client - ${hive.version} - - * + org.apache.commons + commons-compress + + + org.apache.commons + commons-lang3 + + + org.apache.commons + commons-math3 + + + org.apache.curator + curator-client + + + org.apache.curator + curator-framework + + + org.apache.curator + curator-recipes + + + org.apache.hive * - - - - org.apache.hive.hcatalog - hive-hcatalog-core - ${hive.version} - - * + org.apache.httpcomponents * - - - - org.apache.hive.shims - hive-shims-0.23 - ${hive.version} - - * + org.slf4j * - org.apache.hive.shims - hive-shims-common - ${hive.version} + org.apache.kafka + kafka-clients - * + org.lz4 + lz4-java + + + org.xerial.snappy * - + + org.apache.beam + beam-sdks-java-core + provided + org.apache.hop - hop-core - 2.10.0-SNAPSHOT + hop-engine-beam + ${project.version} + provided org.apache.hop hop-transform-constant - 2.10.0-SNAPSHOT + ${project.version} + provided org.apache.hop hop-transform-filterrows - 2.10.0-SNAPSHOT + ${project.version} + provided org.apache.hop hop-transform-groupby - 2.10.0-SNAPSHOT + ${project.version} + provided - org.apache.hop hop-transform-memgroupby - 2.10.0-SNAPSHOT + ${project.version} + provided org.apache.hop hop-transform-mergejoin - 2.10.0-SNAPSHOT + ${project.version} + provided org.apache.hop hop-transform-rowgenerator - 2.10.0-SNAPSHOT + ${project.version} + provided org.apache.hop hop-transform-sort - 2.10.0-SNAPSHOT + ${project.version} + provided org.apache.hop hop-transform-streamlookup - 2.10.0-SNAPSHOT + ${project.version} + provided org.apache.hop hop-transform-switchcase - 2.10.0-SNAPSHOT + ${project.version} + provided org.apache.hop hop-transform-uniquerows - 2.10.0-SNAPSHOT - - - org.apache.hop - hop-ui - 2.10.0-SNAPSHOT - - - org.apache.kafka - kafka-clients - ${kafka-clients.version} + ${project.version} + provided org.apache.spark spark-core_2.12 - ${apache-spark.version} + ${spark.version} + test - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-databind + org.apache.logging.log4j + log4j-1.2-api - com.fasterxml.jackson.module - jackson-module-scala_2.11 + org.apache.logging.log4j + log4j-api - com.google.guava - guava + org.apache.logging.log4j + log4j-core org.apache.logging.log4j - log4j-slf4j-impl + log4j-slf4j2-impl - org.apache.spark spark-streaming_2.12 - ${apache-spark.version} - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.module - jackson-module-scala_2.11 - - - - - org.apache.thrift - libfb303 - ${libfb303.version} - - - * - * - - - - - org.apache.thrift - libthrift - ${libthrift.version} - - - * - * - - - - - org.apache.hop - hop-core - ${project.version} - test-jar - test - - - org.apache.hop - hop-engine - ${project.version} - test-jar + ${spark.version} test - - - - - true - - central - Central Repository - https://repo.maven.apache.org/maven2 - default - - - confluent - https://packages.confluent.io/maven/ - - - diff --git a/plugins/engines/beam/src/assembly/assembly.xml b/plugins/engines/beam/src/assembly/assembly.xml index 857f7261ccf..1b7eedc931f 100644 --- a/plugins/engines/beam/src/assembly/assembly.xml +++ b/plugins/engines/beam/src/assembly/assembly.xml @@ -22,267 +22,46 @@ zip - engines/beam + . ${project.basedir}/src/main/resources/version.xml - . + plugins/engines/beam true ${project.basedir}/src/main/resources/dependencies.xml - . + plugins/engines/beam true - - - lib - - **/* - - - + org.apache.hop:hop-engines-beam:jar + plugins/engines/beam + + + runtime + + org.apache.hop:hop-engines-beam:jar + org.apache.hadoop:*:jar + org.apache.hadoop.thirdparty:*:jar + + lib/beam - lib runtime - - args4j:args4j:jar - com.clearspring.analytics:stream:jar - com.esotericsoftware.kryo:kryo:jar - com.fasterxml.jackson.dataformat:jackson-dataformat-yaml - com.fasterxml.jackson.datatype:jackson-datatype-joda - com.fasterxml.jackson.datatype:jackson-datatype-jsr310 - com.fasterxml.jackson.module:jackson-module-paranamer - com.fasterxml.jackson.module:jackson-module-scala_2.12 - com.github.stephenc.findbugs:findbugs-annotations - com.google.android:annotations - com.google.api:api-common - com.google.api-client:google-api-client-jackson2 - com.google.api:gax - com.google.api:gax-grpc - com.google.api:gax-httpjson - com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2 - com.google.api.grpc:grpc-google-cloud-bigtable-v2 - com.google.api.grpc:grpc-google-cloud-pubsub-v1 - com.google.api.grpc:grpc-google-common-protos - com.google.api.grpc:proto-google-cloud-bigquerystorage-v1 - com.google.api.grpc:proto-google-cloud-bigtable-admin-v2 - com.google.api.grpc:proto-google-cloud-bigtable-v2 - com.google.cloud:google-cloud-bigtable-stats - com.lmax:disruptor - com.google.api.grpc:proto-google-cloud-datastore-v1 - com.google.api.grpc:proto-google-cloud-pubsub-v1 - com.google.api.grpc:grpc-google-cloud-storage-v2 - com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1 - com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1 - com.google.api.grpc:proto-google-cloud-spanner-v1 - com.google.api.grpc:proto-google-cloud-storage-v2 - com.google.api.grpc:proto-google-iam-v1 - com.google.apis:google-api-services-bigquery - com.google.apis:google-api-services-clouddebugger - com.google.apis:google-api-services-cloudresourcemanager - com.google.apis:google-api-services-dataflow - com.google.apis:google-api-services-pubsub - com.google.apis:google-api-services-storage - com.google.auto:auto-common - com.google.auto.service:auto-service - com.google.cloud.bigdataoss:gcsio - com.google.cloud.bigdataoss:util - com.google.cloud.bigtable:bigtable-client-core - com.google.cloud.bigtable:bigtable-metrics-api - com.google.cloud.datastore:datastore-v1-proto-client - com.google.cloud:google-cloud-bigquery - com.google.cloud:google-cloud-bigquerystorage - com.google.cloud:google-cloud-bigtable - com.google.cloud.bigtable:bigtable-client-core-config - com.google.cloud:google-cloud-core - com.google.cloud:google-cloud-core-grpc - com.google.cloud:google-cloud-core-http - com.google.cloud:google-cloud-spanner - com.google.cloud:google-cloud-storage - com.google.flogger:flogger - com.google.flogger:flogger-system-backend - com.google.flogger:google-extensions - com.google.guava:failureaccess - com.google.guava:listenablefuture - com.google.http-client:google-http-client-apache-v2 - com.google.http-client:google-http-client-appengine - com.google.http-client:google-http-client-jackson2 - com.google.http-client:google-http-client-protobuf - com.google.oauth-client:google-oauth-client - commons-cli:commons-cli - commons-httpclient:commons-httpclient - commons-collections:commons-collections - com.twitter:chill_2.12 - com.twitter:chill-java - io.confluent:common-utils - io.confluent:kafka-avro-serializer - io.confluent:kafka-schema-registry-client - io.dropwizard.metrics:metrics-graphite - io.dropwizard.metrics:metrics-json - io.opencensus:opencensus-contrib-grpc-util - javax.annotation:javax.annotation-api - javax.servlet:javax.servlet-api - javax.xml.bind:jaxb-api - net.sf.py4j:py4j - org.apache.avro:avro-ipc - org.apache.avro:avro-mapred - org.apache.beam:beam-model-fn-execution - org.apache.beam:beam-runners-core-construction-java - org.apache.beam:beam-runners-core-java - org.apache.beam:beam-runners-flink-1.16 - org.apache.beam:beam-runners-google-cloud-dataflow-java - org.apache.beam:beam-runners-java-fn-execution - org.apache.beam:beam-runners-spark-3 - org.apache.beam:beam-sdks-java-expansion-service - org.apache.beam:beam-sdks-java-extensions-avro - org.apache.beam:beam-sdks-java-extensions-protobuf - org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core - org.apache.beam:beam-sdks-java-extensions-join-library - org.apache.beam:beam-sdks-java-fn-execution - org.apache.beam:beam-sdks-java-io-google-cloud-platform - org.apache.beam:beam-sdks-java-io-hadoop-common - org.apache.beam:beam-sdks-java-io-hadoop-file-system - org.apache.beam:beam-sdks-java-io-kafka - org.apache.beam:beam-sdks-java-io-hcatalog - org.apache.hive.hcatalog:hive-hcatalog-core - org.apache.hive:hive-common - org.apache.hive:hive-exec:jar:core - org.apache.hive:hive-metastore - org.apache.hive:hive-standalone-metastore - org.apache.hive:hive-serde - org.apache.hive:hive-service-rpc - org.apache.hive.shims:hive-shims-common - org.apache.hive.shims:hive-shims-0.23 - org.apache.hive:hive-spark-client - org.apache.hive:hive-storage-api - org.apache.thrift:libthrift - org.apache.thrift:libfb303 - org.apache.beam:beam-sdks-java-io-synthetic - org.apache.commons:commons-crypto - org.apache.commons:commons-text - org.apache.flink:flink-annotations - org.apache.flink:flink-clients - org.apache.flink:flink-core - org.apache.flink:flink-file-sink-common - org.apache.flink:flink-hadoop-fs - org.apache.flink:flink-java - org.apache.flink:flink-metrics-core - org.apache.flink:flink-optimizer:jar - org.apache.flink:flink-queryable-state-client-java - org.apache.flink:flink-rpc-akka-loader - org.apache.flink:flink-rpc-core - org.apache.flink:flink-runtime:jar - org.apache.flink:flink-shaded-asm-9 - org.apache.flink:flink-shaded-force-shading - org.apache.flink:flink-shaded-guava - org.apache.flink:flink-shaded-jackson - org.apache.flink:flink-shaded-netty - org.apache.flink:flink-shaded-zookeeper-3 - org.apache.flink:flink-streaming-java - org.apache.hadoop:hadoop-client-api - org.apache.hadoop:hadoop-client-runtime - org.apache.hadoop:hadoop-hdfs-client - org.apache.ivy:ivy - org.apache.kafka:kafka-clients - org.apache.logging.log4j:log4j-slf4j-impl - org.apache.spark:spark-core_2.12 - org.apache.spark:spark-kvstore_2.12 - org.apache.spark:spark-launcher_2.12 - org.apache.spark:spark-network-common_2.12 - org.apache.spark:spark-network-shuffle_2.12 - org.apache.spark:spark-streaming_2.12 - org.apache.spark:spark-tags_2.12 - org.apache.spark:spark-unsafe_2.12 - org.apache.xbean:xbean-asm9-shaded - org.codehaus.mojo:animal-sniffer-annotations - org.fusesource.leveldbjni:leveldbjni-all - org.glassfish.hk2.external:aopalliance-repackaged - org.glassfish.hk2:hk2-api - org.glassfish.hk2:hk2-locator - org.glassfish.hk2:hk2-utils - org.glassfish.hk2:osgi-resource-locator - org.glassfish.jersey.containers:jersey-container-servlet - org.glassfish.jersey.containers:jersey-container-servlet-core - org.lz4:lz4-java - org.reactivestreams:reactive-streams - org.roaringbitmap:RoaringBitmap - org.roaringbitmap:shims - org.scala-lang:scala-compiler - org.scala-lang:scala-reflect - org.scala-lang.modules:scala-collection-compat_2.12 - org.scala-lang.modules:scala-parser-combinators_2.12 - org.scala-lang.modules:scala-xml_2.12 - org.slf4j:jcl-over-slf4j - org.slf4j:jul-to-slf4j - org.springframework:spring-core - org.springframework:spring-expression - org.springframework:spring-jcl - org.threeten:threetenbp - oro:oro - - - org.apache.beam:beam-sdks-java-io-amazon-web-services:jar - com.amazonaws:aws-java-sdk-cloudwatch:jar - com.amazonaws:jmespath-java:jar - com.amazonaws:aws-java-sdk-core:jar - software.amazon.ion:ion-java:jar - com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:jar - com.amazonaws:aws-java-sdk-dynamodb:jar - com.amazonaws:aws-java-sdk-s3:jar - com.amazonaws:aws-java-sdk-kms:jar - com.amazonaws:aws-java-sdk-sns:jar - com.amazonaws:aws-java-sdk-sqs:jar - com.amazonaws:aws-java-sdk-sts:jar - - - - com.azure:azure-core-http-netty:jar - com.azure:azure-core:jar - com.azure:azure-identity:jar - com.azure:azure-json:jar - com.azure:azure-storage-blob:jar - com.azure:azure-storage-common:jar - com.azure:azure-storage-internal-avro:jar - com.microsoft.azure:azure-keyvault-core:jar - com.microsoft.azure:msal4j-persistence-extension:jar - com.microsoft.azure:msal4j:jar - com.nimbusds:content-type:jar - com.nimbusds:lang-tag:jar - com.nimbusds:oauth2-oidc-sdk:jar - io.projectreactor.netty:reactor-netty-core:jar - io.projectreactor.netty:reactor-netty-http:jar - io.projectreactor:reactor-core:jar - net.minidev:accessors-smart:jar - net.minidev:json-smart:jar - org.apache.beam:beam-sdks-java-io-azure:jar - org.ow2.asm:asm:jar - org.reactivestreams:reactive-streams:jar - - - - org.apache.beam:beam-sdks-java-io-kinesis:jar - com.amazonaws:aws-java-sdk-kinesis:jar - com.amazonaws:amazon-kinesis-client:jar - com.amazonaws:amazon-kinesis-producer:jar - - + org.apache.hadoop:*:jar + org.apache.hadoop.thirdparty:*:jar + + org.apache.hop:hop-engines-beam:jar + + lib/core \ No newline at end of file diff --git a/plugins/engines/pom.xml b/plugins/engines/pom.xml index 33200ed521e..cec5ee41650 100644 --- a/plugins/engines/pom.xml +++ b/plugins/engines/pom.xml @@ -26,9 +26,7 @@ hop-plugins-engines - 2.10.0-SNAPSHOT pom - Hop Plugins Engines diff --git a/plugins/misc/async/pom.xml b/plugins/misc/async/pom.xml index 0a8b7dc0d7c..b8004ff95e5 100644 --- a/plugins/misc/async/pom.xml +++ b/plugins/misc/async/pom.xml @@ -25,62 +25,7 @@ hop-misc-async - 2.10.0-SNAPSHOT jar - Hop Plugins Miscellaneous Asynchronous Web Service - - - - org.apache.hop - hop-core - ${project.version} - provided - - - org.apache.hop - hop-core - ${project.version} - test - test - - - org.apache.hop - hop-engine - ${project.version} - test-jar - test - - - - - - - org.apache.hop - hop-core - compile - - - org.apache.hop - hop-ui - 2.10.0-SNAPSHOT - compile - - - org.apache.hop - hop-core - ${project.version} - test-jar - test - - - org.apache.hop - hop-engine - ${project.version} - test-jar - test - - - diff --git a/plugins/misc/async/src/assembly/assembly.xml b/plugins/misc/async/src/assembly/assembly.xml index 945c6f576b8..663fbca273d 100644 --- a/plugins/misc/async/src/assembly/assembly.xml +++ b/plugins/misc/async/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - misc/async + . ${project.basedir}/src/main/resources/version.xml - . + plugins/misc/async true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-misc-async:jar + plugins/misc/async \ No newline at end of file diff --git a/plugins/misc/debug/pom.xml b/plugins/misc/debug/pom.xml index 202cfb39186..bf5180180f6 100644 --- a/plugins/misc/debug/pom.xml +++ b/plugins/misc/debug/pom.xml @@ -26,62 +26,7 @@ hop-misc-debug - 2.10.0-SNAPSHOT jar - Hop Plugins Miscellaneous Debug - - - - org.apache.hop - hop-core - ${project.version} - provided - - - org.apache.hop - hop-core - ${project.version} - test - test - - - org.apache.hop - hop-engine - ${project.version} - test-jar - test - - - - - - - org.apache.hop - hop-core - compile - - - org.apache.hop - hop-ui - 2.10.0-SNAPSHOT - compile - - - org.apache.hop - hop-core - ${project.version} - test-jar - test - - - org.apache.hop - hop-engine - ${project.version} - test-jar - test - - - diff --git a/plugins/misc/debug/src/assembly/assembly.xml b/plugins/misc/debug/src/assembly/assembly.xml index 1f6af7c824b..68a2ce2034e 100644 --- a/plugins/misc/debug/src/assembly/assembly.xml +++ b/plugins/misc/debug/src/assembly/assembly.xml @@ -24,27 +24,28 @@ zip - misc/debug + . ${project.basedir}/src/main/resources/version.xml - . + plugins/misc/debug true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-misc-debug:jar + plugins/misc/debug \ No newline at end of file diff --git a/plugins/misc/git/pom.xml b/plugins/misc/git/pom.xml index 6857e354d7d..e19fb069813 100644 --- a/plugins/misc/git/pom.xml +++ b/plugins/misc/git/pom.xml @@ -25,9 +25,7 @@ hop-misc-git - 2.10.0-SNAPSHOT jar - Hop Plugins Miscellaneous Git @@ -38,49 +36,15 @@ org.apache.hop - hop-core - ${project.version} - provided - - - org.apache.hop - hop-core - ${project.version} - test - test - - - org.apache.hop - hop-engine + hop-libs ${project.version} - test-jar - test + pom + import - - org.apache.hop - hop-core - compile - - - org.apache.hop - hop-ui - 2.10.0-SNAPSHOT - compile - - - org.apache.httpcomponents - httpclient - ${httpclient.version} - - - org.apache.httpcomponents - httpcore - ${httpccore.version} - org.eclipse.jgit org.eclipse.jgit @@ -91,20 +55,6 @@ org.eclipse.jgit.http.apache ${dependency.jgit.revision} - - org.apache.hop - hop-core - ${project.version} - test-jar - test - - - org.apache.hop - hop-engine - ${project.version} - test-jar - test - org.eclipse.jgit org.eclipse.jgit.junit diff --git a/plugins/misc/git/src/assembly/assembly.xml b/plugins/misc/git/src/assembly/assembly.xml index 62bb438a177..cd52c141683 100644 --- a/plugins/misc/git/src/assembly/assembly.xml +++ b/plugins/misc/git/src/assembly/assembly.xml @@ -23,36 +23,40 @@ zip - misc/git + . ${project.basedir}/src/main/resources/version.xml - . + plugins/misc/git true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-misc-git:jar + plugins/misc/git - lib runtime - - org.eclipse.jgit:org.eclipse.jgit - com.googlecode.javaewah:JavaEWAH - org.eclipse.jgit:org.eclipse.jgit.http.apache - + + commons-codec:* + commons-logging:* + org.slf4j:* + org.apache.httpcomponents:* + + plugins/misc/git/lib + true + false \ No newline at end of file diff --git a/plugins/misc/import/pom.xml b/plugins/misc/import/pom.xml index 7544544ac39..ee18c9687e7 100644 --- a/plugins/misc/import/pom.xml +++ b/plugins/misc/import/pom.xml @@ -25,113 +25,7 @@ hop-misc-import - 2.10.0-SNAPSHOT jar - Hop Plugins Miscellaneous Import - - - - org.apache.hop - hop-core - ${project.version} - provided - - - org.apache.hop - hop-core - ${project.version} - test - test - - - org.apache.hop - hop-engine - ${project.version} - test-jar - test - - - - - - - org.apache.hop - hop-core - compile - - - org.apache.hop - hop-plugins-misc-projects - ${project.version} - - - org.apache.hop - hop-ui - ${project.version} - compile - - - org.apache.hop - hop-core - ${project.version} - test-jar - test - - - org.apache.hop - hop-engine - ${project.version} - test-jar - test - - - - - - - src/main/java - - **/*.properties - **/*.svg - - - - src/main/resources - - **/*.properties - **/*.svg - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.10 - - - copy-dependencies - - copy-dependencies - - package - - target/lib - false - false - true - test - system - runtime - compile - provided - commons-collections4 - - - - - - diff --git a/plugins/misc/import/src/assembly/assembly.xml b/plugins/misc/import/src/assembly/assembly.xml index 90f29645389..9dcc450c728 100644 --- a/plugins/misc/import/src/assembly/assembly.xml +++ b/plugins/misc/import/src/assembly/assembly.xml @@ -22,27 +22,28 @@ zip - misc/import + . ${project.basedir}/src/main/resources/version.xml - . + plugins/misc/import true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-misc-import:jar + plugins/misc/import \ No newline at end of file diff --git a/plugins/misc/passwords/pom.xml b/plugins/misc/passwords/pom.xml index e893a3b0d17..0ab4b1f73c0 100644 --- a/plugins/misc/passwords/pom.xml +++ b/plugins/misc/passwords/pom.xml @@ -26,62 +26,7 @@ hop-misc-passwords - 2.10.0-SNAPSHOT jar - Hop Plugins Miscellaneous Passwords - - - - org.apache.hop - hop-core - ${project.version} - provided - - - org.apache.hop - hop-core - ${project.version} - test - test - - - org.apache.hop - hop-engine - ${project.version} - test-jar - test - - - - - - - org.apache.hop - hop-core - compile - - - org.apache.hop - hop-ui - 2.10.0-SNAPSHOT - compile - - - org.apache.hop - hop-core - ${project.version} - test-jar - test - - - org.apache.hop - hop-engine - ${project.version} - test-jar - test - - - diff --git a/plugins/misc/passwords/src/assembly/assembly.xml b/plugins/misc/passwords/src/assembly/assembly.xml index 463d8f52b99..cf15450cdab 100644 --- a/plugins/misc/passwords/src/assembly/assembly.xml +++ b/plugins/misc/passwords/src/assembly/assembly.xml @@ -23,27 +23,28 @@ zip - misc/passwords + . ${project.basedir}/src/main/resources/version.xml - . + plugins/misc/passwords true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-misc-passwords:jar + plugins/misc/passwords \ No newline at end of file diff --git a/plugins/misc/pom.xml b/plugins/misc/pom.xml index 8e37fd13b78..f12fcc6286c 100644 --- a/plugins/misc/pom.xml +++ b/plugins/misc/pom.xml @@ -25,9 +25,7 @@ hop-plugins-misc - 2.10.0-SNAPSHOT pom - Hop Plugins Miscellaneous diff --git a/plugins/misc/projects/pom.xml b/plugins/misc/projects/pom.xml index 7896c174319..a17b2dfdc1e 100644 --- a/plugins/misc/projects/pom.xml +++ b/plugins/misc/projects/pom.xml @@ -26,62 +26,7 @@ hop-misc-projects - 2.10.0-SNAPSHOT jar - Hop Plugins Miscellaneous Projects - - - - org.apache.hop - hop-core - ${project.version} - provided - - - org.apache.hop - hop-core - ${project.version} - test - test - - - org.apache.hop - hop-engine - ${project.version} - test-jar - test - - - - - - - org.apache.hop - hop-core - compile - - - org.apache.hop - hop-ui - 2.10.0-SNAPSHOT - compile - - - org.apache.hop - hop-core - ${project.version} - test-jar - test - - - org.apache.hop - hop-engine - ${project.version} - test-jar - test - - - diff --git a/plugins/misc/projects/src/assembly/assembly.xml b/plugins/misc/projects/src/assembly/assembly.xml index ebf042ae013..3dec1aa5678 100644 --- a/plugins/misc/projects/src/assembly/assembly.xml +++ b/plugins/misc/projects/src/assembly/assembly.xml @@ -24,27 +24,28 @@ zip - misc/projects + . ${project.basedir}/src/main/resources/version.xml - . + plugins/misc/projects true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-misc-projects:jar + plugins/misc/projects \ No newline at end of file diff --git a/plugins/misc/reflection/pom.xml b/plugins/misc/reflection/pom.xml index 3e4f103e9c1..e3081dbecba 100644 --- a/plugins/misc/reflection/pom.xml +++ b/plugins/misc/reflection/pom.xml @@ -26,62 +26,7 @@ hop-misc-reflection - 2.10.0-SNAPSHOT jar - Hop Plugins Miscellaneous Reflection - - - - org.apache.hop - hop-core - ${project.version} - provided - - - org.apache.hop - hop-core - ${project.version} - test - test - - - org.apache.hop - hop-engine - ${project.version} - test-jar - test - - - - - - - org.apache.hop - hop-core - compile - - - org.apache.hop - hop-ui - 2.10.0-SNAPSHOT - compile - - - org.apache.hop - hop-core - ${project.version} - test-jar - test - - - org.apache.hop - hop-engine - ${project.version} - test-jar - test - - - diff --git a/plugins/misc/reflection/src/assembly/assembly.xml b/plugins/misc/reflection/src/assembly/assembly.xml index 8587567bc6b..aed511da026 100644 --- a/plugins/misc/reflection/src/assembly/assembly.xml +++ b/plugins/misc/reflection/src/assembly/assembly.xml @@ -24,27 +24,28 @@ zip - misc/reflection + . ${project.basedir}/src/main/resources/version.xml - . + plugins/misc/reflection true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-misc-reflection:jar + plugins/misc/reflection \ No newline at end of file diff --git a/plugins/misc/reflection/src/main/samples/reflection/generate-fake-books.hwf b/plugins/misc/reflection/src/main/samples/reflection/generate-fake-books.hwf index 3acc7e36804..dbbf8dc0ab9 100644 --- a/plugins/misc/reflection/src/main/samples/reflection/generate-fake-books.hwf +++ b/plugins/misc/reflection/src/main/samples/reflection/generate-fake-books.hwf @@ -53,24 +53,24 @@ limitations under the License. PIPELINE - ${PROJECT_HOME}/reflection/generate-fake-books.hpl - N - N - N - N - N - - N N - Basic - N - Y + N + N N - Spark + N + ${PROJECT_HOME}/reflection/generate-fake-books.hpl + + + Basic Y + N + local + N + N + Y N 209 80 @@ -81,8 +81,8 @@ limitations under the License. WRITE_TO_LOG + Basic - N 368 diff --git a/plugins/misc/static-schema/pom.xml b/plugins/misc/static-schema/pom.xml index 37fe868a138..585cb0528ee 100644 --- a/plugins/misc/static-schema/pom.xml +++ b/plugins/misc/static-schema/pom.xml @@ -26,23 +26,7 @@ hop-misc-static-schema - 2.10.0-SNAPSHOT jar - Hop Static Schema - - - org.apache.hop - hop-core - ${project.version} - provided - - - org.apache.hop - hop-ui - ${project.version} - provided - - diff --git a/plugins/misc/static-schema/src/assembly/assembly.xml b/plugins/misc/static-schema/src/assembly/assembly.xml new file mode 100644 index 00000000000..c4f29ad4f58 --- /dev/null +++ b/plugins/misc/static-schema/src/assembly/assembly.xml @@ -0,0 +1,35 @@ + + + + hop-misc-testing + + zip + + . + + + + org.apache.hop:hop-misc-static-schema:jar + + lib/core + + + \ No newline at end of file diff --git a/plugins/misc/testing/pom.xml b/plugins/misc/testing/pom.xml index a06f83adc99..1ecedae470a 100644 --- a/plugins/misc/testing/pom.xml +++ b/plugins/misc/testing/pom.xml @@ -26,32 +26,17 @@ hop-misc-testing - 2.10.0-SNAPSHOT jar - Hop Plugins Miscellaneous Testing org.apache.hop - hop-core - ${project.version} - provided - - - org.apache.hop - hop-core - ${project.version} - test - test - - - org.apache.hop - hop-engine + hop-libs ${project.version} - test-jar - test + pom + import @@ -60,32 +45,6 @@ org.apache.commons commons-csv - 1.9.0 - - - org.apache.hop - hop-core - compile - - - org.apache.hop - hop-ui - 2.10.0-SNAPSHOT - compile - - - org.apache.hop - hop-core - ${project.version} - test-jar - test - - - org.apache.hop - hop-engine - ${project.version} - test-jar - test diff --git a/plugins/misc/testing/src/assembly/assembly.xml b/plugins/misc/testing/src/assembly/assembly.xml index c94d0678650..10346b1bd5d 100644 --- a/plugins/misc/testing/src/assembly/assembly.xml +++ b/plugins/misc/testing/src/assembly/assembly.xml @@ -23,34 +23,27 @@ zip - misc/testing + . ${project.basedir}/src/main/resources/version.xml - . + plugins/misc/testing true - - - lib - - **/* - - - org.apache.hop:hop-misc-testing:jar + plugins/misc/testing - lib runtime org.apache.commons:commons-csv + lib/core \ No newline at end of file diff --git a/plugins/misc/testing/src/main/java/org/apache/hop/testing/util/DataSetConst.java b/plugins/misc/testing/src/main/java/org/apache/hop/testing/util/DataSetConst.java index ea29264950b..983b6de426b 100644 --- a/plugins/misc/testing/src/main/java/org/apache/hop/testing/util/DataSetConst.java +++ b/plugins/misc/testing/src/main/java/org/apache/hop/testing/util/DataSetConst.java @@ -17,12 +17,12 @@ package org.apache.hop.testing.util; +import com.google.common.math.DoubleMath; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; import org.apache.commons.lang.StringUtils; -import org.apache.commons.math3.util.Precision; import org.apache.hop.core.Const; import org.apache.hop.core.exception.HopException; import org.apache.hop.core.exception.HopValueException; @@ -379,7 +379,7 @@ public static final int validateTransformResultAgainstUnitTest( Double d1 = transformValueMeta.getNumber(transformValue); Double d2 = transformValueMeta.getNumber(goldenValueConverted); - if (Precision.equals(d1, d2, 0.000001d)) { + if (DoubleMath.fuzzyEquals(d1, d2, 0.000001d)) { cmp = 0; } } diff --git a/plugins/pom.xml b/plugins/pom.xml index b8176f190c0..802608f88e9 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -26,9 +26,7 @@ hop-plugins - 2.10.0-SNAPSHOT pom - Hop Plugins @@ -40,4 +38,45 @@ transforms valuetypes + + + + org.apache.hop + hop-core + ${project.version} + provided + + + org.apache.hop + hop-engine + ${project.version} + provided + + + org.apache.hop + hop-ui + ${project.version} + provided + + + org.eclipse.platform + ${swt.artifactId} + ${org.eclipse.platform.version} + provided + + + org.apache.hop + hop-core + ${project.version} + test-jar + test + + + org.apache.hop + hop-engine + ${project.version} + test-jar + test + + diff --git a/plugins/src/assembly/assembly.xml b/plugins/src/assembly/assembly.bak similarity index 100% rename from plugins/src/assembly/assembly.xml rename to plugins/src/assembly/assembly.bak diff --git a/plugins/tech/avro/pom.xml b/plugins/tech/avro/pom.xml index d6b67d6d07e..7a20b2a1814 100755 --- a/plugins/tech/avro/pom.xml +++ b/plugins/tech/avro/pom.xml @@ -25,45 +25,7 @@ hop-tech-avro - 2.10.0-SNAPSHOT jar - Hop Plugins Technology Avro - http://maven.apache.org - - - Apache License, version 2.0 - https://www.apache.org/licenses/LICENSE-2.0 - repo - - - - - org.apache.hop - hop-core - ${project.version} - compile - - - org.apache.hop - hop-ui - ${project.version} - compile - - - org.apache.hop - hop-core - ${project.version} - test-jar - test - - - org.apache.hop - hop-engine - ${project.version} - test-jar - test - - diff --git a/plugins/tech/avro/src/assembly/assembly.xml b/plugins/tech/avro/src/assembly/assembly.xml index 11c1d4076bb..77b78db4f20 100644 --- a/plugins/tech/avro/src/assembly/assembly.xml +++ b/plugins/tech/avro/src/assembly/assembly.xml @@ -22,38 +22,28 @@ zip - tech/avro + . ${project.basedir}/src/main/resources/version.xml - . + plugins/tech/avro true - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-tech-avro:jar - - - lib - runtime - - org.codehaus.jackson:jackson-core-asl:jar - org.codehaus.jackson:jackson-mapper-asl:jar - com.thoughtworks.paranamer:paranamer:jar - org.tukaani:xz:jar - + plugins/tech/avro diff --git a/plugins/tech/aws/pom.xml b/plugins/tech/aws/pom.xml index 53dae234be2..a103b92f3ab 100644 --- a/plugins/tech/aws/pom.xml +++ b/plugins/tech/aws/pom.xml @@ -26,78 +26,81 @@ hop-tech-aws jar - Hop Plugins Technology AWS - 1.12.651 - 1.12.651 - 1.12.651 - 1.12.651 - 2.1.0.28 + 1.12.651 + + + + org.apache.hop + hop-libs + ${project.version} + pom + import + + + org.apache.hop + hop-libs-jdbc + ${project.version} + pom + import + + + + - - com.amazon.redshift - redshift-jdbc42 - ${redshift.jdbc.version} - com.amazonaws aws-java-sdk-core - ${aws-java-sdk-core.version} + ${aws-java-sdk.version} compile + + + com.fasterxml.jackson.core + * + + + commons-codec + * + + + commons-logging + * + + + org.apache.httpcomponents + * + + com.amazonaws aws-java-sdk-s3 - ${aws-java-sdk-s3.version} - compile - - - com.amazonaws - aws-java-sdk-sns - ${aws-java-sdk-sns.version} - - - com.amazonaws - aws-java-sdk-sqs - ${aws-java-sdk-sqs.version} - - - com.google.guava - guava - ${guava.version} - compile - - - org.apache.commons - commons-vfs2 - 2.4.1 + ${aws-java-sdk.version} compile - * + com.fasterxml.jackson.core * - org.slf4j - slf4j-api - ${slf4j.version} + com.amazonaws + aws-java-sdk-sns + ${aws-java-sdk.version} - org.apache.hop - hop-core - ${project.version} - provided + com.amazonaws + aws-java-sdk-sqs + ${aws-java-sdk.version} - org.apache.hop - hop-engine - ${project.version} + com.amazon.redshift + redshift-jdbc42 provided diff --git a/plugins/tech/aws/src/assembly/assembly.xml b/plugins/tech/aws/src/assembly/assembly.xml index e2ffba6bb37..ecad92b9d86 100644 --- a/plugins/tech/aws/src/assembly/assembly.xml +++ b/plugins/tech/aws/src/assembly/assembly.xml @@ -22,43 +22,42 @@ zip - tech/aws + . ${project.basedir}/src/main/resources/version.xml - . + plugins/tech/aws true - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-tech-aws:jar + plugins/tech/aws - lib runtime + + org.apache.hop:hop-tech-aws:jar + + plugins/tech/aws/lib + + + provided - com.amazonaws:aws-java-sdk-core - software.amazon.ion:ion-java - com.fasterxml.jackson.dataformat:jackson-dataformat-cbor - joda-time:joda-time - com.amazonaws:aws-java-sdk-s3 - com.amazonaws:aws-java-sdk-sns:jar - com.amazonaws:aws-java-sdk-sqs:jar - com.amazonaws:aws-java-sdk-kms com.amazon.redshift:redshift-jdbc42:jar + lib/jdbc diff --git a/plugins/tech/azure/pom.xml b/plugins/tech/azure/pom.xml index c03b478a2a9..21f262b259d 100755 --- a/plugins/tech/azure/pom.xml +++ b/plugins/tech/azure/pom.xml @@ -26,82 +26,109 @@ hop-tech-azure - 2.10.0-SNAPSHOT jar - Hop Plugins Technology Azure - http://maven.apache.org - - - - Apache License, version 2.0 - https://www.apache.org/licenses/LICENSE-2.0 - repo - - - 3.3.0 8.6.6 + + + + org.apache.hop + hop-libs + ${project.version} + pom + import + + + + com.microsoft.azure azure-eventhubs ${azure-eventhubs.version} + + com.fasterxml.jackson.core + * + + + com.google.code.gson + * + + + com.google.guava + * + + + commons-codec + * + net.minidev json-smart + + org.apache.commons + commons-lang3 + + + org.slf4j + * + com.microsoft.azure azure-eventhubs-eph ${azure-eventhubs.version} + + + com.fasterxml.jackson.core + commons-lang3 + + + com.google.code.gson + * + + + com.google.guava + * + + com.microsoft.azure azure-storage ${azure-storage.version} + + + com.fasterxml.jackson.core + * + + + com.google.guava + * + + + org.apache.commons + commons-lang3 + + + org.slf4j + * + + - net.minidev - json-smart - ${json-smart.version} - - - org.apache.hop - hop-core - ${project.version} - compile - - - org.apache.hop - hop-ui - ${project.version} - compile - - - org.apache.hop - hop-core - ${project.version} - test-jar - test - - - org.apache.hop - hop-engine - ${project.version} - test-jar - test + org.apache.commons + commons-lang3 + provided - + diff --git a/plugins/tech/azure/src/assembly/assembly.xml b/plugins/tech/azure/src/assembly/assembly.xml index 15dbfa5ec33..40ab8dcedfe 100644 --- a/plugins/tech/azure/src/assembly/assembly.xml +++ b/plugins/tech/azure/src/assembly/assembly.xml @@ -22,60 +22,42 @@ zip - tech/azure + . ${project.basedir}/src/main/resources/version.xml - . + plugins/tech/azure true - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-tech-azure:jar + plugins/tech/azure - lib runtime + + org.apache.hop:hop-tech-azure:jar + + plugins/tech/azure/lib + + + provided - com.microsoft.azure:azure-storage - com.microsoft.azure:azure-keyvault-core - com.microsoft.azure:azure-eventhubs:jar - org.apache.qpid:proton-j:jar - com.microsoft.azure:qpid-proton-j-extensions:jar - com.microsoft.azure:azure-client-authentication:jar - com.microsoft.azure:azure-client-runtime:jar - com.microsoft.rest:client-runtime:jar - com.squareup.retrofit2:retrofit:jar - com.squareup.okhttp3:logging-interceptor:jar - com.squareup.okhttp3:okhttp-urlconnection:jar - com.squareup.retrofit2:converter-jackson:jar - com.fasterxml.jackson.datatype:jackson-datatype-joda:jar - joda-time:joda-time:jar - io.reactivex:rxjava:jar - com.squareup.retrofit2:adapter-rxjava:jar - com.microsoft.azure:adal4j:jar - com.nimbusds:oauth2-oidc-sdk:jar - com.nimbusds:lang-tag:jar - com.microsoft.azure:azure-annotations:jar - com.nimbusds:nimbus-jose-jwt:jar - com.github.stephenc.jcip:jcip-annotations:jar - net.minidev:json-smart:jar - net.minidev:accessors-smart:jar - org.ow2.asm:asm:jar - com.microsoft.azure:azure-eventhubs-eph:jar + org.apache.commons:commons-lang3:jar + lib/core diff --git a/plugins/tech/cassandra/pom.xml b/plugins/tech/cassandra/pom.xml index 183b0f50c95..f1965c37922 100644 --- a/plugins/tech/cassandra/pom.xml +++ b/plugins/tech/cassandra/pom.xml @@ -25,31 +25,41 @@ hop-tech-cassandra - 2.10.0-SNAPSHOT jar - Hop Plugins Technology Cassandra - http://maven.apache.org - - - - Apache License, version 2.0 - https://www.apache.org/licenses/LICENSE-2.0 - repo - - - 4.1.5 4.17.0 + + + + org.apache.hop + hop-libs + ${project.version} + pom + import + + + + com.datastax.oss java-driver-core ${cassandra-java-driver.version} + + + com.fasterxml.jackson.core + * + + + org.slf4j + * + + com.datastax.oss @@ -61,6 +71,58 @@ org.apache.cassandra cassandra-all ${cassandra-all.version} + + + com.fasterxml.jackson.core + * + + + com.google.guava + * + + + com.googlecode.json-simple + * + + + commons-codec + * + + + org.apache.commons + commons-lang3 + + + org.apache.commons + commons-math3 + + + org.ow2.asm + asm + + + org.slf4j + * + + + org.xerial.snappy + snappy-java + + + org.yaml + snakeyaml + + + + + org.apache.commons + commons-math3 + provided + + + org.yaml + snakeyaml + provided diff --git a/plugins/tech/cassandra/src/assembly/assembly.xml b/plugins/tech/cassandra/src/assembly/assembly.xml index 3bed3a32869..1f430288602 100644 --- a/plugins/tech/cassandra/src/assembly/assembly.xml +++ b/plugins/tech/cassandra/src/assembly/assembly.xml @@ -16,71 +16,42 @@ --> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd"> hop-tech-cassandra zip - tech/cassandra + . ${project.basedir}/src/main/resources/version.xml - . + plugins/tech/cassandra true - - - lib - - **/* - - - org.apache.hop:hop-tech-cassandra:jar + plugins/tech/cassandra - lib runtime + + org.apache.hop:hop-tech-cassandra:jar + + plugins/tech/cassandra/lib + + + provided - org.apache.cassandra:cassandra-all - com.datastax.oss:java-driver-core - com.datastax.oss:java-driver-query-builder - com.datastax.oss:java-driver-shaded-guava:jar - com.datastax.oss:native-protocol:jar - com.typesafe:config:jar - com.boundary:high-scale-lib:jar - com.carrotsearch:hppc:jar - com.googlecode.concurrent-trees:concurrent-trees:jar - de.jflex:jflex:jar - io.airlift:airline:jar - net.java.dev.jna:jna:jar - org.lz4:lz4-java:jar - org.antlr:ST4:jar - org.caffinitas.ohc:ohc-core-j8:jar - org.caffinitas.ohc:ohc-core:jar - org.eclipse.jdt.core.compiler:ecj:jar - org.fusesource:sigar:jar - org.jctools:jctools-core:jar - org.ow2.asm:asm-analysis:jar - org.ow2.asm:asm-commons:jar - org.ow2.asm:asm:jar - org.ow2.asm:asm-tree:jar - org.ow2.asm:asm-util:jar - com.github.ben-manes.caffeine:caffeine:jar - com.github.jnr:jnr-posix:jar - com.github.jnr:jnr-ffi:jar - com.github.jnr:jffi:jar - com.github.jnr:jnr-a64asm:jar - com.github.jbellis:jamm:jar - com.github.rholder:snowball-stemmer:jar + org.apache.commons:commons-math3:jar + org.yaml:snakeyaml:jar + lib/core diff --git a/plugins/tech/dropbox/pom.xml b/plugins/tech/dropbox/pom.xml index 7334687f480..109601d269a 100644 --- a/plugins/tech/dropbox/pom.xml +++ b/plugins/tech/dropbox/pom.xml @@ -26,23 +26,11 @@ hop-tech-dropbox - 2.10.0-SNAPSHOT jar - Hop Plugins Technology Dropbox - http://maven.apache.org - - - - Apache License, version 2.0 - https://www.apache.org/licenses/LICENSE-2.0 - repo - - - - 5.0.0 + 7.0.0 @@ -51,32 +39,12 @@ com.dropbox.core dropbox-core-sdk ${dropbox.version} - - - org.apache.hop - hop-core - ${project.version} - compile - - - org.apache.hop - hop-ui - ${project.version} - compile - - - org.apache.hop - hop-core - ${project.version} - test-jar - test - - - org.apache.hop - hop-engine - ${project.version} - test-jar - test + + + com.fasterxml.jackson.core + * + + diff --git a/plugins/tech/dropbox/src/assembly/assembly.xml b/plugins/tech/dropbox/src/assembly/assembly.xml index bc796b91589..3295d0fe41f 100644 --- a/plugins/tech/dropbox/src/assembly/assembly.xml +++ b/plugins/tech/dropbox/src/assembly/assembly.xml @@ -23,35 +23,35 @@ zip - tech/dropbox + . ${project.basedir}/src/main/resources/version.xml - . + plugins/tech/dropbox true - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-tech-dropbox:jar + plugins/tech/dropbox - lib runtime - - com.dropbox.core:dropbox-core-sdk - + + org.apache.hop:hop-tech-dropbox:jar + + plugins/tech/dropbox/lib diff --git a/plugins/tech/google/pom.xml b/plugins/tech/google/pom.xml index 0098a1bfed3..1389ea3133a 100755 --- a/plugins/tech/google/pom.xml +++ b/plugins/tech/google/pom.xml @@ -25,20 +25,8 @@ hop-tech-google - 2.10.0-SNAPSHOT jar - Hop Plugins Technology Google - http://maven.apache.org - - - - Apache License, version 2.0 - https://www.apache.org/licenses/LICENSE-2.0 - repo - - - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd"> hop-tech-parquet zip - tech/parquet + . ${project.basedir}/src/main/resources/version.xml - . + plugins/tech/parquet true - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-tech-parquet:jar + plugins/tech/parquet + + + runtime + + + org.apache.hop:hop-tech-parquet:jar + + + + org.apache.parquet:*:jar + + plugins/tech/parquet/lib - lib runtime - com.fasterxml.woodstox:woodstox-core - com.github.luben:zstd-jni:jar - com.google.code.findbugs:jsr305:jar - com.google.protobuf:protobuf-java:jar - commons-collections:commons-collections:jar - javax.xml.bind:jaxb-api:jar - org.apache.curator:curator-client:jar - org.apache.curator:curator-framework:jar - org.apache.curator:curator-recipes:jar - org.apache.hadoop:hadoop-auth:jar - org.apache.hadoop:hadoop-client:jar - org.apache.hadoop:hadoop-client-api:jar - org.apache.hadoop:hadoop-client-runtime:jar - org.apache.hadoop:hadoop-mapreduce-client-common:jar - org.apache.hadoop:hadoop-mapreduce-client-jobclient:jar - org.apache.hadoop:hadoop-yarn-api:jar - org.apache.hadoop:hadoop-yarn-client:jar - org.apache.hadoop:hadoop-yarn-server-common:jar - org.apache.parquet:parquet-avro:jar - org.apache.parquet:parquet-column:jar - org.apache.parquet:parquet-common:jar - org.apache.parquet:parquet-encoding:jar - org.apache.parquet:parquet-format-structures:jar - org.apache.parquet:parquet-hadoop:jar - org.apache.parquet:parquet-jackson:jar - org.apache.yetus:audience-annotations:jar - org.apache.zookeeper:zookeeper:jar + org.apache.hadoop:*:jar + org.apache.hadoop.thirdparty:*:jar + lib/core diff --git a/plugins/tech/pom.xml b/plugins/tech/pom.xml index 4dd864a9583..9ce27ff2660 100644 --- a/plugins/tech/pom.xml +++ b/plugins/tech/pom.xml @@ -25,119 +25,17 @@ hop-plugins-tech - 2.10.0-SNAPSHOT pom - Hop Plugins Technology - - - 4.3.2.RELEASE - - - - - - org.apache.hop - hop-core - ${project.version} - provided - - - org.apache.hop - hop-core - ${project.version} - test - test - - - org.apache.hop - hop-engine - ${project.version} - test-jar - test - - - - - - - org.apache.hop - hop-core - compile - - - org.apache.hop - hop-ui - 2.10.0-SNAPSHOT - compile - - - javax.servlet - javax.servlet-api - ${javax.servlet-api.version} - test - - - org.apache.hop - hop-core - ${project.version} - test-jar - test - - - org.apache.hop - hop-engine - ${project.version} - test-jar - test - - - org.springframework - spring-test - ${spring.framework.version} - test - - - - - - - src/main/java - - **/*.properties - **/*.svg - - - - src/main/resources - - **/*.properties - **/*.svg - - - - - - - - highdeps - - - !skipDefault - - - - avro - aws - azure - cassandra - dropbox - google - neo4j - parquet - - - - + + avro + aws + azure + cassandra + dropbox + google + neo4j + parquet + diff --git a/plugins/transforms/abort/pom.xml b/plugins/transforms/abort/pom.xml index 4e7b83a9e14..ee1b696b146 100644 --- a/plugins/transforms/abort/pom.xml +++ b/plugins/transforms/abort/pom.xml @@ -27,7 +27,6 @@ hop-transform-abort jar - Hop Plugins Transforms Abort diff --git a/plugins/transforms/abort/src/assembly/assembly.xml b/plugins/transforms/abort/src/assembly/assembly.xml index f72ff22c7d0..39e1d43831f 100644 --- a/plugins/transforms/abort/src/assembly/assembly.xml +++ b/plugins/transforms/abort/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/abort + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/abort true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-abort:jar + plugins/transforms/abort \ No newline at end of file diff --git a/plugins/transforms/addsequence/pom.xml b/plugins/transforms/addsequence/pom.xml index db053c321b7..9b737762990 100644 --- a/plugins/transforms/addsequence/pom.xml +++ b/plugins/transforms/addsequence/pom.xml @@ -27,7 +27,6 @@ hop-transform-addsequence jar - Hop Plugins Transforms Add Sequence diff --git a/plugins/transforms/addsequence/src/assembly/assembly.xml b/plugins/transforms/addsequence/src/assembly/assembly.xml index 7da8f082142..377d2983e86 100644 --- a/plugins/transforms/addsequence/src/assembly/assembly.xml +++ b/plugins/transforms/addsequence/src/assembly/assembly.xml @@ -23,28 +23,29 @@ zip - transforms/addsequence + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/addsequence true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-transform-addsequence:jar + plugins/transforms/addsequence \ No newline at end of file diff --git a/plugins/transforms/analyticquery/pom.xml b/plugins/transforms/analyticquery/pom.xml index 4f287a55d38..1ba6351c770 100644 --- a/plugins/transforms/analyticquery/pom.xml +++ b/plugins/transforms/analyticquery/pom.xml @@ -27,7 +27,6 @@ hop-transform-analyticquery jar - Hop Plugins Transforms Analytic Query diff --git a/plugins/transforms/analyticquery/src/assembly/assembly.xml b/plugins/transforms/analyticquery/src/assembly/assembly.xml index 4198834057a..82d38e0f65b 100644 --- a/plugins/transforms/analyticquery/src/assembly/assembly.xml +++ b/plugins/transforms/analyticquery/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/analyticquery + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/analyticquery true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-analyticquery:jar + plugins/transforms/analyticquery \ No newline at end of file diff --git a/plugins/transforms/append/pom.xml b/plugins/transforms/append/pom.xml index 6b27457d783..bcd889c8b6d 100644 --- a/plugins/transforms/append/pom.xml +++ b/plugins/transforms/append/pom.xml @@ -27,7 +27,6 @@ hop-transform-append jar - Hop Plugins Transforms Append diff --git a/plugins/transforms/append/src/assembly/assembly.xml b/plugins/transforms/append/src/assembly/assembly.xml index 0cde9964c82..851c5268bbd 100644 --- a/plugins/transforms/append/src/assembly/assembly.xml +++ b/plugins/transforms/append/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/append + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/append true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-append:jar + plugins/transforms/append \ No newline at end of file diff --git a/plugins/transforms/blockingtransform/pom.xml b/plugins/transforms/blockingtransform/pom.xml index cbaed614335..09d453abcb7 100644 --- a/plugins/transforms/blockingtransform/pom.xml +++ b/plugins/transforms/blockingtransform/pom.xml @@ -27,7 +27,6 @@ hop-transform-blockingtransform jar - Hop Plugins Transforms Blocking diff --git a/plugins/transforms/blockingtransform/src/assembly/assembly.xml b/plugins/transforms/blockingtransform/src/assembly/assembly.xml index 9a49e924928..6126e4b9ead 100644 --- a/plugins/transforms/blockingtransform/src/assembly/assembly.xml +++ b/plugins/transforms/blockingtransform/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/blockingtransform + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/blockingtransform true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-blockingtransform:jar + plugins/transforms/blockingtransform \ No newline at end of file diff --git a/plugins/transforms/blockuntiltransformsfinish/pom.xml b/plugins/transforms/blockuntiltransformsfinish/pom.xml index 15a3c2b3599..fa2e15bc44d 100644 --- a/plugins/transforms/blockuntiltransformsfinish/pom.xml +++ b/plugins/transforms/blockuntiltransformsfinish/pom.xml @@ -27,7 +27,6 @@ hop-transform-blockuntiltransformsfinish jar - Hop Plugins Transforms Block Until Transforms Finish diff --git a/plugins/transforms/blockuntiltransformsfinish/src/assembly/assembly.xml b/plugins/transforms/blockuntiltransformsfinish/src/assembly/assembly.xml index c173d7b5b51..998d2f8c3ee 100644 --- a/plugins/transforms/blockuntiltransformsfinish/src/assembly/assembly.xml +++ b/plugins/transforms/blockuntiltransformsfinish/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/blockuntiltransformsfinish + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/blockuntiltransformsfinish true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-blockuntiltransformsfinish:jar + plugins/transforms/blockuntiltransformsfinish \ No newline at end of file diff --git a/plugins/transforms/calculator/pom.xml b/plugins/transforms/calculator/pom.xml index 2fa0ac64c1a..4158d6f2e3e 100644 --- a/plugins/transforms/calculator/pom.xml +++ b/plugins/transforms/calculator/pom.xml @@ -27,7 +27,6 @@ hop-transform-calculator jar - Hop Plugins Transforms Calculator diff --git a/plugins/transforms/calculator/src/assembly/assembly.xml b/plugins/transforms/calculator/src/assembly/assembly.xml index b65c00e4a6b..5d9dcb0233e 100644 --- a/plugins/transforms/calculator/src/assembly/assembly.xml +++ b/plugins/transforms/calculator/src/assembly/assembly.xml @@ -23,35 +23,34 @@ zip - transforms/calculator + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/calculator true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-calculator:jar + plugins/transforms/calculator - - lib com.wcohen:com.wcohen.secondstring:jar + lib/core \ No newline at end of file diff --git a/plugins/transforms/changefileencoding/pom.xml b/plugins/transforms/changefileencoding/pom.xml index f3b00812847..89553dcdd41 100644 --- a/plugins/transforms/changefileencoding/pom.xml +++ b/plugins/transforms/changefileencoding/pom.xml @@ -27,7 +27,6 @@ hop-transform-changefileencoding jar - Hop Plugins Transforms Change File Encoding diff --git a/plugins/transforms/changefileencoding/src/assembly/assembly.xml b/plugins/transforms/changefileencoding/src/assembly/assembly.xml index d16bcbc0c32..33ca3dd2440 100644 --- a/plugins/transforms/changefileencoding/src/assembly/assembly.xml +++ b/plugins/transforms/changefileencoding/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/changefileencoding + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/changefileencoding true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-changefileencoding:jar + plugins/transforms/changefileencoding \ No newline at end of file diff --git a/plugins/transforms/checksum/pom.xml b/plugins/transforms/checksum/pom.xml index e7fc366b9aa..b63b5cf30d5 100644 --- a/plugins/transforms/checksum/pom.xml +++ b/plugins/transforms/checksum/pom.xml @@ -27,7 +27,6 @@ hop-transform-checksum jar - Hop Plugins Transforms CheckSum diff --git a/plugins/transforms/checksum/src/assembly/assembly.xml b/plugins/transforms/checksum/src/assembly/assembly.xml index 8f5b3ced65c..8d5447ad1d1 100644 --- a/plugins/transforms/checksum/src/assembly/assembly.xml +++ b/plugins/transforms/checksum/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/checksum + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/checksum true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-checksum:jar + plugins/transforms/checksum \ No newline at end of file diff --git a/plugins/transforms/clonerow/pom.xml b/plugins/transforms/clonerow/pom.xml index 90483911b0a..5ede033a712 100644 --- a/plugins/transforms/clonerow/pom.xml +++ b/plugins/transforms/clonerow/pom.xml @@ -27,7 +27,6 @@ hop-transform-clonerow jar - Hop Plugins Transforms Clone Row diff --git a/plugins/transforms/clonerow/src/assembly/assembly.xml b/plugins/transforms/clonerow/src/assembly/assembly.xml index b55ff5b5bc5..f01477df886 100644 --- a/plugins/transforms/clonerow/src/assembly/assembly.xml +++ b/plugins/transforms/clonerow/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/clonerow + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/clonerow true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-clonerow:jar + plugins/transforms/clonerow \ No newline at end of file diff --git a/plugins/transforms/closure/pom.xml b/plugins/transforms/closure/pom.xml index fa6f12fa995..d00ddc5ba17 100644 --- a/plugins/transforms/closure/pom.xml +++ b/plugins/transforms/closure/pom.xml @@ -27,7 +27,6 @@ hop-transform-closure jar - Hop Plugins Transforms Closure Generator diff --git a/plugins/transforms/closure/src/assembly/assembly.xml b/plugins/transforms/closure/src/assembly/assembly.xml index 4c6c0f7c828..724aa1a47d1 100644 --- a/plugins/transforms/closure/src/assembly/assembly.xml +++ b/plugins/transforms/closure/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/closure + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/closure true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-closure:jar + plugins/transforms/closure \ No newline at end of file diff --git a/plugins/transforms/coalesce/pom.xml b/plugins/transforms/coalesce/pom.xml index 32c36b6b202..a8a8e8703fb 100644 --- a/plugins/transforms/coalesce/pom.xml +++ b/plugins/transforms/coalesce/pom.xml @@ -27,7 +27,6 @@ hop-transform-coalesce jar - Hop Plugins Transforms Coalesce diff --git a/plugins/transforms/coalesce/src/assembly/assembly.xml b/plugins/transforms/coalesce/src/assembly/assembly.xml index fe1f19cb8d1..792fac9c3ce 100644 --- a/plugins/transforms/coalesce/src/assembly/assembly.xml +++ b/plugins/transforms/coalesce/src/assembly/assembly.xml @@ -23,20 +23,28 @@ zip - transforms/coalesce + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/coalesce true + + + + ${project.basedir}/src/main/samples + config/projects/samples/ + + + - org.apache.hop:hop-transform-coalesce:jar + plugins/transforms/coalesce \ No newline at end of file diff --git a/plugins/transforms/columnexists/pom.xml b/plugins/transforms/columnexists/pom.xml index c8bae4cb74e..79961852dfa 100644 --- a/plugins/transforms/columnexists/pom.xml +++ b/plugins/transforms/columnexists/pom.xml @@ -27,7 +27,6 @@ hop-transform-columnexists jar - Hop Plugins Transforms Column exists diff --git a/plugins/transforms/columnexists/src/assembly/assembly.xml b/plugins/transforms/columnexists/src/assembly/assembly.xml index 5f85b16436e..223f9c2cdc9 100644 --- a/plugins/transforms/columnexists/src/assembly/assembly.xml +++ b/plugins/transforms/columnexists/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/columnexists + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/columnexists true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-columnexists:jar + plugins/transforms/columnexists \ No newline at end of file diff --git a/plugins/transforms/combinationlookup/pom.xml b/plugins/transforms/combinationlookup/pom.xml index aaebd28b390..5800a6b471b 100644 --- a/plugins/transforms/combinationlookup/pom.xml +++ b/plugins/transforms/combinationlookup/pom.xml @@ -27,7 +27,6 @@ hop-transform-combinationlookup jar - Hop Plugins Transforms Combination Lookup diff --git a/plugins/transforms/combinationlookup/src/assembly/assembly.xml b/plugins/transforms/combinationlookup/src/assembly/assembly.xml index d523ddd7440..f54f1935514 100644 --- a/plugins/transforms/combinationlookup/src/assembly/assembly.xml +++ b/plugins/transforms/combinationlookup/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/combinationlookup + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/combinationlookup true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-combinationlookup:jar + plugins/transforms/combinationlookup \ No newline at end of file diff --git a/plugins/transforms/concatfields/pom.xml b/plugins/transforms/concatfields/pom.xml index faae9b50025..8c7fb014abf 100644 --- a/plugins/transforms/concatfields/pom.xml +++ b/plugins/transforms/concatfields/pom.xml @@ -27,16 +27,6 @@ hop-transform-concatfields jar - Hop Plugins Transforms Concat Fields - - - org.apache.hop - hop-transform-textfile - 2.10.0-SNAPSHOT - compile - - - diff --git a/plugins/transforms/concatfields/src/assembly/assembly.xml b/plugins/transforms/concatfields/src/assembly/assembly.xml index 7be36bc978d..da74523d412 100644 --- a/plugins/transforms/concatfields/src/assembly/assembly.xml +++ b/plugins/transforms/concatfields/src/assembly/assembly.xml @@ -23,33 +23,33 @@ zip - transforms/concatfields + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/concatfields true ${project.basedir}/src/main/resources/dependencies.xml - . + plugins/transforms/concatfields true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-concatfields:jar + plugins/transforms/concatfields \ No newline at end of file diff --git a/plugins/transforms/constant/pom.xml b/plugins/transforms/constant/pom.xml index 2cfe3dae8d9..804015de748 100644 --- a/plugins/transforms/constant/pom.xml +++ b/plugins/transforms/constant/pom.xml @@ -27,7 +27,6 @@ hop-transform-constant jar - Hop Plugins Transforms Constant diff --git a/plugins/transforms/constant/src/assembly/assembly.xml b/plugins/transforms/constant/src/assembly/assembly.xml index 0e2de7504b9..6cee2764333 100644 --- a/plugins/transforms/constant/src/assembly/assembly.xml +++ b/plugins/transforms/constant/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/constant + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/constant true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-constant:jar + plugins/transforms/constant \ No newline at end of file diff --git a/plugins/transforms/cratedbbulkloader/pom.xml b/plugins/transforms/cratedbbulkloader/pom.xml index d5eb18fe28f..8271e7dccfd 100644 --- a/plugins/transforms/cratedbbulkloader/pom.xml +++ b/plugins/transforms/cratedbbulkloader/pom.xml @@ -25,25 +25,39 @@ hop-transform-cratedbbulkloader jar - Hop Plugins Transforms CrateDB bulk loader - 2.7.0 1.19.8 + + + + org.apache.hop + hop-libs-jdbc + ${project.version} + pom + import + + + + + + io.crate + crate-jdbc + org.apache.hop hop-databases-cratedb ${project.version} - io.crate - crate-jdbc - ${cratedb-jdbc.version} - runtime + org.apache.hop + hop-databases-postgresql + ${project.version} + provided org.testcontainers diff --git a/plugins/transforms/cratedbbulkloader/src/assembly/assembly.xml b/plugins/transforms/cratedbbulkloader/src/assembly/assembly.xml index 0669c5a53c4..c46da914538 100644 --- a/plugins/transforms/cratedbbulkloader/src/assembly/assembly.xml +++ b/plugins/transforms/cratedbbulkloader/src/assembly/assembly.xml @@ -22,28 +22,35 @@ zip - transforms/cratedbbulkloader + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/cratedbbulkloader true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-cratedbbulkloader:jar + plugins/transforms/cratedbbulkloader + + + runtime + + org.apache.hop:hop-transform-cratedbbulkloader:jar + + lib/jdbc diff --git a/plugins/transforms/cratedbbulkloader/src/main/java/org/apache/hop/pipeline/transforms/cratedbbulkloader/CrateDBBulkLoader.java b/plugins/transforms/cratedbbulkloader/src/main/java/org/apache/hop/pipeline/transforms/cratedbbulkloader/CrateDBBulkLoader.java index adf7f1fa6a8..abd4c0c8381 100644 --- a/plugins/transforms/cratedbbulkloader/src/main/java/org/apache/hop/pipeline/transforms/cratedbbulkloader/CrateDBBulkLoader.java +++ b/plugins/transforms/cratedbbulkloader/src/main/java/org/apache/hop/pipeline/transforms/cratedbbulkloader/CrateDBBulkLoader.java @@ -272,7 +272,7 @@ public boolean processRow() throws HopException { appendRowAsJsonLine(data.outputRowMeta, r); try { writeIfBatchSizeRecordsAreReached(); - } catch (CrateDBHopException e) { + } catch (IOException | CrateDBHopException e) { throw new HopException(e); } } @@ -366,7 +366,8 @@ private void defineSelectedFieldsMetadataList() throws HopTransformException { } } - private void writeIfBatchSizeRecordsAreReached() throws HopException, CrateDBHopException { + private void writeIfBatchSizeRecordsAreReached() + throws HopException, CrateDBHopException, IOException { int maxBatchSize = Integer.parseInt(meta.getBatchSize()); if (data.httpBulkArgs.size() >= maxBatchSize) { String[] columns = @@ -380,7 +381,7 @@ private void writeIfBatchSizeRecordsAreReached() throws HopException, CrateDBHop } private void writeBatchToCrateDB(String schema, String table, String[] columns) - throws HopException, CrateDBHopException { + throws HopException, CrateDBHopException, IOException { try { final HttpBulkImportResponse httpResponse = bulkImportClient.batchInsert(schema, table, columns, data.httpBulkArgs); diff --git a/plugins/transforms/cratedbbulkloader/src/main/java/org/apache/hop/pipeline/transforms/cratedbbulkloader/http/BulkImportClient.java b/plugins/transforms/cratedbbulkloader/src/main/java/org/apache/hop/pipeline/transforms/cratedbbulkloader/http/BulkImportClient.java index 6cc7fd1881c..b7b1c788f9e 100644 --- a/plugins/transforms/cratedbbulkloader/src/main/java/org/apache/hop/pipeline/transforms/cratedbbulkloader/http/BulkImportClient.java +++ b/plugins/transforms/cratedbbulkloader/src/main/java/org/apache/hop/pipeline/transforms/cratedbbulkloader/http/BulkImportClient.java @@ -52,7 +52,7 @@ private String header(String username, String password) { public HttpBulkImportResponse batchInsert( String schema, String table, String[] columns, List args) - throws HopException, CrateDBHopException, JsonProcessingException { + throws HopException, CrateDBHopException, JsonProcessingException, IOException { ObjectMapper mapper = new ObjectMapper(); BulkImportRequest body = new BulkImportRequest(schema + "." + table, List.of(columns), args); HttpRequest request = diff --git a/plugins/transforms/cratedbbulkloader/src/main/java/org/apache/hop/pipeline/transforms/cratedbbulkloader/http/HttpBulkImportResponse.java b/plugins/transforms/cratedbbulkloader/src/main/java/org/apache/hop/pipeline/transforms/cratedbbulkloader/http/HttpBulkImportResponse.java index 376063cbb3a..ccb57197e2f 100644 --- a/plugins/transforms/cratedbbulkloader/src/main/java/org/apache/hop/pipeline/transforms/cratedbbulkloader/http/HttpBulkImportResponse.java +++ b/plugins/transforms/cratedbbulkloader/src/main/java/org/apache/hop/pipeline/transforms/cratedbbulkloader/http/HttpBulkImportResponse.java @@ -20,6 +20,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; +import java.io.IOException; import java.net.http.HttpResponse; import org.apache.hop.core.exception.HopException; @@ -38,7 +39,7 @@ private HttpBulkImportResponse(int statusCode, Long outputRows, Long rejectedRow } public static HttpBulkImportResponse fromHttpResponse(HttpResponse response) - throws HopException { + throws HopException, IOException { ObjectMapper mapper = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); diff --git a/plugins/transforms/cratedbbulkloader/src/test/java/org/apache/hop/pipeline/transforms/cratedbbulkloader/http/BulkImportClientIT.java b/plugins/transforms/cratedbbulkloader/src/test/java/org/apache/hop/pipeline/transforms/cratedbbulkloader/http/BulkImportClientIT.java index 82d79065e9d..b34816a3a26 100644 --- a/plugins/transforms/cratedbbulkloader/src/test/java/org/apache/hop/pipeline/transforms/cratedbbulkloader/http/BulkImportClientIT.java +++ b/plugins/transforms/cratedbbulkloader/src/test/java/org/apache/hop/pipeline/transforms/cratedbbulkloader/http/BulkImportClientIT.java @@ -21,6 +21,7 @@ import static org.junit.Assert.assertThrows; import com.fasterxml.jackson.core.JsonProcessingException; +import java.io.IOException; import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; @@ -70,7 +71,7 @@ public static void setupAll() throws SQLException { @Test public void whenDataSizeGreaterThanMaxSize_shouldReturnRejectedRows() - throws HopException, JsonProcessingException, CrateDBHopException { + throws HopException, JsonProcessingException, CrateDBHopException, IOException { BulkImportClient client = new BulkImportClient(CRATE_ENDPOINT, "alice", "password"); var response = @@ -89,7 +90,7 @@ public void whenDataSizeGreaterThanMaxSize_shouldReturnRejectedRows() @Test public void whenRequestIsValid_shouldReturn200AndResult() - throws HopException, JsonProcessingException, SQLException, CrateDBHopException { + throws HopException, JsonProcessingException, SQLException, CrateDBHopException, IOException { BulkImportClient client = new BulkImportClient(CRATE_ENDPOINT, "alice", "password"); HttpBulkImportResponse response = client.batchInsert( diff --git a/plugins/transforms/cratedbbulkloader/src/test/java/org/apache/hop/pipeline/transforms/cratedbbulkloader/http/HttpClientBulkImportResponseTest.java b/plugins/transforms/cratedbbulkloader/src/test/java/org/apache/hop/pipeline/transforms/cratedbbulkloader/http/HttpClientBulkImportResponseTest.java index 8f65f6704d7..800e27d4f68 100644 --- a/plugins/transforms/cratedbbulkloader/src/test/java/org/apache/hop/pipeline/transforms/cratedbbulkloader/http/HttpClientBulkImportResponseTest.java +++ b/plugins/transforms/cratedbbulkloader/src/test/java/org/apache/hop/pipeline/transforms/cratedbbulkloader/http/HttpClientBulkImportResponseTest.java @@ -21,6 +21,7 @@ import static org.junit.Assert.assertThrows; import static org.mockito.Mockito.when; +import java.io.IOException; import java.net.http.HttpResponse; import org.apache.hop.core.exception.HopException; import org.junit.Before; @@ -45,7 +46,7 @@ public void setup() { } @Test - public void shouldCalculateOutputRows() throws HopException { + public void shouldCalculateOutputRows() throws HopException, IOException { String responseBody = "{\"cols\":[],\"duration\":20.493383,\"results\":[{\"rowcount\": 1},{\"rowcount\": 1},{\"rowcount\": 1},{\"rowcount\": 1},{\"rowcount\": 1}]}"; when(mockResponse.body()).thenReturn(responseBody); @@ -59,7 +60,7 @@ public void shouldCalculateOutputRows() throws HopException { } @Test - public void shouldCountRejectedRows() throws HopException { + public void shouldCountRejectedRows() throws HopException, IOException { String responseBody = "{\"cols\":[],\"duration\":20.493383,\"results\":[{\"rowcount\": 1},{\"rowcount\": 1},{\"rowcount\": 1},{\"rowcount\": 1},{\"rowcount\":-2}]}"; // as per documentation: rowcount == 1 means imported row, while rowcount == -2 means rejected @@ -76,7 +77,7 @@ public void shouldCountRejectedRows() throws HopException { } @Test - public void shouldReturnZeroOutputRowsWhenEmpty() throws HopException { + public void shouldReturnZeroOutputRowsWhenEmpty() throws HopException, IOException { String emptyResultsResponseBody = "{\"cols\":[],\"duration\":20.493383,\"results\":[]}"; when(mockResponse.statusCode()).thenReturn(200); when(mockResponse.body()).thenReturn(emptyResultsResponseBody); diff --git a/plugins/transforms/creditcardvalidator/pom.xml b/plugins/transforms/creditcardvalidator/pom.xml index fe97f80d81e..615a5e4edf3 100644 --- a/plugins/transforms/creditcardvalidator/pom.xml +++ b/plugins/transforms/creditcardvalidator/pom.xml @@ -27,7 +27,6 @@ hop-transform-creditcardvalidator jar - Hop Plugins Transforms Credit Card Validator diff --git a/plugins/transforms/creditcardvalidator/src/assembly/assembly.xml b/plugins/transforms/creditcardvalidator/src/assembly/assembly.xml index 91c144db5de..0b4b01788c8 100644 --- a/plugins/transforms/creditcardvalidator/src/assembly/assembly.xml +++ b/plugins/transforms/creditcardvalidator/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/creditcardvalidator + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/creditcardvalidator true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-creditcardvalidator:jar + plugins/transforms/creditcardvalidator \ No newline at end of file diff --git a/plugins/transforms/cubeinput/pom.xml b/plugins/transforms/cubeinput/pom.xml index 765ce7b5ab5..4765a9f891a 100644 --- a/plugins/transforms/cubeinput/pom.xml +++ b/plugins/transforms/cubeinput/pom.xml @@ -27,7 +27,6 @@ hop-transform-cubeinput jar - Hop Plugins Transforms Cube Input diff --git a/plugins/transforms/cubeinput/src/assembly/assembly.xml b/plugins/transforms/cubeinput/src/assembly/assembly.xml index 5be09508724..b40bd6ae002 100644 --- a/plugins/transforms/cubeinput/src/assembly/assembly.xml +++ b/plugins/transforms/cubeinput/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/cubeinput + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/cubeinput true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-cubeinput:jar + plugins/transforms/cubeinput \ No newline at end of file diff --git a/plugins/transforms/cubeoutput/pom.xml b/plugins/transforms/cubeoutput/pom.xml index 7855d58e875..cfbe8f5717b 100644 --- a/plugins/transforms/cubeoutput/pom.xml +++ b/plugins/transforms/cubeoutput/pom.xml @@ -27,7 +27,6 @@ hop-transform-cubeoutput jar - Hop Plugins Transforms Cube Output diff --git a/plugins/transforms/cubeoutput/src/assembly/assembly.xml b/plugins/transforms/cubeoutput/src/assembly/assembly.xml index 13c4091b64a..3e52dd2c6b0 100644 --- a/plugins/transforms/cubeoutput/src/assembly/assembly.xml +++ b/plugins/transforms/cubeoutput/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/cubeoutput + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/cubeoutput true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-cubeoutput:jar + plugins/transforms/cubeoutput \ No newline at end of file diff --git a/plugins/transforms/databasejoin/pom.xml b/plugins/transforms/databasejoin/pom.xml index d5e2c40bd08..ce3f95bb5d6 100644 --- a/plugins/transforms/databasejoin/pom.xml +++ b/plugins/transforms/databasejoin/pom.xml @@ -27,7 +27,6 @@ hop-transform-databasejoin jar - Hop Plugins Transforms Database Join diff --git a/plugins/transforms/databasejoin/src/assembly/assembly.xml b/plugins/transforms/databasejoin/src/assembly/assembly.xml index 9008b2e947e..d17c1e5ba74 100644 --- a/plugins/transforms/databasejoin/src/assembly/assembly.xml +++ b/plugins/transforms/databasejoin/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/databasejoin + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/databasejoin true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-databasejoin:jar + plugins/transforms/databasejoin \ No newline at end of file diff --git a/plugins/transforms/databaselookup/pom.xml b/plugins/transforms/databaselookup/pom.xml index 46cf963c840..a9315e479ad 100644 --- a/plugins/transforms/databaselookup/pom.xml +++ b/plugins/transforms/databaselookup/pom.xml @@ -26,6 +26,6 @@ hop-transform-databaselookup jar - Hop Plugins Transforms Database Lookup + diff --git a/plugins/transforms/databaselookup/src/assembly/assembly.xml b/plugins/transforms/databaselookup/src/assembly/assembly.xml index bd8411c1557..577182aeafe 100644 --- a/plugins/transforms/databaselookup/src/assembly/assembly.xml +++ b/plugins/transforms/databaselookup/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/databaselookup + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/databaselookup true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-databaselookup:jar + plugins/transforms/databaselookup \ No newline at end of file diff --git a/plugins/transforms/datagrid/pom.xml b/plugins/transforms/datagrid/pom.xml index 8eee0a7d39b..e5f3aceeebb 100644 --- a/plugins/transforms/datagrid/pom.xml +++ b/plugins/transforms/datagrid/pom.xml @@ -26,7 +26,6 @@ hop-transform-datagrid jar - Hop Plugins Transforms Datagrid diff --git a/plugins/transforms/datagrid/src/assembly/assembly.xml b/plugins/transforms/datagrid/src/assembly/assembly.xml index fde0ce027d2..a505f5e1ea0 100644 --- a/plugins/transforms/datagrid/src/assembly/assembly.xml +++ b/plugins/transforms/datagrid/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/datagrid + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/datagrid true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-datagrid:jar + plugins/transforms/datagrid \ No newline at end of file diff --git a/plugins/transforms/dbproc/pom.xml b/plugins/transforms/dbproc/pom.xml index 44934444fd4..d81eca7d6a7 100644 --- a/plugins/transforms/dbproc/pom.xml +++ b/plugins/transforms/dbproc/pom.xml @@ -26,7 +26,6 @@ hop-transform-dbproc jar - Hop Plugins Transforms Database Procedure diff --git a/plugins/transforms/dbproc/src/assembly/assembly.xml b/plugins/transforms/dbproc/src/assembly/assembly.xml index 717c3020ddd..0fc4afaa482 100644 --- a/plugins/transforms/dbproc/src/assembly/assembly.xml +++ b/plugins/transforms/dbproc/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/dbproc + plugins/transforms/dbproc ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/dbproc true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-dbproc:jar + plugins/transforms/dbproc \ No newline at end of file diff --git a/plugins/transforms/delay/pom.xml b/plugins/transforms/delay/pom.xml index 9942f7cffb8..f9fef538e9e 100644 --- a/plugins/transforms/delay/pom.xml +++ b/plugins/transforms/delay/pom.xml @@ -26,7 +26,6 @@ hop-transform-delay jar - Hop Plugins Transforms Delay diff --git a/plugins/transforms/delay/src/assembly/assembly.xml b/plugins/transforms/delay/src/assembly/assembly.xml index 72675cf58cb..b024a61fb84 100644 --- a/plugins/transforms/delay/src/assembly/assembly.xml +++ b/plugins/transforms/delay/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/delay + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/delay true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-delay:jar + plugins/transforms/delay \ No newline at end of file diff --git a/plugins/transforms/delete/pom.xml b/plugins/transforms/delete/pom.xml index 4dd9f1c8c6b..d7a0d8e38ad 100644 --- a/plugins/transforms/delete/pom.xml +++ b/plugins/transforms/delete/pom.xml @@ -27,7 +27,6 @@ hop-transform-delete jar - Hop Plugins Transforms Calculator diff --git a/plugins/transforms/delete/src/assembly/assembly.xml b/plugins/transforms/delete/src/assembly/assembly.xml index 544b7621800..42e02b1f4cd 100644 --- a/plugins/transforms/delete/src/assembly/assembly.xml +++ b/plugins/transforms/delete/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/delete + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/delete true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-delete:jar + plugins/transforms/delete \ No newline at end of file diff --git a/plugins/transforms/denormaliser/pom.xml b/plugins/transforms/denormaliser/pom.xml index ebaa293c369..ff45f22b97f 100644 --- a/plugins/transforms/denormaliser/pom.xml +++ b/plugins/transforms/denormaliser/pom.xml @@ -27,7 +27,6 @@ hop-transform-denormaliser jar - Hop Plugins Transforms Denormaliser diff --git a/plugins/transforms/denormaliser/src/assembly/assembly.xml b/plugins/transforms/denormaliser/src/assembly/assembly.xml index 202620671c0..2ebb066468b 100644 --- a/plugins/transforms/denormaliser/src/assembly/assembly.xml +++ b/plugins/transforms/denormaliser/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/denormaliser + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/denormaliser true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-denormaliser:jar + plugins/transforms/denormaliser \ No newline at end of file diff --git a/plugins/transforms/detectemptystream/pom.xml b/plugins/transforms/detectemptystream/pom.xml index dbc18e94677..9415c5e4c8a 100644 --- a/plugins/transforms/detectemptystream/pom.xml +++ b/plugins/transforms/detectemptystream/pom.xml @@ -27,7 +27,6 @@ hop-transform-detectemptystream jar - Hop Plugins Transforms Detect Empty Stream diff --git a/plugins/transforms/detectemptystream/src/assembly/assembly.xml b/plugins/transforms/detectemptystream/src/assembly/assembly.xml index 4c576934615..62b769fadee 100644 --- a/plugins/transforms/detectemptystream/src/assembly/assembly.xml +++ b/plugins/transforms/detectemptystream/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/detectemptystream + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/detectemptystream true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-detectemptystream:jar + plugins/transforms/detectemptystream \ No newline at end of file diff --git a/plugins/transforms/detectlastrow/pom.xml b/plugins/transforms/detectlastrow/pom.xml index 943be007b58..cd35a5f6d5c 100644 --- a/plugins/transforms/detectlastrow/pom.xml +++ b/plugins/transforms/detectlastrow/pom.xml @@ -27,7 +27,6 @@ hop-transform-detectlastrow jar - Hop Plugins Transforms Detect Last Row diff --git a/plugins/transforms/detectlastrow/src/assembly/assembly.xml b/plugins/transforms/detectlastrow/src/assembly/assembly.xml index a632efdd3bf..64047819fce 100644 --- a/plugins/transforms/detectlastrow/src/assembly/assembly.xml +++ b/plugins/transforms/detectlastrow/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/detectlastrow + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/detectlastrow true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-detectlastrow:jar + plugins/transforms/detectlastrow \ No newline at end of file diff --git a/plugins/transforms/dimensionlookup/pom.xml b/plugins/transforms/dimensionlookup/pom.xml index 60cbc7a1744..f134921ceeb 100644 --- a/plugins/transforms/dimensionlookup/pom.xml +++ b/plugins/transforms/dimensionlookup/pom.xml @@ -27,7 +27,6 @@ hop-transform-dimensionlookup jar - Hop Plugins Transforms Dimension Lookup diff --git a/plugins/transforms/dimensionlookup/src/assembly/assembly.xml b/plugins/transforms/dimensionlookup/src/assembly/assembly.xml index b4da0b9048b..0ee0788d429 100644 --- a/plugins/transforms/dimensionlookup/src/assembly/assembly.xml +++ b/plugins/transforms/dimensionlookup/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/dimensionlookup + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/dimensionlookup true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-dimensionlookup:jar + plugins/transforms/dimensionlookup \ No newline at end of file diff --git a/plugins/transforms/dorisbulkloader/pom.xml b/plugins/transforms/dorisbulkloader/pom.xml index 0169f81391a..9a68bbeca6f 100644 --- a/plugins/transforms/dorisbulkloader/pom.xml +++ b/plugins/transforms/dorisbulkloader/pom.xml @@ -27,26 +27,6 @@ hop-transform-dorisbulkloader jar - Hop Plugins Transforms Doris Bulk Loader - - - com.googlecode.json-simple - json-simple - 1.1 - - - * - * - - - - - org.apache.httpcomponents - httpclient - 4.5.13 - - - diff --git a/plugins/transforms/dorisbulkloader/src/assembly/assembly.xml b/plugins/transforms/dorisbulkloader/src/assembly/assembly.xml index 9bdcc7215c0..df639e0015b 100644 --- a/plugins/transforms/dorisbulkloader/src/assembly/assembly.xml +++ b/plugins/transforms/dorisbulkloader/src/assembly/assembly.xml @@ -22,28 +22,28 @@ zip - transforms/dorisbulkloader + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/dorisbulkloader true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-dorisbulkloader:jar + plugins/transforms/dorisbulkloader \ No newline at end of file diff --git a/plugins/transforms/drools/pom.xml b/plugins/transforms/drools/pom.xml index 6876362025b..079258e6707 100644 --- a/plugins/transforms/drools/pom.xml +++ b/plugins/transforms/drools/pom.xml @@ -27,104 +27,123 @@ hop-transform-drools jar - Hop Plugins Transforms for Drools - 3.5.3 7.74.1.Final - 7.74.1.Final - 2.4.14.Final - - - - org.antlr - antlr-runtime - ${antlr.version} - + + + + org.apache.hop + hop-libs + ${project.version} + pom + import + + + + org.drools drools-compiler ${drools.version} + + + commons-codec + * + + + org.slf4j + * + + org.drools drools-core ${drools.version} - compile + + + commons-codec + * + + + org.slf4j + * + + - org.drools drools-core-dynamic ${drools.version} + + + org.slf4j + * + + - org.drools drools-core-reflective ${drools.version} - compile + + + org.slf4j + * + + - org.drools drools-decisiontables ${drools.version} + + + org.apache.poi + * + + + org.slf4j + * + + - org.drools drools-mvel ${drools.version} + + + org.slf4j + * + + - org.drools drools-templates ${drools.version} + + + org.slf4j + * + + - - - org.kie - kie-api - ${kie.version} - compile - - - org.kie - kie-internal - ${kie.version} - compile + org.apache.poi + poi + provided - - org.kie - kie-memory-compiler - ${kie.version} - - - - org.kie.soup - kie-soup-maven-support - ${kie.version} - - - - org.kie.soup - kie-soup-project-datamodel-commons - ${kie.version} - - - - org.mvel - mvel2 - ${mvel2.version} + org.apache.poi + poi-ooxml + provided - diff --git a/plugins/transforms/drools/src/assembly/assembly.xml b/plugins/transforms/drools/src/assembly/assembly.xml index a96966606e0..8b773225f87 100644 --- a/plugins/transforms/drools/src/assembly/assembly.xml +++ b/plugins/transforms/drools/src/assembly/assembly.xml @@ -16,54 +16,51 @@ --> - hop-transform-drools - - zip - - transforms/drools - - - ${project.basedir}/src/main/resources/version.xml - . - true - - - - - lib - - **/* - - - - - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd"> + hop-transform-drools + + zip + + . + + + ${project.basedir}/src/main/resources/version.xml + plugins/transforms/drools + true + + - - org.apache.hop:hop-transform-drools:jar - - - + + + ${project.basedir}/src/main/samples + config/projects/samples/ + + - lib - - org.drools:drools-core:jar - org.drools:drools-core-reflective:jar - org.drools:drools-core-dynamic:jar - org.drools:drools-compiler:jar - org.drools:drools-templates:jar - org.drools:drools-decisiontables:jar - org.drools:drools-mvel:jar - org.kie:kie-internal:jar - org.kie.soup:kie-soup-maven-support:jar - org.kie:kie-api:jar - org.kie:kie-memory-compiler:jar - org.kie.soup:kie-soup-project-datamodel-commons:jar - org.antlr:antlr-runtime:jar - org.mvel:mvel2:jar - - - + + + + org.apache.hop:hop-transform-drools:jar + + plugins/transforms/drools + + + runtime + + org.apache.hop:hop-transform-drools:jar + + plugins/transforms/drools/lib + + + provided + + org.apache.poi:* + com.zaxxer:* + org.apache.xmlbeans:* + com.github.virtuald:* + + lib/core + + \ No newline at end of file diff --git a/plugins/transforms/dynamicsqlrow/pom.xml b/plugins/transforms/dynamicsqlrow/pom.xml index 50b704eef94..243d38ea401 100644 --- a/plugins/transforms/dynamicsqlrow/pom.xml +++ b/plugins/transforms/dynamicsqlrow/pom.xml @@ -27,7 +27,6 @@ hop-transform-dynamicsqlrow jar - Hop Plugins Transforms Dynamic SQL Row diff --git a/plugins/transforms/dynamicsqlrow/src/assembly/assembly.xml b/plugins/transforms/dynamicsqlrow/src/assembly/assembly.xml index 15fb283ca7b..b2c93f49600 100644 --- a/plugins/transforms/dynamicsqlrow/src/assembly/assembly.xml +++ b/plugins/transforms/dynamicsqlrow/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/dynamicsqlrow + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/dynamicsqlrow true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-dynamicsqlrow:jar + plugins/transforms/dynamicsqlrow \ No newline at end of file diff --git a/plugins/transforms/edi2xml/pom.xml b/plugins/transforms/edi2xml/pom.xml index 62bb3a7f449..59f35ae65e0 100644 --- a/plugins/transforms/edi2xml/pom.xml +++ b/plugins/transforms/edi2xml/pom.xml @@ -26,20 +26,17 @@ hop-transform-edi2xml jar - Hop Plugins Transforms EDI 2 XML + + 3.5.3 + + org.antlr antlr-complete - 3.5.3 - - - * - * - - + ${antlr-complete.version} diff --git a/plugins/transforms/edi2xml/src/assembly/assembly.xml b/plugins/transforms/edi2xml/src/assembly/assembly.xml index 13f409a3442..a0e7955017e 100644 --- a/plugins/transforms/edi2xml/src/assembly/assembly.xml +++ b/plugins/transforms/edi2xml/src/assembly/assembly.xml @@ -23,36 +23,35 @@ zip - transforms/edi2xml + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/edi2xml true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-edi2xml:jar + plugins/transforms/edi2xml - - lib - - org.antlr:antlr-runtime:jar - org.antlr:antlr-complete:jar - + runtime + + org.apache.hop:hop-transform-edi2xml:jar + + plugins/transforms/edi2xml/lib \ No newline at end of file diff --git a/plugins/transforms/excel/pom.xml b/plugins/transforms/excel/pom.xml index c984305d001..ed4ae824895 100644 --- a/plugins/transforms/excel/pom.xml +++ b/plugins/transforms/excel/pom.xml @@ -27,52 +27,74 @@ hop-transform-excel jar - Hop Plugins Transforms Excel 0.8.7 - 5.2.4 - 2.12.2 + + + + org.apache.hop + hop-libs + ${project.version} + pom + import + + + + + + org.odftoolkit + odfdom-java + ${odfdom-java.version} + + + * + * + + + org.apache.hop hop-misc-static-schema ${project.version} + provided org.apache.hop hop-transform-textfile - 2.10.0-SNAPSHOT - compile + ${project.version} + provided org.apache.poi poi - ${poi.version} + provided + + + org.apache.logging.log4j + log4j-api + + org.apache.poi poi-ooxml - ${poi.version} - - - org.odftoolkit - odfdom-java - ${odfdom-java.version} + provided - * - * + org.apache.logging.log4j + log4j-api xerces xercesImpl - ${xerces.version} + provided diff --git a/plugins/transforms/excel/src/assembly/assembly.xml b/plugins/transforms/excel/src/assembly/assembly.xml index 08ce4824468..039cf7d08f2 100644 --- a/plugins/transforms/excel/src/assembly/assembly.xml +++ b/plugins/transforms/excel/src/assembly/assembly.xml @@ -23,124 +23,58 @@ zip - transforms/excel + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/excel true ${project.basedir}/src/main/resources/dependencies.xml - . + plugins/transforms/excel true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-excel:jar + plugins/transforms/excel - - lib - - org.odftoolkit:odfdom-java:jar - - - - - lib - - org.apache.poi:poi:jar - - - - - lib - - org.apache.poi:poi-ooxml:jar - - - - - lib - - org.apache.poi:poi-ooxml-lite:jar - + runtime + + org.apache.hop:hop-transform-excel:jar + + plugins/transforms/excel/lib - - lib + provided + com.github.virtuald:curvesapi:jar + org.apache.poi:*:jar org.apache.xmlbeans:xmlbeans:jar - - - - - lib - org.apache.commons:commons-collections4:jar - - - - - lib - commons-codec:commons-codec:jar - - - - - lib - commons-io:commons-io:jar - - - - - - lib - com.zaxxer:SparseBitSet:jar - - - - - lib - org.apache.commons:commons-math3:jar - - - - - lib - org.apache.commons:commons-compress:jar + xerces:xercesImpl:jar + xml-apis:xml-apis:jar + org.apache.logging.log4j:log4j-api:jar - - - - lib - - com.github.virtuald:curvesapi:jar - + lib/core \ No newline at end of file diff --git a/plugins/transforms/execinfo/pom.xml b/plugins/transforms/execinfo/pom.xml index 349a762aee7..3aca2af8464 100644 --- a/plugins/transforms/execinfo/pom.xml +++ b/plugins/transforms/execinfo/pom.xml @@ -27,7 +27,6 @@ hop-transform-execinfo jar - Hop Plugins Transforms Execution Information diff --git a/plugins/transforms/execinfo/src/assembly/assembly.xml b/plugins/transforms/execinfo/src/assembly/assembly.xml index 50fb14a7282..9657cee1d9e 100644 --- a/plugins/transforms/execinfo/src/assembly/assembly.xml +++ b/plugins/transforms/execinfo/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/execinfo + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/execinfo true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-execinfo:jar + plugins/transforms/execinfo \ No newline at end of file diff --git a/plugins/transforms/execprocess/pom.xml b/plugins/transforms/execprocess/pom.xml index 6390d64089c..3b62547f2f4 100644 --- a/plugins/transforms/execprocess/pom.xml +++ b/plugins/transforms/execprocess/pom.xml @@ -27,7 +27,6 @@ hop-transform-execprocess jar - Hop Plugins Transforms Execute Process diff --git a/plugins/transforms/execprocess/src/assembly/assembly.xml b/plugins/transforms/execprocess/src/assembly/assembly.xml index 6c09d5dd222..69f43579068 100644 --- a/plugins/transforms/execprocess/src/assembly/assembly.xml +++ b/plugins/transforms/execprocess/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/execprocess + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/execprocess true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-execprocess:jar + plugins/transforms/execprocess \ No newline at end of file diff --git a/plugins/transforms/execsqlrow/pom.xml b/plugins/transforms/execsqlrow/pom.xml index 5d31694ceb9..8b57b4ee0c8 100644 --- a/plugins/transforms/execsqlrow/pom.xml +++ b/plugins/transforms/execsqlrow/pom.xml @@ -27,7 +27,6 @@ hop-transform-execsqlrow jar - Hop Plugins Transforms Execute SQL Row diff --git a/plugins/transforms/execsqlrow/src/assembly/assembly.xml b/plugins/transforms/execsqlrow/src/assembly/assembly.xml index e9edcfda4d3..70b1706dc16 100644 --- a/plugins/transforms/execsqlrow/src/assembly/assembly.xml +++ b/plugins/transforms/execsqlrow/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/execsqlrow + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/execsqlrow true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-execsqlrow:jar + plugins/transforms/execsqlrow \ No newline at end of file diff --git a/plugins/transforms/fake/pom.xml b/plugins/transforms/fake/pom.xml index 8993d330112..d7cf05c9c6c 100644 --- a/plugins/transforms/fake/pom.xml +++ b/plugins/transforms/fake/pom.xml @@ -27,19 +27,50 @@ hop-transform-fake jar - Hop Plugins Transforms Fake + + 1.11-8 + 1.0.2 + + + + + + org.apache.hop + hop-libs + ${project.version} + pom + import + + + + com.github.javafaker javafaker - 1.0.2 + ${javafaker.version} + + + org.apache.commons + * + + + org.yaml + * + + dk.brics.automaton automaton - 1.11-8 + ${automaton.version} + + + org.yaml + snakeyaml + provided diff --git a/plugins/transforms/fake/src/assembly/assembly.xml b/plugins/transforms/fake/src/assembly/assembly.xml index 043e62a8780..aff47ae942d 100644 --- a/plugins/transforms/fake/src/assembly/assembly.xml +++ b/plugins/transforms/fake/src/assembly/assembly.xml @@ -22,37 +22,42 @@ zip - transforms/fake + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/fake true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-fake:jar + plugins/transforms/fake - - lib + runtime + + org.apache.hop:hop-transform-fake:jar + + plugins/transforms/fake/lib + + + provided - com.github.javafaker:javafaker:jar - com.github.mifmif:generex:jar - dk.brics.automaton:automaton:jar + org.yaml:snakeyaml:jar + lib/core \ No newline at end of file diff --git a/plugins/transforms/fieldschangesequence/pom.xml b/plugins/transforms/fieldschangesequence/pom.xml index 3652f0d563e..9bc32297d78 100644 --- a/plugins/transforms/fieldschangesequence/pom.xml +++ b/plugins/transforms/fieldschangesequence/pom.xml @@ -27,7 +27,6 @@ hop-transform-fieldschangesequence jar - Hop Plugins Transforms Fields Changing Sequence diff --git a/plugins/transforms/fieldschangesequence/src/assembly/assembly.xml b/plugins/transforms/fieldschangesequence/src/assembly/assembly.xml index 2eef9a14de0..9ffc90185ba 100644 --- a/plugins/transforms/fieldschangesequence/src/assembly/assembly.xml +++ b/plugins/transforms/fieldschangesequence/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/fieldschangesequence + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/fieldschangesequence true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-fieldschangesequence:jar + plugins/transforms/fieldschangesequence \ No newline at end of file diff --git a/plugins/transforms/fieldsplitter/pom.xml b/plugins/transforms/fieldsplitter/pom.xml index c59414bf26a..9ed45c066de 100644 --- a/plugins/transforms/fieldsplitter/pom.xml +++ b/plugins/transforms/fieldsplitter/pom.xml @@ -27,7 +27,6 @@ hop-transform-fieldsplitter jar - Hop Plugins Transforms Field Splitter diff --git a/plugins/transforms/fieldsplitter/src/assembly/assembly.xml b/plugins/transforms/fieldsplitter/src/assembly/assembly.xml index f9538d4ad27..ca3b6a4dfb5 100644 --- a/plugins/transforms/fieldsplitter/src/assembly/assembly.xml +++ b/plugins/transforms/fieldsplitter/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/fieldsplitter + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/fieldsplitter true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-fieldsplitter:jar + plugins/transforms/fieldsplitter \ No newline at end of file diff --git a/plugins/transforms/fileexists/pom.xml b/plugins/transforms/fileexists/pom.xml index fa1369c7ee2..0a456e924f2 100644 --- a/plugins/transforms/fileexists/pom.xml +++ b/plugins/transforms/fileexists/pom.xml @@ -27,7 +27,6 @@ hop-transform-fileexists jar - Hop Plugins Transforms File Exists diff --git a/plugins/transforms/fileexists/src/assembly/assembly.xml b/plugins/transforms/fileexists/src/assembly/assembly.xml index c63b1e4adb5..c79f449c7c9 100644 --- a/plugins/transforms/fileexists/src/assembly/assembly.xml +++ b/plugins/transforms/fileexists/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/fileexists + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/fileexists true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-fileexists:jar + plugins/transforms/fileexists \ No newline at end of file diff --git a/plugins/transforms/filelocked/pom.xml b/plugins/transforms/filelocked/pom.xml index 88d3541b09f..ce84dc9bd5e 100644 --- a/plugins/transforms/filelocked/pom.xml +++ b/plugins/transforms/filelocked/pom.xml @@ -27,13 +27,13 @@ hop-transform-filelocked jar - Hop Plugins Transforms File Locked + org.apache.hop hop-action-checkfilelocked - 2.10.0-SNAPSHOT + ${project.version} compile diff --git a/plugins/transforms/filelocked/src/assembly/assembly.xml b/plugins/transforms/filelocked/src/assembly/assembly.xml index ebf7d61510c..ada88f22e3d 100644 --- a/plugins/transforms/filelocked/src/assembly/assembly.xml +++ b/plugins/transforms/filelocked/src/assembly/assembly.xml @@ -23,33 +23,33 @@ zip - transforms/filelocked + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/filelocked true ${project.basedir}/src/main/resources/dependencies.xml - . + plugins/transforms/filelocked true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-filelocked:jar + plugins/transforms/filelocked \ No newline at end of file diff --git a/plugins/transforms/filemetadata/pom.xml b/plugins/transforms/filemetadata/pom.xml index 40dd271212c..6125e41ac5e 100644 --- a/plugins/transforms/filemetadata/pom.xml +++ b/plugins/transforms/filemetadata/pom.xml @@ -27,55 +27,54 @@ hop-transform-filemetadata jar - Hop Plugins Transforms File Metadata + + 5.7.1 + + + + + + org.apache.hop + hop-libs + ${project.version} + pom + import + + + + + + com.opencsv + opencsv + ${opencsv.version} + + + commons-beanutils + * + + + org.apache.commons + commons-collections4 + + + org.apache.commons + commons-lang3 + + + com.github.albfernandez juniversalchardet - ${juniversalchardet.version} + provided - com.opencsv - opencsv - ${opencsv.version} + org.apache.commons + commons-lang3 + provided - - - - src - - **/*.png - **/*.properties - - - - src/main/java - - **/*.properties - **/*.png - **/*.svg - **/*.xul - - - - src/main/resources - - **/*.properties - **/*.png - **/*.svg - **/*.xul - - - - src/test/resources - - **/*.csv - - - - diff --git a/plugins/transforms/filemetadata/src/assembly/assembly.xml b/plugins/transforms/filemetadata/src/assembly/assembly.xml index a5b34f3c158..29d90762190 100644 --- a/plugins/transforms/filemetadata/src/assembly/assembly.xml +++ b/plugins/transforms/filemetadata/src/assembly/assembly.xml @@ -23,42 +23,42 @@ zip - transforms/filemetadata + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/filemetadata true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-filemetadata:jar + plugins/transforms/filemetadata - - lib - - com.opencsv:opencsv:jar - + runtime + + org.apache.hop:hop-transform-filemetadata:jar + + plugins/transforms/filemetadata/lib - - lib com.github.albfernandez:juniversalchardet:jar + org.apache.commons:commons-lang3:jar + lib/core \ No newline at end of file diff --git a/plugins/transforms/filesfromresult/pom.xml b/plugins/transforms/filesfromresult/pom.xml index 8eb65e8306b..91eb7c16cf1 100644 --- a/plugins/transforms/filesfromresult/pom.xml +++ b/plugins/transforms/filesfromresult/pom.xml @@ -27,7 +27,6 @@ hop-transform-filesfromresult jar - Hop Plugins Transforms Files From Result diff --git a/plugins/transforms/filesfromresult/src/assembly/assembly.xml b/plugins/transforms/filesfromresult/src/assembly/assembly.xml index ccf939eca54..aa621e0491a 100644 --- a/plugins/transforms/filesfromresult/src/assembly/assembly.xml +++ b/plugins/transforms/filesfromresult/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/filesfromresult + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/filesfromresult true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-filesfromresult:jar + plugins/transforms/filesfromresult \ No newline at end of file diff --git a/plugins/transforms/filestoresult/pom.xml b/plugins/transforms/filestoresult/pom.xml index ae93bc4ac27..2838ec56c71 100644 --- a/plugins/transforms/filestoresult/pom.xml +++ b/plugins/transforms/filestoresult/pom.xml @@ -27,7 +27,6 @@ hop-transform-filestoresult jar - Hop Plugins Transforms Files To Result diff --git a/plugins/transforms/filestoresult/src/assembly/assembly.xml b/plugins/transforms/filestoresult/src/assembly/assembly.xml index 2d8ad400a75..e8f3078a9bf 100644 --- a/plugins/transforms/filestoresult/src/assembly/assembly.xml +++ b/plugins/transforms/filestoresult/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/filestoresult + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/filestoresult true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-filestoresult:jar + plugins/transforms/filestoresult \ No newline at end of file diff --git a/plugins/transforms/filterrows/pom.xml b/plugins/transforms/filterrows/pom.xml index 881bf4d5e25..b209661e035 100644 --- a/plugins/transforms/filterrows/pom.xml +++ b/plugins/transforms/filterrows/pom.xml @@ -27,7 +27,6 @@ hop-transform-filterrows jar - Hop Plugins Transforms Filter Rows diff --git a/plugins/transforms/filterrows/src/assembly/assembly.xml b/plugins/transforms/filterrows/src/assembly/assembly.xml index 8d1c9772755..c3f8802d964 100644 --- a/plugins/transforms/filterrows/src/assembly/assembly.xml +++ b/plugins/transforms/filterrows/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/filterrows + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/filterrows true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-filterrows:jar + plugins/transforms/filterrows \ No newline at end of file diff --git a/plugins/transforms/flattener/pom.xml b/plugins/transforms/flattener/pom.xml index 751e79c6c8d..9697c544f2a 100644 --- a/plugins/transforms/flattener/pom.xml +++ b/plugins/transforms/flattener/pom.xml @@ -27,7 +27,6 @@ hop-transform-flattener jar - Hop Plugins Transforms Row Flattener diff --git a/plugins/transforms/flattener/src/assembly/assembly.xml b/plugins/transforms/flattener/src/assembly/assembly.xml index 4c4b07e94f5..a1bf6fbecfd 100644 --- a/plugins/transforms/flattener/src/assembly/assembly.xml +++ b/plugins/transforms/flattener/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/flattener + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/flattener true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-flattener:jar + plugins/transforms/flattener \ No newline at end of file diff --git a/plugins/transforms/formula/pom.xml b/plugins/transforms/formula/pom.xml index 85019dc8a47..ea5dd7a39e1 100644 --- a/plugins/transforms/formula/pom.xml +++ b/plugins/transforms/formula/pom.xml @@ -26,44 +26,31 @@ hop-transform-formula jar - Hop Plugins Transforms Formula - - 5.2.4 - + + + + org.apache.hop + hop-libs + ${project.version} + pom + import + + + org.apache.poi poi - ${poi.version} - compile + provided org.apache.poi poi-ooxml - ${poi.version} - compile + provided - - - - src/main/java - - **/*.properties - **/*.svg - - - - src/main/resources - - **/*.xml - **/*.properties - **/*.svg - - - - + diff --git a/plugins/transforms/formula/src/assembly/assembly.xml b/plugins/transforms/formula/src/assembly/assembly.xml index 6d1a9cebf86..2a664d42ca0 100644 --- a/plugins/transforms/formula/src/assembly/assembly.xml +++ b/plugins/transforms/formula/src/assembly/assembly.xml @@ -23,84 +23,48 @@ zip - transforms/formula + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/formula true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-formula:jar + plugins/transforms/formula - - lib + provided + com.github.virtuald:curvesapi:jar org.apache.poi:poi:jar - - - - - lib - org.apache.poi:poi-ooxml:jar - - - - - lib - org.apache.poi:poi-ooxml-lite:jar - - - - - lib - - org.apache.poi:poi-ooxml-schemas:jar - - - - - lib - org.apache.xmlbeans:xmlbeans:jar - - - - - - lib - - org.apache.logging.log4j:log4j-to-slf4j:jar - - - - - lib - - org.apache.logging.log4j:log4j-core:jar - + lib/core \ No newline at end of file diff --git a/plugins/transforms/fuzzymatch/pom.xml b/plugins/transforms/fuzzymatch/pom.xml index fbad3c0c4fb..ba950416118 100644 --- a/plugins/transforms/fuzzymatch/pom.xml +++ b/plugins/transforms/fuzzymatch/pom.xml @@ -27,14 +27,31 @@ hop-transform-fuzzymatch jar - Hop Plugins Transforms Fuzzy Match + + + + org.apache.hop + hop-libs + ${project.version} + pom + import + + + + com.wcohen com.wcohen.secondstring - 0.1 + provided + + + log4j + log4j + + diff --git a/plugins/transforms/fuzzymatch/src/assembly/assembly.xml b/plugins/transforms/fuzzymatch/src/assembly/assembly.xml index 19686bc6084..f764a384ca1 100644 --- a/plugins/transforms/fuzzymatch/src/assembly/assembly.xml +++ b/plugins/transforms/fuzzymatch/src/assembly/assembly.xml @@ -23,35 +23,34 @@ zip - transforms/fuzzymatch + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/fuzzymatch true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-fuzzymatch:jar + plugins/transforms/fuzzymatch - - lib com.wcohen:com.wcohen.secondstring:jar + lib/core \ No newline at end of file diff --git a/plugins/transforms/getfilenames/pom.xml b/plugins/transforms/getfilenames/pom.xml index 8501d08b40f..e3b2f91adbf 100644 --- a/plugins/transforms/getfilenames/pom.xml +++ b/plugins/transforms/getfilenames/pom.xml @@ -27,7 +27,6 @@ hop-transform-getfilenames jar - Hop Plugins Transforms Get File Names diff --git a/plugins/transforms/getfilenames/src/assembly/assembly.xml b/plugins/transforms/getfilenames/src/assembly/assembly.xml index 548438a5faa..01792eb8777 100644 --- a/plugins/transforms/getfilenames/src/assembly/assembly.xml +++ b/plugins/transforms/getfilenames/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/getfilenames + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/getfilenames true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-getfilenames:jar + plugins/transforms/getfilenames \ No newline at end of file diff --git a/plugins/transforms/getfilesrowcount/pom.xml b/plugins/transforms/getfilesrowcount/pom.xml index 958abcda4c7..0476b4add53 100644 --- a/plugins/transforms/getfilesrowcount/pom.xml +++ b/plugins/transforms/getfilesrowcount/pom.xml @@ -27,7 +27,6 @@ hop-transform-getfilesrowcount jar - Hop Plugins Transforms Get Files Row Count diff --git a/plugins/transforms/getfilesrowcount/src/assembly/assembly.xml b/plugins/transforms/getfilesrowcount/src/assembly/assembly.xml index a44c090d485..1f9445e187f 100644 --- a/plugins/transforms/getfilesrowcount/src/assembly/assembly.xml +++ b/plugins/transforms/getfilesrowcount/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/getfilesrowscount + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/getfilesrowscount true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-getfilesrowcount:jar + plugins/transforms/getfilesrowscount \ No newline at end of file diff --git a/plugins/transforms/getsubfolders/pom.xml b/plugins/transforms/getsubfolders/pom.xml index 1e2ab982e02..98cf28c48a8 100644 --- a/plugins/transforms/getsubfolders/pom.xml +++ b/plugins/transforms/getsubfolders/pom.xml @@ -27,7 +27,6 @@ hop-transform-getsubfolders jar - Hop Plugins Transforms Get Subfolders diff --git a/plugins/transforms/getsubfolders/src/assembly/assembly.xml b/plugins/transforms/getsubfolders/src/assembly/assembly.xml index 2c70eb14f49..03c840eb4e7 100644 --- a/plugins/transforms/getsubfolders/src/assembly/assembly.xml +++ b/plugins/transforms/getsubfolders/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/getsubfolders + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/getsubfolders true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-getsubfolders:jar + plugins/transforms/getsubfolders \ No newline at end of file diff --git a/plugins/transforms/gettablenames/pom.xml b/plugins/transforms/gettablenames/pom.xml index 2cc258deaae..17956026386 100644 --- a/plugins/transforms/gettablenames/pom.xml +++ b/plugins/transforms/gettablenames/pom.xml @@ -27,7 +27,6 @@ hop-transform-gettablenames jar - Hop Plugins Transforms Get Table Names diff --git a/plugins/transforms/gettablenames/src/assembly/assembly.xml b/plugins/transforms/gettablenames/src/assembly/assembly.xml index e9471410d8a..df49971942f 100644 --- a/plugins/transforms/gettablenames/src/assembly/assembly.xml +++ b/plugins/transforms/gettablenames/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/gettablenames + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/gettablenames true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-gettablenames:jar + plugins/transforms/gettablenames \ No newline at end of file diff --git a/plugins/transforms/getvariable/pom.xml b/plugins/transforms/getvariable/pom.xml index ad7d9a325ad..3e7e187ae3c 100644 --- a/plugins/transforms/getvariable/pom.xml +++ b/plugins/transforms/getvariable/pom.xml @@ -27,7 +27,6 @@ hop-transform-getvariable jar - Hop Plugins Transforms Get Variable diff --git a/plugins/transforms/getvariable/src/assembly/assembly.xml b/plugins/transforms/getvariable/src/assembly/assembly.xml index 169e82785e5..fdb9e35f504 100644 --- a/plugins/transforms/getvariable/src/assembly/assembly.xml +++ b/plugins/transforms/getvariable/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/getvariable + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/getvariable true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-getvariable:jar + plugins/transforms/getvariable \ No newline at end of file diff --git a/plugins/transforms/groupby/pom.xml b/plugins/transforms/groupby/pom.xml index b5f1f7ca667..2d0e0e90962 100644 --- a/plugins/transforms/groupby/pom.xml +++ b/plugins/transforms/groupby/pom.xml @@ -27,7 +27,25 @@ hop-transform-groupby jar - Hop Plugins Transforms Group By + + + + org.apache.hop + hop-libs + ${project.version} + pom + import + + + + + + + org.apache.commons + commons-math3 + + + diff --git a/plugins/transforms/groupby/src/assembly/assembly.xml b/plugins/transforms/groupby/src/assembly/assembly.xml index be50d6943d1..80a509f80e5 100644 --- a/plugins/transforms/groupby/src/assembly/assembly.xml +++ b/plugins/transforms/groupby/src/assembly/assembly.xml @@ -23,28 +23,34 @@ zip - transforms/groupby + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/groupby true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-groupby:jar + plugins/transforms/groupby + + + + org.apache.commons:commons-math3:jar + + lib/core \ No newline at end of file diff --git a/plugins/transforms/http/pom.xml b/plugins/transforms/http/pom.xml index 43be8edf840..d85888d3732 100644 --- a/plugins/transforms/http/pom.xml +++ b/plugins/transforms/http/pom.xml @@ -27,20 +27,6 @@ hop-transform-http jar - Hop Plugins Transforms HTTP - - - com.googlecode.json-simple - json-simple - 1.1.1 - - - * - * - - - - diff --git a/plugins/transforms/http/src/assembly/assembly.xml b/plugins/transforms/http/src/assembly/assembly.xml index fa000227080..5d9d0581d0b 100644 --- a/plugins/transforms/http/src/assembly/assembly.xml +++ b/plugins/transforms/http/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/http + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/http true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-http:jar + plugins/transforms/http \ No newline at end of file diff --git a/plugins/transforms/httppost/pom.xml b/plugins/transforms/httppost/pom.xml index 21269ade8cf..a64e26b4999 100644 --- a/plugins/transforms/httppost/pom.xml +++ b/plugins/transforms/httppost/pom.xml @@ -27,14 +27,17 @@ hop-transform-httppost jar - Hop Plugins Transforms HTTP Post + + 4.5.13 + + - com.googlecode.json-simple - json-simple - 1.1 + org.apache.httpcomponents + httpmime + ${httpclient.version} * @@ -42,16 +45,5 @@ - - org.apache.httpcomponents - httpclient - 4.5.13 - - - org.apache.httpcomponents - httpmime - 4.5.13 - - diff --git a/plugins/transforms/httppost/src/assembly/assembly.xml b/plugins/transforms/httppost/src/assembly/assembly.xml index 165b3c97dc0..ccf1ec0177f 100644 --- a/plugins/transforms/httppost/src/assembly/assembly.xml +++ b/plugins/transforms/httppost/src/assembly/assembly.xml @@ -23,35 +23,34 @@ zip - transforms/httppost + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/httppost true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-httppost:jar + plugins/transforms/httppost - - lib org.apache.httpcomponents:httpmime:jar + plugins/transforms/httppost/lib \ No newline at end of file diff --git a/plugins/transforms/ifnull/pom.xml b/plugins/transforms/ifnull/pom.xml index 9fe90414068..f8f17cf46fa 100644 --- a/plugins/transforms/ifnull/pom.xml +++ b/plugins/transforms/ifnull/pom.xml @@ -27,7 +27,6 @@ hop-transform-ifnull jar - Hop Plugins Transforms If Null diff --git a/plugins/transforms/ifnull/src/assembly/assembly.xml b/plugins/transforms/ifnull/src/assembly/assembly.xml index e24dd183ca5..724ba3ed83f 100644 --- a/plugins/transforms/ifnull/src/assembly/assembly.xml +++ b/plugins/transforms/ifnull/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/ifnull + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/ifnull true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-ifnull:jar + plugins/transforms/ifnull \ No newline at end of file diff --git a/plugins/transforms/insertupdate/pom.xml b/plugins/transforms/insertupdate/pom.xml index 0df1c80af45..b2168eec521 100644 --- a/plugins/transforms/insertupdate/pom.xml +++ b/plugins/transforms/insertupdate/pom.xml @@ -27,7 +27,6 @@ hop-transform-insertupdate jar - Hop Plugins Transforms Insert Update diff --git a/plugins/transforms/insertupdate/src/assembly/assembly.xml b/plugins/transforms/insertupdate/src/assembly/assembly.xml index c5549e7dfcf..0c259660d9b 100644 --- a/plugins/transforms/insertupdate/src/assembly/assembly.xml +++ b/plugins/transforms/insertupdate/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/insertupdate + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/insertupdate true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-insertupdate:jar + plugins/transforms/insertupdate \ No newline at end of file diff --git a/plugins/transforms/janino/pom.xml b/plugins/transforms/janino/pom.xml index 5a16107126f..aaa931537f5 100644 --- a/plugins/transforms/janino/pom.xml +++ b/plugins/transforms/janino/pom.xml @@ -27,7 +27,6 @@ hop-transform-janino jar - Hop Plugins Transforms Janino @@ -47,24 +46,4 @@ - - - - src/main/java - - **/*.xml - **/*.properties - - - - src/main/resources - - **/*.xml - **/*.properties - **/*.svg - - - - - diff --git a/plugins/transforms/janino/src/assembly/assembly.xml b/plugins/transforms/janino/src/assembly/assembly.xml index 94242818826..4605455d540 100644 --- a/plugins/transforms/janino/src/assembly/assembly.xml +++ b/plugins/transforms/janino/src/assembly/assembly.xml @@ -23,41 +23,40 @@ zip - transforms/janino + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/janino true ${project.basedir}/src/main/resources/dependencies.xml - . + plugins/transforms/janino true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-janino:jar + plugins/transforms/janino - - lib org.codehaus.janino:janino:jar org.codehaus.janino:commons-compiler:jar + plugins/transforms/janino/lib \ No newline at end of file diff --git a/plugins/transforms/javascript/pom.xml b/plugins/transforms/javascript/pom.xml index cd5e7bf7430..d0bf1f00bf6 100644 --- a/plugins/transforms/javascript/pom.xml +++ b/plugins/transforms/javascript/pom.xml @@ -26,52 +26,43 @@ hop-transform-javascript jar - Hop Plugins Transforms Javascript + + + + org.apache.hop + hop-libs + ${project.version} + pom + import + + + + - javax.mail - mail - 1.4 + com.sun.mail + jakarta.mail org.apache.hop hop-transform-fieldsplitter - 2.10.0-SNAPSHOT - compile + ${project.version} + provided org.apache.hop hop-transform-loadfileinput - 2.10.0-SNAPSHOT - compile + ${project.version} + provided org.apache.hop hop-transform-rowgenerator - 2.10.0-SNAPSHOT - compile + ${project.version} + provided - - - - src/main/java - - **/*.xml - **/*.properties - - - - src/main/resources - - **/*.xml - **/*.properties - **/*.svg - - - - diff --git a/plugins/transforms/javascript/src/assembly/assembly.xml b/plugins/transforms/javascript/src/assembly/assembly.xml index 786314a123e..767e318c3cd 100644 --- a/plugins/transforms/javascript/src/assembly/assembly.xml +++ b/plugins/transforms/javascript/src/assembly/assembly.xml @@ -23,32 +23,39 @@ zip - transforms/javascript + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/javascript true ${project.basedir}/src/main/resources/dependencies.xml - . + plugins/transforms/javascript true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-transform-javascript:jar + plugins/transforms/javascript + + + runtime + lib/core + false + false \ No newline at end of file diff --git a/plugins/transforms/jdbc-metadata/pom.xml b/plugins/transforms/jdbc-metadata/pom.xml index fd20accf007..a8b38ee02c4 100644 --- a/plugins/transforms/jdbc-metadata/pom.xml +++ b/plugins/transforms/jdbc-metadata/pom.xml @@ -27,7 +27,6 @@ hop-transform-jdbc-metadata jar - Hop Plugins Transforms JDBC Metadata diff --git a/plugins/transforms/jdbc-metadata/src/assembly/assembly.xml b/plugins/transforms/jdbc-metadata/src/assembly/assembly.xml index f1b1648fc23..76ceb7c573b 100644 --- a/plugins/transforms/jdbc-metadata/src/assembly/assembly.xml +++ b/plugins/transforms/jdbc-metadata/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/jdbc-metadata + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/jdbc-metadata true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-jdbc-metadata:jar + plugins/transforms/jdbc-metadata \ No newline at end of file diff --git a/plugins/transforms/joinrows/pom.xml b/plugins/transforms/joinrows/pom.xml index 1cfb37df95a..4df9c51f619 100644 --- a/plugins/transforms/joinrows/pom.xml +++ b/plugins/transforms/joinrows/pom.xml @@ -27,7 +27,6 @@ hop-transform-joinrows jar - Hop Plugins Transforms Join Rows diff --git a/plugins/transforms/joinrows/src/assembly/assembly.xml b/plugins/transforms/joinrows/src/assembly/assembly.xml index 4fdc96fb2f1..d626be80cf9 100644 --- a/plugins/transforms/joinrows/src/assembly/assembly.xml +++ b/plugins/transforms/joinrows/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/joinrows + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/joinrows true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-joinrows:jar + plugins/transforms/joinrows \ No newline at end of file diff --git a/plugins/transforms/json/pom.xml b/plugins/transforms/json/pom.xml index ecb96f36d96..22eb783ca5e 100644 --- a/plugins/transforms/json/pom.xml +++ b/plugins/transforms/json/pom.xml @@ -30,38 +30,23 @@ Hop Plugins Transforms JSON - 1.15 - 2.6.0 1.2 - 0.1.54 2.9.0 + + + + org.apache.hop + hop-libs + ${project.version} + pom + import + + + + - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - compile - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - compile - - - com.googlecode.json-simple - json-simple - 1.1.1 - compile - - - * - * - - - com.jayway.jsonpath json-path @@ -71,40 +56,18 @@ net.minidev json-smart - ${json-smart.version} compile - - - - com.google.guava - guava - ${guava.version} - test - - - com.jcraft - jsch - ${jsch.version} - test - - - com.tinkerpop.blueprints - blueprints-core - ${dependency.com.tinkerpop.blueprints.version} - test - - org.apache.hop hop-transform-rowgenerator - 2.10.0-SNAPSHOT + ${project.version} test org.apache.hop hop-transform-sort - 2.10.0-SNAPSHOT + ${project.version} test @@ -113,7 +76,6 @@ ${encoder.version} test - diff --git a/plugins/transforms/json/src/assembly/assembly.xml b/plugins/transforms/json/src/assembly/assembly.xml index 34f61e5f7be..dffea24a0a6 100644 --- a/plugins/transforms/json/src/assembly/assembly.xml +++ b/plugins/transforms/json/src/assembly/assembly.xml @@ -23,37 +23,42 @@ zip - transforms/json + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/json true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-json:jar + plugins/transforms/json - - lib com.jayway.jsonpath:json-path:jar + + plugins/transforms/json/lib + + + net.minidev:json-smart:jar net.minidev:accessors-smart:jar + org.ow2.asm:asm:jar + lib/core \ No newline at end of file diff --git a/plugins/transforms/kafka/pom.xml b/plugins/transforms/kafka/pom.xml index 61a7b4d24f7..86682d54b49 100644 --- a/plugins/transforms/kafka/pom.xml +++ b/plugins/transforms/kafka/pom.xml @@ -29,53 +29,101 @@ Hop Plugins Transforms Kafka - 1.3 + 7.6.1 + 7.6.1 + + + + org.apache.hop + hop-libs + ${project.version} + pom + import + + + + io.confluent kafka-avro-serializer - 7.3.0 + ${kafka-avro-serializer.version} + + + com.fasterxml.jackson.dataformat + * + + + com.google.guava + * + + + org.apache.avro + * + + + org.apache.commons + * + + + org.slf4j + * + + io.confluent kafka-schema-registry-client - 7.3.0 - - - org.apache.hop - hop-transform-pipelineexecutor - ${project.version} - - - org.apache.kafka - kafka-clients - ${kafka-clients.version} + ${kafka-schema-registry-client.version} + + + com.fasterxml.jackson.core + * + + + com.google.guava + * + + + org.apache.avro + * + + + org.apache.commons + * + + + org.apache.kafka + * + + + org.slf4j + * + + - org.apache.hop - hop-core - ${project.version} + com.google.guava + guava provided - org.apache.hop - hop-engine - ${project.version} + org.apache.avro + avro provided org.apache.hop - hop-ui + hop-transform-pipelineexecutor ${project.version} provided - org.hamcrest - hamcrest-library - ${dependency.hamcrest.revision} - test + org.apache.kafka + kafka-clients + provided diff --git a/plugins/transforms/kafka/src/assembly/assembly.xml b/plugins/transforms/kafka/src/assembly/assembly.xml index 9df53dcf7d9..0c6a9cd0f58 100644 --- a/plugins/transforms/kafka/src/assembly/assembly.xml +++ b/plugins/transforms/kafka/src/assembly/assembly.xml @@ -23,45 +23,52 @@ zip - transforms/kafka + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/kafka true ${project.basedir}/src/main/resources/dependencies.xml - . + plugins/transforms/kafka true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-kafka:jar + plugins/transforms/kafka - - lib + runtime + + org.apache.hop:hop-transform-kafka:jar + + plugins/transforms/kafka/lib + + + provided org.apache.kafka:kafka-clients:jar - io.confluent:kafka-schema-registry-client:jar - io.confluent:kafka-avro-serializer:jar - io.confluent:common-config:jar - io.confluent:common-utils:jar - com.101tec:zkclient:jar + org.apache.avro:avro:jar + com.google.guava:guava:jar + com.github.luben:*:jar + org.lz4:*:jar + org.xerial.snappy:*:jar + lib/core \ No newline at end of file diff --git a/plugins/transforms/ldap/pom.xml b/plugins/transforms/ldap/pom.xml index e8f577508ca..45a9baac421 100644 --- a/plugins/transforms/ldap/pom.xml +++ b/plugins/transforms/ldap/pom.xml @@ -27,7 +27,6 @@ hop-transform-ldap jar - Hop Plugins Transforms LDAP diff --git a/plugins/transforms/ldap/src/assembly/assembly.xml b/plugins/transforms/ldap/src/assembly/assembly.xml index 5364fd1e2bd..ab41ecd2360 100644 --- a/plugins/transforms/ldap/src/assembly/assembly.xml +++ b/plugins/transforms/ldap/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/ldap + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/ldap true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-ldap:jar + plugins/transforms/ldap \ No newline at end of file diff --git a/plugins/transforms/loadfileinput/pom.xml b/plugins/transforms/loadfileinput/pom.xml index 4f63af2072a..3570680d8d4 100644 --- a/plugins/transforms/loadfileinput/pom.xml +++ b/plugins/transforms/loadfileinput/pom.xml @@ -27,7 +27,6 @@ hop-transform-loadfileinput jar - Hop Plugins Transforms Load File Input diff --git a/plugins/transforms/loadfileinput/src/assembly/assembly.xml b/plugins/transforms/loadfileinput/src/assembly/assembly.xml index ac1742a92fc..33b88c3e921 100644 --- a/plugins/transforms/loadfileinput/src/assembly/assembly.xml +++ b/plugins/transforms/loadfileinput/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/loadfileinput + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/loadfileinput true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-loadfileinput:jar + plugins/transforms/loadfileinput \ No newline at end of file diff --git a/plugins/transforms/mail/pom.xml b/plugins/transforms/mail/pom.xml index fb435f99ef0..aecdef13611 100644 --- a/plugins/transforms/mail/pom.xml +++ b/plugins/transforms/mail/pom.xml @@ -27,19 +27,30 @@ hop-transform-mail jar - Hop Plugins Transforms Mail + + + + org.apache.hop + hop-libs + ${project.version} + pom + import + + + + com.sun.activation jakarta.activation - ${jakarta-mail.version} + provided com.sun.mail jakarta.mail - ${jakarta-mail.version} + provided diff --git a/plugins/transforms/mail/src/assembly/assembly.xml b/plugins/transforms/mail/src/assembly/assembly.xml index b43cf369007..baceb557394 100644 --- a/plugins/transforms/mail/src/assembly/assembly.xml +++ b/plugins/transforms/mail/src/assembly/assembly.xml @@ -23,28 +23,37 @@ zip - transforms/mail + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/mail true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-mail:jar + plugins/transforms/mail + + + provided + + com.sun.activation:jakarta.activation:jar + com.sun.mail:jakarta.mail:jar + + lib/core + \ No newline at end of file diff --git a/plugins/transforms/mailinput/pom.xml b/plugins/transforms/mailinput/pom.xml index 12bb1704047..71282582a8f 100644 --- a/plugins/transforms/mailinput/pom.xml +++ b/plugins/transforms/mailinput/pom.xml @@ -27,25 +27,36 @@ hop-transform-mailinput jar - Hop Plugins Transforms Mail Input + + + + org.apache.hop + hop-libs + ${project.version} + pom + import + + + + com.sun.activation jakarta.activation - ${jakarta-mail.version} + provided com.sun.mail jakarta.mail - ${jakarta-mail.version} + provided org.apache.hop hop-action-getpop - 2.10.0-SNAPSHOT - compile + ${project.version} + provided diff --git a/plugins/transforms/mailinput/src/assembly/assembly.xml b/plugins/transforms/mailinput/src/assembly/assembly.xml index 793a4499210..e99965f4445 100644 --- a/plugins/transforms/mailinput/src/assembly/assembly.xml +++ b/plugins/transforms/mailinput/src/assembly/assembly.xml @@ -23,33 +23,40 @@ zip - transforms/mailinput + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/mailinput true ${project.basedir}/src/main/resources/dependencies.xml - . + plugins/transforms/mailinput true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-mailinput:jar + plugins/transforms/mailinput + + + + com.sun.activation:jakarta.activation:jar + com.sun.mail:jakarta.mail:jar + + lib/core \ No newline at end of file diff --git a/plugins/transforms/mapping/pom.xml b/plugins/transforms/mapping/pom.xml index 90b8eb2077a..3c0eca27333 100644 --- a/plugins/transforms/mapping/pom.xml +++ b/plugins/transforms/mapping/pom.xml @@ -27,7 +27,6 @@ hop-transform-mapping jar - Hop Plugins Transforms Mapping diff --git a/plugins/transforms/mapping/src/assembly/assembly.xml b/plugins/transforms/mapping/src/assembly/assembly.xml index 1e0c9b318c4..50895b3387d 100644 --- a/plugins/transforms/mapping/src/assembly/assembly.xml +++ b/plugins/transforms/mapping/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/mapping + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/mapping true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-mapping:jar + plugins/transforms/mapping \ No newline at end of file diff --git a/plugins/transforms/memgroupby/pom.xml b/plugins/transforms/memgroupby/pom.xml index 168f44b2a38..990eb862930 100644 --- a/plugins/transforms/memgroupby/pom.xml +++ b/plugins/transforms/memgroupby/pom.xml @@ -27,14 +27,31 @@ hop-transform-memgroupby jar - Hop Plugins Transforms Memory Group By + + + + org.apache.hop + hop-libs + ${project.version} + pom + import + + + + + + org.apache.commons + commons-math3 + provided + org.apache.hop hop-engine-beam - 2.10.0-SNAPSHOT + ${project.version} + provided diff --git a/plugins/transforms/memgroupby/src/assembly/assembly.xml b/plugins/transforms/memgroupby/src/assembly/assembly.xml index be078d9deb5..c1b851d063f 100644 --- a/plugins/transforms/memgroupby/src/assembly/assembly.xml +++ b/plugins/transforms/memgroupby/src/assembly/assembly.xml @@ -23,28 +23,34 @@ zip - transforms/memgroupby + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/memgroupby true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-memgroupby:jar + plugins/transforms/memgroupby + + + + org.apache.commons:commons-math3:jar + + lib/core \ No newline at end of file diff --git a/plugins/transforms/mergejoin/pom.xml b/plugins/transforms/mergejoin/pom.xml index 1219bb3b9ad..8e0ad5903c6 100644 --- a/plugins/transforms/mergejoin/pom.xml +++ b/plugins/transforms/mergejoin/pom.xml @@ -27,7 +27,6 @@ hop-transform-mergejoin jar - Hop Plugins Transforms Merge Join diff --git a/plugins/transforms/mergejoin/src/assembly/assembly.xml b/plugins/transforms/mergejoin/src/assembly/assembly.xml index 9f2cbb97544..dd14ed881cf 100644 --- a/plugins/transforms/mergejoin/src/assembly/assembly.xml +++ b/plugins/transforms/mergejoin/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/mergejoin + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/mergejoin true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-mergejoin:jar + plugins/transforms/mergejoin \ No newline at end of file diff --git a/plugins/transforms/mergerows/pom.xml b/plugins/transforms/mergerows/pom.xml index e5f9d50f195..49797401fed 100644 --- a/plugins/transforms/mergerows/pom.xml +++ b/plugins/transforms/mergerows/pom.xml @@ -27,7 +27,6 @@ hop-transform-mergerows jar - Hop Plugins Transforms Merge Rows (Diff) diff --git a/plugins/transforms/mergerows/src/assembly/assembly.xml b/plugins/transforms/mergerows/src/assembly/assembly.xml index fa1c050659a..473970efc2b 100644 --- a/plugins/transforms/mergerows/src/assembly/assembly.xml +++ b/plugins/transforms/mergerows/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/mergerows + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/mergerows true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-mergerows:jar + plugins/transforms/mergerows \ No newline at end of file diff --git a/plugins/transforms/metadata/pom.xml b/plugins/transforms/metadata/pom.xml index 0983239a7bd..cf7e7a60506 100644 --- a/plugins/transforms/metadata/pom.xml +++ b/plugins/transforms/metadata/pom.xml @@ -26,7 +26,6 @@ hop-transform-metadata jar - Hop Plugins Transforms Metadata Transforms diff --git a/plugins/transforms/metadata/src/assembly/assembly.xml b/plugins/transforms/metadata/src/assembly/assembly.xml index d49783df331..c5e5a9e9876 100644 --- a/plugins/transforms/metadata/src/assembly/assembly.xml +++ b/plugins/transforms/metadata/src/assembly/assembly.xml @@ -22,28 +22,28 @@ zip - transforms/metadata + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/metadata true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-metadata:jar + plugins/transforms/metadata \ No newline at end of file diff --git a/plugins/transforms/metainject/pom.xml b/plugins/transforms/metainject/pom.xml index 32c74e1b3d1..3ecbbe905be 100644 --- a/plugins/transforms/metainject/pom.xml +++ b/plugins/transforms/metainject/pom.xml @@ -27,14 +27,13 @@ hop-transform-metainject jar - Hop Plugins Transforms ETL Metadata Injection org.apache.hop hop-transform-rowsfromresult - 2.10.0-SNAPSHOT + ${project.version} test diff --git a/plugins/transforms/metainject/src/assembly/assembly.xml b/plugins/transforms/metainject/src/assembly/assembly.xml index ca0cd7c838e..259582c662a 100644 --- a/plugins/transforms/metainject/src/assembly/assembly.xml +++ b/plugins/transforms/metainject/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/metainject + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/metainject true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-metainject:jar + plugins/transforms/metainject \ No newline at end of file diff --git a/plugins/transforms/metastructure/pom.xml b/plugins/transforms/metastructure/pom.xml index b9d1d6976dd..c4b6aa2668e 100644 --- a/plugins/transforms/metastructure/pom.xml +++ b/plugins/transforms/metastructure/pom.xml @@ -27,7 +27,6 @@ hop-transform-metastructure jar - Hop Plugins Transforms Metadata Structure of Stream diff --git a/plugins/transforms/metastructure/src/assembly/assembly.xml b/plugins/transforms/metastructure/src/assembly/assembly.xml index 9cc2bc346ae..828efd4484c 100644 --- a/plugins/transforms/metastructure/src/assembly/assembly.xml +++ b/plugins/transforms/metastructure/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/metastructure + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/metastructure true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-metastructure:jar + plugins/transforms/metastructure \ No newline at end of file diff --git a/plugins/transforms/monetdbbulkloader/pom.xml b/plugins/transforms/monetdbbulkloader/pom.xml index 281dc5d1866..f8a1f674375 100644 --- a/plugins/transforms/monetdbbulkloader/pom.xml +++ b/plugins/transforms/monetdbbulkloader/pom.xml @@ -29,41 +29,30 @@ jar Hop Plugins Transforms MonetDB Bulk Loader - - 3.3 - + + + + org.apache.hop + hop-libs-jdbc + ${project.version} + pom + import + + + monetdb monetdb-jdbc - ${monetdb-jdbc.version} compile - - org.apache.hop - hop-core - ${project.version} - provided - org.apache.hop hop-databases-monetdb ${project.version} provided - - org.apache.hop - hop-engine - ${project.version} - provided - - - org.apache.hop - hop-ui - ${project.version} - provided - diff --git a/plugins/transforms/monetdbbulkloader/src/assembly/assembly.xml b/plugins/transforms/monetdbbulkloader/src/assembly/assembly.xml index 71cc5513bd2..b598a07e6d0 100644 --- a/plugins/transforms/monetdbbulkloader/src/assembly/assembly.xml +++ b/plugins/transforms/monetdbbulkloader/src/assembly/assembly.xml @@ -16,46 +16,46 @@ ~ --> - + hop-transform-monetdbbulkloader zip - transforms/monetdbbulkloader + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/monetdbbulkloader true ${project.basedir}/src/main/resources/dependencies.xml - . + plugins/transforms/monetdbbulkloader true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-monetdbbulkloader:jar + plugins/transforms/monetdbbulkloader monetdb:monetdb-jdbc:jar - - lib + lib/jdbc diff --git a/plugins/transforms/mongodb/pom.xml b/plugins/transforms/mongodb/pom.xml index 010e32b70f6..4b5546a65e4 100644 --- a/plugins/transforms/mongodb/pom.xml +++ b/plugins/transforms/mongodb/pom.xml @@ -32,7 +32,7 @@ 3.4 2.2 - 3.12.11 + 3.12.14 @@ -40,25 +40,7 @@ org.mongodb mongo-java-driver - ${mongo-legacy-driver.version} - - - org.apache.hop - hop-core - ${project.version} - provided - - - org.apache.hop - hop-engine - ${project.version} - provided - - - org.apache.hop - hop-ui - ${project.version} - provided + ${mongo-driver.version} org.easymock @@ -66,7 +48,6 @@ ${easymock.version} test - org.hamcrest hamcrest diff --git a/plugins/transforms/mongodb/src/assembly/assembly.xml b/plugins/transforms/mongodb/src/assembly/assembly.xml index 6b3f36bd0d2..0ada6d03212 100644 --- a/plugins/transforms/mongodb/src/assembly/assembly.xml +++ b/plugins/transforms/mongodb/src/assembly/assembly.xml @@ -23,35 +23,34 @@ zip - transforms/mongodb + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/mongodb true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-mongodb:jar + plugins/transforms/mongodb - - lib org.mongodb:mongo-java-driver:jar + plugins/transforms/mongodb/lib diff --git a/plugins/transforms/multimerge/pom.xml b/plugins/transforms/multimerge/pom.xml index c43079b9201..77fb2667bb3 100644 --- a/plugins/transforms/multimerge/pom.xml +++ b/plugins/transforms/multimerge/pom.xml @@ -27,7 +27,6 @@ hop-transform-multimerge jar - Hop Plugins Transforms Multi Merge diff --git a/plugins/transforms/multimerge/src/assembly/assembly.xml b/plugins/transforms/multimerge/src/assembly/assembly.xml index 4cc64c790a4..c2bc62e0b31 100644 --- a/plugins/transforms/multimerge/src/assembly/assembly.xml +++ b/plugins/transforms/multimerge/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/multimerge + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/multimerge true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-multimerge:jar + plugins/transforms/multimerge \ No newline at end of file diff --git a/plugins/transforms/normaliser/pom.xml b/plugins/transforms/normaliser/pom.xml index 80696da889a..a65d442b952 100644 --- a/plugins/transforms/normaliser/pom.xml +++ b/plugins/transforms/normaliser/pom.xml @@ -27,7 +27,6 @@ hop-transform-normaliser jar - Hop Plugins Transforms Row Normaliser diff --git a/plugins/transforms/normaliser/src/assembly/assembly.xml b/plugins/transforms/normaliser/src/assembly/assembly.xml index ee4a2610a7c..e40bc7e461e 100644 --- a/plugins/transforms/normaliser/src/assembly/assembly.xml +++ b/plugins/transforms/normaliser/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/normaliser + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/normaliser true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-normaliser:jar + plugins/transforms/normaliser \ No newline at end of file diff --git a/plugins/transforms/nullif/pom.xml b/plugins/transforms/nullif/pom.xml index a4075ef0b94..f9064695413 100644 --- a/plugins/transforms/nullif/pom.xml +++ b/plugins/transforms/nullif/pom.xml @@ -27,7 +27,6 @@ hop-transform-nullif jar - Hop Plugins Transforms Null If diff --git a/plugins/transforms/nullif/src/assembly/assembly.xml b/plugins/transforms/nullif/src/assembly/assembly.xml index 23f55bde616..79999940da1 100644 --- a/plugins/transforms/nullif/src/assembly/assembly.xml +++ b/plugins/transforms/nullif/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/nullif + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/nullif true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-nullif:jar + plugins/transforms/nullif \ No newline at end of file diff --git a/plugins/transforms/numberrange/pom.xml b/plugins/transforms/numberrange/pom.xml index 3f691d73604..fd80d226127 100644 --- a/plugins/transforms/numberrange/pom.xml +++ b/plugins/transforms/numberrange/pom.xml @@ -27,7 +27,6 @@ hop-transform-numberrange jar - Hop Plugins Transforms Number Range diff --git a/plugins/transforms/numberrange/src/assembly/assembly.xml b/plugins/transforms/numberrange/src/assembly/assembly.xml index 78e13ab51ed..f5e5c943708 100644 --- a/plugins/transforms/numberrange/src/assembly/assembly.xml +++ b/plugins/transforms/numberrange/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/numberrange + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/numberrange true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-numberrange:jar + plugins/transforms/numberrange \ No newline at end of file diff --git a/plugins/transforms/orabulkloader/pom.xml b/plugins/transforms/orabulkloader/pom.xml index f5b27d229f6..63a74cbacd8 100644 --- a/plugins/transforms/orabulkloader/pom.xml +++ b/plugins/transforms/orabulkloader/pom.xml @@ -27,7 +27,6 @@ hop-transform-orabulkloader jar - Hop Plugins Transforms Oracle bulk loader diff --git a/plugins/transforms/orabulkloader/src/assembly/assembly.xml b/plugins/transforms/orabulkloader/src/assembly/assembly.xml index 1889ade8494..d96011e12ce 100644 --- a/plugins/transforms/orabulkloader/src/assembly/assembly.xml +++ b/plugins/transforms/orabulkloader/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - databases/oracle + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/oracle true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-orabulkloader:jar + plugins/databases/oracle \ No newline at end of file diff --git a/plugins/transforms/pgbulkloader/pom.xml b/plugins/transforms/pgbulkloader/pom.xml index 6d930b3d542..736b979ba6d 100644 --- a/plugins/transforms/pgbulkloader/pom.xml +++ b/plugins/transforms/pgbulkloader/pom.xml @@ -27,18 +27,24 @@ hop-transform-pgbulkloader jar - Hop Plugins Transforms PostgreSQL bulk loader - - 42.7.2 - + + + + org.apache.hop + hop-libs-jdbc + ${project.version} + pom + import + + + org.postgresql postgresql - ${postgresql.version} compile diff --git a/plugins/transforms/pgbulkloader/src/assembly/assembly.xml b/plugins/transforms/pgbulkloader/src/assembly/assembly.xml index 0d11d337f4f..03743243231 100644 --- a/plugins/transforms/pgbulkloader/src/assembly/assembly.xml +++ b/plugins/transforms/pgbulkloader/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - databases/postgresql + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/postgresql true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-pgbulkloader:jar + plugins/databases/postgresql \ No newline at end of file diff --git a/plugins/transforms/pgp/pom.xml b/plugins/transforms/pgp/pom.xml index 78d0c92128d..8cc78470552 100644 --- a/plugins/transforms/pgp/pom.xml +++ b/plugins/transforms/pgp/pom.xml @@ -27,11 +27,8 @@ hop-transform-pgp jar - Hop Plugins Transforms PGP - - org.apache.hop @@ -40,5 +37,4 @@ compile - diff --git a/plugins/transforms/pgp/src/assembly/assembly.xml b/plugins/transforms/pgp/src/assembly/assembly.xml index 1dffc2391c5..cc0abda35e3 100644 --- a/plugins/transforms/pgp/src/assembly/assembly.xml +++ b/plugins/transforms/pgp/src/assembly/assembly.xml @@ -23,33 +23,33 @@ zip - transforms/pgp + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/pgp true ${project.basedir}/src/main/resources/dependencies.xml - . + plugins/transforms/pgp true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-pgp:jar + plugins/transforms/pgp \ No newline at end of file diff --git a/plugins/transforms/pipelineexecutor/pom.xml b/plugins/transforms/pipelineexecutor/pom.xml index c746324022d..ff9d04f1cf6 100644 --- a/plugins/transforms/pipelineexecutor/pom.xml +++ b/plugins/transforms/pipelineexecutor/pom.xml @@ -27,7 +27,6 @@ hop-transform-pipelineexecutor jar - Hop Plugins Transforms Pipeline Executor diff --git a/plugins/transforms/pipelineexecutor/src/assembly/assembly.xml b/plugins/transforms/pipelineexecutor/src/assembly/assembly.xml index 98b964d2a9e..ef0afde8d38 100644 --- a/plugins/transforms/pipelineexecutor/src/assembly/assembly.xml +++ b/plugins/transforms/pipelineexecutor/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/pipelineexecutor + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/pipelineexecutor true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-pipelineexecutor:jar + plugins/transforms/pipelineexecutor \ No newline at end of file diff --git a/plugins/transforms/pom.xml b/plugins/transforms/pom.xml index de760482f37..a0b0c1433a2 100644 --- a/plugins/transforms/pom.xml +++ b/plugins/transforms/pom.xml @@ -25,9 +25,7 @@ hop-plugins-transforms - 2.10.0-SNAPSHOT pom - Hop Plugins Transforms @@ -178,68 +176,4 @@ zipfile - - - 4.3.2.RELEASE - - - - - - org.apache.hop - hop-core - ${project.version} - provided - - - org.apache.hop - hop-engine - ${project.version} - test-jar - test - - - - - - - - org.apache.hop - hop-core - compile - - - org.apache.hop - hop-ui - 2.10.0-SNAPSHOT - compile - - - javax.servlet - javax.servlet-api - ${javax.servlet-api.version} - test - - - org.apache.hop - hop-core - ${project.version} - test-jar - test - - - org.apache.hop - hop-engine - ${project.version} - test-jar - test - - - org.springframework - spring-test - ${spring.framework.version} - test - - - diff --git a/plugins/transforms/processfiles/pom.xml b/plugins/transforms/processfiles/pom.xml index e4dc43315c0..1b8f8c05327 100644 --- a/plugins/transforms/processfiles/pom.xml +++ b/plugins/transforms/processfiles/pom.xml @@ -27,11 +27,6 @@ hop-transform-processfiles jar - Hop Plugins Transforms Process Files - - - - diff --git a/plugins/transforms/processfiles/src/assembly/assembly.xml b/plugins/transforms/processfiles/src/assembly/assembly.xml index a1b5fd429ef..568da330014 100644 --- a/plugins/transforms/processfiles/src/assembly/assembly.xml +++ b/plugins/transforms/processfiles/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/processfiles + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/processfiles true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-processfiles:jar + plugins/transforms/processfiles \ No newline at end of file diff --git a/plugins/transforms/propertyinput/pom.xml b/plugins/transforms/propertyinput/pom.xml index aa3cdb51818..4c94772e258 100644 --- a/plugins/transforms/propertyinput/pom.xml +++ b/plugins/transforms/propertyinput/pom.xml @@ -27,14 +27,17 @@ hop-transform-propertyinput jar - Hop Plugins Transforms Property Input + + 0.5.4 + + org.ini4j ini4j - 0.5.4 + ${ini4j.version} diff --git a/plugins/transforms/propertyinput/src/assembly/assembly.xml b/plugins/transforms/propertyinput/src/assembly/assembly.xml index 471f166e86d..2c218cef8b4 100644 --- a/plugins/transforms/propertyinput/src/assembly/assembly.xml +++ b/plugins/transforms/propertyinput/src/assembly/assembly.xml @@ -23,35 +23,34 @@ zip - transforms/propertyinput + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/propertyinput true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-propertyinput:jar + plugins/transforms/propertyinput - - lib org.ini4j:ini4j:jar + plugins/transforms/propertyinput/lib \ No newline at end of file diff --git a/plugins/transforms/propertyoutput/pom.xml b/plugins/transforms/propertyoutput/pom.xml index 0549c6c2e19..a1f9f7de28a 100644 --- a/plugins/transforms/propertyoutput/pom.xml +++ b/plugins/transforms/propertyoutput/pom.xml @@ -27,7 +27,6 @@ hop-transform-propertyoutput jar - Hop Plugins Transforms Property Output diff --git a/plugins/transforms/propertyoutput/src/assembly/assembly.xml b/plugins/transforms/propertyoutput/src/assembly/assembly.xml index 43315f23c91..dabb22d0d44 100644 --- a/plugins/transforms/propertyoutput/src/assembly/assembly.xml +++ b/plugins/transforms/propertyoutput/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/propertyoutput + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/propertyoutput true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-propertyoutput:jar + plugins/transforms/propertyoutput \ No newline at end of file diff --git a/plugins/transforms/randomvalue/pom.xml b/plugins/transforms/randomvalue/pom.xml index 7a0ecb305a5..10aa721f349 100644 --- a/plugins/transforms/randomvalue/pom.xml +++ b/plugins/transforms/randomvalue/pom.xml @@ -27,7 +27,6 @@ hop-transform-randomvalue jar - Hop Plugins Transforms Random Value diff --git a/plugins/transforms/randomvalue/src/assembly/assembly.xml b/plugins/transforms/randomvalue/src/assembly/assembly.xml index fe9343ce3b5..20cc9127f2f 100644 --- a/plugins/transforms/randomvalue/src/assembly/assembly.xml +++ b/plugins/transforms/randomvalue/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/randomvalue + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/randomvalue true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-randomvalue:jar + plugins/transforms/randomvalue \ No newline at end of file diff --git a/plugins/transforms/regexeval/pom.xml b/plugins/transforms/regexeval/pom.xml index 181f26482bd..6d6831fbf03 100644 --- a/plugins/transforms/regexeval/pom.xml +++ b/plugins/transforms/regexeval/pom.xml @@ -27,7 +27,6 @@ hop-transform-regexeval jar - Hop Plugins Transforms Regular Expression Evaluation diff --git a/plugins/transforms/regexeval/src/assembly/assembly.xml b/plugins/transforms/regexeval/src/assembly/assembly.xml index 595e5ce2331..0fa493a3f4d 100644 --- a/plugins/transforms/regexeval/src/assembly/assembly.xml +++ b/plugins/transforms/regexeval/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/regexeval + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/regexeval true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-regexeval:jar + plugins/transforms/regexeval \ No newline at end of file diff --git a/plugins/transforms/replacestring/pom.xml b/plugins/transforms/replacestring/pom.xml index af417aff549..a9735530c57 100644 --- a/plugins/transforms/replacestring/pom.xml +++ b/plugins/transforms/replacestring/pom.xml @@ -27,7 +27,6 @@ hop-transform-replacestring jar - Hop Plugins Transforms Replace In String diff --git a/plugins/transforms/replacestring/src/assembly/assembly.xml b/plugins/transforms/replacestring/src/assembly/assembly.xml index 76c739e0caa..686851346df 100644 --- a/plugins/transforms/replacestring/src/assembly/assembly.xml +++ b/plugins/transforms/replacestring/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/replacestring + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/replacestring true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-replacestring:jar + plugins/transforms/replacestring \ No newline at end of file diff --git a/plugins/transforms/reservoirsampling/pom.xml b/plugins/transforms/reservoirsampling/pom.xml index 8308f746491..a92f96e85b8 100644 --- a/plugins/transforms/reservoirsampling/pom.xml +++ b/plugins/transforms/reservoirsampling/pom.xml @@ -27,7 +27,6 @@ hop-transform-reservoirsampling jar - Hop Plugins Transforms Reservoir Sampling diff --git a/plugins/transforms/reservoirsampling/src/assembly/assembly.xml b/plugins/transforms/reservoirsampling/src/assembly/assembly.xml index d634a7980a0..155aa10d048 100644 --- a/plugins/transforms/reservoirsampling/src/assembly/assembly.xml +++ b/plugins/transforms/reservoirsampling/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/reservoirsampling + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/reservoirsampling true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-reservoirsampling:jar + plugins/transforms/reservoirsampling \ No newline at end of file diff --git a/plugins/transforms/rest/pom.xml b/plugins/transforms/rest/pom.xml index da24c53c60a..95ce7837b82 100644 --- a/plugins/transforms/rest/pom.xml +++ b/plugins/transforms/rest/pom.xml @@ -27,35 +27,13 @@ hop-transform-rest jar - Hop Plugins Transforms REST - - 2.1.6 - - - - com.googlecode.json-simple - json-simple - 1.1 - - - * - * - - - - - jakarta.ws.rs - jakarta.ws.rs-api - ${jaxrs.version} - compile - org.glassfish.jersey.connectors jersey-apache-connector - 2.30 + 2.43 diff --git a/plugins/transforms/rest/src/assembly/assembly.xml b/plugins/transforms/rest/src/assembly/assembly.xml index 41732bf7598..f3a08524114 100644 --- a/plugins/transforms/rest/src/assembly/assembly.xml +++ b/plugins/transforms/rest/src/assembly/assembly.xml @@ -22,36 +22,34 @@ zip - transforms/rest + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/rest true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-rest:jar - + plugins/transforms/rest - - lib org.glassfish.jersey.connectors:jersey-apache-connector:jar + plugins/transforms/rest/lib \ No newline at end of file diff --git a/plugins/transforms/rowgenerator/pom.xml b/plugins/transforms/rowgenerator/pom.xml index 3836cbb2f5e..b6669092747 100644 --- a/plugins/transforms/rowgenerator/pom.xml +++ b/plugins/transforms/rowgenerator/pom.xml @@ -27,7 +27,6 @@ hop-transform-rowgenerator jar - Hop Plugins Transforms Row Generator diff --git a/plugins/transforms/rowgenerator/src/assembly/assembly.xml b/plugins/transforms/rowgenerator/src/assembly/assembly.xml index b09ce5aaee4..f407e00a19c 100644 --- a/plugins/transforms/rowgenerator/src/assembly/assembly.xml +++ b/plugins/transforms/rowgenerator/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/rowgenerator + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/rowgenerator true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-rowgenerator:jar + plugins/transforms/rowgenerator \ No newline at end of file diff --git a/plugins/transforms/rowsfromresult/pom.xml b/plugins/transforms/rowsfromresult/pom.xml index 38a4708ca07..4c475cda4a8 100644 --- a/plugins/transforms/rowsfromresult/pom.xml +++ b/plugins/transforms/rowsfromresult/pom.xml @@ -27,7 +27,6 @@ hop-transform-rowsfromresult jar - Hop Plugins Transforms Rows From Result diff --git a/plugins/transforms/rowsfromresult/src/assembly/assembly.xml b/plugins/transforms/rowsfromresult/src/assembly/assembly.xml index 47ce3e148f7..556e977adaf 100644 --- a/plugins/transforms/rowsfromresult/src/assembly/assembly.xml +++ b/plugins/transforms/rowsfromresult/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/rowsfromresult + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/rowsfromresult true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-rowsfromresult:jar + plugins/transforms/rowsfromresult \ No newline at end of file diff --git a/plugins/transforms/rowstoresult/pom.xml b/plugins/transforms/rowstoresult/pom.xml index 3e7d2338cb9..b0e285838d0 100644 --- a/plugins/transforms/rowstoresult/pom.xml +++ b/plugins/transforms/rowstoresult/pom.xml @@ -27,7 +27,6 @@ hop-transform-rowstoresult jar - Hop Plugins Transforms Rows To Result diff --git a/plugins/transforms/rowstoresult/src/assembly/assembly.xml b/plugins/transforms/rowstoresult/src/assembly/assembly.xml index 0633d54aea4..59ccbca6299 100644 --- a/plugins/transforms/rowstoresult/src/assembly/assembly.xml +++ b/plugins/transforms/rowstoresult/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/rowstoresult + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/rowstoresult true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-rowstoresult:jar + plugins/transforms/rowstoresult \ No newline at end of file diff --git a/plugins/transforms/salesforce/pom.xml b/plugins/transforms/salesforce/pom.xml index 7bfea6f4066..00e9a099711 100644 --- a/plugins/transforms/salesforce/pom.xml +++ b/plugins/transforms/salesforce/pom.xml @@ -24,8 +24,8 @@ hop-plugins-transforms 2.10.0-SNAPSHOT - hop-transform-salesforce + hop-transform-salesforce jar Hop Plugins Transforms Salesforce diff --git a/plugins/transforms/salesforce/src/assembly/assembly.xml b/plugins/transforms/salesforce/src/assembly/assembly.xml index 33a3314859f..571e18237d1 100644 --- a/plugins/transforms/salesforce/src/assembly/assembly.xml +++ b/plugins/transforms/salesforce/src/assembly/assembly.xml @@ -23,36 +23,35 @@ zip - transforms/salesforce + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/salesforce true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-salesforce:jar + plugins/transforms/salesforce - - lib com.force.api:force-wsc:jar com.force.api:force-partner-api:jar + plugins/transforms/salesforce/lib \ No newline at end of file diff --git a/plugins/transforms/samplerows/pom.xml b/plugins/transforms/samplerows/pom.xml index 8a10c8b7b87..bb5828a2ebc 100644 --- a/plugins/transforms/samplerows/pom.xml +++ b/plugins/transforms/samplerows/pom.xml @@ -27,7 +27,6 @@ hop-transform-samplerows jar - Hop Plugins Transforms Sample Rows diff --git a/plugins/transforms/samplerows/src/assembly/assembly.xml b/plugins/transforms/samplerows/src/assembly/assembly.xml index 7ee4dff33c7..616a0fc0cd3 100644 --- a/plugins/transforms/samplerows/src/assembly/assembly.xml +++ b/plugins/transforms/samplerows/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/samplerows + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/samplerows true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-samplerows:jar + plugins/transforms/samplerows \ No newline at end of file diff --git a/plugins/transforms/sasinput/pom.xml b/plugins/transforms/sasinput/pom.xml index 22ce7c1e556..6753af5084e 100644 --- a/plugins/transforms/sasinput/pom.xml +++ b/plugins/transforms/sasinput/pom.xml @@ -24,20 +24,27 @@ hop-plugins-transforms 2.10.0-SNAPSHOT - hop-transform-sasinput + hop-transform-sasinput jar Hop Plugins Transforms SAS Input - - 2.0.13 - + + + + org.apache.hop + hop-libs + ${project.version} + pom + import + + + com.epam parso - ${epam-parso-version} diff --git a/plugins/transforms/sasinput/src/assembly/assembly.xml b/plugins/transforms/sasinput/src/assembly/assembly.xml index dc95f3c5365..d20c2568518 100644 --- a/plugins/transforms/sasinput/src/assembly/assembly.xml +++ b/plugins/transforms/sasinput/src/assembly/assembly.xml @@ -23,35 +23,34 @@ zip - transforms/sasinput + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/sasinput true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-sasinput:jar + plugins/transforms/sasinput - - lib com.epam:parso:jar + lib/core \ No newline at end of file diff --git a/plugins/transforms/schemamapping/pom.xml b/plugins/transforms/schemamapping/pom.xml index b3228b7e2d6..e16b41e6dd1 100644 --- a/plugins/transforms/schemamapping/pom.xml +++ b/plugins/transforms/schemamapping/pom.xml @@ -27,7 +27,6 @@ hop-transform-schemamapping jar - Hop Plugins Transforms Schema Mapping @@ -35,6 +34,7 @@ org.apache.hop hop-misc-static-schema ${project.version} + provided diff --git a/plugins/transforms/schemamapping/src/assembly/assembly.xml b/plugins/transforms/schemamapping/src/assembly/assembly.xml index 0b88c0b638c..e947eda6f96 100644 --- a/plugins/transforms/schemamapping/src/assembly/assembly.xml +++ b/plugins/transforms/schemamapping/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/schemamapping + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/schemamapping true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-schemamapping:jar + plugins/transforms/schemamapping \ No newline at end of file diff --git a/plugins/transforms/script/pom.xml b/plugins/transforms/script/pom.xml index cb393760779..c6c6ba35af4 100644 --- a/plugins/transforms/script/pom.xml +++ b/plugins/transforms/script/pom.xml @@ -27,50 +27,62 @@ hop-transform-script jar - Hop Plugins Transforms Script + + 4.0.22 + 2.7.3 + + + + + + org.apache.hop + hop-libs + ${project.version} + pom + import + + + + org.apache.groovy groovy - 4.0.8 + ${groovy.version} org.apache.groovy groovy-jsr223 - 4.0.8 - - - org.apache.hop - hop-transform-rowgenerator - ${project.version} - compile + ${groovy.version} org.ow2.asm asm - 7.3.1 org.ow2.asm asm-commons - 7.3.1 org.ow2.asm asm-tree - 7.3.1 org.ow2.asm asm-util - 7.3.1 org.python jython-standalone - 2.7.3 + ${jython.version} + + + org.apache.hop + hop-transform-rowgenerator + ${project.version} + provided diff --git a/plugins/transforms/script/src/assembly/assembly.xml b/plugins/transforms/script/src/assembly/assembly.xml index ad2a7c30c2a..dfd143a29db 100644 --- a/plugins/transforms/script/src/assembly/assembly.xml +++ b/plugins/transforms/script/src/assembly/assembly.xml @@ -23,41 +23,45 @@ zip - transforms/script + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/script true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-script:jar + plugins/transforms/script - - lib org.apache.groovy:groovy:jar org.apache.groovy:groovy-jsr223:jar org.python:jython-standalone:jar - org.ow2.asm:asm:jar org.ow2.asm:asm-commons:jar org.ow2.asm:asm-tree:jar org.ow2.asm:asm-util:jar + plugins/transforms/script/lib + + + + org.ow2.asm:asm:jar + + lib/core \ No newline at end of file diff --git a/plugins/transforms/selectvalues/pom.xml b/plugins/transforms/selectvalues/pom.xml index a6f35cc5c87..39865b19b9e 100644 --- a/plugins/transforms/selectvalues/pom.xml +++ b/plugins/transforms/selectvalues/pom.xml @@ -27,7 +27,6 @@ hop-transform-selectvalues jar - Hop Plugins Transforms Select Values diff --git a/plugins/transforms/selectvalues/src/assembly/assembly.xml b/plugins/transforms/selectvalues/src/assembly/assembly.xml index bbc1983a93e..50a2038a90d 100644 --- a/plugins/transforms/selectvalues/src/assembly/assembly.xml +++ b/plugins/transforms/selectvalues/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/selectvalues + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/selectvalues true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-selectvalues:jar + plugins/transforms/selectvalues \ No newline at end of file diff --git a/plugins/transforms/serverstatus/pom.xml b/plugins/transforms/serverstatus/pom.xml index 81d93c65de9..08f25a98f3a 100644 --- a/plugins/transforms/serverstatus/pom.xml +++ b/plugins/transforms/serverstatus/pom.xml @@ -26,7 +26,6 @@ hop-transform-serverstatus jar - Hop Plugins Transforms Server Status diff --git a/plugins/transforms/serverstatus/src/assembly/assembly.xml b/plugins/transforms/serverstatus/src/assembly/assembly.xml index 16030e8aaab..2c96edc5774 100644 --- a/plugins/transforms/serverstatus/src/assembly/assembly.xml +++ b/plugins/transforms/serverstatus/src/assembly/assembly.xml @@ -22,28 +22,28 @@ zip - transforms/serverstatus + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/serverstatus true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-serverstatus:jar + plugins/transforms/serverstatus \ No newline at end of file diff --git a/plugins/transforms/setvalueconstant/pom.xml b/plugins/transforms/setvalueconstant/pom.xml index 9d04f0f8264..f944fdc3494 100644 --- a/plugins/transforms/setvalueconstant/pom.xml +++ b/plugins/transforms/setvalueconstant/pom.xml @@ -27,7 +27,6 @@ hop-transform-setvalueconstant jar - Hop Plugins Transforms Set Value to a Constant diff --git a/plugins/transforms/setvalueconstant/src/assembly/assembly.xml b/plugins/transforms/setvalueconstant/src/assembly/assembly.xml index 08cc15960eb..efd39a8e187 100644 --- a/plugins/transforms/setvalueconstant/src/assembly/assembly.xml +++ b/plugins/transforms/setvalueconstant/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/setvalueconstant + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/setvalueconstant true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-setvalueconstant:jar + plugins/transforms/setvalueconstant \ No newline at end of file diff --git a/plugins/transforms/setvaluefield/pom.xml b/plugins/transforms/setvaluefield/pom.xml index 0834ddc16a5..43e102412ed 100644 --- a/plugins/transforms/setvaluefield/pom.xml +++ b/plugins/transforms/setvaluefield/pom.xml @@ -27,7 +27,6 @@ hop-transform-setvaluefield jar - Hop Plugins Transforms Set Value to a Field diff --git a/plugins/transforms/setvaluefield/src/assembly/assembly.xml b/plugins/transforms/setvaluefield/src/assembly/assembly.xml index 9e903f3505f..0b7552fddfc 100644 --- a/plugins/transforms/setvaluefield/src/assembly/assembly.xml +++ b/plugins/transforms/setvaluefield/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/setvaluefield + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/setvaluefield true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-setvaluefield:jar + plugins/transforms/setvaluefield \ No newline at end of file diff --git a/plugins/transforms/setvariable/pom.xml b/plugins/transforms/setvariable/pom.xml index b69907166bf..ef5709fc087 100644 --- a/plugins/transforms/setvariable/pom.xml +++ b/plugins/transforms/setvariable/pom.xml @@ -27,7 +27,6 @@ hop-transform-setvariable jar - Hop Plugins Transforms Set Variables diff --git a/plugins/transforms/setvariable/src/assembly/assembly.xml b/plugins/transforms/setvariable/src/assembly/assembly.xml index ae8f6fa7fd3..6a11ce94ced 100644 --- a/plugins/transforms/setvariable/src/assembly/assembly.xml +++ b/plugins/transforms/setvariable/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/setvariable + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/setvariable true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-setvariable:jar + plugins/transforms/setvariable \ No newline at end of file diff --git a/plugins/transforms/snowflake/pom.xml b/plugins/transforms/snowflake/pom.xml index 00638176338..1c62cafa82e 100644 --- a/plugins/transforms/snowflake/pom.xml +++ b/plugins/transforms/snowflake/pom.xml @@ -27,18 +27,24 @@ hop-transform-snowflake-bulkloader jar - Hop Plugins Transforms Snowflake Bulk Loader - - 3.14.3 - + + + + org.apache.hop + hop-libs-jdbc + ${project.version} + pom + import + + + net.snowflake snowflake-jdbc - ${snowflake.jdbc.version} diff --git a/plugins/transforms/snowflake/src/assembly/assembly.xml b/plugins/transforms/snowflake/src/assembly/assembly.xml index e6cbc8c5c2e..70e16c5a408 100644 --- a/plugins/transforms/snowflake/src/assembly/assembly.xml +++ b/plugins/transforms/snowflake/src/assembly/assembly.xml @@ -23,28 +23,34 @@ zip - transforms/snowflake + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/snowflake true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-snowflake-bulkloader:jar + plugins/transforms/snowflake + + + + net.snowflake:snowflake-jdbc:jar + + lib/jdbc \ No newline at end of file diff --git a/plugins/transforms/sort/pom.xml b/plugins/transforms/sort/pom.xml index a00b71f94a9..2d2d0430153 100644 --- a/plugins/transforms/sort/pom.xml +++ b/plugins/transforms/sort/pom.xml @@ -27,7 +27,6 @@ hop-transform-sort jar - Hop Plugins Transforms Sort Rows diff --git a/plugins/transforms/sort/src/assembly/assembly.xml b/plugins/transforms/sort/src/assembly/assembly.xml index a8485864bcb..e3d3af4484f 100644 --- a/plugins/transforms/sort/src/assembly/assembly.xml +++ b/plugins/transforms/sort/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/sort + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/sort true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-sort:jar + plugins/transforms/sort \ No newline at end of file diff --git a/plugins/transforms/sortedmerge/pom.xml b/plugins/transforms/sortedmerge/pom.xml index 552d334abfc..a1f417f0c43 100644 --- a/plugins/transforms/sortedmerge/pom.xml +++ b/plugins/transforms/sortedmerge/pom.xml @@ -27,7 +27,6 @@ hop-transform-sortedmerge jar - Hop Plugins Transforms Sorted Merge diff --git a/plugins/transforms/sortedmerge/src/assembly/assembly.xml b/plugins/transforms/sortedmerge/src/assembly/assembly.xml index a48b250b264..48f592cae48 100644 --- a/plugins/transforms/sortedmerge/src/assembly/assembly.xml +++ b/plugins/transforms/sortedmerge/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/sortedmerge + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/sortedmerge true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-sortedmerge:jar + plugins/transforms/sortedmerge \ No newline at end of file diff --git a/plugins/transforms/splitfieldtorows/pom.xml b/plugins/transforms/splitfieldtorows/pom.xml index d639de82da1..b6c01f9a5bd 100644 --- a/plugins/transforms/splitfieldtorows/pom.xml +++ b/plugins/transforms/splitfieldtorows/pom.xml @@ -27,7 +27,6 @@ hop-transform-splitfieldtorows jar - Hop Plugins Transforms Split Field To Rows diff --git a/plugins/transforms/splitfieldtorows/src/assembly/assembly.xml b/plugins/transforms/splitfieldtorows/src/assembly/assembly.xml index 5edc73d0617..a6e6222d458 100644 --- a/plugins/transforms/splitfieldtorows/src/assembly/assembly.xml +++ b/plugins/transforms/splitfieldtorows/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/splitfieldtorows + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/splitfieldtorows true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-splitfieldtorows:jar + plugins/transforms/splitfieldtorows \ No newline at end of file diff --git a/plugins/transforms/splunk/pom.xml b/plugins/transforms/splunk/pom.xml index 4cebd17749f..b8632fcfb12 100644 --- a/plugins/transforms/splunk/pom.xml +++ b/plugins/transforms/splunk/pom.xml @@ -27,7 +27,6 @@ hop-transform-splunk jar - Hop Plugins Transforms Splunk diff --git a/plugins/transforms/splunk/src/assembly/assembly.xml b/plugins/transforms/splunk/src/assembly/assembly.xml index 221477e3b91..13268c4458b 100644 --- a/plugins/transforms/splunk/src/assembly/assembly.xml +++ b/plugins/transforms/splunk/src/assembly/assembly.xml @@ -23,35 +23,34 @@ zip - transforms/splunk + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/splunk true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-splunk:jar + plugins/transforms/splunk - - lib com.splunk:splunk:jar + plugins/transforms/splunk/lib \ No newline at end of file diff --git a/plugins/transforms/sql/pom.xml b/plugins/transforms/sql/pom.xml index 55b6b659382..5a6c8905a5a 100644 --- a/plugins/transforms/sql/pom.xml +++ b/plugins/transforms/sql/pom.xml @@ -27,7 +27,6 @@ hop-transform-sql jar - Hop Plugins Transforms SQL diff --git a/plugins/transforms/sql/src/assembly/assembly.xml b/plugins/transforms/sql/src/assembly/assembly.xml index 70d2536df11..cdbcc066f4a 100644 --- a/plugins/transforms/sql/src/assembly/assembly.xml +++ b/plugins/transforms/sql/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/sql + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/sql true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-sql:jar + plugins/transforms/sql \ No newline at end of file diff --git a/plugins/transforms/sqlfileoutput/pom.xml b/plugins/transforms/sqlfileoutput/pom.xml index 3b0a56b4f5c..ddacc077649 100644 --- a/plugins/transforms/sqlfileoutput/pom.xml +++ b/plugins/transforms/sqlfileoutput/pom.xml @@ -27,7 +27,6 @@ hop-transform-sqlfileoutput jar - Hop Plugins Transforms SQL File Output diff --git a/plugins/transforms/sqlfileoutput/src/assembly/assembly.xml b/plugins/transforms/sqlfileoutput/src/assembly/assembly.xml index aa29c865658..8536fa94d01 100644 --- a/plugins/transforms/sqlfileoutput/src/assembly/assembly.xml +++ b/plugins/transforms/sqlfileoutput/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/sqlfileoutput + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/sqlfileoutput true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-sqlfileoutput:jar + plugins/transforms/sqlfileoutput \ No newline at end of file diff --git a/plugins/transforms/ssh/pom.xml b/plugins/transforms/ssh/pom.xml index 75d446c6040..fb3dab5c7db 100644 --- a/plugins/transforms/ssh/pom.xml +++ b/plugins/transforms/ssh/pom.xml @@ -27,9 +27,12 @@ hop-transform-ssh jar - Hop Plugins Transforms SSH + + 2.2.23 + + org.connectbot diff --git a/plugins/transforms/ssh/src/assembly/assembly.xml b/plugins/transforms/ssh/src/assembly/assembly.xml index af332bf687b..e134f098341 100644 --- a/plugins/transforms/ssh/src/assembly/assembly.xml +++ b/plugins/transforms/ssh/src/assembly/assembly.xml @@ -23,35 +23,34 @@ zip - transforms/ssh + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/ssh true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-ssh:jar + plugins/transforms/ssh - - lib org.connectbot:sshlib:jar + plugins/transforms/ssh/lib \ No newline at end of file diff --git a/plugins/transforms/standardizephonenumber/pom.xml b/plugins/transforms/standardizephonenumber/pom.xml index a5ad8b9addf..821adbd4fdc 100644 --- a/plugins/transforms/standardizephonenumber/pom.xml +++ b/plugins/transforms/standardizephonenumber/pom.xml @@ -27,15 +27,17 @@ hop-transform-standardizephonenumber jar - Hop Plugins Transforms Standardize Phone Number + + 8.13.40 + + com.googlecode.libphonenumber libphonenumber - 8.12.33 - compile + ${libphonenumber.version} diff --git a/plugins/transforms/standardizephonenumber/src/assembly/assembly.xml b/plugins/transforms/standardizephonenumber/src/assembly/assembly.xml index 9ff540759ae..53bc7d502db 100644 --- a/plugins/transforms/standardizephonenumber/src/assembly/assembly.xml +++ b/plugins/transforms/standardizephonenumber/src/assembly/assembly.xml @@ -17,33 +17,40 @@ --> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd"> hop-transform-standardizephonenumber zip - transforms/standardizephonenumber + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/standardizephonenumber true + + + + ${project.basedir}/src/main/samples + config/projects/samples/ + + + - org.apache.hop:hop-transform-standardizephonenumber:jar + plugins/transforms/standardizephonenumber - - - lib + com.googlecode.libphonenumber:libphonenumber:jar - + plugins/transforms/standardizephonenumber/lib + \ No newline at end of file diff --git a/plugins/transforms/streamlookup/pom.xml b/plugins/transforms/streamlookup/pom.xml index f1271fd773e..dbbf258441b 100644 --- a/plugins/transforms/streamlookup/pom.xml +++ b/plugins/transforms/streamlookup/pom.xml @@ -27,7 +27,6 @@ hop-transform-streamlookup jar - Hop Plugins Transforms Stream Lookup diff --git a/plugins/transforms/streamlookup/src/assembly/assembly.xml b/plugins/transforms/streamlookup/src/assembly/assembly.xml index 290f930960e..0beca3e6f54 100644 --- a/plugins/transforms/streamlookup/src/assembly/assembly.xml +++ b/plugins/transforms/streamlookup/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/streamlookup + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/streamlookup true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-streamlookup:jar + plugins/transforms/streamlookup \ No newline at end of file diff --git a/plugins/transforms/streamschemamerge/pom.xml b/plugins/transforms/streamschemamerge/pom.xml index 87a75690292..d4936413379 100644 --- a/plugins/transforms/streamschemamerge/pom.xml +++ b/plugins/transforms/streamschemamerge/pom.xml @@ -26,14 +26,13 @@ hop-transform-streamschemamerge jar - Hop Plugins Transforms Stream Schema Merge org.apache.hop hop-transform-sort - 2.10.0-SNAPSHOT + ${project.version} test diff --git a/plugins/transforms/streamschemamerge/src/assembly/assembly.xml b/plugins/transforms/streamschemamerge/src/assembly/assembly.xml index 2baca12282d..6fc9b701417 100644 --- a/plugins/transforms/streamschemamerge/src/assembly/assembly.xml +++ b/plugins/transforms/streamschemamerge/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/streamschemamerge + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/streamschemamerge true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-streamschemamerge:jar + plugins/transforms/streamschemamerge \ No newline at end of file diff --git a/plugins/transforms/stringcut/pom.xml b/plugins/transforms/stringcut/pom.xml index 24df0aff433..6f29ebd83cb 100644 --- a/plugins/transforms/stringcut/pom.xml +++ b/plugins/transforms/stringcut/pom.xml @@ -27,7 +27,6 @@ hop-transform-stringcut jar - Hop Plugins Transforms String Cut diff --git a/plugins/transforms/stringcut/src/assembly/assembly.xml b/plugins/transforms/stringcut/src/assembly/assembly.xml index 0deb6ec2931..98e930421af 100644 --- a/plugins/transforms/stringcut/src/assembly/assembly.xml +++ b/plugins/transforms/stringcut/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/stringcut + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/stringcut true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-stringcut:jar + plugins/transforms/stringcut \ No newline at end of file diff --git a/plugins/transforms/stringoperations/pom.xml b/plugins/transforms/stringoperations/pom.xml index c1543bf8bec..e050d7cf06a 100644 --- a/plugins/transforms/stringoperations/pom.xml +++ b/plugins/transforms/stringoperations/pom.xml @@ -27,7 +27,6 @@ hop-transform-stringoperations jar - Hop Plugins Transforms String Operations diff --git a/plugins/transforms/stringoperations/src/assembly/assembly.xml b/plugins/transforms/stringoperations/src/assembly/assembly.xml index 8900de7bcf9..b12e4cedd51 100644 --- a/plugins/transforms/stringoperations/src/assembly/assembly.xml +++ b/plugins/transforms/stringoperations/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/stringoperations + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/stringoperations true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-stringoperations:jar + plugins/transforms/stringoperations \ No newline at end of file diff --git a/plugins/transforms/switchcase/pom.xml b/plugins/transforms/switchcase/pom.xml index 8c4bc3e7f62..a69cdcd9028 100644 --- a/plugins/transforms/switchcase/pom.xml +++ b/plugins/transforms/switchcase/pom.xml @@ -27,15 +27,13 @@ hop-transform-switchcase jar - Hop Plugins Transforms Switch Case org.apache.hop hop-transform-fieldsplitter - 2.10.0-SNAPSHOT - compile + ${project.version} diff --git a/plugins/transforms/switchcase/src/assembly/assembly.xml b/plugins/transforms/switchcase/src/assembly/assembly.xml index 0ff27adc929..4982ee05107 100644 --- a/plugins/transforms/switchcase/src/assembly/assembly.xml +++ b/plugins/transforms/switchcase/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/switchcase + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/switchcase true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-switchcase:jar + plugins/transforms/switchcase \ No newline at end of file diff --git a/plugins/transforms/synchronizeaftermerge/pom.xml b/plugins/transforms/synchronizeaftermerge/pom.xml index 6d0de5557d5..a7d7cfa6d50 100644 --- a/plugins/transforms/synchronizeaftermerge/pom.xml +++ b/plugins/transforms/synchronizeaftermerge/pom.xml @@ -27,9 +27,6 @@ hop-transform-synchronizeaftermerge jar - Hop Plugins Transforms Switch Case - - diff --git a/plugins/transforms/synchronizeaftermerge/src/assembly/assembly.xml b/plugins/transforms/synchronizeaftermerge/src/assembly/assembly.xml index 819d1beebc9..a470a83af4d 100644 --- a/plugins/transforms/synchronizeaftermerge/src/assembly/assembly.xml +++ b/plugins/transforms/synchronizeaftermerge/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/synchronizeaftermerge + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/synchronizeaftermerge true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-synchronizeaftermerge:jar + plugins/transforms/synchronizeaftermerge \ No newline at end of file diff --git a/plugins/transforms/systemdata/pom.xml b/plugins/transforms/systemdata/pom.xml index 7c425c3c47a..504326893d7 100644 --- a/plugins/transforms/systemdata/pom.xml +++ b/plugins/transforms/systemdata/pom.xml @@ -27,7 +27,6 @@ hop-transform-systemdata jar - Hop Plugins Transforms System Data diff --git a/plugins/transforms/systemdata/src/assembly/assembly.xml b/plugins/transforms/systemdata/src/assembly/assembly.xml index 7b7537b50c3..68f3f453b99 100644 --- a/plugins/transforms/systemdata/src/assembly/assembly.xml +++ b/plugins/transforms/systemdata/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/systemdata + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/systemdata true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-systemdata:jar + plugins/transforms/systemdata \ No newline at end of file diff --git a/plugins/transforms/tablecompare/pom.xml b/plugins/transforms/tablecompare/pom.xml index e30be017c2f..2ba46942698 100644 --- a/plugins/transforms/tablecompare/pom.xml +++ b/plugins/transforms/tablecompare/pom.xml @@ -27,7 +27,6 @@ hop-transform-tablecompare jar - Hop Plugins Transforms Table Compare diff --git a/plugins/transforms/tablecompare/src/assembly/assembly.xml b/plugins/transforms/tablecompare/src/assembly/assembly.xml index b7d8249e4c4..dbfe654c307 100644 --- a/plugins/transforms/tablecompare/src/assembly/assembly.xml +++ b/plugins/transforms/tablecompare/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/tablecompare + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/tablecompare true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-tablecompare:jar + plugins/transforms/tablecompare \ No newline at end of file diff --git a/plugins/transforms/tableexists/pom.xml b/plugins/transforms/tableexists/pom.xml index ea6eb09f012..f7c9669fde2 100644 --- a/plugins/transforms/tableexists/pom.xml +++ b/plugins/transforms/tableexists/pom.xml @@ -27,7 +27,6 @@ hop-transform-tableexists jar - Hop Plugins Transforms Table Exists diff --git a/plugins/transforms/tableexists/src/assembly/assembly.xml b/plugins/transforms/tableexists/src/assembly/assembly.xml index 42249483818..f9def69f7ca 100644 --- a/plugins/transforms/tableexists/src/assembly/assembly.xml +++ b/plugins/transforms/tableexists/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/tableexists + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/tableexists true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-tableexists:jar + plugins/transforms/tableexists \ No newline at end of file diff --git a/plugins/transforms/tableinput/pom.xml b/plugins/transforms/tableinput/pom.xml index 32e059ba804..ddae429177c 100644 --- a/plugins/transforms/tableinput/pom.xml +++ b/plugins/transforms/tableinput/pom.xml @@ -27,7 +27,6 @@ hop-transform-tableinput jar - Hop Plugins Transforms Table Input diff --git a/plugins/transforms/tableinput/src/assembly/assembly.xml b/plugins/transforms/tableinput/src/assembly/assembly.xml index 946b6bc07b2..65dfa9faabe 100644 --- a/plugins/transforms/tableinput/src/assembly/assembly.xml +++ b/plugins/transforms/tableinput/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/tableinput + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/tableinput true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-tableinput:jar + plugins/transforms/tableinput \ No newline at end of file diff --git a/plugins/transforms/tableoutput/pom.xml b/plugins/transforms/tableoutput/pom.xml index 47563a3b298..eed9943853b 100644 --- a/plugins/transforms/tableoutput/pom.xml +++ b/plugins/transforms/tableoutput/pom.xml @@ -27,7 +27,6 @@ hop-transform-tableoutput jar - Hop Plugins Transforms Table Output diff --git a/plugins/transforms/tableoutput/src/assembly/assembly.xml b/plugins/transforms/tableoutput/src/assembly/assembly.xml index 91383545864..12a28986865 100644 --- a/plugins/transforms/tableoutput/src/assembly/assembly.xml +++ b/plugins/transforms/tableoutput/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/tableouput + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/tableouput true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-tableoutput:jar + plugins/transforms/tableouput \ No newline at end of file diff --git a/plugins/transforms/terafast/pom.xml b/plugins/transforms/terafast/pom.xml index bcb00e16edb..749b61680d5 100644 --- a/plugins/transforms/terafast/pom.xml +++ b/plugins/transforms/terafast/pom.xml @@ -27,7 +27,6 @@ hop-transform-terafast jar - Hop Plugins Transforms Teradata Fastload Bulk Loader diff --git a/plugins/transforms/terafast/src/assembly/assembly.xml b/plugins/transforms/terafast/src/assembly/assembly.xml index c124b7880b0..886f2f82018 100644 --- a/plugins/transforms/terafast/src/assembly/assembly.xml +++ b/plugins/transforms/terafast/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/terafast + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/terafast true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-terafast:jar + plugins/transforms/terafast \ No newline at end of file diff --git a/plugins/transforms/textfile/pom.xml b/plugins/transforms/textfile/pom.xml index c1cc741e9a8..af3db11d37b 100644 --- a/plugins/transforms/textfile/pom.xml +++ b/plugins/transforms/textfile/pom.xml @@ -27,7 +27,6 @@ hop-transform-textfile jar - Hop Plugins Transforms Text File diff --git a/plugins/transforms/textfile/src/assembly/assembly.xml b/plugins/transforms/textfile/src/assembly/assembly.xml index 90a9e760ddb..37dd192c01b 100644 --- a/plugins/transforms/textfile/src/assembly/assembly.xml +++ b/plugins/transforms/textfile/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/textfile + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/textfile true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-textfile:jar + plugins/transforms/textfile \ No newline at end of file diff --git a/plugins/transforms/tika/pom.xml b/plugins/transforms/tika/pom.xml index ff73e870b1d..5751bbee612 100644 --- a/plugins/transforms/tika/pom.xml +++ b/plugins/transforms/tika/pom.xml @@ -26,59 +26,237 @@ hop-transform-tika jar - - Hop Plugins Transforms Apache Tika + Hop Plugins Transforms Tika 2.7.0 + + + + org.apache.hop + hop-libs + ${project.version} + pom + import + + + + + + org.apache.tika + tika-core + ${tika.version} + + + commons-codec + * + + + commons-io + * + + + commons-logging + * + + + org.ow2.asm + * + + + org.slf4j + * + + + xerces + * + + + + + org.apache.tika + tika-parsers-standard-package + ${tika.version} + + + com.epam + parso + + + com.fasterxml.jackson.core + * + + + com.github.albfernandez + juniversalchardet + + + com.healthmarketscience.jackcess + jackcess + + + com.sun.activation + jakarta.activation + + + commons-codec + commons-codec + + + commons-io + * + + + commons-lang + commons-lang + + + commons-logging + commons-logging + + + jakarta.xml.bind + jakarta.xml.bind-api + + + org.apache.commons + commons-collections4 + + + org.apache.commons + commons-compress + + + org.apache.commons + commons-csv + + + org.apache.commons + commons-lang3 + + + org.apache.commons + commons-math3 + + + org.apache.logging.log4j + * + + + org.apache.poi + poi + + + org.apache.poi + poi-ooxml + + + org.bouncycastle + bcmail-jdk18on + + + org.bouncycastle + bcpkix-jdk18on + + + org.bouncycastle + bcprov-jdk18on + + + org.bouncycastle + bcutil-jdk18on + + + org.ow2.asm + * + + + org.slf4j + * + + + xerces + xercesImpl + + + com.epam parso - 2.0.14 + provided + + + com.github.albfernandez + juniversalchardet + provided com.healthmarketscience.jackcess jackcess - ${jackcess.version} + provided - jakarta.activation - jakarta.activation-api - 2.1.0 + com.sun.activation + jakarta.activation + provided - org.apache.poi - poi-ooxml - 5.2.3 + commons-codec + commons-codec + provided - org.apache.tika - tika-core - ${tika.version} + commons-lang + commons-lang + provided - org.apache.tika - tika-parsers - ${tika.version} - pom + commons-logging + commons-logging + provided - org.apache.tika - tika-parsers-standard-package - ${tika.version} + org.apache.commons + commons-collections4 + provided + + + org.apache.commons + commons-compress + provided + + + org.apache.commons + commons-csv + provided + + + org.apache.commons + commons-lang3 + provided + + + org.apache.commons + commons-math3 + provided + + + org.apache.poi + poi-ooxml + provided org.ow2.asm asm - ${asm.version} + provided - org.tukaani - xz - 1.9 + xerces + xercesImpl + provided diff --git a/plugins/transforms/tika/src/assembly/assembly.xml b/plugins/transforms/tika/src/assembly/assembly.xml index 3c808376b98..e601fb8c44a 100644 --- a/plugins/transforms/tika/src/assembly/assembly.xml +++ b/plugins/transforms/tika/src/assembly/assembly.xml @@ -16,113 +16,67 @@ --> - hop-transform-tika - - zip - - transforms/tika - - - ${project.basedir}/src/main/resources/version.xml - . - true - - - - - lib - - **/* - - - - - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd"> + hop-transform-tika + + zip + + . + + + ${project.basedir}/src/main/resources/version.xml + plugins/transforms/tika + true + + - - org.apache.hop:hop-transform-tika:jar - - - + + + ${project.basedir}/src/main/samples + config/projects/samples/ + + - lib - - com.adobe.xmp:xmpcore:jar - com.drewnoakes:metadata-extractor:jar - com.epam:parso:jar - com.github.jai-imageio:jai-imageio-core:jar - com.github.junrar:junrar:jar - com.github.virtuald:curvesapi:jar - com.github.albfernandez:juniversalchardet:jar - com.googlecode.plist:dd-plist:jar - com.healthmarketscience.jackcess:jackcess-encrypt:jar - com.healthmarketscience.jackcess:jackcess:jar - com.pff:java-libpst:jar - com.rometools:rome:jar - com.rometools:rome-utils:jar - jakarta.activation:jakarta.activation:jar - com.sun.istack:istack-commons-runtime:jar - com.zaxxer:SparseBitSet:jar - de.l3s.boilerpipe:boilerpipe:jar - jakarta.xml.bind:jakarta.xml.bind-api:jar - org.apache.commons:commons-csv:jar - org.apache.commons:commons-exec:jar - org.apache.james:apache-mime4j-core:jar - org.apache.james:apache-mime4j-dom:jar - - org.apache.pdfbox:fontbox:jar - org.apache.pdfbox:jbig2-imageio:jar - org.apache.pdfbox:jempbox:jar - org.apache.pdfbox:pdfbox-debugger:jar - org.apache.pdfbox:pdfbox:jar - org.apache.pdfbox:pdfbox-tools:jar - org.apache.poi:poi:jar - org.apache.poi:poi-ooxml:jar - org.apache.poi:poi-ooxml-lite:jar - org.apache.poi:poi-scratchpad:jar - org.apache.tika:tika-core:jar - org.apache.tika:tika-parser-apple-module:jar - org.apache.tika:tika-parser-audiovideo-module:jar - org.apache.tika:tika-parser-cad-module:jar - org.apache.tika:tika-parser-code-module:jar - org.apache.tika:tika-parser-crypto-module:jar - org.apache.tika:tika-parser-digest-commons:jar - org.apache.tika:tika-parser-font-module:jar - org.apache.tika:tika-parser-html-commons:jar - org.apache.tika:tika-parser-html-module:jar - org.apache.tika:tika-parser-image-module:jar - org.apache.tika:tika-parser-mail-commons:jar - org.apache.tika:tika-parser-mail-module:jar - org.apache.tika:tika-parser-microsoft-module:jar - org.apache.tika:tika-parser-miscoffice-module:jar - org.apache.tika:tika-parser-news-module:jar - org.apache.tika:tika-parser-ocr-module:jar - org.apache.tika:tika-parser-pdf-module:jar - org.apache.tika:tika-parser-pkg-module:jar - org.apache.tika:tika-parser-text-module:jar - org.apache.tika:tika-parser-xml-module:jar - org.apache.tika:tika-parser-xmp-commons:jar - org.apache.tika:tika-parser-zip-commons:jar - org.apache.xmlbeans:xmlbeans:jar - org.bouncycastle:bcmail-jdk15on:jar - org.bouncycastle:bcpkix-jdk15on:jar - org.bouncycastle:bcprov-jdk15on:jar - org.bouncycastle:bcutil-jdk15on:jar - org.brotli:dec:jar - org.ccil.cowan.tagsoup:tagsoup:jar - org.codelibs:jhighlight:jar - org.gagravarr:vorbis-java-core:jar - org.gagravarr:vorbis-java-tika:jar - org.glassfish.jaxb:jaxb-runtime:jar - org.glassfish.jaxb:txw2:jar - org.jdom:jdom2:jar - org.ow2.asm:asm:jar - org.slf4j:jcl-over-slf4j:jar - org.tallison:jmatio:jar - org.tukaani:xz:jar - - - + + + + org.apache.hop:hop-transform-tika:jar + + plugins/transforms/tika + + + runtime + + org.apache.hop:hop-transform-tika:jar + + plugins/transforms/tika/lib + + + provided + + org.ow2.asm:asm:jar + com.epam:parso:jar + com.healthmarketscience.jackcess:jackcess:jar + org.apache.poi:* + com.zaxxer:* + org.apache.xmlbeans:* + com.github.virtuald:* + jakarta.activation:jakarta.activation-api:jar + commons-codec:commons-codec:jar + commons-lang:commons-lang:jar + commons-logging:commons-logging:jar + org.apache.commons:commons-lang3:jar + org.apache.commons:commons-csv + org.apache.commons:commons-compress:jar + org.apache.commons:commons-math3:jar + com.github.albfernandez:juniversalchardet:jar + xerces:xercesImpl:jar + xml-apis:xml-apis:jar + org.apache.commons:commons-collections4:jar + org.apache.logging.log4j:log4j-api:jar + + lib/core + + \ No newline at end of file diff --git a/plugins/transforms/tokenreplacement/pom.xml b/plugins/transforms/tokenreplacement/pom.xml index 8b684bd4e3b..ef0f884c6d9 100644 --- a/plugins/transforms/tokenreplacement/pom.xml +++ b/plugins/transforms/tokenreplacement/pom.xml @@ -27,7 +27,6 @@ hop-transform-tokenreplacement jar - Hop Plugins Transforms Token Replacement diff --git a/plugins/transforms/tokenreplacement/src/assembly/assembly.xml b/plugins/transforms/tokenreplacement/src/assembly/assembly.xml index 0a26e5336ae..dc75baaca8b 100644 --- a/plugins/transforms/tokenreplacement/src/assembly/assembly.xml +++ b/plugins/transforms/tokenreplacement/src/assembly/assembly.xml @@ -22,28 +22,28 @@ zip - transforms/tokenreplacement + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/tokenreplacement true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-tokenreplacement:jar + plugins/transforms/tokenreplacement \ No newline at end of file diff --git a/plugins/transforms/uniquerows/pom.xml b/plugins/transforms/uniquerows/pom.xml index e68acf1d0d8..67a25f436bb 100644 --- a/plugins/transforms/uniquerows/pom.xml +++ b/plugins/transforms/uniquerows/pom.xml @@ -27,7 +27,6 @@ hop-transform-uniquerows jar - Hop Plugins Transforms Unique Rows diff --git a/plugins/transforms/uniquerows/src/assembly/assembly.xml b/plugins/transforms/uniquerows/src/assembly/assembly.xml index ffd3794eaea..b24cd4ef469 100644 --- a/plugins/transforms/uniquerows/src/assembly/assembly.xml +++ b/plugins/transforms/uniquerows/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/uniquerows + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/uniquerows true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-uniquerows:jar + plugins/transforms/uniquerows \ No newline at end of file diff --git a/plugins/transforms/uniquerowsbyhashset/pom.xml b/plugins/transforms/uniquerowsbyhashset/pom.xml index 0a0ee80eaa6..59d97ddbbd0 100644 --- a/plugins/transforms/uniquerowsbyhashset/pom.xml +++ b/plugins/transforms/uniquerowsbyhashset/pom.xml @@ -27,7 +27,6 @@ hop-transform-uniquerowsbyhashset jar - Hop Plugins Transforms Unique Rows By Hash Set diff --git a/plugins/transforms/uniquerowsbyhashset/src/assembly/assembly.xml b/plugins/transforms/uniquerowsbyhashset/src/assembly/assembly.xml index e0b71e425eb..03010ef005a 100644 --- a/plugins/transforms/uniquerowsbyhashset/src/assembly/assembly.xml +++ b/plugins/transforms/uniquerowsbyhashset/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/uniquerowsbyhashset + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/uniquerowsbyhashset true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-uniquerowsbyhashset:jar + plugins/transforms/uniquerowsbyhashset \ No newline at end of file diff --git a/plugins/transforms/update/pom.xml b/plugins/transforms/update/pom.xml index 8ab34c0b6c3..d33d7fb006b 100644 --- a/plugins/transforms/update/pom.xml +++ b/plugins/transforms/update/pom.xml @@ -27,7 +27,6 @@ hop-transform-update jar - Hop Plugins Transforms Update diff --git a/plugins/transforms/update/src/assembly/assembly.xml b/plugins/transforms/update/src/assembly/assembly.xml index 786179087e7..3c3f674361d 100644 --- a/plugins/transforms/update/src/assembly/assembly.xml +++ b/plugins/transforms/update/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/update + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/update true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-update:jar + plugins/transforms/update \ No newline at end of file diff --git a/plugins/transforms/validator/pom.xml b/plugins/transforms/validator/pom.xml index b77cfe81bde..ea0158c62cf 100644 --- a/plugins/transforms/validator/pom.xml +++ b/plugins/transforms/validator/pom.xml @@ -27,7 +27,6 @@ hop-transform-validator jar - Hop Plugins Transforms Data Validator diff --git a/plugins/transforms/validator/src/assembly/assembly.xml b/plugins/transforms/validator/src/assembly/assembly.xml index abd16737301..dd02717aef8 100644 --- a/plugins/transforms/validator/src/assembly/assembly.xml +++ b/plugins/transforms/validator/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/validator + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/validator true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-validator:jar + plugins/transforms/validator \ No newline at end of file diff --git a/plugins/transforms/valuemapper/pom.xml b/plugins/transforms/valuemapper/pom.xml index 4c5f523ab4d..5b93cbfcb18 100644 --- a/plugins/transforms/valuemapper/pom.xml +++ b/plugins/transforms/valuemapper/pom.xml @@ -27,7 +27,6 @@ hop-transform-valuemapper jar - Hop Plugins Transforms Value Mapper diff --git a/plugins/transforms/valuemapper/src/assembly/assembly.xml b/plugins/transforms/valuemapper/src/assembly/assembly.xml index 4e5c9a884c8..40d43399e3f 100644 --- a/plugins/transforms/valuemapper/src/assembly/assembly.xml +++ b/plugins/transforms/valuemapper/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/valuemapper + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/valuemapper true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-valuemapper:jar + plugins/transforms/valuemapper \ No newline at end of file diff --git a/plugins/transforms/verticabulkloader/pom.xml b/plugins/transforms/verticabulkloader/pom.xml index 7e490f205d6..5d048b987a9 100644 --- a/plugins/transforms/verticabulkloader/pom.xml +++ b/plugins/transforms/verticabulkloader/pom.xml @@ -27,18 +27,40 @@ hop-transform-verticabulkloader jar - Hop Plugins Transforms Vertica Bulk Loader - 23.3.0-0 + 2.12.0 + + + + org.apache.hop + hop-libs-jdbc + ${project.version} + pom + import + + + + + + org.apache.commons + commons-dbcp2 + ${commons-dbcp2.version} + + + commons-logging + * + + + com.vertica.jdbc vertica-jdbc - ${vertica.jdbc.version} + provided diff --git a/plugins/transforms/verticabulkloader/src/assembly/assembly.xml b/plugins/transforms/verticabulkloader/src/assembly/assembly.xml index bc247bc47dd..9e973cd2f38 100644 --- a/plugins/transforms/verticabulkloader/src/assembly/assembly.xml +++ b/plugins/transforms/verticabulkloader/src/assembly/assembly.xml @@ -23,33 +23,40 @@ zip - databases/vertica + . ${project.basedir}/src/main/resources/version.xml - . + plugins/databases/vertica true ${project.basedir}/src/main/resources/dependencies.xml - . + plugins/databases/vertica true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-verticabulkloader:jar + plugins/databases/vertica + + + runtime + + org.apache.hop:hop-transform-verticabulkloader:jar + + plugins/databases/vertica/lib \ No newline at end of file diff --git a/plugins/transforms/verticabulkloader/src/main/java/org/apache/hop/pipeline/transforms/vertica/bulkloader/VerticaBulkLoader.java b/plugins/transforms/verticabulkloader/src/main/java/org/apache/hop/pipeline/transforms/vertica/bulkloader/VerticaBulkLoader.java index 23fd1e038fb..19d51560a71 100644 --- a/plugins/transforms/verticabulkloader/src/main/java/org/apache/hop/pipeline/transforms/vertica/bulkloader/VerticaBulkLoader.java +++ b/plugins/transforms/verticabulkloader/src/main/java/org/apache/hop/pipeline/transforms/vertica/bulkloader/VerticaBulkLoader.java @@ -35,7 +35,7 @@ import java.util.concurrent.Executors; import java.util.stream.Collectors; import javax.sql.PooledConnection; -import org.apache.commons.dbcp.DelegatingConnection; +import org.apache.commons.dbcp2.DelegatingConnection; import org.apache.hop.core.database.Database; import org.apache.hop.core.database.DatabaseMeta; import org.apache.hop.core.exception.HopDatabaseException; diff --git a/plugins/transforms/webserviceavailable/pom.xml b/plugins/transforms/webserviceavailable/pom.xml index 8a5d2391ef8..1e2ec38e39d 100644 --- a/plugins/transforms/webserviceavailable/pom.xml +++ b/plugins/transforms/webserviceavailable/pom.xml @@ -27,7 +27,6 @@ hop-transform-webserviceavailable jar - Hop Plugins Transforms Web Service Available diff --git a/plugins/transforms/webserviceavailable/src/assembly/assembly.xml b/plugins/transforms/webserviceavailable/src/assembly/assembly.xml index 42b1597b778..6432f15b577 100644 --- a/plugins/transforms/webserviceavailable/src/assembly/assembly.xml +++ b/plugins/transforms/webserviceavailable/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/webserviceavailable + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/webserviceavailable true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-webserviceavailable:jar + plugins/transforms/webserviceavailable \ No newline at end of file diff --git a/plugins/transforms/webservices/pom.xml b/plugins/transforms/webservices/pom.xml index 3a84e7c4c40..b8fc7531b05 100644 --- a/plugins/transforms/webservices/pom.xml +++ b/plugins/transforms/webservices/pom.xml @@ -27,14 +27,17 @@ hop-transform-webservices jar - Hop Plugins Transforms Web Services + + 1.6.2 + + wsdl4j wsdl4j - 1.6.2 + ${wsdl4j.version} diff --git a/plugins/transforms/webservices/src/assembly/assembly.xml b/plugins/transforms/webservices/src/assembly/assembly.xml index 2df15265744..3b22d876044 100644 --- a/plugins/transforms/webservices/src/assembly/assembly.xml +++ b/plugins/transforms/webservices/src/assembly/assembly.xml @@ -23,42 +23,34 @@ zip - transforms/webservices + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/webservices true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-webservices:jar + plugins/transforms/webservices - - lib - - javax.wsdl:com.springsource.javax.wsdl:jar - - - - - lib wsdl4j:wsdl4j:jar + plugins/transforms/webservices/lib \ No newline at end of file diff --git a/plugins/transforms/workflowexecutor/pom.xml b/plugins/transforms/workflowexecutor/pom.xml index a58682ed1ab..ccb0401e728 100644 --- a/plugins/transforms/workflowexecutor/pom.xml +++ b/plugins/transforms/workflowexecutor/pom.xml @@ -27,7 +27,6 @@ hop-transform-workflowexecutor jar - Hop Plugins Transforms Workflow Executor diff --git a/plugins/transforms/workflowexecutor/src/assembly/assembly.xml b/plugins/transforms/workflowexecutor/src/assembly/assembly.xml index 523e89af130..068e6a54b8f 100644 --- a/plugins/transforms/workflowexecutor/src/assembly/assembly.xml +++ b/plugins/transforms/workflowexecutor/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/workflowexecutor + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/workflowexecutor true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-workflowexecutor:jar + plugins/transforms/workflowexecutor \ No newline at end of file diff --git a/plugins/transforms/writetolog/pom.xml b/plugins/transforms/writetolog/pom.xml index c6e39106b39..4cc75c11366 100644 --- a/plugins/transforms/writetolog/pom.xml +++ b/plugins/transforms/writetolog/pom.xml @@ -27,7 +27,6 @@ hop-transform-writetolog jar - Hop Plugins Transforms Write To Log diff --git a/plugins/transforms/writetolog/src/assembly/assembly.xml b/plugins/transforms/writetolog/src/assembly/assembly.xml index 2c7d73edc4b..6c13416d400 100644 --- a/plugins/transforms/writetolog/src/assembly/assembly.xml +++ b/plugins/transforms/writetolog/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/writetolog + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/writetolog true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-writetolog:jar + plugins/transforms/writetolog \ No newline at end of file diff --git a/plugins/transforms/xml/pom.xml b/plugins/transforms/xml/pom.xml index b43520c65f8..8c69450d7a3 100644 --- a/plugins/transforms/xml/pom.xml +++ b/plugins/transforms/xml/pom.xml @@ -27,7 +27,6 @@ hop-transform-xml jar - Hop Plugins Transforms XML @@ -36,18 +35,23 @@ 8.7 + + + + org.apache.hop + hop-libs + ${project.version} + pom + import + + + + - jaxen jaxen ${jaxen.version} - - - * - * - - net.sf.saxon @@ -62,6 +66,7 @@ xerces xercesImpl + provided diff --git a/plugins/transforms/xml/src/assembly/assembly.xml b/plugins/transforms/xml/src/assembly/assembly.xml index b9244574562..70196a06b4e 100644 --- a/plugins/transforms/xml/src/assembly/assembly.xml +++ b/plugins/transforms/xml/src/assembly/assembly.xml @@ -23,38 +23,41 @@ zip - transforms/xml + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/xml true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-xml:jar + plugins/transforms/xml + + + runtime + + org.apache.hop:hop-transform-xml:jar + + plugins/transforms/xml/lib - - lib - net.sf.saxon:saxon-dom:jar - net.sf.saxon:saxon:jar - org.dom4j:dom4j:jar - jaxen:jaxen:jar + xerces:xercesImpl:jar + lib/core \ No newline at end of file diff --git a/plugins/transforms/yamlinput/pom.xml b/plugins/transforms/yamlinput/pom.xml index abfd29a055e..01cff406578 100644 --- a/plugins/transforms/yamlinput/pom.xml +++ b/plugins/transforms/yamlinput/pom.xml @@ -27,14 +27,25 @@ hop-transform-yamlinput jar - Hop Plugins Transforms Yaml Input + + + + org.apache.hop + hop-libs + ${project.version} + pom + import + + + + org.yaml snakeyaml - ${snakeyaml.version} + provided diff --git a/plugins/transforms/yamlinput/src/assembly/assembly.xml b/plugins/transforms/yamlinput/src/assembly/assembly.xml index 0ef0aaa949c..a8e2b2b9e5b 100644 --- a/plugins/transforms/yamlinput/src/assembly/assembly.xml +++ b/plugins/transforms/yamlinput/src/assembly/assembly.xml @@ -23,28 +23,35 @@ zip - transforms/yamlinput + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/yamlinput true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-yamlinput:jar + plugins/transforms/yamlinput + + + provided + + org.yaml:snakeyaml:jar + + lib/core \ No newline at end of file diff --git a/plugins/transforms/zipfile/pom.xml b/plugins/transforms/zipfile/pom.xml index 5f81d520c45..4226b98c2f6 100644 --- a/plugins/transforms/zipfile/pom.xml +++ b/plugins/transforms/zipfile/pom.xml @@ -27,10 +27,6 @@ hop-transform-zipfile jar - Hop Plugins Transforms Zipfile - - - diff --git a/plugins/transforms/zipfile/src/assembly/assembly.xml b/plugins/transforms/zipfile/src/assembly/assembly.xml index d74ca750f16..5521c80a2a4 100644 --- a/plugins/transforms/zipfile/src/assembly/assembly.xml +++ b/plugins/transforms/zipfile/src/assembly/assembly.xml @@ -23,28 +23,28 @@ zip - transforms/zipfile + . ${project.basedir}/src/main/resources/version.xml - . + plugins/transforms/zipfile true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + - org.apache.hop:hop-transform-zipfile:jar + plugins/transforms/zipfile \ No newline at end of file diff --git a/plugins/valuetypes/json/pom.xml b/plugins/valuetypes/json/pom.xml index 8e8a6fdc874..b4e3962c98d 100644 --- a/plugins/valuetypes/json/pom.xml +++ b/plugins/valuetypes/json/pom.xml @@ -26,17 +26,7 @@ hop-valuetypes-json - 2.10.0-SNAPSHOT jar - Hop Plugins Value Types JSON - - - org.apache.hop - hop-core - 2.10.0-SNAPSHOT - compile - - diff --git a/plugins/valuetypes/json/src/assembly/assembly.xml b/plugins/valuetypes/json/src/assembly/assembly.xml index a98ca61921f..8535b1665e6 100644 --- a/plugins/valuetypes/json/src/assembly/assembly.xml +++ b/plugins/valuetypes/json/src/assembly/assembly.xml @@ -24,27 +24,28 @@ zip - valuetypes/json + . ${project.basedir}/src/main/resources/version.xml - . + plugins/valuetypes/json true + - lib - - **/* - + ${project.basedir}/src/main/samples + config/projects/samples/ + org.apache.hop:hop-valuetypes-json:jar + plugins/valuetypes/json \ No newline at end of file diff --git a/plugins/valuetypes/pom.xml b/plugins/valuetypes/pom.xml index de1b5c6b72a..53a38890997 100644 --- a/plugins/valuetypes/pom.xml +++ b/plugins/valuetypes/pom.xml @@ -26,9 +26,7 @@ hop-plugins-valuetypes - 2.10.0-SNAPSHOT pom - Hop Plugins Value Types diff --git a/pom.xml b/pom.xml index a97a2e8a095..9b0c5862b6d 100644 --- a/pom.xml +++ b/pom.xml @@ -97,72 +97,23 @@ - 2.4.9 - 2.5.32 2.56.0 - 1.16.3 - 3.4.3 - 9.3 false package verify - 1.11.3 - 1.12.347 - 1.17 ${project.build.directory}/dependency 1.14.15 - 1.9.4 - 1.15 - 1.26.0 - 1.5 - 3.12.0 - 1.1.3 - 5.4.0 - 1.2 - 2.46.1 - 2.2.0 - 2.13.0 - v2-rev20240229-2.0.0 - v1-rev20240311-2.0.0 - 1.12.1 - 1.12.1 - 2.15.0 - 1.42.3 - 1.34.1 - 1.60.1 - 2.10 - 32.1.2-jre - 3.3.6 - 2.3.9 - 4.4.15 - 4.5.13 - 4.0.4 - 2.15.0 + 3.1.0 0.8.12 - 2.0.1 - 3.1.0 3.1.8 2.0.0.0 - 4.0.1 - 9.4.41.v20210516 - 2.12.1 - 0.1.55 - 1.1.1 - 2.5.0 - 3.7.0-M11 5.10.2 - 2.4.0 - 3.3.1 - 5.3.0 - 0.16.0 META-INF/LICENSE.txt false 2020 LICENSE.txt apache_v2 Apache - 2.19.0 - 1.8.0 1 true -Duser.timezone=UTC @@ -190,244 +141,40 @@ yyyy-MM-dd hh.mm.ss ${target.jdk.version} ${target.jdk.version} - 4.2.12 - 1.3.1 5.12.0 - 4.1.89.Final 3.4 - 3.3.4 - 4.12.0 - 3.9.0 - 0.31.1 - 0.31.1 - 5.7.1 - 3.12.0 - 3.19.0 3.126.0 - 2.8 - 0.26.0 UTF-8 UTF-8 - 3.25.2 - 1.7.14 - 2.12.17 initialize scpexe://people.apache.org/www/hop.apache.org/maven/ - 2.0.4 - 2.0 - 1.1.10.5 4.0.0.4121 - 2.2.23 17 - 2.0.2 - 6.4.0 - 2.12.2 - 3.8.4 - com.amazonaws - aws-java-sdk-core - ${aws-java-sdk.version} - - - com.amazonaws - aws-java-sdk-emr - ${aws-java-sdk.version} - - - com.amazonaws - aws-java-sdk-iam - ${aws-java-sdk.version} - - - com.amazonaws - aws-java-sdk-pricing - ${aws-java-sdk.version} - - - com.amazonaws - aws-java-sdk-redshift - ${aws-java-sdk.version} - - - com.amazonaws - aws-java-sdk-s3 - ${aws-java-sdk.version} - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - com.fasterxml.jackson.dataformat - jackson-dataformat-cbor - ${jackson.version} - - - com.fasterxml.jackson.dataformat - jackson-dataformat-smile - ${jackson.version} - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - ${jackson.version} - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-base - ${jackson.version} - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - ${jackson.version} - - - com.fasterxml.jackson.jr - jackson-jr-objects - ${jackson.version} - - - com.fasterxml.jackson.module - jackson-module-jaxb-annotations - ${jackson.version} - - - com.google.guava - guava - ${guava.version} - - - * - * - - - - - commons-beanutils - commons-beanutils - ${commons-beanutils.version} - - - * - * - - - - - commons-codec - commons-codec - ${commons-codec.version} - - - * - * - - - - - commons-fileupload - commons-fileupload - ${commons-fileupload.version} - - - commons-logging - commons-logging - ${commons-logging.version} - - - * - * - - - - - org.apache.commons - commons-compress - ${commons-compress.version} - - - org.apache.maven.plugins - maven-failsafe-plugin - 3.0.0-M4 - maven-plugin - - - org.codehaus.mojo - wagon-maven-plugin - ${wagon-plugin.version} - - - - - org.mozilla - rhino - ${rhino.version} - - - * - * - - - - - org.owasp.encoder - encoder - ${encoder.version} - - - * - * - - - - - xerces - xercesImpl - ${xerces.version} - - - * - * - - - - - net.bytebuddy - byte-buddy - ${byte-buddy.version} - test - - - net.bytebuddy - byte-buddy-agent - ${byte-buddy.version} - test - - - org.hamcrest - java-hamcrest - ${java-hamcrest.version} - test + io.smallrye + jandex + ${jandex.version} + + + net.bytebuddy + byte-buddy-agent + ${byte-buddy.version} + test + + + org.hamcrest + java-hamcrest + ${java-hamcrest.version} + test + org.junit.jupiter junit-jupiter @@ -723,6 +470,8 @@ core engine engine-beam + lib + lib-jdbc plugins rap rcp @@ -810,6 +559,7 @@ swt-unix + Linux unix diff --git a/rap/pom.xml b/rap/pom.xml index d7bc4543076..ca1d22bc6fb 100644 --- a/rap/pom.xml +++ b/rap/pom.xml @@ -25,9 +25,7 @@ hop-ui-rap - 2.10.0-SNAPSHOT jar - Hop GUI (RAP fragment) @@ -35,24 +33,28 @@ - + + org.eclipse.rap + org.eclipse.rap.rwt + ${rap.version} + org.apache.hop - hop-ui + hop-core ${project.version} - - - org.eclipse.platform - * - - + provided - - - org.eclipse.rap - org.eclipse.rap.rwt - ${rap.version} + org.apache.hop + hop-engine + ${project.version} + provided + + + org.apache.hop + hop-ui + ${project.version} + provided diff --git a/rcp/pom.xml b/rcp/pom.xml index a4a99c75e3b..07c15ed5bb1 100644 --- a/rcp/pom.xml +++ b/rcp/pom.xml @@ -27,28 +27,32 @@ hop-ui-rcp 2.10.0-SNAPSHOT jar - Hop GUI (RCP fragment) - + + org.apache.hop + hop-core + ${project.version} + provided + + + org.apache.hop + hop-engine + ${project.version} + provided + org.apache.hop hop-ui ${project.version} + provided - - org.eclipse.platform org.eclipse.swt.gtk.linux.x86_64 ${org.eclipse.platform.version} - - - * - * - - + provided diff --git a/rest/pom.xml b/rest/pom.xml index 2c58452c49f..10561573acd 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -26,20 +26,30 @@ hop-rest - 2.10.0-SNAPSHOT war - Hop REST + 3.1.0 3.1.0 + + + + org.apache.hop + hop-libs + ${project.version} + pom + import + + + + com.fasterxml.jackson.module jackson-module-jaxb-annotations - ${jackson.version} jakarta.ws.rs @@ -100,7 +110,7 @@ org.glassfish.jersey jersey-bom - 3.1.0 + ${jersey.version} pom diff --git a/ui/pom.xml b/ui/pom.xml index bb55ed42321..752b659c168 100644 --- a/ui/pom.xml +++ b/ui/pom.xml @@ -24,69 +24,56 @@ 2.10.0-SNAPSHOT - org.apache.hop hop-ui 2.10.0-SNAPSHOT jar - Hop GUI + + 2.9 + + + + + + org.apache.hop + hop-libs + ${project.version} + pom + import + + + + - + + org.apache.xmlgraphics + xmlgraphics-commons + ${xmlgraphics-commons.version} + + + * + * + + + org.apache.hop hop-core ${project.version} + provided org.apache.hop hop-engine ${project.version} + provided - - org.eclipse.platform ${swt.artifactId} ${org.eclipse.platform.version} - - - * - * - - - - - org.eclipse.platform - org.eclipse.core.commands - ${org.eclipse.commands.version} - - - * - * - - - - - org.eclipse.platform - org.eclipse.equinox.common - ${org.eclipse.equinox.version} - - - * - * - - - - - org.mozilla - rhino - - - javax.servlet - javax.servlet-api - ${javax.servlet-api.version} - test + provided org.apache.hop diff --git a/assemblies/core/lib/src/assembly/assembly.xml b/ui/src/assembly/assembly.xml similarity index 64% rename from assemblies/core/lib/src/assembly/assembly.xml rename to ui/src/assembly/assembly.xml index 91155818ff3..930be2ce2b3 100644 --- a/assemblies/core/lib/src/assembly/assembly.xml +++ b/ui/src/assembly/assembly.xml @@ -17,26 +17,16 @@ --> - core-libs + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd"> + hop-engine zip - true - lib - - - ${assembly.dir} - . - - + lib/core - false - - org.apache.hop:hop-plugins-static-schema:jar - + . \ No newline at end of file