Skip to content

Commit 43af0e1

Browse files
committed
chore: fix versions of vcf-pdf-viewer web component and jetty version for v25
1 parent 97db154 commit 43af0e1

File tree

3 files changed

+8
-25
lines changed

3 files changed

+8
-25
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@ vcf-pdf-viewer-demo/tsconfig.json
5252
vcf-pdf-viewer-demo/types.d.ts
5353
vcf-pdf-viewer-demo/pnpmfile.js
5454
vcf-pdf-viewer-demo/.npmrc
55-
vcf-pdf-viewer-demo/src/main/dev-bundle
55+
vcf-pdf-viewer-demo/src/main/bundles
5656
vcf-pdf-viewer-demo/src/main/frontend/index.html
5757
vcf-pdf-viewer-demo/src/main/frontend/generated

vcf-pdf-viewer-demo/pom.xml

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,10 @@
1919

2020
<properties>
2121
<vaadin.version>25.0.0-beta5</vaadin.version>
22-
<flow.version>9.0.1</flow.version>
2322
<maven.compiler.source>21</maven.compiler.source>
2423
<maven.compiler.target>21</maven.compiler.target>
2524
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2625
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
27-
<failOnMissingWebXml>false</failOnMissingWebXml>
2826
</properties>
2927
<dependencyManagement>
3028
<dependencies>
@@ -38,7 +36,6 @@
3836
</dependencies>
3937
</dependencyManagement>
4038

41-
4239
<repositories>
4340
<repository>
4441
<id>Vaadin Directory</id>
@@ -112,23 +109,10 @@
112109
<version>${project.version}</version>
113110
</dependency>
114111

115-
<dependency>
116-
<groupId>com.vaadin</groupId>
117-
<artifactId>flow-component-demo-helpers</artifactId>
118-
<version>${flow.version}</version>
119-
</dependency>
120-
121112
<dependency>
122113
<groupId>org.slf4j</groupId>
123114
<artifactId>slf4j-simple</artifactId>
124115
</dependency>
125-
126-
<dependency>
127-
<groupId>javax.servlet</groupId>
128-
<artifactId>javax.servlet-api</artifactId>
129-
<version>3.1.0</version>
130-
</dependency>
131-
132116
</dependencies>
133117

134118
<build>
@@ -146,9 +130,9 @@
146130
<plugins>
147131
<!-- Jetty plugin for easy testing without a server -->
148132
<plugin>
149-
<groupId>org.eclipse.jetty</groupId>
150-
<artifactId>jetty-maven-plugin</artifactId>
151-
<version>11.0.26</version>
133+
<groupId>org.eclipse.jetty.ee11</groupId>
134+
<artifactId>jetty-ee11-maven-plugin</artifactId>
135+
<version>12.1.4</version>
152136
<configuration>
153137
<stopKey>${project.artifactId}</stopKey>
154138
<stopPort>8081</stopPort>
@@ -164,9 +148,6 @@
164148
<goals>
165149
<goal>prepare-frontend</goal>
166150
</goals>
167-
<configuration>
168-
<convertHtml>false</convertHtml>
169-
</configuration>
170151
</execution>
171152
</executions>
172153
</plugin>
@@ -182,6 +163,9 @@
182163
<groupId>org.apache.maven.plugins</groupId>
183164
<artifactId>maven-war-plugin</artifactId>
184165
<version>3.5.0</version>
166+
<configuration>
167+
<failOnMissingWebXml>false</failOnMissingWebXml>
168+
</configuration>
185169
</plugin>
186170
<plugin>
187171
<groupId>org.apache.maven.plugins</groupId>
@@ -246,5 +230,4 @@
246230
</build>
247231
</profile>
248232
</profiles>
249-
250233
</project>

vcf-pdf-viewer/src/main/java/com/vaadin/componentfactory/pdfviewer/PdfViewer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import org.apache.commons.lang3.StringUtils;
4040

4141
@Tag("vcf-pdf-viewer")
42-
@NpmPackage(value = "@vaadin-component-factory/vcf-pdf-viewer", version = "3.1.0")
42+
@NpmPackage(value = "@vaadin-component-factory/vcf-pdf-viewer", version = "4.0.0")
4343
@NpmPackage(value = "print-js", version = "1.6.0")
4444
@JsModule("@vaadin-component-factory/vcf-pdf-viewer/vcf-pdf-viewer.js")
4545
@JsModule("./src/pdf-print.js")

0 commit comments

Comments
 (0)