some build improvements

* allow to deploy gem to maven-central and oss.sonatype.org
* just let jruby-maven-plugins deal with "-SNAPSHOT" postfix
* use a more up2date jar-dependencies and use sematic version contraint

Author: mkristian

Mavenfile

@@ -5,14 +5,9 @@ gemspec :jar => 'jopenssl', :include_jars => true
 sonatype_url = 'https://oss.sonatype.org/content/repositories/snapshots/'
 snapshot_repository :id => 'sonatype', :url => sonatype_url
 
-if ( version = model.version.to_s ).index('dev')
-  # deploy snapshot versions on sonatype !!!
-  model.version = version.sub('.dev','-SNAPSHOT') unless version.index('-SNAPSHOT')
-  plugin :deploy, '2.8.1' do
-    execute_goals( :deploy,
-                   :skip => false,
-                   :altDeploymentRepository => "sonatype-nexus-snapshots::default::#{sonatype_url}" )
-  end
+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/'
 end
 
 java_target = '1.6'
@@ -75,7 +70,7 @@ plugin( :compiler, '3.1',
       # NOTE: maybe '-J-Xbootclasspath/p:${unsafe.jar}' ... as well ?!
 end
 
-plugin :clean, :filesets => [
+plugin! :clean, :filesets => [
                     { :directory => 'lib', :includes => [ 'jopenssl.jar' ] },
                     { :directory => 'lib/org' },
                     { :directory => 'target', :includes => [ '*' ] },
@@ -93,6 +88,12 @@ jruby_plugin! :gem do
   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
+plugin :deploy, '2.8.1' do
+  execute_goals( :deploy, :skip => false )
+end
+
 supported_bc_versions = %w{ 1.47 1.48 1.49 1.50 1.51 }
 
 default_bc_version = File.read('lib/jopenssl/version.rb')[/BOUNCY_CASTLE_VERSION\s?=\s?'(.*?)'/, 1]
@@ -111,7 +112,7 @@ properties( 'jruby.plugins.version' => '1.0.8',
             'tesla.dump.readonly' => true )
 
 # make sure we have the embedded jars in place before we run runit plugin
-plugin :dependency do
+plugin! :dependency do
   execute_goal 'copy-dependencies', :phase => 'generate-test-resources', :outputDirectory => '${basedir}/lib', :useRepositoryLayout => true, :includeGroupIds => 'org.bouncycastle'
 end
 

jruby-openssl.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.requirements << "jar org.bouncycastle:bcpkix-jdk15on, #{Jopenssl::Version::BOUNCY_CASTLE_VERSION}"
   s.requirements << "jar org.bouncycastle:bcprov-jdk15on, #{Jopenssl::Version::BOUNCY_CASTLE_VERSION}"
 
-  s.add_development_dependency 'jar-dependencies', '0.0.9'
+  s.add_development_dependency 'jar-dependencies', '~> 0.1.0'
 
   s.add_development_dependency 'mocha', '~> 1.1.0'
   s.add_development_dependency 'ruby-maven'

pom.xml

@@ -39,6 +39,16 @@
     <connection>https://github.com/jruby/jruby-openssl.git</connection>
     <url>https://github.com/jruby/jruby-openssl</url>
   </scm>
+  <distributionManagement>
+    <repository>
+      <id>ossrh</id>
+      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+    </repository>
+    <snapshotRepository>
+      <id>ossrh</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+    </snapshotRepository>
+  </distributionManagement>
   <properties>
     <bc.versions>1.50</bc.versions>
     <jruby.plugins.version>1.0.8</jruby.plugins.version>
@@ -54,7 +64,7 @@
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>jar-dependencies</artifactId>
-      <version>[0.0.9,0.0.9.0.0.0.0.1)</version>
+      <version>[0.1.0,0.1.99999]</version>
       <type>gem</type>
       <scope>test</scope>
     </dependency>
@@ -191,21 +201,6 @@
           <useRepositoryLayout>true</useRepositoryLayout>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <version>2.8.1</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>deploy</goal>
-            </goals>
-            <configuration>
-              <skip>false</skip>
-              <altDeploymentRepository>sonatype-nexus-snapshots::default::https://oss.sonatype.org/content/repositories/snapshots/</altDeploymentRepository>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
@@ -309,6 +304,20 @@
           </filesets>
         </configuration>
       </plugin>
+      <plugin>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <version>2.8.1</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>deploy</goal>
+            </goals>
+            <configuration>
+              <skip>false</skip>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>