address the fact that the new jruby-openssl gem does not require kryp…

…t any more moved around the osgi integration tests to be easier managed
jruby · Oct 3, 2014 · b1df10c · b1df10c
1 parent 18232b2
commit b1df10c
Show file tree

Hide file tree

Showing 39 changed files with 90 additions and 459 deletions.
diff --git a/.gitignore b/.gitignore
@@ -78,11 +78,9 @@ dependency-reduced-pom.xml
 install/updates.xml
 
 # generated ITs
-maven/jruby/src/it/osgi_*equinox*
-maven/jruby/src/it/osgi_*felix-3*
-maven/jruby/src/it/osgi_*knoplerfish
+maven/jruby/src/it/osgi_*
 maven/jruby/src/it/j2ee_wlp
-maven/jruby-complete/src/it/osgi_many_bundles_with_embedded_gems_*
+maven/jruby-complete/src/it/osgi*
 
 # IntelliJ project files
 .idea

diff --git a/maven/jruby-complete/pom.rb b/maven/jruby-complete/pom.rb
@@ -52,16 +52,25 @@
 
   execute 'setup other osgi frameworks', :phase => 'pre-integration-test' do |ctx|
     require 'fileutils'
-    felix = File.join( ctx.basedir.to_pathname, 'src', 'it', 'osgi_many_bundles_with_embedded_gems' )
-    [ 'equinox-3.6', 'equinox-3.7', 'felix-3.2' ].each do |m|
+    source = File.join( ctx.basedir.to_pathname, 'src', 'templates', 'osgi_many_bundles_with_embedded_gems' )
+    [ 'equinox-3.6', 'equinox-3.7', 'felix-3.2', 'felix-4.4' ].each do |m|
       target = File.join( ctx.basedir.to_pathname, 'src', 'it', 'osgi_many_bundles_with_embedded_gems_' + m )
-      FileUtils.cp_r( felix, target )
+      FileUtils.cp_r( source, target )
       File.open( File.join( target, 'invoker.properties' ), 'w' ) do |f|
         f.puts 'invoker.profiles = ' + m
       end
     end
   end
 
+  plugin( :clean ) do
+    execute_goals( :clean,
+                   :phase => :clean,
+                   :id => 'clean-extra-osgi-ITs',
+                   :filesets => [ { :directory => '${basedir}/src/it',
+                                    :includes => ['osgi*/**'] } ],
+                   :failOnError => false )
+  end
+
   profile 'sonatype-oss-release' do
 
     # use the javadocs and sources from jruby-core !!!

diff --git a/maven/jruby-complete/pom.xml b/maven/jruby-complete/pom.xml
@@ -72,6 +72,29 @@
           <skipSource>true</skipSource>
         </configuration>
       </plugin>
