Skip to content

Commit

Permalink
Merge branch 'jruby-1_7'
Browse files Browse the repository at this point in the history 
Conflicts:
	.travis.yml
	build.xml
	core/pom.xml
	lib/pom.rb
	maven/jruby-complete/src/it/app_using_classpath_uri/osgi_app/src/test/java/org/jruby/embed/osgi/test/JRubyOsgiEmbedTest.java
	maven/jruby-noasm/src/it/helloworld/pom.xml
	maven/jruby/pom.rb
	maven/jruby/src/it/integrity/verify.bsh
	maven/pom.rb
	maven/pom.xml
	pom.xml
@mkristian
mkristian committed Oct 7, 2014
2 parents 84df0ad + 3c02893 commit 26152a6
Showing 62 changed files with 396 additions and 742 deletions.
6 changes: 2 additions & 4 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -79,11 +79,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
4 changes: 4 additions & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -42,6 +42,10 @@ matrix:
jdk: oraclejdk7
- env: TARGET='-Pcomplete'
jdk: oraclejdk8
- env: TARGET='-Posgi'
jdk: openjdk7
- env: TARGET='-Pj2ee'
jdk: oraclejdk7
fast_finish: true
allow_failures:
- env: TARGET='-Prake -Dtask=spec:compiler'
2 changes: 1 addition & 1 deletion core/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -259,7 +259,7 @@
end


[ :dist, :'jruby-jars', :main, :all, :complete, :release, :snapshots ].each do |name|
[ :osgi, :dist, :'jruby-jars', :main, :all, :complete, :release, :snapshots ].each do |name|
profile name do
plugin :shade do
execute_goals( 'shade',
57 changes: 57 additions & 0 deletions core/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -555,6 +555,63 @@
</plugins>
</build>
<profiles>
<profile>
<id>osgi</id>
<build>
<plugins>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
<id>pack jruby-core-noasm.jar</id>
<phase>verify</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>noasm</shadedClassifierName>
<artifactSet>
<includes>
<include>com.github.jnr:jnr-ffi</include>
<include>org.ow2.asm:*</include>
</includes>
</artifactSet>
<relocations>
<relocation>
<pattern>org.objectweb</pattern>
<shadedPattern>org.jruby.org.objectweb</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
<execution>
<id>pack jruby-core-complete.jar</id>
<phase>verify</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>complete</shadedClassifierName>
<relocations>
<relocation>
<pattern>org.objectweb</pattern>
<shadedPattern>org.jruby.org.objectweb</shadedPattern>
</relocation>
</relocations>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.jruby.Main</mainClass>
</transformer>
</transformers>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>dist</id>
<build>
6 changes: 4 additions & 2 deletions lib/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -22,7 +22,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( 'jruby-readline', '1.0.dev-SNAPSHOT', false ),
ImportedGem.new( 'jruby-ripper', '2.1.0.dev-SNAPSHOT', false, '2.1' ),
ImportedGem.new( 'rake', 'rake.version', true ),
@@ -75,7 +75,9 @@ def to_pathname

plugin( :clean,
:filesets => [ { :directory => '${basedir}/ruby/gems/shared/specifications/default',
:includes => [ '*' ] } ] )
:includes => [ '*' ] },
{ :directory => '${basedir}/ruby/shared',
:includes => [ '**/bouncycastle/**/*.jar' ] } ] )

