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

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


The following commit(s) were added to refs/heads/master by this push:
     new 551d5d93f6 remove empty caché jdbc driver, fixes #2496
     new 4d1fc02f7b Merge pull request #2526 from hansva/master
551d5d93f6 is described below

commit 551d5d93f6dc8dc893dc070f6de22ae39e464349
Author: Hans Van Akelyen <[email protected]>
AuthorDate: Wed Mar 8 16:04:29 2023 +0100

    remove empty caché jdbc driver, fixes #2496
---
 assemblies/plugins/databases/cache-assemblies/pom.xml        |  6 ------
 .../databases/cache-assemblies/src/assembly/assembly.xml     | 12 +++++-------
 .../cache-assemblies/src/main/resources/PUT_JDBC_HERE        |  0
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/assemblies/plugins/databases/cache-assemblies/pom.xml 
b/assemblies/plugins/databases/cache-assemblies/pom.xml
index 627f4de682..73db0f7a79 100644
--- a/assemblies/plugins/databases/cache-assemblies/pom.xml
+++ b/assemblies/plugins/databases/cache-assemblies/pom.xml
@@ -44,12 +44,6 @@
             <artifactId>hop-databases-cache</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <!-- License Apache 2.0 -->
-            <groupId>com.intersystems</groupId>
-            <artifactId>intersystems-jdbc</artifactId>
-            <version>${cache.version}</version>
-        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git 
a/assemblies/plugins/databases/cache-assemblies/src/assembly/assembly.xml 
b/assemblies/plugins/databases/cache-assemblies/src/assembly/assembly.xml
index 69d13dca48..6cc9cd6bab 100644
--- a/assemblies/plugins/databases/cache-assemblies/src/assembly/assembly.xml
+++ b/assemblies/plugins/databases/cache-assemblies/src/assembly/assembly.xml
@@ -30,6 +30,11 @@
             <outputDirectory>.</outputDirectory>
             <filtered>true</filtered>
         </file>
+        <file>
+            
<source>${project.basedir}/src/main/resources/PUT_JDBC_HERE</source>
+            <outputDirectory>lib</outputDirectory>
+            <filtered>true</filtered>
+        </file>
     </files>
     <fileSets>
         <fileSet>
@@ -46,12 +51,5 @@
                 <include>org.apache.hop:hop-databases-cache:jar</include>
             </includes>
         </dependencySet>
-        <dependencySet>
-            <includes>
-                <include>com.intersystems:intersystems-jdbc:jar</include>
-            </includes>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputDirectory>lib</outputDirectory>
-        </dependencySet>
     </dependencySets>
 </assembly>
\ No newline at end of file
diff --git 
a/assemblies/plugins/databases/cache-assemblies/src/main/resources/PUT_JDBC_HERE
 
b/assemblies/plugins/databases/cache-assemblies/src/main/resources/PUT_JDBC_HERE
new file mode 100644
index 0000000000..e69de29bb2

Reply via email to