From 607f3153cfe5a5c6bf08cb6396b663ca59081b07 Mon Sep 17 00:00:00 2001 From: Huang Xiao Date: Fri, 2 Oct 2026 20:05:34 +0800 Subject: [PATCH 1/2] docs: add Flow links, fix locale switchers, and drop upgrade guide Link Vaadin Flow from the README, put the current language first in guide switchers, and remove the unused upgrade pages. --- README.md | 5 ++- README.zh-CN.md | 3 +- docs/en/dev/release-guide.md | 2 +- docs/en/dev/theme-tokens.md | 2 +- docs/en/user/appearance.md | 2 +- docs/en/user/configuration.md | 2 +- docs/en/user/deployment.md | 2 +- docs/en/user/getting-started.md | 3 +- docs/en/user/modules.md | 2 +- docs/en/user/security.md | 2 +- docs/en/user/upgrade.md | 33 ------------------- docs/zh-CN/dev/architecture.md | 2 +- docs/zh-CN/dev/release-guide.md | 2 +- docs/zh-CN/dev/theme-tokens.md | 2 +- docs/zh-CN/user/appearance.md | 2 +- docs/zh-CN/user/configuration.md | 2 +- docs/zh-CN/user/deployment.md | 2 +- docs/zh-CN/user/getting-started.md | 3 +- docs/zh-CN/user/modules.md | 2 +- docs/zh-CN/user/security.md | 2 +- docs/zh-CN/user/upgrade.md | 26 --------------- .../vadmin/app/CurrentDocumentationTest.java | 2 -- 22 files changed, 20 insertions(+), 85 deletions(-) delete mode 100644 docs/en/user/upgrade.md delete mode 100644 docs/zh-CN/user/upgrade.md diff --git a/README.md b/README.md index 4eb8429..ea8e412 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ English | [简体中文](README.zh-CN.md) -VAdmin is a Java-first administration baseline for Vaadin Flow. Its reusable +VAdmin is a Java-first administration baseline for [Vaadin Flow](https://vaadin.com/docs/latest/flow). Its reusable core — identity and permission contracts, RBAC use cases, and the shared shell patterns — is framework-neutral, and runtime-specific behavior lives in adapter modules, so runtimes beyond Spring Boot (such as Quarkus, Helidon, or @@ -18,7 +18,7 @@ React, and TypeScript are not included. VAdmin owns the baseline experience through its default administration module. Consumers add business capabilities as `AdminModule` beans and Flow view beans; they do not create a shell, theme, -or system-administration module for normal adoption. See the English +or system-administration module for normal adoption. See the [Modules](docs/en/user/modules.md) guide for the module, translation, and production-anchor contract. @@ -44,7 +44,6 @@ Open `http://localhost:8080` and sign in with `admin` and the value of | Appearance | [Read](docs/en/user/appearance.md) | | Security | [Read](docs/en/user/security.md) | | Deployment | [Read](docs/en/user/deployment.md) | -| Upgrade | [Read](docs/en/user/upgrade.md) | **Developer guides** diff --git a/README.zh-CN.md b/README.zh-CN.md index e7ebefe..8d7527a 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -2,7 +2,7 @@ 简体中文 | [English](README.md) -VAdmin 是一个 Java 优先、面向 Vaadin Flow 的管理基线。它的可复用核心—— +VAdmin 是一个 Java 优先、面向 [Vaadin Flow](https://vaadin.com/docs/latest/flow) 的管理基线。它的可复用核心—— 身份与权限契约、RBAC 用例和共享外壳模式——框架无关，运行时专属行为归入适配层， 因此 Spring Boot 之外的运行时（如 Quarkus、Helidon、Jakarta EE）仍是未来可能的 适配方向。Spring Boot 是当前唯一受支持的运行时：添加 `vadmin-spring-boot-starter` @@ -38,7 +38,6 @@ docker compose --env-file .env up --build | 外观配置 | [阅读](docs/zh-CN/user/appearance.md) | | 安全说明 | [阅读](docs/zh-CN/user/security.md) | | 部署 | [阅读](docs/zh-CN/user/deployment.md) | -| 升级 | [阅读](docs/zh-CN/user/upgrade.md) | **开发者指南** diff --git a/docs/en/dev/release-guide.md b/docs/en/dev/release-guide.md index 0d3b136..9686c1a 100644 --- a/docs/en/dev/release-guide.md +++ b/docs/en/dev/release-guide.md @@ -2,7 +2,7 @@ VAdmin publication coordinate: `io.github.huahill:vadmin-spring-boot-starter`. -[简体中文](../../zh-CN/dev/release-guide.md) | English +English | [简体中文](../../zh-CN/dev/release-guide.md) ## Scope diff --git a/docs/en/dev/theme-tokens.md b/docs/en/dev/theme-tokens.md index 3c098d5..a5c82cc 100644 --- a/docs/en/dev/theme-tokens.md +++ b/docs/en/dev/theme-tokens.md @@ -2,7 +2,7 @@ VAdmin publication coordinate: `io.github.huahill:vadmin-spring-boot-starter`. -[简体中文](../../zh-CN/dev/theme-tokens.md) | English +English | [简体中文](../../zh-CN/dev/theme-tokens.md) `vadmin` owns the default Vaadin Flow shell. Its `DefaultApplicationShell` loads Aura with `@StyleSheet(Aura.STYLESHEET)`. diff --git a/docs/en/user/appearance.md b/docs/en/user/appearance.md index 0257cc9..da68a01 100644 --- a/docs/en/user/appearance.md +++ b/docs/en/user/appearance.md @@ -1,6 +1,6 @@ # Appearance -[简体中文](../../zh-CN/user/appearance.md) | English +English | [简体中文](../../zh-CN/user/appearance.md) VAdmin uses Vaadin Aura as-is. Users pick system, light, or dark color schemes from the shell's user menu through Vaadin's `ColorScheme` API. diff --git a/docs/en/user/configuration.md b/docs/en/user/configuration.md index 0fdf353..0a863ec 100644 --- a/docs/en/user/configuration.md +++ b/docs/en/user/configuration.md @@ -1,6 +1,6 @@ # Configuration Reference -[简体中文](../../zh-CN/user/configuration.md) | English +English | [简体中文](../../zh-CN/user/configuration.md) All settings are ordinary Spring Boot properties. Only the datasource is required; everything else has a working default. diff --git a/docs/en/user/deployment.md b/docs/en/user/deployment.md index 03f52dd..b8c9c21 100644 --- a/docs/en/user/deployment.md +++ b/docs/en/user/deployment.md @@ -1,6 +1,6 @@ # Deployment -[简体中文](../../zh-CN/user/deployment.md) | English +English | [简体中文](../../zh-CN/user/deployment.md) VAdmin is a regular Spring Boot library — deploy your application the way you already do. This guide covers the VAdmin-specific concerns to check before diff --git a/docs/en/user/getting-started.md b/docs/en/user/getting-started.md index 20f620f..5f13b2f 100644 --- a/docs/en/user/getting-started.md +++ b/docs/en/user/getting-started.md @@ -1,6 +1,6 @@ # Getting Started -[简体中文](../../zh-CN/user/getting-started.md) | English +English | [简体中文](../../zh-CN/user/getting-started.md) Add one dependency to an existing Spring Boot application and start it. You get sign-in with a bootstrap administrator, permission-filtered navigation, @@ -126,7 +126,6 @@ Open `http://localhost:8080` and sign in with `admin` and the value of - Add business pages with the [Modules](modules.md) guide. - Review the [Security](security.md) model before production. - Deploy with the [Deployment](deployment.md) guide. -- Move between versions with the [Upgrade](upgrade.md) guide. - Change the look with the [Appearance](appearance.md) guide. Only a deliberate full shell replacement needs a consumer `AdminHostLayout` diff --git a/docs/en/user/modules.md b/docs/en/user/modules.md index 21c94d6..1b0f1dd 100644 --- a/docs/en/user/modules.md +++ b/docs/en/user/modules.md @@ -1,6 +1,6 @@ # Modules -[简体中文](../../zh-CN/user/modules.md) | English +English | [简体中文](../../zh-CN/user/modules.md) VAdmin ships a complete administration shell out of the box. You add business pages by declaring a module — a small Spring configuration that diff --git a/docs/en/user/security.md b/docs/en/user/security.md index e7805f9..9eb69b0 100644 --- a/docs/en/user/security.md +++ b/docs/en/user/security.md @@ -1,6 +1,6 @@ # Security -[简体中文](../../zh-CN/user/security.md) | English +English | [简体中文](../../zh-CN/user/security.md) ## Sign-In diff --git a/docs/en/user/upgrade.md b/docs/en/user/upgrade.md deleted file mode 100644 index 9b45914..0000000 --- a/docs/en/user/upgrade.md +++ /dev/null @@ -1,33 +0,0 @@ -# Upgrade - -[简体中文](../../zh-CN/user/upgrade.md) | English - -## General Steps - -1. Update `vadmin-spring-boot-starter` to the target version in your - dependency management. All VAdmin modules are versioned together. -2. Ensure your application runs on Java 25 with the Spring Boot and Vaadin - versions listed in the release notes. -3. Review Flyway migrations against a production-like database copy. Apply - each migration once and never rewrite an applied migration. -4. Re-run your tests. Pay attention to authorization, locale switching, - and appearance. If you use OIDC, verify your external-to-local-account - mapping still works. -5. Changing `APP_BOOTSTRAP_PASSWORD` does not reset an existing `admin` - account — see [Security](security.md). - -See the [Modules](modules.md) guide if you need to review your module -declarations, and the [Configuration](configuration.md) reference for -property changes. - -## Upgrading To 0.2.0 - -- **Runtime baseline**: Spring Boot 4.1.1, Vaadin Flow 25.3.0, Flyway 13.7.0. -- **If you only depend on `vadmin-spring-boot-starter`**: no changes needed. - Your build keeps working. -- **If your code imported VAdmin internal classes**: packages moved from - `io.github.huahill.vadmin.starter.*` to `io.github.huahill.vadmin.*`. - Update your imports and the `@EnableVaadin` package list (now just - `io.github.huahill.vadmin`). -- **Narrow screens**: the navigation drawer no longer stays open by default - on phone-width viewports. Desktop behavior is unchanged. diff --git a/docs/zh-CN/dev/architecture.md b/docs/zh-CN/dev/architecture.md index fa668ec..072642d 100644 --- a/docs/zh-CN/dev/architecture.md +++ b/docs/zh-CN/dev/architecture.md @@ -2,7 +2,7 @@ VAdmin 的发布坐标为 `io.github.huahill:vadmin-spring-boot-starter`。 -[English](../../en/dev/architecture.md) | 简体中文 +简体中文 | [English](../../en/dev/architecture.md) ## 范围 diff --git a/docs/zh-CN/dev/release-guide.md b/docs/zh-CN/dev/release-guide.md index 127eba2..6137b94 100644 --- a/docs/zh-CN/dev/release-guide.md +++ b/docs/zh-CN/dev/release-guide.md @@ -2,7 +2,7 @@ VAdmin 的发布坐标为 `io.github.huahill:vadmin-spring-boot-starter`。 -[English](../../en/dev/release-guide.md) | 简体中文 +简体中文 | [English](../../en/dev/release-guide.md) ## 范围 diff --git a/docs/zh-CN/dev/theme-tokens.md b/docs/zh-CN/dev/theme-tokens.md index f7240ee..f8b1ab5 100644 --- a/docs/zh-CN/dev/theme-tokens.md +++ b/docs/zh-CN/dev/theme-tokens.md @@ -2,7 +2,7 @@ VAdmin 的发布坐标为 `io.github.huahill:vadmin-spring-boot-starter`。 -[English](../../en/dev/theme-tokens.md) | 简体中文 +简体中文 | [English](../../en/dev/theme-tokens.md) `vadmin` 拥有默认的 Vaadin Flow 外壳。其 `DefaultApplicationShell` 通过 `@StyleSheet(Aura.STYLESHEET)` 加载 Aura。普通使用方和业务模块不得定义竞争性的 diff --git a/docs/zh-CN/user/appearance.md b/docs/zh-CN/user/appearance.md index 7838b09..1feb767 100644 --- a/docs/zh-CN/user/appearance.md +++ b/docs/zh-CN/user/appearance.md @@ -1,6 +1,6 @@ # 外观配置 -[English](../../en/user/appearance.md) | 简体中文 +简体中文 | [English](../../en/user/appearance.md) VAdmin 直接使用 Vaadin Aura。用户可通过外壳用户菜单，用 Vaadin 的 `ColorScheme` API 在跟随系统、浅色和深色之间切换。 diff --git a/docs/zh-CN/user/configuration.md b/docs/zh-CN/user/configuration.md index 135b441..3f69cb6 100644 --- a/docs/zh-CN/user/configuration.md +++ b/docs/zh-CN/user/configuration.md @@ -1,6 +1,6 @@ # 配置参考 -[English](../../en/user/configuration.md) | 简体中文 +简体中文 | [English](../../en/user/configuration.md) 所有配置都是普通的 Spring Boot 属性。只有数据源是必需项，其余配置都有可用默认值。 diff --git a/docs/zh-CN/user/deployment.md b/docs/zh-CN/user/deployment.md index a8a28b3..29a3822 100644 --- a/docs/zh-CN/user/deployment.md +++ b/docs/zh-CN/user/deployment.md @@ -1,6 +1,6 @@ # 部署 -[English](../../en/user/deployment.md) | 简体中文 +简体中文 | [English](../../en/user/deployment.md) VAdmin 是一个普通的 Spring Boot 库——按你已有的方式部署应用即可。本指南涵盖上线前 需要检查的 VAdmin 相关事项。 diff --git a/docs/zh-CN/user/getting-started.md b/docs/zh-CN/user/getting-started.md index f19d0bc..0c1ebe8 100644 --- a/docs/zh-CN/user/getting-started.md +++ b/docs/zh-CN/user/getting-started.md @@ -1,6 +1,6 @@ # 快速开始 -[English](../../en/user/getting-started.md) | 简体中文 +简体中文 | [English](../../en/user/getting-started.md) 向已有的 Spring Boot 应用添加一个依赖并启动，即可获得：引导管理员登录、 按权限过滤的导航、默认外壳与主题、Users/Roles/Permissions/Audit 系统管理模块、 @@ -113,7 +113,6 @@ docker compose --env-file .env up --build - 用[模块开发](modules.md)指南添加业务页面。 - 上线前阅读[安全说明](security.md)。 - 用[部署与运维](deployment.md)指南完成部署。 -- 用[升级指南](upgrade.md)在版本间迁移。 - 用[外观配置](appearance.md)调整外观。 只有有意完全替换外壳时，使用方才需要提供 `AdminHostLayout` 和 diff --git a/docs/zh-CN/user/modules.md b/docs/zh-CN/user/modules.md index 1f8f585..97456d5 100644 --- a/docs/zh-CN/user/modules.md +++ b/docs/zh-CN/user/modules.md @@ -1,6 +1,6 @@ # 模块开发 -[English](../../en/user/modules.md) | 简体中文 +简体中文 | [English](../../en/user/modules.md) VAdmin 自带完整的管理外壳。你通过声明模块来添加业务页面——一个小型 Spring 配置， 告诉 VAdmin 路由、权限、翻译和视图 Bean。无需任何外壳、布局或主题工作。 diff --git a/docs/zh-CN/user/security.md b/docs/zh-CN/user/security.md index 0929988..7151114 100644 --- a/docs/zh-CN/user/security.md +++ b/docs/zh-CN/user/security.md @@ -1,6 +1,6 @@ # 安全说明 -[English](../../en/user/security.md) | 简体中文 +简体中文 | [English](../../en/user/security.md) ## 登录 diff --git a/docs/zh-CN/user/upgrade.md b/docs/zh-CN/user/upgrade.md deleted file mode 100644 index 2660afd..0000000 --- a/docs/zh-CN/user/upgrade.md +++ /dev/null @@ -1,26 +0,0 @@ -# 升级 - -[English](../../en/user/upgrade.md) | 简体中文 - -## 通用步骤 - -1. 在依赖管理中将 `vadmin-spring-boot-starter` 升级到目标版本。VAdmin 的全部模块 - 统一版本。 -2. 确保应用在 Java 25 上运行，Spring Boot 和 Vaadin 版本与发布说明一致。 -3. 对照生产类数据库副本检查 Flyway 迁移。每条迁移只应用一次，不得改写已应用的 - 迁移。 -4. 重新运行测试。重点关注授权、语言切换和外观。如果使用了 OIDC，验证外部到本地 - 账户的映射仍然有效。 -5. 修改 `APP_BOOTSTRAP_PASSWORD` 不会重置已有的 `admin` 账户——见 - [安全说明](security.md)。 - -如需复查模块声明见[模块开发](modules.md)，属性变更见[配置参考](configuration.md)。 - -## 升级到 0.2.0 - -- **运行时基线**：Spring Boot 4.1.1、Vaadin Flow 25.3.0、Flyway 13.7.0。 -- **仅依赖 `vadmin-spring-boot-starter`**：无需任何改动，构建照常。 -- **代码中导入过 VAdmin 内部类**：包从 `io.github.huahill.vadmin.starter.*` 迁移 - 到 `io.github.huahill.vadmin.*`。更新导入和 `@EnableVaadin` 包列表（现在只需 - `io.github.huahill.vadmin`）。 -- **窄屏**：手机宽度视口下导航抽屉不再默认保持打开。桌面行为不变。 diff --git a/vadmin-reference-app/src/test/java/io/github/huahill/vadmin/app/CurrentDocumentationTest.java b/vadmin-reference-app/src/test/java/io/github/huahill/vadmin/app/CurrentDocumentationTest.java index 1eae37c..e74c69d 100644 --- a/vadmin-reference-app/src/test/java/io/github/huahill/vadmin/app/CurrentDocumentationTest.java +++ b/vadmin-reference-app/src/test/java/io/github/huahill/vadmin/app/CurrentDocumentationTest.java @@ -19,7 +19,6 @@ class CurrentDocumentationTest { "docs/en/user/appearance.md", "docs/en/user/security.md", "docs/en/user/deployment.md", - "docs/en/user/upgrade.md", "docs/en/dev/architecture.md", "docs/en/dev/release-guide.md", "docs/en/dev/theme-tokens.md", @@ -29,7 +28,6 @@ class CurrentDocumentationTest { "docs/zh-CN/user/appearance.md", "docs/zh-CN/user/security.md", "docs/zh-CN/user/deployment.md", - "docs/zh-CN/user/upgrade.md", "docs/zh-CN/dev/architecture.md", "docs/zh-CN/dev/release-guide.md", "docs/zh-CN/dev/theme-tokens.md"); From 86a0da3e08c9982372263f632daab0f18084400d Mon Sep 17 00:00:00 2001 From: Huang Xiao Date: Fri, 2 Oct 2026 20:05:41 +0800 Subject: [PATCH 2/2] build: manage Vaadin, Flyway, and reactor versions from the parent Import vaadin-bom, pin Flyway and first-party modules in dependencyManagement, and stop repeating those versions in subprojects. --- pom.xml | 72 +++++++++++++++++++ vadmin-flow/pom.xml | 2 - vadmin-platform/pom.xml | 1 - vadmin-reference-app/pom.xml | 7 +- .../vadmin-spring-boot-starter/pom.xml | 12 ++-- vadmin-spring/vadmin-spring-boot/pom.xml | 2 +- vadmin-spring/vadmin-spring-flow/pom.xml | 3 - vadmin-spring/vadmin-spring-jpa/pom.xml | 6 +- vadmin-spring/vadmin-spring-security/pom.xml | 6 +- vadmin-spring/vadmin/pom.xml | 8 +-- 10 files changed, 91 insertions(+), 28 deletions(-) diff --git a/pom.xml b/pom.xml index 4de8691..9b3e4e4 100644 --- a/pom.xml +++ b/pom.xml @@ -77,6 +77,68 @@ pom import + + com.vaadin + vaadin-bom + ${vaadin.version} + pom + import + + + org.flywaydb + flyway-core + ${flyway.version} + + + org.flywaydb + flyway-database-postgresql + ${flyway.version} + + + io.github.huahill + vadmin-contracts + ${project.version} + + + io.github.huahill + vadmin-platform + ${project.version} + + + io.github.huahill + vadmin-flow + ${project.version} + + + io.github.huahill + vadmin-spring-security + ${project.version} + + + io.github.huahill + vadmin-spring-jpa + ${project.version} + + + io.github.huahill + vadmin-spring-boot + ${project.version} + + + io.github.huahill + vadmin-spring-flow + ${project.version} + + + io.github.huahill + vadmin + ${project.version} + + + io.github.huahill + vadmin-spring-boot-starter + ${project.version} + @@ -181,6 +243,16 @@ spring-boot-maven-plugin ${spring-boot.version} + + com.vaadin + flow-maven-plugin + ${vaadin.version} + + + org.codehaus.mojo + exec-maven-plugin + 3.6.4 + diff --git a/vadmin-flow/pom.xml b/vadmin-flow/pom.xml index c17c0fe..9cb4472 100644 --- a/vadmin-flow/pom.xml +++ b/vadmin-flow/pom.xml @@ -12,12 +12,10 @@ io.github.huahill vadmin-platform - ${project.version} com.vaadin vaadin-core - ${vaadin.version} jakarta.servlet diff --git a/vadmin-platform/pom.xml b/vadmin-platform/pom.xml index 2dbfc83..e1007ce 100644 --- a/vadmin-platform/pom.xml +++ b/vadmin-platform/pom.xml @@ -12,7 +12,6 @@ io.github.huahill vadmin-contracts - ${project.version} org.junit.jupiter diff --git a/vadmin-reference-app/pom.xml b/vadmin-reference-app/pom.xml index 747e2bb..fa5ada8 100644 --- a/vadmin-reference-app/pom.xml +++ b/vadmin-reference-app/pom.xml @@ -12,8 +12,8 @@ true - io.github.huahillvadmin-spring-boot-starter${project.version} - com.vaadinvaadin-dev${vaadin.version}true + io.github.huahillvadmin-spring-boot-starter + com.vaadinvaadin-devtrue org.springframework.bootspring-boot-starter-testtest org.testcontainerstestcontainerstest org.testcontainerstestcontainers-junit-jupitertest @@ -48,7 +48,6 @@ org.codehaus.mojo exec-maven-plugin - 3.6.4 install-playwright-chromium @@ -75,7 +74,6 @@ com.vaadin flow-server-production-mode - ${vaadin.version} @@ -83,7 +81,6 @@ com.vaadin flow-maven-plugin - ${vaadin.version} diff --git a/vadmin-spring/vadmin-spring-boot-starter/pom.xml b/vadmin-spring/vadmin-spring-boot-starter/pom.xml index 735f94e..ddf5e1d 100644 --- a/vadmin-spring/vadmin-spring-boot-starter/pom.xml +++ b/vadmin-spring/vadmin-spring-boot-starter/pom.xml @@ -9,13 +9,13 @@ vadmin-spring-boot-starter VAdmin Spring Boot Starter - io.github.huahillvadmin${project.version} - io.github.huahillvadmin-spring-security${project.version} - io.github.huahillvadmin-spring-jpa${project.version} - io.github.huahillvadmin-spring-boot${project.version} - io.github.huahillvadmin-spring-flow${project.version} + io.github.huahillvadmin + io.github.huahillvadmin-spring-security + io.github.huahillvadmin-spring-jpa + io.github.huahillvadmin-spring-boot + io.github.huahillvadmin-spring-flow org.springframework.bootspring-boot-starter - com.vaadinvaadin-dev${vaadin.version}true + com.vaadinvaadin-devtrue org.postgresqlpostgresqlruntime org.springframework.bootspring-boot-starter-testtest diff --git a/vadmin-spring/vadmin-spring-boot/pom.xml b/vadmin-spring/vadmin-spring-boot/pom.xml index e2f5091..cb020de 100644 --- a/vadmin-spring/vadmin-spring-boot/pom.xml +++ b/vadmin-spring/vadmin-spring-boot/pom.xml @@ -9,7 +9,7 @@ vadmin-spring-boot VAdmin Spring Boot - io.github.huahillvadmin-contracts${project.version} + io.github.huahillvadmin-contracts org.springframework.bootspring-boot-starter-webmvc org.springframework.bootspring-boot-starter-actuator org.springframework.bootspring-boot-starter-testtest diff --git a/vadmin-spring/vadmin-spring-flow/pom.xml b/vadmin-spring/vadmin-spring-flow/pom.xml index 387fda6..482b309 100644 --- a/vadmin-spring/vadmin-spring-flow/pom.xml +++ b/vadmin-spring/vadmin-spring-flow/pom.xml @@ -12,17 +12,14 @@ io.github.huahill vadmin-flow - ${project.version} io.github.huahill vadmin-contracts - ${project.version} com.vaadin vaadin-spring - ${vaadin.version} jakarta.servlet diff --git a/vadmin-spring/vadmin-spring-jpa/pom.xml b/vadmin-spring/vadmin-spring-jpa/pom.xml index ef2777a..7e42b8e 100644 --- a/vadmin-spring/vadmin-spring-jpa/pom.xml +++ b/vadmin-spring/vadmin-spring-jpa/pom.xml @@ -9,11 +9,11 @@ vadmin-spring-jpa VAdmin Spring JPA - io.github.huahillvadmin-platform${project.version} + io.github.huahillvadmin-platform org.springframework.bootspring-boot-starter-data-jpa org.springframework.bootspring-boot-starter-flyway - org.flywaydbflyway-core${flyway.version} - org.flywaydbflyway-database-postgresql${flyway.version} + org.flywaydbflyway-core + org.flywaydbflyway-database-postgresql tools.jackson.corejackson-databind org.postgresqlpostgresqlruntime diff --git a/vadmin-spring/vadmin-spring-security/pom.xml b/vadmin-spring/vadmin-spring-security/pom.xml index 88eeb31..05633fb 100644 --- a/vadmin-spring/vadmin-spring-security/pom.xml +++ b/vadmin-spring/vadmin-spring-security/pom.xml @@ -9,12 +9,12 @@ vadmin-spring-security VAdmin Spring Security - io.github.huahillvadmin-contracts${project.version} + io.github.huahillvadmin-contracts org.springframework.bootspring-boot-starter-security org.springframework.bootspring-boot-starter-oauth2-client org.springframework.bootspring-boot-starter-webmvc - com.vaadinvaadin-core${vaadin.version} - com.vaadinvaadin-spring${vaadin.version} + com.vaadinvaadin-core + com.vaadinvaadin-spring org.springframework.bootspring-boot-starter-testtest diff --git a/vadmin-spring/vadmin/pom.xml b/vadmin-spring/vadmin/pom.xml index e347034..7e00737 100644 --- a/vadmin-spring/vadmin/pom.xml +++ b/vadmin-spring/vadmin/pom.xml @@ -9,10 +9,10 @@ vadmin VAdmin Default Administration - io.github.huahillvadmin-spring-security${project.version} - io.github.huahillvadmin-spring-jpa${project.version} - io.github.huahillvadmin-spring-boot${project.version} - io.github.huahillvadmin-spring-flow${project.version} + io.github.huahillvadmin-spring-security + io.github.huahillvadmin-spring-jpa + io.github.huahillvadmin-spring-boot + io.github.huahillvadmin-spring-flow org.springframework.bootspring-boot-starter org.springframework.bootspring-boot-starter-testtest