Commit 6fe93c4 1 parent c8811e5 commit 6fe93c4 Copy full SHA for 6fe93c4
File tree 2 files changed +11
-9
lines changed
main/java/com/vaadin/flow/server/frontend/scanner
test/java/com/vaadin/flow/server/frontend/scanner
2 files changed +11
-9
lines changed Original file line number Diff line number Diff line change 77
77
public class FrontendDependencies extends AbstractDependenciesScanner {
78
78
79
79
//@formatter:off
80
- private static final Pattern VISITABLE_CLASS_PATTERN = Pattern .compile ("(^$|"
80
+ private static final Pattern NOT_VISITABLE_CLASS_PATTERN = Pattern .compile ("(^$|"
81
81
+ ".*(slf4j).*|"
82
82
// #5803
83
- + "^(java|sun|oracle|elemental|javax|jakarta|oshi|"
84
- + "org\\ .(apache|atmosphere|jsoup|jboss|w3c|spring|joda|hibernate|glassfish|hsqldb|osgi|jooq)\\ b|"
85
- + "com\\ .(helger|spring|gwt|lowagie|fasterxml|sun|nimbusds|googlecode)\\ b|"
83
+ + "^(java|sun|oracle|elemental|javax|javafx|jakarta|oshi|cglib|"
84
+ + "org\\ .(apache|antlr|atmosphere|aspectj|jsoup|jboss|w3c|spring|joda|hibernate|glassfish|hsqldb|osgi|jooq|springframework|bouncycastle|snakeyaml|keycloak|flywaydb)\\ b|"
85
+ + "com\\ .(helger|spring|gwt|lowagie|fasterxml|sun|nimbusds|googlecode|ibm)\\ b|"
86
+ + "ch\\ .quos\\ .logback\\ b|"
87
+ + "io\\ .(fabric8\\ .kubernetes)\\ b|"
86
88
+ "net\\ .(sf|bytebuddy)\\ b"
87
89
+ ").*|"
88
90
+ ".*(Exception)$"
@@ -903,7 +905,7 @@ protected boolean shouldVisit(String className) {
903
905
// common name-spaces that would not have components.
904
906
// We also exclude Feature-Flag classes
905
907
return className != null && !isExperimental (className )
906
- && !VISITABLE_CLASS_PATTERN .matcher (className ).matches ();
908
+ && !NOT_VISITABLE_CLASS_PATTERN .matcher (className ).matches ();
907
909
}
908
910
909
911
private URL getUrl (String className ) {
Original file line number Diff line number Diff line change @@ -327,11 +327,11 @@ public void shouldVisit_shouldNotMatchOnPartOfPackage() {
327
327
classFinder , true );
328
328
329
329
Assert .assertTrue (
330
- "second package should match fully not as starts with 'spring != springframework '" ,
331
- dependencies .shouldVisit ("org.springframework .samples" ));
330
+ "second package should match fully not as starts with 'spring != springseason '" ,
331
+ dependencies .shouldVisit ("org.springseason .samples" ));
332
332
Assert .assertTrue (
333
- "second package should match fully not as starts with 'spring != springframework '" ,
334
- dependencies .shouldVisit ("org.springframework " ));
333
+ "second package should match fully not as starts with 'spring != springseason '" ,
334
+ dependencies .shouldVisit ("org.springseason " ));
335
335
Assert .assertFalse ("should not visit with only 2 packages 'org.spring'" ,
336
336
dependencies .shouldVisit ("org.spring" ));
337
337
You can’t perform that action at this time.
0 commit comments