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: a0fd348d8eaf
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 35a4547d4760
Choose a head ref
  • 3 commits
  • 8 files changed
  • 1 contributor

Commits on Nov 29, 2017

  1. Begin dev on 9.3.0.0.

    @headius
    headius committed Nov 29, 2017
    Copy the full SHA
    624147c View commit details

  2. Bump Ruby compat level to 2.5.0.

    @headius
    headius committed Nov 29, 2017
    Copy the full SHA
    eb75a70 View commit details

  3. Move ipaddr to default gems.

    @headius
    headius committed Nov 29, 2017
    Copy the full SHA
    35a4547 View commit details
Showing with 28 additions and 675 deletions.
  1. +1 −0 .gitignore
  2. +1 −1 VERSION
  3. +5 −5 core/pom.xml
  4. +4 −4 default.build.properties
  5. +1 −0 lib/pom.rb
  6. +15 −2 lib/pom.xml
  7. +0 −662 lib/ruby/stdlib/ipaddr.rb
  8. +1 −1 pom.xml
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -55,6 +55,7 @@ lib/ruby/stdlib/*.jar
lib/ruby/stdlib/ant*
lib/ruby/stdlib/did_you_mean*
lib/ruby/stdlib/gauntlet_rdoc.rb
lib/ruby/stdlib/ipaddr*
lib/ruby/stdlib/jar*
lib/ruby/stdlib/jline
lib/ruby/stdlib/jopenssl*
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9.2.0.0-SNAPSHOT
9.3.0.0-SNAPSHOT
10 changes: 5 additions & 5 deletions core/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -12,12 +12,12 @@ DO NOT MODIFIY - GENERATED CODE
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-parent</artifactId>
<version>9.2.0.0-SNAPSHOT</version>
<version>9.3.0.0-SNAPSHOT</version>
</parent>
<artifactId>jruby-core</artifactId>
<name>JRuby Core</name>
<properties>
<version.ruby>2.4.1</version.ruby>
<version.ruby>2.5.0</version.ruby>
<prawn.dir>${test.dir}/prawn</prawn.dir>
<spec.tags.dir>${spec.dir}/tags</spec.tags.dir>
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
@@ -27,7 +27,7 @@ DO NOT MODIFIY - GENERATED CODE
<jruby.test.memory.permgen>2G</jruby.test.memory.permgen>
<installer.gems>${jruby.win32ole.gem}</installer.gems>
<prawn.git.repo>git://github.com/sandal/prawn.git</prawn.git.repo>
<version.ruby.minor>1</version.ruby.minor>
<version.ruby.minor>0</version.ruby.minor>
<tzdata.version>2013d</tzdata.version>
<install4j.executable>/Applications/install4j 4/bin/install4jc</install4j.executable>
<jay.bin>jay</jay.bin>
@@ -39,15 +39,15 @@ DO NOT MODIFIY - GENERATED CODE
<rubyspec.1.8.dir>${rubyspec.dir}/1.8</rubyspec.1.8.dir>
<jruby.launch.memory>1024M</jruby.launch.memory>
<jruby.compile.memory>2G</jruby.compile.memory>
<version.ruby.major>2.4</version.ruby.major>
<version.ruby.major>2.5</version.ruby.major>
<release.dir>release</release.dir>
<create.sources.jar>false</create.sources.jar>
<lib.dir>lib</lib.dir>
<rails.dir>${test.dir}/rails</rails.dir>
<parser.dir>core/src/main/java/org/jruby/parser</parser.dir>
<jruby.basedir>${basedir}/..</jruby.basedir>
<rubyspec.dir>${spec.dir}/ruby</rubyspec.dir>
<version.ruby.revision>58053</version.ruby.revision>
<version.ruby.revision>60928</version.ruby.revision>
<jruby.test.memory>3G</jruby.test.memory>
<mspec.dir>${spec.dir}/mspec</mspec.dir>
<build.date>${maven.build.timestamp}</build.date>
8 changes: 4 additions & 4 deletions default.build.properties
View file
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@ rake.args=
install4j.executable=/Applications/install4j 4/bin/install4jc

# Ruby versions
version.ruby=2.4.1
version.ruby.major=2.4
version.ruby.minor=1
version.ruby.revision=58053
version.ruby=2.5.0
version.ruby.major=2.5
version.ruby.minor=0
version.ruby.revision=60928
1 change: 1 addition & 0 deletions lib/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -39,6 +39,7 @@ def initialize( name, version, default_spec = true )
ImportedGem.new( 'net-telnet', '0.1.1'),
ImportedGem.new( 'did_you_mean', '1.0.1'),
ImportedGem.new( 'rake-ant', '1.0.4'),
ImportedGem.new( 'ipaddr', '1.2.0'),
]

project 'JRuby Lib Setup' do
17 changes: 15 additions & 2 deletions lib/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ DO NOT MODIFIY - GENERATED CODE
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-parent</artifactId>
<version>9.2.0.0-SNAPSHOT</version>
<version>9.3.0.0-SNAPSHOT</version>
</parent>
<artifactId>jruby-stdlib</artifactId>
<name>JRuby Lib Setup</name>
@@ -28,7 +28,7 @@ DO NOT MODIFIY - GENERATED CODE
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby-core</artifactId>
<version>9.2.0.0-SNAPSHOT</version>
<version>9.3.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -200,6 +200,19 @@ DO NOT MODIFIY - GENERATED CODE
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>ipaddr</artifactId>
<version>1.2.0</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>jar-dependencies</artifactId>
<groupId>rubygems</groupId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<repositories>
<repository>
Loading