diff --git a/fips-pom.xml b/fips-pom.xml index e6fae03b..e07b5bf2 100644 --- a/fips-pom.xml +++ b/fips-pom.xml @@ -34,7 +34,7 @@ 1.8 1.8 UTF-8 - 2.12.11 + 2.12.18 2.12 4.2.0 3.14.1 @@ -478,6 +478,12 @@ + + test-coverage + + 2.12.15 + + ossrh-deploy diff --git a/pom.xml b/pom.xml index e4ba5598..2caa6e5a 100644 --- a/pom.xml +++ b/pom.xml @@ -34,13 +34,13 @@ 1.8 1.8 UTF-8 - 2.12.11 + 2.12.18 2.12 4.2.0 3.14.1 ${scala.compat.version} Snowpark ${project.version} - 1.4.0 + 1.4.11 1.64 true 4.3.0 @@ -443,19 +443,6 @@ - - org.scoverage - scoverage-maven-plugin - ${scoverage.plugin.version} - - - - check - - prepare-package - - - org.apache.maven.plugins maven-gpg-plugin @@ -506,6 +493,29 @@ + + test-coverage + + 2.12.15 + + + + + org.scoverage + scoverage-maven-plugin + ${scoverage.plugin.version} + + + + check + + prepare-package + + + + + + ossrh-deploy diff --git a/scripts/jenkins_regress.sh b/scripts/jenkins_regress.sh index 79972c75..085b318f 100755 --- a/scripts/jenkins_regress.sh +++ b/scripts/jenkins_regress.sh @@ -18,7 +18,7 @@ exit_code_decorator(){ gpg --quiet --batch --yes --decrypt --passphrase="$GPG_KEY" --output profile.properties scripts/profile.properties.gpg exit_code_decorator "mvn clean compile" -exit_code_decorator "mvn -Dgpg.skip -DtagsToExclude=com.snowflake.snowpark.PerfTest -e scoverage:report" +exit_code_decorator "mvn -Dgpg.skip -DtagsToExclude=com.snowflake.snowpark.PerfTest -e scoverage:report -P test-coverage" version=`git rev-parse HEAD` diff --git a/src/main/java/com/snowflake/snowpark_java/Functions.java b/src/main/java/com/snowflake/snowpark_java/Functions.java index 74cc39a8..1c2e12c7 100644 --- a/src/main/java/com/snowflake/snowpark_java/Functions.java +++ b/src/main/java/com/snowflake/snowpark_java/Functions.java @@ -2365,14 +2365,13 @@ public static Column regexp_count(Column strExpr, Column pattern) { */ public static Column regexp_replace(Column strExpr, Column pattern) { return new Column( - com.snowflake.snowpark.functions.regexp_replace( - strExpr.toScalaColumn(), pattern.toScalaColumn())); + com.snowflake.snowpark.functions.regexp_replace( + strExpr.toScalaColumn(), pattern.toScalaColumn())); } /** - * Returns the subject with the specified pattern (or all occurrences of the pattern) - * replaced by a replacement string. If no matches are found, returns the original - * subject. + * Returns the subject with the specified pattern (or all occurrences of the pattern) replaced by + * a replacement string. If no matches are found, returns the original subject. * * @param strExpr The input string * @param pattern The pattern @@ -2382,8 +2381,8 @@ public static Column regexp_replace(Column strExpr, Column pattern) { */ public static Column regexp_replace(Column strExpr, Column pattern, Column replacement) { return new Column( - com.snowflake.snowpark.functions.regexp_replace( - strExpr.toScalaColumn(), pattern.toScalaColumn(), replacement.toScalaColumn())); + com.snowflake.snowpark.functions.regexp_replace( + strExpr.toScalaColumn(), pattern.toScalaColumn(), replacement.toScalaColumn())); } /** diff --git a/src/main/scala/com/snowflake/snowpark/functions.scala b/src/main/scala/com/snowflake/snowpark/functions.scala index 49f38593..86ad1969 100644 --- a/src/main/scala/com/snowflake/snowpark/functions.scala +++ b/src/main/scala/com/snowflake/snowpark/functions.scala @@ -1817,7 +1817,6 @@ object functions { def regexp_replace(strExpr: Column, pattern: Column, replacement: Column): Column = builtin("regexp_replace")(strExpr, pattern, replacement) - /** * Removes all occurrences of a specified strExpr, * and optionally replaces them with replacement. diff --git a/src/test/java/com/snowflake/snowpark_test/JavaFunctionSuite.java b/src/test/java/com/snowflake/snowpark_test/JavaFunctionSuite.java index f74dc440..6e93454e 100644 --- a/src/test/java/com/snowflake/snowpark_test/JavaFunctionSuite.java +++ b/src/test/java/com/snowflake/snowpark_test/JavaFunctionSuite.java @@ -1457,7 +1457,7 @@ public void regexp_replace() { Column replacement = Functions.lit("ch"); Row[] expected1 = {Row.create("cht"), Row.create("chg"), Row.create("chuse")}; checkAnswer( - df.select(Functions.regexp_replace(df.col("a"), pattern, replacement)), expected1, false); + df.select(Functions.regexp_replace(df.col("a"), pattern, replacement)), expected1, false); } @Test