From e41f4cfeff884915b93ecbae5ac89f0eaa1ac770 Mon Sep 17 00:00:00 2001 From: Richard Rogers Date: Fri, 4 Feb 2022 05:13:47 -0800 Subject: [PATCH 01/15] Add Java package smoketest --- java/smoketest/build.gradle | 13 +++++++++++++ .../src/main/java/smoketest/smoketest.java | 8 ++++++++ 2 files changed, 21 insertions(+) create mode 100644 java/smoketest/build.gradle create mode 100644 java/smoketest/src/main/java/smoketest/smoketest.java diff --git a/java/smoketest/build.gradle b/java/smoketest/build.gradle new file mode 100644 index 0000000000..739781fdcb --- /dev/null +++ b/java/smoketest/build.gradle @@ -0,0 +1,13 @@ + +apply plugin: 'java' + +repostiores { + mavenCentral() +} + +sourceCompatibility = 1.8 +targetCompatibility = 1.8 + +dependencies { + implementation "ai.whylabs:whylogs-core:0.1.7-b2" +} diff --git a/java/smoketest/src/main/java/smoketest/smoketest.java b/java/smoketest/src/main/java/smoketest/smoketest.java new file mode 100644 index 0000000000..e5ba0d4b24 --- /dev/null +++ b/java/smoketest/src/main/java/smoketest/smoketest.java @@ -0,0 +1,8 @@ +import com.whylogs.core; +import java.time.Instant; + +public class SmokeTest { + public static void main(String[] args) { + val dsp = new DatasetProfile("test", Instant.now()); + } +} From dfcbfc14831dd2d3c5c857a2c28a56c2b5f4b017 Mon Sep 17 00:00:00 2001 From: Richard Rogers Date: Fri, 4 Feb 2022 05:14:13 -0800 Subject: [PATCH 02/15] add cmake to development Docker image --- Dockerfile.dev | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile.dev b/Dockerfile.dev index b5577aaf53..2de39654fb 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -4,6 +4,7 @@ RUN mkdir /workspace && \ apt update && \ apt install git -y && \ apt install protobuf-compiler -y && \ + apt install cmake -y && \ pip install pytest && \ pip install pytest-cov && \ pip install jupyterlab && \ From 2170b21c9046c6d17f2d987773606a08a0329456 Mon Sep 17 00:00:00 2001 From: Richard Rogers Date: Thu, 10 Feb 2022 14:13:22 -0800 Subject: [PATCH 03/15] smoke test debugging --- java/cli/build.gradle.kts | 8 +- java/core/build.gradle.kts | 8 +- java/gradle/wrapper/gradle-wrapper.properties | 2 +- java/gradlew.bat | 206 +++++++++--------- java/smoketest/build.gradle | 15 +- java/smoketest/settings.gradle | 0 .../src/main/java/smoketest/SmokeTest.java | 8 + .../src/main/java/smoketest/smoketest.java | 8 - java/spark/build.gradle.kts | 8 +- 9 files changed, 137 insertions(+), 126 deletions(-) create mode 100644 java/smoketest/settings.gradle create mode 100644 java/smoketest/src/main/java/smoketest/SmokeTest.java delete mode 100644 java/smoketest/src/main/java/smoketest/smoketest.java diff --git a/java/cli/build.gradle.kts b/java/cli/build.gradle.kts index 0afc9563f9..96db087528 100644 --- a/java/cli/build.gradle.kts +++ b/java/cli/build.gradle.kts @@ -40,12 +40,12 @@ dependencies { implementation("info.picocli:picocli:4.2.0") // lombok support - compileOnly("org.projectlombok:lombok:1.18.12") - annotationProcessor("org.projectlombok:lombok:1.18.12") + compileOnly("org.projectlombok:lombok:1.18.20") + annotationProcessor("org.projectlombok:lombok:1.18.20") annotationProcessor("info.picocli:picocli:4.2.0") - testCompileOnly("org.projectlombok:lombok:1.18.12") - testAnnotationProcessor("org.projectlombok:lombok:1.18.12") + testCompileOnly("org.projectlombok:lombok:1.18.20") + testAnnotationProcessor("org.projectlombok:lombok:1.18.20") // testng testImplementation("org.testng:testng:6.8") diff --git a/java/core/build.gradle.kts b/java/core/build.gradle.kts index a523fadb17..f6c109ee90 100644 --- a/java/core/build.gradle.kts +++ b/java/core/build.gradle.kts @@ -44,10 +44,10 @@ dependencies { api("com.google.code.findbugs:jsr305:3.0.2") // lombok support - compileOnly("org.projectlombok:lombok:1.18.12") - annotationProcessor("org.projectlombok:lombok:1.18.12") - testCompileOnly("org.projectlombok:lombok:1.18.12") - testAnnotationProcessor("org.projectlombok:lombok:1.18.12") + compileOnly("org.projectlombok:lombok:1.18.20") + annotationProcessor("org.projectlombok:lombok:1.18.20") + testCompileOnly("org.projectlombok:lombok:1.18.20") + testAnnotationProcessor("org.projectlombok:lombok:1.18.20") // testng testImplementation("org.testng:testng:6.8") diff --git a/java/gradle/wrapper/gradle-wrapper.properties b/java/gradle/wrapper/gradle-wrapper.properties index a4b4429748..2e6e5897b5 100644 --- a/java/gradle/wrapper/gradle-wrapper.properties +++ b/java/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/java/gradlew.bat b/java/gradlew.bat index 62bd9b9cce..9109989e3c 100644 --- a/java/gradlew.bat +++ b/java/gradlew.bat @@ -1,103 +1,103 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/java/smoketest/build.gradle b/java/smoketest/build.gradle index 739781fdcb..7ec60ef6ec 100644 --- a/java/smoketest/build.gradle +++ b/java/smoketest/build.gradle @@ -1,7 +1,13 @@ apply plugin: 'java' +apply plugin: 'application' -repostiores { +mainClassName = 'SmokeTest' + +repositories { + flatDir { + dirs '../build/libs', '../cli/build/libs', '../core/build/libs' + } mavenCentral() } @@ -9,5 +15,10 @@ sourceCompatibility = 1.8 targetCompatibility = 1.8 dependencies { - implementation "ai.whylabs:whylogs-core:0.1.7-b2" + implementation "ai.whylabs:core:0.1.7-b2" + + // lombok support + compileOnly("org.projectlombok:lombok:1.18.20") + annotationProcessor("org.projectlombok:lombok:1.18.20") + annotationProcessor("info.picocli:picocli:4.2.0") } diff --git a/java/smoketest/settings.gradle b/java/smoketest/settings.gradle new file mode 100644 index 0000000000..e69de29bb2 diff --git a/java/smoketest/src/main/java/smoketest/SmokeTest.java b/java/smoketest/src/main/java/smoketest/SmokeTest.java new file mode 100644 index 0000000000..2114723ef4 --- /dev/null +++ b/java/smoketest/src/main/java/smoketest/SmokeTest.java @@ -0,0 +1,8 @@ +import com.whylogs.core.DatasetProfile; +import java.time.Instant; + +public class SmokeTest { + public static void main(String[] args) { + DatasetProfile dsp = new DatasetProfile("test", Instant.now()); + } +} diff --git a/java/smoketest/src/main/java/smoketest/smoketest.java b/java/smoketest/src/main/java/smoketest/smoketest.java deleted file mode 100644 index e5ba0d4b24..0000000000 --- a/java/smoketest/src/main/java/smoketest/smoketest.java +++ /dev/null @@ -1,8 +0,0 @@ -import com.whylogs.core; -import java.time.Instant; - -public class SmokeTest { - public static void main(String[] args) { - val dsp = new DatasetProfile("test", Instant.now()); - } -} diff --git a/java/spark/build.gradle.kts b/java/spark/build.gradle.kts index 7051d65ba7..7bf5b7f255 100644 --- a/java/spark/build.gradle.kts +++ b/java/spark/build.gradle.kts @@ -82,10 +82,10 @@ dependencies { implementation("com.squareup.okhttp3:okhttp:4.9.1") // lombok support - compileOnly("org.projectlombok:lombok:1.18.12") - annotationProcessor("org.projectlombok:lombok:1.18.12") - testCompileOnly("org.projectlombok:lombok:1.18.12") - testAnnotationProcessor("org.projectlombok:lombok:1.18.12") + compileOnly("org.projectlombok:lombok:1.18.20") + annotationProcessor("org.projectlombok:lombok:1.18.20") + testCompileOnly("org.projectlombok:lombok:1.18.20") + testAnnotationProcessor("org.projectlombok:lombok:1.18.20") // testng testImplementation("org.testng:testng:6.8") From 248f446ce5cdd4d7bc7281b9c91d180fab5e2149 Mon Sep 17 00:00:00 2001 From: Richard Rogers Date: Thu, 10 Feb 2022 14:21:41 -0800 Subject: [PATCH 04/15] add smoketest to workflow --- .github/workflows/java-continuous-integration.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/java-continuous-integration.yml b/.github/workflows/java-continuous-integration.yml index 1b83694f81..27f6dfa531 100644 --- a/.github/workflows/java-continuous-integration.yml +++ b/.github/workflows/java-continuous-integration.yml @@ -37,3 +37,8 @@ jobs: with: build-root-directory: java arguments: build + - name: Smoke test jar in client environment + uses: eskatos/gradle-command-action@v1 + with: + build-root-directory: java/smoketest + arguments: run From 33f82ad5c2ff32654737430bc750eca42db63690 Mon Sep 17 00:00:00 2001 From: Richard Rogers Date: Thu, 10 Feb 2022 14:46:14 -0800 Subject: [PATCH 05/15] gradle bug workaround --- java/spark/build.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/java/spark/build.gradle.kts b/java/spark/build.gradle.kts index 7bf5b7f255..8115c8f09a 100644 --- a/java/spark/build.gradle.kts +++ b/java/spark/build.gradle.kts @@ -60,6 +60,7 @@ val javadocJar by tasks.creating(Jar::class) { val sourcesJar by tasks.creating(Jar::class) { archiveBaseName.set("${rootProject.name}-spark") archiveClassifier.set("sources") + duplicatesStrategy.set("include") from(sourceSets["main"].allSource) } From 277ddd6c5e4dfce881d23832443f0e35d210bdf3 Mon Sep 17 00:00:00 2001 From: Richard Rogers Date: Fri, 11 Feb 2022 01:31:32 -0800 Subject: [PATCH 06/15] alternate gradle bug fix --- java/spark/build.gradle.kts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java/spark/build.gradle.kts b/java/spark/build.gradle.kts index 8115c8f09a..3a07505ee5 100644 --- a/java/spark/build.gradle.kts +++ b/java/spark/build.gradle.kts @@ -27,6 +27,10 @@ tasks.jar { archiveBaseName.set(artifactBaseName) } +tasks.withType { + duplicatesStrategy = DuplicatesStrategy.INCLUDE +} + fun scalaPackage(groupId: String, name: String, version: String) = "$groupId:${name}_$scalaVersion:$version" @@ -60,7 +64,6 @@ val javadocJar by tasks.creating(Jar::class) { val sourcesJar by tasks.creating(Jar::class) { archiveBaseName.set("${rootProject.name}-spark") archiveClassifier.set("sources") - duplicatesStrategy.set("include") from(sourceSets["main"].allSource) } From ce9406cf69412ec0bea149c5504d7dbfe4f5fd34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andy=20Dang=F0=9F=A4=96?= Date: Fri, 11 Feb 2022 10:51:23 -0800 Subject: [PATCH 07/15] Bump scalatest to 0.31 to work with gradle 7.x --- java/spark/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/spark/build.gradle.kts b/java/spark/build.gradle.kts index 3a07505ee5..84e1eeedf7 100644 --- a/java/spark/build.gradle.kts +++ b/java/spark/build.gradle.kts @@ -3,7 +3,7 @@ plugins { `java-library` signing `maven-publish` - id("com.github.maiflai.scalatest") version "0.26" + id("com.github.maiflai.scalatest") version "0.31" } repositories { From 0ff76749db8d8fe97eee152f6d49178989d16050 Mon Sep 17 00:00:00 2001 From: Richard Rogers Date: Fri, 11 Feb 2022 11:54:13 -0800 Subject: [PATCH 08/15] specify gradle location --- .github/workflows/java-continuous-integration.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/java-continuous-integration.yml b/.github/workflows/java-continuous-integration.yml index 27f6dfa531..810f3927e8 100644 --- a/.github/workflows/java-continuous-integration.yml +++ b/.github/workflows/java-continuous-integration.yml @@ -41,4 +41,5 @@ jobs: uses: eskatos/gradle-command-action@v1 with: build-root-directory: java/smoketest + gradle-executable: java/gradle arguments: run From 785ff5c64abe38e7946788d09718ca00ff644778 Mon Sep 17 00:00:00 2001 From: Richard Rogers Date: Fri, 11 Feb 2022 12:36:50 -0800 Subject: [PATCH 09/15] try gradle-biuld-action --- .github/workflows/java-continuous-integration.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/java-continuous-integration.yml b/.github/workflows/java-continuous-integration.yml index 810f3927e8..5274e4d8db 100644 --- a/.github/workflows/java-continuous-integration.yml +++ b/.github/workflows/java-continuous-integration.yml @@ -38,8 +38,7 @@ jobs: build-root-directory: java arguments: build - name: Smoke test jar in client environment - uses: eskatos/gradle-command-action@v1 + uses: gradle/gradle-build-action@v2 with: build-root-directory: java/smoketest - gradle-executable: java/gradle arguments: run From d4717d24bb8d74ad55817a36dcf533228e155ab2 Mon Sep 17 00:00:00 2001 From: Richard Rogers Date: Fri, 11 Feb 2022 12:44:45 -0800 Subject: [PATCH 10/15] specify gradle executable --- .github/workflows/java-continuous-integration.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/java-continuous-integration.yml b/.github/workflows/java-continuous-integration.yml index 5274e4d8db..f99ed017fb 100644 --- a/.github/workflows/java-continuous-integration.yml +++ b/.github/workflows/java-continuous-integration.yml @@ -42,3 +42,4 @@ jobs: with: build-root-directory: java/smoketest arguments: run + gradle-executable: java/gradlew From 3e68e68b2b6b050e7dfc0d21f505333f3049ccef Mon Sep 17 00:00:00 2001 From: Richard Rogers Date: Fri, 11 Feb 2022 16:01:48 -0800 Subject: [PATCH 11/15] Exercise protobuf --- java/smoketest/src/main/java/smoketest/SmokeTest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/java/smoketest/src/main/java/smoketest/SmokeTest.java b/java/smoketest/src/main/java/smoketest/SmokeTest.java index 2114723ef4..1a7586d81a 100644 --- a/java/smoketest/src/main/java/smoketest/SmokeTest.java +++ b/java/smoketest/src/main/java/smoketest/SmokeTest.java @@ -1,8 +1,11 @@ import com.whylogs.core.DatasetProfile; +import com.whylogs.core.statistics.NumberTracker; import java.time.Instant; public class SmokeTest { public static void main(String[] args) { DatasetProfile dsp = new DatasetProfile("test", Instant.now()); + NumberTracker tracker = new NumberTracker(); + val protobuf = tracker.toProtobuf(); } } From e6c45485080dbbacedf6524a3b1861c13049f455 Mon Sep 17 00:00:00 2001 From: Richard Rogers Date: Fri, 11 Feb 2022 16:07:35 -0800 Subject: [PATCH 12/15] import message type --- java/smoketest/src/main/java/smoketest/SmokeTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java/smoketest/src/main/java/smoketest/SmokeTest.java b/java/smoketest/src/main/java/smoketest/SmokeTest.java index 1a7586d81a..45f5cbfe4d 100644 --- a/java/smoketest/src/main/java/smoketest/SmokeTest.java +++ b/java/smoketest/src/main/java/smoketest/SmokeTest.java @@ -1,11 +1,12 @@ import com.whylogs.core.DatasetProfile; import com.whylogs.core.statistics.NumberTracker; +import com.whylogs.core.message.NumbersMessage; import java.time.Instant; public class SmokeTest { public static void main(String[] args) { DatasetProfile dsp = new DatasetProfile("test", Instant.now()); NumberTracker tracker = new NumberTracker(); - val protobuf = tracker.toProtobuf(); + NumbersMessage.Builder protobuf = tracker.toProtobuf(); } } From 32b4c3168b4e0ee1f77b52ed778034a03cc30982 Mon Sep 17 00:00:00 2001 From: Richard Rogers Date: Fri, 11 Feb 2022 16:18:12 -0800 Subject: [PATCH 13/15] add dependencies --- java/smoketest/build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/java/smoketest/build.gradle b/java/smoketest/build.gradle index 7ec60ef6ec..21d5d2d30b 100644 --- a/java/smoketest/build.gradle +++ b/java/smoketest/build.gradle @@ -17,6 +17,9 @@ targetCompatibility = 1.8 dependencies { implementation "ai.whylabs:core:0.1.7-b2" + api("org.apache.datasketches:datasketches-java:1.3.0-incubating") + api("com.google.protobuf:protobuf-java:3.13.0") + // lombok support compileOnly("org.projectlombok:lombok:1.18.20") annotationProcessor("org.projectlombok:lombok:1.18.20") From a25284cbcc64bd40f096dc46e2bc88cf76063002 Mon Sep 17 00:00:00 2001 From: Richard Rogers Date: Fri, 11 Feb 2022 16:27:28 -0800 Subject: [PATCH 14/15] one more try... --- java/smoketest/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/smoketest/build.gradle b/java/smoketest/build.gradle index 21d5d2d30b..d35b6fcd27 100644 --- a/java/smoketest/build.gradle +++ b/java/smoketest/build.gradle @@ -17,8 +17,8 @@ targetCompatibility = 1.8 dependencies { implementation "ai.whylabs:core:0.1.7-b2" - api("org.apache.datasketches:datasketches-java:1.3.0-incubating") - api("com.google.protobuf:protobuf-java:3.13.0") + implementation "org.apache.datasketches:datasketches-java:1.3.0-incubating" + implementation "com.google.protobuf:protobuf-java:3.13.0" // lombok support compileOnly("org.projectlombok:lombok:1.18.20") From 50a9b48d79b3170b2eaeef72224d83783b666fe2 Mon Sep 17 00:00:00 2001 From: richard-rogers <93153899+richard-rogers@users.noreply.github.com> Date: Tue, 15 Feb 2022 00:51:37 -0800 Subject: [PATCH 15/15] Add smoketest to bumpversion config to enable version bumping --- java/.bumpversion.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/java/.bumpversion.cfg b/java/.bumpversion.cfg index 9bcad43e41..7976ed13af 100644 --- a/java/.bumpversion.cfg +++ b/java/.bumpversion.cfg @@ -14,3 +14,4 @@ values = rc [bumpversion:file:build.gradle.kts] +[bumpversion:file:smoketest/build.gradle]