diff --git a/java-bigquery/google-cloud-bigquery-jdbc/.gitignore b/java-bigquery/google-cloud-bigquery-jdbc/.gitignore index b023676c0793..f68b1f4a5f73 100644 --- a/java-bigquery/google-cloud-bigquery-jdbc/.gitignore +++ b/java-bigquery/google-cloud-bigquery-jdbc/.gitignore @@ -1 +1,2 @@ -drivers/ \ No newline at end of file +drivers/** +target-it/** \ No newline at end of file diff --git a/java-bigquery/google-cloud-bigquery-jdbc/Makefile b/java-bigquery/google-cloud-bigquery-jdbc/Makefile index 46ddae268aeb..62f9d8c5f1af 100644 --- a/java-bigquery/google-cloud-bigquery-jdbc/Makefile +++ b/java-bigquery/google-cloud-bigquery-jdbc/Makefile @@ -4,6 +4,9 @@ CONTAINER_NAME=jdbc PACKAGE_DESTINATION=$(PWD)/drivers SRC="$(PWD)" skipSurefire ?= true +JDBC_DRIVER_VERSION = $(shell mvn help:evaluate -Dexpression=project.version -q -DforceStdout) +JDBC_JAR = $(PACKAGE_DESTINATION)/google-cloud-bigquery-jdbc-$(JDBC_DRIVER_VERSION)-all.jar + # no indendation for ifndef\endif due to their evaluation before execution .check-env: | @@ -59,14 +62,15 @@ package: mvn clean package \ -DincludeScope=runtime \ -Dmaven.test.skip=true - mvn dependency:copy-dependencies \ - -DincludeScope=runtime - ${MAKE} generate-dependency-list - -generate-dependency-list: - mvn -B dependency:list \ - -f pom.xml \ - -DincludeScope=runtime | grep :jar: | sed -E "s/^.* ([^: ]+):([^:]+):([^:]+):([^:]+).*/\1<\/groupId>\2<\/artifactId>\4<\/version><\/dependency>/g" > dependencies.txt + mkdir -p $(PACKAGE_DESTINATION) + cp target/google-cloud-bigquery-jdbc-*-all.jar $(PACKAGE_DESTINATION)/ + +build-it-standalone: + mvn -Dmaven.test.skip=true package -f pom-it.xml + +run-it-standalone: + java -cp $(JDBC_JAR):target-it/* org.junit.platform.console.ConsoleLauncher --select-class com.google.cloud.bigquery.jdbc.it.suites.ITDriverAgnosticTests + # Commands for dockerized environments .docker-run: | diff --git a/java-bigquery/google-cloud-bigquery-jdbc/pom-it.xml b/java-bigquery/google-cloud-bigquery-jdbc/pom-it.xml index fcf489c17e2c..124ca54d4517 100644 --- a/java-bigquery/google-cloud-bigquery-jdbc/pom-it.xml +++ b/java-bigquery/google-cloud-bigquery-jdbc/pom-it.xml @@ -86,6 +86,7 @@ + target-it org.apache.maven.plugins