Skip to content

Commit 491d900

Browse files
committed
feat(demo): upgrade to vaadin 14.7.5
1 parent 54faecc commit 491d900

File tree

1 file changed

+44
-16
lines changed

1 file changed

+44
-16
lines changed

vcf-date-range-picker-demo/pom.xml

Lines changed: 44 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
</organization>
1818

1919
<properties>
20-
<osgi.version>6.0.0</osgi.version>
21-
<vaadin.version>14.5.5</vaadin.version>
22-
<flow.version>2.5.4</flow.version>
2320
<maven.compiler.source>1.8</maven.compiler.source>
2421
<maven.compiler.target>1.8</maven.compiler.target>
22+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2523
<failOnMissingWebXml>false</failOnMissingWebXml>
24+
<vaadin.version>14.7.5</vaadin.version>
25+
<flow.version>2.7.4</flow.version>
2626
</properties>
2727

2828
<dependencyManagement>
@@ -75,6 +75,7 @@
7575
</dependencies>
7676

7777
<build>
78+
<defaultGoal>jetty:run</defaultGoal>
7879
<resources>
7980
<resource>
8081
<directory>src/main/java</directory>
@@ -85,35 +86,62 @@
8586
<filtering>false</filtering>
8687
</resource>
8788
</resources>
89+
<pluginManagement>
90+
<plugins>
91+
<plugin>
92+
<groupId>org.apache.maven.plugins</groupId>
93+
<artifactId>maven-war-plugin</artifactId>
94+
<version>3.3.1</version>
95+
</plugin>
96+
</plugins>
97+
</pluginManagement>
8898
<plugins>
99+
<plugin>
100+
<groupId>org.apache.maven.plugins</groupId>
101+
<artifactId>maven-war-plugin</artifactId>
102+
<version>3.3.1</version>
103+
</plugin>
104+
<!-- We use jetty plugin, replace it with your favourite developing servlet container -->
89105
<plugin>
90106
<groupId>org.eclipse.jetty</groupId>
91107
<artifactId>jetty-maven-plugin</artifactId>
92-
<version>9.4.11.v20180605</version>
108+
<version>9.4.43.v20210629</version>
93109
<configuration>
94110
<scanIntervalSeconds>1</scanIntervalSeconds>
95111
</configuration>
96112
</plugin>
113+
<!--
114+
Take care of synchronizing java dependencies and imports in
115+
package.json and main.js files.
116+
It also creates webpack.config.js if not exists yet.
117+
-->
97118
<plugin>
98-
<groupId>org.sonatype.plugins</groupId>
99-
<artifactId>nexus-staging-maven-plugin</artifactId>
100-
<version>1.6.8</version>
101-
<configuration>
102-
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
103-
</configuration>
119+
<groupId>com.vaadin</groupId>
120+
<artifactId>vaadin-maven-plugin</artifactId>
121+
<version>${vaadin.version}</version>
122+
<executions>
123+
<execution>
124+
<goals>
125+
<goal>prepare-frontend</goal>
126+
</goals>
127+
</execution>
128+
</executions>
104129
</plugin>
105-
106130
</plugins>
107131
</build>
108132

109133
<profiles>
110134
<profile>
111-
<id>production-mode</id>
135+
<!-- Production mode is activated using -Pproduction -->
136+
<id>production</id>
137+
<properties>
138+
<vaadin.productionMode>true</vaadin.productionMode>
139+
</properties>
140+
112141
<dependencies>
113142
<dependency>
114143
<groupId>com.vaadin</groupId>
115144
<artifactId>flow-server-production-mode</artifactId>
116-
<version>${flow.version}</version>
117145
</dependency>
118146
</dependencies>
119147

@@ -122,13 +150,13 @@
122150
<plugin>
123151
<groupId>com.vaadin</groupId>
124152
<artifactId>vaadin-maven-plugin</artifactId>
125-
<version>13.0.9</version>
153+
<version>${vaadin.version}</version>
126154
<executions>
127155
<execution>
128156
<goals>
129-
<goal>copy-production-files</goal>
130-
<goal>package-for-production</goal>
157+
<goal>build-frontend</goal>
131158
</goals>
159+
<phase>compile</phase>
132160
</execution>
133161
</executions>
134162
</plugin>

0 commit comments

Comments
 (0)