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

Commits on Apr 22, 2015

  1. follow the changes from core/pom.xml into core/pom.rb

    @mkristian
    mkristian committed Apr 22, 2015
    Copy the full SHA
    4a947d4 View commit details

  2. copy snakeyaml.jar before packing the jar [skip ci]

    @mkristian
    mkristian committed Apr 22, 2015
    Copy the full SHA
    336ed58 View commit details

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

    @mkristian
    mkristian committed Apr 22, 2015
    Copy the full SHA
    2bea720 View commit details
Showing with 19 additions and 21 deletions.
  1. +4 −4 core/pom.rb
  2. +1 −3 core/pom.xml
  3. +1 −1 lib/pom.rb
  4. +13 −13 lib/pom.xml
8 changes: 4 additions & 4 deletions core/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -41,17 +41,17 @@
jar 'org.ow2.asm:asm-util:${asm.version}'

jar 'com.github.jnr:jnr-netdb:1.1.4'
jar 'com.github.jnr:jnr-enxio:0.7'
jar 'com.github.jnr:jnr-enxio:0.8-SNAPSHOT'
jar 'com.github.jnr:jnr-x86asm:1.0.2'
jar 'com.github.jnr:jnr-unixsocket:0.6'
jar 'com.github.jnr:jnr-posix:3.0.10'
jar 'com.github.jnr:jnr-unixsocket:0.7-SNAPSHOT'
jar 'com.github.jnr:jnr-posix:3.0.11-SNAPSHOT'
jar 'com.github.jnr:jnr-constants:0.8.6'
jar 'com.github.jnr:jnr-ffi:2.0.2'
jar 'com.github.jnr:jffi:${jffi.version}'
jar 'com.github.jnr:jffi:${jffi.version}:native'

jar 'org.jruby.joni:joni:2.1.6-SNAPSHOT'
jar 'org.jruby.extras:bytelist:1.0.12'
jar 'org.jruby.extras:bytelist:1.0.13-SNAPSHOT'
jar 'org.jruby.jcodings:jcodings:1.0.13-SNAPSHOT'
jar 'org.jruby:dirgra:0.2'

4 changes: 1 addition & 3 deletions core/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@
<installer.gems>${jruby.win32ole.gem}</installer.gems>
<tesla.dump.readonly>true</tesla.dump.readonly>
<prawn.git.repo>git://github.com/sandal/prawn.git</prawn.git.repo>
<version.ruby.minor>0</version.ruby.minor>
<version.ruby.minor>2</version.ruby.minor>
<tzdata.version>2013d</tzdata.version>
<install4j.executable>/Applications/install4j 4/bin/install4jc</install4j.executable>
<jay.bin>jay</jay.bin>
@@ -91,7 +91,6 @@
<groupId>com.github.jnr</groupId>
<artifactId>jnr-enxio</artifactId>
<version>0.8-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.github.jnr</groupId>
@@ -102,7 +101,6 @@
<groupId>com.github.jnr</groupId>
<artifactId>jnr-unixsocket</artifactId>
<version>0.7-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.github.jnr</groupId>
2 changes: 1 addition & 1 deletion lib/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -97,7 +97,7 @@ def to_pathname

# TODO no hardcoded group-ids
plugin :dependency, :useRepositoryLayout => true, :outputDirectory => 'ruby/stdlib', :excludeGroupIds => 'rubygems', :includeScope => :provided do
execute_goal 'copy-dependencies', :phase => 'package'
execute_goal 'copy-dependencies', :phase => 'prepare-package'
end

execute :install_gems, :'initialize' do |ctx|
26 changes: 13 additions & 13 deletions lib/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -79,8 +79,8 @@
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>json</artifactId>
<version>${json.version}</version>
<artifactId>minitest</artifactId>
<version>${minitest.version}</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
@@ -92,8 +92,8 @@
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>jar-dependencies</artifactId>
<version>0.1.13</version>
<artifactId>test-unit</artifactId>
<version>${test-unit.version}</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
@@ -105,8 +105,8 @@
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>minitest</artifactId>
<version>${minitest.version}</version>
<artifactId>power_assert</artifactId>
<version>${power_assert.version}</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
@@ -118,8 +118,8 @@
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>test-unit</artifactId>
<version>${test-unit.version}</version>
<artifactId>psych</artifactId>
<version>2.0.9.2</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
@@ -131,8 +131,8 @@
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>power_assert</artifactId>
<version>${power_assert.version}</version>
<artifactId>json</artifactId>
<version>${json.version}</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
@@ -144,8 +144,8 @@
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>psych</artifactId>
<version>2.0.9.2</version>
<artifactId>jar-dependencies</artifactId>
<version>0.1.13</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
@@ -230,7 +230,7 @@
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>