diff options
| author | Patrik Lindström <patrik@vaadin.com> | 2024-11-07 16:15:19 +0200 |
|---|---|---|
| committer | Patrik Lindström <patrik@vaadin.com> | 2024-11-07 16:15:19 +0200 |
| commit | 1942c69c01e3a22d64c7370dced68a9957334072 (patch) | |
| tree | 8006ed56822cee031bfc04bfb2019350004065bb /server | |
| parent | e0e22686e6057de08e089e15fb20683621115296 (diff) | |
| download | vaadin-framework-update-minor-deps.tar.gz vaadin-framework-update-minor-deps.zip | |
feat: Update POMs and bump build dependency versionsupdate-minor-deps
* Ignores VS code project file and updates to .project
* Updates DTD hrefs from HTTP to HTTPS
* Updates commons-io, commons-cli, commons-codec, hsqldb and animal-sniffer
* Fixes dependency management violations
* Includes Maven Flatten Plugin for cleaner release POMs
* Updates Atmosphere version
Diffstat (limited to 'server')
| -rw-r--r-- | server/pom.xml | 6 | ||||
| -rw-r--r-- | server/src/main/java/com/vaadin/server/Constants.java | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/server/pom.xml b/server/pom.xml index 94a383e1d6..6539f25b18 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>com.vaadin</groupId> @@ -120,6 +120,8 @@ <dependency> <groupId>org.hsqldb</groupId> <artifactId>hsqldb</artifactId> + <version>${hsqldb.version}</version> + <classifier>jdk8</classifier> <scope>test</scope> </dependency> <dependency> diff --git a/server/src/main/java/com/vaadin/server/Constants.java b/server/src/main/java/com/vaadin/server/Constants.java index 653cf66c11..754e52b70a 100644 --- a/server/src/main/java/com/vaadin/server/Constants.java +++ b/server/src/main/java/com/vaadin/server/Constants.java @@ -66,7 +66,7 @@ public interface Constants { + "================================================================="; // Keep the version number in sync with pom.xml - static final String REQUIRED_ATMOSPHERE_RUNTIME_VERSION = "2.4.30.vaadin4"; + static final String REQUIRED_ATMOSPHERE_RUNTIME_VERSION = "2.4.30.vaadin7"; static final String INVALID_ATMOSPHERE_VERSION_WARNING = "\n" + "=================================================================\n" |