[jruby-maven-plugins] 04/15: Merge tag 'upstream/1.1.5+ds1'

Markus Koschany apo at moszumanska.debian.org
Wed Dec 28 20:24:42 UTC 2016


This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository jruby-maven-plugins.

commit 184d6f86407d345ed5c2978aadf9ba372ee18ee6
Merge: f685e81 170cb35
Author: Markus Koschany <apo at debian.org>
Date:   Wed Dec 28 20:17:06 2016 +0100

    Merge tag 'upstream/1.1.5+ds1'
    
    Upstream version 1.1.5+ds1
    
    # gpg: Signatur vom Mi 28 Dez 2016 20:17:06 CET
    # gpg:                mittels RSA-Schlüssel ACF3D088EF32EDEF6A1A835FD9AD14B9513B51E4
    # gpg: Korrekte Signatur von "Markus Koschany <apo at gambaru.de>" [ultimativ]
    # gpg:                     alias "Markus Koschany <markus at koschany.net>" [ultimativ]
    # gpg:                     alias "Markus Koschany <apo at debian.org>" [ultimativ]

 .gitignore                                         |   2 +
 .travis.yml                                        |   4 +
 bundler-maven-plugin/pom.xml                       |   2 +-
 .../java/de/saumya/mojo/bundler/InstallMojo.java   |  57 +-----
 .../java/de/saumya/mojo/bundler/UpdateMojo.java    |  34 +---
 cucumber-maven-plugin/pom.xml                      |  64 +-----
 .../features/simplest.feature                      |  11 -
 .../features/step_definitions/simplest_steps.rb    |   3 -
 .../src/it/cucumber-18and19-156_161/pom.xml        |  38 ----
 .../it/cucumber-18and19-156_161/test.properties    |   3 -
 .../src/it/cucumber-18and19-156_161/verify.bsh     |  39 ----
 .../it/cucumber-18and19/features/simplest.feature  |  11 -
 .../features/step_definitions/simplest_steps.rb    |   3 -
 .../src/it/cucumber-18and19/pom.xml                |  38 ----
 .../src/it/cucumber-18and19/test.properties        |   4 -
 .../src/it/cucumber-18and19/verify.bsh             |  26 ---
 .../cucumber/CucumberMavenTestScriptFactory.java   |   9 -
 .../java/de/saumya/mojo/cucumber/CucumberMojo.java |  90 +--------
 gem-assembly-descriptors/pom.xml                   |   4 +-
 gem-extension/pom.xml                              |   2 +-
 gem-maven-plugin/pom.xml                           |  95 +--------
 gem-maven-plugin/src/it/exec-file/pom.xml          |   2 +-
 .../execute-compass-with-gems-from-plugin/pom.xml  |   6 +-
 .../verify.bsh                                     |  12 +-
 gem-maven-plugin/src/it/gem-sets/pom.xml           |  24 ++-
 gem-maven-plugin/src/it/gem-sets/verify.bsh        |  89 ++++++---
 gem-maven-plugin/src/it/initialize/pom.xml         |   8 +-
 gem-maven-plugin/src/it/jars-lock/pom.xml          |   4 +-
 gem-maven-plugin/src/it/jars-lock/setup.bsh        |   4 +-
 gem-maven-plugin/src/it/jars-lock/verify.bsh       |   2 +-
 gem-maven-plugin/src/it/settings.xml               |  45 -----
 .../java/de/saumya/mojo/gem/AbstractGemMojo.java   |  41 ++--
 .../src/main/java/de/saumya/mojo/gem/ExecMojo.java |  38 ++--
 .../src/main/java/de/saumya/mojo/gem/GemMojo.java  |  12 +-
 .../main/java/de/saumya/mojo/gem/GemifyMojo.java   |  40 ++--
 .../de/saumya/mojo/gem/GenerateResourcesMojo.java  |  13 +-
 .../java/de/saumya/mojo/gem/InitializeMojo.java    |   9 +-
 .../main/java/de/saumya/mojo/gem/InstallMojo.java  |  18 +-
 .../src/main/java/de/saumya/mojo/gem/IrbMojo.java  |  22 +-
 .../main/java/de/saumya/mojo/gem/JarsLockMojo.java | 101 +++++-----
 .../main/java/de/saumya/mojo/gem/PackageMojo.java  |  57 +++---
 .../src/main/java/de/saumya/mojo/gem/PomMojo.java  |  37 +---
 .../de/saumya/mojo/gem/ProcessResourcesMojo.java   |  11 +-
 .../src/main/java/de/saumya/mojo/gem/PushMojo.java |  33 +--
 .../src/main/java/de/saumya/mojo/gem/SetsMojo.java | 116 +++++++++--
 gem-parent-mojo/pom.xml                            |  40 +---
 gem-with-jar-extension/pom.xml                     |   4 +-
 .../main/resources/META-INF/plexus/components.xml  |   8 +-
 jruby-maven-plugin/pom.xml                         | 115 ++++-------
 .../src/it/generate-java-and-compile/pom.xml       |   2 +-
 jruby-maven-plugin/src/it/settings.xml             |  45 -----
 .../de/saumya/mojo/jruby/AbstractJRubyMojo.java    |  97 +++------
 .../java/de/saumya/mojo/jruby/CompileMojo.java     |  42 ++--
 .../main/java/de/saumya/mojo/jruby/JRubyMojo.java  |  52 ++---
 .../java/de/saumya/mojo/jruby/JRubyVersion.java    |   4 +-
 jruby9/.gitignore                                  |   1 +
 jruby9/README.md                                   |  49 +++++
 jruby9/jruby9-common/pom.xml                       |  22 ++
 .../saumya/mojo/jruby9/AbstractGenerateMojo.java   |  81 ++++++++
 .../de/saumya/mojo/jruby9/AbstractJRuby9Mojo.java  |  12 ++
 .../de/saumya/mojo/jruby9/AbstractProcessMojo.java |  33 +++
 .../java/de/saumya/mojo/jruby9/ArchiveType.java    |   4 +
 .../java/de/saumya/mojo/jruby9/ArtifactHelper.java |  92 +++++++++
 .../java/de/saumya/mojo/jruby9/JRubyDirectory.java |  80 ++++++++
 .../de/saumya/mojo/jruby9/JarDependencies.java     |  86 ++++++++
 .../main/java/de/saumya/mojo/jruby9/Versions.java  |  10 +
 jruby9/jruby9-exec-maven-plugin/README.md          | 125 ++++++++++++
 jruby9/jruby9-exec-maven-plugin/pom.xml            |  32 +++
 .../src/it/jrubyExecExample}/invoker.properties    |   0
 .../src/it/jrubyExecExample/pom.xml                | 106 ++++++++++
 .../src/it/jrubyExecExample/spec/one_spec.rb       |   7 +
 .../src/it/jrubyExecExample/test.rb                |  29 +++
 .../java/de/saumya/mojo/jruby9/exec}/ExecMojo.java |  79 +++++---
 jruby9/jruby9-extensions/README.md                 |  98 +++++++++
 jruby9/jruby9-extensions/pom.xml                   |  20 ++
 .../src/it/jrubyJarRunnable}/invoker.properties    |   2 +-
 .../src/it/jrubyJarRunnable/pom.xml                | 146 ++++++++++++++
 .../src/it/jrubyJarRunnable/spec/one_spec.rb       |  11 +
 .../src/it/jrubyJarRunnable/test.rb                |  35 ++++
 .../src/it/jrubyWarExample}/invoker.properties     |   2 +-
 .../src/it/jrubyWarExample/pom.xml                 | 157 +++++++++++++++
 .../src/it/jrubyWarExample/spec/one_spec.rb        |  11 +
 .../src/it/jrubyWarExample/test.rb                 |  35 ++++
 .../main/resources/META-INF/plexus/components.xml  | 114 +++++++++++
 jruby9/jruby9-jar-maven-plugin/README.md           | 139 +++++++++++++
 jruby9/jruby9-jar-maven-plugin/pom.xml             |  47 +++++
 .../src/it/jrubyJarArchive/archive/pom.xml         | 103 ++++++++++
 .../src/it/jrubyJarArchive/archive/test.rb         |  35 ++++
 .../src/it/jrubyJarArchive}/invoker.properties     |   2 +-
 .../src/it/jrubyJarArchive/pom.xml                 |  15 ++
 .../src/it/jrubyJarArchive/test-jar/pom.xml        |  75 +++++++
 .../it/jrubyJarArchive/test-jar/spec/one_spec.rb   |  11 +
 .../java/de/saumya/mojo/jruby9/JRuby9TestCase.java |  35 ++++
 .../src/it/jrubyJarArchive/test-runnable/pom.xml   | 167 ++++++++++++++++
 .../jrubyJarArchive/test-runnable/spec/one_spec.rb |  11 +
 .../src/it/jrubyJarRunnable}/invoker.properties    |   2 +-
 .../src/it/jrubyJarRunnable/pom.xml                | 172 ++++++++++++++++
 .../src/it/jrubyJarRunnable/spec/one_spec.rb       |  11 +
 .../src/it/jrubyJarRunnable/test.rb                |  35 ++++
 .../de/saumya/mojo/jruby9/jar/GenerateMojo.java    |  65 ++++++
 .../java/de/saumya/mojo/jruby9/jar/JarMojo.java    | 100 ++++++++++
 .../de/saumya/mojo/jruby9/jar/ProcessMojo.java     |  18 ++
 jruby9/jruby9-war-maven-plugin/README.md           | 139 +++++++++++++
 jruby9/jruby9-war-maven-plugin/pom.xml             |  46 +++++
 .../src/it/jettyExample/app/hellowarld.rb          |  57 ++++++
 .../src/it/jettyExample/app/views/person.erb       |  52 +++++
 .../src/it/jettyExample/config.ru                  |   8 +
 .../src/it/jettyExample}/invoker.properties        |   2 +-
 .../src/it/jettyExample/pom.xml                    |  90 +++++++++
 .../src/it/jrubyWarExample}/invoker.properties     |   2 +-
 .../src/it/jrubyWarExample/pom.xml                 | 171 ++++++++++++++++
 .../src/it/jrubyWarExample/spec/one_spec.rb        |  11 +
 .../src/it/jrubyWarExample/test.rb                 |  35 ++++
 .../de/saumya/mojo/jruby9/war/GenerateMojo.java    |  29 +++
 .../de/saumya/mojo/jruby9/war/ProcessMojo.java     |  18 ++
 .../java/de/saumya/mojo/jruby9/war/WarMojo.java    | 222 +++++++++++++++++++++
 .../src/main/resources/init.rb                     |  17 ++
 .../src/main/resources/web.xml                     |  19 ++
 jruby9/mavengem/mavengem-protocol/README.md        |  84 ++++++++
 jruby9/mavengem/mavengem-protocol/pom.xml          |  28 +++
 .../main/java/de/saumya/mojo/mavengem/Handler.java |  80 ++++++++
 .../mojo/mavengem/MavenGemURLConnection.java       | 127 ++++++++++++
 .../java/de/saumya/mojo/mavengem/Rubygems.java     |  53 +++++
 .../de/saumya/mojo/mavengem/RubygemsFactory.java   | 147 ++++++++++++++
 .../java/de/saumya/mojo/mavengem/HandlerTest.java  | 110 ++++++++++
 .../mojo/mavengem/MavenGemURLConnectionTest.java   | 164 +++++++++++++++
 .../saumya/mojo/mavengem/RubygemsFactoryTest.java  | 129 ++++++++++++
 jruby9/mavengem/mavengem-wagon/README.md           | 114 +++++++++++
 jruby9/mavengem/mavengem-wagon/pom.xml             |  37 ++++
 .../mavengem/mavengem-wagon/src/it/mirror/pom.xml  |  46 +++++
 .../mavengem-wagon/src/it/mirror/postbuild.groovy  |  17 ++
 .../mavengem-wagon/src/it/mirror/prebuild.groovy   |   3 +
 .../mavengem-wagon/src/it/no_mirror/pom.xml        |  46 +++++
 .../src/it/no_mirror/postbuild.groovy              |  17 ++
 .../src/it/no_mirror/prebuild.groovy               |   3 +
 jruby9/mavengem/mavengem-wagon/src/it/settings.xml |  41 ++++
 .../saumya/mojo/mavengem/wagon/MavenGemWagon.java  | 181 +++++++++++++++++
 .../main/resources/META-INF/plexus/components.xml  |  10 +
 jruby9/mavengem/pom.xml                            |  51 +++++
 jruby9/pom.xml                                     | 114 +++++++++++
 minitest-maven-plugin/pom.xml                      |  70 +------
 .../invoker.properties                             |   2 +
 .../src/it/minispec-with-jar-dependencies}/pom.xml |  21 +-
 .../spec/success_spec.rb                           |   1 +
 .../minispec-with-jar-dependencies/test.properties |   1 +
 .../it/minispec-with-jar-dependencies/verify.bsh   |  22 ++
 .../src/it/minitest-18and19-156_161/pom.xml        |  39 ----
 .../it/minitest-18and19-156_161/test.properties    |   2 -
 .../minitest-18and19-156_161/test/simple_test.rb   |   7 -
 .../src/it/minitest-18and19-156_161/verify.bsh     |  39 ----
 .../src/it/minitest-18and19/test.properties        |   3 -
 .../src/it/minitest-18and19/test/simple_test.rb    |   7 -
 .../src/it/minitest-18and19/verify.bsh             |  27 ---
 .../java/de/saumya/mojo/minitest/MinispecMojo.java |  26 +--
 .../java/de/saumya/mojo/minitest/MinitestMojo.java |  26 +--
 parent-mojo/pom.xml                                | 183 ++++++++---------
 pom.xml                                            |   7 +-
 rails3-maven-plugin/.gitignore                     |   1 -
 rails3-maven-plugin/pom.xml                        | 151 --------------
 .../de/saumya/mojo/rails3/AbstractRailsMojo.java   |  86 --------
 .../java/de/saumya/mojo/rails3/ConsoleMojo.java    |  48 -----
 .../java/de/saumya/mojo/rails3/DbConsoleMojo.java  |  45 -----
 .../java/de/saumya/mojo/rails3/GenerateMojo.java   |  52 -----
 .../java/de/saumya/mojo/rails3/InitializeMojo.java |  16 --
 .../main/java/de/saumya/mojo/rails3/NewMojo.java   | 192 ------------------
 .../main/java/de/saumya/mojo/rails3/PomMojo.java   |  75 -------
 .../main/java/de/saumya/mojo/rails3/RakeMojo.java  |  45 -----
 .../java/de/saumya/mojo/rails3/ServerMojo.java     |  36 ----
 rails3-maven-plugin/src/main/resources/boot.rb     |  22 --
 .../src/main/resources/boot.rb.orig                |  13 --
 rake-maven-plugin/pom.xml                          |   2 +-
 .../main/java/de/saumya/mojo/rake/RailsMojo.java   |  58 ------
 .../main/java/de/saumya/mojo/rake/RakeMojo.java    |  40 +---
 rspec-maven-plugin/.project                        |  32 +++
 rspec-maven-plugin/pom.xml                         |  64 +-----
 .../src/it/rspec-18and19-156_161/test.properties   |   2 -
 .../src/it/rspec-18and19-156_161/verify.bsh        |  40 ----
 .../src/it/rspec-18and19/invoker.properties        |   2 -
 .../src/it/rspec-18and19/test.properties           |   3 -
 .../rspec-failure-18and19-156_161/test.properties  |   2 +-
 .../src/it/rspec-path/test.properties              |   2 +-
 .../invoker.properties                             |   0
 .../pom.xml                                        |  10 +-
 .../spec/success_spec.rb                           |   1 +
 .../it/rspec-with-jar-dependencies/test.properties |   1 +
 .../src/it/rspec-with-jar-dependencies/verify.bsh  |  22 ++
 .../main/java/de/saumya/mojo/rspec/RSpecMojo.java  |  30 ++-
 ruby-tools/pom.xml                                 |   6 +-
 .../saumya/mojo/gems/gem/DefaultGemPackager.java   |   8 +-
 .../de/saumya/mojo/ruby/script/AntLauncher.java    |  15 +-
 runit-maven-plugin/pom.xml                         |  70 +------
 .../it/runit-18and19-156_161/invoker.properties    |   2 -
 .../src/it/runit-18and19-156_161/pom.xml           |  22 --
 .../src/it/runit-18and19-156_161/test.properties   |   2 -
 .../src/it/runit-18and19-156_161/verify.bsh        |  39 ----
 .../src/it/runit-18and19/invoker.properties        |   2 -
 runit-maven-plugin/src/it/runit-18and19/pom.xml    |  22 --
 .../src/it/runit-18and19/test.properties           |   3 -
 .../src/it/runit-18and19/test/simple_test.rb       |   7 -
 runit-maven-plugin/src/it/runit-18and19/verify.bsh |  27 ---
 .../invoker.properties                             |   0
 .../src/it/runit-with-jar-dependencies}/pom.xml    |  15 +-
 .../it/runit-with-jar-dependencies/test.properties |   1 +
 .../test/simple_test.rb                            |   2 +-
 .../src/it/runit-with-jar-dependencies}/verify.bsh |  12 +-
 .../main/java/de/saumya/mojo/runit/RUnitMojo.java  |  26 +--
 .../mojo/runit/RunitMavenTestScriptFactory.java    |  29 ++-
 test-base-plugin/pom.xml                           |  12 ++
 .../mojo/tests/AbstractMavenTestScriptFactory.java |   0
 .../de/saumya/mojo/tests/AbstractTestMojo.java     |  57 ++----
 .../mojo/tests/AbstractTestScriptFactory.java      |   0
 .../main/java/de/saumya/mojo/tests/JRubyRun.java   |   0
 .../de/saumya/mojo/tests/TestResultManager.java    |   4 +-
 .../de/saumya/mojo/tests/TestScriptFactory.java    |   0
 test-parent-mojo/pom.xml                           |  20 ++
 tests-parent-mojo/pom.xml                          |  61 ------
 216 files changed, 5905 insertions(+), 2869 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jruby-maven-plugins.git



More information about the pkg-java-commits mailing list