[maven-scala-plugin] 03/03: Merge tag 'upstream/3.2.2'
Andreas Tille
tille at debian.org
Sat Jan 30 13:55:09 UTC 2016
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository maven-scala-plugin.
commit aa38bad537c98b27fc714c146e3397857a5ba45f
Merge: 6eb0ad2 bce0200
Author: Andreas Tille <tille at debian.org>
Date: Sat Jan 30 14:43:15 2016 +0100
Merge tag 'upstream/3.2.2'
Upstream version 3.2.2
.gitignore | 12 +-
README.md | 60 ++
UNLICENSE | 24 +
pom.xml | 469 ++++++-----
src/changes/changes.xml | 71 ++
src/it/27_scalac-plugin/pom.xml | 20 +-
src/it/27_scalac-plugin/src/it/plugin-test/pom.xml | 24 +-
src/it/27_scaladocOnMultiModules/m1/pom.xml | 2 +-
src/it/27_scaladocOnMultiModules/m2/pom.xml | 2 +-
src/it/27_scaladocOnMultiModules/pom.xml | 32 +-
.../27_vscaladocOnMultiModules/invoker.properties | 1 -
src/it/27_vscaladocOnMultiModules/pom.xml | 75 --
src/it/27_vscaladocOnMultiModules/validate.groovy | 21 -
src/it/includesExcludes/pom.xml | 53 +-
src/it/includesExcludes/validate.groovy | 15 +-
src/it/mismatchedScalaVersions/pom.xml | 32 +-
src/it/next_test-scalac/pom.xml | 20 +-
src/it/off-20101014_liftone/invoker.properties | 1 -
src/it/off-20101014_liftone/pom.xml | 117 ---
.../src/main/scala/bootstrap/liftweb/Boot.scala | 45 --
.../src/main/scala/com/liftone/model/User.scala | 35 -
.../scala/com/liftone/snippet/HelloWorld.scala | 6 -
.../src/main/scala/com/liftone/view/.keep | 0
.../src/main/webapp/WEB-INF/web.xml | 21 -
.../src/main/webapp/index.html | 5 -
.../src/test/scala/LiftConsole.scala | 15 -
.../src/test/scala/RunWebApp.scala | 28 -
.../src/test/scala/com/liftone/AppTest.scala | 29 -
.../invoker.properties | 1 +
.../m1/pom.xml | 2 +-
.../m1/src/main/scala/p1/MyClass.scala | 0
.../m2/pom.xml | 2 +-
.../m2/src/main/scala/p2/MyClass.scala | 0
src/it/off-test_scaladoc2_onMultiModules/pom.xml | 66 ++
.../validate.groovy | 12 +
src/it/off-test_script_bug48/invoker.properties | 1 +
src/it/off-test_script_bug48/pom.xml | 67 ++
.../src/main/scala}/.keep | 0
.../validate.groovy | 4 +-
src/it/test-incremental-compile/invoker.properties | 1 +
src/it/test-incremental-compile/pom.xml | 69 ++
.../test-incremental-compile/src/main/java/A.java | 3 +
.../src/main/scala/B.scala | 3 +
.../test-incremental-compile/src/test/java/X.java | 3 +
.../src/test/scala/Y.scala | 3 +
src/it/test-incremental-compile/validate.groovy | 26 +
src/it/test1/invoker.properties | 2 +-
src/it/test1/pom.xml | 83 +-
src/it/testJavaAndScala/pom.xml | 28 +-
src/it/testLotsofJavaFiles/pom.xml | 26 +-
src/it/testLotsofJavaFilesNoFork/pom.xml | 31 +-
src/it/test_custom_outputdir/invoker.properties | 1 +
src/it/test_custom_outputdir/pom.xml | 89 +++
.../src/main/java/TestClass.java | 4 +
.../src/main/scala}/MyClass.scala | 2 -
src/it/test_custom_outputdir/validate.groovy | 17 +
.../invoker.properties | 1 +
src/it/test_directory_with_class_name/pom.xml | 88 +++
.../src/main/java/example/Foo2.java | 9 +
.../main/resources/example/Foo/input/testdata.txt} | 0
.../resources/example/Foo2/input/testdata.txt} | 0
.../src/main/scala/example/Bar.scala | 5 +
.../src/main/scala/example/Foo.scala | 5 +
.../test_directory_with_class_name/validate.groovy | 14 +
src/it/test_goal_doc/pom.xml | 31 +-
src/it/test_goal_site/pom.xml | 109 ++-
src/it/test_goal_site/validate.groovy | 17 +-
src/it/test_macroparadise/core/pom.xml | 49 ++
.../core/src/main/scala/Test.scala | 3 +
src/it/test_macroparadise/invoker.properties | 1 +
src/it/test_macroparadise/macro/pom.xml | 57 ++
.../macro/src/main/scala/Compat.scala | 399 ++++++++++
.../macro/src/main/scala/Helper.scala | 13 +
.../macro/src/main/scala/Macros.scala | 12 +
src/it/test_macroparadise/pom.xml | 25 +
src/it/test_macroparadise/validate.groovy | 12 +
src/it/test_multicompile/invoker.properties | 1 +
src/it/test_multicompile/pom.xml | 51 ++
.../src/c0/scala}/MyClass.scala | 2 -
.../src/c1/scala}/MyClass.scala | 2 -
.../validate.groovy | 7 -
src/it/test_no_sources/invoker.properties | 1 +
src/it/test_no_sources/pom.xml | 47 ++
.../validate.groovy | 8 +-
src/it/test_scalaHome/invoker.properties | 1 +
src/it/test_scalaHome/pom.xml | 48 ++
src/it/test_scalaHome/src/main/java/TestClass.java | 4 +
.../src/main/scala}/MyClass.scala | 2 -
.../validate.groovy | 0
src/it/test_scaladoc2_onJavaScala/pom.xml | 62 +-
.../src/main/scala/HelloScala.scala | 4 +-
src/it/test_scaladoc2_onJavaScala/validate.groovy | 4 +-
src/it/test_script_hello/build.scala | 8 +
src/it/test_script_hello/invoker.properties | 2 +-
src/it/test_script_hello/pom.xml | 51 +-
src/it/test_script_hello/validate.groovy | 7 +-
.../test_script_on_non_scala_project/build.scala | 8 +
.../invoker.properties | 1 +
src/it/test_script_on_non_scala_project/pom.xml | 87 +++
.../validate.groovy | 14 +
.../java/org_scala_tools_maven/BasicArtifact.java | 27 -
.../ScalaCompilerSupport.java | 218 ------
.../org_scala_tools_maven/ScalaGenJsonMojo.java | 303 --------
.../java/org_scala_tools_maven/ScalaHelpMojo.java | 47 --
.../java/org_scala_tools_maven/VersionNumber.java | 76 --
.../ScalaCSCompileAllMojo.java | 14 -
.../ScalaCSCompileMojo.java | 14 -
.../ScalaCSCompileSingleMojo.java | 14 -
.../org_scala_tools_maven_cs/ScalaCSInitMojo.java | 171 ----
.../ScalaCSMojoSupport.java | 49 --
.../ScalaCSRemoveMojo.java | 14 -
.../org_scala_tools_maven_cs/ScalaCSStopMojo.java | 14 -
.../org_scala_tools_maven_cs/ScalacsClient.java | 337 --------
.../ScalaConstants.java | 10 -
.../MavenProjectAdapter.java | 864 ---------------------
src/main/java/sbt_inc/SbtIncrementalCompiler.java | 168 ++++
src/main/java/sbt_inc/SbtLogger.java | 49 ++
.../AddSourceMojo.java | 21 +-
src/main/java/scala_maven/BasicArtifact.java | 13 +
src/main/java/scala_maven/FileUtils.java | 22 +
.../Launcher.java | 2 +-
.../ScalaCompileMojo.java | 51 +-
.../java/scala_maven/ScalaCompilerSupport.java | 346 +++++++++
.../ScalaConsoleMojo.java | 52 +-
.../ScalaContinuousCompileMojo.java | 83 +-
.../ScalaContinuousTestMojo.java | 291 ++++---
src/main/java/scala_maven/ScalaDocJarMojo.java | 200 +++++
.../ScalaDocMojo.java | 112 ++-
src/main/java/scala_maven/ScalaHelpMojo.java | 32 +
.../ScalaMojoSupport.java | 467 +++++++++--
.../ScalaRunMojo.java | 40 +-
.../ScalaScriptMojo.java | 296 +++----
.../ScalaSourceMojoSupport.java | 41 +-
.../ScalaTestCompileMojo.java | 44 +-
.../TychoUtilities.java | 19 +-
src/main/java/scala_maven/VersionNumber.java | 133 ++++
.../CheckScalaVersionVisitor.java | 21 +-
.../scala_maven_dependency/ScalaConstants.java | 8 +
.../ScalaDistroArtifactFilter.java | 18 +-
.../StringUtil.java | 2 +-
.../JavaMainCaller.java | 2 +-
.../JavaMainCallerByFork.java | 75 +-
.../JavaMainCallerInProcess.java | 12 +-
.../JavaMainCallerSupport.java | 40 +-
.../scala_maven_executions/LogProcessorUtils.java | 38 +
.../MainHelper.java | 7 +-
.../MainWithArgsInFile.java | 2 +-
.../SpawnMonitor.java | 2 +-
.../scala_maven_model/MavenProjectAdapter.java | 855 ++++++++++++++++++++
.../resources/announcements/announcement.md.vm | 14 +-
.../scalacs.boot.properties | 0
src/site/default-site.vm | 504 ++++++++++++
src/site/resources/css/maven-base.css | 151 ++++
src/site/resources/css/maven-theme.css | 141 ++++
src/site/resources/css/print.css | 7 +
src/site/resources/css/site.css | 230 ++++++
src/site/resources/images/close.gif | Bin 0 -> 279 bytes
src/site/resources/images/collapsed.gif | Bin 0 -> 53 bytes
src/site/resources/images/expanded.gif | Bin 0 -> 52 bytes
src/site/resources/images/external.png | Bin 0 -> 230 bytes
src/site/resources/images/icon_error_sml.gif | Bin 0 -> 1010 bytes
src/site/resources/images/icon_info_sml.gif | Bin 0 -> 606 bytes
src/site/resources/images/icon_success_sml.gif | Bin 0 -> 990 bytes
src/site/resources/images/icon_warning_sml.gif | Bin 0 -> 576 bytes
.../images/logos/build-by-maven-black.png | Bin 0 -> 2294 bytes
.../images/logos/build-by-maven-white.png | Bin 0 -> 2260 bytes
src/site/resources/images/logos/maven-feather.png | Bin 0 -> 3330 bytes
src/site/resources/images/newwindow.png | Bin 0 -> 220 bytes
src/site/site.xml | 14 +-
src/site/template-site.vm | 551 +++++++++++++
src/site/xdoc/articles.xml | 2 +-
src/site/xdoc/example_cc.xml | 2 +-
.../{example_cctest.xml => example_cctest.xml.vm} | 13 +-
...{example_compile.xml => example_compile.xml.vm} | 36 +-
...{example_console.xml => example_console.xml.vm} | 24 +-
.../xdoc/{example_doc.xml => example_doc.xml.vm} | 38 +-
src/site/xdoc/example_incremental.xml.vm | 171 ++++
.../xdoc/{example_java.xml => example_java.xml.vm} | 40 +-
src/site/xdoc/example_run.xml | 2 +-
...c_plugins.xml => example_scalac_plugins.xml.vm} | 27 +-
.../{example_script.xml => example_script.xml.vm} | 17 +-
src/site/xdoc/{faq.xml => faq.xml.vm} | 26 +-
src/site/xdoc/index.xml | 10 +-
src/site/xdoc/{usage.xml => usage.xml.vm} | 26 +-
src/test/java/org_scala_tools_maven/MiscTest.java | 29 -
.../org_scala_tools_maven/VersionNumberTest.java | 37 -
.../java/scala_maven/LogProcessorUtilsTest.java | 38 +
src/test/java/scala_maven/MiscTest.java | 68 ++
src/test/java/scala_maven/VersionNumberTest.java | 55 ++
189 files changed, 6898 insertions(+), 4164 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-scala-plugin.git
More information about the pkg-java-commits
mailing list