# tell maven to download the respective gem artifacts
default_gems.each do |g|
8 changes: 7 additions & 1 deletion lib/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
@@ -115,6 +115,12 @@
<include>*</include>
</includes>
</fileset>
<fileset>
<directory>${basedir}/ruby/shared</directory>
<includes>
<include>**/bouncycastle/**/*.jar</include>
</includes>
</fileset>
</filesets>
</configuration>
</plugin>
17 changes: 13 additions & 4 deletions maven/jruby-complete/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -49,16 +49,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 !!!
@@ -92,6 +101,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
25 changes: 25 additions & 0 deletions maven/jruby-complete/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -66,6 +66,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>
@@ -170,6 +193,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>
2 changes: 1 addition & 1 deletion maven/jruby-complete/src/it/GH-1983_jruby-completedotjar-S-irb-doesnt-work-anymore/irb.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
JAVA=`which java`
# jirb_swing does not work in those test environments
for i in irb jirb ; do
echo "puts 'hello $i'" | PATH= $JAVA -jar jruby-complete-1.7.16-SNAPSHOT.jar -S $i
echo "puts 'hello $i'" | PATH= $JAVA -jar jruby-complete-${1}.jar -S $i
done
5 changes: 3 additions & 2 deletions maven/jruby-complete/src/it/GH-1983_jruby-completedotjar-S-irb-doesnt-work-anymore/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -8,15 +8,15 @@
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby-complete</artifactId>
<version>1.7.16-SNAPSHOT</version>
<version>@project.version@</version>
<type>jar</type>
</dependency>
</dependencies>

<build>
<resources>
<resource>
<directory>../../local-repo/org/jruby/jruby-complete/1.7.16-SNAPSHOT</directory>
<directory>../../local-repo/org/jruby/jruby-complete/@project.version@</directory>
<includes>
<include>jruby-complete-*.jar</include>
</includes>
@@ -36,6 +36,7 @@
<executable>sh</executable>
<arguments>
<argument>irb.sh</argument>
<argument>@project.version@</argument>
</arguments>
</configuration>
</execution>
3 changes: 0 additions & 3 deletions maven/jruby-complete/src/it/helloworld/invoker.properties
View file

This file was deleted.

45 changes: 0 additions & 45 deletions maven/jruby-complete/src/it/helloworld/pom.xml
View file

This file was deleted.

20 changes: 0 additions & 20 deletions maven/jruby-complete/src/it/helloworld/verify.bsh
View file

This file was deleted.

25 changes: 25 additions & 0 deletions maven/jruby-complete/src/it/integrity/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
5 changes: 5 additions & 0 deletions maven/jruby-complete/src/it/integrity/verify.bsh
View file
Original file line number Diff line number Diff line change
@@ -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 + "'" );
}
439 changes: 0 additions & 439 deletions maven/jruby-complete/src/it/osgi_many_bundles_with_embedded_gems/build.log
View file

This file was deleted.

0 ...es_with_embedded_gems/gems-bundle/Gemfile → ...es_with_embedded_gems/gems-bundle/Gemfile
View file
File renamed without changes.
0 ...les_with_embedded_gems/gems-bundle/pom.rb → ...les_with_embedded_gems/gems-bundle/pom.rb
View file
File renamed without changes.
0 ...es_with_embedded_gems/gems-bundle/pom.xml → ...es_with_embedded_gems/gems-bundle/pom.xml
View file
File renamed without changes.
0 ...c/main/java/org/jruby/osgi/gems/Gems.java → ...c/main/java/org/jruby/osgi/gems/Gems.java
View file
File renamed without changes.
0 ...les_with_embedded_gems/invoker.properties → ...les_with_embedded_gems/invoker.properties
View file
File renamed without changes.
0 ...gi_many_bundles_with_embedded_gems/pom.rb → ...gi_many_bundles_with_embedded_gems/pom.rb
View file
File renamed without changes.
0 ...i_many_bundles_with_embedded_gems/pom.xml → ...i_many_bundles_with_embedded_gems/pom.xml
View file
File renamed without changes.
0 ..._with_embedded_gems/scripts-bundle/pom.rb → ..._with_embedded_gems/scripts-bundle/pom.rb
View file
File renamed without changes.
0 ...with_embedded_gems/scripts-bundle/pom.xml → ...with_embedded_gems/scripts-bundle/pom.xml
View file
File renamed without changes.
0 .../java/org/jruby/osgi/scripts/Scripts.java → .../java/org/jruby/osgi/scripts/Scripts.java
View file
File renamed without changes.
0 ...ms/scripts-bundle/src/main/ruby/.jrubydir → ...ms/scripts-bundle/src/main/ruby/.jrubydir
View file
File renamed without changes.
0 ...ems/scripts-bundle/src/main/ruby/hello.rb → ...ems/scripts-bundle/src/main/ruby/hello.rb
View file
File renamed without changes.
0 ...ems/scripts-bundle/src/main/ruby/world.rb → ...ems/scripts-bundle/src/main/ruby/world.rb
View file
File renamed without changes.
0 ...ny_bundles_with_embedded_gems/test/pom.rb → ...ny_bundles_with_embedded_gems/test/pom.rb
View file
File renamed without changes.
0 ...y_bundles_with_embedded_gems/test/pom.xml → ...y_bundles_with_embedded_gems/test/pom.xml
View file
File renamed without changes.
3 changes: 2 additions & 1 deletion ...y/embed/osgi/test/JRubyOsgiEmbedTest.java → ...y/embed/osgi/test/JRubyOsgiEmbedTest.java
View file
Original file line number Diff line number Diff line change
@@ -108,7 +108,8 @@ 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" );
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
23 changes: 23 additions & 0 deletions maven/jruby-dist/src/it/integrity/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
5 changes: 5 additions & 0 deletions maven/jruby-dist/src/it/integrity/verify.bsh
View file
Original file line number Diff line number Diff line change
@@ -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 + "'" );
}
3 changes: 0 additions & 3 deletions maven/jruby-jars/src/it/helloworld/invoker.properties
View file

