Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Jetty 9.2.15 → 9.4.5 #63

Merged
merged 2 commits into from
Jun 27, 2017
Merged

Conversation

olamy
Copy link
Member

@olamy olamy commented Jun 26, 2017

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

Signed-off-by: olivier lamy <olamy@apache.org>
@olamy olamy requested review from jglick and oleg-nenashev June 26, 2017 11:22
@olamy
Copy link
Member Author

olamy commented Jun 26, 2017

@jglick @oleg-nenashev please review guys thanks!

Signed-off-by: olivier lamy <olamy@apache.org>
<jetty.version>9.2.15.v20160210</jetty.version>
<jetty.version>9.4.5.v20170502</jetty.version>
<maven-surefire-plugin.version>2.20</maven-surefire-plugin.version>
<maven-compiler-plugin.version>3.6.1</maven-compiler-plugin.version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why would you need the explicit versions here?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also curious about this. The parent POM defines these versions IIUC.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

well it's really to use more up2date versions :-)

<jetty.version>9.2.15.v20160210</jetty.version>
<jetty.version>9.4.5.v20170502</jetty.version>
<maven-surefire-plugin.version>2.20</maven-surefire-plugin.version>
<maven-compiler-plugin.version>3.6.1</maven-compiler-plugin.version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also curious about this. The parent POM defines these versions IIUC.

@jglick
Copy link
Member

jglick commented Jun 26, 2017

Not sure why CI build is broken; opened #64 to modernize it.

@olamy olamy merged commit 67e38f5 into jenkinsci:master Jun 27, 2017
@olamy olamy deleted the feature/jetty_9_4 branch June 27, 2017 00:38
@jglick jglick changed the title upgrade to jetty 9.4 Upgrade Jetty 9.2.15 → 9.4.5 Sep 13, 2017
realm.update("alice", new Password("alice"), new String[]{"user","female"});
realm.update("bob", new Password("bob"), new String[]{"user","male"});
realm.update("charlie", new Password("charlie"), new String[]{"user","male"});
UserStore userStore = new UserStore();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Forced by Jetty changes as detailed in jetty/jetty.project#1488 (comment). This makes it awkward to switch Jetty versions in a plugin back to 9.2.x, which @vivek says is currently necessary for Wiremock compatibility: you must use

@Rule
public JenkinsRule r = new JenkinsRule() {
    @Override
    protected LoginService configureUserRealm() {
        HashLoginService realm = new HashLoginService();
        realm.setName("default");
        return realm;
    }
};

We cannot simply delete the UserStore part from the default implementation; it works for most tests, but not those calling WebClient.login while using LegacySecurityRealm (perhaps indirectly via @PresetData(DataSet.NO_ANONYMOUS_READACCESS)), of which there are a few in core and some plugins. (For example, JnlpAccessWithSecuredHudsonTest, using HudsonTestCase.)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants