Merge pull request #218 from tigergraph/jdbc-dev-sync

[Automated]JDBC Driver Release 1.3.17
tigergraph · Feb 8, 2024 · 0e15cdd · 0e15cdd
2 parents e78d005 + cd20d08
commit 0e15cdd
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 20 deletions.
diff --git a/tools/etl/tg-jdbc-driver/CHANGELOG.md b/tools/etl/tg-jdbc-driver/CHANGELOG.md
@@ -1,3 +1,7 @@
+## Release 1.3.17
+* Supported TG Version: 2.4.1+
+* Support 3 release types: jar, jar with dependencies, tar.gz
+
 ## Release 1.3.15
 * Supported TG Version: 2.4.1+
 * Bugfixes:

diff --git a/tools/etl/tg-jdbc-driver/README.md b/tools/etl/tg-jdbc-driver/README.md
@@ -537,7 +537,7 @@ df2.write.mode("overwrite").format("jdbc").options(
 If you use a Spark job to connect TigerGraph via JDBC, we recommend your concurrent Spark loading jobs be capped at 10 with the following per job configuration. This limits the concurrent JDBC connections to 40.
 ```
 /* 2 executors per job and each executor takes 2 cores */
-/path/to/spark/bin/spark-shell --jars /path/to/tigergraph-jdbc-driver-${VERSION}.jar -—num-executors 2 —-executor-cores 2 -i test.scala
+/path/to/spark/bin/spark-shell --jars /path/to/tigergraph-jdbc-driver-${VERSION}-jar-with-dependencies.jar -—num-executors 2 —-executor-cores 2 -i test.scala
 ```
 ```
 val df = sc.textFile("/path/to/your_file", 100).toDF()
@@ -653,7 +653,7 @@ val dbtable2 = """interpreted INTERPRET QUERY (int lowerBound = 0, int upperBoun
 
 Save any piece of the above script in a file (e.g., test.scala), and run it like this:
 ```
-/path/to/spark/bin/spark-shell --jars /path/to/tigergraph-jdbc-driver-${VERSION}.jar -i test.scala
+/path/to/spark/bin/spark-shell --jars /path/to/tigergraph-jdbc-driver-${VERSION}-jar-with-dependencies.jar -i test.scala
 ```
 
 **Please do NOT print multiple objects (i.e., variable list, vertex set, edge set, etc.) in your query if it needs to be invoked via Spark. Otherwise, only one object could be printed. The output format of TigerGraph is JSON, which is an unordered collection of key/value pairs. So the order could not be guaranteed.**
@@ -668,7 +668,7 @@ Please add the following options to your scala script:
 
 And run it with **"--files"** option like this:
 ```
-/path/to/spark/bin/spark-shell --jars /path/to/tigergraph-jdbc-driver-${VERSION}.jar --files /path/to/trust.jks -i test.scala
+/path/to/spark/bin/spark-shell --jars /path/to/tigergraph-jdbc-driver-${VERSION}-jar-with-dependencies.jar --files /path/to/trust.jks -i test.scala
 ```
 The `--files` should be provided the JKS file path, while the `"trustStore" -> "trust.jks"` should be the JKS filename only.
 

diff --git a/tools/etl/tg-jdbc-driver/tg-jdbc-driver/pom.xml b/tools/etl/tg-jdbc-driver/tg-jdbc-driver/pom.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.tigergraph</groupId>
     <artifactId>tigergraph-jdbc-driver</artifactId>
-    <version>1.3.15</version>
+    <version>1.3.17</version>
     <packaging>jar</packaging>
 
     <name>TigerGraph JDBC Driver Parent</name>
@@ -140,18 +142,18 @@
                 <version>1.19</version>
                 <executions>
                     <execution>
-                    <id>check-java-8-compatibility</id>
-                    <phase>compile</phase>
-                    <goals>
-                        <goal>check</goal>
-                    </goals>
-                    <configuration>
-                        <signature>
-                            <groupId>org.codehaus.mojo.signature</groupId>
-                            <artifactId>java18</artifactId>
-                            <version>1.0</version>
-                        </signature>
-                    </configuration>
+                        <id>check-java-8-compatibility</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                        <configuration>
+                            <signature>
+                                <groupId>org.codehaus.mojo.signature</groupId>
+                                <artifactId>java18</artifactId>
+                                <version>1.0</version>
+                            </signature>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
@@ -166,6 +168,22 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
+                            <shadedArtifactAttached>true</shadedArtifactAttached>
+                            <shadedClassifierName>jar-with-dependencies</shadedClassifierName>
+                            <relocations>
+                                <relocation>
+                                    <pattern>org.apache.http</pattern>
+                                    <shadedPattern>org.shaded.apache.http</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.apache.commons.http</pattern>
+                                    <shadedPattern>org.shaded.apache.commons.http</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.json</pattern>
+                                    <shadedPattern>org.shaded.json</shadedPattern>
+                                </relocation>
+                            </relocations>
                             <filters>
                                 <filter>
                                     <artifact>*:*</artifact>
@@ -185,7 +203,8 @@
                                 </filter>
                             </filters>
                             <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                                <transformer
+                                    implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
                             </transformers>
                             <createDependencyReducedPom>false</createDependencyReducedPom>
                         </configuration>
@@ -322,4 +341,4 @@
             </build>
         </profile>
     </profiles>
-</project>
+</project>
diff --git a/tools/etl/tg-jdbc-driver/tg-jdbc-driver/src/assembly/package.xml b/tools/etl/tg-jdbc-driver/tg-jdbc-driver/src/assembly/package.xml
@@ -10,7 +10,7 @@
     </formats>
     <files>
         <file>
-            <source>${project.build.directory}/original-${project.artifactId}-${project.version}.jar</source>
+            <source>${project.build.directory}/${project.artifactId}-${project.version}.jar</source>
             <destName>${project.artifactId}-${project.version}.jar</destName>
             <outputDirectory>/</outputDirectory>
         </file>