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

Commits on Jan 26, 2016

  1. Copy the full SHA
    e72bf60 View commit details
  2. Copy the full SHA
    781025f View commit details
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -93,7 +93,7 @@ branches:
- /^ha-feature/

script: tool/travis_runner.sh
install: travis_retry ./mvnw -Pbootstrap clean install -Dinvoker.skip -Dmaven.test.skip
install: travis_retry ./mvnw -Pbootstrap clean install -B -Dinvoker.skip -Dmaven.test.skip

notifications:
irc:
2 changes: 1 addition & 1 deletion maven/jruby/src/it/bouncycastle/pom.xml
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<bc.version>1.47</bc.version>
<bc.version>1.54</bc.version>
</properties>

<build>
Original file line number Diff line number Diff line change
@@ -23,15 +23,15 @@ public void setupProvider() throws Exception {

@Test
public void java() {
assertEquals("BouncyCastle Security Provider v1.47", new BouncyCastleProvider().getInfo());
assertEquals("BouncyCastle Security Provider v1.54", new BouncyCastleProvider().getInfo());
}

@Test
public void ruby(){
ScriptingContainer container = new ScriptingContainer();
container.setClassloaderDelegate(false);
Object result = container.parse( "require 'openssl'; Java::OrgBouncycastleJceProvider::BouncyCastleProvider.new.info").run();
assertEquals( "BouncyCastle Security Provider v1.50", result.toString() );
assertEquals( "BouncyCastle Security Provider v1.54", result.toString() );

result = container.parse("JRuby.runtime.jruby_class_loader").run();
assertEquals("org.jruby.util.SelfFirstJRubyClassLoader", result.toString().replaceFirst("@.*$", ""));
4 changes: 2 additions & 2 deletions maven/jruby/src/it/runnable/.jbundler/classpath.rb
Original file line number Diff line number Diff line change
@@ -5,8 +5,8 @@
JBUNDLER_TEST_CLASSPATH = []
JBUNDLER_TEST_CLASSPATH.freeze
JBUNDLER_CLASSPATH = []
JBUNDLER_CLASSPATH << (JBUNDLER_LOCAL_REPO + '/org/bouncycastle/bcpkix-jdk15on/1.49/bcpkix-jdk15on-1.49.jar')
JBUNDLER_CLASSPATH << (JBUNDLER_LOCAL_REPO + '/org/bouncycastle/bcpkix-jdk15on/1.54/bcpkix-jdk15on-1.54.jar')
JBUNDLER_CLASSPATH << (JBUNDLER_LOCAL_REPO + '/org/slf4j/slf4j-simple/1.6.4/slf4j-simple-1.6.4.jar')
JBUNDLER_CLASSPATH << (JBUNDLER_LOCAL_REPO + '/org/bouncycastle/bcprov-jdk15on/1.49/bcprov-jdk15on-1.49.jar')
JBUNDLER_CLASSPATH << (JBUNDLER_LOCAL_REPO + '/org/bouncycastle/bcprov-jdk15on/1.54/bcprov-jdk15on-1.54.jar')
JBUNDLER_CLASSPATH << (JBUNDLER_LOCAL_REPO + '/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar')
JBUNDLER_CLASSPATH.freeze
4 changes: 2 additions & 2 deletions maven/jruby/src/it/runnable/Jarfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
:runtime:
- org.bouncycastle:bcpkix-jdk15on:jar:1.49
- org.bouncycastle:bcpkix-jdk15on:jar:1.54
- org.slf4j:slf4j-simple:jar:1.6.4
- org.bouncycastle:bcprov-jdk15on:jar:1.49
- org.bouncycastle:bcprov-jdk15on:jar:1.54
- org.slf4j:slf4j-api:jar:1.6.4
2 changes: 1 addition & 1 deletion tool/travis_runner.sh
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
set -e
set -x

./mvnw install -Dinvoker.skip=false $PHASE | egrep -v 'Download|\\[exec\\] [[:digit:]]+/[[:digit:]]+|^[[:space:]]*\\[exec\\][[:space:]]*$'
./mvnw install -B -Dinvoker.skip=false $PHASE | egrep -v 'Download|\\[exec\\] [[:digit:]]+/[[:digit:]]+|^[[:space:]]*\\[exec\\][[:space:]]*$'

MVN_STATUS=${PIPESTATUS[0]}