[build] * stick to jruby-openssl-0.9.5 for the time being

* only delete bouncycastle gems on clean * squashed two integration tests into one * allow to run single integration test with mvn -Pmain -Dinvoker.test=integrety * obsolete build file * extract the osgi and j2ee integration tests into their own profile * let travis use those new osgi and j2ee targets
jruby · Oct 7, 2014 · bba3e7c · bba3e7c
1 parent 9a1b609
commit bba3e7c
Showing 29 changed files with 212 additions and 354 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -19,6 +19,8 @@ env:
     - TARGET='jruby-jars'
     - TARGET='complete'
     - TARGET='main'
+    - TARGET='osgi'
+    - TARGET='j2ee'
 
 matrix:
   fast_finish: true

diff --git a/lib/pom.rb b/lib/pom.rb
@@ -29,7 +29,7 @@ def version
 # the versions are declared in ../pom.xml
 default_gems =
   [
-   ImportedGem.new( 'jruby-openssl', '0.9.6.dev-SNAPSHOT', true ),
+   ImportedGem.new( 'jruby-openssl', '0.9.5', true ),
    ImportedGem.new( 'rake', 'rake.version', true ),
    ImportedGem.new( 'rdoc', 'rdoc.version', true, false, true ),
    ImportedGem.new( 'json', 'json.version', true, false ),
@@ -83,7 +83,7 @@ def to_pathname
           :filesets => [ { :directory => '${basedir}/ruby/gems/shared/specifications/default',
                            :includes => [ '*' ] },
                          { :directory => '${basedir}/ruby/shared',
-                           :includes => [ '**/*.jar' ] } ] )
+                           :includes => [ '**/bouncycastle/**/*.jar' ] } ] )
 
   # tell maven to download the respective gem artifacts
   default_gems.each do |g|

diff --git a/lib/pom.xml b/lib/pom.xml
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>jruby-openssl</artifactId>
-      <version>0.9.6.dev-SNAPSHOT</version>
+      <version>0.9.5</version>
       <type>gem</type>
     </dependency>
     <dependency>
@@ -106,7 +106,7 @@
             <fileset>
               <directory>${basedir}/ruby/shared</directory>
               <includes>
-                <include>**/*.jar</include>
+                <include>**/bouncycastle/**/*.jar</include>
               </includes>
             </fileset>
           </filesets>

diff --git a/maven/jruby-complete/src/it/helloworld/invoker.properties b/maven/jruby-complete/src/it/helloworld/invoker.properties
diff --git a/maven/jruby-complete/src/it/helloworld/pom.xml b/maven/jruby-complete/src/it/helloworld/pom.xml
diff --git a/maven/jruby-complete/src/it/helloworld/verify.bsh b/maven/jruby-complete/src/it/helloworld/verify.bsh
diff --git a/maven/jruby-complete/src/it/integrity/pom.xml b/maven/jruby-complete/src/it/integrity/pom.xml
@@ -106,6 +106,31 @@
 	      </arguments>
 	    </configuration>
 	  </execution>
+	  <execution>
+	    <id>load default gems</id>
+	    <phase>test</phase>
+	    <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>          
+	      <executable>java</executable> 
+              <arguments>
+		<argument>-classpath</argument>
+		<!-- automatically creates the classpath using all project dependencies,
+		     also adding the project build directory -->
+		<classpath/>
+		<argument>org.jruby.Main</argument>
+		<argument>-e</argument>
+		<!-- make sure openssl loads -->
+		<argument>
+		  require 'jar-dependencies'
+		  require 'openssl'
+		  require 'krypt'
+		  puts Gem.loaded_specs.keys.sort.join(',')
+		</argument>
+              </arguments>
+            </configuration>
+	  </execution>
 	</executions>
       </plugin>
     </plugins>

diff --git a/maven/jruby-complete/src/it/integrity/verify.bsh b/maven/jruby-complete/src/it/integrity/verify.bsh
@@ -33,3 +33,8 @@ 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";
+if ( !log.contains( expected ) )
+{
+    throw new RuntimeException( "log file does not contain '" + expected + "'" );
+}
diff --git a/maven/jruby-dist/src/it/integrity/pom.xml b/maven/jruby-dist/src/it/integrity/pom.xml
@@ -125,6 +125,29 @@
 	      </arguments>
 	    </configuration>
 	  </execution>
