switch over to use SNAPSHOT version but keep final_names without SNAP…

…SHOT to preserve tools depending on file-naming conventions [skip ci]

VERSION

@@ -1 +1 @@
-9000.dev
+9000.dev-SNAPSHOT

core/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-parent</artifactId>
-    <version>9000.dev</version>
+    <version>9000.dev-SNAPSHOT</version>
   </parent>
   <artifactId>jruby-core</artifactId>
   <name>JRuby Core</name>

lib/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-parent</artifactId>
-    <version>9000.dev</version>
+    <version>9000.dev-SNAPSHOT</version>
   </parent>
   <artifactId>jruby-lib</artifactId>
   <packaging>pom</packaging>
@@ -20,7 +20,7 @@
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby-core</artifactId>
-      <version>9000.dev</version>
+      <version>9000.dev-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.jruby.gems</groupId>

maven/jruby-complete/pom.rb

@@ -24,6 +24,10 @@
                         'org.ow2.asm:asm-util' ] )
   jar 'org.jruby:jruby-stdlib:${project.version}'
 
+  build do
+    final_name "#{model.artifact_id}-#{version.sub(/-SNAPSHOT/,'')}"
+  end
+
   plugin( 'org.apache.felix:maven-bundle-plugin',
           :archive => {
             :manifest => {

maven/jruby-complete/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-artifacts</artifactId>
-    <version>9000.dev</version>
+    <version>9000.dev-SNAPSHOT</version>
   </parent>
   <artifactId>jruby-complete</artifactId>
   <packaging>bundle</packaging>
@@ -53,6 +53,7 @@
     </dependency>
   </dependencies>
   <build>
+    <finalName>jruby-complete-9000.dev</finalName>
     <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>

maven/jruby-dist/pom.rb

@@ -42,6 +42,7 @@
 
   phase :package do
     plugin( :assembly, '2.4',
+            'finalName' => "#{model.artifact_id}-#{version.sub(/-SNAPSHOT/, '')}",
             'tarLongFileMode' =>  'gnu',
             'descriptors' => [ 'src/main/assembly/jruby.xml' ] ) do
       execute_goals( 'single' )
@@ -109,7 +110,7 @@
 
       revision = `git show`.gsub( /\n.*|commit /, '' )
 
-      basefile = "#{ctx.project.build.directory}/#{ctx.project.artifactId}-#{ctx.project.version}-src"
+      basefile = "#{ctx.project.build.directory}/#{ctx.project.artifactId}-#{ctx.project.version}-src".sub(/-SNAPSHOT/, '')
 
       FileUtils.cd( File.join( ctx.project.basedir.to_s, '..', '..' ) ) do
         [ 'tar', 'zip' ].each do |format|

maven/jruby-dist/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-artifacts</artifactId>
-    <version>9000.dev</version>
+    <version>9000.dev-SNAPSHOT</version>
   </parent>
   <artifactId>jruby-dist</artifactId>
   <packaging>pom</packaging>
@@ -56,6 +56,7 @@
           </execution>
         </executions>
         <configuration>
+          <finalName>jruby-dist-9000.dev</finalName>
           <tarLongFileMode>gnu</tarLongFileMode>
           <descriptors>
             <descriptor>src/main/assembly/jruby.xml</descriptor>

maven/jruby-jars/Mavenfile

@@ -7,7 +7,7 @@ name "JRuby Jars Gem"
 gemspec :include_jars => true
 
 version = File.read( File.join( basedir, '..', '..', 'VERSION' ) ).strip
-version.gsub!( /-SNAPSHOT$/, '' )
+
 # overwrite the version from gemspec
 model.version = version
 inherit "org.jruby:jruby-artifacts:#{model.version}"
@@ -60,4 +60,8 @@ end
 
 plugin( :invoker )
 
+build do
+  final_name "#{model.artifact_id}-#{version.sub(/-SNAPSHOT/, '')}"
+end
+
 # vim: syntax=Ruby

maven/jruby-jars/jruby-jars.gemspec

@@ -1,22 +1,29 @@
 #-*- mode: ruby -*-
 
-require 'rake'
 require 'rexml/document'
 require 'rexml/xpath'
 
 version = File.read( File.join( File.dirname(File.expand_path(__FILE__)), '..', '..', 'VERSION' ) ).strip
-version.gsub!( /-SNAPSHOT$/, '' )
+
+File.open( 'lib/jruby-jars/version.rb', 'w' ) do |f|
+  f.print <<EOF
+module JRubyJars
+  VERSION = '#{version.sub( /-SNAPSHOT$/, '' )}'
+  MAVEN_VERSION = '#{version}'
+end
+EOF
+end
 
 Gem::Specification.new do |s|
   s.name = 'jruby-jars'
-  s.version = version.sub( /.SNAPSHOT/, '.SNAPSHOT' )
+  s.version = version.sub( /-SNAPSHOT$/, '' )
   s.authors = ['Charles Oliver Nutter']
   s.email = "headius@headius.com"
   s.summary = "The core JRuby code and the JRuby stdlib as jar files."
   s.homepage = 'http://github.com/jruby/jruby/tree/master/gem/jruby-jars'
   s.description = File.read('README.txt', encoding: "UTF-8").split(/\n{2,}/)[3]
   s.rubyforge_project = 'jruby/jruby'
-  s.files = FileList['[A-Z]*', 'lib/**/*.rb', "lib/**/jruby-*-#{version}*.jar", 'test/**/*'].to_a
+  s.files = Dir['[A-Z]*'] + Dir['lib/**/*.rb'] + Dir[ "lib/**/jruby-*-#{version}*.jar" ] + Dir[ 'test/**/*']
 end
 
 # vim: syntax=Ruby

maven/jruby-jars/lib/jruby-jars.rb

@@ -4,10 +4,10 @@ module JRubyJars
   PATH = File.expand_path(File.dirname(__FILE__))
 
   def self.core_jar_path
-    Dir[ PATH + "/jruby-core-complete-#{JRubyJars::VERSION}.jar" ].first
+    Dir[ PATH + "/jruby-core-complete-#{JRubyJars::MAVEN_VERSION}.jar" ].first
   end
 
   def self.stdlib_jar_path
-    Dir[ PATH + "/jruby-stdlib-#{JRubyJars::VERSION}.jar" ].first
+    Dir[ PATH + "/jruby-stdlib-#{JRubyJars::MAVEN_VERSION}.jar" ].first
   end
 end

maven/jruby-jars/lib/jruby-jars/version.rb

@@ -1,3 +1,4 @@
 module JRubyJars
-  VERSION = Dir[ File.expand_path(File.dirname(File.dirname(__FILE__))) + '/jruby-core-complete-*jar' ].first.gsub( /^.*jruby-core-complete-|.jar$/, '' )
+  VERSION = '9000.dev'
+  MAVEN_VERSION = '9000.dev-SNAPSHOT'
 end

maven/jruby-jars/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-artifacts</artifactId>
-    <version>9000.dev</version>
+    <version>9000.dev-SNAPSHOT</version>
   </parent>
   <groupId>rubygems</groupId>
   <artifactId>jruby-jars</artifactId>
@@ -25,12 +25,6 @@ freezing to) a specific jruby-complete jar version.</description>
     <tesla.version>0.0.9</tesla.version>
   </properties>
   <dependencies>
-    <dependency>
-      <groupId>rubygems</groupId>
-      <artifactId>rake</artifactId>
-      <version>[0,)</version>
-      <type>gem</type>
-    </dependency>
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby-stdlib</artifactId>
@@ -52,6 +46,7 @@ freezing to) a specific jruby-complete jar version.</description>
       </extension>
     </extensions>
     <directory>${basedir}/pkg</directory>
+    <finalName>jruby-jars-9000.dev</finalName>
     <plugins>
       <plugin>
         <groupId>de.saumya.mojo</groupId>

maven/jruby-noasm/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-artifacts</artifactId>
-    <version>9000.dev</version>
+    <version>9000.dev-SNAPSHOT</version>
   </parent>
   <artifactId>jruby-noasm</artifactId>
   <name>JRuby Main Maven Artifact With ASM Relocated</name>

maven/jruby-stdlib/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-artifacts</artifactId>
-    <version>9000.dev</version>
+    <version>9000.dev-SNAPSHOT</version>
   </parent>
   <artifactId>jruby-stdlib</artifactId>
   <name>JRuby Stdlib</name>

maven/jruby/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-artifacts</artifactId>
-    <version>9000.dev</version>
+    <version>9000.dev-SNAPSHOT</version>
   </parent>
   <artifactId>jruby</artifactId>
   <name>JRuby Main Maven Artifact</name>

maven/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-parent</artifactId>
-    <version>9000.dev</version>
+    <version>9000.dev-SNAPSHOT</version>
   </parent>
   <artifactId>jruby-artifacts</artifactId>
   <packaging>pom</packaging>

pom.xml

@@ -9,7 +9,7 @@
   </parent>
   <groupId>org.jruby</groupId>
   <artifactId>jruby-parent</artifactId>
-  <version>9000.dev</version>
+  <version>9000.dev-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>JRuby</name>
   <description>JRuby is the effort to recreate the Ruby (http://www.ruby-lang.org) interpreter in Java.</description>