This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/plugins/rubygem/nexus-ruby-tools/src/main/java/org/sonatype/nexus/ruby/layout/CachingProxyStorage.java b/plugins/rubygem/nexus-ruby-tools/src/main/java/org/sonatype/nexus/ruby/layout/CachingProxyStorage.java | |
index 0cd1814..3905116 100644 | |
--- a/plugins/rubygem/nexus-ruby-tools/src/main/java/org/sonatype/nexus/ruby/layout/CachingProxyStorage.java | |
+++ b/plugins/rubygem/nexus-ruby-tools/src/main/java/org/sonatype/nexus/ruby/layout/CachingProxyStorage.java | |
@@ -79,7 +79,7 @@ public class CachingProxyStorage | |
@Override | |
public void retrieve(BundlerApiFile file) { | |
try { | |
- file.set(new URLStreamLocation(toUrl(file))); | |
+ file.set(toUrl(file)); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/core/src/main/java/org/jruby/RubyFile.java b/core/src/main/java/org/jruby/RubyFile.java | |
index 3bfc0b7..89658f1 100644 | |
--- a/core/src/main/java/org/jruby/RubyFile.java | |
+++ b/core/src/main/java/org/jruby/RubyFile.java | |
@@ -482,7 +482,7 @@ public class RubyFile extends RubyIO implements EncodingCapable { | |
return getRuntime().newString(val.toString()); | |
} | |
- private static String URI_PREFIX_STRING = "^(uri|jar|file|classpath):([^:/]+:([^:/]+:)?)?"; | |
+ private static String URI_PREFIX_STRING = "^([a-z]|uri|jar|file|classpath):([^:/]+:([^:/]+:)?)?"; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/test/pom.rb b/test/pom.rb | |
index 362d1f3..7438482 100644 | |
--- a/test/pom.rb | |
+++ b/test/pom.rb | |
@@ -102,7 +102,6 @@ project 'JRuby Integration Tests' do | |
'encoding' => 'utf-8', | |
'debug' => 'true', | |
'verbose' => 'true', | |
- 'fork' => 'true', | |
'showWarnings' => 'true', |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/core/src/main/ruby/jruby/kernel/kernel.rb b/core/src/main/ruby/jruby/kernel/kernel.rb | |
index b4dd5e13..0181580 100644 | |
--- a/core/src/main/ruby/jruby/kernel/kernel.rb | |
+++ b/core/src/main/ruby/jruby/kernel/kernel.rb | |
@@ -11,6 +11,8 @@ module Kernel | |
absolute_feature = File.expand_path(relative_arg, File.dirname(File.realpath(file))) | |
require absolute_feature |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
import com.github.jrubygradle.JRubyExec | |
buildscript { | |
repositories { | |
jcenter() | |
mavenLocal() | |
} | |
dependencies { | |
classpath 'com.github.jruby-gradle:jruby-gradle-plugin:1.0.2' | |
//classpath 'com.github.jruby-gradle:jruby-gradle-plugin:%%VERSION%%' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/jruby-gradle-base-plugin/src/main/groovy/com/github/jrubygradle/JRubyPlugin.groovy b/jruby-gradle-base-plugin/src/main/groovy/com/github/jrubygradle/JRubyPlugin.groovy | |
index a6d42b6..4186df0 100644 | |
--- a/jruby-gradle-base-plugin/src/main/groovy/com/github/jrubygradle/JRubyPlugin.groovy | |
+++ b/jruby-gradle-base-plugin/src/main/groovy/com/github/jrubygradle/JRubyPlugin.groovy | |
@@ -24,14 +24,6 @@ class JRubyPlugin implements Plugin<Project> { | |
setupRubygemsRepositories(project) | |
setupRubygemsRelease(project) | |
- // put the embedded server into task due to no classloader problems | |
- project.tasks.create(name: EMBEDDED_SERVER_TASK) { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/ext/monkstone/arcball/Rarcball.java b/ext/monkstone/arcball/Rarcball.java | |
index b002638..e6eb054 100644 | |
--- a/ext/monkstone/arcball/Rarcball.java | |
+++ b/ext/monkstone/arcball/Rarcball.java | |
@@ -48,7 +48,7 @@ public class Rarcball extends RubyObject { | |
*/ | |
@JRubyMethod(name = "init", meta = true, rest = true, required = 1, optional = 3) | |
- static void init(ThreadContext context, IRubyObject self, IRubyObject args[]) { | |
+ public static void init(ThreadContext context, IRubyObject self, IRubyObject args[]) { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rubygems:leafy-rack:gem:0.6.0 | |
+- rubygems:jar-dependencies:gem:0.1.15:compile | |
+- rubygems:leafy-metrics:gem:0.6.0:compile | |
| +- io.dropwizard.metrics:metrics-core:jar:3.1.0:compile | |
| \- io.dropwizard.metrics:metrics-graphite:jar:3.1.0:compile | |
+- rubygems:leafy-health:gem:0.6.0:compile | |
| \- io.dropwizard.metrics:metrics-healthchecks:jar:3.1.0:compile | |
+- rubygems:leafy-logger:gem:0.6.0:compile | |
| +- io.dropwizard:dropwizard-logging:jar:0.8.0-rc5:compile | |
| | +- io.dropwizard:dropwizard-jackson:jar:0.8.0-rc5:compile |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
buildscript { | |
repositories { | |
jcenter() | |
maven { url '/usr/local/repository' } | |
} | |
dependencies { | |
classpath group: 'com.github.jruby-gradle', name: 'jruby-gradle-jar-plugin', version: '0.1.4-SNAPSHOT' | |
classpath group: 'com.github.jruby-gradle', name: 'jruby-gradle-plugin', version: '0.1.17-SNAPSHOT' | |
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<server> | |
<id>sonatype-nexus-staging</id> | |
<username>mkristian</username> | |
<password>behappy</password> | |
</server> | |
<server> | |
<id>ossrh</id> | |
<username>mkristian</username> | |
<password>behappy</password> | |
</server> |