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

Commits on Aug 20, 2015

  1. Bump for 1.7.22

    @enebo
    enebo committed Aug 20, 2015

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5570cf8 View commit details

  2. Update to last jossl

    @enebo
    enebo committed Aug 20, 2015
    Copy the full SHA
    c28f492 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.22-SNAPSHOT
1.7.22
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.22-SNAPSHOT</version>
<version>1.7.22</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.22-SNAPSHOT</version>
<version>1.7.22</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.22-SNAPSHOT</version>
<version>1.7.22</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.22-SNAPSHOT</version>
<version>1.7.22</version>
</parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-ext</artifactId>
<version>1.7.22-SNAPSHOT</version>
<version>1.7.22</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.22-SNAPSHOT</version>
<version>1.7.22</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.22-SNAPSHOT</version>
<version>1.7.22</version>
</parent>
<artifactId>ripper</artifactId>
<version>1.7.22-SNAPSHOT</version>
<version>1.7.22</version>
<packaging>jar</packaging>

<name>JRuby Ripper</name>
2 changes: 1 addition & 1 deletion lib/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ def version

default_gems =
[
ImportedGem.new( 'jruby-openssl', '0.9.9', true ),
ImportedGem.new( 'jruby-openssl', '0.9.10', true ),
ImportedGem.new( 'rake', 'rake.version', true ),
ImportedGem.new( 'rdoc', 'rdoc.version', true ),
ImportedGem.new( 'json', 'json.version', true, false ),
6 changes: 3 additions & 3 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.22-SNAPSHOT</version>
<version>1.7.22</version>
</parent>
<artifactId>jruby-lib</artifactId>
<packaging>pom</packaging>
@@ -21,12 +21,12 @@
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby-core</artifactId>
<version>1.7.22-SNAPSHOT</version>
<version>1.7.22</version>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>jruby-openssl</artifactId>
<version>0.9.9</version>
<version>0.9.10</version>
<type>gem</type>
</dependency>
<dependency>
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.22-SNAPSHOT</version>
<version>1.7.22</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.22-SNAPSHOT</version>
<version>1.7.22</version>
</parent>
<artifactId>jruby-dist</artifactId>
<packaging>pom</packaging>
@@ -80,7 +80,7 @@
</execution>
</executions>
<configuration>
<finalName>jruby-dist-1.7.22-SNAPSHOT</finalName>
<finalName>jruby-dist-1.7.22</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.22-SNAPSHOT</version>
<version>1.7.22</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.22.dev</finalName>
<finalName>${project.artifactId}-1.7.22</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.22.dev</ruby.version>
<ruby.version>1.7.22</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.22-SNAPSHOT</version>
<version>1.7.22</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.22-SNAPSHOT</version>
<version>1.7.22</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.22-SNAPSHOT</version>
<version>1.7.22</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.22-SNAPSHOT</version>
<version>1.7.22</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.22-SNAPSHOT</version>
<version>1.7.22</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.22-SNAPSHOT</version>
<version>1.7.22</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.22-SNAPSHOT</version>
<version>1.7.22</version>
</parent>
<artifactId>jruby-tests</artifactId>
<packaging>jar</packaging>