+      <plugin>
+        <artifactId>maven-clean-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>clean-extra-osgi-ITs</id>
+            <phase>clean</phase>
+            <goals>
+              <goal>clean</goal>
+            </goals>
+            <configuration>
+              <filesets>
+                <fileset>
+                  <directory>${basedir}/src/it</directory>
+                  <includes>
+                    <include>osgi*/**</include>
+                  </includes>
+                </fileset>
+              </filesets>
+              <failOnError>false</failOnError>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>io.tesla.polyglot</groupId>
         <artifactId>tesla-polyglot-maven-plugin</artifactId>

diff --git a/maven/jruby-complete/src/it/helloworld/pom.xml b/maven/jruby-complete/src/it/helloworld/pom.xml
@@ -35,6 +35,7 @@
             <argument>
               puts 'hello world'
               puts 'openssl loaded' if require 'openssl'
+              puts 'krypt loaded' if require 'krypt'
               puts Gem.loaded_specs.keys.sort.join(',')
             </argument>
           </arguments>

diff --git a/maven/jruby-complete/src/it/helloworld/verify.bsh b/maven/jruby-complete/src/it/helloworld/verify.bsh
@@ -13,7 +13,7 @@ if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );
 }
-expected = "ffi,jar-dependencies,jruby-openssl,krypt,krypt-core,krypt-provider-jdk";
+expected = "ffi,jruby-openssl,krypt,krypt-core,krypt-provider-jdk";
 if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );

diff --git a/maven/jruby-complete/src/it/osgi_many_bundles_with_embedded_gems/build.log b/maven/jruby-complete/src/it/osgi_many_bundles_with_embedded_gems/build.log
diff --git a/...es_with_embedded_gems/gems-bundle/Gemfile → ...es_with_embedded_gems/gems-bundle/Gemfile b/...es_with_embedded_gems/gems-bundle/Gemfile → ...es_with_embedded_gems/gems-bundle/Gemfile
diff --git a/...les_with_embedded_gems/gems-bundle/pom.rb → ...les_with_embedded_gems/gems-bundle/pom.rb b/...les_with_embedded_gems/gems-bundle/pom.rb → ...les_with_embedded_gems/gems-bundle/pom.rb
diff --git a/...es_with_embedded_gems/gems-bundle/pom.xml → ...es_with_embedded_gems/gems-bundle/pom.xml b/...es_with_embedded_gems/gems-bundle/pom.xml → ...es_with_embedded_gems/gems-bundle/pom.xml
diff --git a/...c/main/java/org/jruby/osgi/gems/Gems.java → ...c/main/java/org/jruby/osgi/gems/Gems.java b/...c/main/java/org/jruby/osgi/gems/Gems.java → ...c/main/java/org/jruby/osgi/gems/Gems.java
diff --git a/...les_with_embedded_gems/invoker.properties → ...les_with_embedded_gems/invoker.properties b/...les_with_embedded_gems/invoker.properties → ...les_with_embedded_gems/invoker.properties
diff --git a/...gi_many_bundles_with_embedded_gems/pom.rb → ...gi_many_bundles_with_embedded_gems/pom.rb b/...gi_many_bundles_with_embedded_gems/pom.rb → ...gi_many_bundles_with_embedded_gems/pom.rb
diff --git a/...i_many_bundles_with_embedded_gems/pom.xml → ...i_many_bundles_with_embedded_gems/pom.xml b/...i_many_bundles_with_embedded_gems/pom.xml → ...i_many_bundles_with_embedded_gems/pom.xml
diff --git a/..._with_embedded_gems/scripts-bundle/pom.rb → ..._with_embedded_gems/scripts-bundle/pom.rb b/..._with_embedded_gems/scripts-bundle/pom.rb → ..._with_embedded_gems/scripts-bundle/pom.rb
diff --git a/...with_embedded_gems/scripts-bundle/pom.xml → ...with_embedded_gems/scripts-bundle/pom.xml b/...with_embedded_gems/scripts-bundle/pom.xml → ...with_embedded_gems/scripts-bundle/pom.xml
diff --git a/.../java/org/jruby/osgi/scripts/Scripts.java → .../java/org/jruby/osgi/scripts/Scripts.java b/.../java/org/jruby/osgi/scripts/Scripts.java → .../java/org/jruby/osgi/scripts/Scripts.java
diff --git a/...ms/scripts-bundle/src/main/ruby/.jrubydir → ...ms/scripts-bundle/src/main/ruby/.jrubydir b/...ms/scripts-bundle/src/main/ruby/.jrubydir → ...ms/scripts-bundle/src/main/ruby/.jrubydir
diff --git a/...ems/scripts-bundle/src/main/ruby/hello.rb → ...ems/scripts-bundle/src/main/ruby/hello.rb b/...ems/scripts-bundle/src/main/ruby/hello.rb → ...ems/scripts-bundle/src/main/ruby/hello.rb
diff --git a/...ems/scripts-bundle/src/main/ruby/world.rb → ...ems/scripts-bundle/src/main/ruby/world.rb b/...ems/scripts-bundle/src/main/ruby/world.rb → ...ems/scripts-bundle/src/main/ruby/world.rb
diff --git a/...ny_bundles_with_embedded_gems/test/pom.rb → ...ny_bundles_with_embedded_gems/test/pom.rb b/...ny_bundles_with_embedded_gems/test/pom.rb → ...ny_bundles_with_embedded_gems/test/pom.rb
diff --git a/...y_bundles_with_embedded_gems/test/pom.xml → ...y_bundles_with_embedded_gems/test/pom.xml b/...y_bundles_with_embedded_gems/test/pom.xml → ...y_bundles_with_embedded_gems/test/pom.xml
diff --git a/...y/embed/osgi/test/JRubyOsgiEmbedTest.java → ...y/embed/osgi/test/JRubyOsgiEmbedTest.java b/...y/embed/osgi/test/JRubyOsgiEmbedTest.java → ...y/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)
-        loaded = (Boolean) jruby.runScriptlet( "require 'openssl'" );
+        // ensure we can load openssl (with its bouncy-castle jars) and krypt
+        loaded = (Boolean) jruby.runScriptlet( "require 'openssl';require 'krypt'" );
         assertEquals(true, loaded);
 
         // ensure we can load ffi
@@ -109,13 +109,13 @@ public void testJRubyCreate() throws Exception {
         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\", \"jar-dependencies\", \"ffi\", \"krypt-provider-jdk\", \"krypt-core\", \"krypt\"]");
+        assertEquals(list, "[\"rake\", \"jruby-openssl\", \"krypt\", \"krypt-core\", \"krypt-provider-jdk\"]");
 
         // 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\", \"jar-dependencies\", \"ffi\", \"krypt-provider-jdk\", \"krypt-core\", \"krypt\", \"thread_safe\", \"descendants_tracker\", \"equalizer\", \"coercible\", \"ice_nine\", \"axiom-types\", \"virtus\"]");
+        assertEquals(list, "[\"rake\", \"jruby-openssl\", \"krypt\", \"krypt-core\", \"krypt-provider-jdk\", \"thread_safe\", \"descendants_tracker\", \"equalizer\", \"coercible\", \"ice_nine\", \"axiom-types\", \"virtus\"]");
     }
 }
diff --git a/maven/jruby-jars/src/it/helloworld/pom.xml b/maven/jruby-jars/src/it/helloworld/pom.xml
@@ -40,6 +40,7 @@
             <argument>
               puts 'hello world'
               puts 'openssl loaded' if require 'openssl'
+              puts 'krypt loaded' if require 'krypt'
               puts Gem.loaded_specs.keys.sort.join(',')
             </argument>
           </arguments>

diff --git a/maven/jruby-jars/src/it/helloworld/verify.bsh b/maven/jruby-jars/src/it/helloworld/verify.bsh
@@ -13,7 +13,7 @@ if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );
 }
-expected = "ffi,jar-dependencies,jruby-openssl,krypt,krypt-core,krypt-provider-jdk";
+expected = "ffi,jruby-openssl,krypt,krypt-core,krypt-provider-jdk";
 if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );

diff --git a/maven/jruby-noasm/src/it/helloworld/pom.xml b/maven/jruby-noasm/src/it/helloworld/pom.xml
@@ -32,6 +32,7 @@
             <argument>
               puts 'hello world'
               puts 'openssl loaded' if require 'openssl'
+              puts 'krypt loaded' if require 'krypt'
               puts Gem.loaded_specs.keys.sort.join(',')
             </argument>
           </arguments>

diff --git a/maven/jruby-noasm/src/it/helloworld/verify.bsh b/maven/jruby-noasm/src/it/helloworld/verify.bsh
@@ -13,7 +13,7 @@ if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );
 }
-expected = "ffi,jar-dependencies,jruby-openssl,krypt,krypt-core,krypt-provider-jdk";
+expected = "ffi,jruby-openssl,krypt,krypt-core,krypt-provider-jdk";
 if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );

diff --git a/maven/jruby/pom.rb b/maven/jruby/pom.rb
@@ -35,16 +35,25 @@
   plugin( :invoker )
 
   execute 'setup other osgi frameworks', :phase => 'pre-integration-test' do |ctx|
-    felix = File.join( ctx.basedir.to_pathname, 'src', 'it', 'osgi_all_inclusive' )
-     [ 'equinox-3.6', 'equinox-3.7', 'felix-3.2'].each do |m|
+    source = File.join( ctx.basedir.to_pathname, 'src', 'templates', 'osgi_all_inclusive' )
+     [ 'equinox-3.6', 'equinox-3.7', 'felix-3.2', 'felix-4.4'].each do |m|
       target = File.join( ctx.basedir.to_pathname, 'src', 'it', 'osgi_all_inclusive_' + m )
-      FileUtils.cp_r( felix, target )
+      FileUtils.cp_r( source, target )
       File.open( File.join( target, 'invoker.properties' ), 'w' ) do |f|
         f.puts 'invoker.profiles = ' + m
       end
     end
   end
 
+  plugin( :clean ) do
+    execute_goals( :clean,
+                   :phase => :clean,
+                   :id => 'clean-extra-osgi-ITs',
+                   :filesets => [ { :directory => '${basedir}/src/it',
+                                    :includes => ['osgi*/**'] } ],
+                   :failOnError => false )
+  end
+
   profile :id => :jdk8 do
     activation do
       jdk '1.8'

