jruby · Dec 10, 2014 · Dec 10, 2014 · Dec 10, 2014
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.7.17
+1.7.18-SNAPSHOT
diff --git a/antlib/extra.xml b/antlib/extra.xml
@@ -25,13 +25,14 @@ build jruby-complete.jar
 <env key='GEM_PATH' value='lib/ruby/gems/shared'/>
 <arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
 <arg value='-cp'/>
-<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-1.7.17-SNAPSHOT.jar'/>
+<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-1.7.18-SNAPSHOT.jar'/>
 <arg value='org.jruby.Main'/>
 <arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
 <arg value='-r./test/ruby19_env.rb'/>
 <arg value='-rminitest/excludes'/>
 <arg value='lib/ruby/gems/shared/gems/rake-10.1.0/lib/rake/rake_test_loader.rb'/>
 <arg value='test/test_globals.rb'/>
+<arg value='test/test_adding_pem_to_x509store.rb'/>
 <arg value='test/test_argf.rb'/>
 <arg value='test/test_array.rb'/>
 <arg value='test/test_autoload.rb'/>
@@ -136,7 +137,7 @@ build jruby-complete.jar
 <env key='GEM_PATH' value='lib/ruby/gems/shared'/>
 <arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
 <arg value='-cp'/>
-<arg value='core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-1.7.17-SNAPSHOT.jar'/>
+<arg value='core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-1.7.18-SNAPSHOT.jar'/>
 <arg value='org.jruby.Main'/>
 <arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
 <arg value='-r./test/ruby19_env.rb'/>
@@ -152,7 +153,7 @@ build jruby-complete.jar
 <env key='GEM_PATH' value='lib/ruby/gems/shared'/>
 <arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
 <arg value='-cp'/>
-<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-1.7.17-SNAPSHOT.jar'/>
+<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-1.7.18-SNAPSHOT.jar'/>
 <arg value='org.jruby.Main'/>
 <arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
 <arg value='-r./test/ruby19_env.rb'/>
@@ -168,7 +169,7 @@ build jruby-complete.jar
 <env key='GEM_PATH' value='lib/ruby/gems/shared'/>
 <arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
 <arg value='-cp'/>
-<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-1.7.17-SNAPSHOT.jar'/>
+<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-1.7.18-SNAPSHOT.jar'/>
 <arg value='org.jruby.Main'/>
 <arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
 <arg value='-r./test/ruby19_env.rb'/>
@@ -460,7 +461,7 @@ build jruby-complete.jar
 <env key='GEM_PATH' value='lib/ruby/gems/shared'/>
 <arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
 <arg value='-cp'/>
-<arg value='core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-1.7.17-SNAPSHOT.jar'/>
+<arg value='core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-1.7.18-SNAPSHOT.jar'/>
 <arg value='org.jruby.Main'/>
 <arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
 <arg value='-r./test/ruby19_env.rb'/>

diff --git a/core/pom.xml b/core/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-parent</artifactId>
-    <version>1.7.17</version>
+    <version>1.7.18-SNAPSHOT</version>
   </parent>
   <artifactId>jruby-core</artifactId>
   <packaging>jar</packaging>

diff --git a/docs/man/pom.xml b/docs/man/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.jruby</groupId>
         <artifactId>docs</artifactId>
-        <version>1.7.17</version>
+        <version>1.7.18-SNAPSHOT</version>
     </parent>
 
     <groupId>org.jruby</groupId>

diff --git a/docs/pom.xml b/docs/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-parent</artifactId>
-    <version>1.7.17</version>
+    <version>1.7.18-SNAPSHOT</version>
   </parent>
 
   <groupId>org.jruby</groupId>

diff --git a/ext/pom.xml b/ext/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-parent</artifactId>
-    <version>1.7.17</version>
+    <version>1.7.18-SNAPSHOT</version>
   </parent>
   <groupId>org.jruby</groupId>
   <artifactId>jruby-ext</artifactId>
-  <version>1.7.17</version>
+  <version>1.7.18-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>JRuby Ext</name>

diff --git a/ext/readline/pom.xml b/ext/readline/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-ext</artifactId>
-    <version>1.7.17</version>
+    <version>1.7.18-SNAPSHOT</version>
   </parent>
   <artifactId>readline</artifactId>
   <version>1.0</version>

diff --git a/ext/ripper/pom.xml b/ext/ripper/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-ext</artifactId>
-    <version>1.7.17</version>
+    <version>1.7.18-SNAPSHOT</version>
   </parent>
   <artifactId>ripper</artifactId>
-  <version>1.7.17</version>
+  <version>1.7.18-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>JRuby Ripper</name>

diff --git a/lib/pom.rb b/lib/pom.rb
@@ -59,8 +59,7 @@ def to_pathname
     end
   end
 
-  doc = REXML::Document.new File.new(File.join( basedir, '../pom.xml'))
-  version = REXML::XPath.first(doc, "//project/version").text
+  version = File.read( File.join( basedir, '..', 'VERSION' ) ).strip
 
   model_version '4.0.0'
   id 'jruby-lib'

