[JENKINS-40693, JENKINS-43713] upgrade to jetty 9.4.x #32

made some progress. (weird unit test fail on my osx but not on a linux box...).
I introduced a new class (maybe this one will be added to Jetty source code).
I will let you know.
Maybe I could rename the branch :-)
please note there is not more spdy

olamy · 2017-04-19T23:57:14Z

jetty/jetty.project#1481

olamy · 2017-04-20T04:22:21Z

for the record, to fix unit test: ifconfig lo0 alias 127.0.0.2

olamy · 2017-04-20T07:02:22Z

so ATM this depends on jetty 9.4.5-SNAPSHOT version (but at least can be used for testing purpose)

oleg-nenashev · 2017-04-21T15:00:35Z

src/java/winstone/Launcher.java

@@ -352,6 +352,7 @@ public static void main(String argv[]) throws IOException {
            new Launcher(args);
        } catch (Throwable err) {
            Logger.log(Logger.ERROR, RESOURCES, "Launcher.ContainerStartupError", err);
+            System.exit(1);


Unrelated, but OK. Maybe deserves a separate changelog entry if there is a real issue with it

oleg-nenashev

Local tests consistently fail for me,

[ERROR] Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 76.273 s <<< FAILURE! - in winstone.LauncherTest
[ERROR] mimeType(winstone.LauncherTest)  Time elapsed: 76.272 s  <<< ERROR!
java.net.ConnectException: Operation timed out (Connection timed out)
	at winstone.LauncherTest.mimeType(LauncherTest.java:22)
Caused by: java.net.ConnectException: Operation timed out (Connection timed out)
	at winstone.LauncherTest.mimeType(LauncherTest.java:22)

INFO: Winstone shutdown successfully
[ERROR] Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.508 s <<< FAILURE! - in winstone.HttpConnectorFactoryTest
[ERROR] testListenAddress(winstone.HttpConnectorFactoryTest)  Time elapsed: 0.508 s  <<< ERROR!
java.io.IOException: Failed to start Jetty
	at winstone.HttpConnectorFactoryTest.testListenAddress(HttpConnectorFactoryTest.java:20)
Caused by: java.net.BindException: Can't assign requested address
	at winstone.HttpConnectorFactoryTest.testListenAddress(HttpConnectorFactoryTest.java:20)

OTOH manual testing of UI didn't discovered any issues. We will also need to update https://github.com/jenkinsci/maven-hudson-dev-plugin in order to merge it into Jenkins.

@olamy Any ETA regarding the 9.4.5 release?

oleg-nenashev · 2017-04-27T11:45:19Z

pom.xml

@@ -2,7 +2,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.jenkins-ci</groupId>
  <artifactId>winstone</artifactId>
-  <version>3.4-SNAPSHOT</version>
+  <version>3.5-SNAPSHOT</version>


Better to use 4.0 IMHO (Java bump + major Jetty bump)

LGTM I will do

olamy · 2017-04-28T01:05:46Z

@oleg-nenashev have setup ifconfig lo0 alias 127.0.0.2
For some reason (I don't know) there are unit tests using this ip.....
I didn't want to change that.

Signed-off-by: olivier lamy <olamy@apache.org>

…that Signed-off-by: olivier lamy <olamy@apache.org>

Signed-off-by: olivier lamy <olamy@apache.org>

olamy · 2017-04-28T01:12:28Z

@oleg-nenashev I hope new Jetty release around end of next week.

oleg-nenashev · 2017-04-28T01:26:34Z

README.md

+## Development
+If you have some unit test failures you may add an interface/ip alias such
+
+``` sudo ifconfig lo0 alias 127.0.0.2 ```


OK, fine for me

Signed-off-by: olivier lamy <olamy@apache.org>

…ema :-) Signed-off-by: olivier lamy <olamy@apache.org>

oleg-nenashev

Yes, releasing as 4.0 seems to be a right choice. This update seems to cause some binary incompatibilities, but we have to move forward at some point

oleg-nenashev · 2017-05-03T05:49:13Z

pom.xml

@@ -301,17 +308,19 @@
      <version>${jetty.version}</version>
    </dependency>
    -->
-
+    <!--
+    spdy abandonned


Any potential impact on transient deps?

oleg-nenashev · 2017-05-03T05:49:57Z

pom.xml

@@ -228,6 +224,17 @@
      <id>repo.jenkins-ci.org</id>
      <url>http://repo.jenkins-ci.org/public/</url>
    </repository>
+    <!-- can be removed when jetty 9.4.5 released -->


Should be removed now I suppose

oleg-nenashev · 2017-05-03T05:52:17Z

src/testwebapp/WEB-INF/web.xml

+<web-app
+		xmlns="http://java.sun.com/xml/ns/javaee"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"


Would be nice to have schema validation in the PR builder. Oh wait, PR builder first...

? I don't get it? well it's a test resource

oleg-nenashev · 2017-05-03T05:52:54Z

pom.xml

@@ -228,6 +224,17 @@
      <id>repo.jenkins-ci.org</id>
      <url>http://repo.jenkins-ci.org/public/</url>
    </repository>
+    <!-- can be removed when jetty 9.4.5 released -->


oleg-nenashev · 2017-05-03T05:53:17Z

pom.xml

@@ -301,17 +308,19 @@
      <version>${jetty.version}</version>
    </dependency>
    -->
-
+    <!--
+    spdy abandonned


is there an impact on transient deps?

Nope I don't think so.
FYI I have some test locally to enable http2 as well. But not fully test so will do an other pr later.

Signed-off-by: olivier lamy <olamy@apache.org>

olamy · 2017-05-03T06:37:20Z

ready to merge I guess?
I'm happy to push the button :-)
@oleg-nenashev Let me know.
I think I have to fix something for maven-hudson-dev-plugin :-)