diff --git a/maven/jruby/pom.xml b/maven/jruby/pom.xml
@@ -56,6 +56,29 @@
       <plugin>
         <artifactId>maven-invoker-plugin</artifactId>
       </plugin>
+      <plugin>
+        <artifactId>maven-clean-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>clean-extra-osgi-ITs</id>
+            <phase>clean</phase>
+            <goals>
+              <goal>clean</goal>
+            </goals>
+            <configuration>
+              <filesets>
+                <fileset>
+                  <directory>${basedir}/src/it</directory>
+                  <includes>
+                    <include>osgi*/**</include>
+                  </includes>
+                </fileset>
+              </filesets>
+              <failOnError>false</failOnError>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>io.tesla.polyglot</groupId>
         <artifactId>tesla-polyglot-maven-plugin</artifactId>

diff --git a/maven/jruby/src/it/helloworld/pom.xml b/maven/jruby/src/it/helloworld/pom.xml
@@ -32,6 +32,7 @@
             <argument>
               puts 'hello world'
               puts 'openssl loaded' if require 'openssl'
+              puts 'krypt loaded' if require 'krypt'
               puts Gem.loaded_specs.keys.sort.join(',')
             </argument>
           </arguments>

diff --git a/maven/jruby/src/it/helloworld/verify.bsh b/maven/jruby/src/it/helloworld/verify.bsh
@@ -13,7 +13,7 @@ if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );
 }
-expected = "ffi,jar-dependencies,jruby-openssl,krypt,krypt-core,krypt-provider-jdk";
+expected = "ffi,jruby-openssl,krypt,krypt-core,krypt-provider-jdk";
 if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );

diff --git a/...n/jruby/src/it/osgi_all_inclusive/Gemfile → .../src/templates/osgi_all_inclusive/Gemfile b/...n/jruby/src/it/osgi_all_inclusive/Gemfile → .../src/templates/osgi_all_inclusive/Gemfile
diff --git a/.../it/osgi_all_inclusive/invoker.properties → ...tes/osgi_all_inclusive/invoker.properties b/.../it/osgi_all_inclusive/invoker.properties → ...tes/osgi_all_inclusive/invoker.properties
diff --git a/maven/jruby/src/it/osgi_all_inclusive/pom.rb → ...y/src/templates/osgi_all_inclusive/pom.rb b/maven/jruby/src/it/osgi_all_inclusive/pom.rb → ...y/src/templates/osgi_all_inclusive/pom.rb
diff --git a/...ruby/src/it/osgi_all_inclusive/pom.rb.new → ...c/templates/osgi_all_inclusive/pom.rb.new b/...ruby/src/it/osgi_all_inclusive/pom.rb.new → ...c/templates/osgi_all_inclusive/pom.rb.new
diff --git a/...n/jruby/src/it/osgi_all_inclusive/pom.xml → .../src/templates/osgi_all_inclusive/pom.xml b/...n/jruby/src/it/osgi_all_inclusive/pom.xml → .../src/templates/osgi_all_inclusive/pom.xml
diff --git a/...osgi_all_inclusive/src/main/ruby/hello.rb → ...osgi_all_inclusive/src/main/ruby/hello.rb b/...osgi_all_inclusive/src/main/ruby/hello.rb → ...osgi_all_inclusive/src/main/ruby/hello.rb
diff --git a/...osgi_all_inclusive/src/main/ruby/world.rb → ...osgi_all_inclusive/src/main/ruby/world.rb b/...osgi_all_inclusive/src/main/ruby/world.rb → ...osgi_all_inclusive/src/main/ruby/world.rb
diff --git a/...y/embed/osgi/test/JRubyOsgiEmbedTest.java → ...y/embed/osgi/test/JRubyOsgiEmbedTest.java b/...y/embed/osgi/test/JRubyOsgiEmbedTest.java → ...y/embed/osgi/test/JRubyOsgiEmbedTest.java
@@ -96,13 +96,13 @@ public void testJRubyCreate() throws InterruptedException {
         assertEquals( gemPath, "[\"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\", \"jar-dependencies\", \"ffi\", \"krypt-provider-jdk\", \"krypt-core\", \"krypt\"]");
+        assertEquals(list, "[\"rake\", \"jruby-openssl\"]");
 
         // 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\", \"jar-dependencies\", \"ffi\", \"krypt-provider-jdk\", \"krypt-core\", \"krypt\", \"thread_safe\", \"descendants_tracker\", \"equalizer\", \"coercible\", \"ice_nine\", \"axiom-types\", \"virtus\"]");
+        assertEquals(list, "[\"rake\", \"jruby-openssl\", \"thread_safe\", \"descendants_tracker\", \"equalizer\", \"coercible\", \"ice_nine\", \"axiom-types\", \"virtus\"]");
     }
 }
diff --git a/pom.xml b/pom.xml
@@ -346,6 +346,9 @@
           <configuration>
             <settingsFile>${basedir}/src/it/settings.xml</settingsFile>
             <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+            <properties>
+              <project.version>${project.version}</project.version>
+            </properties>
             <pomIncludes>
               <pomInclude>*/pom.xml</pomInclude>
             </pomIncludes>
@@ -354,6 +357,7 @@
             <preBuildHookScript>setup.bsh</preBuildHookScript>
             <postBuildHookScript>verify.bsh</postBuildHookScript>
             <streamLogs>true</streamLogs>
+	    <goals><goal>install</goal></goals>
           </configuration>
         </plugin>