Merge remote-tracking branch 'origin/master' into k8s-operator/0.1.0

demos/guru_scripts/docker/README.md

@@ -1,6 +1,6 @@
 Overview 
 =================
-This document provides step-by-step instructions on how to pull the latest TigerGraph Developer Edition docker image to your host machine. You can follow the sections in sequence to setup the TigerGraph docker enviroment. 
+This document provides step-by-step instructions on how to pull the latest TigerGraph Free Trial docker image to your host machine. You can follow the sections in sequence to setup the TigerGraph docker enviroment. 
 
 The latest TigerGraph docker image includes the following content.  
 
@@ -56,12 +56,21 @@ Suppose we mount the host OS ~/data folder to a docker folder /home/tigergraph/m
 Since our dev edition does not support backup/restore data, you can persist your data (raw file, gsql script etc.) 
 on the data volume. After upgrading Dev version, you can start a new container using the same data volume. 
 
+Getting a License Key
+================================
+
+Please note that this package does not include a license key. 
+
+You may obtain a license key by going to [dl.tigergraph.com](https://dl.tigergraph.com/) and clicking on "**Request Free Dev License**" at the top. Fill out the form to receive a license key. Once you have the key, [follow the directions](https://docs.tigergraph.com/tigergraph-server/current/system-management/management-with-gadmin#_manage_licenses) for applying the key.
+
+Currently, the Free Trial limits your database to **50 GB**, and is valid for **30 days** after the date of issue.
+
 Pull Pre-built TigerGraph Docker Image And Run It As A Server
 ================================================================
 One command pull docker image and bind all ports for first time user from the TigerGraph docker registry. 
 This image will start as a daemon, so user can ssh to it. 
 
-1. pull the latesst version, only do this step in shell if you upgrade your docker image
+1. pull the latest version, only do this step in shell if you upgrade your docker image
 
         docker pull tigergraph/tigergraph:latest
         
@@ -109,13 +118,19 @@ After pulling the image and launch the container in the background, you can try
 
          gadmin start all
 
+1. apply or update the license if necessary, by running the following commands under bash shell. 
+
+         gadmin license set <new_license_key>
+         gadmin config apply -y
+         gadmin restart all -y
+
 1. start gsql shell under bash shell, and you are ready to follow https://docs.tigergraph.com/start/gsql-101
 
          gsql 
 1. start GraphStudio, TigerGraph's visual IDE,  by opening a browser on your laptop (host OS) and access:
 
         http://localhost:14240
-        
+
 Operation Commands Cheat Sheet
 ================================
 

tools/etl/tg-jdbc-driver/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 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:
+    1. publish the original POM to maven central
+
 ## Release 1.3.14
 * Supported TG Version: 2.4.1+
 * Bugfixes:

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.
 

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.14</version>
+    <version>1.3.17</version>
     <packaging>jar</packaging>
 
     <name>TigerGraph JDBC Driver Parent</name>
@@ -55,12 +57,12 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.5.13</version>
+            <version>4.5.14</version>
         </dependency>
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <version>20230227</version>
+            <version>20231013</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish</groupId>
@@ -115,13 +117,13 @@
         <dependency>
             <groupId>org.apache.spark</groupId>
             <artifactId>spark-core_2.12</artifactId>
-            <version>3.4.0</version>
+            <version>3.5.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.spark</groupId>
             <artifactId>spark-sql_2.12</artifactId>
-            <version>3.3.0</version>
+            <version>3.5.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -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,8 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
+                            <shadedArtifactAttached>true</shadedArtifactAttached>
+                            <shadedClassifierName>jar-with-dependencies</shadedClassifierName>
                             <relocations>
                                 <relocation>
                                     <pattern>org.apache.http</pattern>
@@ -199,8 +203,10 @@
                                 </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>
                     </execution>
                 </executions>
@@ -335,4 +341,4 @@
             </build>
         </profile>
     </profiles>
-</project>
+</project>

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>