Skip to content

Commit

Permalink
Merge pull request #2211 from jruby/versions
Browse files Browse the repository at this point in the history
Versions
  • Loading branch information
chrisseaton committed Nov 18, 2014
2 parents 0cfdfe5 + 5c758d7 commit 43a9fd4
Show file tree
Hide file tree
Showing 15 changed files with 117 additions and 29 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9.0.0.0.dev-SNAPSHOT
9.0.0.0-SNAPSHOT
2 changes: 1 addition & 1 deletion core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-parent</artifactId>
<version>9.0.0.0.dev-SNAPSHOT</version>
<version>9.0.0.0-SNAPSHOT</version>
</parent>
<artifactId>jruby-core</artifactId>
<name>JRuby Core</name>
Expand Down
4 changes: 2 additions & 2 deletions lib/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-parent</artifactId>
<version>9.0.0.0.dev-SNAPSHOT</version>
<version>9.0.0.0-SNAPSHOT</version>
</parent>
<artifactId>jruby-lib</artifactId>
<packaging>pom</packaging>
Expand All @@ -20,7 +20,7 @@
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby-core</artifactId>
<version>9.0.0.0.dev-SNAPSHOT</version>
<version>9.0.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>rubygems</groupId>
Expand Down
2 changes: 1 addition & 1 deletion maven/jruby-complete/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-artifacts</artifactId>
<version>9.0.0.0.dev-SNAPSHOT</version>
<version>9.0.0.0-SNAPSHOT</version>
</parent>
<artifactId>jruby-complete</artifactId>
<packaging>bundle</packaging>
Expand Down
6 changes: 1 addition & 5 deletions maven/jruby-dist/pom.rb
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,6 @@

plugin( :invoker )

build do
final_name "#{model.artifact_id}-#{version.sub(/-SNAPSHOT/, '')}"
end

# for the release we do some extra IT by unzipping a source dist file
# and run the $ mvn -Pall from there and check a few things to be in place.
# add check for SNAPSHOT version in any of the modules !!!!
Expand Down Expand Up @@ -136,7 +132,7 @@

revision = `git show`.gsub( /\n.*|commit /, '' )

basefile = "#{ctx.project.build.directory}/#{ctx.project.artifactId}-#{ctx.project.version}-src".sub(/-SNAPSHOT/, '')
basefile = "#{ctx.project.build.directory}/#{ctx.project.artifactId}-#{ctx.project.version}-src"

FileUtils.cd( File.join( ctx.project.basedir.to_s, '..', '..' ) ) do
[ 'tar', 'zip' ].each do |format|
Expand Down
3 changes: 1 addition & 2 deletions maven/jruby-dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-artifacts</artifactId>
<version>9.0.0.0.dev-SNAPSHOT</version>
<version>9.0.0.0-SNAPSHOT</version>
</parent>
<artifactId>jruby-dist</artifactId>
<packaging>pom</packaging>
Expand All @@ -27,7 +27,6 @@
</dependency>
</dependencies>
<build>
<finalName>jruby-dist-9.0.0.0.dev</finalName>
<plugins>
<plugin>
<groupId>de.saumya.mojo</groupId>
Expand Down
2 changes: 1 addition & 1 deletion maven/jruby-jars/jruby-jars.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require 'rexml/xpath'
version = File.read( File.join( File.dirname(File.expand_path(__FILE__)), '..', '..', 'VERSION' ) ).strip

# this regexp can be refined to work with pre, rc1, rc2 and such cases
ruby_version = version.sub( /-SNAPSHOT$/, '.dev' ).sub( /.dev.dev/, '.dev' )
ruby_version = version.sub( /-SNAPSHOT$/, '.snapshot' )

