diff --git a/scala-package/assembly/src/main/assembly/assembly.xml b/scala-package/assembly/src/main/assembly/assembly.xml index 3a8e11b436d1..5a931360645c 100644 --- a/scala-package/assembly/src/main/assembly/assembly.xml +++ b/scala-package/assembly/src/main/assembly/assembly.xml @@ -33,8 +33,8 @@ org.slf4j:slf4j-api args4j:args4j - / - true + . + false true runtime @@ -71,7 +71,7 @@ cub/LICENSE.TXT mkldnn/external/mklml_mac_2019.0.1.20180928/license.txt - / + . diff --git a/scala-package/assembly/src/main/assembly/javadoc.xml b/scala-package/assembly/src/main/assembly/javadoc.xml index 176fa432190c..c6df96a3f5a5 100644 --- a/scala-package/assembly/src/main/assembly/javadoc.xml +++ b/scala-package/assembly/src/main/assembly/javadoc.xml @@ -25,7 +25,7 @@ ${rootdir}/core/target/site/scaladocs - / + . diff --git a/scala-package/assembly/src/main/assembly/source.xml b/scala-package/assembly/src/main/assembly/source.xml index c06786130192..1f004e811cfc 100644 --- a/scala-package/assembly/src/main/assembly/source.xml +++ b/scala-package/assembly/src/main/assembly/source.xml @@ -29,7 +29,7 @@ **\/*.scala - / + . diff --git a/scala-package/core/pom.xml b/scala-package/core/pom.xml index 5a28a11a0208..b888b5549e7a 100644 --- a/scala-package/core/pom.xml +++ b/scala-package/core/pom.xml @@ -100,10 +100,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - org.apache.maven.plugins maven-clean-plugin @@ -141,6 +137,7 @@ + org.apache.mxnet diff --git a/scala-package/deploy/src/main/deploy/deploy.xml b/scala-package/deploy/src/main/deploy/deploy.xml index 7265e7de8809..f5b624885cbb 100644 --- a/scala-package/deploy/src/main/deploy/deploy.xml +++ b/scala-package/deploy/src/main/deploy/deploy.xml @@ -38,7 +38,7 @@ org.scala-lang.modules scala-parser-combinators_2.11 - 1.0.4 + 1.0.5 org.scala-lang diff --git a/scala-package/examples/pom.xml b/scala-package/examples/pom.xml index d60782ffd06b..257529199176 100644 --- a/scala-package/examples/pom.xml +++ b/scala-package/examples/pom.xml @@ -82,10 +82,6 @@ org.apache.maven.plugins maven-jar-plugin - - org.apache.maven.plugins - maven-compiler-plugin - net.alchim31.maven scala-maven-plugin diff --git a/scala-package/infer/pom.xml b/scala-package/infer/pom.xml index ed90d8073675..81e93932e83f 100644 --- a/scala-package/infer/pom.xml +++ b/scala-package/infer/pom.xml @@ -46,10 +46,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - org.scalatest scalatest-maven-plugin diff --git a/scala-package/macros/pom.xml b/scala-package/macros/pom.xml index 91a13d0fc521..cb84824bb4e2 100644 --- a/scala-package/macros/pom.xml +++ b/scala-package/macros/pom.xml @@ -51,10 +51,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - org.scalatest scalatest-maven-plugin diff --git a/scala-package/pom.xml b/scala-package/pom.xml index 62def16627b9..44b784a56f8e 100644 --- a/scala-package/pom.xml +++ b/scala-package/pom.xml @@ -53,8 +53,11 @@ + 1.7 2.11.8 + 2.11 + g++ $ ${project.basedir}/.. @@ -252,9 +255,11 @@ maven-compiler-plugin 3.3 - 1.7 - 1.7 + ${java.version} + ${java.version} UTF-8 + true + true @@ -339,11 +344,12 @@ - org.scala-tools - maven-scala-plugin - 2.15.2 + net.alchim31.maven + scala-maven-plugin + 3.4.4 - incremental + ${java.version} + ${java.version} org.scalamacros @@ -354,25 +360,19 @@ + compile + add-source compile testCompile + doc-jar - - - - net.alchim31.maven - scala-maven-plugin - 3.3.2 - - - - package - attach-javadocs + presite + pre-site - doc-jar + add-source @@ -388,6 +388,7 @@ + commons-codec @@ -419,7 +420,7 @@ org.scalatest scalatest_2.11 - 3.0.4 + 3.0.2 test @@ -454,7 +455,12 @@ org.scala-lang.modules scala-parser-combinators_2.11 - 1.0.4 + 1.0.5 + + + org.scala-lang.modules + scala-xml_2.11 + 1.0.6 org.scala-lang diff --git a/scala-package/spark/pom.xml b/scala-package/spark/pom.xml index 2acb70b43303..b61a427f83ef 100644 --- a/scala-package/spark/pom.xml +++ b/scala-package/spark/pom.xml @@ -50,5 +50,10 @@ args4j 2.33 + + org.json4s + json4s-core_2.11 + 3.5.1 +