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: f6f73f38e680^
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d7c8c27850be
Choose a head ref
  • 4 commits
  • 21 files changed
  • 2 contributors

Commits on Jun 10, 2015

  1. Update rubygems to 2.4.8 to mitigate CVE-2015-4020 

    CVE-2015-4020 was announced today. It is described here:
https://www.trustwave.com/Resources/Security-Advisories/Advisories/TWSL2015-009/?fid=6478.
The security vulnerability has been addressed in rubygems 2.4.8. As
jruby 1.7 has 2.4.6 included, this commit updates it to 2.4.8.
    @haus @enebo
    haus authored and enebo committed Jun 10, 2015
    Copy the full SHA
    f6f73f3 View commit details

  2. Bump for 1.7.20.1

    @enebo
    enebo committed Jun 10, 2015
    Copy the full SHA
    b28a7b4 View commit details

  3. Dead .xml with wrong version. Manually correcting

    @enebo
    enebo committed Jun 10, 2015
    Copy the full SHA
    ebfca94 View commit details

  4. Two more versions not updated from maven version change

    @enebo
    enebo committed Jun 10, 2015
    Copy the full SHA
    d7c8c27 View commit details
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.7.20
1.7.20.1
10 changes: 5 additions & 5 deletions antlib/extra.xml
View file
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ build jruby-complete.jar
<env key='GEM_PATH' value='lib/ruby/gems/shared'/>
<arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
<arg value='-cp'/>
<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-1.7.20-SNAPSHOT.jar'/>
<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-1.7.20.1.jar'/>
<arg value='org.jruby.Main'/>
<arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
<arg value='-r./test/ruby19_env.rb'/>
@@ -137,7 +137,7 @@ build jruby-complete.jar
<env key='GEM_PATH' value='lib/ruby/gems/shared'/>
<arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
<arg value='-cp'/>
<arg value='core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-1.7.20-SNAPSHOT.jar'/>
<arg value='core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-1.7.20.1.jar'/>
<arg value='org.jruby.Main'/>
<arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
<arg value='-r./test/ruby19_env.rb'/>
@@ -153,7 +153,7 @@ build jruby-complete.jar
<env key='GEM_PATH' value='lib/ruby/gems/shared'/>
<arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
<arg value='-cp'/>
<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-1.7.20-SNAPSHOT.jar'/>
<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-1.7.20.1.jar'/>
<arg value='org.jruby.Main'/>
<arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
<arg value='-r./test/ruby19_env.rb'/>
@@ -169,7 +169,7 @@ build jruby-complete.jar
<env key='GEM_PATH' value='lib/ruby/gems/shared'/>
<arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
<arg value='-cp'/>
<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-1.7.20-SNAPSHOT.jar'/>
<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-1.7.20.1.jar'/>
<arg value='org.jruby.Main'/>
<arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
<arg value='-r./test/ruby19_env.rb'/>
@@ -461,7 +461,7 @@ build jruby-complete.jar
<env key='GEM_PATH' value='lib/ruby/gems/shared'/>
<arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
<arg value='-cp'/>
<arg value='core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-1.7.20-SNAPSHOT.jar'/>
<arg value='core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-1.7.20.1.jar'/>
<arg value='org.jruby.Main'/>
<arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
<arg value='-r./test/ruby19_env.rb'/>
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-parent</artifactId>
<version>1.7.20</version>
<version>1.7.20.1</version>
</parent>
<artifactId>jruby-core</artifactId>
<packaging>jar</packaging>
2 changes: 1 addition & 1 deletion docs/man/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>docs</artifactId>
<version>1.7.20</version>
<version>1.7.20.1</version>
</parent>

<groupId>org.jruby</groupId>
2 changes: 1 addition & 1 deletion docs/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-parent</artifactId>
<version>1.7.20</version>
<version>1.7.20.1</version>
</parent>

<groupId>org.jruby</groupId>
4 changes: 2 additions & 2 deletions ext/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -5,11 +5,11 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-parent</artifactId>
<version>1.7.20</version>
<version>1.7.20.1</version>
</parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-ext</artifactId>
<version>1.7.20</version>
<version>1.7.20.1</version>
<packaging>pom</packaging>

<name>JRuby Ext</name>
2 changes: 1 addition & 1 deletion ext/readline/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-ext</artifactId>
<version>1.7.20</version>
<version>1.7.20.1</version>
</parent>
<artifactId>readline</artifactId>
<version>1.0</version>
4 changes: 2 additions & 2 deletions ext/ripper/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -5,10 +5,10 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-ext</artifactId>
<version>1.7.20</version>
<version>1.7.20.1</version>
</parent>
<artifactId>ripper</artifactId>
<version>1.7.20</version>
<version>1.7.20.1</version>
<packaging>jar</packaging>

