[build] extract the osgi and j2ee integration tests into their own pr…

…ofile [build] reduce j2ee profile to minimum [build] make the osgi more independent of jruby-openssl version used
jruby · Oct 7, 2014 · 57dfc0d · 57dfc0d
1 parent bba3e7c
commit 57dfc0d
Showing 10 changed files with 55 additions and 15 deletions.
diff --git a/build.xml b/build.xml
@@ -470,6 +470,18 @@
         </exec>
     </target>
 
+    <target name="osgi" description="run osgi tests">
+        <exec executable="mvn" failonerror="true">
+          <arg line="-Posgi"/>
+        </exec>
+    </target>
+
+    <target name="j2ee" description="run j2ee tests">
+        <exec executable="mvn" failonerror="true">
+          <arg line="-Pj2ee"/>
+        </exec>
+    </target>
+
     <target name="complete" description="Create the jruby-complete.jar">
         <exec executable="mvn" failonerror="true">
           <arg line="-Pcomplete"/>

diff --git a/maven/jruby-complete/pom.rb b/maven/jruby-complete/pom.rb
@@ -104,6 +104,6 @@
     activation do
       jdk '1.8'
     end
-    plugin :invoker, :pomExcludes => ['osgi_many_bundles_with_embedded_gems_felix-3.2/pom.xml']
+    plugin :invoker, :pomExcludes => ['osgi_many_bundles_with_embedded_gems_felix-3.2/pom.xml', '${its.j2ee}', '${its.osgi}']
   end
 end
diff --git a/maven/jruby-complete/pom.xml b/maven/jruby-complete/pom.xml
@@ -199,6 +199,8 @@
             <configuration>
               <pomExcludes>
                 <pomExclude>osgi_many_bundles_with_embedded_gems_felix-3.2/pom.xml</pomExclude>
+                <pomExclude>${its.j2ee}</pomExclude>
+                <pomExclude>${its.osgi}</pomExclude>
               </pomExcludes>
             </configuration>
           </plugin>

diff --git a/...s_with_embedded_gems/test/src/test/java/org/jruby/embed/osgi/test/JRubyOsgiEmbedTest.java b/...s_with_embedded_gems/test/src/test/java/org/jruby/embed/osgi/test/JRubyOsgiEmbedTest.java
@@ -96,8 +96,8 @@ public void testJRubyCreate() throws Exception {
         String list = (String) jruby.runScriptlet( "Gem.loaded_specs.keys.inspect" );
         assertEquals(list, "[\"rake\"]");
 
-        // ensure we can load openssl (with its bouncy-castle jars) and krypt
-        loaded = (Boolean) jruby.runScriptlet( "require 'openssl';require 'krypt'" );
+        // ensure we can load openssl (with its bouncy-castle jars)
+        loaded = (Boolean) jruby.runScriptlet( "require 'openssl'" );
         assertEquals(true, loaded);
 
         // ensure we can load ffi
@@ -108,14 +108,15 @@ public void testJRubyCreate() throws Exception {
         gemPath = gemPath.replaceAll( "bundle[^:]*://[^/]*", "bundle:/" );
         assertEquals( gemPath, "[\"uri:bundle://specifications\", \"uri:bundle://specifications\", \"uri:bundle://META-INF/jruby.home/lib/ruby/gems/shared/specifications\"]" );
 
-	list = (String) jruby.runScriptlet( "Gem.loaded_specs.keys.inspect" );
-        assertEquals(list, "[\"rake\", \"jruby-openssl\", \"ffi\", \"krypt-provider-jdk\", \"krypt-core\", \"krypt\"]");
+	jruby.runScriptlet( "require 'jar-dependencies'; require 'krypt'" );
+        list = (String) jruby.runScriptlet( "Gem.loaded_specs.keys.inspect" );
+        assertEquals(list, "[\"rake\", \"jruby-openssl\", \"jar-dependencies\", \"ffi\", \"krypt-provider-jdk\", \"krypt-core\", \"krypt\"]");
 
         // ensure we can load can load embedded gems
         loaded = (Boolean) jruby.runScriptlet( "require 'virtus'" );
         assertEquals(true, loaded);
 
 	list = (String) jruby.runScriptlet( "Gem.loaded_specs.keys.inspect" );
-        assertEquals(list, "[\"rake\", \"jruby-openssl\", \"ffi\", \"krypt-provider-jdk\", \"krypt-core\", \"krypt\", \"thread_safe\", \"descendants_tracker\", \"equalizer\", \"coercible\", \"ice_nine\", \"axiom-types\", \"virtus\"]");
+        assertEquals(list, "[\"rake\", \"jruby-openssl\", \"jar-dependencies\", \"ffi\", \"krypt-provider-jdk\", \"krypt-core\", \"krypt\", \"thread_safe\", \"descendants_tracker\", \"equalizer\", \"coercible\", \"ice_nine\", \"axiom-types\", \"virtus\"]");
     }
 }
diff --git a/maven/jruby/pom.rb b/maven/jruby/pom.rb
@@ -58,7 +58,7 @@
     activation do
       jdk '1.8'
     end
-    plugin :invoker, :pomExcludes => ['osgi_all_inclusive_felix-3.2/pom.xml']
+    plugin :invoker, :pomExcludes => ['osgi_all_inclusive_felix-3.2/pom.xml', '${its.j2ee}', '${its.osgi}']
   end
   profile :id => :jdk6 do
     activation do

