Skip to content

Commit b7763b1

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

File tree

3 files changed

+8
-18
lines changed

3 files changed

+8
-18
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 & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
<maven.compiler.target>21</maven.compiler.target>
2525
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2626
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
27-
<failOnMissingWebXml>false</failOnMissingWebXml>
2827
</properties>
2928
<dependencyManagement>
3029
<dependencies>
@@ -38,7 +37,6 @@
3837
</dependencies>
3938
</dependencyManagement>
4039

41-
4240
<repositories>
4341
<repository>
4442
<id>Vaadin Directory</id>
@@ -122,13 +120,6 @@
122120
<groupId>org.slf4j</groupId>
123121
<artifactId>slf4j-simple</artifactId>
124122
</dependency>
125-
126-
<dependency>
127-
<groupId>javax.servlet</groupId>
128-
<artifactId>javax.servlet-api</artifactId>
129-
<version>3.1.0</version>
130-
</dependency>
131-
132123
</dependencies>
133124

134125
<build>
@@ -146,9 +137,9 @@
146137
<plugins>
147138
<!-- Jetty plugin for easy testing without a server -->
148139
<plugin>
149-
<groupId>org.eclipse.jetty</groupId>
150-
<artifactId>jetty-maven-plugin</artifactId>
151-
<version>11.0.26</version>
140+
<groupId>org.eclipse.jetty.ee11</groupId>
141+
<artifactId>jetty-ee11-maven-plugin</artifactId>
142+
<version>12.1.4</version>
152143
<configuration>
153144
<stopKey>${project.artifactId}</stopKey>
154145
<stopPort>8081</stopPort>
@@ -164,9 +155,6 @@
164155
<goals>
165156
<goal>prepare-frontend</goal>
166157
</goals>
167-
<configuration>
168-
<convertHtml>false</convertHtml>
169-
</configuration>
170158
</execution>
171159
</executions>
172160
</plugin>
@@ -182,6 +170,9 @@
182170
<groupId>org.apache.maven.plugins</groupId>
183171
<artifactId>maven-war-plugin</artifactId>
184172
<version>3.5.0</version>
173+
<configuration>
174+
<failOnMissingWebXml>false</failOnMissingWebXml>
175+
</configuration>
185176
</plugin>
186177
<plugin>
187178
<groupId>org.apache.maven.plugins</groupId>
@@ -246,5 +237,4 @@
246237
</build>
247238
</profile>
248239
</profiles>
249-
250240
</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)