Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9388c744ec87
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f7b3b4291329
Choose a head ref
  • 6 commits
  • 6 files changed
  • 1 contributor

Commits on Oct 8, 2016

  1. first step to use maven profiles to set bootclasspath

    jdk9 on macos can not handle both configurations. is related to #4103
    mkristian committed Oct 8, 2016
    Copy the full SHA
    f2c9a07 View commit details
  2. Copy the full SHA
    ad8b487 View commit details
  3. Copy the full SHA
    e7371a7 View commit details

Commits on Dec 3, 2016

  1. Copy the full SHA
    8705ed5 View commit details
  2. rebuild pom.xml

    mkristian committed Dec 3, 2016
    Copy the full SHA
    7cb6ebf View commit details
  3. pick the right javac version depending on the jdk which runs maven

    jdk8 uses 1.8 as specification version and jdk9 is using 9. there could be
    other ways to solve this - just picked one.
    mkristian committed Dec 3, 2016
    Copy the full SHA
    f7b3b42 View commit details
Showing with 105 additions and 65 deletions.
  1. +12 −7 core/pom.rb
  2. +59 −44 core/pom.xml
  3. +1 −1 lib/pom.rb
  4. +4 −6 lib/pom.xml
  5. +11 −2 truffle/pom.rb
  6. +18 −5 truffle/pom.xml
