Skip to content

Commit e922f3e

Browse files
mshabarovmshabarov
authored
Merge branch 'main' into vaadinFilter
2 parents a327e3b + 423bbb7 commit e922f3e

File tree

50 files changed

+2325
-17
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+2325
-17
lines changed

‎flow-jandex/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
<plugin>
105105
<groupId>io.smallrye</groupId>
106106
<artifactId>jandex-maven-plugin</artifactId>
107-
<version>3.1.2</version>
107+
<version>3.1.3</version>
108108
<executions>
109109
<execution>
110110
<id>make-index</id>

‎flow-server/src/main/java/com/vaadin/experimental/FeatureFlags.java

-6
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,6 @@ public class FeatureFlags implements Serializable {
5858
"Collaboration Kit backend for clustering support",
5959
"collaborationEngineBackend",
6060
"https://github.com/vaadin/platform/issues/1988", true, null);
61-
public static final Feature SIDE_NAV_COMPONENT = new Feature(
62-
"SideNav component (Production ready but tweaks to at least the internal DOM will still take place)",
63-
"sideNavComponent",
64-
"https://vaadin.com/docs/latest/components/side-nav", true,
65-
"com.vaadin.flow.component.sidenav.SideNav");
6661

6762
public static final Feature WEB_PUSH = new Feature(
6863
"Server side WebPush API", "webPush",
@@ -87,7 +82,6 @@ public FeatureFlags(Lookup lookup) {
8782
this.lookup = lookup;
8883
features.add(new Feature(EXAMPLE));
8984
features.add(new Feature(COLLABORATION_ENGINE_BACKEND));
90-
features.add(new Feature(SIDE_NAV_COMPONENT));
9185
features.add(new Feature(WEB_PUSH));
9286
loadProperties();
9387
}

‎flow-tests/pom.xml

+6
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,12 @@
337337
<module>test-webpush</module>
338338
</modules>
339339
</profile>
340+
<profile>
341+
<id>benchmark</id>
342+
<modules>
343+
<module>vaadin-spring-tests</module>
344+
</modules>
345+
</profile>
340346
<profile>
341347
<id>eclipse</id>
342348
<build>

‎flow-tests/test-theme-editor/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<dependency>
4848
<groupId>com.vaadin</groupId>
4949
<artifactId>vaadin-button-flow</artifactId>
50-
<version>24.1.6</version>
50+
<version>24.1.7</version>
5151
</dependency>
5252
</dependencies>
5353

‎flow-tests/vaadin-spring-tests/pom.xml

+13-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<properties>
1717
<maven.deploy.skip>true</maven.deploy.skip>
18-
<component.version>24.1.5</component.version>
18+
<component.version>24.1.7</component.version>
1919
<nimbus-jose-jwt.version>9.31</nimbus-jose-jwt.version>
2020
</properties>
2121

@@ -329,8 +329,20 @@
329329

330330
<module>test-spring-boot-only-prepare</module>
331331
<module>test-spring-white-list</module>
332+
333+
</modules>
334+
</profile>
335+
336+
<profile>
337+
<!-- Modules for performance benchmark -->
338+
<id>benchmark</id>
339+
340+
<modules>
341+
<module>test-spring-boot-reload-time</module>
342+
<module>test-spring-boot-multimodule-reload-time</module>
332343
</modules>
333344
</profile>
345+
334346
</profiles>
335347

336348
</project>

‎flow-tests/vaadin-spring-tests/test-spring-boot-multimodule-reload-time/README.MD

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
## Spring boot multimodule reload time project
2+
3+
Project to measure reload time of large Spring boot application.
4+
Application is partly generated by Maven plugin under `/generator` submodule (`test-spring-boot-multimodule-reload-time-generator`).
5+
See list of properties ahead to configure generator.
6+
7+
How to build Flow for `test-spring-boot-multimodule-reload-time` locally:
8+
```
9+
/flow
10+
$ mvn clean install -DskipTests -Pvalidation,benchmark
11+
```
12+
13+
How to run tests locally:
14+
15+
```
16+
mvn verify -pl :test-spring-boot-multimodule-reload-time-ui -Pbenchmark -Dvaadin.test.codegen.maven.plugin.routes=1000
17+
```
18+
19+
### Properties for code generator
20+
21+
`vaadin.test.codegen.maven.plugin.routes`: number of generated routes. Default is 500.
22+
23+
`vaadin.test.codegen.maven.plugin.services.per.route`: number of generated Spring components per route. Default is 1.
24+
25+
`vaadin.test.codegen.maven.plugin.cssimports.per.route`: number of generated
26+
@CssImport + .css combos per route. CSS files are generated
27+
in `frontend/generated-css` folder. CSS file has a rule that is used by the
28+
route.
29+
Default is 0.
30+
31+
`vaadin.test.codegen.maven.plugin.jsmodules.per.route`: number of generated
32+
@JsModule + .js combos per route. JS files are generated
33+
in `frontend/generated-js` folder. Javascript in the file defines a simple
34+
web-component with
35+
Lit. Web component is added to the DOM of the route. Default is 0.
36+
37+
### Other properties for the integration test
38+
39+
`route.hierarchy.enabled`: When 'true', adds a route with hierarchical
40+
structure.
41+
Route is mapped like '
42+
catalog/product/0' (or with alias 'catalog/prod/0'). 'false' by default.

‎flow-tests/vaadin-spring-tests/test-spring-boot-multimodule-reload-time/generator/pom.xml

+97
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
<parent>
7+
<artifactId>test-spring-boot-multimodule-reload-time</artifactId>
8+
<groupId>com.vaadin</groupId>
9+
<version>24.2-SNAPSHOT</version>
10+
</parent>
11+
<artifactId>test-spring-boot-multimodule-reload-time-generator</artifactId>
12+
<name>The code generator Maven plugin for a Spring boot multimodule reload
13+
time project
14+
</name>
15+
16+
<packaging>maven-plugin</packaging>
17+
<properties>
18+
<maven.deploy.skip>true</maven.deploy.skip>
19+
</properties>
20+
21+
<dependencies>
22+
<dependency>
23+
<groupId>org.apache.maven</groupId>
24+
<artifactId>maven-core</artifactId>
25+
<version>${maven.version}</version>
26+
<scope>provided</scope>
27+
</dependency>
28+
<dependency>
29+
<groupId>org.apache.maven</groupId>
30+
<artifactId>maven-artifact</artifactId>
31+
<version>${maven.version}</version>
32+
<scope>provided</scope>
33+
</dependency>
34+
<dependency>
35+
<groupId>org.apache.maven</groupId>
36+
<artifactId>maven-plugin-api</artifactId>
37+
<version>${maven.version}</version>
38+
<scope>provided</scope>
39+
</dependency>
40+
<dependency>
41+
<groupId>org.apache.maven.plugin-tools</groupId>
42+
<artifactId>maven-plugin-annotations</artifactId>
43+
<scope>provided</scope>
44+
</dependency>
45+
<dependency>
46+
<groupId>org.springframework.boot</groupId>
47+
<artifactId>spring-boot-starter-mustache</artifactId>
48+
<version>${spring.boot.version}</version>
49+
</dependency>
50+
<dependency>
51+
<groupId>org.springframework</groupId>
52+
<artifactId>spring-context</artifactId>
53+
</dependency>
54+
</dependencies>
55+
56+
<build>
57+
<pluginManagement>
58+
<plugins>
59+
<plugin>
60+
<groupId>org.apache.maven.plugins</groupId>
61+
<artifactId>maven-plugin-plugin</artifactId>
62+
<version>3.9.0</version>
63+
<configuration>
64+
<skipErrorNoDescriptorsFound>true
65+
</skipErrorNoDescriptorsFound>
66+
</configuration>
67+
<executions>
68+
<execution>
69+
<id>mojo-descriptor</id>
70+
<phase>process-classes</phase>
71+
<goals>
72+
<goal>descriptor</goal>
73+
</goals>
74+
</execution>
75+
</executions>
76+
</plugin>
77+
<plugin>
78+
<groupId>org.apache.maven.plugins</groupId>
79+
<artifactId>maven-jar-plugin</artifactId>
80+
<configuration>
81+
<archive>
82+
<manifestFile>
83+
${project.build.outputDirectory}/META-INF/MANIFEST.MF
84+
</manifestFile>
85+
<index>false</index>
86+
<manifest>
87+
<addDefaultImplementationEntries>true
88+
</addDefaultImplementationEntries>
89+
</manifest>
90+
</archive>
91+
</configuration>
92+
</plugin>
93+
</plugins>
94+
</pluginManagement>
95+
</build>
96+
97+
</project>

0 commit comments

Comments
 (0)