<name>JRuby Ripper</name>
4 changes: 2 additions & 2 deletions lib/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-parent</artifactId>
<version>1.7.20</version>
<version>1.7.20.1</version>
</parent>
<artifactId>jruby-lib</artifactId>
<packaging>pom</packaging>
@@ -21,7 +21,7 @@
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby-core</artifactId>
<version>1.7.20</version>
<version>1.7.20.1</version>
</dependency>
<dependency>
<groupId>rubygems</groupId>
2 changes: 1 addition & 1 deletion lib/ruby/shared/rubygems.rb
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
require 'thread'

module Gem
VERSION = '2.4.6'
VERSION = '2.4.8'
end

# Must be first since it unloads the prelude from 1.9.2
8 changes: 7 additions & 1 deletion lib/ruby/shared/rubygems/remote_fetcher.rb
View file
Original file line number Diff line number Diff line change
@@ -94,7 +94,13 @@ def api_endpoint(uri)
rescue Resolv::ResolvError
uri
else
URI.parse "#{uri.scheme}://#{res.target}#{uri.path}"
target = res.target.to_s.strip

if /\.#{Regexp.quote(host)}\z/ =~ target
return URI.parse "#{uri.scheme}://#{target}#{uri.path}"
end

uri
end
end

2 changes: 1 addition & 1 deletion maven/jruby-complete/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-artifacts</artifactId>
<version>1.7.20</version>
<version>1.7.20.1</version>
</parent>
<artifactId>jruby-complete</artifactId>
<packaging>bundle</packaging>
4 changes: 2 additions & 2 deletions maven/jruby-dist/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-artifacts</artifactId>
<version>1.7.20</version>
<version>1.7.20.1</version>
</parent>
<artifactId>jruby-dist</artifactId>
<packaging>pom</packaging>
@@ -78,7 +78,7 @@
</execution>
</executions>
<configuration>
<finalName>jruby-dist-1.7.20</finalName>
<finalName>jruby-dist-1.7.20.1</finalName>
<tarLongFileMode>gnu</tarLongFileMode>
<descriptors>
<descriptor>src/main/assembly/jruby.xml</descriptor>
6 changes: 3 additions & 3 deletions maven/jruby-jars/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-artifacts</artifactId>
<version>1.7.20</version>
<version>1.7.20.1</version>
</parent>
<groupId>rubygems</groupId>
<artifactId>jruby-jars</artifactId>
@@ -67,7 +67,7 @@ freezing to) a specific jruby-complete jar version.</description>
</extension>
</extensions>
<directory>${basedir}/pkg</directory>
<finalName>${project.artifactId}-1.7.20.dev</finalName>
<finalName>${project.artifactId}-1.7.20.1</finalName>
<plugins>
<plugin>
<groupId>de.saumya.mojo</groupId>
@@ -114,7 +114,7 @@ freezing to) a specific jruby-complete jar version.</description>
<artifactId>maven-invoker-plugin</artifactId>
<configuration>
<properties>
<ruby.version>1.7.20.dev</ruby.version>
<ruby.version>1.7.20.1</ruby.version>
<gem.home>${project.build.directory}/rubygems</gem.home>
<gem.path>${project.build.directory}/rubygems</gem.path>
</properties>
2 changes: 1 addition & 1 deletion maven/jruby-noasm/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-artifacts</artifactId>
<version>1.7.20</version>
<version>1.7.20.1</version>
</parent>
<artifactId>jruby-noasm</artifactId>
<packaging>bundle</packaging>
2 changes: 1 addition & 1 deletion maven/jruby-rake-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-artifacts</artifactId>
<version>1.7.20</version>
<version>1.7.20.1</version>
</parent>
<groupId>org.jruby.plugins</groupId>
<artifactId>jruby-rake-plugin</artifactId>
2 changes: 1 addition & 1 deletion maven/jruby-stdlib/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-artifacts</artifactId>
<version>1.7.20</version>
<version>1.7.20.1</version>
</parent>
<artifactId>jruby-stdlib</artifactId>
<name>JRuby Stdlib</name>
2 changes: 1 addition & 1 deletion maven/jruby/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-artifacts</artifactId>
<version>1.7.20</version>
<version>1.7.20.1</version>
</parent>
<artifactId>jruby</artifactId>
<name>JRuby Main Maven Artifact</name>
2 changes: 1 addition & 1 deletion maven/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-parent</artifactId>
<version>1.7.20</version>
<version>1.7.20.1</version>
</parent>
<artifactId>jruby-artifacts</artifactId>
<packaging>pom</packaging>
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@

<groupId>org.jruby</groupId>
<artifactId>jruby-parent</artifactId>
<version>1.7.20</version>
<version>1.7.20.1</version>
<packaging>pom</packaging>

<name>JRuby</name>
2 changes: 1 addition & 1 deletion test/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-parent</artifactId>
<version>1.7.20</version>
<version>1.7.20.1</version>
</parent>
<artifactId>jruby-tests</artifactId>
<packaging>jar</packaging>