19 changes: 12 additions & 7 deletions core/pom.rb
Original file line number Diff line number Diff line change
@@ -172,8 +172,8 @@
'compilerArgs' => { 'arg' => '-J-Xmx1G' },
'showWarnings' => 'true',
'showDeprecation' => 'true',
'source' => [ '${base.java.version}', '1.7' ],
'target' => [ '${base.javac.version}', '1.7' ],
'source' => '${base.java.version}',
'target' => '${base.javac.version}',
'useIncrementalCompilation' => 'false' ) do
execute_goals( 'compile',
:id => 'anno',
@@ -388,12 +388,17 @@

end

profile 'bootclasspath' do
activation do
jdk '1.8'
end
# TODO change to 1.9 when running with jdk9 as soon as core builds
# with jdk9
{ '52.0': '1.8', '53.0': '1.8' }.each do |class_version, java_version|
profile "#{class_version}" do
activation do
property name: 'java.class.version', value: class_version
end

properties 'bootclasspath': '-J-Xbootclasspath/p:${unsafe.jar}'
properties( 'base.java.version': java_version,
'base.javac.version': java_version )
end
end

profile 'tzdata' do
103 changes: 59 additions & 44 deletions core/pom.xml
Original file line number Diff line number Diff line change
@@ -17,58 +17,58 @@ DO NOT MODIFIY - GENERATED CODE
<artifactId>jruby-core</artifactId>
<name>JRuby Core</name>
<properties>
<release.dir>release</release.dir>
<version.ruby>2.3.1</version.ruby>
<prawn.dir>${test.dir}/prawn</prawn.dir>
<spec.tags.dir>${spec.dir}/tags</spec.tags.dir>
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
<pkg.dir>${build.dir}/pkg</pkg.dir>
<unsafe.jar>${settings.localRepository}/com/headius/unsafe-mock/${unsafe.version}/unsafe-mock-${unsafe.version}.jar</unsafe.jar>
<version.ruby.revision>54768</version.ruby.revision>
<dest.lib.dir>${lib.dir}</dest.lib.dir>
<tzdata.version>2013d</tzdata.version>
<jruby.basedir>${basedir}/..</jruby.basedir>
<rubyspec.1.8.dir>${rubyspec.dir}/1.8</rubyspec.1.8.dir>
<build.date>${maven.build.timestamp}</build.date>
<main.basedir>${project.parent.basedir}</main.basedir>
<prawn.stable.version>0.4.1</prawn.stable.version>
<jruby.gem.home>lib/ruby/gems/shared</jruby.gem.home>
<spec.dir>spec</spec.dir>
<maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
<mspec.dir>${spec.dir}/mspec</mspec.dir>
<install4j.executable>/Applications/install4j 4/bin/install4jc</install4j.executable>
<jay.bin>jay</jay.bin>
<test.classes.dir>${test.dir}/target/test-classes</test.classes.dir>
<test.dir>test</test.dir>
<mspec.bin>${mspec.dir}/bin/mspec</mspec.bin>
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
<jruby.test.memory.permgen>2G</jruby.test.memory.permgen>
<Constants.java>org/jruby/runtime/Constants.java</Constants.java>
<rails.dir>${test.dir}/rails</rails.dir>
<test.results.dir>${build.dir}/test-results</test.results.dir>
<jruby.compile.memory>2G</jruby.compile.memory>
<build.lib.dir>test/target</build.lib.dir>
<create.sources.jar>false</create.sources.jar>
<anno.sources>${project.basedir}/target/generated-sources</anno.sources>
<jruby.launch.memory>1024M</jruby.launch.memory>
<jruby.win32ole.gem>jruby-win32ole</jruby.win32ole.gem>
<unsafe.jar>${settings.localRepository}/com/headius/unsafe-mock/${unsafe.version}/unsafe-mock-${unsafe.version}.jar</unsafe.jar>
<jflex.bin>jflex</jflex.bin>
<parser.dir>core/src/main/java/org/jruby/parser</parser.dir>
<installer.gems>${jruby.win32ole.gem}</installer.gems>
<version.ruby.major>2.3</version.ruby.major>
<maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
<prawn.git.repo>git://github.com/sandal/prawn.git</prawn.git.repo>
<version.ruby.minor>1</version.ruby.minor>
<tzdata.version>2013d</tzdata.version>
<install4j.executable>/Applications/install4j 4/bin/install4jc</install4j.executable>
<jay.bin>jay</jay.bin>
<polyglot.dump.readonly>true</polyglot.dump.readonly>
<dest.lib.dir>${lib.dir}</dest.lib.dir>
<rails.git.repo>git://github.com/rails/rails.git</rails.git.repo>
<unsafe.version>8.92.1</unsafe.version>
<mspec.tar.file>${build.dir}/mspec.tgz</mspec.tar.file>
<build.dir>target</build.dir>
<polyglot.dump.readonly>true</polyglot.dump.readonly>
<maven.test.skip>true</maven.test.skip>
<rubyspec.1.8.dir>${rubyspec.dir}/1.8</rubyspec.1.8.dir>
<jruby.launch.memory>1024M</jruby.launch.memory>
<jruby.compile.memory>2G</jruby.compile.memory>
<version.ruby.major>2.3</version.ruby.major>
<unsafe.version>8.92.1</unsafe.version>
<release.dir>release</release.dir>
<create.sources.jar>false</create.sources.jar>
<jruby.test.memory>3G</jruby.test.memory>
<lib.dir>lib</lib.dir>
<rails.dir>${test.dir}/rails</rails.dir>
<parser.dir>core/src/main/java/org/jruby/parser</parser.dir>
<jruby.basedir>${basedir}/..</jruby.basedir>
<rubyspec.dir>${spec.dir}/ruby</rubyspec.dir>
<version.ruby.revision>54768</version.ruby.revision>
<jruby.test.memory>3G</jruby.test.memory>
<bootclasspath>-Xbootclasspath/p:${unsafe.jar}</bootclasspath>
<mspec.dir>${spec.dir}/mspec</mspec.dir>
<build.date>${maven.build.timestamp}</build.date>
<main.basedir>${project.parent.basedir}</main.basedir>
<tzdata.scope>provided</tzdata.scope>
<test.results.dir>${build.dir}/test-results</test.results.dir>
<prawn.stable.version>0.4.1</prawn.stable.version>
<mspec.tar.file>${build.dir}/mspec.tgz</mspec.tar.file>
<build.lib.dir>test/target</build.lib.dir>
<anno.sources>${project.basedir}/target/generated-sources</anno.sources>
<rake.args></rake.args>
<test.dir>test</test.dir>
<jflex.bin>jflex</jflex.bin>
<jruby.win32ole.gem>jruby-win32ole</jruby.win32ole.gem>
<mspec.bin>${mspec.dir}/bin/mspec</mspec.bin>
<jruby.gem.home>lib/ruby/gems/shared</jruby.gem.home>
<Constants.java>org/jruby/runtime/Constants.java</Constants.java>
<test.classes.dir>${test.dir}/target/test-classes</test.classes.dir>
<pkg.dir>${build.dir}/pkg</pkg.dir>
<rails.git.repo>git://github.com/rails/rails.git</rails.git.repo>
<prawn.dir>${test.dir}/prawn</prawn.dir>
<spec.tags.dir>${spec.dir}/tags</spec.tags.dir>
</properties>
<dependencies>
<dependency>
@@ -546,9 +546,7 @@ DO NOT MODIFIY - GENERATED CODE
<showWarnings>true</showWarnings>
<showDeprecation>true</showDeprecation>
<source>${base.java.version}</source>
<source>1.7</source>
<target>${base.javac.version}</target>
<target>1.7</target>
<useIncrementalCompilation>false</useIncrementalCompilation>
</configuration>
</plugin>
@@ -1107,12 +1105,29 @@ DO NOT MODIFIY - GENERATED CODE
</build>
</profile>
<profile>
<id>bootclasspath</id>
<id>52.0</id>
<activation>
<jdk>1.8</jdk>
<property>
<name>java.class.version</name>
<value>52.0</value>
</property>
</activation>
<properties>
<base.javac.version>1.8</base.javac.version>
<base.java.version>1.8</base.java.version>
</properties>
</profile>
<profile>
<id>53.0</id>
<activation>
<property>
<name>java.class.version</name>
<value>53.0</value>
</property>
</activation>
<properties>
<bootclasspath>-J-Xbootclasspath/p:${unsafe.jar}</bootclasspath>
<base.javac.version>1.8</base.javac.version>
<base.java.version>1.8</base.java.version>
</properties>
</profile>
<profile>
2 changes: 1 addition & 1 deletion lib/pom.rb
Original file line number Diff line number Diff line change
@@ -62,7 +62,7 @@ def initialize( name, version, default_spec = true )
# just depends on jruby-core so we are sure the jruby.jar is in place
jar "org.jruby:jruby-core:#{version}", :scope => 'test'

extension 'org.torquebox.mojo:mavengem-wagon:0.2.2-SNAPSHOT'
extension 'org.torquebox.mojo:mavengem-wagon:0.2.2'

repository :id => :mavengems, :url => 'mavengem:https://rubygems.org'

10 changes: 4 additions & 6 deletions lib/pom.xml
Original file line number Diff line number Diff line change
@@ -206,9 +206,7 @@ DO NOT MODIFIY - GENERATED CODE
<id>mavengems</id>
<url>mavengem:https://rubygems.org</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<repository>
<releases>
<enabled>false</enabled>
</releases>
@@ -217,14 +215,14 @@ DO NOT MODIFIY - GENERATED CODE
</snapshots>
<id>takari</id>
<url>https://otto.takari.io/content/repositories/snapshots</url>
</pluginRepository>
</pluginRepositories>
</repository>
</repositories>
<build>
<extensions>
<extension>
<groupId>org.torquebox.mojo</groupId>
<artifactId>mavengem-wagon</artifactId>
<version>0.2.2-SNAPSHOT</version>
<version>0.2.2</version>
</extension>
</extensions>
<resources>
13 changes: 11 additions & 2 deletions truffle/pom.rb
Original file line number Diff line number Diff line change
@@ -11,6 +11,7 @@
'polyglot.dump.readonly' => true,
# Must be the same as in mx.jruby/suite.py (except for the -SNAPSHOT part only in this file, and here we can use a release name)
'truffle.version' => '0.20',
'java.version' => '1.8',
'jruby.basedir' => '${basedir}/..',
'maven.test.skip' => 'true' )

