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

Commits on Nov 26, 2014

  1. [build] get all the artifacts in place for jruby_complete_jar_extended

    @mkristian
    mkristian committed Nov 26, 2014
    Copy the full SHA
    ac2ffda View commit details

  2. Merge branch 'master' of github.com:jruby/jruby

    @mkristian
    mkristian committed Nov 26, 2014
    Copy the full SHA
    ad1da0b View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 core/pom.rb
  2. +1 −1 core/pom.xml
2 changes: 1 addition & 1 deletion core/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -258,7 +258,7 @@
end


[ :osgi, :dist, :'jruby-jars', :main, :all, :complete, :release, :snapshots ].each do |name|
[ :osgi, :dist, :'jruby-jars', :main, :all, :complete, :release, :jruby_complete_jar_extended ].each do |name|
profile name do
plugin :shade do
execute_goals( 'shade',
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -950,7 +950,7 @@
</build>
</profile>
<profile>
<id>snapshots</id>
<id>jruby_complete_jar_extended</id>
<build>
<plugins>
<plugin>