jruby · Nov 5, 2014 · Nov 5, 2014 · Nov 5, 2014 · Nov 6, 2014 · Nov 6, 2014
diff --git a/.travis.yml b/.travis.yml
@@ -30,6 +30,7 @@ env:
     - TARGET='-Prake -Dtask=spec:ruby:fast'
     - TARGET='-Prake -Dtask=spec:jruby'
     - TARGET='-Prake -Dtask=spec:jrubyc'
+    - TARGET='-Prake -Dtask=spec:profiler'
     - TARGET='-Ptruffle-specs-language'
     - TARGET='-Ptruffle-specs-core'
 
@@ -53,6 +54,7 @@ matrix:
     - env: TARGET='-Pcomplete'
     - env: TARGET='-Prake -Dtask=spec:jrubyc'
     - env: TARGET='-Pj2ee'
+    - env: TARGET='-Prake -Dtask=spec:profiler'
 
 branches:
   only:

diff --git a/BUILDING.md b/BUILDING.md
@@ -327,7 +327,7 @@ rake maven:dump_poms
 
 about the ruby DSL for those poms just look in the existing pom.rb/Mavenfile files - there are plenty of examples for all kind of situations. (more documentation to come).
 
-regular maven uses the the jruby from the installation, i.e. 9000.dev. this also means that a regular maven run does not depend under the hood on any other jruby versions from maven central.
+regular maven uses the the jruby from the installation, i.e. 9.0.0.0.dev. this also means that a regular maven run does not depend under the hood on any other jruby versions from maven central.
 
 at some parts there are **inline** plugins in **pom.rb** or **Mavenfile** which will work directly with regular maven where there is a special plugin running those ruby parts. see **./lib/pom.rb**.
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-9000.dev-SNAPSHOT
+9.0.0.0.dev-SNAPSHOT
diff --git a/core/pom.rb b/core/pom.rb
@@ -35,7 +35,7 @@
   jar 'com.github.jnr:jnr-enxio:0.4'
   jar 'com.github.jnr:jnr-x86asm:1.0.2'
   jar 'com.github.jnr:jnr-unixsocket:0.3'
-  jar 'com.github.jnr:jnr-posix:3.0.7-SNAPSHOT'
+  jar 'com.github.jnr:jnr-posix:3.0.7'
   jar 'com.github.jnr:jnr-constants:0.8.6-SNAPSHOT'
   jar 'com.github.jnr:jnr-ffi:2.0.0-SNAPSHOT'
   jar 'com.github.jnr:jffi:${jffi.version}'

diff --git a/core/pom.xml b/core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-parent</artifactId>
-    <version>9000.dev-SNAPSHOT</version>
+    <version>9.0.0.0.dev-SNAPSHOT</version>
   </parent>
   <artifactId>jruby-core</artifactId>
   <name>JRuby Core</name>
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>com.github.jnr</groupId>
       <artifactId>jnr-posix</artifactId>
-      <version>3.0.7-SNAPSHOT</version>
+      <version>3.0.7</version>
     </dependency>
     <dependency>
       <groupId>com.github.jnr</groupId>

diff --git a/ext/pom.xml b/ext/pom.xml
@@ -5,17 +5,9 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-parent</artifactId>
-<<<<<<< HEAD
-    <version>9000.dev-SNAPSHOT</version>
-=======
-    <version>1.7.17-SNAPSHOT</version>
->>>>>>> jruby-1_7
+    <version>9.0.0.0.dev-SNAPSHOT</version>
   </parent>
   <artifactId>jruby-ext</artifactId>
-<<<<<<< HEAD
-=======
-  <version>1.7.17-SNAPSHOT</version>
->>>>>>> jruby-1_7
   <packaging>pom</packaging>
   <name>JRuby Ext</name>
   <modules>

