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

Commits on Dec 12, 2014

  1. [build] use install to generated new pom.xml

    @mkristian
    mkristian committed Dec 12, 2014
    Copy the full SHA
    76dc06e View commit details

  2. remove deprecated entries from Constants.java

    @mkristian
    mkristian committed Dec 12, 2014
    Copy the full SHA
    fe95046 View commit details

  3. [build] new pom.xml

    @mkristian
    mkristian committed Dec 12, 2014
    Copy the full SHA
    669fbdc View commit details
Showing with 2 additions and 21 deletions.
  1. +0 −18 core/src/main/resources/org/jruby/runtime/Constants.java
  2. +1 −1 maven/jruby-dist/pom.xml
  3. +0 −1 maven/jruby-jars/jruby-jars.gemspec
  4. +1 −1 rakelib/maven.rake
18 changes: 0 additions & 18 deletions core/src/main/resources/org/jruby/runtime/Constants.java
View file
Original file line number Diff line number Diff line change
@@ -41,24 +41,6 @@ public final class Constants {
public static final int RUBY_PATCHLEVEL = Integer.parseInt("@version.ruby.patchlevel@");
public static final int RUBY_REVISION = Integer.parseInt("@version.ruby.revision@");

@Deprecated
public static final String RUBY1_9_MAJOR_VERSION = "@version.ruby1_9.major@";
@Deprecated
public static final String RUBY1_9_VERSION = "@version.ruby1_9@";
@Deprecated
public static final int RUBY1_9_PATCHLEVEL = Integer.parseInt("@version.ruby1_9.patchlevel@");
@Deprecated
public static final int RUBY1_9_REVISION = Integer.parseInt("@version.ruby1_9.revision@");

@Deprecated
public static final String RUBY2_0_MAJOR_VERSION = "@version.ruby2_0.major@";
@Deprecated
public static final String RUBY2_0_VERSION = "@version.ruby2_0@";
@Deprecated
public static final int RUBY2_0_PATCHLEVEL = Integer.parseInt("@version.ruby2_0.patchlevel@");
@Deprecated
public static final int RUBY2_0_REVISION = Integer.parseInt("@version.ruby2_0.revision@");

public static final String COMPILE_DATE = "@build.date@";
public static final String VERSION = "@version.jruby@";
public static final String BUILD = "java@base.java.version@";
2 changes: 1 addition & 1 deletion maven/jruby-dist/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
<name>JRuby Dist</name>
<properties>
<tesla.dump.readonly>true</tesla.dump.readonly>
<jruby.plugins.version>1.0.3</jruby.plugins.version>
<jruby.plugins.version>1.0.7</jruby.plugins.version>
<main.basedir>${project.parent.parent.basedir}</main.basedir>
<tesla.dump.pom>pom.xml</tesla.dump.pom>
<tesla.version>0.1.1</tesla.version>
1 change: 0 additions & 1 deletion maven/jruby-jars/jruby-jars.gemspec
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#-*- mode: ruby -*-

require 'rake'
require 'fileutils'

version = File.read( File.join( File.dirname(File.expand_path(__FILE__)), '..', '..', 'VERSION' ) ).strip
2 changes: 1 addition & 1 deletion rakelib/maven.rake
View file
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ namespace :maven do

desc "Dump pom.xml files"
task :dump_poms do
maven.validate( '-Pall' )
maven.install( '-Pall' )
end

desc "Set new version"