You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ha...@apache.org on 2020/12/23 16:37:06 UTC

[incubator-hop] branch master updated: HOP-2346 : Removed mulesoft redshift jdbc dependency.

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 63a81de  HOP-2346 : Removed mulesoft redshift jdbc dependency.
     new b82bb8f  Merge pull request #487 from sramazzina/master
63a81de is described below

commit 63a81deea13dfa00caa35dd6b6068aaff4fc513b
Author: sergio.ramazzina <se...@serasoft.it>
AuthorDate: Wed Dec 23 16:57:22 2020 +0100

    HOP-2346 : Removed mulesoft redshift jdbc dependency.
---
 assemblies/plugins/databases/redshift-assemblies/pom.xml             | 5 -----
 .../plugins/databases/redshift-assemblies/src/assembly/assembly.xml  | 5 +++++
 .../databases/redshift-assemblies/src/main/resources/PUT_JDBC_HERE   | 0
 plugins/databases/redshift/pom.xml                                   | 5 -----
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/assemblies/plugins/databases/redshift-assemblies/pom.xml b/assemblies/plugins/databases/redshift-assemblies/pom.xml
index c972343..b281e12 100644
--- a/assemblies/plugins/databases/redshift-assemblies/pom.xml
+++ b/assemblies/plugins/databases/redshift-assemblies/pom.xml
@@ -47,11 +47,6 @@
             <artifactId>hop-databases-redshift</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.amazon.redshift</groupId>
-            <artifactId>redshift-jdbc42</artifactId>
-            <version>${redshift.version}</version>
-        </dependency>
     </dependencies>
 
     <repositories>
diff --git a/assemblies/plugins/databases/redshift-assemblies/src/assembly/assembly.xml b/assemblies/plugins/databases/redshift-assemblies/src/assembly/assembly.xml
index 8f242cc..e5900c9 100644
--- a/assemblies/plugins/databases/redshift-assemblies/src/assembly/assembly.xml
+++ b/assemblies/plugins/databases/redshift-assemblies/src/assembly/assembly.xml
@@ -31,6 +31,11 @@
             <filtered>true</filtered>
         </file>
         <file>
+            <source>${project.basedir}/src/main/resources/PUT_JDBC_HERE</source>
+            <outputDirectory>lib</outputDirectory>
+            <filtered>true</filtered>
+        </file>
+        <file>
             <source>${project.basedir}/src/main/resources/dependencies.xml</source>
             <outputDirectory>.</outputDirectory>
             <filtered>true</filtered>
diff --git a/assemblies/plugins/databases/redshift-assemblies/src/main/resources/PUT_JDBC_HERE b/assemblies/plugins/databases/redshift-assemblies/src/main/resources/PUT_JDBC_HERE
new file mode 100644
index 0000000..e69de29
diff --git a/plugins/databases/redshift/pom.xml b/plugins/databases/redshift/pom.xml
index 8b17b3a..561a17a 100644
--- a/plugins/databases/redshift/pom.xml
+++ b/plugins/databases/redshift/pom.xml
@@ -28,11 +28,6 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.amazon.redshift</groupId>
-            <artifactId>redshift-jdbc42</artifactId>
-            <version>${redshift.version}</version>
-        </dependency>
-        <dependency>
             <groupId>org.apache.hop</groupId>
             <artifactId>hop-databases-postgresql</artifactId>
             <scope>compile</scope>