This file was deleted.

50 changes: 0 additions & 50 deletions maven/jruby-jars/src/it/helloworld/pom.xml
View file

This file was deleted.

20 changes: 0 additions & 20 deletions maven/jruby-jars/src/it/helloworld/verify.bsh
View file

This file was deleted.

23 changes: 23 additions & 0 deletions maven/jruby-jars/src/it/integrity/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
5 changes: 5 additions & 0 deletions maven/jruby-jars/src/it/integrity/verify.bsh
View file
Original file line number Diff line number Diff line change
@@ -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 + "'" );
}
3 changes: 0 additions & 3 deletions maven/jruby-noasm/src/it/helloworld/invoker.properties
View file

This file was deleted.

42 changes: 0 additions & 42 deletions maven/jruby-noasm/src/it/helloworld/pom.xml
View file

This file was deleted.

20 changes: 0 additions & 20 deletions maven/jruby-noasm/src/it/helloworld/verify.bsh
View file

This file was deleted.

25 changes: 25 additions & 0 deletions maven/jruby-noasm/src/it/integrity/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
5 changes: 5 additions & 0 deletions maven/jruby-noasm/src/it/integrity/verify.bsh
View file
Original file line number Diff line number Diff line change
@@ -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 + "'" );
}
19 changes: 14 additions & 5 deletions maven/jruby/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -27,28 +27,37 @@
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.rm_rf( target )
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'
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
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
27 changes: 27 additions & 0 deletions maven/jruby/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -43,6 +43,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>
@@ -83,6 +106,8 @@
<configuration>
<pomExcludes>
<pomExclude>osgi_all_inclusive_felix-3.2/pom.xml</pomExclude>
<pomExclude>${its.j2ee}</pomExclude>
<pomExclude>${its.osgi}</pomExclude>
</pomExcludes>
</configuration>
</plugin>
@@ -103,6 +128,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>
3 changes: 0 additions & 3 deletions maven/jruby/src/it/helloworld/invoker.properties
View file

This file was deleted.

42 changes: 0 additions & 42 deletions maven/jruby/src/it/helloworld/pom.xml
View file

This file was deleted.

20 changes: 0 additions & 20 deletions maven/jruby/src/it/helloworld/verify.bsh
View file

This file was deleted.

