diff --git a/pom.xml b/pom.xml index 67df6e46..a0b8a1de 100644 --- a/pom.xml +++ b/pom.xml @@ -135,7 +135,7 @@ UTF-8 https://oss.sonatype.org/content/repositories/snapshots/ 2.12.18 - 2.13.11 + 2.13.13 diff --git a/samples/prj_multi_modules/pom.xml b/samples/prj_multi_modules/pom.xml index a6da1439..1bd5fbb5 100644 --- a/samples/prj_multi_modules/pom.xml +++ b/samples/prj_multi_modules/pom.xml @@ -13,7 +13,7 @@ org.scala-lang scala-library - 2.12.10 + 2.13.13 @@ -24,7 +24,7 @@ net.alchim31.maven scala-maven-plugin - 4.3.0 + 4.9.0 diff --git a/src/it/includesExcludes/pom.xml b/src/it/includesExcludes/pom.xml index ece1298b..83692635 100644 --- a/src/it/includesExcludes/pom.xml +++ b/src/it/includesExcludes/pom.xml @@ -1,78 +1,77 @@ - 4.0.0 + 4.0.0 - it.scala-maven-plugin - includesExcludes - 1.0-SNAPSHOT - Test compilation using excludes/includes - Test compilation pulls version from dependency - jar - - - org.scala-lang - scala-library - ${scala.version.lastrelease} - - - - + it.scala-maven-plugin + includesExcludes + 1.0-SNAPSHOT + Test compilation using excludes/includes + Test compilation pulls version from dependency + jar + + + org.scala-lang + scala-library + ${scala.version.lastrelease} + + + + + + @project.groupId@ + @project.artifactId@ + @project.version@ + + + + compile + testCompile + + + + + + **/*.scala + **/TestClass.java + + + bad.scala + + + + + org.apache.maven.plugins + maven-site-plugin + 3.3 + + - @project.groupId@ - @project.artifactId@ - @project.version@ - - - - compile - testCompile - - - - - - **/*.scala - **/TestClass.java - - - bad.scala - - + @project.groupId@ + @project.artifactId@ + @project.version@ + + + **/*.scala + **/TestClass.java + + + bad.scala + + - - org.apache.maven.plugins - maven-site-plugin - 3.3 - - - - @project.groupId@ - @project.artifactId@ - @project.version@ - - - **/*.scala - **/TestClass.java - - - bad.scala - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 1.8 - 1.8 - - - - - + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.13.0 + + 1.8 + 1.8 + + + + diff --git a/src/it/mismatchedScalaVersions/pom.xml b/src/it/mismatchedScalaVersions/pom.xml index 17430cd9..e69bd1a0 100644 --- a/src/it/mismatchedScalaVersions/pom.xml +++ b/src/it/mismatchedScalaVersions/pom.xml @@ -1,71 +1,71 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 - it.scala-maven-plugin - mismatchedScalaVersions - 1.0-SNAPSHOT - jar - Test for Mismatched Scala versions and error message output! - Test for Java + Scala compilation + it.scala-maven-plugin + mismatchedScalaVersions + 1.0-SNAPSHOT + jar + Test for Mismatched Scala versions and error message output! + Test for Java + Scala compilation - - - org.scala-lang - scala-library - 2.7.1 - - - lift-util - net.liftweb - 1.0 - - - org.openid4java - openid4java - 0.9.3 - - + + + org.scala-lang + scala-library + 2.13.13 + + + net.liftweb + lift-util_2.13 + 3.5.0 + + + org.openid4java + openid4java + 0.9.3 + + - - - - + + + + @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 - - - - - false - false - - - - + + + scala-compile-first + process-resources + + add-source + compile + + + + scala-test-compile + process-test-resources + + testCompile + + + + + false + false + + + + diff --git a/src/it/multilanguage-kotlinscala/pom.xml b/src/it/multilanguage-kotlinscala/pom.xml index ebfe8ffe..4149d22a 100644 --- a/src/it/multilanguage-kotlinscala/pom.xml +++ b/src/it/multilanguage-kotlinscala/pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 it.scala-maven-plugin @@ -23,9 +23,9 @@ - kotlin-maven-plugin org.jetbrains.kotlin - 1.2.50 + kotlin-maven-plugin + 1.9.23 compile diff --git a/src/it/test-incremental-compile/pom.xml b/src/it/test-incremental-compile/pom.xml index 2a822b98..1c04bde1 100644 --- a/src/it/test-incremental-compile/pom.xml +++ b/src/it/test-incremental-compile/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 it.scala-maven-plugin @@ -64,7 +64,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.13.0 1.8 1.8 @@ -72,5 +72,4 @@ - diff --git a/src/it/test1/pom.xml b/src/it/test1/pom.xml index e1135ca2..1ebeec72 100644 --- a/src/it/test1/pom.xml +++ b/src/it/test1/pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 it.scala-maven-plugin @@ -24,58 +24,58 @@ @project.artifactId@ @project.version@ - + cmain compile + + + + -DwordWithSpace=hello world + + + -dependencyfile + ${project.build.directory}/.main_scala_dependencies + + + + + ctest + testCompile + + + -dependencyfile + ${project.build.directory}/.test_scala_dependencies + + ---> - - - cmain - - compile - - - - -DwordWithSpace=hello world - - - -dependencyfile - ${project.build.directory}/.main_scala_dependencies - - - - - ctest - - testCompile - - - - -dependencyfile - ${project.build.directory}/.test_scala_dependencies - - - - - - ${scala.version} - true - - -encoding - UTF8 - - + + ${scala.version} + true + + -encoding + UTF8 + + org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.13.0 1.8 1.8 @@ -84,17 +84,17 @@ org.apache.maven.plugins maven-site-plugin - 3.3 - - - - @project.groupId@ - @project.artifactId@ - @project.version@ - - - + 3.12.1 + + + + @project.groupId@ + @project.artifactId@ + @project.version@ + + + diff --git a/src/it/testJavaAndScala/pom.xml b/src/it/testJavaAndScala/pom.xml index 81431183..a910a467 100644 --- a/src/it/testJavaAndScala/pom.xml +++ b/src/it/testJavaAndScala/pom.xml @@ -1,60 +1,59 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 - it.scala-maven-plugin - testJavaAndScala - 1.0-SNAPSHOT - Test for Java + Scala compilation - Test for Java + Scala compilation - jar - - - org.scala-lang - scala-library + it.scala-maven-plugin + testJavaAndScala + 1.0-SNAPSHOT + Test for Java + Scala compilation + Test for Java + Scala compilation + jar + + + org.scala-lang + scala-library ${scala.version.lastrelease} - - + + - - - - + + + + @project.groupId@ @project.artifactId@ @project.version@ - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - - - - + + + org.apache.maven.plugins + maven-compiler-plugin + 3.13.0 + + + + + @project.groupId@ @project.artifactId@ - - - scala-compile-first - process-resources - - compile - - - - scala-test-compile - process-test-resources - - testCompile - - - - - - - + + + scala-compile-first + process-resources + + compile + + + + scala-test-compile + process-test-resources + + testCompile + + + + + + diff --git a/src/it/testLotsofJavaFiles/pom.xml b/src/it/testLotsofJavaFiles/pom.xml index 5ba9eaee..7f8db183 100644 --- a/src/it/testLotsofJavaFiles/pom.xml +++ b/src/it/testLotsofJavaFiles/pom.xml @@ -1,80 +1,79 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 - it.scala-maven-plugin - testLotsofJavaFiles - 1.0-SNAPSHOT - jar - Test for Java + Scala compilation with too many files and non-forked execution - Test for Java + Scala compilation + it.scala-maven-plugin + testLotsofJavaFiles + 1.0-SNAPSHOT + jar + Test for Java + Scala compilation with too many files and non-forked execution + Test for Java + Scala compilation - - - org.scala-lang - scala-library - ${scala.version.lastrelease} - - + + + org.scala-lang + scala-library + ${scala.version.lastrelease} + + - - - - + + + + @project.groupId@ @project.artifactId@ @project.version@ - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 1.8 - 1.8 - - - - - - + + + org.apache.maven.plugins + maven-compiler-plugin + 3.13.0 + + 1.8 + 1.8 + + + + + + @project.groupId@ @project.artifactId@ - - - scala-compile-first - process-resources - - add-source - compile - - - - scala-test-compile - process-test-resources - - testCompile - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - compile - - compile - - - - - - - + + + scala-compile-first + process-resources + + add-source + compile + + + + scala-test-compile + process-test-resources + + testCompile + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + compile + + compile + + + + + + diff --git a/src/it/testLotsofJavaFilesNoFork/pom.xml b/src/it/testLotsofJavaFilesNoFork/pom.xml index 1e0f0bee..c330122b 100644 --- a/src/it/testLotsofJavaFilesNoFork/pom.xml +++ b/src/it/testLotsofJavaFilesNoFork/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 it.scala-maven-plugin @@ -29,7 +29,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.13.0 1.8 1.8 diff --git a/src/it/test_custom_outputdir/pom.xml b/src/it/test_custom_outputdir/pom.xml index 075e2f81..838c28a6 100644 --- a/src/it/test_custom_outputdir/pom.xml +++ b/src/it/test_custom_outputdir/pom.xml @@ -73,21 +73,12 @@ org.apache.maven.plugins maven-site-plugin - 3.3 - - - - @project.groupId@ - @project.artifactId@ - @project.version@ - - - + 3.12.1 org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.13.0 1.8 1.8 @@ -95,4 +86,13 @@ + + + + @project.groupId@ + @project.artifactId@ + @project.version@ + + + \ No newline at end of file diff --git a/src/it/test_directory_with_class_name/pom.xml b/src/it/test_directory_with_class_name/pom.xml index 45121c08..3df88904 100644 --- a/src/it/test_directory_with_class_name/pom.xml +++ b/src/it/test_directory_with_class_name/pom.xml @@ -1,92 +1,91 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - it.scala-maven-plugin - 1.0 - directory_with_class_name - ${project.artifactId} - Test resources directory with same name as a class (java or scala) - jar + it.scala-maven-plugin + 1.0 + directory_with_class_name + ${project.artifactId} + Test resources directory with same name as a class (java or scala) + jar - - UTF-8 - + + UTF-8 + - - - org.scala-lang - scala-library - ${scala.version.lastrelease} - - - - - + + + org.scala-lang + scala-library + ${scala.version.lastrelease} + + + + + + + @project.groupId@ + @project.artifactId@ + @project.version@ + + all + + -target:jvm-1.8 + + + -source + 1.8 + -target + 1.8 + + + + + - - @project.groupId@ - @project.artifactId@ - @project.version@ - - all - - -target:jvm-1.8 - - - -source - 1.8 - -target - 1.8 - - - - - + - + + net.alchim31.maven + scala-maven-plugin + + + scala-compile + process-resources + + compile + + + + scala-test-compile + process-test-resources + + testCompile + + + + - - net.alchim31.maven - scala-maven-plugin - - - scala-compile - process-resources - - compile - - - - scala-test-compile - process-test-resources - - testCompile - - - - + + maven-compiler-plugin + + 1.8 + 1.8 + + + + default-compile + none + + + default-testCompile + none + + + + - - maven-compiler-plugin - - 1.8 - 1.8 - - - - default-compile - none - - - default-testCompile - none - - - - - - + diff --git a/src/it/test_goal_doc/pom.xml b/src/it/test_goal_doc/pom.xml index c114a7b8..4864c21e 100644 --- a/src/it/test_goal_doc/pom.xml +++ b/src/it/test_goal_doc/pom.xml @@ -1,6 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 it.scala-maven-plugin @@ -56,12 +57,12 @@ org.apache.maven.plugins maven-site-plugin - 3.7.1 + 3.12.1 org.apache.maven.plugins maven-project-info-reports-plugin - 3.0.0 + 3.5.0 @@ -82,7 +83,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.13.0 1.8 1.8 @@ -90,5 +91,4 @@ - diff --git a/src/it/test_goal_site/pom.xml b/src/it/test_goal_site/pom.xml index 0616e5af..9ba3e1b8 100644 --- a/src/it/test_goal_site/pom.xml +++ b/src/it/test_goal_site/pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 it.scala-maven-plugin @@ -40,21 +40,12 @@ org.apache.maven.plugins maven-site-plugin - 3.3 - - - - @project.groupId@ - @project.artifactId@ - @project.version@ - - - + 3.12.1 org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.13.0 1.8 1.8 @@ -62,5 +53,13 @@ - + + + + @project.groupId@ + @project.artifactId@ + @project.version@ + + + diff --git a/src/it/test_multicompile/pom.xml b/src/it/test_multicompile/pom.xml index 0642fbc3..b201c9ad 100644 --- a/src/it/test_multicompile/pom.xml +++ b/src/it/test_multicompile/pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 it.scala-maven-plugin @@ -23,28 +23,28 @@ @project.groupId@ @project.artifactId@ @project.version@ - - - c0 - generate-resources - - compile - - - src/c0/scala - - - - c1 - generate-sources - - compile - - - src/c1/scala - - - + + + c0 + generate-resources + + compile + + + src/c0/scala + + + + c1 + generate-sources + + compile + + + src/c1/scala + + + diff --git a/src/it/test_no_sources/pom.xml b/src/it/test_no_sources/pom.xml index da5de6d8..21cd560b 100644 --- a/src/it/test_no_sources/pom.xml +++ b/src/it/test_no_sources/pom.xml @@ -1,47 +1,47 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 - it.scala-maven-plugin - test_no_sources - 1.0-SNAPSHOT - Test for absent Scala sources - Test for absent Scala sources - pom - - - org.scala-lang - scala-library - ${scala.version.lastrelease} - - + it.scala-maven-plugin + test_no_sources + 1.0-SNAPSHOT + Test for absent Scala sources + Test for absent Scala sources + pom + + + org.scala-lang + scala-library + ${scala.version.lastrelease} + + - - - - @project.groupId@ - @project.artifactId@ - @project.version@ - - - scala-compile-first - process-resources - - compile - - - - scala-test-compile - process-test-resources - - testCompile - - - - - - + + + + @project.groupId@ + @project.artifactId@ + @project.version@ + + + scala-compile-first + process-resources + + compile + + + + scala-test-compile + process-test-resources + + testCompile + + + + + + diff --git a/src/it/test_scala3/pom.xml b/src/it/test_scala3/pom.xml index aae91e08..628ab130 100644 --- a/src/it/test_scala3/pom.xml +++ b/src/it/test_scala3/pom.xml @@ -11,7 +11,7 @@ 3 - 3.0.0 + 3.4.1 @@ -19,7 +19,7 @@ scala3-library_${scala.compat.version} ${scala.version} - + diff --git a/src/it/test_scalaCompatVersion/pom.xml b/src/it/test_scalaCompatVersion/pom.xml index 48003c6e..0c2f1da3 100644 --- a/src/it/test_scalaCompatVersion/pom.xml +++ b/src/it/test_scalaCompatVersion/pom.xml @@ -2,68 +2,67 @@ - 4.0.0 + 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! + 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 - + + 2.12 + ${scala.version.major} + 14 + ${scala.version.major}.${scala.version.minor} + 3.5.1 + - - - org.apache.spark - spark-sql_${scala.compat.version} - ${spark.version} - provided - - + + + 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 - - - - - - + + 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_scaladoc2_onJavaScala/pom.xml b/src/it/test_scaladoc2_onJavaScala/pom.xml index e8040c8e..58bc6934 100644 --- a/src/it/test_scaladoc2_onJavaScala/pom.xml +++ b/src/it/test_scaladoc2_onJavaScala/pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 scaladocTest scaladocTest @@ -20,7 +20,6 @@ scala-library ${scala.version} - @@ -36,29 +35,34 @@ compile compile - compile + + compile + test-compile test-compile - testCompile + + testCompile + process-resources process-resources - compile + + compile + - - - - myLauncher - HelloScala - - - + + + + myLauncher + HelloScala + + + - org.apache.maven.plugins @@ -71,5 +75,4 @@ - diff --git a/src/it/test_scaladoc_compiler_plugins/pom.xml b/src/it/test_scaladoc_compiler_plugins/pom.xml index 26071e6f..c112793c 100644 --- a/src/it/test_scaladoc_compiler_plugins/pom.xml +++ b/src/it/test_scaladoc_compiler_plugins/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 it.scala-maven-plugin test_scaladoc_compiler_plugin @@ -49,7 +50,7 @@ org.typelevel kind-projector_${scala.version.lastrelease} - 0.13.2 + 0.13.3 @@ -65,7 +66,7 @@ doc-jar - + diff --git a/src/it/test_skip_main/pom.xml b/src/it/test_skip_main/pom.xml index a78bda01..5ee4c6da 100644 --- a/src/it/test_skip_main/pom.xml +++ b/src/it/test_skip_main/pom.xml @@ -1,45 +1,43 @@ - 4.0.0 - - it.scala-maven-plugin - test_skip_test - 1.0-SNAPSHOT - Test for skipping compilation of test sources - Test for skipping compilation of test sources - pom - - - org.scala-lang - scala-library - ${scala.version.lastrelease} - - - - - - - @project.groupId@ - @project.artifactId@ - @project.version@ - - - scala-compile-first - - compile - - - - scala-test-compile - - testCompile - - - - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 + it.scala-maven-plugin + test_skip_test + 1.0-SNAPSHOT + Test for skipping compilation of test sources + Test for skipping compilation of test sources + pom + + + org.scala-lang + scala-library + ${scala.version.lastrelease} + + + + + + @project.groupId@ + @project.artifactId@ + @project.version@ + + + scala-compile-first + + compile + + + + scala-test-compile + + testCompile + + + + + + diff --git a/src/it/test_skip_test/pom.xml b/src/it/test_skip_test/pom.xml index a78bda01..5ee4c6da 100644 --- a/src/it/test_skip_test/pom.xml +++ b/src/it/test_skip_test/pom.xml @@ -1,45 +1,43 @@ - 4.0.0 - - it.scala-maven-plugin - test_skip_test - 1.0-SNAPSHOT - Test for skipping compilation of test sources - Test for skipping compilation of test sources - pom - - - org.scala-lang - scala-library - ${scala.version.lastrelease} - - - - - - - @project.groupId@ - @project.artifactId@ - @project.version@ - - - scala-compile-first - - compile - - - - scala-test-compile - - testCompile - - - - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 + it.scala-maven-plugin + test_skip_test + 1.0-SNAPSHOT + Test for skipping compilation of test sources + Test for skipping compilation of test sources + pom + + + org.scala-lang + scala-library + ${scala.version.lastrelease} + + + + + + @project.groupId@ + @project.artifactId@ + @project.version@ + + + scala-compile-first + + compile + + + + scala-test-compile + + testCompile + + + + + +