Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b700e6640207^
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c300a1ff62dc
Choose a head ref
  • 2 commits
  • 15 files changed
  • 1 contributor

Commits on Apr 29, 2015

  1. adds maven-wrapper

    @mkristian
    mkristian committed Apr 29, 2015
    Copy the full SHA
    b700e66 View commit details

  2. allow to use maven-3.3.1 and remove the pom.xml under ./maven/**

    @mkristian
    mkristian committed Apr 29, 2015
    Copy the full SHA
    c300a1f View commit details
Showing with 429 additions and 866 deletions.
  1. +8 −0 .mvn/extensions.xml
  2. BIN .mvn/wrapper/maven-wrapper.jar
  3. +1 −0 .mvn/wrapper/maven-wrapper.properties
  4. +1 −1 .travis.yml
  5. +2 −2 core/pom.rb
  6. +2 −3 lib/pom.rb
  7. +0 −204 maven/jruby-complete/pom.xml
  8. +0 −230 maven/jruby-dist/pom.xml
  9. +0 −155 maven/jruby-jars/pom.xml
  10. +0 −155 maven/jruby/pom.xml
  11. +0 −111 maven/pom.xml
  12. +234 −0 mvnw
  13. +177 −0 mvnw.bat
  14. +2 −3 pom.rb
  15. +2 −2 truffle/pom.rb
8 changes: 8 additions & 0 deletions .mvn/extensions.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<extensions>
<extension>
<groupId>io.takari.polyglot</groupId>
<artifactId>polyglot-ruby</artifactId>
<version>0.1.8</version>
</extension>
</extensions>
Binary file added .mvn/wrapper/maven-wrapper.jar
View file
Binary file not shown.
1 change: 1 addition & 0 deletions .mvn/wrapper/maven-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.1/apache-maven-3.3.1-bin.zip
2 changes: 1 addition & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -79,7 +79,7 @@ branches:
- /^test-.*$/
- /^ha-feature/

script: if [[ -v COMMAND ]]; then $COMMAND; else travis_retry mvn -Pbootstrap clean install -Dinvoker.skip=false $PHASE | egrep -v 'Download|\\[exec\\] [[:digit:]]+/[[:digit:]]+|^[[:space:]]*\\[exec\\][[:space:]]*$' ; [ ${PIPESTATUS[0]} == 0 ]; fi
script: if [[ -v COMMAND ]]; then $COMMAND; else travis_retry ./mvnw -Pbootstrap clean install -Dinvoker.skip=false $PHASE | egrep -v 'Download|\\[exec\\] [[:digit:]]+/[[:digit:]]+|^[[:space:]]*\\[exec\\][[:space:]]*$' ; [ ${PIPESTATUS[0]} == 0 ]; fi
install: /bin/true
notifications:
irc:
4 changes: 2 additions & 2 deletions core/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -5,8 +5,8 @@
inherit 'org.jruby:jruby-parent', version
id 'org.jruby:jruby-core'

properties( 'tesla.dump.pom' => 'pom.xml',
'tesla.dump.readonly' => true,
properties( 'polyglot.dump.pom' => 'pom.xml',
'polyglot.dump.readonly' => true,

'tzdata.version' => '2013d',
'tzdata.scope' => 'provided',
5 changes: 2 additions & 3 deletions lib/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -57,9 +57,8 @@ def to_pathname
id 'jruby-stdlib'
inherit "org.jruby:jruby-parent", version

properties( 'tesla.dump.pom' => 'pom.xml',
'tesla.dump.readonly' => true,
'tesla.version' => '0.1.1',
properties( 'polyglot.dump.pom' => 'pom.xml',
'polyglot.dump.readonly' => true,
'jruby.plugins.version' => '1.0.9',
'gem.home' => '${basedir}/ruby/gems/shared',
# we copy everything into the target/classes/META-INF
204 changes: 0 additions & 204 deletions maven/jruby-complete/pom.xml
View file

This file was deleted.

Loading