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: f2c9a07af162^
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e7371a7df5ad
Choose a head ref
  • 3 commits
  • 7 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
Showing with 113 additions and 83 deletions.
  1. +1 −1 .mvn/extensions.xml
  2. +12 −4 core/pom.rb
  3. +50 −42 core/pom.xml
  4. +3 −1 lib/pom.rb
  5. +17 −5 lib/pom.xml
  6. +1 −1 pom.rb
  7. +29 −29 pom.xml
2 changes: 1 addition & 1 deletion .mvn/extensions.xml
Original file line number Diff line number Diff line change
@@ -3,6 +3,6 @@
<extension>
<groupId>io.takari.polyglot</groupId>
<artifactId>polyglot-ruby</artifactId>
<version>0.1.15</version>
<version>0.1.20-SNAPSHOT</version>
</extension>
</extensions>
16 changes: 12 additions & 4 deletions core/pom.rb
Original file line number Diff line number Diff line change
@@ -15,6 +15,8 @@

'unsafe.version' => '8.92.1',
'unsafe.jar' => '${settings.localRepository}/com/headius/unsafe-mock/${unsafe.version}/unsafe-mock-${unsafe.version}.jar',
# can not test on jdk9 with profile activation so use jdk9 as default
'bootclasspath' => '-Xbootclasspath/p:${unsafe.jar}',

'maven.build.timestamp.format' => 'yyyy-MM-dd',
'maven.test.skip' => 'true',
@@ -191,17 +193,15 @@
'compilerArgs' => [ '-XDignore.symbol.file=true',
'-J-Duser.language=en',
'-J-Dfile.encoding=UTF-8',
'-J-Xbootclasspath/p:${unsafe.jar}',
'-Xbootclasspath/p:${unsafe.jar}',
'${bootclasspath}',
'-J-Xmx${jruby.compile.memory}' ] )
execute_goals( 'compile',
:id => 'populators',
:phase => 'process-classes',
'compilerArgs' => [ '-XDignore.symbol.file=true',
'-J-Duser.language=en',
'-J-Dfile.encoding=UTF-8',
'-J-Xbootclasspath/p:${unsafe.jar}',
'-Xbootclasspath/p:${unsafe.jar}',
'${bootclasspath}',
'-J-Xmx${jruby.compile.memory}' ],
'includes' => [ 'org/jruby/gen/**/*.java' ] )
execute_goals( 'compile',
@@ -380,6 +380,14 @@

end

profile 'bootclasspath' do
activation do
jdk '1.8'
end

properties 'bootclasspath': '-J-Xbootclasspath/p:${unsafe.jar}'
end

profile 'tzdata' do

activation do
92 changes: 50 additions & 42 deletions core/pom.xml
Original file line number Diff line number Diff line change
@@ -17,56 +17,57 @@ 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>
<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>
<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>
<mspec.dir>${spec.dir}/mspec</mspec.dir>
<build.date>${maven.build.timestamp}</build.date>
<main.basedir>${project.parent.basedir}</main.basedir>
<bootclasspath>-Xbootclasspath/p:${unsafe.jar}</bootclasspath>
<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>
@@ -501,8 +502,7 @@ DO NOT MODIFIY - GENERATED CODE
<compilerArg>-XDignore.symbol.file=true</compilerArg>
<compilerArg>-J-Duser.language=en</compilerArg>
<compilerArg>-J-Dfile.encoding=UTF-8</compilerArg>
<compilerArg>-J-Xbootclasspath/p:${unsafe.jar}</compilerArg>
<compilerArg>-Xbootclasspath/p:${unsafe.jar}</compilerArg>
<compilerArg>${bootclasspath}</compilerArg>
<compilerArg>-J-Xmx${jruby.compile.memory}</compilerArg>
</compilerArgs>
</configuration>
@@ -518,8 +518,7 @@ DO NOT MODIFIY - GENERATED CODE
<compilerArg>-XDignore.symbol.file=true</compilerArg>
<compilerArg>-J-Duser.language=en</compilerArg>
<compilerArg>-J-Dfile.encoding=UTF-8</compilerArg>
<compilerArg>-J-Xbootclasspath/p:${unsafe.jar}</compilerArg>
<compilerArg>-Xbootclasspath/p:${unsafe.jar}</compilerArg>
<compilerArg>${bootclasspath}</compilerArg>
<compilerArg>-J-Xmx${jruby.compile.memory}</compilerArg>
</compilerArgs>
<includes>
@@ -1102,6 +1101,15 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
</profile>
<profile>
<id>bootclasspath</id>
<activation>
<jdk>1.8</jdk>
</activation>
<properties>
<bootclasspath>-J-Xbootclasspath/p:${unsafe.jar}</bootclasspath>
</properties>
</profile>
<profile>
<id>tzdata</id>
<activation>
4 changes: 3 additions & 1 deletion lib/pom.rb
Original file line number Diff line number Diff line change
@@ -62,10 +62,12 @@ 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.0'
extension 'org.torquebox.mojo:mavengem-wagon:0.2.2-SNAPSHOT'

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

snapshot_repository :id => :takari, :url => 'https://otto.takari.io/content/repositories/snapshots'

# for testing out jruby-ossl before final release :
#repository( :url => 'https://oss.sonatype.org/content/repositories/snapshots',
# :id => 'gem-snaphots' )
22 changes: 17 additions & 5 deletions lib/pom.xml
Original file line number Diff line number Diff line change
@@ -17,12 +17,12 @@ DO NOT MODIFIY - GENERATED CODE
<artifactId>jruby-stdlib</artifactId>
<name>JRuby Lib Setup</name>
<properties>
<jruby.complete.home>${project.build.outputDirectory}/META-INF/jruby.home</jruby.complete.home>
<polyglot.dump.readonly>true</polyglot.dump.readonly>
<jruby.complete.gems>${jruby.complete.home}/lib/ruby/gems/shared</jruby.complete.gems>
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
<gem.home>${basedir}/ruby/gems/shared</gem.home>
<jruby.plugins.version>1.1.2</jruby.plugins.version>
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
<jruby.complete.home>${project.build.outputDirectory}/META-INF/jruby.home</jruby.complete.home>
</properties>
<dependencies>
<dependency>
@@ -207,12 +207,24 @@ DO NOT MODIFIY - GENERATED CODE
<url>mavengem:https://rubygems.org</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
<id>takari</id>
<url>https://otto.takari.io/content/repositories/snapshots</url>
</pluginRepository>
</pluginRepositories>
<build>
<extensions>
<extension>
<groupId>org.torquebox.mojo</groupId>
<artifactId>mavengem-wagon</artifactId>
<version>0.2.0</version>
<version>0.2.2-SNAPSHOT</version>
</extension>
</extensions>
<resources>
@@ -313,7 +325,7 @@ DO NOT MODIFIY - GENERATED CODE
<plugin>
<groupId>io.takari.polyglot</groupId>
<artifactId>polyglot-maven-plugin</artifactId>
<version>0.1.15</version>
<version>0.1.20-SNAPSHOT</version>
<executions>
<execution>
<id>install_gems</id>
@@ -364,7 +376,7 @@ DO NOT MODIFIY - GENERATED CODE
<dependency>
<groupId>io.takari.polyglot</groupId>
<artifactId>polyglot-ruby</artifactId>
<version>0.1.15</version>
<version>0.1.20-SNAPSHOT</version>
</dependency>
</dependencies>
</plugin>
2 changes: 1 addition & 1 deletion pom.rb
Original file line number Diff line number Diff line change
@@ -119,7 +119,7 @@
plugin :clean, '2.5'
plugin :dependency, '2.8'
plugin :release, '2.4.1'
plugin :jar, '2.6'
plugin :jar, '3.0.2'

rules = { :requireMavenVersion => { :version => '[3.3.0,)' } }
unless model.version =~ /-SNAPSHOT/
58 changes: 29 additions & 29 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -104,39 +104,39 @@ DO NOT MODIFIY - GENERATED CODE
</site>
</distributionManagement>
<properties>
<rspec-core.version>3.4.4</rspec-core.version>
<polyglot.dump.readonly>true</polyglot.dump.readonly>
<racc.version>1.4.14</racc.version>
<its.j2ee>j2ee*/pom.xml</its.j2ee>
<jruby.basedir>${project.basedir}</jruby.basedir>
<minitest.version>5.4.1</minitest.version>
<ant.version>1.9.2</ant.version>
<diff-lcs.version>1.1.3</diff-lcs.version>
<jffi.version>1.2.13</jffi.version>
<rake.version>10.4.2</rake.version>
<jruby-launcher.version>1.1.1</jruby-launcher.version>
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
<asm.version>5.0.4</asm.version>
<rspec-expectations.version>3.4.0</rspec-expectations.version>
<its.osgi>osgi*/pom.xml</its.osgi>
<base.javac.version>1.7</base.javac.version>
<test-unit.version>3.1.1</test-unit.version>
<rdoc.version>4.2.0</rdoc.version>
<rspec.version>3.4.0</rspec.version>
<base.java.version>1.7</base.java.version>
<jruby.basedir>${project.basedir}</jruby.basedir>
<bouncy-castle.version>1.47</bouncy-castle.version>
<its.j2ee>j2ee*/pom.xml</its.j2ee>
<rspec-mocks.version>3.4.1</rspec-mocks.version>
<jruby.plugins.version>1.0.10</jruby.plugins.version>
<main.basedir>${project.basedir}</main.basedir>
<invoker.skip>true</invoker.skip>
<json.version>1.8.3</json.version>
<jar-dependencies.version>0.3.5</jar-dependencies.version>
<power_assert.version>0.2.3</power_assert.version>
<version.jruby>${project.version}</version.jruby>
<bouncy-castle.version>1.47</bouncy-castle.version>
<main.basedir>${project.basedir}</main.basedir>
<github.global.server>github</github.global.server>
<joda.time.version>2.8.2</joda.time.version>
<rake.version>10.4.2</rake.version>
<base.javac.version>1.7</base.javac.version>
<test-unit.version>3.1.1</test-unit.version>
<asm.version>5.0.4</asm.version>
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
<rspec-core.version>3.4.4</rspec-core.version>
<power_assert.version>0.2.3</power_assert.version>
<minitest.version>5.4.1</minitest.version>
<base.java.version>1.7</base.java.version>
<rspec-support.version>3.4.1</rspec-support.version>
<rdoc.version>4.2.0</rdoc.version>
<rspec-expectations.version>3.4.0</rspec-expectations.version>
<polyglot.dump.readonly>true</polyglot.dump.readonly>
<json.version>1.8.3</json.version>
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
<its.osgi>osgi*/pom.xml</its.osgi>
<jruby.plugins.version>1.0.10</jruby.plugins.version>
<diff-lcs.version>1.1.3</diff-lcs.version>
<ant.version>1.9.2</ant.version>
<racc.version>1.4.14</racc.version>
<joda.time.version>2.8.2</joda.time.version>
<github.global.server>github</github.global.server>
<jar-dependencies.version>0.3.5</jar-dependencies.version>
<jruby-launcher.version>1.1.1</jruby-launcher.version>
</properties>
<dependencyManagement>
<dependencies>
@@ -258,7 +258,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
<version>3.0.2</version>
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
@@ -672,8 +672,8 @@ DO NOT MODIFIY - GENERATED CODE
<module>maven</module>
</modules>
<properties>
<its.osgi>no-excludes/pom.xml</its.osgi>
<invoker.skip>false</invoker.skip>
<its.osgi>no-excludes/pom.xml</its.osgi>
</properties>
</profile>
<profile>
@@ -695,8 +695,8 @@ DO NOT MODIFIY - GENERATED CODE
<module>maven</module>
</modules>
<properties>
<its.j2ee>no-excludes/pom.xml</its.j2ee>
<invoker.skip>false</invoker.skip>
<its.j2ee>no-excludes/pom.xml</its.j2ee>
</properties>
</profile>
<profile>