25 changes: 25 additions & 0 deletions maven/jruby/src/it/integrity/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
5 changes: 5 additions & 0 deletions maven/jruby/src/it/integrity/verify.bsh
View file
Original file line number Diff line number Diff line change
@@ -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 + "'" );
}
0 ...n/jruby/src/it/osgi_all_inclusive/Gemfile → .../src/templates/osgi_all_inclusive/Gemfile
View file
File renamed without changes.
0 .../it/osgi_all_inclusive/invoker.properties → ...tes/osgi_all_inclusive/invoker.properties
View file
File renamed without changes.
0 maven/jruby/src/it/osgi_all_inclusive/pom.rb → ...y/src/templates/osgi_all_inclusive/pom.rb
View file
File renamed without changes.
0 ...n/jruby/src/it/osgi_all_inclusive/pom.xml → .../src/templates/osgi_all_inclusive/pom.xml
View file
File renamed without changes.
0 ...osgi_all_inclusive/src/main/ruby/hello.rb → ...osgi_all_inclusive/src/main/ruby/hello.rb
View file
File renamed without changes.
0 ...osgi_all_inclusive/src/main/ruby/world.rb → ...osgi_all_inclusive/src/main/ruby/world.rb
View file
File renamed without changes.
1 change: 1 addition & 0 deletions ...y/embed/osgi/test/JRubyOsgiEmbedTest.java → ...y/embed/osgi/test/JRubyOsgiEmbedTest.java
View file
Original file line number Diff line number Diff line change
@@ -96,6 +96,7 @@ 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\", \"jar-dependencies\", \"ffi\", \"krypt-provider-jdk\", \"krypt-core\", \"krypt\"]");

13 changes: 7 additions & 6 deletions maven/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -22,12 +22,13 @@
end
end

map = { 'jruby' => ['release', 'main' ],
'jruby-noasm' => ['release', 'main' ],
'jruby-stdlib' => ['release', 'main', 'complete', 'dist', 'jruby-jars' ],
'jruby-complete' => ['release', 'complete', 'dist' ],
'jruby-jars' => ['release', 'jruby-jars' ],
'jruby-dist' => ['release', 'dist']
# module to profile map
map = { 'jruby' => [ :release, :main, :osgi, :j2ee ],
'jruby-noasm' => [ :release, :main, :osgi ],
'jruby-stdlib' => [ :release, :main, :complete, :dist, 'jruby-jars', :osgi, :j2ee ],
'jruby-complete' => [ :release, :complete, :osgi ],
'jruby-jars' => [ :release, 'jruby-jars' ],
'jruby-dist' => [ :release, :dist ]
}

profile :all do
17 changes: 16 additions & 1 deletion maven/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -76,6 +76,22 @@
<module>jruby-stdlib</module>
</modules>
</profile>
<profile>
<id>osgi</id>
<modules>
<module>jruby</module>
<module>jruby-noasm</module>
<module>jruby-stdlib</module>
<module>jruby-complete</module>
</modules>
</profile>
<profile>
<id>j2ee</id>
<modules>
<module>jruby</module>
<module>jruby-stdlib</module>
</modules>
</profile>
<profile>
<id>complete</id>
<modules>
@@ -87,7 +103,6 @@
<id>dist</id>
<modules>
<module>jruby-stdlib</module>
<module>jruby-complete</module>
<module>jruby-dist</module>
</modules>
</profile>
21 changes: 17 additions & 4 deletions pom.rb
View file
Original file line number Diff line number Diff line change
@@ -9,6 +9,8 @@

description 'JRuby is the effort to recreate the Ruby (http://www.ruby-lang.org) interpreter in Java.'

organization 'JRuby', 'http://jruby.org'

[ 'headius', 'enebo', 'wmeissner', 'BanzaiMan', 'mkristian' ].each do |name|
developer name do
name name
@@ -24,6 +26,10 @@
end
end

license 'GPL 3', 'http://www.gnu.org/licenses/gpl-3.0-standalone.html'
license 'LGPL 3', 'http://www.gnu.org/licenses/lgpl-3.0-standalone.html'
license 'EPL', 'http://www.eclipse.org/legal/epl-v10.html'

plugin_repository( 'https://oss.sonatype.org/content/repositories/snapshots/',
:id => 'sonatype' ) do
releases 'false'
@@ -50,7 +56,9 @@
:name => 'JRuby Site' )
end

