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

Commits on Jul 1, 2015

  1. Revert "use jossl-0.9.8.dev to run test before releasing gem"

    needs more testing and fixes
    This reverts commit 71f95f7.
    mkristian committed Jul 1, 2015
    Copy the full SHA
    89b3c00 View commit details
  2. fix wrong java classname inside rubygems/defaults/jruby.rb

    fixes #3095
    
    Sponsored by Lookout Inc.
    mkristian committed Jul 1, 2015
    Copy the full SHA
    0473991 View commit details
Showing with 65 additions and 3 deletions.
  1. +1 −1 lib/pom.rb
  2. +1 −1 lib/pom.xml
  3. +1 −1 lib/ruby/shared/rubygems/defaults/jruby.rb
  4. +62 −0 maven/jruby-complete/src/it/GH-3095-gem-install-with-forked-jruby/pom.xml
2 changes: 1 addition & 1 deletion lib/pom.rb
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ def version

default_gems =
[
ImportedGem.new( 'jruby-openssl', '0.9.8.dev-SNAPSHOT', true ),
ImportedGem.new( 'jruby-openssl', '0.9.7', true ),
ImportedGem.new( 'rake', 'rake.version', true ),
ImportedGem.new( 'rdoc', 'rdoc.version', true ),
ImportedGem.new( 'json', 'json.version', true, false ),
2 changes: 1 addition & 1 deletion lib/pom.xml
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@
<dependency>
<groupId>rubygems</groupId>
<artifactId>jruby-openssl</artifactId>
<version>0.9.8.dev-SNAPSHOT</version>
<version>0.9.7</version>
<type>gem</type>
</dependency>
<dependency>
2 changes: 1 addition & 1 deletion lib/ruby/shared/rubygems/defaults/jruby.rb
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ def ruby
ruby_path = original_ruby
if jarred_path?(ruby_path)
# use quote as the original_ruby does it
ruby_path = "\"#{org.jruby.util.Classpath.jrubyCommand(JRuby.runtime)}\""
ruby_path = "\"#{org.jruby.util.ClasspathLauncher.jrubyCommand(JRuby.runtime)}\""
end
ruby_path
end
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
<project>
<groupId>org.jruby</groupId>
<artifactId>gem-install-with-forked-jruby</artifactId>
<version>1</version>
<modelVersion>4.0.0</modelVersion>

<repositories>
<repository>
<id>rubygems-releases</id>
<url>http://rubygems-proxy.torquebox.org/releases</url>
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>rubygems</groupId>
<artifactId>diff-lcs</artifactId>
<version>1.2.5</version>
<type>gem</type>
</dependency>
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby-complete</artifactId>
<version>@project.version@</version>
<type>jar</type>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.2</version>
<executions>
<execution>
<phase>package</phase>
<goals><goal>exec</goal></goals>
<configuration>
<executable>java</executable>
<arguments>
<argument>-classpath</argument>
<classpath/>
<argument>org.jruby.Main</argument>
<argument>-S</argument>
<argument>gem</argument>
<argument>install</argument>
<argument>${settings.localRepository}/rubygems/diff-lcs/1.2.5/diff-lcs-1.2.5.gem</argument>
<argument>--ignore-dependencies</argument>
<argument>--install-dir=./gems</argument>
<argument>--no-user-install</argument>
<argument>--wrappers</argument>
<argument>--no-document</argument>
<argument>--local</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>