diff --git a/aws-lambda-scorer/lambda-template/build.gradle b/aws-lambda-scorer/lambda-template/build.gradle index d0583794..779200db 100644 --- a/aws-lambda-scorer/lambda-template/build.gradle +++ b/aws-lambda-scorer/lambda-template/build.gradle @@ -5,10 +5,6 @@ dependencies { implementation project(':common:transform') implementation group: 'ai.h2o', name: 'mojo2-runtime-api' implementation group: 'ai.h2o', name: 'mojo2-runtime-impl' - constraints { - // because https://app.snyk.io/vuln/SNYK-JAVA-COMMONSBEANUTILS-460111 - compile group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.4' - } implementation group: 'com.amazonaws', name: 'aws-lambda-java-core' implementation group: 'com.amazonaws', name: 'aws-lambda-java-events' implementation group: 'com.amazonaws', name: 'aws-java-sdk-s3' diff --git a/aws-sagemaker-hosted-scorer/build.gradle b/aws-sagemaker-hosted-scorer/build.gradle index ae4b2057..4d4dfa26 100644 --- a/aws-sagemaker-hosted-scorer/build.gradle +++ b/aws-sagemaker-hosted-scorer/build.gradle @@ -9,10 +9,6 @@ dependencies { implementation project(':common:transform') implementation group: 'ai.h2o', name: 'mojo2-runtime-api' implementation group: 'ai.h2o', name: 'mojo2-runtime-impl' - constraints { - // because https://app.snyk.io/vuln/SNYK-JAVA-COMMONSBEANUTILS-460111 - compile group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.4' - } implementation group: 'io.springfox', name: 'springfox-boot-starter', version: springFoxVersion implementation group: 'com.google.guava', name: 'guava', version: guavaVersion implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web' diff --git a/common/jdbc/build.gradle b/common/jdbc/build.gradle index a45fe8bc..e118178f 100644 --- a/common/jdbc/build.gradle +++ b/common/jdbc/build.gradle @@ -9,10 +9,6 @@ dependencies { implementation project(':common:rest-jdbc-spring-api') implementation group: 'ai.h2o', name: 'mojo2-runtime-api' implementation group: 'ai.h2o', name: 'mojo2-runtime-impl' - constraints { - // because https://app.snyk.io/vuln/SNYK-JAVA-COMMONSBEANUTILS-460111 - compile group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.4' - } implementation group: 'ai.h2o', name: 'sparkling-water-scoring_2.12' implementation group: 'org.scala-lang', name: 'scala-library' implementation group: 'org.apache.spark', name: 'spark-core_2.12' diff --git a/common/rest-java-model/build.gradle b/common/rest-java-model/build.gradle index 64008d9e..109e4b14 100644 --- a/common/rest-java-model/build.gradle +++ b/common/rest-java-model/build.gradle @@ -20,7 +20,16 @@ swaggerSources { dependsOn validation } } + modelV1Exp { + inputFile = file('../swagger/v1exp/swagger.yaml') + code { + language = 'java' + configFile = file('../swagger/v1exp/swagger_codegen.json') + components = [models: true] + dependsOn validation + } + } } -compileJava.dependsOn swaggerSources.model.code -sourceSets.main.java.srcDir "${swaggerSources.model.code.outputDir}/src/main/java" +compileJava.dependsOn swaggerSources.model.code, swaggerSources.modelV1Exp.code +sourceSets.main.java.srcDirs "${swaggerSources.model.code.outputDir}/src/main/java", "${swaggerSources.modelV1Exp.code.outputDir}/src/main/java" diff --git a/common/rest-jdbc-spring-api/build.gradle b/common/rest-jdbc-spring-api/build.gradle index 4b4acaf2..26c0e249 100644 --- a/common/rest-jdbc-spring-api/build.gradle +++ b/common/rest-jdbc-spring-api/build.gradle @@ -5,7 +5,7 @@ plugins { apply from: project(":").file('gradle/java.gradle') dependencies { - implementation group: 'io.swagger', name: 'swagger-annotations' + implementation group: 'io.swagger.core.v3', name: 'swagger-annotations' implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web' implementation group: 'org.springframework.boot', name: 'spring-boot-starter-validation' swaggerCodegen group: 'io.swagger.codegen.v3', name: 'swagger-codegen-cli' diff --git a/common/rest-spring-api/build.gradle b/common/rest-spring-api/build.gradle index 5b2da10a..f81c3ed8 100644 --- a/common/rest-spring-api/build.gradle +++ b/common/rest-spring-api/build.gradle @@ -5,7 +5,7 @@ plugins { apply from: project(":").file('gradle/java.gradle') dependencies { - implementation group: 'io.swagger', name: 'swagger-annotations' + implementation group: 'io.swagger.core.v3', name: 'swagger-annotations' implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web' implementation group: 'org.springframework.boot', name: 'spring-boot-starter-validation' swaggerCodegen group: 'io.swagger.codegen.v3', name: 'swagger-codegen-cli' @@ -21,6 +21,15 @@ swaggerSources { dependsOn validation } } + apiV1Exp { + inputFile = file('../swagger/v1exp/swagger.yaml') + code { + language = 'spring' + configFile = file('../swagger/v1exp/swagger_codegen.json') + components = [models: true, apis: true] + dependsOn validation + } + } } jar { @@ -32,5 +41,5 @@ bootJar { enabled=false } -compileJava.dependsOn swaggerSources.api.code -sourceSets.main.java.srcDir "${swaggerSources.api.code.outputDir}/src/main/java" +compileJava.dependsOn swaggerSources.api.code, swaggerSources.apiV1Exp.code +sourceSets.main.java.srcDirs "${swaggerSources.api.code.outputDir}/src/main/java", "${swaggerSources.apiV1Exp.code.outputDir}/src/main/java" diff --git a/common/rest-vertex-ai-spring-api/build.gradle b/common/rest-vertex-ai-spring-api/build.gradle index 51efac53..6e7fdd12 100644 --- a/common/rest-vertex-ai-spring-api/build.gradle +++ b/common/rest-vertex-ai-spring-api/build.gradle @@ -5,7 +5,7 @@ plugins { apply from: project(":").file('gradle/java.gradle') dependencies { - implementation group: 'io.swagger', name: 'swagger-annotations' + implementation group: 'io.swagger.core.v3', name: 'swagger-annotations' implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web' implementation group: 'org.springframework.boot', name: 'spring-boot-starter-validation' swaggerCodegen group: 'io.swagger.codegen.v3', name: 'swagger-codegen-cli' diff --git a/common/swagger/v1exp/swagger.yaml b/common/swagger/v1exp/swagger.yaml index f795cafa..0aa59231 100644 --- a/common/swagger/v1exp/swagger.yaml +++ b/common/swagger/v1exp/swagger.yaml @@ -26,15 +26,15 @@ paths: schema: type: object properties: - mediaScoreRequest: - $ref: '#/components/schemas/MediaScoreRequest' + scoreMediaRequest: + $ref: '#/components/schemas/scoreMediaRequest' files: type: array items: type: string format: binary required: - - mediaScoreRequest + - scoreMediaRequest - files responses: '200': @@ -49,7 +49,7 @@ paths: description: Invalid payload components: schemas: - MediaScoreRequest: + scoreMediaRequest: allOf: - $ref: '../v1/swagger.yaml#/definitions/ScoreRequest' - properties: diff --git a/common/swagger/v1openapi3/swagger.yaml b/common/swagger/v1openapi3/swagger.yaml new file mode 100644 index 00000000..ee4e18bc --- /dev/null +++ b/common/swagger/v1openapi3/swagger.yaml @@ -0,0 +1,419 @@ +openapi: '3.0.0' +info: + title: Scoring API - v1.2.0-openapi3 + description: >- + This is a definition of the REST API for scoring from H2O. + This API is intended to be used within DAI and eventually across all H2O scoring systems. + This API combines both v1 and v1Exp in OPENAPI 3.0 spec. + contact: + email: support@h2o.ai + license: + name: License + url: 'http://www.h2o.ai' + version: 1.2.0-openapi3 +servers: + - url: / +paths: + /model/id: + get: + tags: + - metadata + summary: Returns model id + description: Returns unique id of the model loaded in the server and used for scoring + operationId: getModelId + responses: + "200": + description: Successful operation + content: + text/plain: + schema: + type: string + security: + - api_key: [] + /model/schema: + get: + tags: + - metadata + summary: Describe a model + description: "Returns information about the model used for scoring, e.g., input schema." + operationId: getModelInfo + responses: + "200": + description: Successful operation + content: + application/json: + schema: + $ref: '#/components/schemas/Model' + /model/sample_request: + get: + tags: + - metadata + summary: Sample scoring request + description: Builds a sample scoring request that would pass all validations + operationId: getSampleRequest + responses: + "200": + description: Successful operation + content: + application/json: + schema: + $ref: '#/components/schemas/ScoreRequest' + /model/capabilities: + get: + tags: + - metadata + summary: List capabilities supported by the scorer. + description: Returns the capabilities supported by the scorer. + operationId: getCapabilities + responses: + "200": + description: Successful operation + content: + application/json: + schema: + type: array + items: + $ref: '#/components/schemas/CapabilityType' + /model/score: + get: + tags: + - scoring + summary: Score on given file + description: Computes score of the rows in the file specified by the path in the query parameter + operationId: getScoreByFile + parameters: + - name: file + in: query + required: false + style: form + explode: true + schema: + type: string + responses: + "200": + description: Successful operation + content: + application/json: + schema: + $ref: '#/components/schemas/ScoreResponse' + "400": + description: Invalid payload + content: {} + post: + tags: + - scoring + summary: Score on given rows + description: Computes score of the rows sent in the body of the post request + operationId: getScore + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/ScoreRequest' + required: true + responses: + "200": + description: Successful operation + content: + application/json: + schema: + $ref: '#/components/schemas/ScoreResponse' + "400": + description: Invalid payload + content: {} + "500": + description: Failure operation + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorResponse' + x-codegen-request-body-name: payload + /model/contribution: + post: + tags: + - contribution + summary: Contribution score or Shapley values on given rows + description: Computes contribution score with the rows sent in the body of the post request + operationId: getContribution + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/ContributionRequest' + required: true + responses: + "200": + description: Successful operation + content: + application/json: + schema: + $ref: '#/components/schemas/ContributionResponse' + "400": + description: Invalid payload + content: {} + "500": + description: Failure operation + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorResponse' + "501": + description: Implementation not supported + content: {} + x-codegen-request-body-name: payload + /model/media-score: + post: + tags: + - scoring + summary: Score model with provided media files + description: Computes score of provided data making use of provided media files. + operationId: getMediaScore + requestBody: + content: + multipart/form-data: + schema: + type: object + properties: + scoreMediaRequest: + $ref: '#/components/schemas/scoreMediaRequest' + files: + type: array + items: + type: string + format: binary + required: + - scoreMediaRequest + - files + responses: + '200': + description: Successful scoring operation + content: + application/json: + schema: + $ref: '#/components/schemas/ScoreResponse' + '501': + description: Implementation not supported + '400': + description: Invalid payload +components: + schemas: + Model: + type: object + properties: + id: + type: string + name: + type: string + description: + type: string + properties: + $ref: '#/components/schemas/Model_properties' + schema: + $ref: '#/components/schemas/ModelSchema' + Row: + type: array + items: + type: string + ContributionRequest: + required: + - requestShapleyValueType + type: object + properties: + requestShapleyValueType: + $ref: '#/components/schemas/ShapleyType' + fields: + type: array + description: | + An array holding the names of fields in the order of appearance in the `rows` property. The length of `fields` has to match length of each row in `rows`. No duplicates are allowed. + items: + type: string + rows: + type: array + description: | + An array of rows consisting the actual input data for scoring, one scoring request per row. + items: + $ref: '#/components/schemas/Row' + ContributionResponse: + type: object + properties: + features: + type: array + description: | + An array holding the names of fields in the order of appearance in the rows of the `contributions` property. + items: + type: string + contributionGroups: + type: array + description: | + An array of rows consisting of the shapley contributions output corresponding to an output group. + items: + $ref: '#/components/schemas/ContributionGroup' + ContributionGroup: + type: object + properties: + outputGroup: + type: string + description: | + Name of the output group. It will be populated only for multinomial models. Shapley values are not supported for third party models yet, hence this field will not be populated. + contributions: + type: array + description: | + An array of rows consisting of the shapley contributions output corresponding to columns in the fields + items: + $ref: '#/components/schemas/Row' + ScoreRequest: + type: object + properties: + requestShapleyValueType: + $ref: '#/components/schemas/ShapleyType' + includeFieldsInOutput: + type: array + description: | + An array holding the list of field names to be copied from the input request row to the corresponding scoring output. It is an error to specify a field name not present in the `fields` property, except when it is equal to the `idField` property. In the latter case, the row id would be generated and returned in the response. Note that the order of items in `includeFieldsInOutput` is ignored and the specified fields are returned in the order of appearance in the input request row. + items: + type: string + noFieldNamesInOutput: + type: boolean + description: | + If set to `true`. The scorer will not fill response column names in the `fields` field. This is can be useful to maintain compatibility with older scorer versions or to save bandwidth. + idField: + type: string + description: | + Name of the field that holds a row id, e.g., a value that uniquely identifies each row of the request. The caller may specify a name of the field that is not present in fields. In which case, the scorer is allowed to generate a UUID to identify each row (e.g., for logging and monitoring purposes). To retrieve such a generated id as a part of the response, simply name it in the `includeFieldsInOutput`. + fields: + type: array + description: | + An array holding the names of fields in the order of appearance in the `rows` property. The length of `fields` has to match length of each row in `rows`. No duplicates are allowed. + items: + type: string + rows: + type: array + description: | + An array of rows consisting the actual input data for scoring, one scoring request per row. + items: + $ref: '#/components/schemas/Row' + requestPredictionIntervals: + type: boolean + description: | + If set to `true`, the scorer will try to fill field `predictionIntervals` in response if it is supported. + ScoreResponse: + type: object + properties: + id: + type: string + description: | + A unique id of the model used for scoring. + fields: + type: array + description: | + An array holding the names of fields in the order of appearance in the rows of the `score` property. This field is not populated if requested by setting the `noFieldNamesInOutput` request field to `true`. + items: + type: string + score: + type: array + description: | + An array of rows consisting the actual scoring output. The order of rows corresponds to the order of the input request rows. Each row contains any copied input fields first (in the order of appearance in the input row). If the `idField` was specified and also listed in the `includeFieldsInOutput` but not provided in `fields`, a unique id will be generated and positioned right after all the other fields copied from the input. The scoring output follows. + items: + $ref: '#/components/schemas/Row' + featureShapleyContributions: + $ref: '#/components/schemas/ContributionResponse' + predictionIntervals: + $ref: '#/components/schemas/PredictionInterval' + ErrorResponse: + type: object + properties: + detail: + type: string + description: | + A string message containing the detail error message. + DataField: + type: object + properties: + name: + type: string + dataType: + type: string + enum: + - Bool + - Int32 + - Int64 + - Float32 + - Float64 + - Str + - Time64 + example: + type: string + ModelSchema: + type: object + properties: + inputFields: + type: array + items: + $ref: '#/components/schemas/DataField' + targetFields: + type: array + items: + $ref: '#/components/schemas/DataField' + outputFields: + type: array + items: + $ref: '#/components/schemas/DataField' + ShapleyType: + type: string + enum: + - ORIGINAL + - TRANSFORMED + - NONE + ScoringType: + type: string + enum: + - REGRESSION + - CLASSIFICATION + - BINOMIAL + CapabilityType: + type: string + enum: + - SCORE + - SCORE_PREDICTION_INTERVAL + - CONTRIBUTION_ORIGINAL + - CONTRIBUTION_TRANSFORMED + Model_properties: + type: object + properties: + scoringType: + $ref: '#/components/schemas/ScoringType' + scoringResponLabels: + type: array + items: + type: string + PredictionInterval: + type: object + description: >- + Prediction interval consist of an array of interval bound names + and rows of array of bounds per bound name. Setting `requestPredictionIntervals` + to true will enable populating the field. The field will be empty or an error + response returned if prediction intervals are not returned or supported by the model. + properties: + fields: + $ref: '#/components/schemas/Row' + rows: + type: array + items: + $ref: '#/components/schemas/Row' + scoreMediaRequest: + allOf: + - $ref: '#/components/schemas/ScoreRequest' + - properties: + mediaFields: + description: > + An array holding the names of all fields which are expected to contain media files. + Contents of these fields will be replaced by corresponding uploaded files where the + expected values in the column must be the file names of the uploaded files. + type: array + items: + type: string + securitySchemes: + api_key: + type: apiKey + name: api_key + in: header diff --git a/common/swagger/v1openapi3/swagger_codegen.json b/common/swagger/v1openapi3/swagger_codegen.json new file mode 100644 index 00000000..199e80a6 --- /dev/null +++ b/common/swagger/v1openapi3/swagger_codegen.json @@ -0,0 +1,7 @@ +{ + "basePackage":"ai.h2o.mojos.deploy.common.rest.v1openapi3", + "configPackage":"ai.h2o.mojos.deploy.common.rest.v1openapi3.config", + "modelPackage": "ai.h2o.mojos.deploy.common.rest.v1openapi3.model", + "apiPackage" : "ai.h2o.mojos.deploy.common.rest.v1openapi3.api", + "interfaceOnly" : true +} diff --git a/common/transform/build.gradle b/common/transform/build.gradle index 16bf43fe..04c55b1e 100644 --- a/common/transform/build.gradle +++ b/common/transform/build.gradle @@ -4,11 +4,6 @@ dependencies { implementation project(':common:rest-java-model') implementation group: 'ai.h2o', name: 'mojo2-runtime-api' implementation group: 'ai.h2o', name: 'mojo2-runtime-impl' - - constraints { - // because https://app.snyk.io/vuln/SNYK-JAVA-COMMONSBEANUTILS-460111 - compile group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.4' - } implementation group: 'com.google.guava', name: 'guava' implementation group: 'org.slf4j', name: 'slf4j-api' // FIXME(MM): this should not be required, since the dependency should be provided diff --git a/gcp-vertex-ai-mojo-scorer/build.gradle b/gcp-vertex-ai-mojo-scorer/build.gradle index 97fad3de..f3e42f12 100644 --- a/gcp-vertex-ai-mojo-scorer/build.gradle +++ b/gcp-vertex-ai-mojo-scorer/build.gradle @@ -13,10 +13,6 @@ dependencies { implementation group: 'ai.h2o', name: 'mojo2-runtime-api' implementation group: 'ai.h2o', name: 'mojo2-runtime-h2o3-impl' implementation group: 'ai.h2o', name: 'mojo2-runtime-impl' - constraints { - // because https://app.snyk.io/vuln/SNYK-JAVA-COMMONSBEANUTILS-460111 - compile group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.4' - } implementation group: 'io.springfox', name: 'springfox-boot-starter', version: springFoxVersion implementation group: 'com.google.guava', name: 'guava', version: guavaVersion implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web' diff --git a/gradle.properties b/gradle.properties index 83b8cdfb..e2da4263 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,9 +18,9 @@ jupiterVersion = 5.4.0 jupiterSystemStubsVersion = 1.2.0 mockitoVersion = 3.4.0 springFoxVersion = 3.0.0 -swaggerCodegenVersion = 3.0.0 -swaggerCoreVersion = 2.0.5 -swaggerCoreSpringVersion = 1.5.21 +swaggerCodegenVersion = 3.0.46 +swaggerCoreVersion = 2.2.11 +swaggerCoreSpringVersion = 1.6.11 shadowJarVersion = 4.0.4 slf4jVersion = 1.7.30 log4jVersion = 2.17.1 @@ -35,9 +35,9 @@ configVersion = 1.3.4 # External plugins: springBootPluginVersion = 2.7.12 -swaggerGradlePluginVersion = 2.15.1 +swaggerGradlePluginVersion = 2.19.2 spotlessPluginVersion = 3.24.2 -errorpronePluginVersion = 0.8.1 +errorpronePluginVersion = 3.1.0 jibPluginVersion = 2.7.1 # External tools: diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 29953ea1..41d9927a 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 25d32653..aa991fce 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index cccdd3d5..1b6c7873 100755 --- a/gradlew +++ b/gradlew @@ -1,78 +1,129 @@ -#!/usr/bin/env sh +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# 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 +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +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="" +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + 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. Please set the JAVA_HOME variable in your environment to match the @@ -89,84 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -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. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index e95643d6..ac1b06f9 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -45,28 +64,14 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/kdb-mojo-scorer/build.gradle b/kdb-mojo-scorer/build.gradle index e4f7e7e0..f594fc96 100644 --- a/kdb-mojo-scorer/build.gradle +++ b/kdb-mojo-scorer/build.gradle @@ -7,10 +7,6 @@ dependencies { implementation project(':common:kdb-java') implementation group: 'ai.h2o', name: 'mojo2-runtime-api' implementation group: 'ai.h2o', name: 'mojo2-runtime-impl' - constraints { - // because https://app.snyk.io/vuln/SNYK-JAVA-COMMONSBEANUTILS-460111 - compile group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.4' - } implementation group: 'commons-cli', name: 'commons-cli' implementation group: 'org.slf4j', name: 'slf4j-api' implementation group: 'org.apache.logging.log4j', name: 'log4j-api' diff --git a/local-rest-scorer/build.gradle b/local-rest-scorer/build.gradle index 1d046baa..dda49c0b 100644 --- a/local-rest-scorer/build.gradle +++ b/local-rest-scorer/build.gradle @@ -12,10 +12,6 @@ dependencies { implementation group: 'ai.h2o', name: 'mojo2-runtime-api' implementation group: 'ai.h2o', name: 'mojo2-runtime-h2o3-impl' implementation group: 'ai.h2o', name: 'mojo2-runtime-impl' - constraints { - // because https://app.snyk.io/vuln/SNYK-JAVA-COMMONSBEANUTILS-460111 - compile group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.4' - } implementation group: 'io.springfox', name: 'springfox-boot-starter', version: springFoxVersion implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web' implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '9.0.63'