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

Commits on Apr 11, 2017

  1. Force maven-shade-plugin to use ASM 6.0_ALPHA. 

    This works around JDK9 incompatibilities in ASM 5.1.

See https://issues.apache.org/jira/browse/MSHADE-242.
    @headius
    headius committed Apr 11, 2017
    Copy the full SHA
    c1288c2 View commit details

  2. Attempt to build -Pdist on openjdk9 on travis.

    @headius
    headius committed Apr 11, 2017
    Copy the full SHA
    603545f View commit details
Showing with 14 additions and 2 deletions.
  1. +3 −1 .travis.yml
  2. +3 −1 core/pom.rb
  3. +8 −0 core/pom.xml
4 changes: 3 additions & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -55,7 +55,9 @@ matrix:
include:
# these profile do no need to run for all JDKs
- env: PHASE='-Pdist'
jdk: oraclejdk8
jdk:
- oraclejdk8
- oraclejdk9
- env: PHASE='-Pjruby-jars'
jdk: openjdk7
- env: PHASE='-Pmain'
4 changes: 3 additions & 1 deletion core/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -258,7 +258,9 @@
end


plugin :shade do
plugin ( :shade,
:dependencies => [ 'org.ow2.asm:asm-all:6.0_ALPHA' ]
) do
execute_goals( 'shade',
:id => 'create lib/jruby.jar',
:phase => 'package',
8 changes: 8 additions & 0 deletions core/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -595,6 +595,14 @@ DO NOT MODIFIY - GENERATED CODE
</plugin>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<version>3.0.0</version>
<dependencies>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-all</artifactId>
<version>6.0_ALPHA</version>
</dependency>
</dependencies>
<executions>
<execution>
<id>create lib/jruby.jar</id>