diff --git a/ext/readline/pom.xml b/ext/readline/pom.xml
@@ -5,11 +5,7 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-ext</artifactId>
-<<<<<<< HEAD
-    <version>9000.dev-SNAPSHOT</version>
-=======
-    <version>1.7.17-SNAPSHOT</version>
->>>>>>> jruby-1_7
+    <version>9.0.0.0.dev-SNAPSHOT</version>
   </parent>
   <groupId>rubygems</groupId>
   <artifactId>jruby-readline</artifactId>

diff --git a/ext/ripper/pom.xml b/ext/ripper/pom.xml
@@ -5,21 +5,12 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-ext</artifactId>
-<<<<<<< HEAD
-    <version>9000.dev-SNAPSHOT</version>
+    <version>9.0.0.0.dev-SNAPSHOT</version>
   </parent>
   <groupId>rubygems</groupId>
   <artifactId>jruby-ripper</artifactId>
   <version>2.1.0.dev-SNAPSHOT</version>
   <packaging>gem</packaging>
-=======
-    <version>1.7.17-SNAPSHOT</version>
-  </parent>
-  <artifactId>ripper</artifactId>
-  <version>1.7.17-SNAPSHOT</version>
-  <packaging>jar</packaging>
-
->>>>>>> jruby-1_7
   <name>JRuby Ripper</name>
   <description>ripper extension for JRuby</description>
   <url>https://github.com/jruby/jruby</url>

diff --git a/lib/pom.xml b/lib/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-parent</artifactId>
-    <version>9000.dev-SNAPSHOT</version>
+    <version>9.0.0.0.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-SNAPSHOT</version>
+      <version>9.0.0.0.dev-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>rubygems</groupId>

diff --git a/maven/jruby-complete/pom.xml b/maven/jruby-complete/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-artifacts</artifactId>
-    <version>9000.dev-SNAPSHOT</version>
+    <version>9.0.0.0.dev-SNAPSHOT</version>
   </parent>
   <artifactId>jruby-complete</artifactId>
   <packaging>bundle</packaging>

diff --git a/maven/jruby-dist/pom.xml b/maven/jruby-dist/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-artifacts</artifactId>
-    <version>9000.dev-SNAPSHOT</version>
+    <version>9.0.0.0.dev-SNAPSHOT</version>
   </parent>
   <artifactId>jruby-dist</artifactId>
   <packaging>pom</packaging>
@@ -27,7 +27,7 @@
     </dependency>
   </dependencies>
   <build>
-    <finalName>jruby-dist-9000.dev</finalName>
+    <finalName>jruby-dist-9.0.0.0.dev</finalName>
     <plugins>
       <plugin>
         <groupId>de.saumya.mojo</groupId>

diff --git a/maven/jruby-jars/lib/jruby-jars/version.rb b/maven/jruby-jars/lib/jruby-jars/version.rb
@@ -1,4 +1,4 @@
 module JRubyJars
-  VERSION = '9000.dev'
-  MAVEN_VERSION = '9000.dev-SNAPSHOT'
+  VERSION = '9.0.0.0.dev'
+  MAVEN_VERSION = '9.0.0.0.dev-SNAPSHOT'
 end
diff --git a/maven/jruby-jars/pom.xml b/maven/jruby-jars/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-artifacts</artifactId>
-    <version>9000.dev-SNAPSHOT</version>
+    <version>9.0.0.0.dev-SNAPSHOT</version>
   </parent>
   <groupId>rubygems</groupId>
   <artifactId>jruby-jars</artifactId>
@@ -67,7 +67,7 @@ freezing to) a specific jruby-complete jar version.</description>
       </extension>
     </extensions>
     <directory>${basedir}/pkg</directory>
-    <finalName>${project.artifactId}-9000.dev</finalName>
+    <finalName>${project.artifactId}-9.0.0.0.dev</finalName>
     <plugins>
       <plugin>
         <groupId>de.saumya.mojo</groupId>
@@ -114,7 +114,7 @@ freezing to) a specific jruby-complete jar version.</description>
         <artifactId>maven-invoker-plugin</artifactId>
         <configuration>
           <properties>
