psych as default gem

needed to adjust a junit test in core/ since it assumed to have psych installed in lib/ruby/stdlib which is not the case at this point of the build cycle
jruby · Feb 26, 2015 · dbd3065 · dbd3065
1 parent 0f29341
commit dbd3065
Show file tree

Hide file tree

Showing 9 changed files with 115 additions and 19 deletions.
diff --git a/core/src/test/java/org/jruby/embed/ScriptingContainerTest.java b/core/src/test/java/org/jruby/embed/ScriptingContainerTest.java
@@ -90,7 +90,7 @@ public class ScriptingContainerTest {
     static OutputStream outStream = null;
     PrintStream pstream = null;
     FileWriter writer = null;
-    String basedir = new File(System.getProperty("user.dir")).getParent();
+    String basedir = System.getProperty("jruby.home");
 
     public ScriptingContainerTest() {
     }
@@ -1048,7 +1048,6 @@ public void testCallMethod_4args_3() {
         Class<Object> returnType = null;
         EmbedEvalUnit unit = null;
         ScriptingContainer instance = new ScriptingContainer(LocalContextScope.THREADSAFE, LocalVariableBehavior.PERSISTENT);
-        instance.setHomeDirectory(basedir);
         instance.setError(pstream);
         instance.setOutput(pstream);
         instance.setWriter(writer);
@@ -1074,7 +1073,7 @@ public void testCallMethod_4args_3() {
         Object receiver = unit.run();
         instance.callMethod(instance.getProvider().getRuntime().getTopSelf(), "dump", null, unit);
         Object expResult =
-                "songs: Hey Soul Sister, Who Says, Apologize\npodcasts: Java Posse, Stack Overflow\n";
+                "songs: Hey Soul Sister Who Says Apologizepodcasts: Java Posse Stack Overflow\n";
         assertEquals(expResult, sw.toString());
 
         instance.getVarMap().clear();

diff --git a/core/src/test/ruby/org/jruby/embed/ruby/yaml_dump.rb b/core/src/test/ruby/org/jruby/embed/ruby/yaml_dump.rb
@@ -1,8 +1,7 @@
 # yaml_dump.rb [embed]
 
-require 'yaml'
+# no use of yaml since psych is not installed at this point of the tests
 
 def dump
-  content = YAML::load @text
-  content.each { |k, v| puts "#{k}: #{v.join(", ")}" }
-end
+  puts @text.gsub( /\n/m, '' ).gsub( /-/, '')
+end
diff --git a/lib/pom.rb b/lib/pom.rb
@@ -26,10 +26,11 @@ def version
    ImportedGem.new( 'rake', 'rake.version', true ),
    ImportedGem.new( 'rdoc', 'rdoc.version', true ),
    ImportedGem.new( 'json', 'json.version', true ),
-   ImportedGem.new( 'jar-dependencies', '0.1.2', true ),
+   ImportedGem.new( 'jar-dependencies', '0.1.8', true ),
    ImportedGem.new( 'minitest', 'minitest.version', true ),
    ImportedGem.new( 'test-unit', 'test-unit.version', true ),
-   ImportedGem.new( 'power_assert', 'power_assert.version', true )
+   ImportedGem.new( 'power_assert', 'power_assert.version', true ),
+   ImportedGem.new( 'psych', '2.0.9-SNAPSHOT', true )
   ]
 
 project 'JRuby Lib Setup' do
@@ -68,7 +69,7 @@ def to_pathname
   end
 
   # just depends on jruby-core so we are sure the jruby.jar is in place
-  jar "org.jruby:jruby-core:#{version}"
+  jar "org.jruby:jruby-core:#{version}", :scope => 'provided'
 
   repository( :url => 'http://rubygems-proxy.torquebox.org/releases',
               :id => 'rubygems-releases' )
@@ -81,14 +82,20 @@ def to_pathname
 
   # tell maven to download the respective gem artifacts
   default_gems.each do |g|
-    gem g.name, g.version
+    dependency 'rubygems', g.name, g.version, :type => 'gem' do
+      exclusion 'rubygems:jar-dependencies'
+    end
   end
 
   # this is not an artifact for maven central
   plugin :deploy, :skip => true
 
   gem 'ruby-maven', '3.1.1.0.8', :scope => :provided
 
+  plugin :dependency, :useRepositoryLayout => true, :outputDirectory => 'ruby/stdlib', :excludeGroupIds => 'rubygems', :includeScope => :runtime do
+    execute_goal 'copy-dependencies', :phase => 'package'
+  end
+
   execute :install_gems, :'package' do |ctx|
     require 'fileutils'
 
@@ -127,6 +134,7 @@ def to_pathname
     require 'rubygems/package'
 
     puts 'install gems unless already installed'
+    ENV_JAVA['jars.skip'] = 'true'
     ctx.project.artifacts.select do |a|
       a.group_id == 'rubygems' || a.group_id == 'org.jruby.gems'
     end.each do |a|

diff --git a/lib/pom.xml b/lib/pom.xml
@@ -21,66 +21,139 @@
       <groupId>org.jruby</groupId>
       <artifactId>jruby-core</artifactId>
       <version>9.0.0.0-SNAPSHOT</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>jruby-openssl</artifactId>
       <version>0.9.6</version>
       <type>gem</type>
+      <exclusions>
+        <exclusion>
+          <artifactId>jar-dependencies</artifactId>
+          <groupId>rubygems</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>jruby-readline</artifactId>
       <version>1.0.dev-SNAPSHOT</version>
       <type>gem</type>
+      <exclusions>
+        <exclusion>
+          <artifactId>jar-dependencies</artifactId>
+          <groupId>rubygems</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>jruby-ripper</artifactId>
       <version>2.1.0.dev-SNAPSHOT</version>
       <type>gem</type>
+      <exclusions>
+        <exclusion>
+          <artifactId>jar-dependencies</artifactId>
+          <groupId>rubygems</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>rake</artifactId>
       <version>${rake.version}</version>
       <type>gem</type>
+      <exclusions>
+        <exclusion>
+          <artifactId>jar-dependencies</artifactId>
+          <groupId>rubygems</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>rdoc</artifactId>
       <version>${rdoc.version}</version>
       <type>gem</type>
+      <exclusions>
+        <exclusion>
+          <artifactId>jar-dependencies</artifactId>
+          <groupId>rubygems</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>json</artifactId>
       <version>${json.version}</version>
       <type>gem</type>
+      <exclusions>
+        <exclusion>
+          <artifactId>jar-dependencies</artifactId>
+          <groupId>rubygems</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>jar-dependencies</artifactId>
-      <version>0.1.2</version>
+      <version>0.1.8</version>
       <type>gem</type>
+      <exclusions>
+        <exclusion>
+          <artifactId>jar-dependencies</artifactId>
+          <groupId>rubygems</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>minitest</artifactId>
       <version>${minitest.version}</version>
       <type>gem</type>
+      <exclusions>
+        <exclusion>
+          <artifactId>jar-dependencies</artifactId>
+          <groupId>rubygems</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>test-unit</artifactId>
       <version>${test-unit.version}</version>
       <type>gem</type>
+      <exclusions>
+        <exclusion>
+          <artifactId>jar-dependencies</artifactId>
+          <groupId>rubygems</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>power_assert</artifactId>
       <version>${power_assert.version}</version>
       <type>gem</type>
+      <exclusions>
+        <exclusion>
+          <artifactId>jar-dependencies</artifactId>
+          <groupId>rubygems</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>rubygems</groupId>
+      <artifactId>psych</artifactId>
+      <version>2.0.9-SNAPSHOT</version>
+      <type>gem</type>
+      <exclusions>
+        <exclusion>
+          <artifactId>jar-dependencies</artifactId>
+          <groupId>rubygems</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>rubygems</groupId>
@@ -123,10 +196,27 @@
           <skip>true</skip>
         </configuration>
       </plugin>
+      <plugin>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <useRepositoryLayout>true</useRepositoryLayout>
+          <outputDirectory>ruby/stdlib</outputDirectory>
+          <excludeGroupIds>rubygems</excludeGroupIds>
+          <includeScope>runtime</includeScope>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>io.tesla.polyglot</groupId>
         <artifactId>tesla-polyglot-maven-plugin</artifactId>
-        <version>${tesla.version}</version>
+        <version>0.1.1</version>
         <executions>
           <execution>
             <id>install_gems</id>
@@ -144,7 +234,7 @@
           <dependency>
             <groupId>io.tesla.polyglot</groupId>
             <artifactId>tesla-polyglot-ruby</artifactId>
-            <version>${tesla.version}</version>
+            <version>0.1.1</version>
           </dependency>
         </dependencies>
       </plugin>

diff --git a/maven/jruby-complete/src/it/integrity/verify.bsh b/maven/jruby-complete/src/it/integrity/verify.bsh
@@ -28,7 +28,7 @@ if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );
 }
-expected = "gems count 8";
+expected = "gems count 9";
 if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );

diff --git a/maven/jruby-dist/src/it/integrity/verify.bsh b/maven/jruby-dist/src/it/integrity/verify.bsh
@@ -28,7 +28,7 @@ if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );
 }
-expected = "gems count 8";
+expected = "gems count 9";
 if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );

diff --git a/maven/jruby-jars/src/it/integrity/verify.bsh b/maven/jruby-jars/src/it/integrity/verify.bsh
@@ -28,7 +28,7 @@ if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );
 }
-expected = "gems count 8";
+expected = "gems count 9";
 if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );

diff --git a/maven/jruby-noasm/src/it/integrity/verify.bsh b/maven/jruby-noasm/src/it/integrity/verify.bsh
@@ -28,7 +28,7 @@ if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );
 }
-expected = "gems count 8";
+expected = "gems count 9";
 if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );

diff --git a/maven/jruby/src/it/integrity/verify.bsh b/maven/jruby/src/it/integrity/verify.bsh
@@ -28,7 +28,7 @@ if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );
 }
-expected = "gems count 8";
+expected = "gems count 9";
 if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );