File tree 3 files changed +6
-7
lines changed
main/java/org/springframework/boot/web/embedded/jetty
test/java/org/springframework/boot/web/embedded/jetty
3 files changed +6
-7
lines changed Original file line number Diff line number Diff line change @@ -855,7 +855,7 @@ bom {
855
855
]
856
856
}
857
857
}
858
- library(" Jetty" , " 12.0.8 " ) {
858
+ library(" Jetty" , " 12.0.9 " ) {
859
859
group(" org.eclipse.jetty.ee10" ) {
860
860
imports = [
861
861
" jetty-ee10-bom"
Original file line number Diff line number Diff line change 17
17
package org .springframework .boot .web .embedded .jetty ;
18
18
19
19
import org .eclipse .jetty .ee10 .servlet .ServletHandler ;
20
- import org .eclipse .jetty .ee10 .webapp .ClassMatcher ;
21
20
import org .eclipse .jetty .ee10 .webapp .WebAppContext ;
21
+ import org .eclipse .jetty .util .ClassMatcher ;
22
22
23
23
/**
24
24
* Jetty {@link WebAppContext} used by {@link JettyWebServer} to support deferred
29
29
class JettyEmbeddedWebAppContext extends WebAppContext {
30
30
31
31
JettyEmbeddedWebAppContext () {
32
- setServerClassMatcher (new ClassMatcher ("org.springframework.boot.loader." ));
33
- // setTempDirectory(WebInfConfiguration.getCanonicalNameForWebAppTmpDir(this));
32
+ setHiddenClassMatcher (new ClassMatcher ("org.springframework.boot.loader." ));
34
33
}
35
34
36
35
@ Override
Original file line number Diff line number Diff line change 45
45
import org .eclipse .jetty .ee10 .servlet .ErrorPageErrorHandler ;
46
46
import org .eclipse .jetty .ee10 .servlet .ServletHolder ;
47
47
import org .eclipse .jetty .ee10 .webapp .AbstractConfiguration ;
48
- import org .eclipse .jetty .ee10 .webapp .ClassMatcher ;
49
48
import org .eclipse .jetty .ee10 .webapp .Configuration ;
50
49
import org .eclipse .jetty .ee10 .webapp .WebAppContext ;
51
50
import org .eclipse .jetty .server .AbstractConnector ;
55
54
import org .eclipse .jetty .server .Server ;
56
55
import org .eclipse .jetty .server .ServerConnector ;
57
56
import org .eclipse .jetty .server .SslConnectionFactory ;
57
+ import org .eclipse .jetty .util .ClassMatcher ;
58
58
import org .eclipse .jetty .util .ssl .SslContextFactory ;
59
59
import org .eclipse .jetty .util .thread .QueuedThreadPool ;
60
60
import org .eclipse .jetty .util .thread .ThreadPool ;
@@ -196,8 +196,8 @@ void jettyConfigurations() throws Exception {
196
196
Configuration mockConfiguration (Class <? extends Configuration > type ) {
197
197
Configuration mock = mock (type );
198
198
ClassMatcher classMatcher = new ClassMatcher ();
199
- given (mock .getSystemClasses ()).willReturn (classMatcher );
200
- given (mock .getServerClasses ()).willReturn (classMatcher );
199
+ given (mock .getProtectedClasses ()).willReturn (classMatcher );
200
+ given (mock .getHiddenClasses ()).willReturn (classMatcher );
201
201
return mock ;
202
202
}
203
203
You can’t perform that action at this time.
0 commit comments