Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[build] various cleanup - mvn -Prake -Dtask=test:rubicon does r…
…un on clean git clone.
  • Loading branch information
mkristian committed Nov 11, 2014
1 parent 480c520 commit 18cf051
Show file tree
Hide file tree
Showing 11 changed files with 34 additions and 125 deletions.
2 changes: 1 addition & 1 deletion bin/rake
Expand Up @@ -13,7 +13,7 @@ version = ">= 0"
if ARGV.first
str = ARGV.first
str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
if str =~ /\A_(.*)_\z/ and Gem::Version.correct?($1) then
if str =~ /\A_(.*)_\z/
version = $1
ARGV.shift
end
Expand Down
2 changes: 1 addition & 1 deletion bin/rdoc
Expand Up @@ -13,7 +13,7 @@ version = ">= 0"
if ARGV.first
str = ARGV.first
str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
if str =~ /\A_(.*)_\z/ and Gem::Version.correct?($1) then
if str =~ /\A_(.*)_\z/
version = $1
ARGV.shift
end
Expand Down
2 changes: 1 addition & 1 deletion bin/ri
Expand Up @@ -13,7 +13,7 @@ version = ">= 0"
if ARGV.first
str = ARGV.first
str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
if str =~ /\A_(.*)_\z/ and Gem::Version.correct?($1) then
if str =~ /\A_(.*)_\z/
version = $1
ARGV.shift
end
Expand Down
4 changes: 2 additions & 2 deletions core/pom.rb
Expand Up @@ -52,7 +52,7 @@
jar 'com.headius:jsr292-mock:1.1', :scope => 'provided'