properties( 'minitest-excludes.version' => '1.0.2',
properties( 'its.j2ee' => 'j2ee*/pom.xml',
'its.osgi' => 'osgi*/pom.xml',
'minitest-excludes.version' => '1.0.2',
'tesla.version' => '0.1.1',
'rspec-core.version' => '2.14.2',
'jruby.basedir' => '${project.basedir}',
@@ -188,7 +196,7 @@
end
end

[ 'jruby-jars', 'main', 'complete', 'dist' ].each do |name|
[ 'osgi', 'j2ee', 'jruby-jars', 'main', 'complete', 'dist' ].each do |name|

profile name do

@@ -206,8 +214,6 @@

modules all_modules

#snapshot_repository 'http://ci.jruby.org/snapshots/maven', :id => 'jruby-snapshots'

build do
default_goal 'install'
end
@@ -245,6 +251,13 @@
end
end

profile 'single invoker test' do
activation do
property :name => 'invoker.test'
end
properties 'invoker.skip' => false
end

reporting do
plugin( :'project-info-reports', '2.4',
'dependencyLocationsEnabled' => 'false',
49 changes: 49 additions & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -15,6 +15,24 @@
<description>JRuby is the effort to recreate the Ruby (http://www.ruby-lang.org) interpreter in Java.</description>
<url>https://github.com/jruby/jruby</url>
<inceptionYear>2001</inceptionYear>
<organization>
<name>JRuby</name>
<url>http://jruby.org</url>
</organization>
<licenses>
<license>
<name>GPL 3</name>
<url>http://www.gnu.org/licenses/gpl-3.0-standalone.html</url>
</license>
<license>
<name>LGPL 3</name>
<url>http://www.gnu.org/licenses/lgpl-3.0-standalone.html</url>
</license>
<license>
<name>EPL</name>
<url>http://www.eclipse.org/legal/epl-v10.html</url>
</license>
</licenses>
<developers>
<developer>
<id>headius</id>
@@ -94,6 +112,7 @@
<minitest-excludes.version>1.0.2</minitest-excludes.version>
<tesla.version>0.1.1</tesla.version>
<rspec-core.version>2.14.2</rspec-core.version>
<its.j2ee>j2ee*/pom.xml</its.j2ee>
<jruby.basedir>${project.basedir}</jruby.basedir>
<minitest.version>5.0.7</minitest.version>
<ant.version>1.9.2</ant.version>
@@ -104,6 +123,7 @@
<jruby-launcher.version>1.0.19</jruby-launcher.version>
<rspec-expectations.version>2.14.0</rspec-expectations.version>
<asm.version>5.0.3</asm.version>
<its.osgi>osgi*/pom.xml</its.osgi>
<base.javac.version>1.7</base.javac.version>
<krypt.version>0.0.2.rc1</krypt.version>
<rdoc.version>4.1.0</rdoc.version>
@@ -560,6 +580,24 @@
<module>test</module>
</modules>
</profile>
<profile>
<id>osgi</id>
<build>
<defaultGoal>install</defaultGoal>
</build>
<modules>
<module>maven</module>
</modules>
</profile>
<profile>
<id>j2ee</id>
<build>
<defaultGoal>install</defaultGoal>
</build>
<modules>
<module>maven</module>
</modules>
</profile>
<profile>
<id>jruby-jars</id>
<build>
@@ -650,5 +688,16 @@
<snapshots.dir>/builds/snapshots</snapshots.dir>
</properties>
</profile>
<profile>
<id>single invoker test</id>
<activation>
<property>
<name>invoker.test</name>
</property>
</activation>
<properties>
<invoker.skip>false</invoker.skip>
</properties>
</profile>
</profiles>
</project>

0 comments on commit 26152a6

Please sign in to comment.