diff --git a/maven/jruby/pom.xml b/maven/jruby/pom.xml
@@ -119,6 +119,8 @@
             <configuration>
               <pomExcludes>
                 <pomExclude>osgi_all_inclusive_felix-3.2/pom.xml</pomExclude>
+                <pomExclude>${its.j2ee}</pomExclude>
+                <pomExclude>${its.osgi}</pomExclude>
               </pomExcludes>
             </configuration>
           </plugin>

diff --git a/...plates/osgi_all_inclusive/src/test/java/org/jruby/embed/osgi/test/JRubyOsgiEmbedTest.java b/...plates/osgi_all_inclusive/src/test/java/org/jruby/embed/osgi/test/JRubyOsgiEmbedTest.java
@@ -95,14 +95,15 @@ public void testJRubyCreate() throws InterruptedException {
         gemPath = gemPath.replaceAll( "bundle[^:]*://[^/]*", "bundle:/" );
         assertEquals( gemPath, "[\"uri:bundle://specifications\", \"uri:bundle://META-INF/jruby.home/lib/ruby/gems/shared/specifications\"]" );
 
+	jruby.runScriptlet( "require 'jar-dependencies'; require 'krypt'" );
         list = (String) jruby.runScriptlet( "Gem.loaded_specs.keys.inspect" );
-        assertEquals(list, "[\"rake\", \"jruby-openssl\"]");
+        assertEquals(list, "[\"rake\", \"jruby-openssl\", \"jar-dependencies\", \"ffi\", \"krypt-provider-jdk\", \"krypt-core\", \"krypt\"]");
 
         // ensure we can load can load embedded gems
         loaded = (Boolean) jruby.runScriptlet( "require 'virtus'" );
         assertEquals(true, loaded);
 
 	list = (String) jruby.runScriptlet( "Gem.loaded_specs.keys.inspect" );
-        assertEquals(list, "[\"rake\", \"jruby-openssl\", \"thread_safe\", \"descendants_tracker\", \"equalizer\", \"coercible\", \"ice_nine\", \"axiom-types\", \"virtus\"]");
+        assertEquals(list, "[\"rake\", \"jruby-openssl\", \"jar-dependencies\", \"ffi\", \"krypt-provider-jdk\", \"krypt-core\", \"krypt\", \"thread_safe\", \"descendants_tracker\", \"equalizer\", \"coercible\", \"ice_nine\", \"axiom-types\", \"virtus\"]");
     }
 }
diff --git a/maven/pom.rb b/maven/pom.rb
@@ -23,14 +23,14 @@
   end
 
   # module to profile map
-  map = { 'jruby' => [ :release, :main ],
-    'jruby-stdlib' => [ :release, :main, :complete, :dist, 'jruby-jars' ],
-    'jruby-complete' => [ :release, :complete ],
+  map = { 'jruby' => [ :release, :main, :osgi, :j2ee ],
+    'jruby-noasm' => [ :release, :main ],
+    'jruby-stdlib' => [ :release, :main, :complete, :dist, 'jruby-jars', :osgi, :j2ee ],
+    'jruby-complete' => [ :release, :complete, :osgi ],
     'jruby-dist' => [ :release, :dist ],
     'jruby-jars' => [ :release, 'jruby-jars' ],
     'jruby-rake-plugin' => [ :release, 'jruby-rake-plugin']
   }
-  map[ 'jruby-noasm' ] = map[ 'jruby' ]
 
   profile :all do
     modules map.keys

diff --git a/maven/pom.xml b/maven/pom.xml
@@ -50,32 +50,48 @@
       <id>all</id>
       <modules>
         <module>jruby</module>
+        <module>jruby-noasm</module>
         <module>jruby-stdlib</module>
         <module>jruby-complete</module>
         <module>jruby-dist</module>
         <module>jruby-jars</module>
         <module>jruby-rake-plugin</module>
-        <module>jruby-noasm</module>
       </modules>
     </profile>
     <profile>
       <id>release</id>
       <modules>
         <module>jruby</module>
+        <module>jruby-noasm</module>
         <module>jruby-stdlib</module>
         <module>jruby-complete</module>
         <module>jruby-dist</module>
         <module>jruby-jars</module>
         <module>jruby-rake-plugin</module>
-        <module>jruby-noasm</module>
       </modules>
     </profile>
     <profile>
       <id>main</id>
+      <modules>
+        <module>jruby</module>
+        <module>jruby-noasm</module>
+        <module>jruby-stdlib</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>osgi</id>
       <modules>
         <module>jruby</module>
         <module>jruby-stdlib</module>
         <module>jruby-noasm</module>
+        <module>jruby-complete</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>j2ee</id>
+      <modules>
+        <module>jruby</module>
+        <module>jruby-stdlib</module>
       </modules>
     </profile>
     <profile>

diff --git a/pom.xml b/pom.xml
@@ -53,6 +53,8 @@
   </organization>
 
   <properties>
+    <its.j2ee>j2ee*/pom.xml</its.j2ee>
+    <its.osgi>osgi*/pom.xml</its.osgi>
     <invoker.skip>true</invoker.skip>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
     <jruby.plugins.version>1.0.7-SNAPSHOT</jruby.plugins.version>
@@ -358,6 +360,10 @@
             <postBuildHookScript>verify.bsh</postBuildHookScript>
             <streamLogs>true</streamLogs>
 	    <goals><goal>install</goal></goals>
+	    <pomExcludes>
+	      <pomExclude>${its.j2ee}</pomExclude>
+	      <pomExclude>${its.osgi}</pomExclude>
+	    </pomExcludes>
           </configuration>
         </plugin>