jar 'bsf:bsf:2.4.0', :scope => 'provided'
jar 'com.jcraft:jzlib:1.1.2'
jar 'com.jcraft:jzlib:1.1.3'
jar 'com.martiansoftware:nailgun-server:0.9.1'
jar 'com.oracle:truffle:0.5'
jar 'com.oracle:truffle-dsl-processor:0.5', :scope => 'provided'
Expand Down Expand Up @@ -294,7 +294,7 @@
plugin :antrun do
execute_goals( 'run',
:id => 'copy',
:phase => 'package',
:phase => 'initialize',
'tasks' => {
'exec' => {
'@executable' => '/bin/sh',
Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
Expand Up @@ -1020,7 +1020,7 @@
<executions>
<execution>
<id>copy</id>
<phase>package</phase>
<phase>initialize</phase>
<goals>
<goal>run</goal>
</goals>
Expand Down
2 changes: 1 addition & 1 deletion lib/pom.rb
Expand Up @@ -95,7 +95,7 @@ def to_pathname

gem 'ruby-maven', '3.1.1.0.8', :scope => :provided

execute :install_gems, :package do |ctx|
execute :install_gems, :'package' do |ctx|
require 'fileutils'

puts "using jruby #{JRUBY_VERSION}"
Expand Down
14 changes: 7 additions & 7 deletions lib/pom.xml
Expand Up @@ -88,13 +88,6 @@
<version>0.1.2</version>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>ruby-maven</artifactId>
<version>3.1.1.0.8</version>
<type>gem</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>minitest</artifactId>
Expand All @@ -113,6 +106,13 @@
<version>${power_assert.version}</version>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>ruby-maven</artifactId>
<version>3.1.1.0.8</version>
<type>gem</type>
<scope>provided</scope>
</dependency>
</dependencies>
<repositories>
<repository>
Expand Down
6 changes: 4 additions & 2 deletions pom.rb
Expand Up @@ -85,7 +85,9 @@
'bouncy-castle.version' => '1.47',
'github.global.server' => 'github',
'main.basedir' => '${project.basedir}',
'joda.time.version' => '2.3' )
'joda.time.version' => '2.3',
'test-unit.version' => '3.0.3',
'power_assert.version' => '0.1.4' )

unless version =~ /-SNAPSHOT/
properties 'jruby.home' => '${basedir}/..'
Expand Down Expand Up @@ -188,7 +190,7 @@
modules [ 'test' ]

build do
default_goal 'test'
default_goal 'package'
end
end
end
Expand Down
14 changes: 7 additions & 7 deletions pom.xml
Expand Up @@ -114,8 +114,6 @@
<its.j2ee>j2ee*/pom.xml</its.j2ee>
<jruby.basedir>${project.basedir}</jruby.basedir>
<minitest.version>5.4.1</minitest.version>
<test-unit.version>3.0.3</test-unit.version>
<power_assert.version>0.1.4</power_assert.version>
<ant.version>1.9.2</ant.version>
<diff-lcs.version>1.1.3</diff-lcs.version>
<jffi.version>1.2.7</jffi.version>
Expand All @@ -127,6 +125,7 @@
<its.osgi>osgi*/pom.xml</its.osgi>
<base.javac.version>1.7</base.javac.version>
<krypt.version>0.0.2.rc1</krypt.version>
<test-unit.version>3.0.3</test-unit.version>
<rdoc.version>4.1.0</rdoc.version>
<rspec.version>2.14.1</rspec.version>
<tesla.dump.pom>pom.xml</tesla.dump.pom>
Expand All @@ -136,6 +135,7 @@
<jruby.plugins.version>1.0.7-SNAPSHOT</jruby.plugins.version>
<json.version>1.8.0</json.version>
<invoker.skip>true</invoker.skip>
<power_assert.version>0.1.4</power_assert.version>
<version.jruby>${project.version}</version.jruby>
<bouncy-castle.version>1.47</bouncy-castle.version>
<main.basedir>${project.basedir}</main.basedir>
Expand Down Expand Up @@ -536,7 +536,7 @@
<profile>
<id>rake</id>
<build>
<defaultGoal>test</defaultGoal>
<defaultGoal>package</defaultGoal>
</build>
<modules>
<module>test</module>
Expand All @@ -545,7 +545,7 @@
<profile>
<id>exec</id>
<build>
<defaultGoal>test</defaultGoal>
<defaultGoal>package</defaultGoal>
</build>
<modules>
<module>test</module>
Expand All @@ -554,7 +554,7 @@
<profile>
<id>truffle-specs-language</id>
<build>
<defaultGoal>test</defaultGoal>
<defaultGoal>package</defaultGoal>
</build>
<modules>
<module>test</module>
Expand All @@ -563,7 +563,7 @@
<profile>
<id>truffle-specs-core</id>
<build>
<defaultGoal>test</defaultGoal>
<defaultGoal>package</defaultGoal>
</build>
<modules>
<module>test</module>
Expand All @@ -572,7 +572,7 @@
<profile>
<id>truffle-test-pe</id>
<build>
<defaultGoal>test</defaultGoal>
<defaultGoal>package</defaultGoal>
</build>
<modules>
<module>test</module>
Expand Down
4 changes: 2 additions & 2 deletions test/pom.rb
Expand Up @@ -31,7 +31,7 @@
jar 'junit:junit:4.11'
jar 'commons-logging:commons-logging:1.1.3'
jar 'org.livetribe:livetribe-jsr223:2.0.7'
jar 'org.jruby:jruby-lib:${version}'
jar 'org.jruby:jruby-core', '${project.version}'
end
scope :provided do
jar 'org.apache.ant:ant:${ant.version}'
Expand All @@ -40,7 +40,7 @@
jar( 'org.jruby:requireTest:1.0',
:scope => 'system',
:systemPath => '${project.basedir}/jruby/requireTest-1.0.jar' )
gem 'rubygems:rspec:${rspec.version}'
gem 'rspec', '${rspec.version}'

overrides do
plugin( 'org.eclipse.m2e:lifecycle-mapping:1.0.0',
Expand Down
107 changes: 7 additions & 100 deletions test/pom.xml
Expand Up @@ -37,7 +37,7 @@
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby-core</artifactId>
<version>${version}</version>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -240,7 +240,7 @@
</goals>
<configuration>
<target>
<exec dir="${jruby.home}" executable="${jruby.home}/bin/jruby" failonerror="true">
<exec failonerror="true" dir="${jruby.home}" executable="${jruby.home}/bin/jruby">
<arg value="-S" />
<arg value="rake" />
<arg value="${task}" />
Expand Down Expand Up @@ -268,105 +268,12 @@
</goals>
<configuration>
<target>
<exec dir="${jruby.home}" executable="java" failonerror="true">
<exec failonerror="true" dir="${jruby.home}" executable="java">
<arg value="-cp" />
<arg value="core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-${project.version}.jar" />
<arg value="org.jruby.Main" />
<arg value="-I." />
<arg value="/home/christian/projects/active/maven/jruby/test/../lib/ruby/gems/shared/gems/rake-10.1.0/lib/rake/rake_test_loader.rb" />
<arg value="test/jruby/test_globals.rb" />
<arg value="test/jruby/test_argf.rb" />
<arg value="test/jruby/test_array.rb" />
<arg value="test/jruby/test_autoload.rb" />
<arg value="test/jruby/test_backquote.rb" />
<arg value="test/jruby/test_backtraces.rb" />
<arg value="test/jruby/test_big_decimal.rb" />
<arg value="test/jruby/test_binding_eval_yield.rb" />
<arg value="test/jruby/test_caller.rb" />
<arg value="test/jruby/test_case.rb" />
<arg value="test/jruby/test_class.rb" />
<arg value="test/jruby/test_comparable.rb" />
<arg value="test/jruby/test_core_arities.rb" />
<arg value="test/jruby/test_custom_enumerable.rb" />
<arg value="test/jruby/test_cvars_in_odd_scopes.rb" />
<arg value="test/jruby/test_date_joda_time.rb" />
<arg value="test/jruby/test_defined.rb" />
<arg value="test/jruby/test_default_constants.rb" />
<arg value="test/jruby/test_delegated_array_equals.rb" />
<arg value="test/jruby/test_dir.rb" />
<arg value="test/jruby/test_dir_with_jar_without_dir_entry.rb" />
<arg value="test/jruby/test_digest_extend.rb" />
<arg value="test/jruby/test_digest2.rb" />
<arg value="test/jruby/test_env.rb" />
<arg value="test/jruby/test_etc.rb" />
<arg value="test/jruby/test_file.rb" />
<arg value="test/jruby/test_flip.rb" />
<arg value="test/jruby/test_frame_self.rb" />
<arg value="test/jruby/test_hash.rb" />
<arg value="test/jruby/test_higher_javasupport.rb" />
<arg value="test/jruby/test_included_in_object_space.rb" />
<arg value="test/jruby/test_integer_overflows.rb" />
<arg value="test/jruby/test_ivar_table_integrity.rb" />
<arg value="test/jruby/test_io.rb" />
<arg value="test/jruby/test_load.rb" />
<arg value="test/jruby/test_method.rb" />
<arg value="test/jruby/test_method_cache.rb" />
<arg value="test/jruby/test_method_override_and_caching.rb" />
<arg value="test/jruby/test_java_accessible_object.rb" />
<arg value="test/jruby/test_java_extension.rb" />
<arg value="test/jruby/test_java_wrapper_deadlock.rb" />
<arg value="test/jruby/test_jruby_internals.rb" />
<arg value="test/jruby/test_marshal_with_instance_variables.rb" />
<arg value="test/jruby/test_marshal_gemspec.rb" />
<arg value="test/jruby/test_method_missing.rb" />
<arg value="test/jruby/test_no_stack_trace_stomp.rb" />
<arg value="test/jruby/test_pack.rb" />
<arg value="test/jruby/test_primitive_to_java.rb" />
<arg value="test/jruby/test_process.rb" />
<arg value="test/jruby/test_proc_visibility.rb" />
<arg value="test/jruby/test_parsing.rb" />
<arg value="test/jruby/test_pathname_dup.rb" />
<arg value="test/jruby/test_random.rb" />
<arg value="test/jruby/test_rbconfig.rb" />
<arg value="test/jruby/test_require_once.rb" />
<arg value="test/jruby/test_respond_to.rb" />
<arg value="test/jruby/test_socket.rb" />
<arg value="test/jruby/test_string_java_bytes.rb" />
<arg value="test/jruby/test_string_printf.rb" />
<arg value="test/jruby/test_string_to_number.rb" />
<arg value="test/jruby/test_super_call_site_caching.rb" />
<arg value="test/jruby/test_system.rb" />
<arg value="test/jruby/test_system_error.rb" />
<arg value="test/jruby/test_timeout.rb" />
<arg value="test/jruby/test_thread.rb" />
<arg value="test/jruby/test_threaded_nonlocal_return.rb" />
<arg value="test/jruby/test_time_add.rb" />
<arg value="test/jruby/test_time_nil_ops.rb" />
<arg value="test/jruby/test_time_tz.rb" />
<arg value="test/jruby/test_unmarshal.rb" />
<arg value="test/jruby/test_vietnamese_charset.rb" />
<arg value="test/jruby/test_win32.rb" />
<arg value="test/jruby/test_zlib.rb" />
<arg value="test/jruby/test_loading_builtin_libraries.rb" />
<arg value="test/jruby/test_null_channel.rb" />
<arg value="test/jruby/test_irubyobject_java_passing.rb" />
<arg value="test/jruby/test_jruby_object_input_stream.rb" />
<arg value="test/jruby/test_jar_on_load_path.rb" />
<arg value="test/jruby/test_jruby_ext.rb" />
<arg value="test/jruby/test_jruby_core_ext.rb" />
<arg value="test/jruby/test_thread_context_frame_dereferences_unreachable_variables.rb" />
<arg value="test/jruby/test_context_classloader.rb" />
<arg value="test/jruby/test_rexml_document.rb" />
<arg value="test/jruby/test_openssl_stub.rb" />
<arg value="test/jruby/test_missing_jruby_home.rb" />
<arg value="test/jruby/test_jarred_gems_with_spaces_in_directory.rb" />
<arg value="test/jruby/test_kernel.rb" />
<arg value="test/jruby/test_dir_with_plusses.rb" />
<arg value="test/jruby/test_jar_file.rb" />
<arg value="test/jruby/test_jruby_synchronized.rb" />
<arg value="test/jruby/test_instantiating_interfaces.rb" />
<arg value="test/jruby/test_openssl.rb" />
<arg value="test/jruby/test_tempfile_cleanup.rb" />
<arg value="" />
<arg value="-v" />
</exec>
</target>
Expand Down Expand Up @@ -400,7 +307,7 @@
</goals>
<configuration>
<target>
<exec dir="${jruby.home}" executable="${jruby.home}/bin/jruby" failonerror="true">
<exec failonerror="true" dir="${jruby.home}" executable="${jruby.home}/bin/jruby">
<arg value="-X+T" />
<arg value="-Xparser.warn.useless_use_of=false" />
<arg value="-Xparser.warn.not_reached=false" />
Expand Down Expand Up @@ -442,7 +349,7 @@
</goals>
<configuration>
<target>
<exec dir="${jruby.home}" executable="${jruby.home}/bin/jruby" failonerror="true">
<exec failonerror="true" dir="${jruby.home}" executable="${jruby.home}/bin/jruby">
<arg value="-X+T" />
<arg value="-Xparser.warn.useless_use_of=false" />
<arg value="-Xparser.warn.not_reached=false" />
Expand Down Expand Up @@ -484,7 +391,7 @@
</goals>
<configuration>
<target>
<exec dir="${jruby.home}" executable="${jruby.home}/bin/jruby" failonerror="true">
<exec failonerror="true" dir="${jruby.home}" executable="${jruby.home}/bin/jruby">
<arg value="-J-server" />
<arg value="-J-G:-TruffleBackgroundCompilation" />
<arg value="-J-G:+TruffleCompilationExceptionsAreFatal" />
Expand Down

0 comments on commit 18cf051

Please sign in to comment.