Skip to content

Commit e3d93f2

Browse files
mkristianmkristian
committed
Merge branch 'jruby-1_7' into merge
Conflicts: VERSION core/pom.xml core/src/main/java/org/jruby/RubyString.java core/src/main/java/org/jruby/RubyStruct.java core/src/main/java/org/jruby/ext/bigdecimal/RubyBigDecimal.java docs/man/pom.xml docs/pom.xml ext/pom.xml ext/readline/pom.xml ext/ripper/pom.xml lib/pom.rb lib/pom.xml maven/jruby-complete/pom.xml maven/jruby-complete/src/it/integrity/verify.bsh maven/jruby-dist/pom.xml maven/jruby-dist/src/it/integrity/verify.bsh maven/jruby-jars/pom.xml maven/jruby-jars/src/it/integrity/verify.bsh maven/jruby-noasm/pom.xml maven/jruby-noasm/src/it/integrity/verify.bsh maven/jruby-rake-plugin/pom.xml maven/jruby-stdlib/pom.xml maven/jruby/pom.rb maven/jruby/pom.xml maven/jruby/src/it/integrity/verify.bsh maven/jruby/src/it/runnable/pom.xml maven/pom.xml pom.xml rakelib/test.rake spec/regression/GH-2524_bigdecimal_loss_of_precision_with_different_excution_order_spec.rb test/externals/ruby1.9/excludes/OpenSSL/TestASN1.rb test/externals/ruby1.9/excludes/OpenSSL/TestCipher.rb test/externals/ruby1.9/excludes/OpenSSL/TestDigest.rb test/externals/ruby1.9/excludes/OpenSSL/TestX509Name.rb test/externals/ruby1.9/excludes/OpenSSL/TestX509Request.rb test/externals/ruby1.9/openssl/test_asn1.rb test/pom.xml test/test_adding_pem_to_x509store.rb
2 parents eb3740c + b6f907f commit e3d93f2

34 files changed

Lines changed: 2333 additions & 102 deletions

‎antlib/extra.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ build jruby-complete.jar
2525
<env key='GEM_PATH' value='lib/ruby/gems/shared'/>
2626
<arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
2727
<arg value='-cp'/>
28-
<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-1.7.19-SNAPSHOT.jar'/>
28+
<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-1.7.20-SNAPSHOT.jar'/>
2929
<arg value='org.jruby.Main'/>
3030
<arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
3131
<arg value='-r./test/ruby19_env.rb'/>
@@ -137,7 +137,7 @@ build jruby-complete.jar
137137
<env key='GEM_PATH' value='lib/ruby/gems/shared'/>
138138
<arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
139139
<arg value='-cp'/>
140-
<arg value='core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-1.7.19-SNAPSHOT.jar'/>
140+
<arg value='core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-1.7.20-SNAPSHOT.jar'/>
141141
<arg value='org.jruby.Main'/>
142142
<arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
143143
<arg value='-r./test/ruby19_env.rb'/>
@@ -153,7 +153,7 @@ build jruby-complete.jar
153153
<env key='GEM_PATH' value='lib/ruby/gems/shared'/>
154154
<arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
155155
<arg value='-cp'/>
156-
<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-1.7.19-SNAPSHOT.jar'/>
156+
<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-1.7.20-SNAPSHOT.jar'/>
157157
<arg value='org.jruby.Main'/>
158158
<arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
159159
<arg value='-r./test/ruby19_env.rb'/>
@@ -169,7 +169,7 @@ build jruby-complete.jar
169169
<env key='GEM_PATH' value='lib/ruby/gems/shared'/>
170170
<arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
171171
<arg value='-cp'/>
172-
<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-1.7.19-SNAPSHOT.jar'/>
172+
<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-1.7.20-SNAPSHOT.jar'/>
173173
<arg value='org.jruby.Main'/>
174174
<arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
175175
<arg value='-r./test/ruby19_env.rb'/>
@@ -461,7 +461,7 @@ build jruby-complete.jar
461461
<env key='GEM_PATH' value='lib/ruby/gems/shared'/>
462462
<arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
463463
<arg value='-cp'/>
464-
<arg value='core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-1.7.19-SNAPSHOT.jar'/>
464+
<arg value='core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-1.7.20-SNAPSHOT.jar'/>
465465
<arg value='org.jruby.Main'/>
466466
<arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
467467
<arg value='-r./test/ruby19_env.rb'/>
@@ -515,4 +515,4 @@ build jruby-complete.jar
515515
<!--arg value='-v'/-->
516516
</exec>
517517
</target>
518-
<target description='test using jruby-complete or jruby-core/jruby-stdlib jars' name='test-jruby-jars' depends='mvn,test-jruby-jars-jruby.1.9,test-jruby-complete-slow,test-jruby-jars-objectspace,test-jruby-jars-mri.1.9,test-jruby-complete-rubicon.1.9'/></project>
518+
<target description='test using jruby-complete or jruby-core/jruby-stdlib jars' name='test-jruby-jars' depends='mvn,test-jruby-jars-jruby.1.9,test-jruby-complete-slow,test-jruby-jars-objectspace,test-jruby-jars-mri.1.9,test-jruby-complete-rubicon.1.9'/></project>

0 commit comments

Comments
 (0)