daniel-beck · 2017-05-03T21:18:36Z

Could we perhaps use this opportunity to update https://github.com/jenkinsci/winstone/blob/master/src/java/winstone/LocalStrings.properties#L1 ? It should have been a filtered resource long ago…

Signed-off-by: olivier lamy <olamy@apache.org>

oleg-nenashev · 2017-05-04T06:25:49Z

@jglick Could you please cut the release or approve https://github.com/jenkins-infra/repository-permissions-updater/pull/293/files ?

oleg-nenashev added the needs-review label Feb 17, 2017

oleg-nenashev mentioned this pull request Apr 11, 2017

Bump java.level to 8 as jenkins core uses 8 now. #34

Closed

olamy self-assigned this Apr 19, 2017

olamy changed the title ~~upgrade to jetty 9.2.21.v20170120~~ upgrade to jetty 9.4.x Apr 19, 2017

olamy changed the title ~~upgrade to jetty 9.4.x~~ [WIP] upgrade to jetty 9.4.x Apr 19, 2017

olamy mentioned this pull request Apr 20, 2017

[JENKINS-43713] Integrate Winstone 4 (Jetty 9.4.x) jenkinsci/jenkins#2850

Merged

2 tasks

oleg-nenashev reviewed Apr 21, 2017

View reviewed changes

oleg-nenashev changed the title ~~[WIP] upgrade to jetty 9.4.x~~ [JENKINS-40693, JENKINS-43713] upgrade to jetty 9.4.x Apr 27, 2017

oleg-nenashev self-assigned this Apr 27, 2017

oleg-nenashev mentioned this pull request Apr 27, 2017

Grant @oleg-nenashev permissions to release Winstone jenkins-infra/repository-permissions-updater#293

Merged

oleg-nenashev reviewed Apr 27, 2017

View reviewed changes

oleg-nenashev added the work-in-progress label Apr 27, 2017

upgrade to jetty 9.2.21.v20170120

154817d

Signed-off-by: olivier lamy <olamy@apache.org>

olamy added 6 commits April 28, 2017 11:11

use jetty 9.4.4.v20170414

1cb94eb

Signed-off-by: olivier lamy <olamy@apache.org>

fix realm as convenient methods not exist anymore

42c149f

Signed-off-by: olivier lamy <olamy@apache.org>

remove abstract class as some code has been added to Jetty to handle …

742865d

…that Signed-off-by: olivier lamy <olamy@apache.org>

upgrade compiler plugin version, touch to trigger ci build

1a750d9

Signed-off-by: olivier lamy <olamy@apache.org>

as major jetty upgrade change version to 4.0-SNAPSHOT

dbef17a

Signed-off-by: olivier lamy <olamy@apache.org>

detail on dev

17d6364

Signed-off-by: olivier lamy <olamy@apache.org>

oleg-nenashev reviewed Apr 28, 2017

View reviewed changes

olamy added 2 commits May 3, 2017 14:58

