Skip to content

Commit

Permalink
Merge pull request #2 from deivid-rodriguez/bump_plugins
Browse files Browse the repository at this point in the history
Bump mvn extensions
  • Loading branch information
headius authored Oct 28, 2021
2 parents 3d2ce35 + 398408c commit 7779014
Show file tree
Hide file tree
Showing 7 changed files with 46 additions and 22 deletions.
31 changes: 31 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Test

on: [push, pull_request]

jobs:
build:
runs-on: ubuntu-20.04

strategy:
fail-fast: false

matrix:
ruby: [2.6.8, jruby-head, jruby-9.3.1.0]

steps:
- uses: actions/checkout@v2

- name: Set up Ruby ${{ matrix.ruby }}
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true

- name: Set up Java 8
uses: actions/setup-java@v2
with:
distribution: zulu
java-version: 8

- name: Run test
run: bundle exec rake
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
pkg
pom*xml
pom*xml.bkp
*.gem
*.lock
5 changes: 2 additions & 3 deletions .mvn/extensions.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- from ruby-maven gem -->
<extensions>
<extension>
<groupId>org.torquebox.mojo</groupId>
<artifactId>mavengem-wagon</artifactId>
<version>0.2.1</version>
<version>1.0.3</version>
</extension>
<extension>
<groupId>io.takari.polyglot</groupId>
<artifactId>polyglot-ruby</artifactId>
<version>0.1.18</version>
<version>0.4.4</version>
</extension>
</extensions>
7 changes: 0 additions & 7 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion Mavenfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

gemspec

properties 'push.skip': true, 'jruby.version': '9.2.9.0'
properties 'push.skip': true, 'jruby.version': '9.3.1.0'

profile :id => :release do
properties 'maven.test.skip' => true, 'invoker.skip' => true
Expand Down
8 changes: 4 additions & 4 deletions spec/maven_ruby_maven_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
subject.exec( '-Dverbose', 'validate' )
end
subject.verbose = false
CatchStdout.result.must_match /mvn -Dverbose validate/
_(CatchStdout.result).must_match /mvn -Dverbose validate/
end

it 'takes declared jruby version' do
begin
subject.inherit_jruby_version '9.0.4.0'
subject.exec( '-X', 'initialize', '-l', 'pkg/log1.txt' )
File.read('pkg/log1.txt').must_match /resolve jruby for version 9.0.4.0/
_(File.read('pkg/log1.txt')).must_match /resolve jruby for version 9.0.4.0/
ensure
subject['jruby.version'] = nil
end
Expand All @@ -27,13 +27,13 @@
it 'inherits jruby version' do
subject.inherit_jruby_version
subject.exec( '-X', 'initialize', '-l', 'pkg/log2.txt' )
File.read('pkg/log2.txt').must_match /resolve jruby for version #{JRUBY_VERSION}/
_(File.read('pkg/log2.txt')).must_match /resolve jruby for version #{JRUBY_VERSION}/
end
else
it 'takes default jruby version with inherit jruby version' do
subject.inherit_jruby_version
subject.exec( '-X', 'initialize', '-l', 'pkg/log3.txt' )
File.read('pkg/log3.txt').must_match /resolve jruby for version 1.7.22/
_(File.read('pkg/log3.txt')).must_match /resolve jruby for version 9.3.1.0/
end
end
end
14 changes: 7 additions & 7 deletions spec/ruby_maven_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
CatchStdout.exec do
RubyMaven.exec( '--version' )
end
CatchStdout.result.must_match /Polyglot Maven Extension 0.1.15/
_(CatchStdout.result).must_match /Polyglot Maven Extension 0.4.4/
xml = File.read('.mvn/extensions.xml')
xml.must_equal "dummy\n"
_(xml).must_equal "dummy\n"
end
end

Expand All @@ -26,13 +26,13 @@
FileUtils.rm_f gem_name
CatchStdout.exec do
# need newer jruby version
RubyMaven.exec( '-Dverbose', 'package', '-Djruby.version=1.7.24' )
RubyMaven.exec( '-Dverbose', 'package', '-Djruby.version=9.3.0.0' )
end
#puts CatchStdout.result
CatchStdout.result.must_match /mvn -Dverbose package/
File.exists?( gem_name ).must_equal true
File.exists?( '.mvn/extensions.xml' ).must_equal true
File.exists?( '.mvn/extensions.xml.orig' ).wont_equal true
_(CatchStdout.result).must_match /mvn -Dverbose package/
_(File.exists?( gem_name )).must_equal true
_(File.exists?( '.mvn/extensions.xml' )).must_equal true
_(File.exists?( '.mvn/extensions.xml.orig' )).wont_equal true
end

end

0 comments on commit 7779014

Please sign in to comment.