-            <ruby.version>9000.dev</ruby.version>
+            <ruby.version>9.0.0.0.dev</ruby.version>
             <gem.home>${project.build.directory}/rubygems</gem.home>
             <gem.path>${project.build.directory}/rubygems</gem.path>
           </properties>

diff --git a/maven/jruby-noasm/pom.xml b/maven/jruby-noasm/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-artifacts</artifactId>
-    <version>9000.dev-SNAPSHOT</version>
+    <version>9.0.0.0.dev-SNAPSHOT</version>
   </parent>
   <artifactId>jruby-noasm</artifactId>
   <name>JRuby Main Maven Artifact With ASM Relocated</name>

diff --git a/maven/jruby-stdlib/pom.xml b/maven/jruby-stdlib/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-artifacts</artifactId>
-    <version>9000.dev-SNAPSHOT</version>
+    <version>9.0.0.0.dev-SNAPSHOT</version>
   </parent>
   <artifactId>jruby-stdlib</artifactId>
   <name>JRuby Stdlib</name>

diff --git a/maven/jruby/pom.xml b/maven/jruby/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-artifacts</artifactId>
-    <version>9000.dev-SNAPSHOT</version>
+    <version>9.0.0.0.dev-SNAPSHOT</version>
   </parent>
   <artifactId>jruby</artifactId>
   <name>JRuby Main Maven Artifact</name>

diff --git a/maven/pom.xml b/maven/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-parent</artifactId>
-    <version>9000.dev-SNAPSHOT</version>
+    <version>9.0.0.0.dev-SNAPSHOT</version>
   </parent>
   <artifactId>jruby-artifacts</artifactId>
   <packaging>pom</packaging>

diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
   </parent>
   <groupId>org.jruby</groupId>
   <artifactId>jruby-parent</artifactId>
-  <version>9000.dev-SNAPSHOT</version>
+  <version>9.0.0.0.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>

diff --git a/test/pom.xml b/test/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-parent</artifactId>
-    <version>9000.dev-SNAPSHOT</version>
+    <version>9.0.0.0.dev-SNAPSHOT</version>
   </parent>
   <artifactId>jruby-tests</artifactId>
   <name>JRuby Integration Tests</name>

diff --git a/tool/build-graal-bundles.sh b/tool/build-graal-bundles.sh
@@ -6,35 +6,35 @@
 # configuration.
 
 # Takes no arguments. Produces:
-#    * jruby-dist-9000+graal-linux-x86_64.dev-bin.tar.gz
-#    * jruby-dist-9000+graal-macosx-x86_64.dev-bin.tar.gz
+#    * jruby-dist-9.0.0.0+graal-linux-x86_64.dev-bin.tar.gz
+#    * jruby-dist-9.0.0.0+graal-macosx-x86_64.dev-bin.tar.gz
 # which are the artifacts to be published.
 
 # Run in the root directory. Run -Pdist first.
 
-tar -zxf maven/jruby-dist/target/jruby-dist-9000.dev-bin.tar.gz || exit $?
-mv jruby-9000.dev-SNAPSHOT jruby-9000.dev || exit $?
+tar -zxf maven/jruby-dist/target/jruby-dist-9.0.0.0.dev-bin.tar.gz || exit $?
+mv jruby-9.0.0.0.dev-SNAPSHOT jruby-9.0.0.0.dev || exit $?
 
 # Remove files we aren't going to patch so people don't use them by mistake
 