File.open( 'lib/jruby-jars/version.rb', 'w' ) do |f|
f.print <<EOF
Expand Down
4 changes: 2 additions & 2 deletions maven/jruby-jars/lib/jruby-jars/version.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module JRubyJars
VERSION = '9.0.0.0.dev'
MAVEN_VERSION = '9.0.0.0.dev-SNAPSHOT'
VERSION = '9.0.0.0.snapshot'
MAVEN_VERSION = '9.0.0.0-SNAPSHOT'
end
6 changes: 3 additions & 3 deletions maven/jruby-jars/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-artifacts</artifactId>
<version>9.0.0.0.dev-SNAPSHOT</version>
<version>9.0.0.0-SNAPSHOT</version>
</parent>
<groupId>rubygems</groupId>
<artifactId>jruby-jars</artifactId>
Expand Down Expand Up @@ -67,7 +67,7 @@ freezing to) a specific jruby-complete jar version.</description>
</extension>
</extensions>
<directory>${basedir}/pkg</directory>
<finalName>${project.artifactId}-9.0.0.0.dev</finalName>
<finalName>${project.artifactId}-9.0.0.0.snapshot</finalName>
<plugins>
<plugin>
<groupId>de.saumya.mojo</groupId>
Expand Down Expand Up @@ -114,7 +114,7 @@ freezing to) a specific jruby-complete jar version.</description>
<artifactId>maven-invoker-plugin</artifactId>
<configuration>
<properties>
<ruby.version>9.0.0.0.dev</ruby.version>
<ruby.version>9.0.0.0.snapshot</ruby.version>
<gem.home>${project.build.directory}/rubygems</gem.home>
<gem.path>${project.build.directory}/rubygems</gem.path>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion maven/jruby-noasm/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-artifacts</artifactId>
<version>9.0.0.0.dev-SNAPSHOT</version>
<version>9.0.0.0-SNAPSHOT</version>
</parent>
<artifactId>jruby-noasm</artifactId>
<name>JRuby Main Maven Artifact With ASM Relocated</name>
Expand Down
2 changes: 1 addition & 1 deletion maven/jruby-stdlib/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-artifacts</artifactId>
<version>9.0.0.0.dev-SNAPSHOT</version>
<version>9.0.0.0-SNAPSHOT</version>
</parent>
<artifactId>jruby-stdlib</artifactId>
<name>JRuby Stdlib</name>
Expand Down
2 changes: 1 addition & 1 deletion maven/jruby/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-artifacts</artifactId>
<version>9.0.0.0.dev-SNAPSHOT</version>
<version>9.0.0.0-SNAPSHOT</version>
</parent>
<artifactId>jruby</artifactId>
<name>JRuby Main Maven Artifact</name>
Expand Down
2 changes: 1 addition & 1 deletion maven/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-parent</artifactId>
<version>9.0.0.0.dev-SNAPSHOT</version>
<version>9.0.0.0-SNAPSHOT</version>
</parent>
<artifactId>jruby-artifacts</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-parent</artifactId>
<version>9.0.0.0.dev-SNAPSHOT</version>
<version>9.0.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>JRuby</name>
<description>JRuby is the effort to recreate the Ruby (http://www.ruby-lang.org) interpreter in Java.</description>
Expand Down
105 changes: 99 additions & 6 deletions test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-parent</artifactId>
<version>9.0.0.0.dev-SNAPSHOT</version>
<version>9.0.0.0-SNAPSHOT</version>
</parent>
<artifactId>jruby-tests</artifactId>
<name>JRuby Integration Tests</name>
Expand Down Expand Up @@ -240,7 +240,7 @@
</goals>
<configuration>
<target>
<exec failonerror="true" dir="${jruby.home}" executable="${jruby.home}/bin/jruby">
<exec dir="${jruby.home}" executable="${jruby.home}/bin/jruby" failonerror="true">
<arg value="-S" />
<arg value="rake" />
<arg value="${task}" />
Expand Down Expand Up @@ -268,12 +268,105 @@
</goals>
<configuration>
<target>
<exec failonerror="true" dir="${jruby.home}" executable="java">
<exec dir="${jruby.home}" executable="java" failonerror="true">
<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="" />
<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="-v" />
</exec>
</target>
Expand Down Expand Up @@ -307,7 +400,7 @@
</goals>
<configuration>
<target>
<exec failonerror="true" dir="${jruby.home}" executable="${jruby.home}/bin/jruby">
<exec dir="${jruby.home}" executable="${jruby.home}/bin/jruby" failonerror="true">
<arg value="-X+T" />
<arg value="-Xparser.warn.useless_use_of=false" />
<arg value="-Xparser.warn.not_reached=false" />
Expand Down Expand Up @@ -349,7 +442,7 @@
</goals>
<configuration>
<target>
<exec failonerror="true" dir="${jruby.home}" executable="${jruby.home}/bin/jruby">
<exec dir="${jruby.home}" executable="${jruby.home}/bin/jruby" failonerror="true">
<arg value="-X+T" />
<arg value="-Xparser.warn.useless_use_of=false" />
<arg value="-Xparser.warn.not_reached=false" />
Expand Down Expand Up @@ -391,7 +484,7 @@
</goals>
<configuration>
<target>
<exec failonerror="true" dir="${jruby.home}" executable="${jruby.home}/bin/jruby">
<exec dir="${jruby.home}" executable="${jruby.home}/bin/jruby" failonerror="true">
<arg value="-J-server" />
<arg value="-J-G:-TruffleBackgroundCompilation" />
<arg value="-J-G:+TruffleCompilationExceptionsAreFatal" />
Expand Down

0 comments on commit 43a9fd4

Please sign in to comment.