diff --git a/.github/actions/dllib-scala-ut-action/action.yml b/.github/actions/dllib-scala-ut-action/action.yml
index a73f422dc77..0ba0a81fb7f 100644
--- a/.github/actions/dllib-scala-ut-action/action.yml
+++ b/.github/actions/dllib-scala-ut-action/action.yml
@@ -9,14 +9,14 @@ runs:
export SPARK_LOCAL_HOSTNAME=localhost
export KERAS_BACKEND=tensorflow
cd scala
- mvn "-DwildcardSuites=com.intel.analytics.bigdl.dllib.optim" "-Dtest=com.intel.analytics.bigdl.dllib.optim.*Test" test -P spark_3.x -Dspark.version=3.1.3
- mvn "-DwildcardSuites=com.intel.analytics.bigdl.dllib.models" "-Dtest=com.intel.analytics.bigdl.dllib.models.*Test" test -P spark_3.x -Dspark.version=3.1.3
- mvn "-DwildcardSuites=com.intel.analytics.bigdl.dllib.estimator" "-Dtest=com.intel.analytics.bigdl.dllib.estimator.*Test" test -P spark_3.x -Dspark.version=3.1.3
- mvn "-DwildcardSuites=com.intel.analytics.bigdl.dllib.nnframes" "-Dtest=com.intel.analytics.bigdl.dllib.nnframes.*Test" test -P spark_3.x -Dspark.version=3.1.3
- mvn "-DwildcardSuites=com.intel.analytics.bigdl.dllib.feature" "-Dtest=com.intel.analytics.bigdl.dllib.feature.*Test" test -P spark_3.x -Dspark.version=3.1.3
- mvn "-DwildcardSuites=com.intel.analytics.bigdl.dllib.utils.intermediate" "-Dtest=com.intel.analytics.bigdl.dllib.utils.intermediate.*Test" test -P spark_3.x -Dspark.version=3.1.3
- mvn "-DwildcardSuites=com.intel.analytics.bigdl.dllib.utils.tf" "-Dtest=com.intel.analytics.bigdl.dllib.utils.tf.*Test" test -P spark_3.x -Dspark.version=3.1.3
- mvn "-DwildcardSuites=com.intel.analytics.bigdl.dllib.utils.python.api" "-Dtest=com.intel.analytics.bigdl.dllib.utils.python.api.*Test" test -P spark_3.x -Dspark.version=3.1.3
+ mvn "-DwildcardSuites=com.intel.analytics.bigdl.dllib.optim" "-Dtest=com.intel.analytics.bigdl.dllib.optim.*Test" test -P spark_3.x -Dspark.version=3.4.1
+ mvn "-DwildcardSuites=com.intel.analytics.bigdl.dllib.models" "-Dtest=com.intel.analytics.bigdl.dllib.models.*Test" test -P spark_3.x -Dspark.version=3.4.1
+ mvn "-DwildcardSuites=com.intel.analytics.bigdl.dllib.estimator" "-Dtest=com.intel.analytics.bigdl.dllib.estimator.*Test" test -P spark_3.x -Dspark.version=3.4.1
+ mvn "-DwildcardSuites=com.intel.analytics.bigdl.dllib.nnframes" "-Dtest=com.intel.analytics.bigdl.dllib.nnframes.*Test" test -P spark_3.x -Dspark.version=3.4.1
+ mvn "-DwildcardSuites=com.intel.analytics.bigdl.dllib.feature" "-Dtest=com.intel.analytics.bigdl.dllib.feature.*Test" test -P spark_3.x -Dspark.version=3.4.1
+ mvn "-DwildcardSuites=com.intel.analytics.bigdl.dllib.utils.intermediate" "-Dtest=com.intel.analytics.bigdl.dllib.utils.intermediate.*Test" test -P spark_3.x -Dspark.version=3.4.1
+ mvn "-DwildcardSuites=com.intel.analytics.bigdl.dllib.utils.tf" "-Dtest=com.intel.analytics.bigdl.dllib.utils.tf.*Test" test -P spark_3.x -Dspark.version=3.4.1
+ mvn "-DwildcardSuites=com.intel.analytics.bigdl.dllib.utils.python.api" "-Dtest=com.intel.analytics.bigdl.dllib.utils.python.api.*Test" test -P spark_3.x -Dspark.version=3.4.1
#need python requirements
#mvn "-DwildcardSuites=com.intel.analytics.bigdl.dllib.keras" "-Dtest=com.intel.analytics.bigdl.dllib.keras.*Test" test -P spark_3.x -Dspark.version=3.1.3
#mvn "-DwildcardSuites=com.intel.analytics.bigdl.dllib.nn.mkldnn" "-Dtest=com.intel.analytics.bigdl.dllib.nn.mkldnn.*Test" test -P spark_3.x -Dspark.version=3.1.3
diff --git a/.github/actions/friesian-scala-ut-action/action.yml b/.github/actions/friesian-scala-ut-action/action.yml
index 74cee432b68..66cef1c813b 100644
--- a/.github/actions/friesian-scala-ut-action/action.yml
+++ b/.github/actions/friesian-scala-ut-action/action.yml
@@ -39,4 +39,4 @@ runs:
export KERAS_BACKEND=tensorflow
cd scala
mvn "-DwildcardSuites=com.intel.analytics.bigdl.friesian" "-Dtest=com.intel.analytics.bigdl.friesian.*Test" test -P serving,spark_2.x -Dspark.version=2.4.6 "-Dspark.master=local[*]" -pl "!ppml"
- mvn "-DwildcardSuites=com.intel.analytics.bigdl.friesian" "-Dtest=com.intel.analytics.bigdl.friesian.*Test" test -P serving,spark_3.x -Dspark.version=3.1.3 "-Dspark.master=local[*]"
+ mvn "-DwildcardSuites=com.intel.analytics.bigdl.friesian" "-Dtest=com.intel.analytics.bigdl.friesian.*Test" test -P serving,spark_3.x -Dspark.version=3.4.1 "-Dspark.master=local[*]"
diff --git a/scala/common/spark-version/2.0/pom.xml b/scala/common/spark-version/2.0/pom.xml
index 9d6bcbeb561..8afc344d479 100644
--- a/scala/common/spark-version/2.0/pom.xml
+++ b/scala/common/spark-version/2.0/pom.xml
@@ -17,7 +17,7 @@
org.apache.hadoop
hadoop-client
- 3.2.4
+ ${hadoop.version}
provided
@@ -61,7 +61,7 @@
org.apache.hadoop
hadoop-common
- 3.2.4
+ ${hadoop.version}
provided
diff --git a/scala/common/spark-version/3.0/pom.xml b/scala/common/spark-version/3.0/pom.xml
index f9cbca7f8a3..bd81fc2028c 100644
--- a/scala/common/spark-version/3.0/pom.xml
+++ b/scala/common/spark-version/3.0/pom.xml
@@ -17,7 +17,7 @@
org.apache.hadoop
hadoop-client
- 3.2.4
+ ${hadoop.version}
provided
@@ -55,13 +55,17 @@
org.apache.hadoop
hadoop-hdfs-client
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
org.apache.hadoop
hadoop-common
- 3.2.4
+ ${hadoop.version}
provided
@@ -95,7 +99,15 @@
org.codehaus.jettison
jettison
-
+
+
+ org.apache.commons
+ commons-lang3
+
+
+ org.apache.commons
+ commons-text
+
@@ -139,7 +151,15 @@
com.google.protobuf
protobuf-java
-
+
+
+ org.apache.commons
+ commons-lang3
+
+
+ org.apache.commons
+ commons-text
+
@@ -179,7 +199,15 @@
com.google.protobuf
protobuf-java
-
+
+
+ org.apache.commons
+ commons-lang3
+
+
+ org.apache.commons
+ commons-text
+
diff --git a/scala/dllib/pom.xml b/scala/dllib/pom.xml
index 72d7b7a6bc9..8e014f9b258 100644
--- a/scala/dllib/pom.xml
+++ b/scala/dllib/pom.xml
@@ -40,7 +40,7 @@
org.apache.hadoop
hadoop-client
- 3.2.4
+ ${hadoop.version}
${spark-scope}
@@ -76,7 +76,7 @@
org.apache.hadoop
hadoop-common
- 3.2.4
+ ${hadoop.version}
provided
@@ -114,7 +114,15 @@
net.minidev
json-smart
-
+
+
+ org.apache.commons
+ commons-lang3
+
+
+ org.apache.commons
+ commons-text
+
@@ -140,6 +148,14 @@
log4j
log4j
+
+
+ io.netty
+ netty-handler
+
+
+ io.netty
+ netty-transport-native-epoll
@@ -226,7 +242,15 @@
org.apache.ivy
ivy
-
+
+
+ org.apache.commons
+ commons-lang3
+
+
+ org.apache.commons
+ commons-text
+
@@ -292,6 +316,18 @@
commons-compress
1.21
+
+ org.apache.commons
+ commons-lang3
+ 3.12.0
+ ${spark-scope}
+
+
+ org.apache.commons
+ commons-text
+ 1.10.0
+ ${spark-scope}
+
org.scalanlp
breeze_${scala.major.version}
@@ -319,8 +355,8 @@
ml.dmlc
- xgboost4j_${scala.major.version}
- 1.1.2
+ xgboost4j_2.12
+ 1.6.2
com.esotericsoftware.kryo
@@ -334,8 +370,8 @@
ml.dmlc
- xgboost4j-spark_${scala.major.version}
- 1.1.2
+ xgboost4j-spark_2.12
+ 1.6.2
com.esotericsoftware.kryo
diff --git a/scala/friesian/pom.xml b/scala/friesian/pom.xml
index 18aa43ffce1..5853acc4df2 100644
--- a/scala/friesian/pom.xml
+++ b/scala/friesian/pom.xml
@@ -137,7 +137,7 @@
org.apache.hadoop
hadoop-common
- 3.2.4
+ ${hadoop.version}
provided
@@ -234,7 +234,7 @@
io.lettuce
lettuce-core
- 6.1.6.RELEASE
+ 6.2.4.RELEASE
${serving.scope}
diff --git a/scala/pom.xml b/scala/pom.xml
index ef50f198040..3120dae990b 100644
--- a/scala/pom.xml
+++ b/scala/pom.xml
@@ -160,8 +160,9 @@
1.0-alpha-8
3.0.0-M3
- 3.2.4
- 32.0.1-jre
+ 3.3.4
+ 32.0.1-jre
+ 3.7.0-M11
thrift
0.9.2
1.7.7
@@ -187,7 +188,7 @@
http://download.tensorflow.org
provided
1.53.0
- 1.12.2
+ 1.12.3
@@ -812,10 +813,10 @@
1.8
1.8
3.0
- 3.1.3
+ 3.4.1
2.12
- 2.12.10
- 2.1.0
+ 2.12.15
+ 2.1.1
compile
${java.version}
${java.version}
@@ -893,8 +894,8 @@
scala_2.12
2.12
- 2.12.10
- 2.1.0
+ 2.12.15
+ 2.1.1
diff --git a/scala/ppml/pom.xml b/scala/ppml/pom.xml
index e01ab2491cc..ed2a683eb4c 100644
--- a/scala/ppml/pom.xml
+++ b/scala/ppml/pom.xml
@@ -113,7 +113,11 @@
org.apache.ivy
ivy
-
+
+
+ org.scala-lang.modules
+ scala-parser-combinators_${scala.major.version}
+
@@ -121,6 +125,17 @@
commons-text
1.10.0
+
+ org.scala-lang.modules
+ scala-parser-combinators_${scala.major.version}
+ 1.1.2
+
+
+ org.apache.hadoop
+ hadoop-client
+ ${hadoop.version}
+ provided
+
org.apache.commons
commons-compress
diff --git a/scala/serving/pom.xml b/scala/serving/pom.xml
index fc1e6e4585e..e9031971f9c 100644
--- a/scala/serving/pom.xml
+++ b/scala/serving/pom.xml
@@ -44,7 +44,7 @@
org.json4s
json4s-jackson_${scala.major.version}
- 3.7.0-M5
+ ${json4s.version}
com.google.protobuf