-rm jruby-9000.dev/bin/*.bat jruby-9000.dev/bin/*.sh jruby-9000.dev/bin/*.bash jruby-9000.dev/bin/*.exe jruby-9000.dev/bin/*.dll
+rm jruby-9.0.0.0.dev/bin/*.bat jruby-9.0.0.0.dev/bin/*.sh jruby-9.0.0.0.dev/bin/*.bash jruby-9.0.0.0.dev/bin/*.exe jruby-9.0.0.0.dev/bin/*.dll
 
 # Patch the jruby bash script to set JAVACMD and JRUBY_OPTS
 
 sed -i.backup 's|if \[ -z "\$JAVACMD" \] ; then|# Modifications for distribution with Graal\
 JAVACMD=\"\$JRUBY_HOME/graalvm-jdk1.8.0/bin/java\"\
 JRUBY_OPTS=\"-J-server -J-d64 \$JRUBY_OPTS\"\
 \
-if [ -z "$JAVACMD" ] ; then|' jruby-9000.dev/bin/jruby
+if [ -z "$JAVACMD" ] ; then|' jruby-9.0.0.0.dev/bin/jruby
 
-if diff jruby-9000.dev/bin/jruby jruby-9000.dev/bin/jruby.backup >/dev/null ; then
+if diff jruby-9.0.0.0.dev/bin/jruby jruby-9.0.0.0.dev/bin/jruby.backup >/dev/null ; then
   echo "patch didn't work"
   exit 1
 fi
 
-rm jruby-9000.dev/bin/jruby.backup
+rm jruby-9.0.0.0.dev/bin/jruby.backup
 
-chmod +x jruby-9000.dev/bin/jruby || exit $?
+chmod +x jruby-9.0.0.0.dev/bin/jruby || exit $?
 
 function pack {
     # $1 ... platform (linux, ...)
@@ -49,10 +49,10 @@ function pack {
 
     tar -zxf $buildname || exit $?
     chmod -R +w graalvm-jdk1.8.0
-    cp -r graalvm-jdk1.8.0 jruby-9000.dev || exit $?
-    rm -rf jruby-9000.dev/graalvm-jdk1.8.0/src.zip jruby-9000.dev/graalvm-jdk1.8.0/demo jruby-9000.dev/graalvm-jdk1.8.0/include jruby-9000.dev/graalvm-jdk1.8.0/sample
-    targetname=jruby-dist-9000+graal-$1-x86_64.dev-bin.tar.gz
-    tar -zcf $targetname jruby-9000.dev || exit $?
+    cp -r graalvm-jdk1.8.0 jruby-9.0.0.0.dev || exit $?
+    rm -rf jruby-9.0.0.0.dev/graalvm-jdk1.8.0/src.zip jruby-9.0.0.0.dev/graalvm-jdk1.8.0/demo jruby-9.0.0.0.dev/graalvm-jdk1.8.0/include jruby-9.0.0.0.dev/graalvm-jdk1.8.0/sample
+    targetname=jruby-dist-9.0.0.0+graal-$1-x86_64.dev-bin.tar.gz
+    tar -zcf $targetname jruby-9.0.0.0.dev || exit $?
     shasum -a 1 $targetname > $targetname.sha1
 }
 

diff --git a/tool/remove-bundled-truffle.sh b/tool/remove-bundled-truffle.sh
@@ -7,10 +7,10 @@
 # You will want to run mvn -Pcomplete first.
 
 # Takes no arguments. Modifies a copy of
-# maven/jruby-complete/target/jruby-complete-9000.dev.jar to create
-# maven/jruby-complete/target/jruby-complete-no-truffle-9000.dev.jar.
+# maven/jruby-complete/target/jruby-complete-9.0.0.0.dev.jar to create
+# maven/jruby-complete/target/jruby-complete-no-truffle-9.0.0.0.dev.jar.
 
 # Chris Seaton, 5 Aug 14
 
-cp maven/jruby-complete/target/jruby-complete-9000.dev-SNAPSHOT.jar maven/jruby-complete/target/jruby-complete-no-truffle-9000.dev-SNAPSHOT.jar
-zip -d maven/jruby-complete/target/jruby-complete-no-truffle-9000.dev-SNAPSHOT.jar com/oracle/nfi/* com/oracle/truffle/*
+cp maven/jruby-complete/target/jruby-complete-9.0.0.0.dev-SNAPSHOT.jar maven/jruby-complete/target/jruby-complete-no-truffle-9.0.0.0.dev-SNAPSHOT.jar
+zip -d maven/jruby-complete/target/jruby-complete-no-truffle-9.0.0.0.dev-SNAPSHOT.jar com/oracle/nfi/* com/oracle/truffle/*