Skip to content

Commit

Permalink
Update JRuby/Maven stack
Browse files Browse the repository at this point in the history
This eliminates the fileno warning when running on a JPMS-enabled
JVM.

Fixes jruby#7987
  • Loading branch information
headius committed Nov 2, 2023
1 parent 931c4fc commit 1674454
Show file tree
Hide file tree
Showing 32 changed files with 48 additions and 48 deletions.
2 changes: 1 addition & 1 deletion .mvn/extensions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<extension>
<groupId>io.takari.polyglot</groupId>
<artifactId>polyglot-ruby</artifactId>
<version>0.4.11</version>
<version>0.5.0</version>
</extension>
</extensions>
4 changes: 2 additions & 2 deletions lib/pom.rb
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ def log(message=nil)

properties( 'polyglot.dump.pom' => 'pom.xml',
'polyglot.dump.readonly' => true,
'jruby.plugins.version' => '3.0.1',
'jruby.plugins.version' => '3.0.2',
'gem.home' => '${basedir}/ruby/gems/shared',
# we copy everything into the target/classes/META-INF
# so the jar plugin just packs it - see build/resources below
Expand All @@ -164,7 +164,7 @@ def log(message=nil)
# 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.jruby.maven:mavengem-wagon:2.0.1'
extension 'org.jruby.maven:mavengem-wagon:2.0.2'

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

Expand Down
8 changes: 4 additions & 4 deletions lib/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ DO NOT MODIFY - GENERATED CODE
<gem.home>${basedir}/ruby/gems/shared</gem.home>
<jruby.complete.gems>${jruby.complete.home}/lib/ruby/gems/shared</jruby.complete.gems>
<jruby.complete.home>${project.build.outputDirectory}/META-INF/jruby.home</jruby.complete.home>
<jruby.plugins.version>3.0.1</jruby.plugins.version>
<jruby.plugins.version>3.0.2</jruby.plugins.version>
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
<polyglot.dump.readonly>true</polyglot.dump.readonly>
</properties>
Expand Down Expand Up @@ -1057,7 +1057,7 @@ DO NOT MODIFY - GENERATED CODE
<extension>
<groupId>org.jruby.maven</groupId>
<artifactId>mavengem-wagon</artifactId>
<version>2.0.1</version>
<version>2.0.2</version>
</extension>
</extensions>
<resources>
Expand Down Expand Up @@ -1381,7 +1381,7 @@ DO NOT MODIFY - GENERATED CODE
<plugin>
<groupId>io.takari.polyglot</groupId>
<artifactId>polyglot-maven-plugin</artifactId>
<version>0.4.11</version>
<version>0.5.0</version>
<executions>
<execution>
<id>install_gems</id>
Expand Down Expand Up @@ -1432,7 +1432,7 @@ DO NOT MODIFY - GENERATED CODE
<dependency>
<groupId>io.takari.polyglot</groupId>
<artifactId>polyglot-ruby</artifactId>
<version>0.4.11</version>
<version>0.5.0</version>
</dependency>
</dependencies>
<inherited>false</inherited>
Expand Down
4 changes: 2 additions & 2 deletions lifecycle-mapping-metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<pluginExecutionFilter>
<groupId>org.jruby.maven</groupId>
<artifactId>gem-maven-plugin</artifactId>
<versionRange>3.0.1</versionRange>
<versionRange>3.0.2</versionRange>
<goals>
<goal>initialize</goal>
</goals>
Expand All @@ -44,7 +44,7 @@
<pluginExecutionFilter>
<groupId>org.jruby.maven</groupId>
<artifactId>gem-maven-plugin</artifactId>
<versionRange>3.0.1</versionRange>
<versionRange>3.0.2</versionRange>
<goals>
<goal>initialize</goal>
</goals>
Expand Down
2 changes: 1 addition & 1 deletion maven/jruby-complete/pom.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
packaging 'bundle'


extension 'org.jruby.maven:mavengem-wagon:2.0.1'
extension 'org.jruby.maven:mavengem-wagon:2.0.2'

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<extension>
<groupId>org.jruby.maven</groupId>
<artifactId>mavengem-wagon</artifactId>
<version>2.0.1</version>
<version>2.0.2</version>
</extension>
</extensions>
<plugins>
Expand Down
2 changes: 1 addition & 1 deletion maven/jruby-complete/src/it/extended/Mavenfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#-*- mode: ruby -*-

# default versions will be overwritten by pom.rb from root directory
properties( 'jruby.plugins.version' => '3.0.1',
properties( 'jruby.plugins.version' => '3.0.2',
'project.build.sourceEncoding' => 'utf-8',
'jruby.home' => '${basedir}/../../../../..' )

Expand Down
2 changes: 1 addition & 1 deletion maven/jruby-complete/src/it/runnable/Mavenfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#-*- mode: ruby -*-

# default versions will be overwritten by pom.rb from root directory
properties( 'jruby.plugins.version' => '3.0.1',
properties( 'jruby.plugins.version' => '3.0.2',
'mavengem.wagon.version' => '2.0.1',
'jruby.version' => '9.4.3.0' )

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@

model.repositories.clear

extension 'org.jruby.maven:mavengem-wagon:2.0.1'
extension 'org.jruby.maven:mavengem-wagon:2.0.2'
repository :id => :mavengems, :url => 'mavengem:https://rubygems.org'

id 'org.jruby.osgi:gems-bundle', '1.0'

packaging 'bundle'

# default versions will be overwritten by pom.rb from root directory
properties( 'jruby.plugins.version' => '3.0.1',
properties( 'jruby.plugins.version' => '3.0.2',
# needed bundle plugin
'polyglot.dump.pom' => 'pom.xml' )

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
packaging :pom

# default versions will be overwritten by pom.rb from root directory
properties( 'jruby.plugins.version' => '3.0.1',
properties( 'jruby.plugins.version' => '3.0.2',
'project.build.sourceEncoding' => 'utf-8' )

modules [ 'gems-bundle', 'scripts-bundle', 'test' ]
2 changes: 1 addition & 1 deletion maven/jruby-jars/Mavenfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ end

properties( 'tesla.dump.pom' => 'pom.xml',
'tesla.dump.readonly' => true,
'jruby.plugins.version' => '3.0.1',
'jruby.plugins.version' => '3.0.2',
# we share the already installed gems
'gem.home' => '${jruby_home}/lib/ruby/gems/shared',
# need jruby_home but not jruby.home as name otherwise
Expand Down
2 changes: 1 addition & 1 deletion maven/jruby-jars/src/it/integrity/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<plugin>
<groupId>org.jruby.maven</groupId>
<artifactId>gem-maven-plugin</artifactId>
<version>3.0.1</version>
<version>3.0.2</version>
<executions>
<execution>
<goals><goal>initialize</goal></goals>
Expand Down
4 changes: 2 additions & 2 deletions maven/jruby/src/it/j2ee_jetty/pom.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
packaging 'war'

# default versions will be overwritten by pom.rb from root directory
properties( 'jruby.plugins.version' => '3.0.1',
properties( 'jruby.plugins.version' => '3.0.2',
'project.build.sourceEncoding' => 'utf-8' )

pom( 'org.jruby:jruby', '${jruby.version}' )

# a gem to be used
gem 'flickraw', '0.9.7'

extension 'org.jruby.maven:mavengem-wagon:2.0.1'
extension 'org.jruby.maven:mavengem-wagon:2.0.2'
repository :id => :mavengems, :url => 'mavengem:https://rubygems.org'

jruby_plugin :gem, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' do
Expand Down
4 changes: 2 additions & 2 deletions maven/jruby/src/it/j2ee_jetty_rack/Mavenfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
packaging 'war'

# get jruby dependencies
properties( 'jruby.plugins.version' => '3.0.1',
properties( 'jruby.plugins.version' => '3.0.2',
'project.build.sourceEncoding' => 'utf-8',
'public.dir' => '${basedir}/public' )

Expand All @@ -16,7 +16,7 @@ jar( 'org.jruby.rack:jruby-rack', '1.1.18',
# a gem to be used
gem 'flickraw', '0.9.7'

extension 'org.jruby.maven:mavengem-wagon:2.0.1'
extension 'org.jruby.maven:mavengem-wagon:2.0.2'
repository :id => :mavengems, :url => 'mavengem:https://rubygems.org'

jruby_plugin :gem, :includeRubygemsInResources => true, :includeLibDirectoryInResources => true, :jrubyVersion => '9.0.0.0' do
Expand Down
4 changes: 2 additions & 2 deletions maven/jruby/src/it/j2ee_tomcat/pom.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
packaging 'war'

# default versions will be overwritten by pom.rb from root directory
properties( 'jruby.plugins.version' => '3.0.1',
properties( 'jruby.plugins.version' => '3.0.2',
'project.build.sourceEncoding' => 'utf-8' )

pom( 'org.jruby:jruby', '${jruby.version}' )

# a gem to be used
gem 'flickraw', '0.9.7'

extension 'org.jruby.maven:mavengem-wagon:2.0.1'
extension 'org.jruby.maven:mavengem-wagon:2.0.2'
repository :id => :mavengems, :url => 'mavengem:https://rubygems.org'

jruby_plugin :gem, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' do
Expand Down
4 changes: 2 additions & 2 deletions maven/jruby/src/it/j2ee_tomcat_rack/Mavenfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
packaging 'war'

# get jruby dependencies
properties( 'jruby.plugins.version' => '3.0.1',
properties( 'jruby.plugins.version' => '3.0.2',
'project.build.sourceEncoding' => 'utf-8',
'public.dir' => '${basedir}/public' )

Expand All @@ -16,7 +16,7 @@ jar( 'org.jruby.rack:jruby-rack', '1.1.18',
# a gem to be used
gem 'flickraw', '0.9.7'

extension 'org.jruby.maven:mavengem-wagon:2.0.1'
extension 'org.jruby.maven:mavengem-wagon:2.0.2'
repository :id => :mavengems, :url => 'mavengem:https://rubygems.org'

jruby_plugin :gem, :includeRubygemsInResources => true, :includeLibDirectoryInResources => true, :jrubyVersion => '9.0.0.0' do
Expand Down
4 changes: 2 additions & 2 deletions maven/jruby/src/it/j2ee_wildfly/pom.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
packaging 'war'

# default versions will be overwritten by pom.rb from root directory
properties( 'jruby.plugins.version' => '3.0.1',
properties( 'jruby.plugins.version' => '3.0.2',
'wildfly.version' => '9.0.2.Final',
'project.build.sourceEncoding' => 'utf-8' )

Expand All @@ -11,7 +11,7 @@
# a gem to be used
gem 'virtus', '0.5.5'

extension 'org.jruby.maven:mavengem-wagon:2.0.1'
extension 'org.jruby.maven:mavengem-wagon:2.0.2'
repository :id => :mavengems, :url => 'mavengem:https://rubygems.org'

jruby_plugin :gem, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' do
Expand Down
4 changes: 2 additions & 2 deletions maven/jruby/src/it/jetty/Mavenfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
packaging 'war'

# default versions will be overwritten by pom.rb from root directory
properties( 'jruby.plugins.version' => '3.0.1',
properties( 'jruby.plugins.version' => '3.0.2',
'project.build.sourceEncoding' => 'utf-8',
'public.dir' => '${basedir}/public' )

Expand All @@ -16,7 +16,7 @@ jar( 'org.jruby.rack:jruby-rack', '1.1.14',
# a gem to be used
gem 'flickraw', '0.9.7'

extension 'org.jruby.maven:mavengem-wagon:2.0.1'
extension 'org.jruby.maven:mavengem-wagon:2.0.2'
repository :id => :mavengems, :url => 'mavengem:https://rubygems.org'

jruby_plugin :gem, :includeRubygemsInTestResources => false, :includeRubygemsInResources => true, :includeLibDirectoryInResources => true, :jrubyVersion => '9.0.0.0' do
Expand Down
2 changes: 1 addition & 1 deletion maven/jruby/src/it/many_jars_with_embedded_gems/app/pom.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# two jars with embedded gems
jar 'org.jruby.maven:maven-tools', '3.0.1'
jar 'org.jruby.maven:maven-tools', '3.0.2'
jar 'org.rubygems:zip', '2.0.2'

# jruby scripting container
Expand Down
2 changes: 1 addition & 1 deletion maven/jruby/src/it/many_jars_with_embedded_gems/pom.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#-*- mode: ruby -*-

# default versions will be overwritten by pom.rb from root directory
properties( 'jruby.plugins.version' => '3.0.1' )
properties( 'jruby.plugins.version' => '3.0.2' )

packaging :pom

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

model.repositories.clear

extension 'org.jruby.maven:mavengem-wagon:2.0.1'
extension 'org.jruby.maven:mavengem-wagon:2.0.2'
repository :id => :mavengems, :url => 'mavengem:https://rubygems.org'

id 'org.rubygems:zip', VERSION
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

model.repositories.clear

extension 'org.jruby.maven:mavengem-wagon:2.0.1'
extension 'org.jruby.maven:mavengem-wagon:2.0.2'
repository :id => :mavengems, :url => 'mavengem:https://rubygems.org'

id 'org.rubygems:gem1', '1'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

model.repositories.clear

extension 'org.jruby.maven:mavengem-wagon:2.0.1'
extension 'org.jruby.maven:mavengem-wagon:2.0.2'
repository :id => :mavengems, :url => 'mavengem:https://rubygems.org'

id 'org.rubygems:gem2', '2'
Expand Down
2 changes: 1 addition & 1 deletion maven/jruby/src/it/many_jars_with_embedded_gems_ng/pom.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#-*- mode: ruby -*-

# default versions will be overwritten by pom.rb from root directory
properties( 'jruby.plugins.version' => '3.0.1' )
properties( 'jruby.plugins.version' => '3.0.2' )

packaging :pom

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</repositories>

<properties>
<jruby.plugins.version>3.0.1</jruby.plugins.version>
<jruby.plugins.version>3.0.2</jruby.plugins.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

Expand All @@ -42,7 +42,7 @@
<extension>
<groupId>org.jruby.maven</groupId>
<artifactId>mavengem-wagon</artifactId>
<version>2.0.1</version>
<version>2.0.2</version>
</extension>
</extensions>
<plugins>
Expand Down
4 changes: 2 additions & 2 deletions maven/jruby/src/it/tomcat/pom.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
packaging 'war'

# default versions will be overwritten by pom.rb from root directory
properties( 'jruby.plugins.version' => '3.0.1',
properties( 'jruby.plugins.version' => '3.0.2',
'project.build.sourceEncoding' => 'utf-8' )

pom( 'org.jruby:jruby', '${jruby.version}' )

# a gem to be used
gem 'flickraw', '0.9.7'

extension 'org.jruby.maven:mavengem-wagon:2.0.1'
extension 'org.jruby.maven:mavengem-wagon:2.0.2'
repository :id => :mavengems, :url => 'mavengem:https://rubygems.org'

jruby_plugin :gem, :includeRubygemsInTestResources => false, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' do
Expand Down
2 changes: 1 addition & 1 deletion maven/jruby/src/templates/hellowarld/Mavenfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ packaging 'pom'
# TODO add extension to .mvn/extensions.xml
extension 'org.jruby.maven', 'jruby9-extensions', '${jruby9.plugins.version}'

properties( 'jruby.plugins.version' => '3.0.1',
properties( 'jruby.plugins.version' => '3.0.2',
'jruby9.plugins.version' => '0.2.0' )

# integration tests
Expand Down
4 changes: 2 additions & 2 deletions maven/jruby/src/templates/j2ee_wlp/pom.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
packaging 'war'

# default versions will be overwritten by pom.rb from root directory
properties( 'jruby.plugins.version' => '3.0.1',
properties( 'jruby.plugins.version' => '3.0.2',
'project.build.sourceEncoding' => 'utf-8' )

pom( 'org.jruby:jruby', '${jruby.version}' )

# a gem to be used
gem 'virtus', '0.5.5'

extension 'org.jruby.maven:mavengem-wagon:2.0.1'
extension 'org.jruby.maven:mavengem-wagon:2.0.2'
repository :id => :mavengems, :url => 'mavengem:https://rubygems.org'

jruby_plugin :gem, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' do
Expand Down
Loading

0 comments on commit 1674454

Please sign in to comment.