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: 843ab8eccaf2
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 69068081186d
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Oct 27, 2017

  1. Update mavengems extension to allow building jruby-complete on 9. 

    Fixes #4799.
    @headius
    headius committed Oct 27, 2017
    Copy the full SHA
    79085c6 View commit details

  2. Add -Pcomplete on 9 to build matrix.

    @headius
    headius committed Oct 27, 2017
    Copy the full SHA
    6906808 View commit details
Showing with 6 additions and 2 deletions.
  1. +4 −0 .travis.yml
  2. +1 −1 lib/pom.rb
  3. +1 −1 lib/pom.xml
4 changes: 4 additions & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -85,6 +85,8 @@ matrix:
jdk: oraclejdk9
- env: PHASE='-Pmain'
jdk: oraclejdk9
- env: PHASE='-Pcomplete'
jdk: oraclejdk9
allow_failures:
- env: PHASE='-Prake -Dtask=test:jruby:jit'
jdk: oraclejdk9
@@ -94,6 +96,8 @@ matrix:
jdk: oraclejdk9
- env: PHASE='-Pmain'
jdk: oraclejdk9
- env: PHASE='-Pcomplete'
jdk: oraclejdk9

install: tool/travis-install.sh
script: tool/travis-script.sh
2 changes: 1 addition & 1 deletion lib/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -61,7 +61,7 @@ def initialize( name, version, default_spec = true )
# just depends on jruby-core so we are sure the jruby.jar is in place
jar "org.jruby:jruby-core:#{version}", :scope => 'test'

extension 'org.torquebox.mojo:mavengem-wagon:0.2.0'
extension 'org.torquebox.mojo:mavengem-wagon:0.2.2'

repository :id => :mavengems, :url => 'mavengem:https://rubygems.org'

2 changes: 1 addition & 1 deletion lib/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -199,7 +199,7 @@ DO NOT MODIFIY - GENERATED CODE
<extension>
<groupId>org.torquebox.mojo</groupId>
<artifactId>mavengem-wagon</artifactId>
<version>0.2.0</version>
<version>0.2.2</version>
</extension>
</extensions>
<resources>