use released Jetty version

ff04006

Signed-off-by: olivier lamy <olamy@apache.org>

avoid trying to get dtd from java.sun.com well in 2017 we can use sch…

5880341

…ema :-) Signed-off-by: olivier lamy <olamy@apache.org>

oleg-nenashev reviewed May 3, 2017

View reviewed changes

remove snapshot repository

50950c6

Signed-off-by: olivier lamy <olamy@apache.org>

jglick self-requested a review May 3, 2017 13:53

rsandell approved these changes May 3, 2017

View reviewed changes

jglick approved these changes May 3, 2017

View reviewed changes

olamy added 2 commits May 4, 2017 10:22

get rid of spdy option

bf0ed05

Signed-off-by: olivier lamy <olamy@apache.org>

get rid of spdy

0ae4379

Signed-off-by: olivier lamy <olamy@apache.org>

olamy merged commit 16a1f19 into jenkinsci:master May 4, 2017

olamy deleted the features/jetty_9.2.21.v20170120 branch May 4, 2017 00:57

jglick mentioned this pull request Sep 5, 2017

Updating jenkins-test-harness jenkinsci/jenkins#2967

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[JENKINS-40693, JENKINS-43713] upgrade to jetty 9.4.x #32

[JENKINS-40693, JENKINS-43713] upgrade to jetty 9.4.x #32

olamy commented Jan 23, 2017 •

edited

Loading

aheritier commented Jan 30, 2017

daniel-beck commented Jan 30, 2017

oleg-nenashev commented Feb 17, 2017

oleg-nenashev commented Feb 17, 2017

paladox commented Apr 8, 2017 •

edited

Loading

oleg-nenashev commented Apr 9, 2017

paladox commented Apr 9, 2017

oleg-nenashev commented Apr 11, 2017

oleg-nenashev commented Apr 17, 2017

olamy commented Apr 17, 2017

oleg-nenashev commented Apr 17, 2017

olamy commented Apr 17, 2017

olamy commented Apr 19, 2017 •

edited

Loading

olamy commented Apr 19, 2017

olamy commented Apr 20, 2017

olamy commented Apr 20, 2017

oleg-nenashev Apr 21, 2017

oleg-nenashev left a comment

oleg-nenashev Apr 27, 2017

olamy Apr 28, 2017

olamy commented Apr 28, 2017

olamy commented Apr 28, 2017

oleg-nenashev Apr 28, 2017

oleg-nenashev left a comment

oleg-nenashev May 3, 2017

oleg-nenashev May 3, 2017

oleg-nenashev May 3, 2017

olamy May 3, 2017

oleg-nenashev May 3, 2017

oleg-nenashev May 3, 2017

olamy May 3, 2017

olamy commented May 3, 2017 •

edited

Loading

daniel-beck commented May 3, 2017

oleg-nenashev commented May 4, 2017

[JENKINS-40693, JENKINS-43713] upgrade to jetty 9.4.x #32

[JENKINS-40693, JENKINS-43713] upgrade to jetty 9.4.x #32

Conversation

olamy commented Jan 23, 2017 • edited Loading

aheritier commented Jan 30, 2017

daniel-beck commented Jan 30, 2017

oleg-nenashev commented Feb 17, 2017

oleg-nenashev commented Feb 17, 2017

paladox commented Apr 8, 2017 • edited Loading

oleg-nenashev commented Apr 9, 2017

paladox commented Apr 9, 2017

oleg-nenashev commented Apr 11, 2017

oleg-nenashev commented Apr 17, 2017

olamy commented Apr 17, 2017

oleg-nenashev commented Apr 17, 2017

olamy commented Apr 17, 2017

olamy commented Apr 19, 2017 • edited Loading

olamy commented Apr 19, 2017

olamy commented Apr 20, 2017

olamy commented Apr 20, 2017

Choose a reason for hiding this comment

oleg-nenashev left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

olamy commented Apr 28, 2017

olamy commented Apr 28, 2017

Choose a reason for hiding this comment

oleg-nenashev left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

olamy commented May 3, 2017 • edited Loading

daniel-beck commented May 3, 2017

oleg-nenashev commented May 4, 2017

olamy commented Jan 23, 2017 •

edited

Loading

paladox commented Apr 8, 2017 •

edited

Loading

olamy commented Apr 19, 2017 •

edited

Loading

olamy commented May 3, 2017 •

edited

Loading