Emmanuel Bourg pushed to branch master at Debian Java Maintainers / wagon
Commits: be6cfaf4 by Emmanuel Bourg at 2018-12-10T17:57:06Z Fixed the build failure with Jetty 9.4 - - - - - 4 changed files: - debian/changelog - debian/control - + debian/patches/jetty-compatibility.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +wagon (3.2.0-2) unstable; urgency=medium + + * Team upload. + * Fixed the build failure with Jetty 9.4 + + -- Emmanuel Bourg <[email protected]> Mon, 10 Dec 2018 18:48:06 +0100 + wagon (3.2.0-1) unstable; urgency=medium * Team upload. ===================================== debian/control ===================================== @@ -12,8 +12,8 @@ Build-Depends: libcommons-net-java, libeasymock-java (>= 3.2), libhttpclient-java (>= 4.3.1), - libjetty9-extra-java, - libjetty9-java, + libjetty9-extra-java (>= 9.4), + libjetty9-java (>= 9.4), libjsch-agent-proxy-java, libjsch-java, libjsoup-java, ===================================== debian/patches/jetty-compatibility.patch ===================================== @@ -0,0 +1,68 @@ +Description: Fixes the compatibility with Jetty 9.4 +Author: Emmanuel Bourg <[email protected]> +Forwarded: no +--- a/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java ++++ b/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java +@@ -2224,7 +2224,9 @@ + + TestSecurityHandler sh = new TestSecurityHandler(); + HashLoginService hashLoginService = new HashLoginService( "MyRealm" ); +- hashLoginService.putUser( "user", new Password( "secret" ), new String[] { "admin" } ); ++ org.eclipse.jetty.security.UserStore userStore = new org.eclipse.jetty.security.UserStore(); ++ hashLoginService.setUserStore( userStore ); ++ userStore.addUser( "user", new Password( "secret" ), new String[] { "admin" } ); + sh.setLoginService( hashLoginService ); + sh.setConstraintMappings( new ConstraintMapping[]{ cm } ); + sh.setAuthenticator ( new BasicAuthenticator() ); +--- a/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/ServerFixture.java ++++ b/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/ServerFixture.java +@@ -22,12 +22,12 @@ + import org.eclipse.jetty.security.ConstraintMapping; + import org.eclipse.jetty.security.ConstraintSecurityHandler; + import org.eclipse.jetty.security.HashLoginService; ++import org.eclipse.jetty.security.UserStore; + import org.eclipse.jetty.server.Handler; + import org.eclipse.jetty.server.Server; + import org.eclipse.jetty.server.ServerConnector; + import org.eclipse.jetty.server.handler.DefaultHandler; + import org.eclipse.jetty.server.handler.HandlerCollection; +-import org.eclipse.jetty.server.session.AbstractSessionManager; + import org.eclipse.jetty.server.session.SessionHandler; + import org.eclipse.jetty.servlet.FilterHolder; + import org.eclipse.jetty.servlet.FilterMapping; +@@ -71,6 +71,8 @@ + + private final HashLoginService loginService; + ++ private final UserStore userStore; ++ + private final ConstraintSecurityHandler securityHandler; + + private int filterCount = 0; +@@ -117,6 +119,8 @@ + securityHandler = new ConstraintSecurityHandler(); + + loginService = new HashLoginService( "Test Server" ); ++ userStore = new UserStore(); ++ loginService.setUserStore( userStore ); + + securityHandler.setLoginService( loginService ); + securityHandler.setConstraintMappings( new ConstraintMapping[]{ cm } ); +@@ -130,7 +134,7 @@ + webappContext.setHandler( securityHandler ); + + SessionHandler sessionHandler = webappContext.getSessionHandler(); +- ( (AbstractSessionManager) sessionHandler.getSessionManager() ).setUsingCookies( false ); ++ sessionHandler.setUsingCookies( false ); + + HandlerCollection handlers = new HandlerCollection(); + handlers.setHandlers( new Handler[]{ webappContext, new DefaultHandler() } ); +@@ -159,7 +163,7 @@ + + public void addUser( final String user, final String password ) + { +- loginService.putUser( user, new Password( password ), new String[] { "allowed" } ); ++ userStore.addUser( user, new Password( password ), new String[] { "allowed" } ); + } + + public Server getServer() ===================================== debian/patches/series ===================================== @@ -3,3 +3,4 @@ do_not_run_http_tests.patch no_mina_sshd.diff no_itcould_webdav.diff network_dependent_test_disabled.patch +jetty-compatibility.patch View it on GitLab: https://salsa.debian.org/java-team/wagon/commit/be6cfaf41edf8e3100cb34542432f1fc6df9fb3c -- View it on GitLab: https://salsa.debian.org/java-team/wagon/commit/be6cfaf41edf8e3100cb34542432f1fc6df9fb3c You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
