diff --git a/.github/workflows/nebula-ci.yml b/.github/workflows/nebula-ci.yml index a101c8330..3890c0235 100644 --- a/.github/workflows/nebula-ci.yml +++ b/.github/workflows/nebula-ci.yml @@ -12,8 +12,8 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - # test against JDK 8 - java: [ 8 ] + # test against JDK 17 + java: [ 17 ] name: CI with Java ${{ matrix.java }} steps: - name: Setup Git diff --git a/.github/workflows/nebula-publish.yml b/.github/workflows/nebula-publish.yml index 0c1cfcb4c..65f7ffa9d 100644 --- a/.github/workflows/nebula-publish.yml +++ b/.github/workflows/nebula-publish.yml @@ -20,7 +20,7 @@ jobs: - name: Setup jdk uses: actions/setup-java@v2 with: - java-version: 8 + java-version: 17 distribution: 'zulu' - name: Publish candidate if: contains(github.ref, '-rc.') diff --git a/.github/workflows/push-docker-image.yml b/.github/workflows/push-docker-image.yml index 9d6801be6..6152849a8 100644 --- a/.github/workflows/push-docker-image.yml +++ b/.github/workflows/push-docker-image.yml @@ -48,7 +48,7 @@ jobs: - name: Setup jdk uses: actions/setup-java@v1 with: - java-version: 8 + java-version: 17 - name: Generate dockerfiles uses: gradle/gradle-build-action@v2 diff --git a/build.gradle b/build.gradle index 858c9f102..59af45733 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ buildscript { classpath 'com.netflix.nebula:gradle-netflixoss-project-plugin:11.5.0' classpath 'com.netflix.nebula:nebula-dependency-recommender:11.+' classpath 'io.mantisrx:mantis-gradle-plugin:1.2.7' - classpath "io.freefair.gradle:lombok-plugin:6.+" + classpath "io.freefair.gradle:lombok-plugin:8.+" classpath 'eu.appsatori:gradle-fatjar-plugin:0.3' classpath("com.github.johnrengelman:shadow:8.1.1") classpath 'gradle.plugin.org.inferred:gradle-processors:3.3.0' @@ -47,6 +47,7 @@ ext.versions = [ junit5 : "5.4.+", mockito : "2.0.+", mockito3 : "3.+", + mockito5 : "5.+", spectator: "1.3.+", slf4j : "1.7.0", vavr : "0.9.2", @@ -78,9 +79,9 @@ ext.libraries = [ "org.junit.jupiter:junit-jupiter-params:${versions.junit5}", ], mantisShaded : "io.mantisrx:mantis-shaded:2.0.97", - mockitoAll : "org.mockito:mockito-all:${versions.mockito}", - mockitoCore : "org.mockito:mockito-core:${versions.mockito}", mockitoCore3 : "org.mockito:mockito-core:${versions.mockito3}", + mockitoCore : "org.mockito:mockito-core:${versions.mockito5}", + wiremockjre8 : "com.github.tomakehurst:wiremock-jre8:2.+", mockneat : "net.andreinc:mockneat:0.4.8", rxJava : "io.reactivex:rxjava:1.3.8", rxNettyShaded : "com.netflix:mantis-rxnetty:0.4.19.1", @@ -98,6 +99,12 @@ ext.libraries = [ allprojects { apply plugin: 'nebula.netflixoss' + + java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(17)) + } + } } def printAllReleasedArtifacts = project.tasks.create('printAllReleasedArtifacts') @@ -108,13 +115,13 @@ subprojects { // Apply lombok plugin. apply plugin: "io.freefair.lombok" lombok { - version = "1.18.20" + version = "1.18.36" } group = 'io.mantisrx' - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 if (project.hasProperty('useMavenLocal')) { repositories { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e5832f..e6441136f 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0d1842103..e2847c820 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index a69d9cb6c..b740cf133 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,11 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +131,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/gradlew.bat b/gradlew.bat index 53a6b238d..7101f8e46 100755 --- a/gradlew.bat +++ b/gradlew.bat @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -42,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -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. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -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. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/mantis-client/dependencies.lock b/mantis-client/dependencies.lock index dc7099155..a4be1bec0 100644 --- a/mantis-client/dependencies.lock +++ b/mantis-client/dependencies.lock @@ -1,185 +1,7 @@ { "annotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" - } - }, - "baseline-exact-dependencies-main": { - "com.github.spullara.cli-parser:cli-parser": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "1.1.1" - }, - "com.google.code.findbugs:jsr305": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "3.0.1" - }, - "com.netflix.spectator:spectator-api": { - "locked": "1.3.10" - }, - "com.netflix:mantis-rxnetty": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "0.4.19.1" - }, - "io.mantisrx:mantis-common": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core", - "io.mantisrx:mantis-network", - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-common-serde": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "project": true - }, - "io.mantisrx:mantis-control-plane-client": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-server-worker-client" - ], - "project": true - }, - "io.mantisrx:mantis-control-plane-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-client", - "io.mantisrx:mantis-server-worker-client" - ], - "project": true - }, - "io.mantisrx:mantis-network": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-remote-observable": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-client", - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-runtime": { - "project": true - }, - "io.mantisrx:mantis-server-worker-client": { - "project": true - }, - "io.mantisrx:mantis-shaded": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common", - "io.mantisrx:mantis-common-serde" - ], - "project": true - }, - "io.netty:netty-buffer": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-codec-http": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-handler": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-network" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-transport-native-epoll": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.reactivex:rxjava": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.3.8" - }, - "joda-time:joda-time": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "2.12.7" - }, - "org.apache.flink:flink-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "1.14.2" - }, - "org.apache.flink:flink-rpc-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "1.14.2" - }, - "org.hdrhistogram:HdrHistogram": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "2.1.12" - }, - "org.jctools:jctools-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.2.1" - }, - "org.json:json": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "20180813" - }, - "org.skife.config:config-magic": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "0.11" - }, - "org.slf4j:slf4j-api": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common", - "io.mantisrx:mantis-runtime" - ], - "locked": "1.7.15" - }, - "org.slf4j:slf4j-log4j12": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.7.0" - }, - "org.xerial.snappy:snappy-java": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.1.10.5" - } - }, - "baseline-exact-dependencies-test": { - "junit:junit": { - "locked": "4.11" - }, - "junit:junit-dep": { - "locked": "4.11" - }, - "org.mockito:mockito-core": { - "locked": "2.0.111-beta" + "locked": "1.18.36" } }, "compileClasspath": { @@ -291,7 +113,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "org.apache.flink:flink-core": { "firstLevelTransitive": [ @@ -309,7 +131,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -324,7 +146,7 @@ "locked": "20180813" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.skife.config:config-magic": { "firstLevelTransitive": [ @@ -349,12 +171,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "lombok": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "runtimeClasspath": { @@ -494,6 +316,7 @@ }, "io.vavr:vavr": { "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core", "io.mantisrx:mantis-shaded" ], "locked": "0.9.2" @@ -502,7 +325,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "net.jcip:jcip-annotations": { "firstLevelTransitive": [ @@ -510,6 +333,12 @@ ], "locked": "1.0" }, + "net.openhft:zero-allocation-hashing": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-network" + ], + "locked": "0.27ea0" + }, "org.apache.flink:flink-core": { "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" @@ -532,7 +361,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -571,12 +400,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testAnnotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "testCompileClasspath": { @@ -688,7 +517,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "junit:junit": { "locked": "4.11" @@ -712,7 +541,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -727,10 +556,10 @@ "locked": "20180813" }, "org.mockito:mockito-core": { - "locked": "2.0.111-beta" + "locked": "5.14.2" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.skife.config:config-magic": { "firstLevelTransitive": [ @@ -755,7 +584,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testRuntimeClasspath": { @@ -895,6 +724,7 @@ }, "io.vavr:vavr": { "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core", "io.mantisrx:mantis-shaded" ], "locked": "0.9.2" @@ -903,7 +733,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "junit:junit": { "locked": "4.11" @@ -917,6 +747,12 @@ ], "locked": "1.0" }, + "net.openhft:zero-allocation-hashing": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-network" + ], + "locked": "0.27ea0" + }, "org.apache.flink:flink-core": { "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" @@ -939,7 +775,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -954,7 +790,7 @@ "locked": "20180813" }, "org.mockito:mockito-core": { - "locked": "2.0.111-beta" + "locked": "5.14.2" }, "org.skife.config:config-magic": { "firstLevelTransitive": [ @@ -981,7 +817,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } } } \ No newline at end of file diff --git a/mantis-common-serde/dependencies.lock b/mantis-common-serde/dependencies.lock index 03f5eacc4..5bc3ed179 100644 --- a/mantis-common-serde/dependencies.lock +++ b/mantis-common-serde/dependencies.lock @@ -1,7 +1,7 @@ { "annotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "compileClasspath": { @@ -9,12 +9,12 @@ "project": true }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "lombok": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "runtimeClasspath": { @@ -30,7 +30,7 @@ }, "testAnnotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "testCompileClasspath": { @@ -38,7 +38,7 @@ "project": true }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "testRuntimeClasspath": { diff --git a/mantis-common/dependencies.lock b/mantis-common/dependencies.lock index 9aa55656a..1796730c0 100644 --- a/mantis-common/dependencies.lock +++ b/mantis-common/dependencies.lock @@ -1,114 +1,7 @@ { "annotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" - } - }, - "baseline-exact-dependencies-main": { - "commons-io:commons-io": { - "locked": "2.11.0" - }, - "net.jcip:jcip-annotations": { - "locked": "1.0" - } - }, - "baseline-exact-dependencies-test": { - "com.google.code.findbugs:jsr305": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "3.0.1" - }, - "com.netflix.spectator:spectator-api": { - "locked": "1.3.10" - }, - "com.netflix:mantis-rxnetty": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "0.4.19.1" - }, - "io.mantisrx:mantis-common": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "project": true - }, - "io.mantisrx:mantis-common-serde": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "project": true - }, - "io.mantisrx:mantis-shaded": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common", - "io.mantisrx:mantis-common-serde" - ], - "project": true - }, - "io.netty:netty-buffer": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-codec-http": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-transport-native-epoll": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.reactivex:rxjava": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.3.8" - }, - "junit:junit": { - "locked": "4.11" - }, - "junit:junit-dep": { - "locked": "4.11" - }, - "org.apache.commons:commons-lang3": { - "locked": "3.5" - }, - "org.hamcrest:hamcrest-core": { - "locked": "1.3" - }, - "org.jctools:jctools-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.2.1" - }, - "org.mockito:mockito-core": { - "locked": "2.0.111-beta" - }, - "org.slf4j:slf4j-api": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.7.6" - }, - "org.slf4j:slf4j-log4j12": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.7.0" - }, - "org.xerial.snappy:snappy-java": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.1.10.5" + "locked": "1.18.36" } }, "compileClasspath": { @@ -152,7 +45,7 @@ "locked": "1.2.1" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.slf4j:slf4j-api": { "locked": "1.7.6" @@ -161,12 +54,12 @@ "locked": "1.7.0" }, "org.xerial.snappy:snappy-java": { - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "lombok": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "runtimeClasspath": { @@ -219,12 +112,12 @@ "locked": "1.7.0" }, "org.xerial.snappy:snappy-java": { - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testAnnotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "testCompileClasspath": { @@ -311,10 +204,10 @@ "locked": "1.2.1" }, "org.mockito:mockito-core": { - "locked": "2.0.111-beta" + "locked": "5.14.2" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -332,12 +225,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testFixturesAnnotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "testFixturesCompileClasspath": { @@ -400,7 +293,7 @@ "locked": "1.2.1" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -418,7 +311,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testFixturesRuntimeClasspath": { @@ -514,7 +407,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testRuntimeClasspath": { @@ -613,7 +506,7 @@ "locked": "1.2.1" }, "org.mockito:mockito-core": { - "locked": "2.0.111-beta" + "locked": "5.14.2" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -631,7 +524,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } } } \ No newline at end of file diff --git a/mantis-common/src/test/java/io/reactivx/mantis/operators/OperatorGroupByTest.java b/mantis-common/src/test/java/io/reactivx/mantis/operators/OperatorGroupByTest.java index a6347010f..17af049b9 100644 --- a/mantis-common/src/test/java/io/reactivx/mantis/operators/OperatorGroupByTest.java +++ b/mantis-common/src/test/java/io/reactivx/mantis/operators/OperatorGroupByTest.java @@ -19,8 +19,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -37,7 +37,7 @@ import java.util.concurrent.atomic.AtomicReference; import org.junit.Before; import org.junit.Test; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.mockito.MockitoAnnotations; import rx.Notification; import rx.Observable; @@ -1045,8 +1045,8 @@ public void testGroupByOnAsynchronousSourceAcceptsMultipleSubscriptions() throws stream.subscribe(o2); // check that subscriptions were successful - verify(o1, never()).onError(Matchers.any()); - verify(o2, never()).onError(Matchers.any()); + verify(o1, never()).onError(ArgumentMatchers.any()); + verify(o2, never()).onError(ArgumentMatchers.any()); } @Test @@ -1351,4 +1351,4 @@ public String toString() { } } -} \ No newline at end of file +} diff --git a/mantis-connectors/mantis-connector-iceberg/dependencies.lock b/mantis-connectors/mantis-connector-iceberg/dependencies.lock index 7a84c4a4b..3cfb9f30a 100644 --- a/mantis-connectors/mantis-connector-iceberg/dependencies.lock +++ b/mantis-connectors/mantis-connector-iceberg/dependencies.lock @@ -1,32 +1,7 @@ { "annotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" - } - }, - "baseline-exact-dependencies-main": { - "org.slf4j:slf4j-api": { - "locked": "1.7.0" - } - }, - "baseline-exact-dependencies-test": { - "com.netflix.spectator:spectator-api": { - "locked": "1.3.10" - }, - "org.junit.jupiter:junit-jupiter-api": { - "locked": "5.4.2" - }, - "org.junit.jupiter:junit-jupiter-engine": { - "locked": "5.4.2" - }, - "org.junit.jupiter:junit-jupiter-params": { - "locked": "5.4.2" - }, - "org.mockito:mockito-core": { - "locked": "2.0.111-beta" - }, - "org.slf4j:slf4j-log4j12": { - "locked": "1.7.0" + "locked": "1.18.36" } }, "compileClasspath": { @@ -135,7 +110,7 @@ "locked": "1.2.1" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -154,12 +129,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "lombok": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "runtimeClasspath": { @@ -272,6 +247,12 @@ ], "locked": "1.0" }, + "net.openhft:zero-allocation-hashing": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-network" + ], + "locked": "0.27ea0" + }, "org.apache.hadoop:hadoop-common": { "locked": "2.7.3" }, @@ -300,12 +281,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testAnnotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "testCompileClasspath": { @@ -426,10 +407,10 @@ "locked": "5.4.2" }, "org.mockito:mockito-core": { - "locked": "2.0.111-beta" + "locked": "5.14.2" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -448,7 +429,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testRuntimeClasspath": { @@ -564,6 +545,12 @@ ], "locked": "1.0" }, + "net.openhft:zero-allocation-hashing": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-network" + ], + "locked": "0.27ea0" + }, "org.apache.avro:avro": { "locked": "1.10.2" }, @@ -601,10 +588,10 @@ "locked": "5.4.2" }, "org.mockito:mockito-core": { - "locked": "2.0.111-beta" + "locked": "5.14.2" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -625,7 +612,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } } } \ No newline at end of file diff --git a/mantis-connectors/mantis-connector-job-source/dependencies.lock b/mantis-connectors/mantis-connector-job-source/dependencies.lock index f4660feaf..042e71003 100644 --- a/mantis-connectors/mantis-connector-job-source/dependencies.lock +++ b/mantis-connectors/mantis-connector-job-source/dependencies.lock @@ -1,10 +1,10 @@ { "annotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, - "baseline-exact-dependencies-main": { + "compileClasspath": { "com.github.spullara.cli-parser:cli-parser": { "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" @@ -24,7 +24,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ @@ -55,190 +55,15 @@ ], "project": true }, - "io.mantisrx:mantis-control-plane-core": { - "project": true - }, - "io.mantisrx:mantis-discovery-proto": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-publish-core" - ], - "project": true - }, - "io.mantisrx:mantis-network": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-publish-core": { - "project": true - }, - "io.mantisrx:mantis-remote-observable": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-runtime": { - "project": true - }, - "io.mantisrx:mantis-shaded": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common", - "io.mantisrx:mantis-common-serde", - "io.mantisrx:mantis-discovery-proto" - ], - "project": true - }, - "io.netty:netty-buffer": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-codec-http": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-handler": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-network" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-transport-native-epoll": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.reactivex:rxjava": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.3.8" - }, - "io.vavr:vavr": { - "locked": "0.9.2" - }, - "joda-time:joda-time": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "2.12.7" - }, - "org.apache.flink:flink-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "1.14.2" - }, - "org.apache.flink:flink-rpc-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "1.14.2" - }, - "org.hdrhistogram:HdrHistogram": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "2.1.12" - }, - "org.jctools:jctools-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.2.1" - }, - "org.json:json": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "20180813" - }, - "org.skife.config:config-magic": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "0.11" - }, - "org.slf4j:slf4j-api": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common", - "io.mantisrx:mantis-runtime" - ], - "locked": "1.7.15" - }, - "org.slf4j:slf4j-log4j12": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.7.0" - }, - "org.xerial.snappy:snappy-java": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.1.10.5" - } - }, - "compileClasspath": { - "com.github.spullara.cli-parser:cli-parser": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "1.1.1" - }, - "com.google.code.findbugs:jsr305": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "3.0.1" - }, - "com.google.code.gson:gson": { - "locked": "2.8.9" - }, - "com.netflix.archaius:archaius2-api": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-publish-core" - ], - "locked": "2.7.9" - }, - "com.netflix.spectator:spectator-api": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-publish-core" - ], - "locked": "0.134.0" - }, - "com.netflix:mantis-rxnetty": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "0.4.19.1" - }, - "io.mantisrx:mantis-client": { - "project": true - }, - "io.mantisrx:mantis-common": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core", - "io.mantisrx:mantis-network", - "io.mantisrx:mantis-runtime" - ], + "io.mantisrx:mantis-control-plane-client": { "project": true }, - "io.mantisrx:mantis-common-serde": { + "io.mantisrx:mantis-control-plane-core": { "firstLevelTransitive": [ - "io.mantisrx:mantis-common" + "io.mantisrx:mantis-control-plane-client" ], "project": true }, - "io.mantisrx:mantis-control-plane-core": { - "project": true - }, "io.mantisrx:mantis-discovery-proto": { "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" @@ -256,6 +81,7 @@ }, "io.mantisrx:mantis-remote-observable": { "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-client", "io.mantisrx:mantis-runtime" ], "project": true @@ -308,7 +134,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "org.apache.flink:flink-core": { "firstLevelTransitive": [ @@ -326,7 +152,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -341,7 +167,7 @@ "locked": "20180813" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.skife.config:config-magic": { "firstLevelTransitive": [ @@ -366,12 +192,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "lombok": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "runtimeClasspath": { @@ -394,13 +220,13 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.archaius:archaius2-core": { "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.rxjava:rxjava-math": { "firstLevelTransitive": [ @@ -556,6 +382,7 @@ }, "io.vavr:vavr": { "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core", "io.mantisrx:mantis-shaded" ], "locked": "0.9.2" @@ -564,7 +391,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "net.jcip:jcip-annotations": { "firstLevelTransitive": [ @@ -572,6 +399,12 @@ ], "locked": "1.0" }, + "net.openhft:zero-allocation-hashing": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-network" + ], + "locked": "0.27ea0" + }, "org.apache.flink:flink-core": { "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" @@ -594,7 +427,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -635,12 +468,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testAnnotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "testCompileClasspath": { @@ -663,7 +496,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ @@ -694,7 +527,13 @@ ], "project": true }, + "io.mantisrx:mantis-control-plane-client": { + "project": true + }, "io.mantisrx:mantis-control-plane-core": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-client" + ], "project": true }, "io.mantisrx:mantis-discovery-proto": { @@ -714,6 +553,7 @@ }, "io.mantisrx:mantis-remote-observable": { "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-client", "io.mantisrx:mantis-runtime" ], "project": true @@ -766,7 +606,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "org.apache.flink:flink-core": { "firstLevelTransitive": [ @@ -784,7 +624,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -799,7 +639,7 @@ "locked": "20180813" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.skife.config:config-magic": { "firstLevelTransitive": [ @@ -824,7 +664,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testRuntimeClasspath": { @@ -847,13 +687,13 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.archaius:archaius2-core": { "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.rxjava:rxjava-math": { "firstLevelTransitive": [ @@ -1009,6 +849,7 @@ }, "io.vavr:vavr": { "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core", "io.mantisrx:mantis-shaded" ], "locked": "0.9.2" @@ -1017,7 +858,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "net.jcip:jcip-annotations": { "firstLevelTransitive": [ @@ -1025,6 +866,12 @@ ], "locked": "1.0" }, + "net.openhft:zero-allocation-hashing": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-network" + ], + "locked": "0.27ea0" + }, "org.apache.flink:flink-core": { "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" @@ -1047,7 +894,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -1088,7 +935,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } } } \ No newline at end of file diff --git a/mantis-connectors/mantis-connector-kafka/build.gradle b/mantis-connectors/mantis-connector-kafka/build.gradle index 58d623b50..15abddc69 100644 --- a/mantis-connectors/mantis-connector-kafka/build.gradle +++ b/mantis-connectors/mantis-connector-kafka/build.gradle @@ -33,7 +33,7 @@ dependencies { testImplementation libraries.junit4 testImplementation project(':mantis-runtime').sourceSets.test.output - testImplementation libraries.mockitoAll - testImplementation "com.github.tomakehurst:wiremock-jre8:2.21.0" + testImplementation libraries.mockitoCore + testImplementation libraries.wiremockjre8 testCompileOnly "com.netflix.archaius:archaius2-core:$archaiusVersion" } diff --git a/mantis-connectors/mantis-connector-kafka/dependencies.lock b/mantis-connectors/mantis-connector-kafka/dependencies.lock index 145aef4c8..a85892443 100644 --- a/mantis-connectors/mantis-connector-kafka/dependencies.lock +++ b/mantis-connectors/mantis-connector-kafka/dependencies.lock @@ -1,125 +1,7 @@ { "annotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" - } - }, - "baseline-exact-dependencies-main": { - "com.google.code.findbugs:jsr305": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "3.0.1" - }, - "com.netflix:mantis-rxnetty": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "0.4.19.1" - }, - "io.mantisrx:mantis-common": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-network", - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-common-serde": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "project": true - }, - "io.mantisrx:mantis-network": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-remote-observable": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-runtime": { - "project": true - }, - "io.mantisrx:mantis-shaded": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common", - "io.mantisrx:mantis-common-serde" - ], - "project": true - }, - "io.netty:netty-buffer": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-codec-http": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-handler": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-network" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-transport-native-epoll": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.reactivex:rxjava": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.3.8" - }, - "org.jctools:jctools-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.2.1" - }, - "org.slf4j:slf4j-api": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common", - "io.mantisrx:mantis-runtime" - ], - "locked": "1.7.6" - }, - "org.slf4j:slf4j-log4j12": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.7.0" - }, - "org.xerial.snappy:snappy-java": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.1.10.5" - } - }, - "baseline-exact-dependencies-test": { - "com.github.tomakehurst:wiremock-jre8": { - "locked": "2.21.0" - }, - "junit:junit": { - "locked": "4.12" - }, - "junit:junit-dep": { - "locked": "4.11" - }, - "org.mockito:mockito-all": { - "locked": "2.0.2-beta" + "locked": "1.18.36" } }, "compileClasspath": { @@ -219,7 +101,7 @@ "locked": "1.2.1" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -238,12 +120,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "lombok": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "runtimeClasspath": { @@ -365,6 +247,12 @@ ], "locked": "1.0" }, + "net.openhft:zero-allocation-hashing": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-network" + ], + "locked": "0.27ea0" + }, "org.apache.kafka:kafka-clients": { "locked": "2.2.2" }, @@ -393,17 +281,17 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testAnnotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "testCompileClasspath": { "com.github.tomakehurst:wiremock-jre8": { - "locked": "2.21.0" + "locked": "2.35.2" }, "com.google.code.findbugs:jsr305": { "firstLevelTransitive": [ @@ -492,7 +380,7 @@ "locked": "1.3.8" }, "junit:junit": { - "locked": "4.12" + "locked": "4.11" }, "junit:junit-dep": { "locked": "4.11" @@ -506,18 +394,18 @@ ], "locked": "1.2.1" }, - "org.mockito:mockito-all": { - "locked": "2.0.2-beta" + "org.mockito:mockito-core": { + "locked": "5.14.2" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ "io.mantisrx:mantis-common", "io.mantisrx:mantis-runtime" ], - "locked": "1.7.25" + "locked": "1.7.33" }, "org.slf4j:slf4j-log4j12": { "firstLevelTransitive": [ @@ -529,12 +417,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testRuntimeClasspath": { "com.github.tomakehurst:wiremock-jre8": { - "locked": "2.21.0" + "locked": "2.35.2" }, "com.google.code.findbugs:jsr305": { "firstLevelTransitive": [ @@ -649,7 +537,7 @@ "locked": "0.9.2" }, "junit:junit": { - "locked": "4.12" + "locked": "4.11" }, "junit:junit-dep": { "locked": "4.11" @@ -660,6 +548,12 @@ ], "locked": "1.0" }, + "net.openhft:zero-allocation-hashing": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-network" + ], + "locked": "0.27ea0" + }, "org.apache.kafka:kafka-clients": { "locked": "2.2.2" }, @@ -669,8 +563,8 @@ ], "locked": "1.2.1" }, - "org.mockito:mockito-all": { - "locked": "2.0.2-beta" + "org.mockito:mockito-core": { + "locked": "5.14.2" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -691,7 +585,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } } } \ No newline at end of file diff --git a/mantis-connectors/mantis-connector-publish/dependencies.lock b/mantis-connectors/mantis-connector-publish/dependencies.lock index e465408a5..7cb0a8f0b 100644 --- a/mantis-connectors/mantis-connector-publish/dependencies.lock +++ b/mantis-connectors/mantis-connector-publish/dependencies.lock @@ -1,122 +1,7 @@ { "annotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" - } - }, - "baseline-exact-dependencies-main": { - "com.google.code.findbugs:jsr305": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "3.0.1" - }, - "com.netflix:mantis-rxnetty": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "0.4.19.1" - }, - "io.mantisrx:mantis-common": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-network", - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-common-serde": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "project": true - }, - "io.mantisrx:mantis-network": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-remote-observable": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-runtime": { - "project": true - }, - "io.mantisrx:mantis-shaded": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common", - "io.mantisrx:mantis-common-serde" - ], - "project": true - }, - "io.netty:netty-buffer": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-codec-http": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-handler": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-network" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-transport-native-epoll": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.reactivex:rxjava": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.3.8" - }, - "org.jctools:jctools-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.2.1" - }, - "org.slf4j:slf4j-api": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common", - "io.mantisrx:mantis-runtime" - ], - "locked": "1.7.6" - }, - "org.slf4j:slf4j-log4j12": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.7.0" - }, - "org.xerial.snappy:snappy-java": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.1.10.5" - } - }, - "baseline-exact-dependencies-test": { - "org.junit.jupiter:junit-jupiter-api": { - "locked": "5.4.2" - }, - "org.junit.jupiter:junit-jupiter-engine": { - "locked": "5.4.2" - }, - "org.junit.jupiter:junit-jupiter-params": { - "locked": "5.4.2" + "locked": "1.18.36" } }, "compileClasspath": { @@ -136,7 +21,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ @@ -233,7 +118,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "org.apache.flink:flink-core": { "firstLevelTransitive": [ @@ -251,7 +136,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -266,7 +151,7 @@ "locked": "20180813" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.skife.config:config-magic": { "firstLevelTransitive": [ @@ -291,12 +176,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "lombok": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "runtimeClasspath": { @@ -316,13 +201,13 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.archaius:archaius2-core": { "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.rxjava:rxjava-math": { "firstLevelTransitive": [ @@ -446,6 +331,7 @@ }, "io.vavr:vavr": { "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core", "io.mantisrx:mantis-shaded" ], "locked": "0.9.2" @@ -454,7 +340,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "net.jcip:jcip-annotations": { "firstLevelTransitive": [ @@ -462,6 +348,12 @@ ], "locked": "1.0" }, + "net.openhft:zero-allocation-hashing": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-network" + ], + "locked": "0.27ea0" + }, "org.apache.flink:flink-core": { "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" @@ -478,7 +370,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -518,12 +410,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testAnnotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "testCompileClasspath": { @@ -543,7 +435,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ @@ -640,7 +532,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "org.apache.flink:flink-core": { "firstLevelTransitive": [ @@ -658,7 +550,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -682,7 +574,7 @@ "locked": "5.4.2" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.skife.config:config-magic": { "firstLevelTransitive": [ @@ -707,7 +599,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testRuntimeClasspath": { @@ -727,13 +619,13 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.archaius:archaius2-core": { "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.rxjava:rxjava-math": { "firstLevelTransitive": [ @@ -857,6 +749,7 @@ }, "io.vavr:vavr": { "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core", "io.mantisrx:mantis-shaded" ], "locked": "0.9.2" @@ -865,7 +758,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "net.jcip:jcip-annotations": { "firstLevelTransitive": [ @@ -873,6 +766,12 @@ ], "locked": "1.0" }, + "net.openhft:zero-allocation-hashing": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-network" + ], + "locked": "0.27ea0" + }, "org.apache.flink:flink-core": { "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" @@ -889,7 +788,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -938,7 +837,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } } } \ No newline at end of file diff --git a/mantis-control-plane/mantis-control-plane-client/build.gradle b/mantis-control-plane/mantis-control-plane-client/build.gradle index fb4764d44..aa727efd7 100644 --- a/mantis-control-plane/mantis-control-plane-client/build.gradle +++ b/mantis-control-plane/mantis-control-plane-client/build.gradle @@ -22,7 +22,7 @@ dependencies { api project(":mantis-remote-observable") testImplementation libraries.junit4 - testImplementation libraries.mockitoAll + testImplementation libraries.mockitoCore3 testImplementation libraries.spectatorApi testImplementation(testFixtures(project(":mantis-common"))) } @@ -33,3 +33,10 @@ tasks.named('compileJava') { tasks.named('delombok') { dependsOn project(':mantis-control-plane:mantis-control-plane-core').tasks.named('jar') } + +tasks.withType(Test) { + jvmArgs += [ + '--add-opens', 'java.base/java.lang=ALL-UNNAMED', + '--add-opens', 'java.base/java.util=ALL-UNNAMED' + ] +} diff --git a/mantis-control-plane/mantis-control-plane-client/dependencies.lock b/mantis-control-plane/mantis-control-plane-client/dependencies.lock index 52fb6ac04..fe2b7b9b1 100644 --- a/mantis-control-plane/mantis-control-plane-client/dependencies.lock +++ b/mantis-control-plane/mantis-control-plane-client/dependencies.lock @@ -1,108 +1,7 @@ { "annotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" - } - }, - "baseline-exact-dependencies-main": { - "com.spotify:completable-futures": { - "locked": "0.3.1" - }, - "org.asynchttpclient:async-http-client": { - "locked": "2.12.3" - } - }, - "baseline-exact-dependencies-test": { - "com.google.code.findbugs:jsr305": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "3.0.1" - }, - "com.netflix.spectator:spectator-api": { - "locked": "1.3.10" - }, - "com.netflix:mantis-rxnetty": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "0.4.19.1" - }, - "io.mantisrx:mantis-common": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "project": true - }, - "io.mantisrx:mantis-common-serde": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "project": true - }, - "io.mantisrx:mantis-shaded": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common", - "io.mantisrx:mantis-common-serde" - ], - "project": true - }, - "io.netty:netty-buffer": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-codec-http": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-transport-native-epoll": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.reactivex:rxjava": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.3.8" - }, - "junit:junit": { - "locked": "4.11" - }, - "junit:junit-dep": { - "locked": "4.11" - }, - "org.jctools:jctools-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.2.1" - }, - "org.mockito:mockito-all": { - "locked": "2.0.2-beta" - }, - "org.slf4j:slf4j-api": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.7.6" - }, - "org.slf4j:slf4j-log4j12": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.7.0" - }, - "org.xerial.snappy:snappy-java": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.1.10.5" + "locked": "1.18.36" } }, "compileClasspath": { @@ -180,7 +79,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "org.apache.flink:flink-core": { "firstLevelTransitive": [ @@ -201,7 +100,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -216,7 +115,7 @@ "locked": "20180813" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.skife.config:config-magic": { "firstLevelTransitive": [ @@ -240,12 +139,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "lombok": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "runtimeClasspath": { @@ -341,6 +240,7 @@ }, "io.vavr:vavr": { "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core", "io.mantisrx:mantis-shaded" ], "locked": "0.9.2" @@ -349,7 +249,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "net.jcip:jcip-annotations": { "firstLevelTransitive": [ @@ -376,7 +276,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -414,12 +314,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testAnnotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "testCompileClasspath": { @@ -501,7 +401,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "junit:junit": { "locked": "4.11" @@ -528,7 +428,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -542,11 +442,11 @@ ], "locked": "20180813" }, - "org.mockito:mockito-all": { - "locked": "2.0.2-beta" + "org.mockito:mockito-core": { + "locked": "3.12.4" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.skife.config:config-magic": { "firstLevelTransitive": [ @@ -570,7 +470,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testRuntimeClasspath": { @@ -670,6 +570,7 @@ }, "io.vavr:vavr": { "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core", "io.mantisrx:mantis-shaded" ], "locked": "0.9.2" @@ -678,7 +579,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "junit:junit": { "locked": "4.11" @@ -711,7 +612,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -725,8 +626,8 @@ ], "locked": "20180813" }, - "org.mockito:mockito-all": { - "locked": "2.0.2-beta" + "org.mockito:mockito-core": { + "locked": "3.12.4" }, "org.skife.config:config-magic": { "firstLevelTransitive": [ @@ -752,7 +653,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } } } \ No newline at end of file diff --git a/mantis-control-plane/mantis-control-plane-core/build.gradle b/mantis-control-plane/mantis-control-plane-core/build.gradle index 87cb1d6e7..a6a36ca55 100644 --- a/mantis-control-plane/mantis-control-plane-core/build.gradle +++ b/mantis-control-plane/mantis-control-plane-core/build.gradle @@ -44,7 +44,7 @@ dependencies { testFixturesImplementation libraries.flinkRpcImpl testImplementation libraries.junit4 - testImplementation libraries.mockitoAll + testImplementation libraries.mockitoCore } // This task makes flink-rpc-akka.jar available in mantis-control-plane-core classpath, diff --git a/mantis-control-plane/mantis-control-plane-core/dependencies.lock b/mantis-control-plane/mantis-control-plane-core/dependencies.lock index a4fba82f1..29d9c2560 100644 --- a/mantis-control-plane/mantis-control-plane-core/dependencies.lock +++ b/mantis-control-plane/mantis-control-plane-core/dependencies.lock @@ -1,155 +1,7 @@ { "annotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" - } - }, - "baseline-exact-dependencies-main": { - "commons-io:commons-io": { - "locked": "2.11.0" - } - }, - "baseline-exact-dependencies-test": { - "com.github.spullara.cli-parser:cli-parser": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "1.1.1" - }, - "com.google.code.findbugs:jsr305": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "3.0.1" - }, - "com.netflix:mantis-rxnetty": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "0.4.19.1" - }, - "io.mantisrx:mantis-common": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "project": true - }, - "io.mantisrx:mantis-common-serde": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "project": true - }, - "io.mantisrx:mantis-control-plane-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "project": true - }, - "io.mantisrx:mantis-shaded": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common", - "io.mantisrx:mantis-common-serde" - ], - "project": true - }, - "io.netty:netty-buffer": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-codec-http": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-transport-native-epoll": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.reactivex:rxjava": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.3.8" - }, - "joda-time:joda-time": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "2.12.7" - }, - "junit:junit": { - "locked": "4.11" - }, - "junit:junit-dep": { - "locked": "4.11" - }, - "org.apache.flink:flink-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "1.14.2" - }, - "org.apache.flink:flink-rpc-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "1.14.2" - }, - "org.hdrhistogram:HdrHistogram": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "2.1.12" - }, - "org.jctools:jctools-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.2.1" - }, - "org.json:json": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "20180813" - }, - "org.mockito:mockito-all": { - "locked": "2.0.2-beta" - }, - "org.skife.config:config-magic": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "0.11" - }, - "org.slf4j:slf4j-api": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.7.15" - }, - "org.slf4j:slf4j-log4j12": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.7.0" - }, - "org.xerial.snappy:snappy-java": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.1.10.5" - } - }, - "baseline-exact-dependencies-testFixtures": { - "org.apache.flink:flink-rpc-akka": { - "locked": "1.14.2" + "locked": "1.18.36" } }, "compileClasspath": { @@ -211,8 +63,11 @@ ], "locked": "1.3.8" }, + "io.vavr:vavr": { + "locked": "0.9.2" + }, "joda-time:joda-time": { - "locked": "2.12.7" + "locked": "2.13.0" }, "org.apache.flink:flink-core": { "locked": "1.14.2" @@ -224,7 +79,7 @@ "locked": "1.14.2" }, "org.hdrhistogram:HdrHistogram": { - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -236,7 +91,7 @@ "locked": "20180813" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.skife.config:config-magic": { "locked": "0.11" @@ -257,12 +112,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "lombok": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "runtimeClasspath": { @@ -334,7 +189,7 @@ "locked": "0.9.2" }, "joda-time:joda-time": { - "locked": "2.12.7" + "locked": "2.13.0" }, "net.jcip:jcip-annotations": { "firstLevelTransitive": [ @@ -349,7 +204,7 @@ "locked": "1.14.2" }, "org.hdrhistogram:HdrHistogram": { - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -379,12 +234,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testAnnotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "testCompileClasspath": { @@ -458,11 +313,14 @@ ], "locked": "1.3.8" }, + "io.vavr:vavr": { + "locked": "0.9.2" + }, "joda-time:joda-time": { "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "junit:junit": { "locked": "4.11" @@ -486,7 +344,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -500,11 +358,11 @@ ], "locked": "20180813" }, - "org.mockito:mockito-all": { - "locked": "2.0.2-beta" + "org.mockito:mockito-core": { + "locked": "5.14.2" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.skife.config:config-magic": { "firstLevelTransitive": [ @@ -528,12 +386,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testFixturesAnnotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "testFixturesCompileClasspath": { @@ -605,7 +463,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "org.apache.flink:flink-core": { "firstLevelTransitive": [ @@ -626,7 +484,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -641,7 +499,7 @@ "locked": "20180813" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.skife.config:config-magic": { "firstLevelTransitive": [ @@ -665,7 +523,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testFixturesRuntimeClasspath": { @@ -742,6 +600,7 @@ }, "io.vavr:vavr": { "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core", "io.mantisrx:mantis-shaded" ], "locked": "0.9.2" @@ -750,7 +609,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "net.jcip:jcip-annotations": { "firstLevelTransitive": [ @@ -777,7 +636,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -813,7 +672,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testRuntimeClasspath": { @@ -893,6 +752,7 @@ }, "io.vavr:vavr": { "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core", "io.mantisrx:mantis-shaded" ], "locked": "0.9.2" @@ -901,7 +761,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "junit:junit": { "locked": "4.11" @@ -937,7 +797,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -951,8 +811,8 @@ ], "locked": "20180813" }, - "org.mockito:mockito-all": { - "locked": "2.0.2-beta" + "org.mockito:mockito-core": { + "locked": "5.14.2" }, "org.skife.config:config-magic": { "firstLevelTransitive": [ @@ -976,7 +836,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } } } \ No newline at end of file diff --git a/mantis-control-plane/mantis-control-plane-dynamodb/build.gradle b/mantis-control-plane/mantis-control-plane-dynamodb/build.gradle index 2862f85ba..700618ba4 100644 --- a/mantis-control-plane/mantis-control-plane-dynamodb/build.gradle +++ b/mantis-control-plane/mantis-control-plane-dynamodb/build.gradle @@ -71,3 +71,10 @@ tasks.named('compileJava') { tasks.named('delombok') { dependsOn project(':mantis-control-plane:mantis-control-plane-core').tasks.named('jar') } + +tasks.withType(Test) { + jvmArgs += [ + '--add-opens', 'java.base/java.lang=ALL-UNNAMED', + '--add-opens', 'java.base/java.util=ALL-UNNAMED' + ] +} diff --git a/mantis-control-plane/mantis-control-plane-dynamodb/dependencies.lock b/mantis-control-plane/mantis-control-plane-dynamodb/dependencies.lock new file mode 100644 index 000000000..16ff4cbc6 --- /dev/null +++ b/mantis-control-plane/mantis-control-plane-dynamodb/dependencies.lock @@ -0,0 +1,704 @@ +{ + "annotationProcessor": { + "org.projectlombok:lombok": { + "locked": "1.18.36" + } + }, + "compileClasspath": { + "com.amazonaws:dynamodb-lock-client": { + "locked": "1.2.0" + }, + "com.github.spullara.cli-parser:cli-parser": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core" + ], + "locked": "1.1.1" + }, + "com.google.code.findbugs:jsr305": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "3.0.1" + }, + "com.netflix.spectator:spectator-api": { + "locked": "1.3.10" + }, + "com.netflix:mantis-rxnetty": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "0.4.19.1" + }, + "io.mantisrx:mantis-common": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core" + ], + "project": true + }, + "io.mantisrx:mantis-common-serde": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "project": true + }, + "io.mantisrx:mantis-control-plane-core": { + "project": true + }, + "io.mantisrx:mantis-shaded": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common", + "io.mantisrx:mantis-common-serde" + ], + "project": true + }, + "io.netty:netty-buffer": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "4.1.17.Final" + }, + "io.netty:netty-codec-http": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "4.1.17.Final" + }, + "io.netty:netty-transport-native-epoll": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "4.1.17.Final" + }, + "io.reactivex:rxjava": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "1.3.8" + }, + "io.vavr:vavr": { + "locked": "0.9.2" + }, + "joda-time:joda-time": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core" + ], + "locked": "2.13.0" + }, + "org.apache.flink:flink-core": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core" + ], + "locked": "1.14.2" + }, + "org.apache.flink:flink-rpc-core": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core" + ], + "locked": "1.14.2" + }, + "org.hdrhistogram:HdrHistogram": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core" + ], + "locked": "2.2.2" + }, + "org.jctools:jctools-core": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "1.2.1" + }, + "org.json:json": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core" + ], + "locked": "20180813" + }, + "org.projectlombok:lombok": { + "locked": "1.18.36" + }, + "org.skife.config:config-magic": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core" + ], + "locked": "0.11" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "1.7.36" + }, + "org.slf4j:slf4j-log4j12": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "1.7.0" + }, + "org.xerial.snappy:snappy-java": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "1.1.10.7" + }, + "software.amazon.awssdk:aws-core": { + "locked": "2.29.38" + }, + "software.amazon.awssdk:bom": { + "locked": "2.23.15" + }, + "software.amazon.awssdk:dynamodb": { + "locked": "2.23.15" + }, + "software.amazon.awssdk:sts": { + "locked": "2.29.38" + } + }, + "lombok": { + "org.projectlombok:lombok": { + "locked": "1.18.36" + } + }, + "runtimeClasspath": { + "com.amazonaws:dynamodb-lock-client": { + "locked": "1.2.0" + }, + "com.github.spullara.cli-parser:cli-parser": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core" + ], + "locked": "1.1.1" + }, + "com.google.code.findbugs:jsr305": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "3.0.1" + }, + "com.netflix.spectator:spectator-api": { + "locked": "1.3.10" + }, + "com.netflix:mantis-rxnetty": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "0.4.19.1" + }, + "commons-io:commons-io": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common", + "io.mantisrx:mantis-control-plane-core" + ], + "locked": "2.11.0" + }, + "io.mantisrx:mantis-common": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core" + ], + "project": true + }, + "io.mantisrx:mantis-common-serde": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "project": true + }, + "io.mantisrx:mantis-control-plane-core": { + "project": true + }, + "io.mantisrx:mantis-shaded": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common", + "io.mantisrx:mantis-common-serde" + ], + "project": true + }, + "io.netty:netty-buffer": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "4.1.115.Final" + }, + "io.netty:netty-codec-http": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "4.1.115.Final" + }, + "io.netty:netty-transport-native-epoll": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "4.1.17.Final" + }, + "io.reactivex:rxjava": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "1.3.8" + }, + "io.vavr:vavr": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core", + "io.mantisrx:mantis-shaded" + ], + "locked": "0.9.2" + }, + "joda-time:joda-time": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core" + ], + "locked": "2.13.0" + }, + "net.jcip:jcip-annotations": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "1.0" + }, + "org.apache.flink:flink-core": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core" + ], + "locked": "1.14.2" + }, + "org.apache.flink:flink-rpc-core": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core" + ], + "locked": "1.14.2" + }, + "org.hdrhistogram:HdrHistogram": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core" + ], + "locked": "2.2.2" + }, + "org.jctools:jctools-core": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "1.2.1" + }, + "org.json:json": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core" + ], + "locked": "20180813" + }, + "org.skife.config:config-magic": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core" + ], + "locked": "0.11" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "1.7.36" + }, + "org.slf4j:slf4j-log4j12": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "1.7.0" + }, + "org.xerial.snappy:snappy-java": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "1.1.10.7" + }, + "software.amazon.awssdk:aws-core": { + "locked": "2.29.38" + }, + "software.amazon.awssdk:bom": { + "locked": "2.23.15" + }, + "software.amazon.awssdk:dynamodb": { + "locked": "2.23.15" + }, + "software.amazon.awssdk:sts": { + "locked": "2.29.38" + } + }, + "testAnnotationProcessor": { + "org.projectlombok:lombok": { + "locked": "1.18.36" + } + }, + "testCompileClasspath": { + "com.amazonaws:DynamoDBLocal": { + "locked": "1.25.0" + }, + "com.amazonaws:dynamodb-lock-client": { + "locked": "1.2.0" + }, + "com.github.spullara.cli-parser:cli-parser": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core" + ], + "locked": "1.1.1" + }, + "com.github.stefanbirkner:system-rules": { + "locked": "1.19.0" + }, + "com.google.code.findbugs:jsr305": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "3.0.2" + }, + "com.netflix.spectator:spectator-api": { + "locked": "1.3.10" + }, + "com.netflix:mantis-rxnetty": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "0.4.19.1" + }, + "commons-io:commons-io": { + "locked": "2.11.0" + }, + "io.mantisrx:mantis-common": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common", + "io.mantisrx:mantis-control-plane-core" + ], + "project": true + }, + "io.mantisrx:mantis-common-serde": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "project": true + }, + "io.mantisrx:mantis-control-plane-core": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core" + ], + "project": true + }, + "io.mantisrx:mantis-shaded": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common", + "io.mantisrx:mantis-common-serde" + ], + "project": true + }, + "io.netty:netty-buffer": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "4.1.17.Final" + }, + "io.netty:netty-codec-http": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "4.1.17.Final" + }, + "io.netty:netty-transport-native-epoll": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "4.1.17.Final" + }, + "io.reactivex:rxjava": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "1.3.8" + }, + "io.vavr:vavr": { + "locked": "0.9.2" + }, + "joda-time:joda-time": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core" + ], + "locked": "2.13.0" + }, + "junit:junit": { + "locked": "4.13.1" + }, + "junit:junit-dep": { + "locked": "4.11" + }, + "org.apache.flink:flink-core": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core" + ], + "locked": "1.14.2" + }, + "org.apache.flink:flink-rpc-core": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core" + ], + "locked": "1.14.2" + }, + "org.awaitility:awaitility": { + "locked": "4.2.2" + }, + "org.hdrhistogram:HdrHistogram": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core" + ], + "locked": "2.2.2" + }, + "org.jctools:jctools-core": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "1.2.1" + }, + "org.json:json": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core" + ], + "locked": "20180813" + }, + "org.mockito:mockito-core": { + "locked": "3.12.4" + }, + "org.projectlombok:lombok": { + "locked": "1.18.36" + }, + "org.skife.config:config-magic": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core" + ], + "locked": "0.11" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "1.7.36" + }, + "org.slf4j:slf4j-log4j12": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "1.7.0" + }, + "org.testng:testng": { + "locked": "6.14.3" + }, + "org.xerial.snappy:snappy-java": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "1.1.10.7" + }, + "software.amazon.awssdk:aws-core": { + "locked": "2.29.38" + }, + "software.amazon.awssdk:bom": { + "locked": "2.23.15" + }, + "software.amazon.awssdk:dynamodb": { + "locked": "2.23.15" + }, + "software.amazon.awssdk:sts": { + "locked": "2.29.38" + } + }, + "testRuntimeClasspath": { + "com.amazonaws:DynamoDBLocal": { + "locked": "1.25.0" + }, + "com.amazonaws:dynamodb-lock-client": { + "locked": "1.2.0" + }, + "com.github.spullara.cli-parser:cli-parser": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core" + ], + "locked": "1.1.1" + }, + "com.github.stefanbirkner:system-rules": { + "locked": "1.19.0" + }, + "com.google.code.findbugs:jsr305": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "3.0.2" + }, + "com.netflix.spectator:spectator-api": { + "locked": "1.3.10" + }, + "com.netflix:mantis-rxnetty": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "0.4.19.1" + }, + "commons-io:commons-io": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common", + "io.mantisrx:mantis-control-plane-core" + ], + "locked": "2.11.0" + }, + "io.mantisrx:mantis-common": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common", + "io.mantisrx:mantis-control-plane-core" + ], + "project": true + }, + "io.mantisrx:mantis-common-serde": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "project": true + }, + "io.mantisrx:mantis-control-plane-core": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core" + ], + "project": true + }, + "io.mantisrx:mantis-shaded": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common", + "io.mantisrx:mantis-common-serde" + ], + "project": true + }, + "io.netty:netty-buffer": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "4.1.115.Final" + }, + "io.netty:netty-codec-http": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "4.1.115.Final" + }, + "io.netty:netty-transport-native-epoll": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "4.1.17.Final" + }, + "io.reactivex:rxjava": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "1.3.8" + }, + "io.vavr:vavr": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core", + "io.mantisrx:mantis-shaded" + ], + "locked": "0.9.2" + }, + "joda-time:joda-time": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core" + ], + "locked": "2.13.0" + }, + "junit:junit": { + "locked": "4.13.1" + }, + "junit:junit-dep": { + "locked": "4.11" + }, + "net.jcip:jcip-annotations": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "1.0" + }, + "org.apache.flink:flink-core": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core" + ], + "locked": "1.14.2" + }, + "org.apache.flink:flink-rpc-akka": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core" + ], + "locked": "1.14.2" + }, + "org.apache.flink:flink-rpc-core": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core" + ], + "locked": "1.14.2" + }, + "org.awaitility:awaitility": { + "locked": "4.2.2" + }, + "org.hdrhistogram:HdrHistogram": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core" + ], + "locked": "2.2.2" + }, + "org.jctools:jctools-core": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "1.2.1" + }, + "org.json:json": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core" + ], + "locked": "20180813" + }, + "org.mockito:mockito-core": { + "locked": "3.12.4" + }, + "org.skife.config:config-magic": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core" + ], + "locked": "0.11" + }, + "org.slf4j:slf4j-api": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "1.7.36" + }, + "org.slf4j:slf4j-log4j12": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "1.7.0" + }, + "org.testng:testng": { + "locked": "6.14.3" + }, + "org.xerial.snappy:snappy-java": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-common" + ], + "locked": "1.1.10.7" + }, + "software.amazon.awssdk:aws-core": { + "locked": "2.29.38" + }, + "software.amazon.awssdk:bom": { + "locked": "2.23.15" + }, + "software.amazon.awssdk:dynamodb": { + "locked": "2.23.15" + }, + "software.amazon.awssdk:sts": { + "locked": "2.29.38" + } + } +} \ No newline at end of file diff --git a/mantis-control-plane/mantis-control-plane-server/build.gradle b/mantis-control-plane/mantis-control-plane-server/build.gradle index 419214731..0545dc4dc 100644 --- a/mantis-control-plane/mantis-control-plane-server/build.gradle +++ b/mantis-control-plane/mantis-control-plane-server/build.gradle @@ -118,6 +118,13 @@ test { } } +tasks.withType(Test) { + jvmArgs += [ + '--add-opens', 'java.base/java.lang=ALL-UNNAMED', + '--add-opens', 'java.base/java.util=ALL-UNNAMED' + ] +} + tasks.named('compileJava') { dependsOn project(':mantis-control-plane:mantis-control-plane-core').tasks.named('jar') } diff --git a/mantis-control-plane/mantis-control-plane-server/dependencies.lock b/mantis-control-plane/mantis-control-plane-server/dependencies.lock index 72da5a04b..d97663985 100644 --- a/mantis-control-plane/mantis-control-plane-server/dependencies.lock +++ b/mantis-control-plane/mantis-control-plane-server/dependencies.lock @@ -1,172 +1,7 @@ { "annotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" - } - }, - "baseline-exact-dependencies-main": { - "com.netflix.spectator:spectator-api": { - "locked": "1.3.10" - }, - "com.spotify:completable-futures": { - "locked": "0.3.1" - }, - "io.vavr:vavr": { - "locked": "0.9.2" - }, - "org.apache.commons:commons-math3": { - "locked": "3.5" - } - }, - "baseline-exact-dependencies-test": { - "com.github.spullara.cli-parser:cli-parser": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "1.1.1" - }, - "com.google.code.findbugs:jsr305": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "3.0.1" - }, - "com.netflix:mantis-rxnetty": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "0.4.19.1" - }, - "com.typesafe.akka:akka-http-testkit_2.12": { - "locked": "10.2.7" - }, - "com.typesafe.akka:akka-testkit_2.12": { - "locked": "2.6.15" - }, - "commons-io:commons-io": { - "locked": "2.11.0" - }, - "io.mantisrx:mantis-common": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common", - "io.mantisrx:mantis-control-plane-core" - ], - "project": true - }, - "io.mantisrx:mantis-common-serde": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "project": true - }, - "io.mantisrx:mantis-control-plane-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "project": true - }, - "io.mantisrx:mantis-shaded": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common", - "io.mantisrx:mantis-common-serde" - ], - "project": true - }, - "io.netty:netty-buffer": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-codec-http": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-transport-native-epoll": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.reactivex:rxjava": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.3.8" - }, - "joda-time:joda-time": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "2.12.7" - }, - "junit:junit": { - "locked": "4.11" - }, - "junit:junit-dep": { - "locked": "4.11" - }, - "org.apache.flink:flink-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "1.14.2" - }, - "org.apache.flink:flink-rpc-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "1.14.2" - }, - "org.hdrhistogram:HdrHistogram": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "2.1.12" - }, - "org.jctools:jctools-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.2.1" - }, - "org.json:json": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "20180813" - }, - "org.mockito:mockito-core": { - "locked": "3.12.4" - }, - "org.skife.config:config-magic": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "0.11" - }, - "org.slf4j:slf4j-api": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.7.15" - }, - "org.slf4j:slf4j-log4j12": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.7.0" - }, - "org.testng:testng": { - "locked": "6.14.3" - }, - "org.xerial.snappy:snappy-java": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.1.10.5" + "locked": "1.18.36" } }, "compileClasspath": { @@ -230,6 +65,9 @@ "io.mantisrx:mantis-control-plane-core": { "project": true }, + "io.mantisrx:mantis-control-plane-dynamodb": { + "project": true + }, "io.mantisrx:mantis-shaded": { "firstLevelTransitive": [ "io.mantisrx:mantis-common", @@ -271,7 +109,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "org.apache.commons:commons-math3": { "locked": "3.5" @@ -292,7 +130,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -307,7 +145,7 @@ "locked": "20180813" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.skife.config:config-magic": { "firstLevelTransitive": [ @@ -331,15 +169,21 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "lombok": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "runtimeClasspath": { + "com.amazonaws:dynamodb-lock-client": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-dynamodb" + ], + "locked": "1.2.0" + }, "com.github.spullara.cli-parser:cli-parser": { "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" @@ -356,6 +200,9 @@ "locked": "0.13.8" }, "com.netflix.spectator:spectator-api": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-dynamodb" + ], "locked": "1.3.10" }, "com.netflix:mantis-rxnetty": { @@ -405,6 +252,12 @@ "project": true }, "io.mantisrx:mantis-control-plane-core": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-dynamodb" + ], + "project": true + }, + "io.mantisrx:mantis-control-plane-dynamodb": { "project": true }, "io.mantisrx:mantis-shaded": { @@ -418,13 +271,13 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "4.1.17.Final" + "locked": "4.1.115.Final" }, "io.netty:netty-codec-http": { "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "4.1.17.Final" + "locked": "4.1.115.Final" }, "io.netty:netty-transport-native-epoll": { "firstLevelTransitive": [ @@ -443,6 +296,8 @@ }, "io.vavr:vavr": { "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core", + "io.mantisrx:mantis-control-plane-dynamodb", "io.mantisrx:mantis-shaded" ], "locked": "0.9.2" @@ -451,7 +306,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "net.jcip:jcip-annotations": { "firstLevelTransitive": [ @@ -478,7 +333,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -514,12 +369,36 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" + }, + "software.amazon.awssdk:aws-core": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-dynamodb" + ], + "locked": "2.29.38" + }, + "software.amazon.awssdk:bom": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-dynamodb" + ], + "locked": "2.23.15" + }, + "software.amazon.awssdk:dynamodb": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-dynamodb" + ], + "locked": "2.23.15" + }, + "software.amazon.awssdk:sts": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-dynamodb" + ], + "locked": "2.29.38" } }, "testAnnotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "testCompileClasspath": { @@ -596,6 +475,9 @@ ], "project": true }, + "io.mantisrx:mantis-control-plane-dynamodb": { + "project": true + }, "io.mantisrx:mantis-shaded": { "firstLevelTransitive": [ "io.mantisrx:mantis-common", @@ -637,7 +519,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "junit:junit": { "locked": "4.11" @@ -664,7 +546,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -682,7 +564,7 @@ "locked": "3.12.4" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.skife.config:config-magic": { "firstLevelTransitive": [ @@ -709,10 +591,16 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testRuntimeClasspath": { + "com.amazonaws:dynamodb-lock-client": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-dynamodb" + ], + "locked": "1.2.0" + }, "com.github.spullara.cli-parser:cli-parser": { "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" @@ -729,6 +617,9 @@ "locked": "0.13.8" }, "com.netflix.spectator:spectator-api": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-dynamodb" + ], "locked": "1.3.10" }, "com.netflix:mantis-rxnetty": { @@ -786,10 +677,14 @@ }, "io.mantisrx:mantis-control-plane-core": { "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" + "io.mantisrx:mantis-control-plane-core", + "io.mantisrx:mantis-control-plane-dynamodb" ], "project": true }, + "io.mantisrx:mantis-control-plane-dynamodb": { + "project": true + }, "io.mantisrx:mantis-shaded": { "firstLevelTransitive": [ "io.mantisrx:mantis-common", @@ -801,13 +696,13 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "4.1.17.Final" + "locked": "4.1.115.Final" }, "io.netty:netty-codec-http": { "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "4.1.17.Final" + "locked": "4.1.115.Final" }, "io.netty:netty-transport-native-epoll": { "firstLevelTransitive": [ @@ -826,6 +721,8 @@ }, "io.vavr:vavr": { "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core", + "io.mantisrx:mantis-control-plane-dynamodb", "io.mantisrx:mantis-shaded" ], "locked": "0.9.2" @@ -834,7 +731,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "junit:junit": { "locked": "4.11" @@ -873,7 +770,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -915,7 +812,31 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" + }, + "software.amazon.awssdk:aws-core": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-dynamodb" + ], + "locked": "2.29.38" + }, + "software.amazon.awssdk:bom": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-dynamodb" + ], + "locked": "2.23.15" + }, + "software.amazon.awssdk:dynamodb": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-dynamodb" + ], + "locked": "2.23.15" + }, + "software.amazon.awssdk:sts": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-dynamodb" + ], + "locked": "2.29.38" } } } \ No newline at end of file diff --git a/mantis-control-plane/mantis-control-plane-server/src/main/java/io/mantisrx/master/resourcecluster/DisableTaskExecutorsRequest.java b/mantis-control-plane/mantis-control-plane-server/src/main/java/io/mantisrx/master/resourcecluster/DisableTaskExecutorsRequest.java index ae4467139..1f8e934c0 100644 --- a/mantis-control-plane/mantis-control-plane-server/src/main/java/io/mantisrx/master/resourcecluster/DisableTaskExecutorsRequest.java +++ b/mantis-control-plane/mantis-control-plane-server/src/main/java/io/mantisrx/master/resourcecluster/DisableTaskExecutorsRequest.java @@ -23,11 +23,11 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.time.Instant; +import java.util.Base64; import java.util.Map; import java.util.Optional; import java.util.TreeMap; import javax.annotation.Nullable; -import javax.xml.bind.DatatypeConverter; import lombok.Value; @Value @@ -66,7 +66,7 @@ public String getHash() { messageDigest.update(key.getBytes(StandardCharsets.UTF_8)); messageDigest.update(value.getBytes(StandardCharsets.UTF_8)); }); - return DatatypeConverter.printHexBinary(messageDigest.digest()); + return Base64.getEncoder().encodeToString(messageDigest.digest()); } catch (NoSuchAlgorithmException exception) { // don't expect this to happen // let's just throw a runtime exception in this case diff --git a/mantis-control-plane/mantis-control-plane-server/src/test/java/io/mantisrx/master/api/akka/route/JacksonTest.java b/mantis-control-plane/mantis-control-plane-server/src/test/java/io/mantisrx/master/api/akka/route/JacksonTest.java index 2586fb4ed..d70673094 100644 --- a/mantis-control-plane/mantis-control-plane-server/src/test/java/io/mantisrx/master/api/akka/route/JacksonTest.java +++ b/mantis-control-plane/mantis-control-plane-server/src/test/java/io/mantisrx/master/api/akka/route/JacksonTest.java @@ -19,6 +19,7 @@ import static org.junit.Assert.*; import io.mantisrx.common.Ack; +import io.mantisrx.master.api.akka.payloads.PayloadUtils; import io.mantisrx.master.jobcluster.job.MantisJobMetadataView; import io.mantisrx.server.master.store.MantisWorkerMetadataWritable; import io.mantisrx.shaded.com.fasterxml.jackson.core.JsonProcessingException; @@ -30,31 +31,22 @@ import java.io.ObjectOutputStream; import java.util.List; import java.util.Optional; + +import io.mantisrx.shaded.com.fasterxml.jackson.databind.SerializationFeature; +import io.mantisrx.shaded.com.fasterxml.jackson.datatype.jdk8.Jdk8Module; import org.junit.Test; public class JacksonTest { - private static final ObjectMapper objectMapper = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + private static final ObjectMapper objectMapper = new ObjectMapper() + .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) + .configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false) + .registerModule(new Jdk8Module()); @Test public void testDeser4() throws IOException { - final String jsonStr = "[{\"jobMetadata\":{\"jobId\":\"sine-function-1\",\"name\":\"sine-function\"," + - "\"user\":\"nmahilani\",\"submittedAt\":1527703650220,\"jarUrl\":\"https://mantis.staging.us-east-1.prod.netflix.net/mantis-artifacts/mantis-examples-sine-function-0.2.9.zip\"," + - "\"numStages\":2,\"sla\":{\"runtimeLimitSecs\":0,\"minRuntimeSecs\":0,\"slaType\":\"Lossy\",\"durationType\":\"Perpetual\",\"userProvidedType\":\"\"}," + - "\"state\":\"Accepted\",\"subscriptionTimeoutSecs\":0,\"parameters\":[{\"name\":\"useRandom\",\"value\":\"True\"}],\"nextWorkerNumberToUse\":11," + - "\"migrationConfig\":{\"strategy\":\"PERCENTAGE\",\"configString\":\"{\\\"percentToMove\\\":25,\\\"intervalMs\\\":60000}\"}," + - "\"labels\":[{\"name\":\"_mantis.user\",\"value\":\"nmahilani\"},{\"name\":\"_mantis.ownerEmail\",\"value\":\"nmahilani@netflix.com\"}," + - "{\"name\":\"_mantis.jobType\",\"value\":\"other\"},{\"name\":\"_mantis.criticality\",\"value\":\"low\"},{\"name\":\"_mantis.artifact.version\",\"value\":\"0.2.9\"}]}," + - "\"stageMetadataList\":[{\"jobId\":\"sine-function-1\",\"stageNum\":0,\"numStages\":2,\"machineDefinition\":{\"cpuCores\":1.0,\"memoryMB\":200.0,\"networkMbps\":128.0,\"diskMB\":1024.0,\"numPorts\":1}," + - "\"numWorkers\":1,\"hardConstraints\":null,\"softConstraints\":null,\"scalingPolicy\":null,\"scalable\":false}," + - "{\"jobId\":\"sine-function-1\",\"stageNum\":1,\"numStages\":2,\"machineDefinition\":{\"cpuCores\":1.0,\"memoryMB\":200.0,\"networkMbps\":128.0,\"diskMB\":1024.0,\"numPorts\":1},\"numWorkers\":1,\"hardConstraints\":[],\"softConstraints\":[\"M4Cluster\"]," + - "\"scalingPolicy\":{\"stage\":1,\"min\":1,\"max\":10,\"increment\":2,\"decrement\":1,\"coolDownSecs\":600," + - "\"strategies\":{\"CPU\":{\"reason\":\"CPU\",\"scaleDownBelowPct\":15.0,\"scaleUpAbovePct\":75.0,\"rollingCount\":{\"count\":12,\"of\":20}}},\"enabled\":true},\"scalable\":true}]," + - "\"workerMetadataList\":[{\"workerIndex\":0,\"workerNumber\":2,\"jobId\":\"sine-function-1\",\"stageNum\":0,\"numberOfPorts\":4,\"metricsPort\":0,\"consolePort\":0," + - "\"debugPort\":-1,\"ports\":[],\"state\":\"Accepted\",\"slave\":null,\"slaveID\":null,\"cluster\":{\"present\":false},\"acceptedAt\":1527703650231,\"launchedAt\":0,\"startingAt\":0,\"startedAt\":0," + - "\"completedAt\":0,\"reason\":null,\"resubmitOf\":-1,\"totalResubmitCount\":0},{\"workerIndex\":0,\"workerNumber\":3,\"jobId\":\"sine-function-1\",\"stageNum\":1,\"numberOfPorts\":4,\"metricsPort\":0,\"consolePort\":0,\"debugPort\":-1,\"ports\":[],\"state\":\"Accepted\"," + - "\"slave\":null,\"slaveID\":null,\"cluster\":{\"present\":false},\"acceptedAt\":1527703650232,\"launchedAt\":0,\"startingAt\":0,\"startedAt\":0,\"completedAt\":0," + - "\"reason\":null,\"resubmitOf\":-1,\"totalResubmitCount\":0}]}]"; + final String jsonStr = + PayloadUtils.getStringFromResource("jackson/JobMetadata1.json"); final List jobIdInfos = Jackson.fromJSON(objectMapper, jsonStr, new TypeReference>() { }); assertEquals(1, jobIdInfos.size()); @@ -62,21 +54,22 @@ public void testDeser4() throws IOException { assertEquals("sine-function-1", jobInfo.getJobMetadata().getJobId()); assertEquals(2, jobInfo.getWorkerMetadataList().size()); assertEquals(2, jobInfo.getStageMetadataList().size()); + assertEquals("mantisagent", jobInfo.getWorkerMetadataList().get(0).getResourceCluster().get().getResourceID()); MantisWorkerMetadataWritable mwm = jobInfo.getWorkerMetadataList().get(0); mwm.setCluster(Optional.of("test")); final String out = objectMapper.writer(Jackson.DEFAULT_FILTER_PROVIDER).writeValueAsString(mwm); - assertTrue(out.contains("\"cluster\":{\"present\":true},")); + assertFalse(out.contains("\"cluster\":{\"present\":true},")); final String serializeAgain = objectMapper.writeValueAsString(objectMapper.readValue(out, MantisWorkerMetadataWritable.class)); - assertFalse(serializeAgain.contains("\"cluster\":{\"present\":true},")); - assertTrue(serializeAgain.contains("\"cluster\":{\"present\":false},")); + assertFalse(out.contains("{\"present\":")); + assertTrue(serializeAgain.contains("\"resourceCluster\":{\"resourceID\":\"mantisagent\"}")); } @Test public void testOptionalSerialization() throws JsonProcessingException { - assertEquals("{\"present\":false}", objectMapper.writeValueAsString(Optional.empty())); - assertEquals("{\"present\":true}", objectMapper.writeValueAsString(Optional.of("test"))); + assertEquals("null", objectMapper.writeValueAsString(Optional.empty())); + assertEquals("\"test\"", objectMapper.writeValueAsString(Optional.of("test"))); } @Test diff --git a/mantis-control-plane/mantis-control-plane-server/src/test/resources/jackson/JobMetadata1.json b/mantis-control-plane/mantis-control-plane-server/src/test/resources/jackson/JobMetadata1.json new file mode 100644 index 000000000..b0ec8e461 --- /dev/null +++ b/mantis-control-plane/mantis-control-plane-server/src/test/resources/jackson/JobMetadata1.json @@ -0,0 +1,163 @@ +[ + { + "jobMetadata": { + "jobId": "sine-function-1", + "name": "sine-function", + "user": "nmahilani", + "submittedAt": 1527703650220, + "jarUrl": "https://mantis.staging.us-east-1.prod.netflix.net/mantis-artifacts/mantis-examples-sine-function-0.2.9.zip", + "numStages": 2, + "sla": { + "runtimeLimitSecs": 0, + "minRuntimeSecs": 0, + "slaType": "Lossy", + "durationType": "Perpetual", + "userProvidedType": "" + }, + "state": "Accepted", + "subscriptionTimeoutSecs": 0, + "parameters": [ + { + "name": "useRandom", + "value": "True" + } + ], + "nextWorkerNumberToUse": 11, + "migrationConfig": { + "strategy": "PERCENTAGE", + "configString": "{\"percentToMove\":25,\"intervalMs\":60000}" + }, + "labels": [ + { + "name": "_mantis.user", + "value": "nmahilani" + }, + { + "name": "_mantis.ownerEmail", + "value": "nmahilani@netflix.com" + }, + { + "name": "_mantis.jobType", + "value": "other" + }, + { + "name": "_mantis.criticality", + "value": "low" + }, + { + "name": "_mantis.artifact.version", + "value": "0.2.9" + } + ] + }, + "stageMetadataList": [ + { + "jobId": "sine-function-1", + "stageNum": 0, + "numStages": 2, + "machineDefinition": { + "cpuCores": 1.0, + "memoryMB": 200.0, + "networkMbps": 128.0, + "diskMB": 1024.0, + "numPorts": 1 + }, + "numWorkers": 1, + "hardConstraints": null, + "softConstraints": null, + "scalingPolicy": null, + "scalable": false + }, + { + "jobId": "sine-function-1", + "stageNum": 1, + "numStages": 2, + "machineDefinition": { + "cpuCores": 1.0, + "memoryMB": 200.0, + "networkMbps": 128.0, + "diskMB": 1024.0, + "numPorts": 1 + }, + "numWorkers": 1, + "hardConstraints": [], + "softConstraints": [ + "M4Cluster" + ], + "scalingPolicy": { + "stage": 1, + "min": 1, + "max": 10, + "increment": 2, + "decrement": 1, + "coolDownSecs": 600, + "strategies": { + "CPU": { + "reason": "CPU", + "scaleDownBelowPct": 15.0, + "scaleUpAbovePct": 75.0, + "rollingCount": { + "count": 12, + "of": 20 + } + } + }, + "enabled": true + }, + "scalable": true + } + ], + "workerMetadataList": [ + { + "workerIndex": 0, + "workerNumber": 2, + "jobId": "sine-function-1", + "stageNum": 0, + "numberOfPorts": 4, + "metricsPort": 0, + "consolePort": 0, + "debugPort": -1, + "ports": [], + "state": "Accepted", + "slave": null, + "slaveID": null, + "resourceCluster": { + "resourceID": "mantisagent" + }, + "acceptedAt": 1527703650231, + "launchedAt": 0, + "startingAt": 0, + "startedAt": 0, + "completedAt": 0, + "reason": null, + "resubmitOf": -1, + "totalResubmitCount": 0 + }, + { + "workerIndex": 0, + "workerNumber": 3, + "jobId": "sine-function-1", + "stageNum": 1, + "numberOfPorts": 4, + "metricsPort": 0, + "consolePort": 0, + "debugPort": -1, + "ports": [], + "state": "Accepted", + "slave": null, + "slaveID": null, + "resourceCluster": { + "resourceID": "mantisagent" + }, + "acceptedAt": 1527703650232, + "launchedAt": 0, + "startingAt": 0, + "startedAt": 0, + "completedAt": 0, + "reason": null, + "resubmitOf": -1, + "totalResubmitCount": 0 + } + ] + } +] diff --git a/mantis-discovery-proto/dependencies.lock b/mantis-discovery-proto/dependencies.lock index 021074b6f..722fcee22 100644 --- a/mantis-discovery-proto/dependencies.lock +++ b/mantis-discovery-proto/dependencies.lock @@ -1,15 +1,7 @@ { "annotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" - } - }, - "baseline-exact-dependencies-test": { - "junit:junit": { - "locked": "4.11" - }, - "junit:junit-dep": { - "locked": "4.11" + "locked": "1.18.36" } }, "compileClasspath": { @@ -17,12 +9,12 @@ "project": true }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "lombok": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "runtimeClasspath": { @@ -38,7 +30,7 @@ }, "testAnnotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "testCompileClasspath": { @@ -52,7 +44,7 @@ "locked": "4.11" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "testRuntimeClasspath": { diff --git a/mantis-examples/mantis-examples-core/dependencies.lock b/mantis-examples/mantis-examples-core/dependencies.lock index 4b3ded561..36a0d6e08 100644 --- a/mantis-examples/mantis-examples-core/dependencies.lock +++ b/mantis-examples/mantis-examples-core/dependencies.lock @@ -1,111 +1,7 @@ { "annotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" - } - }, - "baseline-exact-dependencies-main": { - "com.google.code.findbugs:jsr305": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "3.0.1" - }, - "com.netflix:mantis-rxnetty": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "0.4.19.1" - }, - "io.mantisrx:mantis-common": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-network", - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-common-serde": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "project": true - }, - "io.mantisrx:mantis-network": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-remote-observable": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-runtime": { - "project": true - }, - "io.mantisrx:mantis-shaded": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common", - "io.mantisrx:mantis-common-serde" - ], - "project": true - }, - "io.netty:netty-buffer": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-codec-http": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-handler": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-network" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-transport-native-epoll": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.reactivex:rxjava": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.3.8" - }, - "org.jctools:jctools-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.2.1" - }, - "org.slf4j:slf4j-api": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common", - "io.mantisrx:mantis-runtime" - ], - "locked": "1.7.6" - }, - "org.slf4j:slf4j-log4j12": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.7.0" - }, - "org.xerial.snappy:snappy-java": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.1.10.5" + "locked": "1.18.36" } }, "compileClasspath": { @@ -193,7 +89,7 @@ "locked": "1.2.1" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -212,12 +108,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "lombok": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "runtimeClasspath": { @@ -330,6 +226,12 @@ ], "locked": "1.0" }, + "net.openhft:zero-allocation-hashing": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-network" + ], + "locked": "0.27ea0" + }, "org.jctools:jctools-core": { "firstLevelTransitive": [ "io.mantisrx:mantis-common" @@ -355,12 +257,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testAnnotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "testCompileClasspath": { @@ -448,7 +350,7 @@ "locked": "1.2.1" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -467,7 +369,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testRuntimeClasspath": { @@ -580,6 +482,12 @@ ], "locked": "1.0" }, + "net.openhft:zero-allocation-hashing": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-network" + ], + "locked": "0.27ea0" + }, "org.jctools:jctools-core": { "firstLevelTransitive": [ "io.mantisrx:mantis-common" @@ -605,7 +513,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } } } \ No newline at end of file diff --git a/mantis-examples/mantis-examples-groupby-sample/dependencies.lock b/mantis-examples/mantis-examples-groupby-sample/dependencies.lock index 6f36944aa..5781aac43 100644 --- a/mantis-examples/mantis-examples-groupby-sample/dependencies.lock +++ b/mantis-examples/mantis-examples-groupby-sample/dependencies.lock @@ -1,117 +1,7 @@ { "annotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" - } - }, - "baseline-exact-dependencies-main": { - "com.google.code.findbugs:jsr305": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "3.0.1" - }, - "com.netflix.spectator:spectator-api": { - "locked": "1.3.10" - }, - "com.netflix:mantis-rxnetty": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "0.4.19.1" - }, - "io.mantisrx:mantis-common": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-network", - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-common-serde": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "project": true - }, - "io.mantisrx:mantis-network": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-remote-observable": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-runtime": { - "project": true - }, - "io.mantisrx:mantis-shaded": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common", - "io.mantisrx:mantis-common-serde" - ], - "project": true - }, - "io.netty:netty-buffer": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-codec-http": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-handler": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-network" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-transport-native-epoll": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.reactivex:rxjava": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.3.8" - }, - "net.andreinc:mockneat": { - "locked": "0.4.8" - }, - "org.jctools:jctools-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.2.1" - }, - "org.slf4j:slf4j-api": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common", - "io.mantisrx:mantis-runtime" - ], - "locked": "1.7.6" - }, - "org.slf4j:slf4j-log4j12": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.7.0" - }, - "org.xerial.snappy:snappy-java": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.1.10.5" + "locked": "1.18.36" } }, "compileClasspath": { @@ -205,7 +95,7 @@ "locked": "1.2.1" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -224,12 +114,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "lombok": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "runtimeClasspath": { @@ -348,6 +238,12 @@ ], "locked": "1.0" }, + "net.openhft:zero-allocation-hashing": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-network" + ], + "locked": "0.27ea0" + }, "org.jctools:jctools-core": { "firstLevelTransitive": [ "io.mantisrx:mantis-common" @@ -373,12 +269,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testAnnotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "testCompileClasspath": { @@ -472,7 +368,7 @@ "locked": "1.2.1" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -491,7 +387,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testRuntimeClasspath": { @@ -610,6 +506,12 @@ ], "locked": "1.0" }, + "net.openhft:zero-allocation-hashing": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-network" + ], + "locked": "0.27ea0" + }, "org.jctools:jctools-core": { "firstLevelTransitive": [ "io.mantisrx:mantis-common" @@ -635,7 +537,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } } } \ No newline at end of file diff --git a/mantis-examples/mantis-examples-jobconnector-sample/dependencies.lock b/mantis-examples/mantis-examples-jobconnector-sample/dependencies.lock index 723fe94ac..51799d2c9 100644 --- a/mantis-examples/mantis-examples-jobconnector-sample/dependencies.lock +++ b/mantis-examples/mantis-examples-jobconnector-sample/dependencies.lock @@ -1,117 +1,7 @@ { "annotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" - } - }, - "baseline-exact-dependencies-main": { - "com.google.code.findbugs:jsr305": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "3.0.1" - }, - "com.netflix.spectator:spectator-api": { - "locked": "1.3.10" - }, - "com.netflix:mantis-rxnetty": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "0.4.19.1" - }, - "io.mantisrx:mantis-common": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-network", - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-common-serde": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "project": true - }, - "io.mantisrx:mantis-connector-job": { - "project": true - }, - "io.mantisrx:mantis-network": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-remote-observable": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-runtime": { - "project": true - }, - "io.mantisrx:mantis-shaded": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common", - "io.mantisrx:mantis-common-serde" - ], - "project": true - }, - "io.netty:netty-buffer": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-codec-http": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-handler": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-network" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-transport-native-epoll": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.reactivex:rxjava": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.3.8" - }, - "org.jctools:jctools-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.2.1" - }, - "org.slf4j:slf4j-api": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common", - "io.mantisrx:mantis-runtime" - ], - "locked": "1.7.6" - }, - "org.slf4j:slf4j-log4j12": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.7.0" - }, - "org.xerial.snappy:snappy-java": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.1.10.5" + "locked": "1.18.36" } }, "compileClasspath": { @@ -143,7 +33,7 @@ ], "project": true }, - "io.mantisrx:mantis-connector-job": { + "io.mantisrx:mantis-connector-job-source": { "project": true }, "io.mantisrx:mantis-network": { @@ -205,7 +95,7 @@ "locked": "1.2.1" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -224,12 +114,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "lombok": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "runtimeClasspath": { @@ -247,7 +137,7 @@ }, "com.google.code.gson:gson": { "firstLevelTransitive": [ - "io.mantisrx:mantis-connector-job" + "io.mantisrx:mantis-connector-job-source" ], "locked": "2.8.9" }, @@ -255,13 +145,13 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.archaius:archaius2-core": { "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.rxjava:rxjava-math": { "firstLevelTransitive": [ @@ -304,7 +194,7 @@ }, "io.mantisrx:mantis-client": { "firstLevelTransitive": [ - "io.mantisrx:mantis-connector-job" + "io.mantisrx:mantis-connector-job-source" ], "project": true }, @@ -324,19 +214,20 @@ ], "project": true }, - "io.mantisrx:mantis-connector-job": { + "io.mantisrx:mantis-connector-job-source": { "project": true }, "io.mantisrx:mantis-control-plane-client": { "firstLevelTransitive": [ "io.mantisrx:mantis-client", + "io.mantisrx:mantis-connector-job-source", "io.mantisrx:mantis-server-worker-client" ], "project": true }, "io.mantisrx:mantis-control-plane-core": { "firstLevelTransitive": [ - "io.mantisrx:mantis-connector-job", + "io.mantisrx:mantis-connector-job-source", "io.mantisrx:mantis-control-plane-client", "io.mantisrx:mantis-server-worker-client" ], @@ -356,7 +247,7 @@ }, "io.mantisrx:mantis-publish-core": { "firstLevelTransitive": [ - "io.mantisrx:mantis-connector-job" + "io.mantisrx:mantis-connector-job-source" ], "project": true }, @@ -370,7 +261,7 @@ "io.mantisrx:mantis-runtime": { "firstLevelTransitive": [ "io.mantisrx:mantis-client", - "io.mantisrx:mantis-connector-job" + "io.mantisrx:mantis-connector-job-source" ], "project": true }, @@ -428,7 +319,8 @@ }, "io.vavr:vavr": { "firstLevelTransitive": [ - "io.mantisrx:mantis-connector-job", + "io.mantisrx:mantis-connector-job-source", + "io.mantisrx:mantis-control-plane-core", "io.mantisrx:mantis-shaded" ], "locked": "0.9.2" @@ -437,7 +329,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "net.jcip:jcip-annotations": { "firstLevelTransitive": [ @@ -445,6 +337,12 @@ ], "locked": "1.0" }, + "net.openhft:zero-allocation-hashing": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-network" + ], + "locked": "0.27ea0" + }, "org.apache.flink:flink-core": { "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" @@ -467,7 +365,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -508,12 +406,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testAnnotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "testCompileClasspath": { @@ -545,7 +443,7 @@ ], "project": true }, - "io.mantisrx:mantis-connector-job": { + "io.mantisrx:mantis-connector-job-source": { "project": true }, "io.mantisrx:mantis-network": { @@ -607,7 +505,7 @@ "locked": "1.2.1" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -626,7 +524,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testRuntimeClasspath": { @@ -644,7 +542,7 @@ }, "com.google.code.gson:gson": { "firstLevelTransitive": [ - "io.mantisrx:mantis-connector-job" + "io.mantisrx:mantis-connector-job-source" ], "locked": "2.8.9" }, @@ -652,13 +550,13 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.archaius:archaius2-core": { "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.rxjava:rxjava-math": { "firstLevelTransitive": [ @@ -701,7 +599,7 @@ }, "io.mantisrx:mantis-client": { "firstLevelTransitive": [ - "io.mantisrx:mantis-connector-job" + "io.mantisrx:mantis-connector-job-source" ], "project": true }, @@ -721,19 +619,20 @@ ], "project": true }, - "io.mantisrx:mantis-connector-job": { + "io.mantisrx:mantis-connector-job-source": { "project": true }, "io.mantisrx:mantis-control-plane-client": { "firstLevelTransitive": [ "io.mantisrx:mantis-client", + "io.mantisrx:mantis-connector-job-source", "io.mantisrx:mantis-server-worker-client" ], "project": true }, "io.mantisrx:mantis-control-plane-core": { "firstLevelTransitive": [ - "io.mantisrx:mantis-connector-job", + "io.mantisrx:mantis-connector-job-source", "io.mantisrx:mantis-control-plane-client", "io.mantisrx:mantis-server-worker-client" ], @@ -753,7 +652,7 @@ }, "io.mantisrx:mantis-publish-core": { "firstLevelTransitive": [ - "io.mantisrx:mantis-connector-job" + "io.mantisrx:mantis-connector-job-source" ], "project": true }, @@ -767,7 +666,7 @@ "io.mantisrx:mantis-runtime": { "firstLevelTransitive": [ "io.mantisrx:mantis-client", - "io.mantisrx:mantis-connector-job" + "io.mantisrx:mantis-connector-job-source" ], "project": true }, @@ -825,7 +724,8 @@ }, "io.vavr:vavr": { "firstLevelTransitive": [ - "io.mantisrx:mantis-connector-job", + "io.mantisrx:mantis-connector-job-source", + "io.mantisrx:mantis-control-plane-core", "io.mantisrx:mantis-shaded" ], "locked": "0.9.2" @@ -834,7 +734,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "net.jcip:jcip-annotations": { "firstLevelTransitive": [ @@ -842,6 +742,12 @@ ], "locked": "1.0" }, + "net.openhft:zero-allocation-hashing": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-network" + ], + "locked": "0.27ea0" + }, "org.apache.flink:flink-core": { "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" @@ -864,7 +770,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -905,7 +811,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } } } \ No newline at end of file diff --git a/mantis-examples/mantis-examples-mantis-publish-sample/dependencies.lock b/mantis-examples/mantis-examples-mantis-publish-sample/dependencies.lock index f00cfa484..216438786 100644 --- a/mantis-examples/mantis-examples-mantis-publish-sample/dependencies.lock +++ b/mantis-examples/mantis-examples-mantis-publish-sample/dependencies.lock @@ -1,74 +1,7 @@ { "annotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" - } - }, - "baseline-exact-dependencies-main": { - "com.google.inject:guice": { - "locked": "4.2.2" - }, - "com.netflix.archaius:archaius2-api": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-publish-core" - ], - "locked": "2.7.9" - }, - "com.netflix.archaius:archaius2-core": { - "locked": "2.7.9" - }, - "com.netflix.archaius:archaius2-guice": { - "locked": "2.7.9" - }, - "com.netflix.spectator:spectator-api": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-publish-core" - ], - "locked": "1.3.10" - }, - "com.netflix.spectator:spectator-ext-ipc": { - "locked": "1.3.10" - }, - "com.netflix.spectator:spectator-nflx-plugin": { - "locked": "1.3.10" - }, - "io.mantisrx:mantis-discovery-proto": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-publish-core" - ], - "project": true - }, - "io.mantisrx:mantis-publish-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-publish-netty-guice" - ], - "project": true - }, - "io.mantisrx:mantis-publish-netty-guice": { - "project": true - }, - "io.mantisrx:mantis-shaded": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-discovery-proto" - ], - "project": true - }, - "io.reactivex:rxjava": { - "locked": "1.3.8" - }, - "net.andreinc:mockneat": { - "locked": "0.4.8" - }, - "org.slf4j:slf4j-log4j12": { - "locked": "1.7.0" - } - }, - "baseline-exact-dependencies-test": { - "junit:junit": { - "locked": "4.11" - }, - "junit:junit-dep": { - "locked": "4.11" + "locked": "1.18.36" } }, "compileClasspath": { @@ -79,13 +12,13 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.archaius:archaius2-core": { - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.archaius:archaius2-guice": { - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ @@ -127,7 +60,7 @@ "locked": "0.4.8" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.slf4j:slf4j-log4j12": { "locked": "1.7.0" @@ -135,7 +68,7 @@ }, "lombok": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "runtimeClasspath": { @@ -149,7 +82,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.archaius:archaius2-core": { "firstLevelTransitive": [ @@ -157,19 +90,19 @@ "io.mantisrx:mantis-publish-netty", "io.mantisrx:mantis-publish-netty-guice" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.archaius:archaius2-guice": { "firstLevelTransitive": [ "io.mantisrx:mantis-publish-netty-guice" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "1.7.12" + "locked": "1.8.2" }, "com.netflix.spectator:spectator-ext-ipc": { "firstLevelTransitive": [ @@ -177,7 +110,7 @@ "io.mantisrx:mantis-publish-netty", "io.mantisrx:mantis-publish-netty-guice" ], - "locked": "1.7.12" + "locked": "1.8.2" }, "com.netflix.spectator:spectator-nflx-plugin": { "firstLevelTransitive": [ @@ -258,7 +191,7 @@ }, "testAnnotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "testCompileClasspath": { @@ -269,13 +202,13 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.archaius:archaius2-core": { - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.archaius:archaius2-guice": { - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ @@ -323,7 +256,7 @@ "locked": "0.4.8" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.slf4j:slf4j-log4j12": { "locked": "1.7.0" @@ -340,7 +273,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.archaius:archaius2-core": { "firstLevelTransitive": [ @@ -348,19 +281,19 @@ "io.mantisrx:mantis-publish-netty", "io.mantisrx:mantis-publish-netty-guice" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.archaius:archaius2-guice": { "firstLevelTransitive": [ "io.mantisrx:mantis-publish-netty-guice" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "1.7.12" + "locked": "1.8.2" }, "com.netflix.spectator:spectator-ext-ipc": { "firstLevelTransitive": [ @@ -368,7 +301,7 @@ "io.mantisrx:mantis-publish-netty", "io.mantisrx:mantis-publish-netty-guice" ], - "locked": "1.7.12" + "locked": "1.8.2" }, "com.netflix.spectator:spectator-nflx-plugin": { "firstLevelTransitive": [ diff --git a/mantis-examples/mantis-examples-sine-function/dependencies.lock b/mantis-examples/mantis-examples-sine-function/dependencies.lock index 2ba99fa06..0a5f4ec89 100644 --- a/mantis-examples/mantis-examples-sine-function/dependencies.lock +++ b/mantis-examples/mantis-examples-sine-function/dependencies.lock @@ -1,197 +1,7 @@ { "annotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" - } - }, - "baseline-exact-dependencies-main": { - "com.github.spullara.cli-parser:cli-parser": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "1.1.1" - }, - "com.google.code.findbugs:jsr305": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "3.0.1" - }, - "com.netflix.spectator:spectator-api": { - "locked": "1.3.10" - }, - "com.netflix:mantis-rxnetty": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "0.4.19.1" - }, - "io.mantisrx:mantis-common": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core", - "io.mantisrx:mantis-network", - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-common-serde": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "project": true - }, - "io.mantisrx:mantis-control-plane-client": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-runtime-loader", - "io.mantisrx:mantis-server-worker-client" - ], - "project": true - }, - "io.mantisrx:mantis-control-plane-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-client", - "io.mantisrx:mantis-server-worker-client" - ], - "project": true - }, - "io.mantisrx:mantis-network": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-remote-observable": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-client", - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-runtime": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-runtime-executor" - ], - "project": true - }, - "io.mantisrx:mantis-runtime-executor": { - "project": true - }, - "io.mantisrx:mantis-runtime-loader": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-runtime-executor" - ], - "project": true - }, - "io.mantisrx:mantis-rxcontrol": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-runtime-executor" - ], - "project": true - }, - "io.mantisrx:mantis-server-worker-client": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-runtime-executor" - ], - "project": true - }, - "io.mantisrx:mantis-shaded": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common", - "io.mantisrx:mantis-common-serde", - "io.mantisrx:mantis-rxcontrol" - ], - "project": true - }, - "io.netty:netty-buffer": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-codec-http": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-handler": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-network" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-transport-native-epoll": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.reactivex:rxjava": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.3.8" - }, - "joda-time:joda-time": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "2.12.7" - }, - "org.apache.flink:flink-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "1.14.2" - }, - "org.apache.flink:flink-rpc-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "1.14.2" - }, - "org.hdrhistogram:HdrHistogram": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "2.1.12" - }, - "org.jctools:jctools-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.2.1" - }, - "org.json:json": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "20180813" - }, - "org.skife.config:config-magic": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "0.11" - }, - "org.slf4j:slf4j-api": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common", - "io.mantisrx:mantis-runtime" - ], - "locked": "1.7.15" - }, - "org.slf4j:slf4j-log4j12": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.7.0" - }, - "org.xerial.snappy:snappy-java": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.1.10.5" + "locked": "1.18.36" } }, "compileClasspath": { @@ -326,7 +136,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "org.apache.flink:flink-core": { "firstLevelTransitive": [ @@ -344,7 +154,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -359,7 +169,7 @@ "locked": "20180813" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.skife.config:config-magic": { "firstLevelTransitive": [ @@ -384,12 +194,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "lombok": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "runtimeClasspath": { @@ -568,6 +378,7 @@ }, "io.vavr:vavr": { "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core", "io.mantisrx:mantis-runtime-executor", "io.mantisrx:mantis-runtime-loader", "io.mantisrx:mantis-rxcontrol", @@ -585,7 +396,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "net.jcip:jcip-annotations": { "firstLevelTransitive": [ @@ -593,6 +404,12 @@ ], "locked": "1.0" }, + "net.openhft:zero-allocation-hashing": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-network" + ], + "locked": "0.27ea0" + }, "nz.ac.waikato.cms.moa:moa": { "firstLevelTransitive": [ "io.mantisrx:mantis-runtime-executor" @@ -633,7 +450,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -675,12 +492,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testAnnotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "testCompileClasspath": { @@ -815,7 +632,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "org.apache.flink:flink-core": { "firstLevelTransitive": [ @@ -833,7 +650,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -848,7 +665,7 @@ "locked": "20180813" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.skife.config:config-magic": { "firstLevelTransitive": [ @@ -873,7 +690,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testRuntimeClasspath": { @@ -1052,6 +869,7 @@ }, "io.vavr:vavr": { "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core", "io.mantisrx:mantis-runtime-executor", "io.mantisrx:mantis-runtime-loader", "io.mantisrx:mantis-rxcontrol", @@ -1069,7 +887,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "net.jcip:jcip-annotations": { "firstLevelTransitive": [ @@ -1077,6 +895,12 @@ ], "locked": "1.0" }, + "net.openhft:zero-allocation-hashing": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-network" + ], + "locked": "0.27ea0" + }, "nz.ac.waikato.cms.moa:moa": { "firstLevelTransitive": [ "io.mantisrx:mantis-runtime-executor" @@ -1117,7 +941,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -1159,7 +983,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } } } \ No newline at end of file diff --git a/mantis-examples/mantis-examples-synthetic-sourcejob/dependencies.lock b/mantis-examples/mantis-examples-synthetic-sourcejob/dependencies.lock index 2e39fa700..8d0073274 100644 --- a/mantis-examples/mantis-examples-synthetic-sourcejob/dependencies.lock +++ b/mantis-examples/mantis-examples-synthetic-sourcejob/dependencies.lock @@ -1,125 +1,7 @@ { "annotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" - } - }, - "baseline-exact-dependencies-main": { - "com.google.code.findbugs:jsr305": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "3.0.1" - }, - "com.netflix.spectator:spectator-api": { - "locked": "1.3.10" - }, - "com.netflix:mantis-rxnetty": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "0.4.19.1" - }, - "io.mantisrx:mantis-common": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-network", - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-common-serde": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "project": true - }, - "io.mantisrx:mantis-network": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-remote-observable": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-runtime": { - "project": true - }, - "io.mantisrx:mantis-shaded": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common", - "io.mantisrx:mantis-common-serde" - ], - "project": true - }, - "io.mantisrx:mql-jvm": { - "locked": "3.2.2" - }, - "io.netty:netty-buffer": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-codec-http": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-handler": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-network" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-transport-native-epoll": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.reactivex:rxjava": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.3.8" - }, - "net.andreinc:mockneat": { - "locked": "0.4.8" - }, - "org.jctools:jctools-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.2.1" - }, - "org.slf4j:slf4j-api": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common", - "io.mantisrx:mantis-runtime" - ], - "locked": "1.7.6" - }, - "org.slf4j:slf4j-log4j12": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.7.0" - }, - "org.xerial.snappy:snappy-java": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.1.10.5" - } - }, - "baseline-exact-dependencies-test": { - "org.mockito:mockito-all": { - "locked": "1.9.5" + "locked": "1.18.36" } }, "compileClasspath": { @@ -216,7 +98,7 @@ "locked": "1.2.1" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -235,12 +117,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "lombok": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "runtimeClasspath": { @@ -359,6 +241,12 @@ ], "locked": "1.0" }, + "net.openhft:zero-allocation-hashing": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-network" + ], + "locked": "0.27ea0" + }, "org.jctools:jctools-core": { "firstLevelTransitive": [ "io.mantisrx:mantis-common" @@ -384,12 +272,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testAnnotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "testCompileClasspath": { @@ -489,7 +377,7 @@ "locked": "1.9.5" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -508,7 +396,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testRuntimeClasspath": { @@ -627,6 +515,12 @@ ], "locked": "1.0" }, + "net.openhft:zero-allocation-hashing": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-network" + ], + "locked": "0.27ea0" + }, "org.jctools:jctools-core": { "firstLevelTransitive": [ "io.mantisrx:mantis-common" @@ -655,7 +549,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } } } \ No newline at end of file diff --git a/mantis-examples/mantis-examples-twitter-sample/dependencies.lock b/mantis-examples/mantis-examples-twitter-sample/dependencies.lock index 0c9928a21..1c8887a89 100644 --- a/mantis-examples/mantis-examples-twitter-sample/dependencies.lock +++ b/mantis-examples/mantis-examples-twitter-sample/dependencies.lock @@ -1,117 +1,7 @@ { "annotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" - } - }, - "baseline-exact-dependencies-main": { - "com.google.code.findbugs:jsr305": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "3.0.1" - }, - "com.netflix.spectator:spectator-api": { - "locked": "1.3.10" - }, - "com.netflix:mantis-rxnetty": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "0.4.19.1" - }, - "com.twitter:hbc-core": { - "locked": "2.2.0" - }, - "io.mantisrx:mantis-common": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-network", - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-common-serde": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "project": true - }, - "io.mantisrx:mantis-network": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-remote-observable": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-runtime": { - "project": true - }, - "io.mantisrx:mantis-shaded": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common", - "io.mantisrx:mantis-common-serde" - ], - "project": true - }, - "io.netty:netty-buffer": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-codec-http": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-handler": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-network" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-transport-native-epoll": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.reactivex:rxjava": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.3.8" - }, - "org.jctools:jctools-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.2.1" - }, - "org.slf4j:slf4j-api": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common", - "io.mantisrx:mantis-runtime" - ], - "locked": "1.7.6" - }, - "org.slf4j:slf4j-log4j12": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.7.0" - }, - "org.xerial.snappy:snappy-java": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.1.10.5" + "locked": "1.18.36" } }, "compileClasspath": { @@ -205,7 +95,7 @@ "locked": "1.2.1" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -224,12 +114,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "lombok": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "runtimeClasspath": { @@ -348,6 +238,12 @@ ], "locked": "1.0" }, + "net.openhft:zero-allocation-hashing": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-network" + ], + "locked": "0.27ea0" + }, "org.jctools:jctools-core": { "firstLevelTransitive": [ "io.mantisrx:mantis-common" @@ -373,12 +269,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testAnnotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "testCompileClasspath": { @@ -472,7 +368,7 @@ "locked": "1.2.1" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -491,7 +387,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testRuntimeClasspath": { @@ -610,6 +506,12 @@ ], "locked": "1.0" }, + "net.openhft:zero-allocation-hashing": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-network" + ], + "locked": "0.27ea0" + }, "org.jctools:jctools-core": { "firstLevelTransitive": [ "io.mantisrx:mantis-common" @@ -635,7 +537,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } } } \ No newline at end of file diff --git a/mantis-examples/mantis-examples-wordcount/dependencies.lock b/mantis-examples/mantis-examples-wordcount/dependencies.lock index 756df63f6..7bb0c5e42 100644 --- a/mantis-examples/mantis-examples-wordcount/dependencies.lock +++ b/mantis-examples/mantis-examples-wordcount/dependencies.lock @@ -1,120 +1,7 @@ { "annotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" - } - }, - "baseline-exact-dependencies-main": { - "com.google.code.findbugs:jsr305": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "3.0.1" - }, - "com.netflix.spectator:spectator-api": { - "locked": "1.3.10" - }, - "com.netflix:mantis-rxnetty": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "0.4.19.1" - }, - "com.twitter:hbc-core": { - "locked": "2.2.0" - }, - "io.mantisrx:mantis-common": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-network", - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-common-serde": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "project": true - }, - "io.mantisrx:mantis-examples-core": { - "project": true - }, - "io.mantisrx:mantis-network": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-remote-observable": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-runtime": { - "project": true - }, - "io.mantisrx:mantis-shaded": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common", - "io.mantisrx:mantis-common-serde" - ], - "project": true - }, - "io.netty:netty-buffer": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-codec-http": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-handler": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-network" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-transport-native-epoll": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.reactivex:rxjava": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.3.8" - }, - "org.jctools:jctools-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.2.1" - }, - "org.slf4j:slf4j-api": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common", - "io.mantisrx:mantis-runtime" - ], - "locked": "1.7.6" - }, - "org.slf4j:slf4j-log4j12": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.7.0" - }, - "org.xerial.snappy:snappy-java": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.1.10.5" + "locked": "1.18.36" } }, "compileClasspath": { @@ -211,7 +98,7 @@ "locked": "1.2.1" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -230,12 +117,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "lombok": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "runtimeClasspath": { @@ -360,6 +247,12 @@ ], "locked": "1.0" }, + "net.openhft:zero-allocation-hashing": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-network" + ], + "locked": "0.27ea0" + }, "org.jctools:jctools-core": { "firstLevelTransitive": [ "io.mantisrx:mantis-common" @@ -387,12 +280,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testAnnotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "testCompileClasspath": { @@ -489,7 +382,7 @@ "locked": "1.2.1" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -508,7 +401,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testRuntimeClasspath": { @@ -633,6 +526,12 @@ ], "locked": "1.0" }, + "net.openhft:zero-allocation-hashing": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-network" + ], + "locked": "0.27ea0" + }, "org.jctools:jctools-core": { "firstLevelTransitive": [ "io.mantisrx:mantis-common" @@ -660,7 +559,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } } } \ No newline at end of file diff --git a/mantis-network/dependencies.lock b/mantis-network/dependencies.lock index 36815288a..c1ca7d70d 100644 --- a/mantis-network/dependencies.lock +++ b/mantis-network/dependencies.lock @@ -1,7 +1,7 @@ { "annotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "compileClasspath": { @@ -67,7 +67,7 @@ "locked": "1.3.8" }, "net.openhft:zero-allocation-hashing": { - "locked": "0.26ea0" + "locked": "0.27ea0" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -76,7 +76,7 @@ "locked": "1.2.1" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -99,7 +99,7 @@ }, "lombok": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "runtimeClasspath": { @@ -180,7 +180,7 @@ "locked": "1.0" }, "net.openhft:zero-allocation-hashing": { - "locked": "0.26ea0" + "locked": "0.27ea0" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -209,7 +209,7 @@ }, "testAnnotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "testCompileClasspath": { @@ -275,7 +275,7 @@ "locked": "1.3.8" }, "net.openhft:zero-allocation-hashing": { - "locked": "0.26ea0" + "locked": "0.27ea0" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -293,10 +293,10 @@ "locked": "5.4.2" }, "org.mockito:mockito-core": { - "locked": "2.0.111-beta" + "locked": "5.14.2" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -398,7 +398,7 @@ "locked": "1.0" }, "net.openhft:zero-allocation-hashing": { - "locked": "0.26ea0" + "locked": "0.27ea0" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -416,7 +416,7 @@ "locked": "5.4.2" }, "org.mockito:mockito-core": { - "locked": "2.0.111-beta" + "locked": "5.14.2" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ diff --git a/mantis-publish/mantis-publish-core/build.gradle b/mantis-publish/mantis-publish-core/build.gradle index 0c5100c27..20dff7e71 100644 --- a/mantis-publish/mantis-publish-core/build.gradle +++ b/mantis-publish/mantis-publish-core/build.gradle @@ -30,12 +30,11 @@ dependencies { api "com.netflix.archaius:archaius2-api:$archaiusVersion" implementation "com.netflix.archaius:archaius2-core:$archaiusVersion" - - testImplementation "com.github.tomakehurst:wiremock-jre8:2.21.0" - testCompileOnly "com.netflix.archaius:archaius2-core:$archaiusVersion" - implementation libraries.slf4jApi + testImplementation libraries.junit4 + testImplementation libraries.wiremockjre8 + testCompileOnly "com.netflix.archaius:archaius2-core:$archaiusVersion" testImplementation libraries.junitJupiter testImplementation libraries.mockitoCore testImplementation libraries.slf4jLog4j12 diff --git a/mantis-publish/mantis-publish-core/dependencies.lock b/mantis-publish/mantis-publish-core/dependencies.lock index ea5654eac..1ea6a4daf 100644 --- a/mantis-publish/mantis-publish-core/dependencies.lock +++ b/mantis-publish/mantis-publish-core/dependencies.lock @@ -1,61 +1,15 @@ { "annotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" - } - }, - "baseline-exact-dependencies-main": { - "com.netflix.archaius:archaius2-core": { - "locked": "2.7.9" - }, - "com.netflix.spectator:spectator-ext-ipc": { - "locked": "0.134.0" - }, - "io.mantisrx:mantis-common-serde": { - "project": true - }, - "io.mantisrx:mantis-shaded": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common-serde" - ], - "project": true - }, - "io.mantisrx:mql-jvm": { - "locked": "3.2.2" - }, - "org.slf4j:slf4j-api": { - "locked": "1.7.0" - } - }, - "baseline-exact-dependencies-test": { - "com.github.tomakehurst:wiremock-jre8": { - "locked": "2.21.0" - }, - "commons-io:commons-io": { - "locked": "2.11.0" - }, - "org.junit.jupiter:junit-jupiter-api": { - "locked": "5.4.2" - }, - "org.junit.jupiter:junit-jupiter-engine": { - "locked": "5.4.2" - }, - "org.junit.jupiter:junit-jupiter-params": { - "locked": "5.4.2" - }, - "org.mockito:mockito-core": { - "locked": "2.0.111-beta" - }, - "org.slf4j:slf4j-log4j12": { - "locked": "1.7.0" + "locked": "1.18.36" } }, "compileClasspath": { "com.netflix.archaius:archaius2-api": { - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.archaius:archaius2-core": { - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.spectator:spectator-api": { "locked": "0.134.0" @@ -80,7 +34,7 @@ "locked": "3.2.2" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.slf4j:slf4j-api": { "locked": "1.7.0" @@ -88,15 +42,15 @@ }, "lombok": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "runtimeClasspath": { "com.netflix.archaius:archaius2-api": { - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.archaius:archaius2-core": { - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.spectator:spectator-api": { "locked": "0.134.0" @@ -132,18 +86,18 @@ }, "testAnnotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "testCompileClasspath": { "com.github.tomakehurst:wiremock-jre8": { - "locked": "2.21.0" + "locked": "2.35.2" }, "com.netflix.archaius:archaius2-api": { - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.archaius:archaius2-core": { - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.spectator:spectator-api": { "locked": "0.134.0" @@ -170,6 +124,12 @@ "io.mantisrx:mql-jvm": { "locked": "3.2.2" }, + "junit:junit": { + "locked": "4.11" + }, + "junit:junit-dep": { + "locked": "4.11" + }, "org.junit.jupiter:junit-jupiter-api": { "locked": "5.4.2" }, @@ -180,13 +140,13 @@ "locked": "5.4.2" }, "org.mockito:mockito-core": { - "locked": "2.0.111-beta" + "locked": "5.14.2" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.slf4j:slf4j-api": { - "locked": "1.7.25" + "locked": "1.7.33" }, "org.slf4j:slf4j-log4j12": { "locked": "1.7.0" @@ -194,13 +154,13 @@ }, "testRuntimeClasspath": { "com.github.tomakehurst:wiremock-jre8": { - "locked": "2.21.0" + "locked": "2.35.2" }, "com.netflix.archaius:archaius2-api": { - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.archaius:archaius2-core": { - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.spectator:spectator-api": { "locked": "0.134.0" @@ -233,6 +193,12 @@ ], "locked": "0.9.2" }, + "junit:junit": { + "locked": "4.11" + }, + "junit:junit-dep": { + "locked": "4.11" + }, "org.junit.jupiter:junit-jupiter-api": { "locked": "5.4.2" }, @@ -243,7 +209,7 @@ "locked": "5.4.2" }, "org.mockito:mockito-core": { - "locked": "2.0.111-beta" + "locked": "5.14.2" }, "org.slf4j:slf4j-api": { "locked": "1.7.36" diff --git a/mantis-publish/mantis-publish-core/src/test/java/io/mantisrx/publish/DefaultSubscriptionTrackerTest.java b/mantis-publish/mantis-publish-core/src/test/java/io/mantisrx/publish/DefaultSubscriptionTrackerTest.java index d5d916edf..d445b9776 100644 --- a/mantis-publish/mantis-publish-core/src/test/java/io/mantisrx/publish/DefaultSubscriptionTrackerTest.java +++ b/mantis-publish/mantis-publish-core/src/test/java/io/mantisrx/publish/DefaultSubscriptionTrackerTest.java @@ -356,7 +356,7 @@ public void testSubsNotRefreshOnNoRegisteredStreams() throws IOException { assertTrue(getCurrentSubIds(streamName).isEmpty()); verify(mockStreamManager, times(1)).getRegisteredStreams(); - verifyZeroInteractions(mockJobDiscovery); + verifyNoInteractions(mockJobDiscovery); } private static class SubscriptionsHelper { diff --git a/mantis-publish/mantis-publish-core/src/test/java/io/mantisrx/publish/internal/discovery/MantisJobDiscoveryTest.java b/mantis-publish/mantis-publish-core/src/test/java/io/mantisrx/publish/internal/discovery/MantisJobDiscoveryTest.java index a3635c893..b2c85eab6 100644 --- a/mantis-publish/mantis-publish-core/src/test/java/io/mantisrx/publish/internal/discovery/MantisJobDiscoveryTest.java +++ b/mantis-publish/mantis-publish-core/src/test/java/io/mantisrx/publish/internal/discovery/MantisJobDiscoveryTest.java @@ -43,7 +43,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Optional; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; import org.junit.Rule; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -52,7 +52,7 @@ import org.slf4j.LoggerFactory; -public class MantisJobDiscoveryTest { +class MantisJobDiscoveryTest { private static final Logger logger = LoggerFactory.getLogger(MantisJobDiscoveryTest.class); private final Map streamJobClusterMap = new HashMap<>(); @@ -121,8 +121,8 @@ public void testJobDiscoveryFetch() throws IOException { assertEquals(jobSchedulingInfo.getWorkerAssignments().get(1).getHosts().get(1).getHost(), currentJobWorkers.get().getIngestStageWorkers().getWorkers().get(0).getHost()); } + @Disabled("another flaky test") @Test - @Ignore("another flaky test") public void testJobDiscoveryFetchFailureHandlingAfterSuccess() throws IOException, InterruptedException { String jobCluster = "MantisJobDiscoveryTestJobCluster"; String jobId = jobCluster + "-1"; diff --git a/mantis-publish/mantis-publish-netty-guice/build.gradle b/mantis-publish/mantis-publish-netty-guice/build.gradle index 5bf64bd0f..da64deb79 100644 --- a/mantis-publish/mantis-publish-netty-guice/build.gradle +++ b/mantis-publish/mantis-publish-netty-guice/build.gradle @@ -39,3 +39,10 @@ dependencies { test { useJUnitPlatform() } + +tasks.withType(Test) { + jvmArgs += [ + '--add-opens', 'java.base/java.lang=ALL-UNNAMED', + '--add-opens', 'java.base/java.util=ALL-UNNAMED' + ] +} diff --git a/mantis-publish/mantis-publish-netty-guice/dependencies.lock b/mantis-publish/mantis-publish-netty-guice/dependencies.lock index 797457087..732ffbfc3 100644 --- a/mantis-publish/mantis-publish-netty-guice/dependencies.lock +++ b/mantis-publish/mantis-publish-netty-guice/dependencies.lock @@ -1,47 +1,7 @@ { "annotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" - } - }, - "baseline-exact-dependencies-main": { - "com.google.inject:guice": { - "locked": "4.2.2" - }, - "com.netflix.archaius:archaius2-core": { - "locked": "2.7.9" - }, - "com.netflix.archaius:archaius2-guice": { - "locked": "2.7.9" - }, - "com.netflix.spectator:spectator-ext-ipc": { - "locked": "0.96.0" - }, - "com.netflix.spectator:spectator-nflx-plugin": { - "locked": "0.96.0" - }, - "io.mantisrx:mantis-publish-netty": { - "project": true - }, - "org.slf4j:slf4j-api": { - "locked": "1.7.28" - } - }, - "baseline-exact-dependencies-test": { - "org.junit.jupiter:junit-jupiter-api": { - "locked": "5.4.2" - }, - "org.junit.jupiter:junit-jupiter-engine": { - "locked": "5.4.2" - }, - "org.junit.jupiter:junit-jupiter-params": { - "locked": "5.4.2" - }, - "org.mockito:mockito-core": { - "locked": "2.0.111-beta" - }, - "org.slf4j:slf4j-log4j12": { - "locked": "1.7.0" + "locked": "1.18.36" } }, "compileClasspath": { @@ -52,13 +12,13 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.archaius:archaius2-core": { - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.archaius:archaius2-guice": { - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ @@ -91,7 +51,7 @@ "project": true }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.slf4j:slf4j-api": { "locked": "1.7.28" @@ -99,7 +59,7 @@ }, "lombok": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "runtimeClasspath": { @@ -110,30 +70,30 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.archaius:archaius2-core": { "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core", "io.mantisrx:mantis-publish-netty" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.archaius:archaius2-guice": { - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "1.7.12" + "locked": "1.8.2" }, "com.netflix.spectator:spectator-ext-ipc": { "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core", "io.mantisrx:mantis-publish-netty" ], - "locked": "1.7.12" + "locked": "1.8.2" }, "com.netflix.spectator:spectator-nflx-plugin": { "locked": "0.96.0" @@ -194,7 +154,7 @@ }, "testAnnotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "testCompileClasspath": { @@ -205,13 +165,13 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.archaius:archaius2-core": { - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.archaius:archaius2-guice": { - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ @@ -253,10 +213,10 @@ "locked": "5.4.2" }, "org.mockito:mockito-core": { - "locked": "2.0.111-beta" + "locked": "5.14.2" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.slf4j:slf4j-api": { "locked": "1.7.28" @@ -273,30 +233,30 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.archaius:archaius2-core": { "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core", "io.mantisrx:mantis-publish-netty" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.archaius:archaius2-guice": { - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "1.7.12" + "locked": "1.8.2" }, "com.netflix.spectator:spectator-ext-ipc": { "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core", "io.mantisrx:mantis-publish-netty" ], - "locked": "1.7.12" + "locked": "1.8.2" }, "com.netflix.spectator:spectator-nflx-plugin": { "locked": "0.96.0" @@ -357,7 +317,7 @@ "locked": "5.4.2" }, "org.mockito:mockito-core": { - "locked": "2.0.111-beta" + "locked": "5.14.2" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ diff --git a/mantis-publish/mantis-publish-netty/dependencies.lock b/mantis-publish/mantis-publish-netty/dependencies.lock index a8957e0ed..7be7fef4e 100644 --- a/mantis-publish/mantis-publish-netty/dependencies.lock +++ b/mantis-publish/mantis-publish-netty/dependencies.lock @@ -1,65 +1,7 @@ { "annotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" - } - }, - "baseline-exact-dependencies-main": { - "com.netflix.archaius:archaius2-api": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-publish-core" - ], - "locked": "2.7.9" - }, - "com.netflix.archaius:archaius2-core": { - "locked": "2.7.9" - }, - "com.netflix.spectator:spectator-api": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-publish-core" - ], - "locked": "1.7.12" - }, - "com.netflix.spectator:spectator-ext-ipc": { - "locked": "1.7.12" - }, - "io.mantisrx:mantis-discovery-proto": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-publish-core" - ], - "project": true - }, - "io.mantisrx:mantis-publish-core": { - "project": true - }, - "io.mantisrx:mantis-shaded": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-discovery-proto" - ], - "project": true - }, - "io.netty:netty-all": { - "locked": "4.1.34.Final" - }, - "org.slf4j:slf4j-api": { - "locked": "1.7.0" - } - }, - "baseline-exact-dependencies-test": { - "org.junit.jupiter:junit-jupiter-api": { - "locked": "5.4.2" - }, - "org.junit.jupiter:junit-jupiter-engine": { - "locked": "5.4.2" - }, - "org.junit.jupiter:junit-jupiter-params": { - "locked": "5.4.2" - }, - "org.mockito:mockito-core": { - "locked": "2.0.111-beta" - }, - "org.slf4j:slf4j-log4j12": { - "locked": "1.7.0" + "locked": "1.18.36" } }, "compileClasspath": { @@ -67,19 +9,19 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.archaius:archaius2-core": { - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "1.7.12" + "locked": "1.8.2" }, "com.netflix.spectator:spectator-ext-ipc": { - "locked": "1.7.12" + "locked": "1.8.2" }, "io.mantisrx:mantis-discovery-proto": { "firstLevelTransitive": [ @@ -100,7 +42,7 @@ "locked": "4.1.34.Final" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.slf4j:slf4j-api": { "locked": "1.7.0" @@ -108,7 +50,7 @@ }, "lombok": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "runtimeClasspath": { @@ -116,25 +58,25 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.archaius:archaius2-core": { "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "1.7.12" + "locked": "1.8.2" }, "com.netflix.spectator:spectator-ext-ipc": { "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "1.7.12" + "locked": "1.8.2" }, "io.mantisrx:mantis-common-serde": { "firstLevelTransitive": [ @@ -182,7 +124,7 @@ }, "testAnnotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "testCompileClasspath": { @@ -190,19 +132,19 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.archaius:archaius2-core": { - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "1.7.12" + "locked": "1.8.2" }, "com.netflix.spectator:spectator-ext-ipc": { - "locked": "1.7.12" + "locked": "1.8.2" }, "io.mantisrx:mantis-discovery-proto": { "firstLevelTransitive": [ @@ -232,10 +174,10 @@ "locked": "5.4.2" }, "org.mockito:mockito-core": { - "locked": "2.0.111-beta" + "locked": "5.14.2" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.slf4j:slf4j-api": { "locked": "1.7.0" @@ -249,25 +191,25 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.archaius:archaius2-core": { "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "1.7.12" + "locked": "1.8.2" }, "com.netflix.spectator:spectator-ext-ipc": { "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "1.7.12" + "locked": "1.8.2" }, "io.mantisrx:mantis-common-serde": { "firstLevelTransitive": [ @@ -316,7 +258,7 @@ "locked": "5.4.2" }, "org.mockito:mockito-core": { - "locked": "2.0.111-beta" + "locked": "5.14.2" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ diff --git a/mantis-remote-observable/dependencies.lock b/mantis-remote-observable/dependencies.lock index 8df6c6706..e638ae85a 100644 --- a/mantis-remote-observable/dependencies.lock +++ b/mantis-remote-observable/dependencies.lock @@ -1,99 +1,7 @@ { "annotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" - } - }, - "baseline-exact-dependencies-main": { - "com.google.code.findbugs:jsr305": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "3.0.1" - }, - "com.netflix.rxjava:rxjava-math": { - "locked": "0.20.6" - }, - "com.netflix:mantis-rxnetty": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "0.4.19.1" - }, - "io.mantisrx:mantis-common": { - "project": true - }, - "io.mantisrx:mantis-common-serde": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "project": true - }, - "io.mantisrx:mantis-shaded": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common", - "io.mantisrx:mantis-common-serde" - ], - "project": true - }, - "io.netty:netty-buffer": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-codec-http": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-handler": { - "locked": "4.1.17.Final" - }, - "io.netty:netty-transport-native-epoll": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.reactivex:rxjava": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.3.8" - }, - "org.jctools:jctools-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.2.1" - }, - "org.slf4j:slf4j-api": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.7.6" - }, - "org.slf4j:slf4j-log4j12": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.7.0" - }, - "org.xerial.snappy:snappy-java": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.1.10.5" - } - }, - "baseline-exact-dependencies-test": { - "junit:junit": { - "locked": "4.11" - }, - "junit:junit-dep": { - "locked": "4.11" + "locked": "1.18.36" } }, "compileClasspath": { @@ -162,7 +70,7 @@ "locked": "1.2.1" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -180,12 +88,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "lombok": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "runtimeClasspath": { @@ -287,12 +195,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testAnnotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "testCompileClasspath": { @@ -367,7 +275,7 @@ "locked": "1.2.1" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -385,7 +293,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testRuntimeClasspath": { @@ -493,7 +401,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } } } \ No newline at end of file diff --git a/mantis-runtime-executor/build.gradle b/mantis-runtime-executor/build.gradle index 85daec82f..ac137c269 100644 --- a/mantis-runtime-executor/build.gradle +++ b/mantis-runtime-executor/build.gradle @@ -33,9 +33,16 @@ dependencies { implementation libraries.spectatorApi testImplementation libraries.junit4 - testImplementation libraries.mockitoAll + testImplementation libraries.mockitoCore testImplementation 'org.hamcrest:hamcrest-all:1.3' testImplementation libraries.vavrTest testImplementation(testFixtures(project(":mantis-common"))) testImplementation(testFixtures(project(":mantis-control-plane:mantis-control-plane-core"))) } + +tasks.withType(Test) { + jvmArgs += [ + '--add-opens', 'java.base/java.lang=ALL-UNNAMED', + '--add-opens', 'java.base/java.util=ALL-UNNAMED' + ] +} diff --git a/mantis-runtime-executor/dependencies.lock b/mantis-runtime-executor/dependencies.lock index 882563c2a..cb2069c37 100644 --- a/mantis-runtime-executor/dependencies.lock +++ b/mantis-runtime-executor/dependencies.lock @@ -1,175 +1,7 @@ { "annotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" - } - }, - "baseline-exact-dependencies-main": { - "com.netflix.spectator:spectator-api": { - "locked": "1.3.10" - }, - "com.yahoo.datasketches:sketches-core": { - "locked": "0.9.1" - }, - "io.vavr:vavr": { - "locked": "0.9.2" - }, - "nz.ac.waikato.cms.moa:moa": { - "locked": "2017.06" - }, - "org.apache.httpcomponents:httpclient": { - "locked": "4.5.14" - }, - "org.slf4j:slf4j-api": { - "locked": "1.7.0" - }, - "org.slf4j:slf4j-log4j12": { - "locked": "1.7.0" - } - }, - "baseline-exact-dependencies-test": { - "com.github.spullara.cli-parser:cli-parser": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "1.1.1" - }, - "com.google.code.findbugs:jsr305": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "3.0.1" - }, - "com.netflix:mantis-rxnetty": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "0.4.19.1" - }, - "io.mantisrx:mantis-common": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common", - "io.mantisrx:mantis-control-plane-core" - ], - "project": true - }, - "io.mantisrx:mantis-common-serde": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "project": true - }, - "io.mantisrx:mantis-control-plane-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "project": true - }, - "io.mantisrx:mantis-shaded": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common", - "io.mantisrx:mantis-common-serde" - ], - "project": true - }, - "io.netty:netty-buffer": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-codec-http": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-transport-native-epoll": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.reactivex:rxjava": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.3.8" - }, - "io.vavr:vavr-test": { - "locked": "0.9.2" - }, - "joda-time:joda-time": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "2.12.7" - }, - "junit:junit": { - "locked": "4.11" - }, - "junit:junit-dep": { - "locked": "4.11" - }, - "org.apache.flink:flink-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "1.14.2" - }, - "org.apache.flink:flink-rpc-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "1.14.2" - }, - "org.hamcrest:hamcrest-all": { - "locked": "1.3" - }, - "org.hdrhistogram:HdrHistogram": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "2.1.12" - }, - "org.jctools:jctools-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.2.1" - }, - "org.json:json": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "20180813" - }, - "org.mockito:mockito-all": { - "locked": "2.0.2-beta" - }, - "org.skife.config:config-magic": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "0.11" - }, - "org.slf4j:slf4j-api": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.7.15" - }, - "org.slf4j:slf4j-log4j12": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.7.0" - }, - "org.xerial.snappy:snappy-java": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.1.10.5" + "locked": "1.18.36" } }, "compileClasspath": { @@ -295,7 +127,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "nz.ac.waikato.cms.moa:moa": { "locked": "2017.06" @@ -319,7 +151,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -334,7 +166,7 @@ "locked": "20180813" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.skife.config:config-magic": { "firstLevelTransitive": [ @@ -359,12 +191,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "lombok": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "runtimeClasspath": { @@ -526,6 +358,7 @@ }, "io.vavr:vavr": { "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core", "io.mantisrx:mantis-runtime-loader", "io.mantisrx:mantis-rxcontrol", "io.mantisrx:mantis-shaded" @@ -542,7 +375,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "net.jcip:jcip-annotations": { "firstLevelTransitive": [ @@ -550,6 +383,12 @@ ], "locked": "1.0" }, + "net.openhft:zero-allocation-hashing": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-network" + ], + "locked": "0.27ea0" + }, "nz.ac.waikato.cms.moa:moa": { "locked": "2017.06" }, @@ -584,7 +423,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -624,12 +463,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testAnnotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "testCompileClasspath": { @@ -760,7 +599,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "junit:junit": { "locked": "4.11" @@ -793,7 +632,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -807,11 +646,11 @@ ], "locked": "20180813" }, - "org.mockito:mockito-all": { - "locked": "2.0.2-beta" + "org.mockito:mockito-core": { + "locked": "5.14.2" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.skife.config:config-magic": { "firstLevelTransitive": [ @@ -836,7 +675,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testRuntimeClasspath": { @@ -1000,6 +839,7 @@ }, "io.vavr:vavr": { "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core", "io.mantisrx:mantis-runtime-loader", "io.mantisrx:mantis-rxcontrol", "io.mantisrx:mantis-shaded" @@ -1019,7 +859,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "junit:junit": { "locked": "4.11" @@ -1033,6 +873,12 @@ ], "locked": "1.0" }, + "net.openhft:zero-allocation-hashing": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-network" + ], + "locked": "0.27ea0" + }, "nz.ac.waikato.cms.moa:moa": { "locked": "2017.06" }, @@ -1076,7 +922,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -1090,8 +936,8 @@ ], "locked": "20180813" }, - "org.mockito:mockito-all": { - "locked": "2.0.2-beta" + "org.mockito:mockito-core": { + "locked": "5.14.2" }, "org.skife.config:config-magic": { "firstLevelTransitive": [ @@ -1119,7 +965,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } } } \ No newline at end of file diff --git a/mantis-runtime-executor/src/test/java/io/mantisrx/server/worker/jobmaster/JobAutoScalerTest.java b/mantis-runtime-executor/src/test/java/io/mantisrx/server/worker/jobmaster/JobAutoScalerTest.java index a92ef883e..9c463a884 100644 --- a/mantis-runtime-executor/src/test/java/io/mantisrx/server/worker/jobmaster/JobAutoScalerTest.java +++ b/mantis-runtime-executor/src/test/java/io/mantisrx/server/worker/jobmaster/JobAutoScalerTest.java @@ -21,8 +21,8 @@ import static io.mantisrx.runtime.descriptor.StageScalingPolicy.ScalingReason.UserDefined; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.*; import io.mantisrx.runtime.Context; diff --git a/mantis-runtime-executor/src/test/java/io/mantisrx/server/worker/jobmaster/WorkerMetricHandlerTest.java b/mantis-runtime-executor/src/test/java/io/mantisrx/server/worker/jobmaster/WorkerMetricHandlerTest.java index cfa81ce71..91e12c4bf 100644 --- a/mantis-runtime-executor/src/test/java/io/mantisrx/server/worker/jobmaster/WorkerMetricHandlerTest.java +++ b/mantis-runtime-executor/src/test/java/io/mantisrx/server/worker/jobmaster/WorkerMetricHandlerTest.java @@ -22,8 +22,8 @@ import static io.reactivex.mantis.network.push.PushServerSse.PROCESSED_COUNTER_METRIC_NAME; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/mantis-runtime-loader/build.gradle b/mantis-runtime-loader/build.gradle index 50e61c9f3..9d168da40 100644 --- a/mantis-runtime-loader/build.gradle +++ b/mantis-runtime-loader/build.gradle @@ -19,7 +19,7 @@ dependencies { implementation libraries.vavr testImplementation libraries.junit4 - testImplementation libraries.mockitoAll + testImplementation libraries.mockitoCore testImplementation(testFixtures(project(":mantis-common"))) } diff --git a/mantis-runtime-loader/dependencies.lock b/mantis-runtime-loader/dependencies.lock index 4b0151831..c680c4ea0 100644 --- a/mantis-runtime-loader/dependencies.lock +++ b/mantis-runtime-loader/dependencies.lock @@ -1,102 +1,7 @@ { "annotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" - } - }, - "baseline-exact-dependencies-main": { - "io.vavr:vavr": { - "locked": "0.9.2" - } - }, - "baseline-exact-dependencies-test": { - "com.google.code.findbugs:jsr305": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "3.0.1" - }, - "com.netflix:mantis-rxnetty": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "0.4.19.1" - }, - "io.mantisrx:mantis-common": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "project": true - }, - "io.mantisrx:mantis-common-serde": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "project": true - }, - "io.mantisrx:mantis-shaded": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common", - "io.mantisrx:mantis-common-serde" - ], - "project": true - }, - "io.netty:netty-buffer": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-codec-http": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-transport-native-epoll": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.reactivex:rxjava": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.3.8" - }, - "junit:junit": { - "locked": "4.11" - }, - "junit:junit-dep": { - "locked": "4.11" - }, - "org.jctools:jctools-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.2.1" - }, - "org.mockito:mockito-all": { - "locked": "2.0.2-beta" - }, - "org.slf4j:slf4j-api": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.7.6" - }, - "org.slf4j:slf4j-log4j12": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.7.0" - }, - "org.xerial.snappy:snappy-java": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.1.10.5" + "locked": "1.18.36" } }, "compileClasspath": { @@ -183,7 +88,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "org.apache.flink:flink-core": { "firstLevelTransitive": [ @@ -201,7 +106,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -216,7 +121,7 @@ "locked": "20180813" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.skife.config:config-magic": { "firstLevelTransitive": [ @@ -240,12 +145,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "lombok": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "runtimeClasspath": { @@ -353,6 +258,7 @@ }, "io.vavr:vavr": { "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core", "io.mantisrx:mantis-shaded" ], "locked": "0.9.2" @@ -361,7 +267,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "net.jcip:jcip-annotations": { "firstLevelTransitive": [ @@ -391,7 +297,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -429,12 +335,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testAnnotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "testCompileClasspath": { @@ -522,7 +428,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "junit:junit": { "locked": "4.11" @@ -546,7 +452,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -560,11 +466,11 @@ ], "locked": "20180813" }, - "org.mockito:mockito-all": { - "locked": "2.0.2-beta" + "org.mockito:mockito-core": { + "locked": "5.14.2" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.skife.config:config-magic": { "firstLevelTransitive": [ @@ -588,7 +494,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testRuntimeClasspath": { @@ -697,6 +603,7 @@ }, "io.vavr:vavr": { "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core", "io.mantisrx:mantis-shaded" ], "locked": "0.9.2" @@ -705,7 +612,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "junit:junit": { "locked": "4.11" @@ -741,7 +648,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -755,8 +662,8 @@ ], "locked": "20180813" }, - "org.mockito:mockito-all": { - "locked": "2.0.2-beta" + "org.mockito:mockito-core": { + "locked": "5.14.2" }, "org.skife.config:config-magic": { "firstLevelTransitive": [ @@ -782,7 +689,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } } } \ No newline at end of file diff --git a/mantis-runtime/dependencies.lock b/mantis-runtime/dependencies.lock index 7554c18ab..edbaf4d3d 100644 --- a/mantis-runtime/dependencies.lock +++ b/mantis-runtime/dependencies.lock @@ -1,21 +1,7 @@ { "annotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" - } - }, - "baseline-exact-dependencies-test": { - "com.netflix.spectator:spectator-api": { - "locked": "1.3.10" - }, - "junit:junit": { - "locked": "4.11" - }, - "junit:junit-dep": { - "locked": "4.11" - }, - "org.mockito:mockito-core": { - "locked": "2.0.111-beta" + "locked": "1.18.36" } }, "compileClasspath": { @@ -96,7 +82,7 @@ "locked": "1.2.1" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -114,12 +100,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "lombok": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "runtimeClasspath": { @@ -222,6 +208,12 @@ ], "locked": "1.0" }, + "net.openhft:zero-allocation-hashing": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-network" + ], + "locked": "0.27ea0" + }, "org.jctools:jctools-core": { "firstLevelTransitive": [ "io.mantisrx:mantis-common" @@ -246,12 +238,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testAnnotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "testCompileClasspath": { @@ -338,10 +330,10 @@ "locked": "1.2.1" }, "org.mockito:mockito-core": { - "locked": "2.0.111-beta" + "locked": "5.14.2" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -359,7 +351,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testRuntimeClasspath": { @@ -471,6 +463,12 @@ ], "locked": "1.0" }, + "net.openhft:zero-allocation-hashing": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-network" + ], + "locked": "0.27ea0" + }, "org.jctools:jctools-core": { "firstLevelTransitive": [ "io.mantisrx:mantis-common" @@ -478,7 +476,7 @@ "locked": "1.2.1" }, "org.mockito:mockito-core": { - "locked": "2.0.111-beta" + "locked": "5.14.2" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -498,7 +496,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } } } \ No newline at end of file diff --git a/mantis-runtime/src/test/java/io/mantisrx/runtime/source/http/ClientResumePoliciesTest.java b/mantis-runtime/src/test/java/io/mantisrx/runtime/source/http/ClientResumePoliciesTest.java index b4a1e6510..3249c8e5c 100644 --- a/mantis-runtime/src/test/java/io/mantisrx/runtime/source/http/ClientResumePoliciesTest.java +++ b/mantis-runtime/src/test/java/io/mantisrx/runtime/source/http/ClientResumePoliciesTest.java @@ -21,7 +21,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/mantis-rxcontrol/dependencies.lock b/mantis-rxcontrol/dependencies.lock index dfeaacb45..6b42a9753 100644 --- a/mantis-rxcontrol/dependencies.lock +++ b/mantis-rxcontrol/dependencies.lock @@ -1,44 +1,7 @@ { "annotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" - } - }, - "baseline-exact-dependencies-main": { - "com.mashape.unirest:unirest-java": { - "locked": "1.4.9" - }, - "com.netflix.rxjava:rxjava-math": { - "locked": "0.20.6" - }, - "com.yahoo.datasketches:sketches-core": { - "locked": "0.9.1" - }, - "io.reactivex:rxjava": { - "locked": "1.3.8" - }, - "io.vavr:vavr": { - "locked": "0.9.2" - }, - "org.apache.commons:commons-math3": { - "locked": "3.5" - }, - "org.slf4j:slf4j-api": { - "locked": "1.7.0" - } - }, - "baseline-exact-dependencies-test": { - "junit:junit": { - "locked": "4.11" - }, - "junit:junit-dep": { - "locked": "4.11" - }, - "org.assertj:assertj-core": { - "locked": "3.12.2" - }, - "org.mockito:mockito-core": { - "locked": "2.0.111-beta" + "locked": "1.18.36" } }, "compileClasspath": { @@ -64,7 +27,7 @@ "locked": "3.5" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.slf4j:slf4j-api": { "locked": "1.7.0" @@ -72,7 +35,7 @@ }, "lombok": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "runtimeClasspath": { @@ -109,7 +72,7 @@ }, "testAnnotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "testCompileClasspath": { @@ -147,10 +110,10 @@ "locked": "3.12.2" }, "org.mockito:mockito-core": { - "locked": "2.0.111-beta" + "locked": "5.14.2" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.slf4j:slf4j-api": { "locked": "1.7.0" @@ -194,7 +157,7 @@ "locked": "3.12.2" }, "org.mockito:mockito-core": { - "locked": "2.0.111-beta" + "locked": "5.14.2" }, "org.slf4j:slf4j-api": { "locked": "1.7.0" diff --git a/mantis-server/mantis-server-agent/build.gradle b/mantis-server/mantis-server-agent/build.gradle index 22898c28d..d7d203d8d 100644 --- a/mantis-server/mantis-server-agent/build.gradle +++ b/mantis-server/mantis-server-agent/build.gradle @@ -35,7 +35,7 @@ dependencies { implementation "io.github.resilience4j:resilience4j-retry:1.5.0" testImplementation libraries.junit4 - testImplementation libraries.mockitoAll + testImplementation libraries.mockitoCore testImplementation project(":mantis-runtime-executor") testImplementation(testFixtures(project(":mantis-control-plane:mantis-control-plane-core"))) } @@ -90,3 +90,10 @@ dockerSyncBuildContext.dependsOn(installDist) dockerSyncBuildContext.dependsOn(project.tasks.processTestResources) mainClassName = "io.mantisrx.server.agent.AgentV2Main" + +tasks.withType(Test) { + jvmArgs += [ + '--add-opens', 'java.base/java.lang=ALL-UNNAMED', + '--add-opens', 'java.base/java.util=ALL-UNNAMED' + ] +} diff --git a/mantis-server/mantis-server-agent/dependencies.lock b/mantis-server/mantis-server-agent/dependencies.lock index 134bdece5..90e544202 100644 --- a/mantis-server/mantis-server-agent/dependencies.lock +++ b/mantis-server/mantis-server-agent/dependencies.lock @@ -1,233 +1,7 @@ { "annotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" - } - }, - "baseline-exact-dependencies-main": { - "com.netflix.spectator:spectator-api": { - "locked": "1.3.10" - }, - "com.spotify:completable-futures": { - "locked": "0.3.1" - }, - "commons-io:commons-io": { - "locked": "2.11.0" - }, - "io.github.resilience4j:resilience4j-retry": { - "locked": "1.5.0" - }, - "io.vavr:vavr": { - "locked": "0.10.2" - }, - "net.lingala.zip4j:zip4j": { - "locked": "2.9.0" - }, - "org.apache.hadoop:hadoop-common": { - "locked": "2.7.7" - }, - "org.slf4j:slf4j-api": { - "locked": "1.7.30" - }, - "org.slf4j:slf4j-log4j12": { - "locked": "1.7.0" - } - }, - "baseline-exact-dependencies-test": { - "com.github.spullara.cli-parser:cli-parser": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "1.1.1" - }, - "com.google.code.findbugs:jsr305": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "3.0.1" - }, - "com.netflix:mantis-rxnetty": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "0.4.19.1" - }, - "io.mantisrx:mantis-common": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core", - "io.mantisrx:mantis-network", - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-common-serde": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "project": true - }, - "io.mantisrx:mantis-control-plane-client": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-runtime-loader", - "io.mantisrx:mantis-server-worker-client" - ], - "project": true - }, - "io.mantisrx:mantis-control-plane-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-client", - "io.mantisrx:mantis-control-plane-core", - "io.mantisrx:mantis-server-worker-client" - ], - "project": true - }, - "io.mantisrx:mantis-network": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-remote-observable": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-client", - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-runtime": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-runtime-executor" - ], - "project": true - }, - "io.mantisrx:mantis-runtime-executor": { - "project": true - }, - "io.mantisrx:mantis-runtime-loader": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-runtime-executor" - ], - "project": true - }, - "io.mantisrx:mantis-rxcontrol": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-runtime-executor" - ], - "project": true - }, - "io.mantisrx:mantis-server-worker-client": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-runtime-executor" - ], - "project": true - }, - "io.mantisrx:mantis-shaded": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common", - "io.mantisrx:mantis-common-serde", - "io.mantisrx:mantis-rxcontrol" - ], - "project": true - }, - "io.netty:netty-buffer": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-codec-http": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-handler": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-network" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-transport-native-epoll": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.reactivex:rxjava": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.3.8" - }, - "joda-time:joda-time": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "2.12.7" - }, - "junit:junit": { - "locked": "4.11" - }, - "junit:junit-dep": { - "locked": "4.11" - }, - "org.apache.flink:flink-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "1.14.2" - }, - "org.apache.flink:flink-rpc-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "1.14.2" - }, - "org.hdrhistogram:HdrHistogram": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "2.1.12" - }, - "org.jctools:jctools-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.2.1" - }, - "org.json:json": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "20180813" - }, - "org.mockito:mockito-all": { - "locked": "2.0.2-beta" - }, - "org.skife.config:config-magic": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "0.11" - }, - "org.slf4j:slf4j-api": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common", - "io.mantisrx:mantis-runtime" - ], - "locked": "1.7.15" - }, - "org.slf4j:slf4j-log4j12": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.7.0" - }, - "org.xerial.snappy:snappy-java": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.1.10.5" + "locked": "1.18.36" } }, "compileClasspath": { @@ -287,6 +61,9 @@ ], "project": true }, + "io.mantisrx:mantis-control-plane-dynamodb": { + "project": true + }, "io.mantisrx:mantis-remote-observable": { "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-client" @@ -337,7 +114,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "net.lingala.zip4j:zip4j": { "locked": "2.9.0" @@ -361,7 +138,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -376,7 +153,7 @@ "locked": "20180813" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.skife.config:config-magic": { "firstLevelTransitive": [ @@ -400,15 +177,21 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "lombok": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "runtimeClasspath": { + "com.amazonaws:dynamodb-lock-client": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-dynamodb" + ], + "locked": "1.2.0" + }, "com.github.spullara.cli-parser:cli-parser": { "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" @@ -429,6 +212,7 @@ }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-dynamodb", "io.mantisrx:mantis-server-worker-client" ], "locked": "1.3.10" @@ -478,10 +262,14 @@ "io.mantisrx:mantis-control-plane-core": { "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-client", + "io.mantisrx:mantis-control-plane-dynamodb", "io.mantisrx:mantis-server-worker-client" ], "project": true }, + "io.mantisrx:mantis-control-plane-dynamodb": { + "project": true + }, "io.mantisrx:mantis-remote-observable": { "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-client" @@ -505,19 +293,19 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "4.1.60.Final" + "locked": "4.1.115.Final" }, "io.netty:netty-codec-http": { "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "4.1.60.Final" + "locked": "4.1.115.Final" }, "io.netty:netty-handler": { "firstLevelTransitive": [ "io.mantisrx:mantis-remote-observable" ], - "locked": "4.1.60.Final" + "locked": "4.1.115.Final" }, "io.netty:netty-transport-native-epoll": { "firstLevelTransitive": [ @@ -533,6 +321,8 @@ }, "io.vavr:vavr": { "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core", + "io.mantisrx:mantis-control-plane-dynamodb", "io.mantisrx:mantis-runtime-loader", "io.mantisrx:mantis-shaded" ], @@ -542,7 +332,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "net.jcip:jcip-annotations": { "firstLevelTransitive": [ @@ -578,7 +368,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -616,12 +406,36 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" + }, + "software.amazon.awssdk:aws-core": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-dynamodb" + ], + "locked": "2.29.38" + }, + "software.amazon.awssdk:bom": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-dynamodb" + ], + "locked": "2.23.15" + }, + "software.amazon.awssdk:dynamodb": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-dynamodb" + ], + "locked": "2.23.15" + }, + "software.amazon.awssdk:sts": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-dynamodb" + ], + "locked": "2.29.38" } }, "testAnnotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "testCompileClasspath": { @@ -684,6 +498,9 @@ ], "project": true }, + "io.mantisrx:mantis-control-plane-dynamodb": { + "project": true + }, "io.mantisrx:mantis-network": { "firstLevelTransitive": [ "io.mantisrx:mantis-runtime" @@ -769,7 +586,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "junit:junit": { "locked": "4.11" @@ -799,7 +616,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -813,11 +630,11 @@ ], "locked": "20180813" }, - "org.mockito:mockito-all": { - "locked": "2.0.2-beta" + "org.mockito:mockito-core": { + "locked": "5.14.2" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.skife.config:config-magic": { "firstLevelTransitive": [ @@ -842,10 +659,16 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testRuntimeClasspath": { + "com.amazonaws:dynamodb-lock-client": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-dynamodb" + ], + "locked": "1.2.0" + }, "com.github.spullara.cli-parser:cli-parser": { "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" @@ -873,6 +696,7 @@ }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-dynamodb", "io.mantisrx:mantis-runtime-executor", "io.mantisrx:mantis-server-worker-client" ], @@ -933,10 +757,14 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-client", "io.mantisrx:mantis-control-plane-core", + "io.mantisrx:mantis-control-plane-dynamodb", "io.mantisrx:mantis-server-worker-client" ], "project": true }, + "io.mantisrx:mantis-control-plane-dynamodb": { + "project": true + }, "io.mantisrx:mantis-network": { "firstLevelTransitive": [ "io.mantisrx:mantis-runtime" @@ -995,20 +823,20 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "4.1.60.Final" + "locked": "4.1.115.Final" }, "io.netty:netty-codec-http": { "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "4.1.60.Final" + "locked": "4.1.115.Final" }, "io.netty:netty-handler": { "firstLevelTransitive": [ "io.mantisrx:mantis-network", "io.mantisrx:mantis-remote-observable" ], - "locked": "4.1.60.Final" + "locked": "4.1.115.Final" }, "io.netty:netty-transport-native-epoll": { "firstLevelTransitive": [ @@ -1025,6 +853,8 @@ }, "io.vavr:vavr": { "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core", + "io.mantisrx:mantis-control-plane-dynamodb", "io.mantisrx:mantis-runtime-executor", "io.mantisrx:mantis-runtime-loader", "io.mantisrx:mantis-rxcontrol", @@ -1042,7 +872,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "junit:junit": { "locked": "4.11" @@ -1059,6 +889,12 @@ "net.lingala.zip4j:zip4j": { "locked": "2.9.0" }, + "net.openhft:zero-allocation-hashing": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-network" + ], + "locked": "0.27ea0" + }, "nz.ac.waikato.cms.moa:moa": { "firstLevelTransitive": [ "io.mantisrx:mantis-runtime-executor" @@ -1108,7 +944,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -1122,8 +958,8 @@ ], "locked": "20180813" }, - "org.mockito:mockito-all": { - "locked": "2.0.2-beta" + "org.mockito:mockito-core": { + "locked": "5.14.2" }, "org.skife.config:config-magic": { "firstLevelTransitive": [ @@ -1153,7 +989,31 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" + }, + "software.amazon.awssdk:aws-core": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-dynamodb" + ], + "locked": "2.29.38" + }, + "software.amazon.awssdk:bom": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-dynamodb" + ], + "locked": "2.23.15" + }, + "software.amazon.awssdk:dynamodb": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-dynamodb" + ], + "locked": "2.23.15" + }, + "software.amazon.awssdk:sts": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-dynamodb" + ], + "locked": "2.29.38" } } } \ No newline at end of file diff --git a/mantis-server/mantis-server-agent/src/test/java/io/mantisrx/server/agent/BlobStoreTest.java b/mantis-server/mantis-server-agent/src/test/java/io/mantisrx/server/agent/BlobStoreTest.java index e1e1371d6..a6e33741d 100644 --- a/mantis-server/mantis-server-agent/src/test/java/io/mantisrx/server/agent/BlobStoreTest.java +++ b/mantis-server/mantis-server-agent/src/test/java/io/mantisrx/server/agent/BlobStoreTest.java @@ -16,7 +16,7 @@ package io.mantisrx.server.agent; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -26,7 +26,7 @@ import java.io.IOException; import java.net.URI; import org.junit.Test; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; public class BlobStoreTest { @Test @@ -41,11 +41,11 @@ public void testPrefixedBlobStore() throws Exception { final URI expectedUri = new URI("s3://mantisrx.s3.store/mantis/jobs/sananthanarayanan-mantis-jobs-sine-function-thin-0.1.0.zip"); - verify(blobStore, times(1)).get(Matchers.eq(expectedUri)); + verify(blobStore, times(1)).get(ArgumentMatchers.eq(expectedUri)); prefixedBlobStpre.get(new URI( "https://mantisrx.region.prod.io.net/mantis-artifacts/sananthanarayanan-mantis-jobs-sine-function-thin-0.1.0.zip")); - verify(blobStore, times(2)).get(Matchers.eq(expectedUri)); + verify(blobStore, times(2)).get(ArgumentMatchers.eq(expectedUri)); } @Test @@ -67,16 +67,16 @@ public void testFallbackBlobStore() throws Exception { final URI expectedUri = new URI("s3://mantisrx.s3.store/mantis/jobs/sananthanarayanan-mantis-jobs-sine-function-thin-0.1.0.zip"); - verify(blobStore, times(1)).get(Matchers.eq(expectedUri)); + verify(blobStore, times(1)).get(ArgumentMatchers.eq(expectedUri)); final URI expectedFallbackUri = new URI("s3://mantisrx.s3.store.fallback/mantis/jobs/sananthanarayanan-mantis-jobs-sine-function-thin-0.1" + ".0.zip"); - verify(fallbackBlobStore, times(1)).get(Matchers.eq(expectedFallbackUri)); + verify(fallbackBlobStore, times(1)).get(ArgumentMatchers.eq(expectedFallbackUri)); // test non-fallback path fallbackEnabledBlobStore.get(new URI("http://sananthanarayanan-mantis-jobs-sine-function-thin-0.1.0.zip")); - verify(blobStore, times(2)).get(Matchers.eq(expectedUri)); - verify(fallbackBlobStore, times(1)).get(Matchers.eq(expectedFallbackUri)); + verify(blobStore, times(2)).get(ArgumentMatchers.eq(expectedUri)); + verify(fallbackBlobStore, times(1)).get(ArgumentMatchers.eq(expectedFallbackUri)); } } diff --git a/mantis-server/mantis-server-agent/src/test/java/io/mantisrx/server/agent/ResourceManagerGatewayCxnTest.java b/mantis-server/mantis-server-agent/src/test/java/io/mantisrx/server/agent/ResourceManagerGatewayCxnTest.java index a147f29e0..20edd6b76 100644 --- a/mantis-server/mantis-server-agent/src/test/java/io/mantisrx/server/agent/ResourceManagerGatewayCxnTest.java +++ b/mantis-server/mantis-server-agent/src/test/java/io/mantisrx/server/agent/ResourceManagerGatewayCxnTest.java @@ -54,7 +54,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -117,11 +117,11 @@ public void setup() throws IOException { @Test public void testIfTaskExecutorRegistersItselfWithResourceManagerAndSendsHeartbeatsPeriodically() throws Exception { - when(gateway.registerTaskExecutor(Matchers.eq(registration))).thenReturn( + when(gateway.registerTaskExecutor(ArgumentMatchers.eq(registration))).thenReturn( CompletableFuture.completedFuture(null)); - when(gateway.disconnectTaskExecutor(Matchers.eq(disconnection))).thenReturn( + when(gateway.disconnectTaskExecutor(ArgumentMatchers.eq(disconnection))).thenReturn( CompletableFuture.completedFuture(null)); - when(gateway.heartBeatFromTaskExecutor(Matchers.eq(heartbeat))) + when(gateway.heartBeatFromTaskExecutor(ArgumentMatchers.eq(heartbeat))) .thenReturn(CompletableFuture.completedFuture(null)); cxn.startAsync().awaitRunning(); @@ -133,11 +133,11 @@ public void testIfTaskExecutorRegistersItselfWithResourceManagerAndSendsHeartbea @Test public void testWhenRegistrationFailsIntermittently() throws Throwable { - when(gateway.heartBeatFromTaskExecutor(Matchers.eq(heartbeat))) + when(gateway.heartBeatFromTaskExecutor(ArgumentMatchers.eq(heartbeat))) .thenReturn(CompletableFuture.completedFuture(null)); - when(gateway.disconnectTaskExecutor(Matchers.eq(disconnection))).thenReturn( + when(gateway.disconnectTaskExecutor(ArgumentMatchers.eq(disconnection))).thenReturn( CompletableFuture.completedFuture(null)); - when(gateway.registerTaskExecutor(Matchers.eq(registration))) + when(gateway.registerTaskExecutor(ArgumentMatchers.eq(registration))) .thenAnswer(new Answer>() { private int count = 0; @@ -161,11 +161,11 @@ public CompletableFuture answer(InvocationOnMock invocation) { @Test public void testWhenRegistrationFailsContinuously() throws Throwable { - when(gateway.heartBeatFromTaskExecutor(Matchers.eq(heartbeat))) + when(gateway.heartBeatFromTaskExecutor(ArgumentMatchers.eq(heartbeat))) .thenReturn(CompletableFuture.completedFuture(null)); - when(gateway.disconnectTaskExecutor(Matchers.eq(disconnection))).thenReturn( + when(gateway.disconnectTaskExecutor(ArgumentMatchers.eq(disconnection))).thenReturn( CompletableFuture.completedFuture(null)); - when(gateway.registerTaskExecutor(Matchers.eq(registration))) + when(gateway.registerTaskExecutor(ArgumentMatchers.eq(registration))) .thenAnswer(new Answer>() { private int count = 0; @@ -183,9 +183,9 @@ public CompletableFuture answer(InvocationOnMock invocation) { @Test public void testWhenHeartbeatFailsIntermittently() throws Exception { - when(gateway.registerTaskExecutor(Matchers.eq(registration))).thenReturn( + when(gateway.registerTaskExecutor(ArgumentMatchers.eq(registration))).thenReturn( CompletableFuture.completedFuture(null)); - when(gateway.heartBeatFromTaskExecutor(Matchers.eq(heartbeat))) + when(gateway.heartBeatFromTaskExecutor(ArgumentMatchers.eq(heartbeat))) .thenAnswer(new Answer>() { private int count = 0; @@ -208,9 +208,9 @@ public CompletableFuture answer(InvocationOnMock invocation) { @Test public void testWhenHeartbeatFailsWithTaskCancelled() throws Exception { - when(gateway.registerTaskExecutor(Matchers.eq(registration))).thenReturn( + when(gateway.registerTaskExecutor(ArgumentMatchers.eq(registration))).thenReturn( CompletableFuture.completedFuture(null)); - when(gateway.heartBeatFromTaskExecutor(Matchers.eq(heartbeat))) + when(gateway.heartBeatFromTaskExecutor(ArgumentMatchers.eq(heartbeat))) .thenAnswer((Answer>) invocation -> CompletableFutures.exceptionallyCompletedFuture( new TaskExecutorTaskCancelledException("mock error", workerId))); @@ -224,11 +224,11 @@ public void testWhenHeartbeatFailsWithTaskCancelled() throws Exception { @Test public void testWhenHeartbeatFailsContinuously() throws Exception { - when(gateway.registerTaskExecutor(Matchers.eq(registration))).thenReturn( + when(gateway.registerTaskExecutor(ArgumentMatchers.eq(registration))).thenReturn( CompletableFuture.completedFuture(null)); CountDownLatch startSignal = new CountDownLatch(1); CountDownLatch isNotRegisteredSignal = new CountDownLatch(5); - when(gateway.heartBeatFromTaskExecutor(Matchers.eq(heartbeat))) + when(gateway.heartBeatFromTaskExecutor(ArgumentMatchers.eq(heartbeat))) .thenAnswer(new Answer>() { private int count = 0; @@ -244,7 +244,7 @@ public CompletableFuture answer(InvocationOnMock invocation) { new UnknownError("error")); } }); - when(gateway.disconnectTaskExecutor(Matchers.eq(disconnection))).thenReturn( + when(gateway.disconnectTaskExecutor(ArgumentMatchers.eq(disconnection))).thenReturn( CompletableFuture.completedFuture(null)); cxn.startAsync(); // wait for the heart beat failure diff --git a/mantis-server/mantis-server-agent/src/test/java/io/mantisrx/server/agent/RuntimeTaskImplExecutorTest.java b/mantis-server/mantis-server-agent/src/test/java/io/mantisrx/server/agent/RuntimeTaskImplExecutorTest.java index 9829ed0ad..d2281ff3d 100644 --- a/mantis-server/mantis-server-agent/src/test/java/io/mantisrx/server/agent/RuntimeTaskImplExecutorTest.java +++ b/mantis-server/mantis-server-agent/src/test/java/io/mantisrx/server/agent/RuntimeTaskImplExecutorTest.java @@ -17,7 +17,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; diff --git a/mantis-server/mantis-server-agent/src/test/java/io/mantisrx/server/agent/TestHadoopFileSystemBlobStore.java b/mantis-server/mantis-server-agent/src/test/java/io/mantisrx/server/agent/TestHadoopFileSystemBlobStore.java index 8d7d06124..29dad4395 100644 --- a/mantis-server/mantis-server-agent/src/test/java/io/mantisrx/server/agent/TestHadoopFileSystemBlobStore.java +++ b/mantis-server/mantis-server-agent/src/test/java/io/mantisrx/server/agent/TestHadoopFileSystemBlobStore.java @@ -25,7 +25,7 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.junit.Test; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; public class TestHadoopFileSystemBlobStore { @@ -43,7 +43,7 @@ public void test() throws Exception { new URI( "/mnt/data/mantis-artifacts/sananthanarayanan-mantis-jobs-sine-function-thin-0.1.0.zip"); blobStore.get(src); - verify(fileSystem, times(1)).copyToLocalFile(Matchers.eq(new Path(src)), - Matchers.eq(new Path(dst))); + verify(fileSystem, times(1)).copyToLocalFile(ArgumentMatchers.eq(new Path(src)), + ArgumentMatchers.eq(new Path(dst))); } } diff --git a/mantis-server/mantis-server-worker-client/build.gradle b/mantis-server/mantis-server-worker-client/build.gradle index 66560627b..c64a28290 100644 --- a/mantis-server/mantis-server-worker-client/build.gradle +++ b/mantis-server/mantis-server-worker-client/build.gradle @@ -21,7 +21,7 @@ dependencies { implementation libraries.spectatorApi testImplementation libraries.junit4 - testImplementation libraries.mockitoAll + testImplementation libraries.mockitoCore testImplementation libraries.spectatorApi testImplementation 'org.hamcrest:hamcrest-all:1.3' } diff --git a/mantis-server/mantis-server-worker-client/dependencies.lock b/mantis-server/mantis-server-worker-client/dependencies.lock index 4b0888426..a5e32846a 100644 --- a/mantis-server/mantis-server-worker-client/dependencies.lock +++ b/mantis-server/mantis-server-worker-client/dependencies.lock @@ -1,29 +1,7 @@ { "annotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" - } - }, - "baseline-exact-dependencies-main": { - "com.netflix.spectator:spectator-api": { - "locked": "1.3.10" - } - }, - "baseline-exact-dependencies-test": { - "com.netflix.spectator:spectator-api": { - "locked": "1.3.10" - }, - "junit:junit": { - "locked": "4.11" - }, - "junit:junit-dep": { - "locked": "4.11" - }, - "org.hamcrest:hamcrest-all": { - "locked": "1.3" - }, - "org.mockito:mockito-all": { - "locked": "2.0.2-beta" + "locked": "1.18.36" } }, "compileClasspath": { @@ -110,7 +88,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "org.apache.flink:flink-core": { "firstLevelTransitive": [ @@ -128,7 +106,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -143,7 +121,7 @@ "locked": "20180813" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.skife.config:config-magic": { "firstLevelTransitive": [ @@ -167,12 +145,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "lombok": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "runtimeClasspath": { @@ -283,6 +261,7 @@ }, "io.vavr:vavr": { "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core", "io.mantisrx:mantis-shaded" ], "locked": "0.9.2" @@ -291,7 +270,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "net.jcip:jcip-annotations": { "firstLevelTransitive": [ @@ -321,7 +300,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -359,12 +338,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testAnnotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "testCompileClasspath": { @@ -451,7 +430,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "junit:junit": { "locked": "4.11" @@ -478,7 +457,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -492,11 +471,11 @@ ], "locked": "20180813" }, - "org.mockito:mockito-all": { - "locked": "2.0.2-beta" + "org.mockito:mockito-core": { + "locked": "5.14.2" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.skife.config:config-magic": { "firstLevelTransitive": [ @@ -520,7 +499,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testRuntimeClasspath": { @@ -631,6 +610,7 @@ }, "io.vavr:vavr": { "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core", "io.mantisrx:mantis-shaded" ], "locked": "0.9.2" @@ -639,7 +619,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "junit:junit": { "locked": "4.11" @@ -678,7 +658,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -692,8 +672,8 @@ ], "locked": "20180813" }, - "org.mockito:mockito-all": { - "locked": "2.0.2-beta" + "org.mockito:mockito-core": { + "locked": "5.14.2" }, "org.skife.config:config-magic": { "firstLevelTransitive": [ @@ -719,7 +699,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } } } \ No newline at end of file diff --git a/mantis-shaded/dependencies.lock b/mantis-shaded/dependencies.lock index ac03ff3e1..99bc66199 100644 --- a/mantis-shaded/dependencies.lock +++ b/mantis-shaded/dependencies.lock @@ -1,12 +1,7 @@ { "annotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" - } - }, - "baseline-exact-dependencies-main": { - "io.vavr:vavr": { - "locked": "0.9.2" + "locked": "1.18.36" } }, "compileClasspath": { @@ -14,12 +9,12 @@ "locked": "0.9.2" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "lombok": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "runtimeClasspath": { @@ -35,7 +30,7 @@ "locked": "2.12.7" }, "com.fasterxml.jackson.core:jackson-databind": { - "locked": "2.12.7.1" + "locked": "2.12.7.2" }, "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": { "locked": "2.12.7" @@ -82,7 +77,7 @@ }, "testAnnotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "testCompileClasspath": { @@ -90,7 +85,7 @@ "locked": "0.9.2" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "testRuntimeClasspath": { diff --git a/mantis-source-jobs/mantis-source-job-kafka/dependencies.lock b/mantis-source-jobs/mantis-source-job-kafka/dependencies.lock index 4d0a87072..fbcbc1407 100644 --- a/mantis-source-jobs/mantis-source-job-kafka/dependencies.lock +++ b/mantis-source-jobs/mantis-source-job-kafka/dependencies.lock @@ -1,142 +1,7 @@ { "annotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" - } - }, - "baseline-exact-dependencies-main": { - "com.google.code.findbugs:jsr305": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "3.0.1" - }, - "com.netflix.archaius:archaius2-api": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-connector-kafka" - ], - "locked": "2.3.21" - }, - "com.netflix.archaius:archaius2-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-connector-kafka" - ], - "locked": "2.3.21" - }, - "com.netflix.spectator:spectator-api": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-connector-kafka" - ], - "locked": "0.82.0" - }, - "com.netflix:mantis-rxnetty": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "0.4.19.1" - }, - "io.mantisrx:mantis-common": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-network", - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-common-serde": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "project": true - }, - "io.mantisrx:mantis-connector-kafka": { - "project": true - }, - "io.mantisrx:mantis-network": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-remote-observable": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-runtime": { - "project": true - }, - "io.mantisrx:mantis-shaded": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common", - "io.mantisrx:mantis-common-serde" - ], - "project": true - }, - "io.mantisrx:mql-jvm": { - "locked": "3.2.2" - }, - "io.netty:netty-buffer": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-codec-http": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-handler": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-network" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-transport-native-epoll": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.reactivex:rxjava": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common", - "io.mantisrx:mantis-connector-kafka" - ], - "locked": "1.3.8" - }, - "org.apache.kafka:kafka-clients": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-connector-kafka" - ], - "locked": "2.2.2" - }, - "org.jctools:jctools-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.2.1" - }, - "org.slf4j:slf4j-api": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common", - "io.mantisrx:mantis-runtime" - ], - "locked": "1.7.25" - }, - "org.slf4j:slf4j-log4j12": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.7.0" - }, - "org.xerial.snappy:snappy-java": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.1.10.5" + "locked": "1.18.36" } }, "compileClasspath": { @@ -255,7 +120,7 @@ "locked": "1.2.1" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -274,12 +139,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "lombok": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "runtimeClasspath": { @@ -418,6 +283,12 @@ ], "locked": "1.0" }, + "net.openhft:zero-allocation-hashing": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-network" + ], + "locked": "0.27ea0" + }, "org.apache.kafka:kafka-clients": { "firstLevelTransitive": [ "io.mantisrx:mantis-connector-kafka" @@ -449,12 +320,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testAnnotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "testCompileClasspath": { @@ -573,7 +444,7 @@ "locked": "1.2.1" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.slf4j:slf4j-api": { "firstLevelTransitive": [ @@ -592,7 +463,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testRuntimeClasspath": { @@ -731,6 +602,12 @@ ], "locked": "1.0" }, + "net.openhft:zero-allocation-hashing": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-network" + ], + "locked": "0.27ea0" + }, "org.apache.kafka:kafka-clients": { "firstLevelTransitive": [ "io.mantisrx:mantis-connector-kafka" @@ -762,7 +639,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } } } \ No newline at end of file diff --git a/mantis-source-jobs/mantis-source-job-publish/dependencies.lock b/mantis-source-jobs/mantis-source-job-publish/dependencies.lock index 6e956453b..7c278f255 100644 --- a/mantis-source-jobs/mantis-source-job-publish/dependencies.lock +++ b/mantis-source-jobs/mantis-source-job-publish/dependencies.lock @@ -1,240 +1,7 @@ { "annotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" - } - }, - "baseline-exact-dependencies-main": { - "com.github.spullara.cli-parser:cli-parser": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "1.1.1" - }, - "com.google.code.findbugs:jsr305": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "3.0.1" - }, - "com.netflix.archaius:archaius2-api": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-publish-core" - ], - "locked": "2.7.9" - }, - "com.netflix.spectator:spectator-api": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-publish-core" - ], - "locked": "0.134.0" - }, - "com.netflix:mantis-rxnetty": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "0.4.19.1" - }, - "io.mantisrx:mantis-common": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core", - "io.mantisrx:mantis-network", - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-common-serde": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "project": true - }, - "io.mantisrx:mantis-connector-publish": { - "project": true - }, - "io.mantisrx:mantis-control-plane-client": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-runtime-loader", - "io.mantisrx:mantis-server-worker-client" - ], - "project": true - }, - "io.mantisrx:mantis-control-plane-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-connector-publish", - "io.mantisrx:mantis-control-plane-client", - "io.mantisrx:mantis-server-worker-client" - ], - "project": true - }, - "io.mantisrx:mantis-discovery-proto": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-publish-core" - ], - "project": true - }, - "io.mantisrx:mantis-network": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-publish-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-connector-publish" - ], - "project": true - }, - "io.mantisrx:mantis-publish-netty": { - "project": true - }, - "io.mantisrx:mantis-remote-observable": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-client", - "io.mantisrx:mantis-runtime" - ], - "project": true - }, - "io.mantisrx:mantis-runtime": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-runtime-executor" - ], - "project": true - }, - "io.mantisrx:mantis-runtime-executor": { - "project": true - }, - "io.mantisrx:mantis-runtime-loader": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-runtime-executor" - ], - "project": true - }, - "io.mantisrx:mantis-rxcontrol": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-runtime-executor" - ], - "project": true - }, - "io.mantisrx:mantis-server-worker-client": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-runtime-executor" - ], - "project": true - }, - "io.mantisrx:mantis-shaded": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common", - "io.mantisrx:mantis-common-serde", - "io.mantisrx:mantis-discovery-proto", - "io.mantisrx:mantis-rxcontrol" - ], - "project": true - }, - "io.netty:netty-buffer": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-codec-http": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-handler": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-network" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-transport-native-epoll": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.reactivex:rxjava": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.3.8" - }, - "joda-time:joda-time": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "2.12.7" - }, - "org.apache.flink:flink-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "1.14.2" - }, - "org.apache.flink:flink-rpc-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "1.14.2" - }, - "org.hdrhistogram:HdrHistogram": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "2.1.12" - }, - "org.jctools:jctools-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.2.1" - }, - "org.json:json": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "20180813" - }, - "org.skife.config:config-magic": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "0.11" - }, - "org.slf4j:slf4j-api": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common", - "io.mantisrx:mantis-runtime" - ], - "locked": "1.7.15" - }, - "org.slf4j:slf4j-log4j12": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.7.0" - }, - "org.xerial.snappy:snappy-java": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.1.10.5" - } - }, - "baseline-exact-dependencies-test": { - "org.junit.jupiter:junit-jupiter-api": { - "locked": "5.4.2" - }, - "org.junit.jupiter:junit-jupiter-engine": { - "locked": "5.4.2" - }, - "org.junit.jupiter:junit-jupiter-params": { - "locked": "5.4.2" - }, - "org.mockito:mockito-core": { - "locked": "2.0.111-beta" + "locked": "1.18.36" } }, "compileClasspath": { @@ -254,7 +21,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ @@ -398,7 +165,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "org.apache.flink:flink-core": { "firstLevelTransitive": [ @@ -416,7 +183,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -431,7 +198,7 @@ "locked": "20180813" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.skife.config:config-magic": { "firstLevelTransitive": [ @@ -456,12 +223,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "lombok": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "runtimeClasspath": { @@ -487,14 +254,14 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.archaius:archaius2-core": { "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core", "io.mantisrx:mantis-publish-netty" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.rxjava:rxjava-math": { "firstLevelTransitive": [ @@ -509,14 +276,14 @@ "io.mantisrx:mantis-runtime-executor", "io.mantisrx:mantis-server-worker-client" ], - "locked": "1.7.12" + "locked": "1.8.2" }, "com.netflix.spectator:spectator-ext-ipc": { "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core", "io.mantisrx:mantis-publish-netty" ], - "locked": "1.7.12" + "locked": "1.8.2" }, "com.netflix:mantis-rxnetty": { "firstLevelTransitive": [ @@ -692,6 +459,7 @@ }, "io.vavr:vavr": { "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core", "io.mantisrx:mantis-runtime-executor", "io.mantisrx:mantis-runtime-loader", "io.mantisrx:mantis-rxcontrol", @@ -709,7 +477,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "net.jcip:jcip-annotations": { "firstLevelTransitive": [ @@ -717,6 +485,12 @@ ], "locked": "1.0" }, + "net.openhft:zero-allocation-hashing": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-network" + ], + "locked": "0.27ea0" + }, "nz.ac.waikato.cms.moa:moa": { "firstLevelTransitive": [ "io.mantisrx:mantis-runtime-executor" @@ -757,7 +531,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -801,12 +575,12 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testAnnotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "testCompileClasspath": { @@ -826,7 +600,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.spectator:spectator-api": { "firstLevelTransitive": [ @@ -970,7 +744,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "org.apache.flink:flink-core": { "firstLevelTransitive": [ @@ -988,7 +762,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -1012,10 +786,10 @@ "locked": "5.4.2" }, "org.mockito:mockito-core": { - "locked": "2.0.111-beta" + "locked": "5.14.2" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.skife.config:config-magic": { "firstLevelTransitive": [ @@ -1040,7 +814,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testRuntimeClasspath": { @@ -1066,14 +840,14 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.archaius:archaius2-core": { "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core", "io.mantisrx:mantis-publish-netty" ], - "locked": "2.7.9" + "locked": "2.8.2" }, "com.netflix.rxjava:rxjava-math": { "firstLevelTransitive": [ @@ -1088,14 +862,14 @@ "io.mantisrx:mantis-runtime-executor", "io.mantisrx:mantis-server-worker-client" ], - "locked": "1.7.12" + "locked": "1.8.2" }, "com.netflix.spectator:spectator-ext-ipc": { "firstLevelTransitive": [ "io.mantisrx:mantis-publish-core", "io.mantisrx:mantis-publish-netty" ], - "locked": "1.7.12" + "locked": "1.8.2" }, "com.netflix:mantis-rxnetty": { "firstLevelTransitive": [ @@ -1271,6 +1045,7 @@ }, "io.vavr:vavr": { "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core", "io.mantisrx:mantis-runtime-executor", "io.mantisrx:mantis-runtime-loader", "io.mantisrx:mantis-rxcontrol", @@ -1288,7 +1063,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "net.jcip:jcip-annotations": { "firstLevelTransitive": [ @@ -1296,6 +1071,12 @@ ], "locked": "1.0" }, + "net.openhft:zero-allocation-hashing": { + "firstLevelTransitive": [ + "io.mantisrx:mantis-network" + ], + "locked": "0.27ea0" + }, "nz.ac.waikato.cms.moa:moa": { "firstLevelTransitive": [ "io.mantisrx:mantis-runtime-executor" @@ -1336,7 +1117,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -1360,7 +1141,7 @@ "locked": "5.4.2" }, "org.mockito:mockito-core": { - "locked": "2.0.111-beta" + "locked": "5.14.2" }, "org.skife.config:config-magic": { "firstLevelTransitive": [ @@ -1392,7 +1173,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } } } \ No newline at end of file diff --git a/mantis-testcontainers/dependencies.lock b/mantis-testcontainers/dependencies.lock index c12a3e31a..f6b9fde32 100644 --- a/mantis-testcontainers/dependencies.lock +++ b/mantis-testcontainers/dependencies.lock @@ -1,167 +1,7 @@ { "annotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" - } - }, - "baseline-exact-dependencies-test": { - "ch.qos.logback:logback-classic": { - "locked": "1.3.8" - }, - "com.github.spullara.cli-parser:cli-parser": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "1.1.1" - }, - "com.google.code.findbugs:jsr305": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "3.0.1" - }, - "com.netflix:mantis-rxnetty": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "0.4.19.1" - }, - "com.squareup.okhttp3:okhttp": { - "locked": "5.0.0-alpha.14" - }, - "io.mantisrx:mantis-common": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "project": true - }, - "io.mantisrx:mantis-common-serde": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "project": true - }, - "io.mantisrx:mantis-control-plane-client": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-server-worker-client" - ], - "project": true - }, - "io.mantisrx:mantis-control-plane-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-client", - "io.mantisrx:mantis-server-worker-client" - ], - "project": true - }, - "io.mantisrx:mantis-remote-observable": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-client" - ], - "project": true - }, - "io.mantisrx:mantis-server-worker-client": { - "project": true - }, - "io.mantisrx:mantis-shaded": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common", - "io.mantisrx:mantis-common-serde" - ], - "project": true - }, - "io.netty:netty-buffer": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-codec-http": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.netty:netty-transport-native-epoll": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "4.1.17.Final" - }, - "io.reactivex:rxjava": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.3.8" - }, - "joda-time:joda-time": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "2.12.7" - }, - "org.apache.flink:flink-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "1.14.2" - }, - "org.apache.flink:flink-rpc-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "1.14.2" - }, - "org.hdrhistogram:HdrHistogram": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "2.1.12" - }, - "org.jctools:jctools-core": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.2.1" - }, - "org.json:json": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "20180813" - }, - "org.junit.jupiter:junit-jupiter": { - "locked": "5.9.1" - }, - "org.junit:junit-bom": { - "locked": "5.9.1" - }, - "org.skife.config:config-magic": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-control-plane-core" - ], - "locked": "0.11" - }, - "org.slf4j:slf4j-api": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "2.0.7" - }, - "org.slf4j:slf4j-log4j12": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.7.0" - }, - "org.testcontainers:testcontainers": { - "locked": "1.18.3" - }, - "org.xerial.snappy:snappy-java": { - "firstLevelTransitive": [ - "io.mantisrx:mantis-common" - ], - "locked": "1.1.10.5" + "locked": "1.18.36" } }, "compileClasspath": { @@ -169,12 +9,12 @@ "project": true }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "lombok": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "runtimeClasspath": { @@ -190,7 +30,7 @@ }, "testAnnotationProcessor": { "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" } }, "testCompileClasspath": { @@ -287,7 +127,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "org.apache.flink:flink-core": { "firstLevelTransitive": [ @@ -305,7 +145,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -326,7 +166,7 @@ "locked": "5.9.1" }, "org.projectlombok:lombok": { - "locked": "1.18.20" + "locked": "1.18.36" }, "org.skife.config:config-magic": { "firstLevelTransitive": [ @@ -353,7 +193,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } }, "testRuntimeClasspath": { @@ -480,6 +320,7 @@ }, "io.vavr:vavr": { "firstLevelTransitive": [ + "io.mantisrx:mantis-control-plane-core", "io.mantisrx:mantis-shaded" ], "locked": "0.9.2" @@ -488,7 +329,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.12.7" + "locked": "2.13.0" }, "net.jcip:jcip-annotations": { "firstLevelTransitive": [ @@ -518,7 +359,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-control-plane-core" ], - "locked": "2.1.12" + "locked": "2.2.2" }, "org.jctools:jctools-core": { "firstLevelTransitive": [ @@ -565,7 +406,7 @@ "firstLevelTransitive": [ "io.mantisrx:mantis-common" ], - "locked": "1.1.10.5" + "locked": "1.1.10.7" } } } \ No newline at end of file