@@ -34,8 +35,8 @@
'verbose' => 'false',
'showWarnings' => 'true',
'showDeprecation' => 'true',
'source' => '1.8',
'target' => '1.8',
'source' => '${java.version}',
'target' => '${java.version}',
'useIncrementalCompilation' => 'false' ) do
execute_goals( 'compile',
:id => 'default-compile',
@@ -100,4 +101,12 @@
profile 'tck' do
properties( 'maven.test.skip' => 'false' )
end

profile 'java_version' do
activation do
property name: 'java.class.version', value: '53.0'
end

properties( 'java.version': '1.9' )
end
end
23 changes: 18 additions & 5 deletions truffle/pom.xml
Original file line number Diff line number Diff line change
@@ -17,11 +17,12 @@ DO NOT MODIFIY - GENERATED CODE
<artifactId>jruby-truffle</artifactId>
<name>JRuby Truffle</name>
<properties>
<maven.test.skip>true</maven.test.skip>
<jruby.basedir>${basedir}/..</jruby.basedir>
<polyglot.dump.readonly>true</polyglot.dump.readonly>
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
<truffle.version>0.20</truffle.version>
<java.version>1.8</java.version>
<maven.test.skip>true</maven.test.skip>
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
<jruby.basedir>${basedir}/..</jruby.basedir>
</properties>
<dependencies>
<dependency>
@@ -126,8 +127,8 @@ DO NOT MODIFIY - GENERATED CODE
<verbose>false</verbose>
<showWarnings>true</showWarnings>
<showDeprecation>true</showDeprecation>
<source>1.8</source>
<target>1.8</target>
<source>${java.version}</source>
<target>${java.version}</target>
<useIncrementalCompilation>false</useIncrementalCompilation>
</configuration>
</plugin>
@@ -278,5 +279,17 @@ DO NOT MODIFIY - GENERATED CODE
<maven.test.skip>false</maven.test.skip>
</properties>
</profile>
<profile>
<id>java_version</id>
<activation>
<property>
<name>java.class.version</name>
<value>53.0</value>
</property>
</activation>
<properties>
<java.version>1.9</java.version>
</properties>
</profile>
</profiles>
</project>