diff --git a/.github/workflows/gem_release.yml b/.github/workflows/gem_release.yml index e8362c7..51f7e16 100644 --- a/.github/workflows/gem_release.yml +++ b/.github/workflows/gem_release.yml @@ -11,10 +11,9 @@ jobs: steps: - uses: actions/checkout@master - - name: Set up Ruby 2.6 - uses: ruby/setup-ruby@v1 + - uses: ruby/setup-ruby@v1 with: - ruby-version: 2.6.x + ruby-version: 2.7 - name: Publish to RubyGems run: | mkdir -p $HOME/.gem diff --git a/README.rdoc b/README.rdoc index e2f04b4..4712558 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,5 +1,4 @@ {Gem Version}[https://badge.fury.io/rb/r2corba] -{Azure pipeline}[https://dev.azure.com/remedyit/r2corba/_build?definitionId=3&_a=summary] {CodeFactor}[https://www.codefactor.io/repository/github/remedyit/r2corba] {Linux CI}[https://github.com/RemedyIT/r2corba/actions?query=workflow%3Alinux] @@ -36,7 +35,7 @@ to install R2CORBA as a gem. == Bugs -If you find a bug, please report it at the R2CORBA project's {issues tracker}[https://github.com/RemedyIT/r2corba/issues]. +If you find a bug, please report it at the R2CORBA project's {issue tracker}[https://github.com/RemedyIT/r2corba/issues]. == License @@ -46,7 +45,7 @@ It is free software, and may be redistributed under the terms specified in the l == Acknowledgments -See the file link:THANKS +See the link:THANKS file. == Warranty diff --git a/lib/corba/common/version.rb b/lib/corba/common/version.rb index 87f20e7..8a71c28 100644 --- a/lib/corba/common/version.rb +++ b/lib/corba/common/version.rb @@ -14,7 +14,7 @@ module R2CORBA R2CORBA_MAJOR = 1 R2CORBA_MINOR = 5 - R2CORBA_RELEASE = 2 + R2CORBA_RELEASE = 3 R2CORBA_VERSION = "#{R2CORBA_MAJOR}.#{R2CORBA_MINOR}.#{R2CORBA_RELEASE}".freeze diff --git a/lib/corba/svcs/ins/ins.rb b/lib/corba/svcs/ins/ins.rb index 4a9a27b..df3027a 100644 --- a/lib/corba/svcs/ins/ins.rb +++ b/lib/corba/svcs/ins/ins.rb @@ -417,7 +417,7 @@ def INS.parse_arg puts " provides help for the specified command\n\n" exit when :version - puts "R2CORBA Interoprable Naming Service (INS) #{INS_VERSION_MAJOR}.#{INS_VERSION_MINOR}.#{INS_VERSION_RELEASE}" + puts "R2CORBA Interoperable Naming Service (INS) #{INS_VERSION_MAJOR}.#{INS_VERSION_MINOR}.#{INS_VERSION_RELEASE}" puts INS_COPYRIGHT puts '' exit diff --git a/rakelib/gem.rake b/rakelib/gem.rake index c766b1e..8521d96 100644 --- a/rakelib/gem.rake +++ b/rakelib/gem.rake @@ -68,7 +68,7 @@ namespace :r2corba do gem.description = %Q{TAO sourcecode for building R2CORBA.} gem.email = 'mcorino@remedy.nl' gem.homepage = "https://www.remedy.nl/opensource/r2corba.html" - gem.authors = ['Martin Corino'] + gem.authors = ['Martin Corino', 'Johnny Willemsen'] gem.files = Dir['lib/taosource/**/*'] gem.files.concat(Dir["src/ACE+TAO-src-#{_ace_ver}.tar.gz"]) gem.files << 'mkrf_conf_taogem.rb' @@ -77,6 +77,10 @@ namespace :r2corba do gem.executables = [] gem.required_ruby_version = '>= 2.0' gem.licenses = ['DOC'] + gem.metadata = { + "bug_tracker_uri" => "https://github.com/DOCGroup/ACE_TAO/issues", + "source_code_uri" => "https://github.com/DOCGroup/ACE_TAO" + } end R2CORBA::Gem.build_gem(gemspec) end @@ -91,7 +95,7 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_ gem.description = %Q{OMG CORBA v3.3 compliant CORBA language mapping implementation for Ruby. Depends on ridl gem for providing native Ruby IDL compiler. } gem.email = 'mcorino@remedy.nl' gem.homepage = "https://www.remedy.nl/opensource/r2corba.html" - gem.authors = ['Martin Corino'] + gem.authors = ['Martin Corino', 'Johnny Willemsen'] gem.files = R2CORBA::Gem.manifest gem.extensions = ['mkrf_conf_srcgem.rb'] gem.require_paths = %w{lib} @@ -99,7 +103,7 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_ gem.required_ruby_version = '>= 2.0' gem.licenses = ['Nonstandard', 'DOC', 'GPL-2.0'] gem.require_paths << 'ext' - gem.add_dependency 'ridl', '~> 2.7' + gem.add_dependency 'ridl', '~> 2.8' gem.add_dependency 'rake', '~> 12.3.3' gem.rdoc_options << '--exclude=\\.dll' << '--exclude=\\.so' << '--exclude=\\.pidlc' gem.metadata = { @@ -130,14 +134,18 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_ gem.description = %Q{OMG CORBA v3.3 compliant CORBA language mapping implementation for Ruby. Depends on ridl gem for providing native Ruby IDL compiler. (extension binaries)} gem.email = 'mcorino@remedy.nl' gem.homepage = "https://www.remedy.nl/opensource/r2corba.html" - gem.authors = ['Martin Corino'] + gem.authors = ['Martin Corino', 'Johnny Willemsen'] gem.files = R2CORBA::Gem.manifest(:extbin) gem.extensions = [] gem.require_paths = %w{ext} gem.executables = [] - gem.required_ruby_version = '>= 2.0.0' + gem.required_ruby_version = '>= 2.0' gem.licenses = ['Nonstandard', 'DOC'] gem.rdoc_options << '--exclude=\\.dll' << '--exclude=\\.so' + gem.metadata = { + "bug_tracker_uri" => "https://github.com/RemedyIT/r2corba/issues", + "source_code_uri" => "https://github.com/RemedyIT/r2corba" + } end R2CORBA::Gem.build_gem(gemspec) ensure @@ -169,24 +177,28 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_ gem.description = %Q{OMG CORBA v3.3 compliant CORBA language mapping implementation for Ruby. Depends on ridl gem for providing native Ruby IDL compiler. } gem.email = 'mcorino@remedy.nl' gem.homepage = "https://www.remedy.nl/opensource/r2corba.html" - gem.authors = ['Martin Corino'] + gem.authors = ['Martin Corino', 'Johnny Willemsen'] gem.files = R2CORBA::Gem.manifest(:bin) gem.require_paths = %w{lib} gem.executables = %w{ridlc rins r2corba} gem.extensions = ['mkrf_conf_bingem.rb'] if defined?(JRUBY_VERSION) gem.require_paths << 'jacorb/lib' - gem.required_ruby_version = '>= 1.7.0' + gem.required_ruby_version = '>= 2.0' gem.licenses = ['Nonstandard', 'GPL-2.0'] else gem.files << File.join('ext', '.keep') unless ENV['FULL_BINGEM'] # to force installation of ext folder if libs are left out - gem.required_ruby_version = '>= 1.9.3' + gem.required_ruby_version = '>= 2.0' gem.licenses = ['Nonstandard', 'DOC', 'GPL-2.0'] gem.require_paths << 'ext' end - gem.add_dependency 'ridl', '~> 2.7' + gem.add_dependency 'ridl', '~> 2.8' gem.add_dependency 'rake', '~> 12.3.3' gem.rdoc_options << '--exclude=\\.dll' << '--exclude=\\.so' << '--exclude=\\.pidlc' + gem.metadata = { + "bug_tracker_uri" => "https://github.com/RemedyIT/r2corba/issues", + "source_code_uri" => "https://github.com/RemedyIT/r2corba" + } end R2CORBA::Gem.build_gem(gemspec) ensure @@ -208,13 +220,17 @@ unless defined?(JRUBY_VERSION) || !R2CORBA::Config.is_win32 gem.description = %Q{Fake Devkit loader to satisfy stupid RubyInstaller pre-install hook. } gem.email = 'mcorino@remedy.nl' gem.homepage = "https://www.remedy.nl/opensource/r2corba.html" - gem.authors = ['Martin Corino'] + gem.authors = ['Martin Corino', 'Johnny Willemsen'] gem.files = 'lib/rubygems_plugin.rb' gem.require_paths = %w{lib} gem.executables = [] gem.extensions = [] gem.required_ruby_version = '>= 2.0' gem.licenses = ['Nonstandard'] + gem.metadata = { + "bug_tracker_uri" => "https://github.com/RemedyIT/r2corba/issues", + "source_code_uri" => "https://github.com/RemedyIT/r2corba" + } end R2CORBA::Gem.build_gem(gemspec) end diff --git a/scripts/rake-gem.rb b/scripts/rake-gem.rb index e4a11e3..c0f4ea0 100644 --- a/scripts/rake-gem.rb +++ b/scripts/rake-gem.rb @@ -8,7 +8,7 @@ gem.description = %Q{OMG CORBA v. 3.3 compliant CORBA language mapping implementation for Ruby. Depends on ridl gem for providing native Ruby IDL compiler. } gem.email = 'mcorino@remedy.nl' gem.homepage = "https://www.remedy.nl/opensource/r2corba.html" - gem.authors = ['Martin Corino'] + gem.authors = ['Martin Corino', 'Johnny Willemsen'] gem.files = R2CORBA.manifest gem.extensions = ['Rakefile'] gem.extra_rdoc_files = %w{LICENSE README.rdoc} @@ -18,15 +18,19 @@ gem.platform = Gem::Platform::JAVA gem.executables << 'jrins' gem.require_paths << 'jacorb/lib' - gem.required_ruby_version = '>= 1.5.0' + gem.required_ruby_version = '>= 2.0' gem.licenses = ['Nonstandard', 'GPL-2.0'] else gem.platform = Gem::Platform::CURRENT if RUBY_PLATFORM =~ /mingw32/ - gem.required_ruby_version = '>= 1.8.6' + gem.required_ruby_version = '>= 2.0' gem.licenses = ['Nonstandard', 'DOC', 'GPL-2.0'] gem.require_paths << 'ext' end - gem.add_dependency 'ridl', '>= 2.2.2' + gem.add_dependency 'ridl', '>= 2.8' + gem.metadata = { + "bug_tracker_uri" => "https://github.com/RemedyIT/r2corba/issues", + "source_code_uri" => "https://github.com/RemedyIT/r2corba" + } end end diff --git a/scripts/rake-taogem.rb b/scripts/rake-taogem.rb index e77a028..8b7d15e 100644 --- a/scripts/rake-taogem.rb +++ b/scripts/rake-taogem.rb @@ -40,7 +40,7 @@ def self.build_gem gem.description = %Q{TAO sourcecode for building R2CORBA} gem.email = 'mcorino@remedy.nl' gem.homepage = "https://www.remedy.nl/opensource/r2corba.html" - gem.authors = ['Martin Corino'] + gem.authors = ['Martin Corino', 'Johnny Willemsen'] gem.files = Dir['lib/**/*'] gem.files.concat(Dir["src/ACE+TAO-src-#{TAOGem::VERSION}.tar.gz"]) gem.files << 'Rakefile' @@ -50,6 +50,10 @@ def self.build_gem #gem.platform = Gem::Platform::CURRENT gem.required_ruby_version = '>= 2.0' gem.licenses = ['DOC'] + gem.metadata = { + "bug_tracker_uri" => "https://github.com/DOCGroup/ACE_TAO/issues", + "source_code_uri" => "https://github.com/DOCGroup/ACE_TAO" + } end end