Skip to content

Commit 022aea9

Browse files
committed
refactor: Make flow-build-tools dependency provided/optional in Maven plugin ITs
Make flow-build-tools dependency provided and optional in integration tests to prevent it from being picked up by ClassFinder as a project dependency. This better simulates real application projects which don't typically depend on build tools directly. Changes: - Add provided+optional scope to 6 ITs that implement TypeScriptBootstrapModifier: - classfinder-lookup - resources-from-project - deps-with-classifier-dups-project - plugin-pinned-deps-project - commercial-banner-build - ignore-maven-deps-from-project - Remove flow-build-tools dependency entirely from frontend-scanner-tuning-project (doesn't implement TypeScriptBootstrapModifier and doesn't need the dependency) All ITs pass successfully with these changes.
1 parent f94e851 commit 022aea9

File tree

7 files changed

+12
-6
lines changed
  • flow-plugins/flow-maven-plugin/src/it

7 files changed

+12
-6
lines changed

flow-plugins/flow-maven-plugin/src/it/classfinder-lookup/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
<artifactId>flow-build-tools</artifactId>
3434
<version>${flow.version}</version>
3535
<classifier>shaded</classifier>
36+
<scope>provided</scope>
37+
<optional>true</optional>
3638
</dependency>
3739
<dependency>
3840
<groupId>com.vaadin</groupId>

flow-plugins/flow-maven-plugin/src/it/commercial-banner-build/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
<artifactId>flow-build-tools</artifactId>
3434
<version>${flow.version}</version>
3535
<classifier>shaded</classifier>
36+
<scope>provided</scope>
37+
<optional>true</optional>
3638
</dependency>
3739
<dependency>
3840
<groupId>com.vaadin</groupId>

flow-plugins/flow-maven-plugin/src/it/deps-with-classifier-dups-project/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
<artifactId>flow-build-tools</artifactId>
3535
<version>${flow.version}</version>
3636
<classifier>shaded</classifier>
37+
<scope>provided</scope>
38+
<optional>true</optional>
3739
</dependency>
3840
<dependency>
3941
<groupId>com.vaadin</groupId>

flow-plugins/flow-maven-plugin/src/it/frontend-scanner-tuning-project/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,6 @@
3131
<artifactId>flow-server</artifactId>
3232
<version>${flow.version}</version>
3333
</dependency>
34-
<dependency>
35-
<groupId>com.vaadin</groupId>
36-
<artifactId>flow-build-tools</artifactId>
37-
<version>${flow.version}</version>
38-
<classifier>shaded</classifier>
39-
</dependency>
4034
<dependency>
4135
<groupId>com.vaadin</groupId>
4236
<artifactId>flow-client</artifactId>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
<artifactId>flow-build-tools</artifactId>
3535
<version>${flow.version}</version>
3636
<classifier>shaded</classifier>
37+
<scope>provided</scope>
38+
<optional>true</optional>
3739
</dependency>
3840
<dependency>
3941
<groupId>com.vaadin</groupId>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
<artifactId>flow-build-tools</artifactId>
3535
<version>${flow.version}</version>
3636
<classifier>shaded</classifier>
37+
<scope>provided</scope>
38+
<optional>true</optional>
3739
</dependency>
3840
<dependency>
3941
<groupId>com.vaadin</groupId>

flow-plugins/flow-maven-plugin/src/it/resources-from-project/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
<artifactId>flow-build-tools</artifactId>
3434
<version>${flow.version}</version>
3535
<classifier>shaded</classifier>
36+
<scope>provided</scope>
37+
<optional>true</optional>
3638
</dependency>
3739
<dependency>
3840
<groupId>com.vaadin</groupId>

0 commit comments

Comments
 (0)