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

Commits on May 2, 2016

  1. [packaging] ensure licensing info is included in artifacts 

    * jars should have them in META-INF
* bin tarball/zip should have them in top level
    @busbey
    busbey committed May 2, 2016
    Copy the full SHA
    93d5a9c View commit details

  2. Merge pull request #3839 from busbey/license-packaging-fix 

    [build] ensure licensing info is included in artifacts
    @mkristian
    mkristian committed May 2, 2016
    Copy the full SHA
    dfaf182 View commit details
Showing with 66 additions and 0 deletions.
  1. +6 −0 core/pom.rb
  2. +10 −0 core/pom.xml
  3. +6 −0 lib/pom.rb
  4. +10 −0 lib/pom.xml
  5. +8 −0 maven/jruby-complete/pom.rb
  6. +2 −0 maven/jruby-dist/src/main/assembly/common.xml
  7. +8 −0 maven/jruby/pom.rb
  8. +6 −0 truffle/pom.rb
  9. +10 −0 truffle/pom.xml
6 changes: 6 additions & 0 deletions core/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -251,6 +251,12 @@
target_path '${project.build.sourceDirectory}'
filtering 'true'
end

resource do
directory '${project.basedir}/..'
includes [ 'BSDL', 'COPYING', 'LEGAL', 'LICENSE.RUBY' ]
target_path '${project.build.outputDirectory}/META-INF/'
end
end


10 changes: 10 additions & 0 deletions core/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -300,6 +300,16 @@ DO NOT MODIFIY - GENERATED CODE
<include>${Constants.java}</include>
</includes>
</resource>
<resource>
<targetPath>${project.build.outputDirectory}/META-INF/</targetPath>
<directory>${project.basedir}/..</directory>
<includes>
<include>BSDL</include>
<include>COPYING</include>
<include>LEGAL</include>
<include>LICENSE.RUBY</include>
</includes>
</resource>
</resources>
<pluginManagement>
<plugins>
6 changes: 6 additions & 0 deletions lib/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -276,5 +276,11 @@ def installer.ensure_required_ruby_version_met; end
'lib/ruby/stdlib/gauntlet*.rb' # gauntlet_rdoc.rb, gauntlet_rubygems.rb
target_path '${jruby.complete.home}'
end

resource do
directory '${project.basedir}/..'
includes [ 'BSDL', 'COPYING', 'LEGAL', 'LICENSE.RUBY' ]
target_path '${project.build.outputDirectory}/META-INF/'
end
end
end
10 changes: 10 additions & 0 deletions lib/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -225,6 +225,16 @@ DO NOT MODIFIY - GENERATED CODE
<exclude>lib/ruby/stdlib/gauntlet*.rb</exclude>
</excludes>
</resource>
<resource>
<targetPath>${project.build.outputDirectory}/META-INF/</targetPath>
<directory>${project.basedir}/..</directory>
<includes>
<include>BSDL</include>
<include>COPYING</include>
<include>LEGAL</include>
<include>LICENSE.RUBY</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
8 changes: 8 additions & 0 deletions maven/jruby-complete/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -10,6 +10,14 @@
inherit "org.jruby:jruby-artifacts:#{version}"
packaging 'bundle'

build do
resource do
directory '${project.basedir}/../..'
includes [ 'BSDL', 'COPYING', 'LEGAL', 'LICENSE.RUBY' ]
target_path '${project.build.outputDirectory}/META-INF/'
end
end

plugin_repository( :id => 'rubygems-releases',
:url => 'https://otto.takari.io/content/repositories/rubygems/maven/releases' )

2 changes: 2 additions & 0 deletions maven/jruby-dist/src/main/assembly/common.xml
View file
Original file line number Diff line number Diff line change
@@ -50,6 +50,8 @@
<includes>
<include>LICENSE*</include>
<include>COPYING*</include>
<include>BSDL</include>
<include>LEGAL</include>
<include>lib/jni/**/*</include>
<include>samples/**/*</include>
<include>docs/**/*</include>
8 changes: 8 additions & 0 deletions maven/jruby/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -22,6 +22,14 @@

plugin( :invoker, :properties => { 'localRepository' => '${settings.localRepository}' } )

build do
resource do
directory '${project.basedir}/../..'
includes [ 'BSDL', 'COPYING', 'LEGAL', 'LICENSE.RUBY' ]
target_path '${project.build.outputDirectory}/META-INF/'
end
end

profile :apps do
activation do
property :name => 'invoker.test'
6 changes: 6 additions & 0 deletions truffle/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -70,6 +70,12 @@
includes '**/*rb'
target_path '${project.build.directory}/classes/jruby-truffle'
end

resource do
directory '${project.basedir}/..'
includes [ 'BSDL', 'COPYING', 'LEGAL', 'LICENSE.RUBY' ]
target_path '${project.build.outputDirectory}/META-INF/'
end
end

[ :dist, :'jruby-jars', :all, :release ].each do |name|
10 changes: 10 additions & 0 deletions truffle/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -77,6 +77,16 @@ DO NOT MODIFIY - GENERATED CODE
<include>**/*rb</include>
</includes>
</resource>
<resource>
<targetPath>${project.build.outputDirectory}/META-INF/</targetPath>
<directory>${project.basedir}/..</directory>
<includes>
<include>BSDL</include>
<include>COPYING</include>
<include>LEGAL</include>
<include>LICENSE.RUBY</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>