Skip to content

Commit e433d66

Browse files
committed
Merge remote-tracking branch 'origin/jruby-9.4' into jruby-10.0
2 parents a780c41 + 737fcfa commit e433d66

4 files changed

Lines changed: 10 additions & 10 deletions

File tree

core/pom.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@
4545

4646
# exclude jnr-ffi to avoid problems with shading and relocation of the asm packages
4747
jar 'com.github.jnr:jnr-netdb:1.2.0', exclusions: ['com.github.jnr:jnr-ffi']
48-
jar 'com.github.jnr:jnr-enxio:0.32.19', exclusions: ['com.github.jnr:jnr-ffi']
49-
jar 'com.github.jnr:jnr-unixsocket:0.38.24', exclusions: ['com.github.jnr:jnr-ffi']
50-
jar 'com.github.jnr:jnr-posix:3.1.21', exclusions: ['com.github.jnr:jnr-ffi']
48+
jar 'com.github.jnr:jnr-enxio:0.32.20', exclusions: ['com.github.jnr:jnr-ffi']
49+
jar 'com.github.jnr:jnr-unixsocket:0.38.25', exclusions: ['com.github.jnr:jnr-ffi']
50+
jar 'com.github.jnr:jnr-posix:3.1.22', exclusions: ['com.github.jnr:jnr-ffi']
5151
jar 'com.github.jnr:jnr-constants:0.10.4', exclusions: ['com.github.jnr:jnr-ffi']
52-
jar 'com.github.jnr:jnr-ffi:2.2.18'
52+
jar 'com.github.jnr:jnr-ffi:2.2.19'
5353
jar 'com.github.jnr:jffi:${jffi.version}'
5454
jar 'com.github.jnr:jffi:${jffi.version}:native'
5555

core/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ DO NOT MODIFY - GENERATED CODE
8989
<dependency>
9090
<groupId>com.github.jnr</groupId>
9191
<artifactId>jnr-enxio</artifactId>
92-
<version>0.32.19</version>
92+
<version>0.32.20</version>
9393
<exclusions>
9494
<exclusion>
9595
<groupId>com.github.jnr</groupId>
@@ -100,7 +100,7 @@ DO NOT MODIFY - GENERATED CODE
100100
<dependency>
101101
<groupId>com.github.jnr</groupId>
102102
<artifactId>jnr-unixsocket</artifactId>
103-
<version>0.38.24</version>
103+
<version>0.38.25</version>
104104
<exclusions>
105105
<exclusion>
106106
<groupId>com.github.jnr</groupId>
@@ -111,7 +111,7 @@ DO NOT MODIFY - GENERATED CODE
111111
<dependency>
112112
<groupId>com.github.jnr</groupId>
113113
<artifactId>jnr-posix</artifactId>
114-
<version>3.1.21</version>
114+
<version>3.1.22</version>
115115
<exclusions>
116116
<exclusion>
117117
<groupId>com.github.jnr</groupId>
@@ -133,7 +133,7 @@ DO NOT MODIFY - GENERATED CODE
133133
<dependency>
134134
<groupId>com.github.jnr</groupId>
135135
<artifactId>jnr-ffi</artifactId>
136-
<version>2.2.18</version>
136+
<version>2.2.19</version>
137137
</dependency>
138138
<dependency>
139139
<groupId>com.github.jnr</groupId>

pom.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"ant.version": '1.9.8',
7777
"asm.version": '9.7.1',
7878
"jar-dependencies.version": '0.4.1',
79-
"jffi.version": '1.3.14',
79+
"jffi.version": '1.3.15',
8080
"joda.time.version": '2.14.0')
8181

8282
plugin_management do

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ DO NOT MODIFY - GENERATED CODE
108108
<its.j2ee>j2ee*/pom.xml</its.j2ee>
109109
<its.osgi>osgi*/pom.xml</its.osgi>
110110
<jar-dependencies.version>0.4.1</jar-dependencies.version>
111-
<jffi.version>1.3.14</jffi.version>
111+
<jffi.version>1.3.15</jffi.version>
112112
<joda.time.version>2.14.0</joda.time.version>
113113
<jruby-launcher.version>1.1.6</jruby-launcher.version>
114114
<jruby.basedir>${project.basedir}</jruby.basedir>

0 commit comments

Comments
 (0)