Skip to content

Commit a92cd49

Browse files
authored
Merge branch 'main' into bugfix/commons-dependencies-leaking-from-vaadin-dev
2 parents 504d4c6 + b3987eb commit a92cd49

File tree

7 files changed

+315
-187
lines changed

7 files changed

+315
-187
lines changed

flow-plugins/flow-dev-bundle-plugin/src/main/java/com/vaadin/flow/plugin/maven/Reflector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public final class Reflector {
5656
"org.eclipse.sisu");
5757
// Dependency required by the plugin but not provided by Flow at runtime
5858
private static final Set<String> REQUIRED_PLUGIN_DEPENDENCIES = Set.of(
59-
"org.reflections:reflections:jar",
59+
"io.github.classgraph:classgraph:jar",
6060
"org.zeroturnaround:zt-exec:jar");
6161
private static final ScopeArtifactFilter PRODUCTION_SCOPE_FILTER = new ScopeArtifactFilter(
6262
Artifact.SCOPE_COMPILE_PLUS_RUNTIME);

flow-plugins/flow-maven-plugin/src/it/plugin-pinned-deps-project/invoker.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,6 @@
1414
# the License.
1515
#
1616

17-
invoker.goals=clean package
17+
# Build will fail with a ClassNotFoundException if using the outdate version
18+
# of the plugin required dependencies.
19+
invoker.goals=clean package -ntp

flow-plugins/flow-maven-plugin/src/it/plugin-pinned-deps-project/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
<version>${flow.version}</version>
3636
</dependency>
3737
<dependency>
38-
<groupId>org.reflections</groupId>
39-
<artifactId>reflections</artifactId>
40-
<version>0.9.10</version>
38+
<groupId>io.github.classgraph</groupId>
39+
<artifactId>classgraph</artifactId>
40+
<version>4.0.0</version>
4141
</dependency>
4242
<dependency>
4343
<groupId>org.zeroturnaround</groupId>

flow-plugins/flow-maven-plugin/src/main/java/com/vaadin/flow/plugin/maven/Reflector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public final class Reflector {
6969
"org.eclipse.sisu");
7070
// Dependency required by the plugin but not provided by Flow at runtime
7171
private static final Set<String> REQUIRED_PLUGIN_DEPENDENCIES = Set.of(
72-
"org.reflections:reflections:jar",
72+
"io.github.classgraph:classgraph:jar",
7373
"org.zeroturnaround:zt-exec:jar");
7474
private static final ScopeArtifactFilter PRODUCTION_SCOPE_FILTER = new ScopeArtifactFilter(
7575
Artifact.SCOPE_COMPILE_PLUS_RUNTIME);

flow-plugins/flow-plugin-base/pom.xml

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -30,28 +30,9 @@
3030
<artifactId>license-checker</artifactId>
3131
</dependency>
3232
<dependency>
33-
<groupId>org.reflections</groupId>
34-
<artifactId>reflections</artifactId>
35-
<version>0.10.2</version>
36-
<exclusions>
37-
<exclusion>
38-
<groupId>org.dom4j</groupId>
39-
<artifactId>dom4j</artifactId>
40-
</exclusion>
41-
<exclusion>
42-
<groupId>com.google.code.gson</groupId>
43-
<artifactId>gson</artifactId>
44-
</exclusion>
45-
<exclusion>
46-
<groupId>org.javassist</groupId>
47-
<artifactId>javassist</artifactId>
48-
</exclusion>
49-
</exclusions>
50-
</dependency>
51-
<dependency>
52-
<groupId>org.javassist</groupId>
53-
<artifactId>javassist</artifactId>
54-
<version>${javassist.version}</version>
33+
<groupId>io.github.classgraph</groupId>
34+
<artifactId>classgraph</artifactId>
35+
<version>4.8.184</version>
5536
</dependency>
5637
<dependency>
5738
<groupId>org.zeroturnaround</groupId>

0 commit comments

Comments
 (0)