cleanup Mavenfile and prepare release 0.10.1

Author: kares

History.md

@@ -1,3 +1,15 @@
+## 0.10.1
+
+* loading JOpenSSL's native ext part the JRuby 9.2 (internal) way
+* avoid, once again, installing BC provider on boot (due OCSP support)
+* [feat] support OpenSSL::KDF as a (semi) OpenSSL::PKCS5 replacement
+* rename ugly-sh "Jopenssl" constant to **JOpenSSL**
+* support PKCS7#decrypt with 1 argument (pkey only - without certificate)
+* undo some of the call-sites in SSLSocket - account for sub-classes (#165)
+* follow-up to provide == for X.509 types (like C-OpenSSL does in 2.1) 
+* validate iter parameter on Cipher#pkcs5_keyivgen (since OpenSSL 2.0.8)
+* remove openssl/pkcs7.rb -> since 1.8 no longer supported
+
 ## 0.10.0
 
 **NOTE:** dropped support for anything below ~ JRuby 1.7.20

Mavenfile

@@ -2,9 +2,6 @@
 
 gemspec :jar => 'jopenssl', :include_jars => true
 
-sonatype_url = 'https://oss.sonatype.org/content/repositories/snapshots/'
-snapshot_repository :id => 'sonatype', :url => sonatype_url
-
 distribution_management do
   snapshot_repository :id => :ossrh, :url => 'https://oss.sonatype.org/content/repositories/snapshots'
   repository :id => :ossrh, :url => 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
@@ -80,29 +77,24 @@ plugin :clean do
                  'failOnError' =>  'false' )
 end
 
-# NOTE: unfortunately we can not use 1.6.8 to generate invokers ...
-# although we'd like to compile against 1.6 to make sure all is well
-jar 'org.jruby:jruby-core', '1.7.17', :scope => :provided  # 1.6.8
+jar 'org.jruby:jruby-core', '1.7.20', :scope => :provided
 jar 'junit:junit', '4.11', :scope => :test
 
 jruby_plugin! :gem do
-  # when installing dependent gems we want to use the built in openssl
-  # not the one from this lib directory
-  # we compile against jruby-core-1.7.17 and want to keep this out of
-  # the plugin execution here
+  # when installing dependent gems we want to use the built in openssl not the one from this lib directory
+  # we compile against jruby-core-1.7.20 and want to keep this out of the plugin execution here
   execute_goal :id => 'default-initialize', :addProjectClasspath => false, :libDirectory => 'something-which-does-not-exists'
   execute_goals :id => 'default-push', :skip => true
 end
 
-# we want to have the snapshots on oss.sonatype.org and the released gems
-# on maven central
+# we want to have the snapshots on oss.sonatype.org and the released gems on maven central
 plugin :deploy, '2.8.1' do
   execute_goals( :deploy, :skip => false )
 end
 
 supported_bc_versions = %w{ 1.55 1.56 1.57 1.58 1.59 }
 
-default_bc_version = File.expand_path('lib/jopenssl/version.rb', File.dirname(__FILE__))
+default_bc_version = File.read File.expand_path('lib/jopenssl/version.rb', File.dirname(__FILE__))
 default_bc_version = default_bc_version[/BOUNCY_CASTLE_VERSION\s?=\s?'(.*?)'/, 1]
 
 properties( 'jruby.plugins.version' => '1.0.10',
@@ -122,7 +114,11 @@ properties( 'jruby.plugins.version' => '1.0.10',
 
 # make sure we have the embedded jars in place before we run runit plugin
 plugin! :dependency do
-  execute_goal 'copy-dependencies', :phase => 'generate-test-resources', :outputDirectory => '${basedir}/lib', :useRepositoryLayout => true, :includeGroupIds => 'org.bouncycastle'
+  execute_goal 'copy-dependencies',
+               :phase => 'generate-test-resources',
+               :outputDirectory => '${basedir}/lib',
+               :useRepositoryLayout => true,
+               :includeGroupIds => 'org.bouncycastle'
 end
 
 jruby_plugin(:runit) { execute_goal( :test, :runitDirectory => '${runit.dir}' ) }
@@ -141,34 +137,16 @@ invoker_run_options = {
       'runit.dir' => '${runit.dir}' }
 }
 
-# profile :id => 'test-1.6.8' do
-#   plugin :invoker, '1.8' do
-#     execute_goals( :install, :run, invoker_run_options )
-#   end
-#   properties 'jruby.versions' => '1.6.8', 'jruby.modes' => '1.8,1.9',
-#              'bc.versions' => supported_bc_versions.join(',')
-# end
-#
-# profile :id => 'test-1.7.4' do
-#   plugin :invoker, '1.8' do
-#     execute_goals( :install, :run, invoker_run_options )
-#   end
-#   properties 'jruby.versions' => '1.7.4', 'jruby.modes' => '1.8,1.9',
-#              'bc.versions' => supported_bc_versions.join(',')
-# end
-
 jruby_1_7_versions = %w{ 1.7.18 1.7.20 1.7.22 1.7.23 1.7.24 1.7.25 1.7.26 1.7.27 }
 
 jruby_1_7_versions.each { |version|
-
 profile :id => "test-#{version}" do
   plugin :invoker, '1.8' do
     execute_goals( :install, :run, invoker_run_options )
   end
   properties 'jruby.versions' => version, 'jruby.modes' => '1.9,2.0',
              'bc.versions' => supported_bc_versions.join(',')
 end
-
 }
 
 jruby_9_K_versions = %w{ 9.0.1.0 9.0.5.0 9.1.2.0 9.1.8.0 9.1.12.0 9.1.16.0 9.1.17.0 9.2.0.0 }
@@ -190,4 +168,5 @@ profile :id => 'release' do
     execute_goal :sign, :phase => :verify
   end
 end
+
 # vim: syntax=Ruby

lib/jopenssl/version.rb

@@ -1,5 +1,5 @@
 module JOpenSSL
-  VERSION = '0.10.1.dev'
+  VERSION = '0.10.1'
   BOUNCY_CASTLE_VERSION = '1.59'
 end
 Jopenssl = JOpenSSL

pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>rubygems</groupId>
   <artifactId>jruby-openssl</artifactId>
-  <version>0.10.1.dev-SNAPSHOT</version>
+  <version>0.10.1</version>
   <packaging>gem</packaging>
   <name>JRuby OpenSSL</name>
   <description>JRuby-OpenSSL is an add-on gem for JRuby that emulates the Ruby OpenSSL native library.</description>
@@ -110,7 +110,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby-core</artifactId>
-      <version>1.7.17</version>
+      <version>1.7.20</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -125,16 +125,6 @@ DO NOT MODIFIY - GENERATED CODE
       <id>mavengems</id>
       <url>mavengem:https://rubygems.org</url>
     </repository>
-    <repository>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <id>sonatype</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
-    </repository>
   </repositories>
   <build>
     <extensions>