make the jruby-openssl a java platform gem [skip ci]

Author: mkristian

Mavenfile

@@ -2,11 +2,6 @@
 
 gemspec :jar => 'jopenssl', :include_jars => true
 
-# that all should be part of ruby-maven to pick the right extension
-properties 'jruby.plugins.version' => '1.0.2'
-build.extensions.clear
-extension 'de.saumya.mojo:gem-with-jar-extension', '${jruby.plugins.version}'
-
 if model.version.to_s.match /[a-zA-Z]/
   model.group_id = 'org.jruby.gems'
 
@@ -20,17 +15,6 @@ end
 
 plugin( :compiler, :target => '1.6', :source => '1.6', :debug => true, :verbose => false, :showWarnings => true, :showDeprecation => true )
 
-# TODO need upstream fix
-plugin( :jar,
-        :outputDirectory => 'lib',
-        :finalName => 'jopenssl' ) do
-  execute_goals :jar, :phase => 'prepare-package'
-end
-
-plugin( :clean, VERSIONS[ :clean_plugin ],
-        :filesets => [ { :directory => 'lib',
-                         :includes => [ "jopenssl.jar" ] } ] )
-
 jruby_plugin! :gem do
   # avoid adding this not yet built openssl to the load_path
   # when installing dependent gems

jruby-openssl.gemspec

@@ -11,12 +11,12 @@ Gem::Specification.new do |s|
   s.homepage = 'https://github.com/jruby/jruby'
   s.description = File.read('README.txt').split(/\n{2,}/)[3...4].join("\n\n")
   s.rubyforge_project = 'jruby/jruby'
+  s.platform = 'java'
   s.files = Dir['[A-Z]*'] + Dir['lib/**/*'] + Dir['test/**/*']
 
   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.changes = File.read('History.txt').split(/\n{2,}/)[0..1].join("\n\n")
   s.require_paths = ['lib']
 end
 

pom.xml

@@ -81,6 +81,36 @@
     </extensions>
     <directory>${basedir}/pkg</directory>
     <plugins>
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.4</version>
+        <executions>
+          <execution>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <outputDirectory>lib</outputDirectory>
+          <finalName>jopenssl</finalName>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-clean-plugin</artifactId>
+        <version>2.4</version>
+        <configuration>
+          <filesets>
+            <fileset>
+              <directory>lib</directory>
+              <includes>
+                <include>jopenssl.jar</include>
+              </includes>
+            </fileset>
+          </filesets>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>de.saumya.mojo</groupId>
         <artifactId>gem-maven-plugin</artifactId>
@@ -131,35 +161,6 @@
           <showDeprecation>true</showDeprecation>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <outputDirectory>lib</outputDirectory>
-          <finalName>jopenssl</finalName>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <version>2.4</version>
-        <configuration>
-          <filesets>
-            <fileset>
-              <directory>lib</directory>
-              <includes>
-                <include>jopenssl.jar</include>
-              </includes>
-            </fileset>
-          </filesets>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>