Skip to content

Commit 16a56d4

Browse files
kareskares
committed
Merge branch '1.1-stable'
* 1.1-stable: use distributionManagement instead of (sonatype) pom parent just keep the jruby-home when set by jruby to "uri:classsloader:/META-INF/jruby.home" support configuration of `Response.swallow_client_abort?` (with e075f34 fixes #186) better servlet (3.0) specific API testability [travis-ci] jruby-head should be fine ... from now on :over-9000: [travis-ci] there seems to be a constant failure on TRAVIS=true with the application pool only run t is1_9 he compat-version spec on JRuby < 9k [travis-ci] exclude all of jruby-head with openjdk6 activate -P jars by default due running with `mvn package` only ... setup rubygems repository & let us roll jruby-openssl 0.9.6 setup oss.sonatype.org deployment `gem update --system 2.2.3` on travis-ci travis-ci `sudo: false` is is better client EOF (socket abort "Broken pipe") detection in JRuby::Rack::Response ... we're now "officially" handling Jetty and maybe a bunch of others due EofException allow PATCH verb to be processed by the ruby application
2 parents 33f8693 + 56592c0 commit 16a56d4

File tree

14 files changed

+552
-124
lines changed

14 files changed

+552
-124
lines changed

‎.travis.yml

Lines changed: 93 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
language: ruby
2+
sudo: false
23
bundler_args: --without development
34
script: rake spec
45
branches:
@@ -34,13 +35,72 @@ before_script:
3435
- export JRUBY_VERSION="1.7.13"
3536
- jruby -S gem env || true
3637
before_install:
38+
# NOTE: RubyGems 2.4.x fails us at application_spec's gem_install_rack_unless_installed !
39+
- (jruby --1.9 -S gem update --system 2.2.3) || true
3740
- ((jruby -v | grep 1.8.7) && jruby --1.9 -S gem update --system 2.1.11) || true
3841
- ((echo $BUNDLE_GEMFILE | grep rails23) && jruby --1.9 -S gem update --system 1.8.29) || true
3942
matrix:
4043
allow_failures:
41-
- rvm: jruby-head
44+
#- rvm: jruby-head
4245
#- gemfile: gemfiles/rails41.gemfile
4346
exclude:
47+
## avoid jruby-head with JDK6 :
48+
- rvm: jruby-head
49+
gemfile: Gemfile
50+
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
51+
jdk: openjdk6
52+
- rvm: jruby-head
53+
gemfile: Gemfile
54+
env: JRUBY_OPTS="$JRUBY_OPTS" JAVA_OPTS="-Djruby.version=$JRUBY_VERSION"
55+
jdk: openjdk6
56+
- rvm: jruby-head
57+
gemfile: gemfiles/rails23.gemfile
58+
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
59+
jdk: openjdk6
60+
- rvm: jruby-head
61+
gemfile: gemfiles/rails23.gemfile
62+
env: JRUBY_OPTS="$JRUBY_OPTS" JAVA_OPTS="-Djruby.version=$JRUBY_VERSION"
63+
jdk: openjdk6
64+
- rvm: jruby-head
65+
gemfile: gemfiles/rails30.gemfile
66+
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
67+
jdk: openjdk6
68+
- rvm: jruby-head
69+
gemfile: gemfiles/rails30.gemfile
70+
env: JRUBY_OPTS="$JRUBY_OPTS" JAVA_OPTS="-Djruby.version=$JRUBY_VERSION"
71+
jdk: openjdk6
72+
- rvm: jruby-head
73+
gemfile: gemfiles/rails31.gemfile
74+
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
75+
jdk: openjdk6
76+
- rvm: jruby-head
77+
gemfile: gemfiles/rails31.gemfile
78+
env: JRUBY_OPTS="$JRUBY_OPTS" JAVA_OPTS="-Djruby.version=$JRUBY_VERSION"
79+
jdk: openjdk6
80+
- rvm: jruby-head
81+
gemfile: gemfiles/rails32.gemfile
82+
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
83+
jdk: openjdk6
84+
- rvm: jruby-head
85+
gemfile: gemfiles/rails32.gemfile
86+
env: JRUBY_OPTS="$JRUBY_OPTS" JAVA_OPTS="-Djruby.version=$JRUBY_VERSION"
87+
jdk: openjdk6
88+
- rvm: jruby-head
89+
gemfile: gemfiles/rails40.gemfile
90+
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
91+
jdk: openjdk6
92+
- rvm: jruby-head
93+
gemfile: gemfiles/rails40.gemfile
94+
env: JRUBY_OPTS="$JRUBY_OPTS" JAVA_OPTS="-Djruby.version=$JRUBY_VERSION"
95+
jdk: openjdk6
96+
- rvm: jruby-head
97+
gemfile: gemfiles/rails41.gemfile
98+
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
99+
jdk: openjdk6
100+
- rvm: jruby-head
101+
gemfile: gemfiles/rails41.gemfile
102+
env: JRUBY_OPTS="$JRUBY_OPTS" JAVA_OPTS="-Djruby.version=$JRUBY_VERSION"
103+
jdk: openjdk6
44104
## rails 4.0 does not run on --1.8
45105
- rvm: jruby
46106
gemfile: gemfiles/rails40.gemfile
@@ -68,10 +128,10 @@ matrix:
68128
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
69129
jdk: oraclejdk8
70130
## rails 4.0 does not run on --1.8 (jruby-head)
71-
- rvm: jruby-head
72-
gemfile: gemfiles/rails40.gemfile
73-
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
74-
jdk: openjdk6
131+
#- rvm: jruby-head
132+
# gemfile: gemfiles/rails40.gemfile
133+
# env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
134+
# jdk: openjdk6
75135
- rvm: jruby-head
76136
gemfile: gemfiles/rails40.gemfile
77137
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
@@ -81,10 +141,10 @@ matrix:
81141
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
82142
jdk: oraclejdk8
83143
## rails 4.1 won't run on --1.8 (jruby-head)
84-
- rvm: jruby-head
85-
gemfile: gemfiles/rails41.gemfile
86-
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
87-
jdk: openjdk6
144+
#- rvm: jruby-head
145+
# gemfile: gemfiles/rails41.gemfile
146+
# env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
147+
# jdk: openjdk6
88148
- rvm: jruby-head
89149
gemfile: gemfiles/rails41.gemfile
90150
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
@@ -94,10 +154,10 @@ matrix:
94154
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
95155
jdk: oraclejdk8
96156
## rails 3.2 jruby-head won't support --1.8
97-
- rvm: jruby-head
98-
gemfile: gemfiles/rails32.gemfile
99-
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
100-
jdk: openjdk6
157+
#- rvm: jruby-head
158+
# gemfile: gemfiles/rails32.gemfile
159+
# env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
160+
# jdk: openjdk6
101161
- rvm: jruby-head
102162
gemfile: gemfiles/rails32.gemfile
103163
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
@@ -156,10 +216,10 @@ matrix:
156216
env: JRUBY_OPTS="$JRUBY_OPTS" JAVA_OPTS="-Djruby.version=$JRUBY_VERSION"
157217
jdk: openjdk6
158218
## do not run with 2.3 (jruby-head) :
159-
- rvm: jruby-head
160-
gemfile: gemfiles/rails23.gemfile
161-
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
162-
jdk: openjdk6
219+
#- rvm: jruby-head
220+
# gemfile: gemfiles/rails23.gemfile
221+
# env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
222+
# jdk: openjdk6
163223
- rvm: jruby-head
164224
gemfile: gemfiles/rails23.gemfile
165225
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
@@ -181,10 +241,10 @@ matrix:
181241
env: JRUBY_OPTS="$JRUBY_OPTS" JAVA_OPTS="-Djruby.version=$JRUBY_VERSION"
182242
jdk: oraclejdk8
183243
## do not run with 3.0 (jruby-head) :
184-
- rvm: jruby-head
185-
gemfile: gemfiles/rails30.gemfile
186-
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
187-
jdk: openjdk6
244+
#- rvm: jruby-head
245+
# gemfile: gemfiles/rails30.gemfile
246+
# env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
247+
# jdk: openjdk6
188248
- rvm: jruby-head
189249
gemfile: gemfiles/rails30.gemfile
190250
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
@@ -193,10 +253,10 @@ matrix:
193253
gemfile: gemfiles/rails30.gemfile
194254
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
195255
jdk: oraclejdk8
196-
- rvm: jruby-head
197-
gemfile: gemfiles/rails30.gemfile
198-
env: JRUBY_OPTS="$JRUBY_OPTS" JAVA_OPTS="-Djruby.version=$JRUBY_VERSION"
199-
jdk: openjdk6
256+
#- rvm: jruby-head
257+
# gemfile: gemfiles/rails30.gemfile
258+
# env: JRUBY_OPTS="$JRUBY_OPTS" JAVA_OPTS="-Djruby.version=$JRUBY_VERSION"
259+
# jdk: openjdk6
200260
- rvm: jruby-head
201261
gemfile: gemfiles/rails30.gemfile
202262
env: JRUBY_OPTS="$JRUBY_OPTS" JAVA_OPTS="-Djruby.version=$JRUBY_VERSION"
@@ -206,10 +266,10 @@ matrix:
206266
env: JRUBY_OPTS="$JRUBY_OPTS" JAVA_OPTS="-Djruby.version=$JRUBY_VERSION"
207267
jdk: oraclejdk8
208268
## do not run with 3.1 (jruby-head) :
209-
- rvm: jruby-head
210-
gemfile: gemfiles/rails31.gemfile
211-
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
212-
jdk: openjdk6
269+
#- rvm: jruby-head
270+
# gemfile: gemfiles/rails31.gemfile
271+
# env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
272+
# jdk: openjdk6
213273
- rvm: jruby-head
214274
gemfile: gemfiles/rails31.gemfile
215275
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
@@ -218,10 +278,10 @@ matrix:
218278
gemfile: gemfiles/rails31.gemfile
219279
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
220280
jdk: oraclejdk8
221-
- rvm: jruby-head
222-
gemfile: gemfiles/rails31.gemfile
223-
env: JRUBY_OPTS="$JRUBY_OPTS" JAVA_OPTS="-Djruby.version=$JRUBY_VERSION"
224-
jdk: openjdk6
281+
#- rvm: jruby-head
282+
# gemfile: gemfiles/rails31.gemfile
283+
# env: JRUBY_OPTS="$JRUBY_OPTS" JAVA_OPTS="-Djruby.version=$JRUBY_VERSION"
284+
# jdk: openjdk6
225285
- rvm: jruby-head
226286
gemfile: gemfiles/rails31.gemfile
227287
env: JRUBY_OPTS="$JRUBY_OPTS" JAVA_OPTS="-Djruby.version=$JRUBY_VERSION"

‎pom.xml

Lines changed: 58 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
-->
88
<project xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd' xmlns='http://maven.apache.org/POM/4.0.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
99
<modelVersion>4.0.0</modelVersion>
10+
1011
<groupId>org.jruby.rack</groupId>
1112
<artifactId>jruby-rack</artifactId>
1213
<version>1.2.0-SNAPSHOT</version>
@@ -22,15 +23,26 @@
2223
<vendor.gems.path>vendor/gems</vendor.gems.path>
2324
<bundler.version>1.6.5</bundler.version>
2425
<bundler.local>false</bundler.local> <!-- true by default -->
25-
<saumya.mojo.version>1.0.5</saumya.mojo.version>
26-
<!--default: <gem.home>target/rubygems</gem.home>-->
26+
<saumya.mojo.version>1.0.6</saumya.mojo.version>
27+
<gem.home>${project.build.directory}/rubygems</gem.home>
2728
</properties>
2829

2930
<issueManagement>
3031
<system>Github</system>
3132
<url>http://github.com/jruby/jruby-rack/issues</url>
3233
</issueManagement>
3334

35+
<distributionManagement>
36+
<snapshotRepository>
37+
<id>ossrh</id>
38+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
39+
</snapshotRepository>
40+
<repository>
41+
<id>ossrh</id>
42+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
43+
</repository>
44+
</distributionManagement>
45+
3446
<scm>
3547
<connection>scm:git:git://github.com/jruby/jruby-rack.git</connection>
3648
<developerConnection>scm:git:[email protected]:jruby/jruby-rack.git</developerConnection>
@@ -45,36 +57,6 @@
4557
</license>
4658
</licenses>
4759

48-
<distributionManagement>
49-
<repository>
50-
<id>codehaus-jruby-repository</id>
51-
<name>JRuby Central Repository</name>
52-
<url>dav:https://dav.codehaus.org/repository/jruby</url>
53-
</repository>
54-
<snapshotRepository>
55-
<id>codehaus-jruby-snapshot-repository</id>
56-
<name>JRuby Central Development Repository</name>
57-
<url>dav:https://dav.codehaus.org/snapshots.repository/jruby</url>
58-
</snapshotRepository>
59-
</distributionManagement>
60-
61-
<repositories>
62-
<repository>
63-
<id>codehaus</id>
64-
<name>Codehaus Repository</name>
65-
<releases><enabled>true</enabled></releases>
66-
<snapshots><enabled>false</enabled></snapshots>
67-
<url>http://repository.codehaus.org</url>
68-
</repository>
69-
<repository>
70-
<id>tesla</id>
71-
<name>tesla</name>
72-
<url>http://repository.tesla.io:8081/nexus/content/groups/public</url>
73-
<releases><enabled>false</enabled></releases>
74-
<snapshots><enabled>false</enabled></snapshots>
75-
</repository>
76-
</repositories>
77-
7860
<developers>
7961
<developer>
8062
<id>nicksieger</id>
@@ -92,6 +74,23 @@
9274
</developer>
9375
</developers>
9476

77+
<repositories>
78+
<repository>
79+
<id>rubygems-releases</id>
80+
<url>http://rubygems-proxy.torquebox.org/releases</url>
81+
</repository>
82+
<repository>
83+
<releases>
84+
<enabled>false</enabled>
85+
</releases>
86+
<snapshots>
87+
<enabled>true</enabled>
88+
</snapshots>
89+
<id>sonatype</id>
90+
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
91+
</repository>
92+
</repositories>
93+
9594
<dependencies>
9695
<dependency>
9796
<groupId>org.jruby</groupId>
@@ -147,6 +146,20 @@
147146
<version>3.2.10.RELEASE</version>
148147
<scope>test</scope>
149148
</dependency>
149+
<dependency>
150+
<groupId>rubygems</groupId>
151+
<artifactId>jruby-openssl</artifactId>
152+
<version>0.9.6</version>
153+
<type>gem</type>
154+
<scope>provided</scope>
155+
</dependency>
156+
<dependency>
157+
<groupId>rubygems</groupId>
158+
<artifactId>bundler</artifactId>
159+
<version>${bundler.version}</version>
160+
<type>gem</type>
161+
<scope>provided</scope>
162+
</dependency>
150163
</dependencies>
151164

152165
<build>
@@ -189,21 +202,26 @@
189202
<artifactId>maven-help-plugin</artifactId>
190203
<version>2.2</version>
191204
</plugin>
192-
193205
<plugin>
194206
<groupId>de.saumya.mojo</groupId>
195207
<artifactId>gem-maven-plugin</artifactId>
196208
<version>${saumya.mojo.version}</version>
209+
<configuration>
210+
<includeOpenSSL>false</includeOpenSSL>
211+
<gemHomes>
212+
<provided>${gem.home}</provided>
213+
</gemHomes>
214+
</configuration>
197215
<executions>
198216
<execution>
199217
<id>gem-install-bundler</id>
200218
<phase>test</phase>
201219
<goals><goal>install</goal></goals>
220+
<!--
221+
<id>default-initialize</id>
202222
<configuration>
203-
<jruby.version>${jruby.version}</jruby.version>
204-
<includeOpenSSL>false</includeOpenSSL>
205-
<args>bundler -v ${bundler.version}</args>
206-
</configuration>
223+
<libDirectory>smt-that-does-not-exists</libDirectory>
224+
</configuration>-->
207225
</execution>
208226
</executions>
209227
</plugin>
@@ -252,18 +270,14 @@
252270
</executions>
253271
</plugin>
254272
</plugins>
255-
<extensions>
256-
<extension>
257-
<groupId>org.apache.maven.wagon</groupId>
258-
<artifactId>wagon-webdav</artifactId>
259-
<version>1.0-beta-2</version>
260-
</extension>
261-
</extensions>
262273
</build>
263274

264275
<profiles>
265276
<profile>
266277
<id>jars</id>
278+
<activation>
279+
<activeByDefault>true</activeByDefault>
280+
</activation>
267281
<build>
268282
<plugins>
269283
<plugin>

0 commit comments

Comments
 (0)