+	  <execution>
+	    <id>load default gems</id>
+	    <phase>test</phase>
+	    <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>          
+	      <executable>java</executable> 
+              <arguments>
+		<argument>-Xbootclasspath/a:${jruby.home}/lib/jruby.jar</argument>
+		<argument>-Djruby.home=${jruby.home}</argument>
+		<argument>org.jruby.Main</argument>
+		<argument>-e</argument>
+		<!-- make sure openssl loads -->
+		<argument>
+		  require 'jar-dependencies'
+		  require 'openssl'
+		  require 'krypt'
+		  puts Gem.loaded_specs.keys.sort.join(',')
+		</argument>
+              </arguments>
+            </configuration>
+	  </execution>
 	</executions>
       </plugin>
     </plugins>

diff --git a/maven/jruby-dist/src/it/integrity/verify.bsh b/maven/jruby-dist/src/it/integrity/verify.bsh
@@ -30,6 +30,11 @@ if ( !log.contains( expected ) )
 }
 expected = "gems count 9";
 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";
+if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );
 }
diff --git a/maven/jruby-jars/src/it/helloworld/invoker.properties b/maven/jruby-jars/src/it/helloworld/invoker.properties
diff --git a/maven/jruby-jars/src/it/helloworld/pom.xml b/maven/jruby-jars/src/it/helloworld/pom.xml
diff --git a/maven/jruby-jars/src/it/helloworld/verify.bsh b/maven/jruby-jars/src/it/helloworld/verify.bsh
diff --git a/maven/jruby-jars/src/it/integrity/pom.xml b/maven/jruby-jars/src/it/integrity/pom.xml
@@ -114,6 +114,29 @@
 	      </arguments>
 	    </configuration>
 	  </execution>
+	  <execution>
+	    <id>load default gems</id>
+	    <phase>test</phase>
+	    <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>          
+	      <executable>java</executable> 
+              <arguments>
+		<argument>-classpath</argument>
+		<argument>${gem.home}/gems/jruby-jars-${ruby.version}/lib/jruby-core-@project.version@.jar${path.separator}${gem.home}/gems/jruby-jars-${ruby.version}/lib/jruby-stdlib-@project.version@.jar</argument>
+		<argument>org.jruby.Main</argument>
+		<argument>-e</argument>
+		<!-- make sure openssl loads -->
+		<argument>
+		  require 'jar-dependencies'
+		  require 'openssl'
+		  require 'krypt'
+		  puts Gem.loaded_specs.keys.sort.join(',')
+		</argument>
+              </arguments>
+            </configuration>
+	  </execution>
 	</executions>
       </plugin>
     </plugins>

diff --git a/maven/jruby-jars/src/it/integrity/verify.bsh b/maven/jruby-jars/src/it/integrity/verify.bsh
@@ -30,6 +30,11 @@ if ( !log.contains( expected ) )
 }
 expected = "gems count 9";
 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";
+if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );
 }
diff --git a/maven/jruby-noasm/src/it/helloworld/invoker.properties b/maven/jruby-noasm/src/it/helloworld/invoker.properties
diff --git a/maven/jruby-noasm/src/it/helloworld/pom.xml b/maven/jruby-noasm/src/it/helloworld/pom.xml
diff --git a/maven/jruby-noasm/src/it/helloworld/verify.bsh b/maven/jruby-noasm/src/it/helloworld/verify.bsh
diff --git a/maven/jruby-noasm/src/it/integrity/pom.xml b/maven/jruby-noasm/src/it/integrity/pom.xml
@@ -106,6 +106,31 @@
 	      </arguments>
 	    </configuration>
 	  </execution>
+	  <execution>
+	    <id>load default gems</id>
+	    <phase>test</phase>
+	    <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>          
+	      <executable>java</executable> 
+              <arguments>
+		<argument>-classpath</argument>
+		<!-- automatically creates the classpath using all project dependencies,
+		     also adding the project build directory -->
+		<classpath/>
+		<argument>org.jruby.Main</argument>
+		<argument>-e</argument>
+		<!-- make sure openssl loads -->
+		<argument>
+		  require 'jar-dependencies'
+		  require 'openssl'
+		  require 'krypt'
+		  puts Gem.loaded_specs.keys.sort.join(',')
+		</argument>
+              </arguments>
+            </configuration>
+	  </execution>
 	</executions>
       </plugin>
     </plugins>

