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

Commits on Sep 16, 2014

  1. new jar-dependecies version - fixes #1975

    @mkristian
    mkristian committed Sep 16, 2014
    Copy the full SHA
    25f778f View commit details

  2. adjust final name on dist

    @mkristian
    mkristian committed Sep 16, 2014
    Copy the full SHA
    3c4fa4a View commit details
Showing with 3 additions and 3 deletions.
  1. +1 −1 lib/pom.rb
  2. +1 −1 lib/pom.xml
  3. +1 −1 maven/jruby-dist/pom.xml
2 changes: 1 addition & 1 deletion lib/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -45,7 +45,7 @@ def version
ImportedGem.new( 'krypt-core', KRYPT_VERSION, true ),
ImportedGem.new( 'krypt-provider-jdk', KRYPT_VERSION, true ),
ImportedGem.new( 'ffi', '1.9.3', true ),
ImportedGem.new( 'jar-dependencies', '0.1.0', true )
ImportedGem.new( 'jar-dependencies', '0.1.1', true )
]

project 'JRuby Lib Setup' do
2 changes: 1 addition & 1 deletion lib/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -74,7 +74,7 @@
<dependency>
<groupId>rubygems</groupId>
<artifactId>jar-dependencies</artifactId>
<version>0.1.0</version>
<version>0.1.1</version>
<type>gem</type>
</dependency>
<dependency>
2 changes: 1 addition & 1 deletion maven/jruby-dist/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -77,7 +77,7 @@
</execution>
</executions>
<configuration>
<finalName>jruby-dist-1.7.15</finalName>
<finalName>jruby-dist-1.7.16</finalName>
<tarLongFileMode>gnu</tarLongFileMode>
<descriptors>
<descriptor>src/main/assembly/jruby.xml</descriptor>