diff --git a/src/it/test_scalaCompatVersion/invoker.properties b/src/it/test_scalaCompatVersion/invoker.properties new file mode 100644 index 00000000..8bb493a8 --- /dev/null +++ b/src/it/test_scalaCompatVersion/invoker.properties @@ -0,0 +1 @@ +invoker.goals=clean compile -e \ No newline at end of file diff --git a/src/it/test_scalaCompatVersion/pom.xml b/src/it/test_scalaCompatVersion/pom.xml new file mode 100644 index 00000000..48003c6e --- /dev/null +++ b/src/it/test_scalaCompatVersion/pom.xml @@ -0,0 +1,69 @@ + + + + 4.0.0 + + it.scala-maven-plugin + test_scalaCompatVersion + 1.0-SNAPSHOT + jar + Test for Compatible Scala versions and error message output! + Test for Compatible Scala versions and error message output! + + + 2.12 + ${scala.version.major} + 14 + ${scala.version.major}.${scala.version.minor} + 3.2.1 + + + + + org.apache.spark + spark-sql_${scala.compat.version} + ${spark.version} + provided + + + + + src/main/scala + src/test/scala + + + + + @project.groupId@ + @project.artifactId@ + @project.version@ + + + + + + @project.groupId@ + @project.artifactId@ + + + scala-compile-first + process-resources + + add-source + compile + + + + scala-test-compile + process-test-resources + + testCompile + + + + + + + + diff --git a/src/it/test_scalaCompatVersion/src/main/scala/ScalaClass.scala b/src/it/test_scalaCompatVersion/src/main/scala/ScalaClass.scala new file mode 100644 index 00000000..89866c3b --- /dev/null +++ b/src/it/test_scalaCompatVersion/src/main/scala/ScalaClass.scala @@ -0,0 +1,6 @@ +class ScalaClass { + + def abstractJavaMethod() : Unit = { + Console.println("Test") + } +} \ No newline at end of file diff --git a/src/it/test_scalaCompatVersion/validate.groovy b/src/it/test_scalaCompatVersion/validate.groovy new file mode 100644 index 00000000..6999ed39 --- /dev/null +++ b/src/it/test_scalaCompatVersion/validate.groovy @@ -0,0 +1,21 @@ +try { + +def echoString = "[WARNING] Multiple versions of scala libraries detected!" +def logFile = new File(basedir, "build.log") +//Look for echo string +def found = false; +logFile.eachLine({ line -> + if(line.contains(echoString)) { + found = true; + } +}); + +assert !found + + +return true + +} catch(Throwable e) { + e.printStackTrace() + return false +} diff --git a/src/main/java/scala_maven_dependency/CheckScalaVersionVisitor.java b/src/main/java/scala_maven_dependency/CheckScalaVersionVisitor.java index ac27fea8..8edcab57 100644 --- a/src/main/java/scala_maven_dependency/CheckScalaVersionVisitor.java +++ b/src/main/java/scala_maven_dependency/CheckScalaVersionVisitor.java @@ -45,7 +45,7 @@ public boolean visit(DependencyNode node) { try { if (_scalaContext.hasInDistro(artifact) && artifact.getVersion() != null) { VersionNumber originalVersion = new VersionNumber(artifact.getVersion()); - if (_scalaContext.version().compareTo(originalVersion) + if (_scalaContext.versionCompat().compareTo(originalVersion) != 0) { // _version can be a VersionNumberMask _failed = true; }