diff --git a/maven/jruby-noasm/src/it/integrity/verify.bsh b/maven/jruby-noasm/src/it/integrity/verify.bsh
@@ -30,6 +30,11 @@ if ( !log.contains( expected ) )
 }
 expected = "gems count 9";
 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";
+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
@@ -64,7 +64,7 @@
     activation do
       jdk '1.6'
     end
-    plugin :invoker, :pomExcludes => ['jetty/pom.xml','j2ee_jetty/pom.xml','j2ee_wildfly/pom.xml']
+    plugin :invoker, :pomExcludes => ['jetty/pom.xml','j2ee_jetty/pom.xml','j2ee_wildfly/pom.xml', '${its.j2ee}', '${its.osgi}']
   end
 
   profile :id => :wlp do

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

diff --git a/maven/jruby/src/it/helloworld/invoker.properties b/maven/jruby/src/it/helloworld/invoker.properties
diff --git a/maven/jruby/src/it/helloworld/pom.xml b/maven/jruby/src/it/helloworld/pom.xml
diff --git a/maven/jruby/src/it/helloworld/verify.bsh b/maven/jruby/src/it/helloworld/verify.bsh
diff --git a/maven/jruby/src/it/integrity/pom.xml b/maven/jruby/src/it/integrity/pom.xml
@@ -106,6 +106,31 @@
 	      </arguments>
 	    </configuration>
 	  </execution>
+	  <execution>
+	    <id>load default gems</id>
+	    <phase>test</phase>
+	    <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>          
+	      <executable>java</executable> 
+              <arguments>
+		<argument>-classpath</argument>
+		<!-- automatically creates the classpath using all project dependencies,
+		     also adding the project build directory -->
+		<classpath/>
+		<argument>org.jruby.Main</argument>
+		<argument>-e</argument>
+		<!-- make sure openssl loads -->
+		<argument>
+		  require 'jar-dependencies'
+		  require 'openssl'
+		  require 'krypt'
+		  puts Gem.loaded_specs.keys.sort.join(',')
+		</argument>
+              </arguments>
+            </configuration>
+	  </execution>
 	</executions>
       </plugin>
     </plugins>

diff --git a/maven/jruby/src/it/integrity/verify.bsh b/maven/jruby/src/it/integrity/verify.bsh
@@ -30,6 +30,11 @@ if ( !log.contains( expected ) )
 }
 expected = "gems count 9";
 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";
+if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );
 }
diff --git a/maven/jruby/src/templates/osgi_all_inclusive/pom.rb.new b/maven/jruby/src/templates/osgi_all_inclusive/pom.rb.new
diff --git a/pom.xml b/pom.xml
@@ -462,6 +462,63 @@
 	<defaultGoal>install</defaultGoal>
       </build>
     </profile>
+    <profile>
+      <id>osgi</id>
+      <modules>
+        <module>maven</module>
+      </modules>
+      <properties>
+	<invoker.skip>false</invoker.skip>
+	<its.osgi>no-excludes/pom.xml</its.osgi>
+      </properties>
+      <build>
+	<defaultGoal>install</defaultGoal>
+	<plugins>
+          <plugin>
+            <artifactId>maven-invoker-plugin</artifactId>
+            <configuration>
+              <pomIncludes>
+                <pomInclude>osgi*/pom.xml</pomInclude>
+	      </pomIncludes>
+	    </configuration>
+	  </plugin>
+	</plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>j2ee</id>
+      <modules>
+        <module>maven</module>
+      </modules>
+      <properties>
+	<invoker.skip>false</invoker.skip>
+	<its.j2ee>no-excludes/pom.xml</its.j2ee>
+      </properties>
+      <build>
+	<defaultGoal>install</defaultGoal>
+	<plugins>
+          <plugin>
+            <artifactId>maven-invoker-plugin</artifactId>
+            <configuration>
+              <pomIncludes>
+                <pomInclude>j2ee*/pom.xml</pomInclude>
+	      </pomIncludes>
+	    </configuration>
+	  </plugin>
+	</plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>single invoker test</id>
+      <activation>
+        <property>
+          <name>invoker.test</name>
+	</property>
+      </activation>
+      <properties>
+	<invoker.skip>false</invoker.skip>
+      </properties>
+    </profile>
     <profile>
       <id>jruby-jars</id>
       <modules>