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

Commits on Dec 1, 2014

  1. make the OSGi test compile again

    @mkristian
    mkristian committed Dec 1, 2014
    Copy the full SHA
    d673364 View commit details

  2. [build] switch to release jruby-maven-plugin

    @mkristian
    mkristian committed Dec 1, 2014
    Copy the full SHA
    a65a63c View commit details
2 changes: 1 addition & 1 deletion ...s_with_embedded_gems/test/src/test/java/org/jruby/embed/osgi/test/JRubyOsgiEmbedTest.java
View file
Original file line number Diff line number Diff line change
@@ -82,7 +82,7 @@ public void testJRubyCreate() throws Exception {

IsolatedScriptingContainer jruby = new IsolatedScriptingContainer();
jruby.addLoadPath( Scripts.class.getClassLoader() );
jruby.addGemPath( FrameworkUtil.getBundle( Gems.class ) );
jruby.addBundleToGemPath( FrameworkUtil.getBundle( Gems.class ) );

// run a script from LOAD_PATH
String hello = (String) jruby.runScriptlet( "require 'hello'; Hello.say" );
2 changes: 1 addition & 1 deletion maven/jruby-jars/Mavenfile
View file
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ end

properties( 'tesla.dump.pom' => 'pom.xml',
'tesla.dump.readonly' => true,
'jruby.plugins.version' => '1.0.7-SNAPSHOT',
'jruby.plugins.version' => '1.0.7',
# we share the already installed gems
'gem.home' => '${jruby.home}/lib/ruby/gems/shared',
'jruby.home' => '${basedir}/../../' )
2 changes: 1 addition & 1 deletion maven/jruby-jars/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@ freezing to) a specific jruby-complete jar version.</description>
<jruby.home>${basedir}/../../</jruby.home>
<tesla.dump.readonly>true</tesla.dump.readonly>
<gem.home>${jruby.home}/lib/ruby/gems/shared</gem.home>
<jruby.plugins.version>1.0.7-SNAPSHOT</jruby.plugins.version>
<jruby.plugins.version>1.0.7</jruby.plugins.version>
<tesla.dump.pom>pom.xml</tesla.dump.pom>
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
<tesla.version>0.1.1</tesla.version>
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
@@ -57,7 +57,7 @@
<its.osgi>osgi*/pom.xml</its.osgi>
<invoker.skip>true</invoker.skip>
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
<jruby.plugins.version>1.0.7-SNAPSHOT</jruby.plugins.version>
<jruby.plugins.version>1.0.7</jruby.plugins.version>
<rake.version>10.1.0</rake.version>
<rspec.version>2.14.1</rspec.version>
<rspec-core.version>2.14.2</rspec-core.version>