Merge fix for #1163

jruby · Oct 24, 2013 · f1b5dbc · f1b5dbc
1 parent b555db5
commit f1b5dbc
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 8 deletions.
diff --git a/maven/jruby-jars/Mavenfile b/maven/jruby-jars/Mavenfile
@@ -2,6 +2,7 @@
 
 gemspec :include_jars => true
 
+model.version = model.version.sub(/\.SNAPSHOT/, '-SNAPSHOT')
 inherit "org.jruby:jruby-artifacts:#{model.version}"
 
 name "JRuby Jars Gem"
@@ -24,4 +25,13 @@ properties( 'tesla.dump.pom' => 'pom.xml',
 plugin 'de.saumya.mojo:gem-maven-plugin' do
   execute_goals :id => 'default-push', :skip => true
 end
+
+execute 'rename gem file', :package do |ctx|
+
+  require 'fileutils'
+  gem = File.join( ctx.project.build.directory,
+                   ctx.project.build.final_name + ".gem" )
+  FileUtils.mv( gem.sub( /-SNAPSHOT/, '' ), gem.sub( /-SNAPSHOT/, '.SNAPSHOT' ) )
+
+end
 # vim: syntax=Ruby
diff --git a/maven/jruby-jars/pom.xml b/maven/jruby-jars/pom.xml
@@ -56,14 +56,6 @@ freezing to) a specific jruby-complete jar version.</description>
           <gemspec>jruby-jars.gemspec</gemspec>
           <includeDependencies>true</includeDependencies>
         </configuration>
-        <executions>
-          <execution>
-            <id>default-push</id>
-            <configuration>
-              <skip>true</skip>
-            </configuration>
-          </execution>
-        </executions>
       </plugin>
       <plugin>
         <artifactId>maven-clean-plugin</artifactId>
@@ -89,6 +81,45 @@ freezing to) a specific jruby-complete jar version.</description>
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>de.saumya.mojo</groupId>
+        <artifactId>gem-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>default-push</id>
+            <configuration>
+              <skip>true</skip>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>io.tesla.polyglot</groupId>
+        <artifactId>tesla-polyglot-maven-plugin</artifactId>
+        <version>0.0.1</version>
+        <configuration>
+          <nativePom>Mavenfile</nativePom>
+        </configuration>
+        <executions>
+          <execution>
+            <id>rename gem file</id>
+            <phase>package</phase>
+            <goals>
+              <goal>execute</goal>
+            </goals>
+            <configuration>
+              <taskId>rename gem file</taskId>
+            </configuration>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>io.tesla.polyglot</groupId>
+            <artifactId>tesla-polyglot-ruby</artifactId>
+            <version>0.0.1</version>
+          </dependency>
+        </dependencies>
+      </plugin>
     </plugins>
   </build>
 </project>