Skip to content

refactor: upgrade to v25 #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

refactor: upgrade to v25 #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
023d6df
chore: version 6.0.0
sujoykd Nov 19, 2025
97db154
chore: update plugin versions
sujoykd Nov 19, 2025
43af0e1
chore: fix versions of vcf-pdf-viewer web component and jetty version…
sujoykd Nov 19, 2025
855dd14
chore: replace stream resource with download handler in demo views
sujoykd Nov 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ error-screenshots/
*.iml
.idea/
.eclipse
.DS_Store


# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
Expand All @@ -45,13 +46,12 @@ webpack.config.js
webpack.generated.js

.vscode
vcf-pdf-viewer-demo/frontend/index.html
vcf-pdf-viewer-demo/frontend/generated
vcf-pdf-viewer-demo/src/main/dev-bundle
vcf-pdf-viewer-demo/vite.generated.ts
vcf-pdf-viewer-demo/vite.config.ts
vcf-pdf-viewer-demo/tsconfig.json
vcf-pdf-viewer-demo/types.d.ts
vcf-pdf-viewer-demo/pnpmfile.js
vcf-pdf-viewer-demo/.npmrc
vcf-pdf-viewer-demo/src/main/dev-bundle
vcf-pdf-viewer-demo/src/main/bundles
vcf-pdf-viewer-demo/src/main/frontend/index.html
vcf-pdf-viewer-demo/src/main/frontend/generated
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<groupId>org.vaadin.addons.componentfactory</groupId>
<artifactId>vcf-pdf-viewer-root</artifactId>
<version>5.0.1-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
<module>vcf-pdf-viewer</module>
Expand Down
73 changes: 0 additions & 73 deletions pom.xml.versionsBackup
View file
Open in desktop

This file was deleted.

73 changes: 39 additions & 34 deletions vcf-pdf-viewer-demo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>org.vaadin.addons.componentfactory</groupId>
<artifactId>vcf-pdf-viewer-demo</artifactId>
<version>5.0.1-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>

<name>Pdf Viewer Demo</name>
<packaging>war</packaging>
Expand All @@ -18,13 +18,11 @@
</organization>

<properties>
<vaadin.version>24.8.0</vaadin.version>
<flow.version>9.0.1</flow.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<vaadin.version>25.0.0-beta5</vaadin.version>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<failOnMissingWebXml>false</failOnMissingWebXml>
</properties>
<dependencyManagement>
<dependencies>
Expand All @@ -38,7 +36,6 @@
</dependencies>
</dependencyManagement>


<repositories>
<repository>
<id>Vaadin Directory</id>
Expand All @@ -65,7 +62,9 @@
<pluginRepository>
<id>vaadin-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/vaadin-snapshots/</url>
<releases><enabled>false</enabled></releases>
<releases>
<enabled>false</enabled>
</releases>
</pluginRepository>
</pluginRepositories>
<dependencies>
Expand Down Expand Up @@ -105,28 +104,15 @@
</dependency>

<dependency>
<groupId>org.vaadin.addons.componentfactory</groupId>
<artifactId>vcf-pdf-viewer</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>com.vaadin</groupId>
<artifactId>flow-component-demo-helpers</artifactId>
<version>${flow.version}</version>
<groupId>org.vaadin.addons.componentfactory</groupId>
<artifactId>vcf-pdf-viewer</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
</dependency>

</dependencies>

<build>
Expand All @@ -144,9 +130,9 @@
<plugins>
<!-- Jetty plugin for easy testing without a server -->
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>11.0.13</version>
<groupId>org.eclipse.jetty.ee11</groupId>
<artifactId>jetty-ee11-maven-plugin</artifactId>
<version>12.1.4</version>
<configuration>
<stopKey>${project.artifactId}</stopKey>
<stopPort>8081</stopPort>
Expand All @@ -162,29 +148,49 @@
<goals>
<goal>prepare-frontend</goal>
</goals>
<configuration>
<convertHtml>false</convertHtml>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.8</version>
<version>1.7.0</version>
<configuration>
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.3.1</version>
<version>3.5.0</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.14.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.6.2</version>
<executions>
<execution>
<id>enforce-maven</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>3.8</version>
</requireMavenVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
Expand Down Expand Up @@ -224,5 +230,4 @@
</build>
</profile>
</profiles>

</project>
Loading