Merge pull request #27 from jwillemsen/jwi-r2corba-153

Preparations for new R2CORBA v1.5.3 release

.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

README.rdoc

@@ -1,5 +1,4 @@
 {<img src="https://badge.fury.io/rb/r2corba.svg" alt="Gem Version" />}[https://badge.fury.io/rb/r2corba]
-{<img src="https://dev.azure.com/remedyit/r2corba/_apis/build/status/r2corba?branchName=master" alt="Azure pipeline" />}[https://dev.azure.com/remedyit/r2corba/_build?definitionId=3&_a=summary]
 {<img src="https://www.codefactor.io/repository/github/remedyit/r2corba/badge" alt="CodeFactor" />}[https://www.codefactor.io/repository/github/remedyit/r2corba]
 {<img src="https://github.com/RemedyIT/r2corba/workflows/linux/badge.svg" alt="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
 

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
 

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

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,15 +95,15 @@ 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}
     gem.executables = %w{ridlc rins 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

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
 

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