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

Commits on Mar 3, 2016

  1. use latest ruby DSL for maven 

    should remove those bad file descriptor errors as the new one uses jruby-9k
instead of jruby-1.7.x for parsing the ruby DSL
    @mkristian
    mkristian committed Mar 3, 2016
    Copy the full SHA
    27c6f4a View commit details

  2. fix Gemfile.lock 

    not sure why bundler wants to overwrite the old Gemfile.lock :(

a new one works b but needs bundler-1.7.7 and the Gemfile.lock needs to
created with this bundler version. latest bundler-1.11.x does wipe out
the $LOAD_PATH when executing `rake rspec` on the packed jar.
    @mkristian
    mkristian committed Mar 3, 2016
    Copy the full SHA
    c424a66 View commit details

  3. [build] use https://rubygems.org

    @mkristian
    mkristian committed Mar 3, 2016
    Copy the full SHA
    ca8b656 View commit details
Showing with 24 additions and 24 deletions.
  1. +1 −1 .mvn/extensions.xml
  2. +2 −2 lib/pom.rb
  3. +3 −3 lib/pom.xml
  4. +15 −18 maven/jruby/src/it/runnable/Gemfile.lock
  5. +3 −0 maven/jruby/src/it/runnable/Mavenfile
2 changes: 1 addition & 1 deletion .mvn/extensions.xml
View file
Original file line number Diff line number Diff line change
@@ -3,6 +3,6 @@
<extension>
<groupId>io.takari.polyglot</groupId>
<artifactId>polyglot-ruby</artifactId>
<version>0.1.11</version>
<version>0.1.15</version>
</extension>
</extensions>
4 changes: 2 additions & 2 deletions lib/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@ def initialize( name, version, default_spec = true )

extension 'org.torquebox.mojo:mavengem-wagon:0.2.0'

repository :id => :mavengems, :url => 'mavengem:http://rubygems.org'
repository :id => :mavengems, :url => 'mavengem:https://rubygems.org'

plugin( :clean,
:filesets => [ { :directory => '${basedir}/ruby/gems/shared/specifications/default',
@@ -67,7 +67,7 @@ def initialize( name, version, default_spec = true )
plugin :dependency,
:useRepositoryLayout => true,
:outputDirectory => 'ruby/stdlib',
:excludeGroupIds => 'rubygems', # TODO no hardcoded group-ids
:excludeGroupIds => 'rubygems',
:includeScope => :provided do
execute_goal 'copy-dependencies', :phase => 'generate-resources'
end
6 changes: 3 additions & 3 deletions lib/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -178,7 +178,7 @@ DO NOT MODIFIY - GENERATED CODE
<repositories>
<repository>
<id>mavengems</id>
<url>mavengem:http://rubygems.org</url>
<url>mavengem:https://rubygems.org</url>
</repository>
</repositories>
<build>
@@ -276,7 +276,7 @@ DO NOT MODIFIY - GENERATED CODE
<plugin>
<groupId>io.takari.polyglot</groupId>
<artifactId>polyglot-maven-plugin</artifactId>
<version>0.1.11</version>
<version>0.1.15</version>
<executions>
<execution>
<id>install_gems</id>
@@ -327,7 +327,7 @@ DO NOT MODIFIY - GENERATED CODE
<dependency>
<groupId>io.takari.polyglot</groupId>
<artifactId>polyglot-ruby</artifactId>
<version>0.1.11</version>
<version>0.1.15</version>
</dependency>
</dependencies>
</plugin>
33 changes: 15 additions & 18 deletions maven/jruby/src/it/runnable/Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -11,31 +11,31 @@ GEM
thread_safe (~> 0.3, >= 0.3.1)
diff-lcs (1.2.5)
equalizer (0.0.11)
ice_nine (0.11.1)
jar-dependencies (0.1.13)
ice_nine (0.11.2)
jar-dependencies (0.1.15)
jbundler (0.7.1)
bundler (~> 1.5)
jar-dependencies (~> 0.1.7)
maven-tools (~> 1.0.6)
ruby-maven (>= 3.1.1.0.6, < 3.1.2)
maven-tools (1.0.8)
maven-tools (1.0.13)
virtus (~> 1.0)
rake (10.4.2)
rspec (3.3.0)
rspec-core (~> 3.3.0)
rspec-expectations (~> 3.3.0)
rspec-mocks (~> 3.3.0)
rspec-core (3.3.1)
rspec-support (~> 3.3.0)
rspec-expectations (3.3.0)
rspec (3.4.0)
rspec-core (~> 3.4.0)
rspec-expectations (~> 3.4.0)
rspec-mocks (~> 3.4.0)
rspec-core (3.4.3)
rspec-support (~> 3.4.0)
rspec-expectations (3.4.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.3.0)
rspec-mocks (3.3.1)
rspec-support (~> 3.4.0)
rspec-mocks (3.4.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.3.0)
rspec-support (3.3.0)
rspec-support (~> 3.4.0)
rspec-support (3.4.1)
ruby-maven (3.1.1.0.11)
maven-tools (~> 1.0.1)
maven-tools (~> 1.0.8)
ruby-maven-libs (= 3.1.1)
ruby-maven-libs (3.1.1)
thread_safe (0.3.5-java)
@@ -53,6 +53,3 @@ DEPENDENCIES
rake (= 10.4.2)
rspec (~> 3.0)
ruby-maven (= 3.1.1.0.11)

BUNDLED WITH
1.11.2
3 changes: 3 additions & 0 deletions maven/jruby/src/it/runnable/Mavenfile
View file
Original file line number Diff line number Diff line change
@@ -3,6 +3,9 @@
# default versions will be overwritten by pom.rb from root directory
properties( 'jruby.plugins.version' => '1.0.10' )

# default versions will be overwritten by pom.rb from root directory
properties( 'mavengem.wagon.version' => '0.2.0' )

gemfile

model.repositories.clear