Skip to content

Commit

Permalink
Merge pull request jruby#7936 from headius/update_jnr
Browse files Browse the repository at this point in the history
Update jnr stack
  • Loading branch information
headius authored Sep 12, 2023
2 parents db22b4a + 3009f42 commit 5ace6f8
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions core/pom.rb
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@

# exclude jnr-ffi to avoid problems with shading and relocation of the asm packages
jar 'com.github.jnr:jnr-netdb:1.2.0', :exclusions => ['com.github.jnr:jnr-ffi']
jar 'com.github.jnr:jnr-enxio:0.32.15', :exclusions => ['com.github.jnr:jnr-ffi']
jar 'com.github.jnr:jnr-unixsocket:0.38.20', :exclusions => ['com.github.jnr:jnr-ffi']
jar 'com.github.jnr:jnr-posix:3.1.17', :exclusions => ['com.github.jnr:jnr-ffi']
jar 'com.github.jnr:jnr-enxio:0.32.16', :exclusions => ['com.github.jnr:jnr-ffi']
jar 'com.github.jnr:jnr-unixsocket:0.38.21', :exclusions => ['com.github.jnr:jnr-ffi']
jar 'com.github.jnr:jnr-posix:3.1.18', :exclusions => ['com.github.jnr:jnr-ffi']
jar 'com.github.jnr:jnr-constants:0.10.4', :exclusions => ['com.github.jnr:jnr-ffi']
jar 'com.github.jnr:jnr-ffi:2.2.14'
jar 'com.github.jnr:jnr-ffi:2.2.15'
jar 'com.github.jnr:jffi:${jffi.version}'
jar 'com.github.jnr:jffi:${jffi.version}:native'

Expand Down
8 changes: 4 additions & 4 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ DO NOT MODIFY - GENERATED CODE
<dependency>
<groupId>com.github.jnr</groupId>
<artifactId>jnr-enxio</artifactId>
<version>0.32.15</version>
<version>0.32.16</version>
<exclusions>
<exclusion>
<groupId>com.github.jnr</groupId>
Expand All @@ -100,7 +100,7 @@ DO NOT MODIFY - GENERATED CODE
<dependency>
<groupId>com.github.jnr</groupId>
<artifactId>jnr-unixsocket</artifactId>
<version>0.38.20</version>
<version>0.38.21</version>
<exclusions>
<exclusion>
<groupId>com.github.jnr</groupId>
Expand All @@ -111,7 +111,7 @@ DO NOT MODIFY - GENERATED CODE
<dependency>
<groupId>com.github.jnr</groupId>
<artifactId>jnr-posix</artifactId>
<version>3.1.17</version>
<version>3.1.18</version>
<exclusions>
<exclusion>
<groupId>com.github.jnr</groupId>
Expand All @@ -133,7 +133,7 @@ DO NOT MODIFY - GENERATED CODE
<dependency>
<groupId>com.github.jnr</groupId>
<artifactId>jnr-ffi</artifactId>
<version>2.2.14</version>
<version>2.2.15</version>
</dependency>
<dependency>
<groupId>com.github.jnr</groupId>
Expand Down
2 changes: 1 addition & 1 deletion pom.rb
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
'ant.version' => '1.9.8',
'asm.version' => '9.2',
'jar-dependencies.version' => '0.4.1',
'jffi.version' => '1.3.11',
'jffi.version' => '1.3.12',
'joda.time.version' => '2.12.5' )

plugin_management do
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ DO NOT MODIFY - GENERATED CODE
<its.j2ee>j2ee*/pom.xml</its.j2ee>
<its.osgi>osgi*/pom.xml</its.osgi>
<jar-dependencies.version>0.4.1</jar-dependencies.version>
<jffi.version>1.3.11</jffi.version>
<jffi.version>1.3.12</jffi.version>
<joda.time.version>2.12.5</joda.time.version>
<jruby-launcher.version>1.1.6</jruby-launcher.version>
<jruby.basedir>${project.basedir}</jruby.basedir>
Expand Down

0 comments on commit 5ace6f8

Please sign in to comment.