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

Commits on Jan 26, 2015

  1. Use Maven Central to fetch Truffle jars.

    @eregon
    eregon committed Jan 26, 2015
    Copy the full SHA
    7e3f984 View commit details

  2. Other changes done by rake maven:dump_poms.

    @eregon
    eregon committed Jan 26, 2015
    Copy the full SHA
    3cdfc85 View commit details
Showing with 8 additions and 17 deletions.
  1. +1 −1 maven/jruby-dist/pom.xml
  2. +6 −1 maven/jruby-jars/pom.xml
  3. +0 −5 pom.rb
  4. +0 −10 pom.xml
  5. +1 −0 test/pom.xml
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>
7 changes: 6 additions & 1 deletion maven/jruby-jars/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -18,12 +18,18 @@ freezing to) a specific jruby-complete jar version.</description>
<licenses>
<license>
<name>EPL-1.0</name>
<url>http://opensource.org/licenses/EPL-1.0</url>
<comments>Eclipse Public License 1.0</comments>
</license>
<license>
<name>GPL-2.0</name>
<url>http://opensource.org/licenses/GPL-2.0</url>
<comments>GNU General Public License version 2.0</comments>
</license>
<license>
<name>LGPL-2.1</name>
<url>http://opensource.org/licenses/LGPL-2.1</url>
<comments>GNU Library or "Lesser" General Public License version 2.1</comments>
</license>
</licenses>
<developers>
@@ -41,7 +47,6 @@ freezing to) a specific jruby-complete jar version.</description>
<gem.home>${jruby.home}/lib/ruby/gems/shared</gem.home>
<jruby.plugins.version>1.0.7</jruby.plugins.version>
<tesla.dump.pom>pom.xml</tesla.dump.pom>
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
<jruby_home>${basedir}/../../</jruby_home>
<tesla.version>0.1.1</tesla.version>
</properties>
5 changes: 0 additions & 5 deletions pom.rb
View file
Original file line number Diff line number Diff line change
@@ -40,11 +40,6 @@
releases 'false'
snapshots 'true'
end
repository( 'http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/releases/',
:id => 'truffle' ) do
releases 'true'
snapshots 'false'
end

source_control( :url => 'https://github.com/jruby/jruby',
:connection => 'scm:git:git@jruby.org:jruby.git',
10 changes: 0 additions & 10 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -164,16 +164,6 @@
<id>sonatype</id>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
</repository>
<repository>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>truffle</id>
<url>http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/releases/</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
1 change: 1 addition & 0 deletions test/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -341,6 +341,7 @@
<arg value="test/mri/ruby/test_path.rb" />
<arg value="test/mri/ruby/test_pipe.rb" />
<arg value="test/mri/ruby/test_primitive.rb" />
<arg value="test/mri/ruby/test_process.rb" />
<arg value="test/mri/ruby/test_rand.rb" />
<arg value="test/mri/ruby/test_range.rb" />
<arg value="test/mri/ruby/test_rational.rb" />