diff --git a/lib/pom.xml b/lib/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-parent</artifactId>
-    <version>1.7.17</version>
+    <version>1.7.18-SNAPSHOT</version>
   </parent>
   <artifactId>jruby-lib</artifactId>
   <packaging>pom</packaging>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby-core</artifactId>
-      <version>1.7.17</version>
+      <version>1.7.18-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>1.7.17</version>
+    <version>1.7.18-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>1.7.17</version>
+    <version>1.7.18-SNAPSHOT</version>
   </parent>
   <artifactId>jruby-dist</artifactId>
   <packaging>pom</packaging>
@@ -78,7 +78,7 @@
           </execution>
         </executions>
         <configuration>
-          <finalName>jruby-dist-1.7.17</finalName>
+          <finalName>jruby-dist-1.7.18</finalName>
           <tarLongFileMode>gnu</tarLongFileMode>
           <descriptors>
             <descriptor>src/main/assembly/jruby.xml</descriptor>

diff --git a/maven/jruby-jars/.gitignore b/maven/jruby-jars/.gitignore
@@ -1,4 +1,4 @@
 lib/*jar
 pkg
 pom.jruby-jars.gemspec.xml
-
+lib/jruby-jars/version.rb
diff --git a/maven/jruby-jars/lib/jruby-jars/version.rb b/maven/jruby-jars/lib/jruby-jars/version.rb
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>1.7.17</version>
+    <version>1.7.18-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}-${project.version}</finalName>
+    <finalName>${project.artifactId}-1.7.18.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>1.7.17.dev</ruby.version>
+            <ruby.version>1.7.18.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>1.7.17</version>
+    <version>1.7.18-SNAPSHOT</version>
   </parent>
   <artifactId>jruby-noasm</artifactId>
   <packaging>bundle</packaging>

diff --git a/maven/jruby-rake-plugin/pom.xml b/maven/jruby-rake-plugin/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-artifacts</artifactId>
-    <version>1.7.17</version>
+    <version>1.7.18-SNAPSHOT</version>
   </parent>
   <groupId>org.jruby.plugins</groupId>
   <artifactId>jruby-rake-plugin</artifactId>

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>1.7.17</version>
+    <version>1.7.18-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>1.7.17</version>
+    <version>1.7.18-SNAPSHOT</version>
   </parent>
   <artifactId>jruby</artifactId>
   <packaging>bundle</packaging>

diff --git a/maven/pom.rb b/maven/pom.rb
@@ -3,8 +3,8 @@
   version = File.read( File.join( basedir, '..', 'VERSION' ) ).strip
 
   model_version '4.0.0'
-  id "org.jruby:jruby-artifacts:#{version}"
-  inherit "org.jruby:jruby-parent:#{version}"
+  id 'jruby-artifacts'
+  inherit 'org.jruby:jruby-parent', version
   packaging 'pom'
 
   properties( 'tesla.dump.pom' => 'pom.xml',
@@ -24,7 +24,7 @@
 
   # module to profile map
   map = { 'jruby' => [ :release, :main, :osgi, :j2ee ],
-    'jruby-noasm' => [ :release, :main ],
+    'jruby-noasm' => [ :release, :main, :osgi ],
     'jruby-stdlib' => [ :release, :main, :complete, :dist, 'jruby-jars', :osgi, :j2ee ],
     'jruby-complete' => [ :release, :complete, :osgi ],
     'jruby-dist' => [ :release, :dist ],

diff --git a/maven/pom.xml b/maven/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-parent</artifactId>
-    <version>1.7.17</version>
+    <version>1.7.18-SNAPSHOT</version>
   </parent>
   <artifactId>jruby-artifacts</artifactId>
   <packaging>pom</packaging>
@@ -82,8 +82,8 @@
       <id>osgi</id>
       <modules>
         <module>jruby</module>
-        <module>jruby-stdlib</module>
         <module>jruby-noasm</module>
+        <module>jruby-stdlib</module>
         <module>jruby-complete</module>
       </modules>
     </profile>

diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
   <groupId>org.jruby</groupId>
   <artifactId>jruby-parent</artifactId>
-  <version>1.7.17</version>
+  <version>1.7.18-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>JRuby</name>

diff --git a/test/pom.rb b/test/pom.rb
@@ -44,8 +44,8 @@ def create_target( name, complete )
   version = File.read( File.join( basedir, '..', 'VERSION' ) ).strip
 
   model_version '4.0.0'
-  id "org.jruby:jruby-tests:#{version}"
-  inherit "org.jruby:jruby-parent:#{version}"
+  id 'jruby-tests'
+  inherit 'org.jruby:jruby-parent', version
   packaging 'jar'
 
   repository( :id => 'rubygems-releases',

diff --git a/test/pom.xml b/test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-parent</artifactId>
-    <version>1.7.17</version>
+    <version>1.7.18-SNAPSHOT</version>
   </parent>
   <artifactId>jruby-tests</artifactId>
   <packaging>jar</packaging>