Skip to content

Commit

Permalink
Merge branch 'main' into feat/438/JsonSubTypes
Browse files Browse the repository at this point in the history
  • Loading branch information
@cromoteca
cromoteca committed Sep 22, 2023
2 parents 4a120e4 + 14192fc commit 5008904
Show file tree
Hide file tree
Showing 32 changed files with 22,856 additions and 6,020 deletions.
39 changes: 22 additions & 17 deletions packages/java/tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,35 +74,40 @@
<groupId>com.vaadin</groupId>
<artifactId>vaadin-button-testbench</artifactId>
<version>${vaadin.component.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-login-testbench</artifactId>
<version>${vaadin.component.version}</version>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-login-testbench</artifactId>
<version>${vaadin.component.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-grid-testbench</artifactId>
<version>${vaadin.component.version}</version>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-grid-testbench</artifactId>
<version>${vaadin.component.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-notification-testbench</artifactId>
<version>${vaadin.component.version}</version>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-notification-testbench</artifactId>
<version>${vaadin.component.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-text-field-testbench</artifactId>
<version>${vaadin.component.version}</version>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-text-field-testbench</artifactId>
<version>${vaadin.component.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
<version>5.2.1</version>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
<version>5.2.1</version>
</dependency>
</dependencies>
</dependencies>

<build>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
3,188 changes: 2,964 additions & 224 deletions packages/java/tests/spring/endpoints discovery/package-lock.json
View file

Large diffs are not rendered by default.

208 changes: 206 additions & 2 deletions packages/java/tests/spring/endpoints discovery/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"license": "UNLICENSED",
"type": "module",
"dependencies": {
"@hilla/form": "2.3.0-alpha5",
"@hilla/frontend": "../../../../ts/hilla-frontend",
"@hilla/generator-typescript-cli": "../../../../ts/generator-typescript-cli",
"@hilla/generator-typescript-core": "../../../../ts/generator-typescript-core",
Expand All @@ -13,8 +14,75 @@
"@hilla/generator-typescript-plugin-push": "../../../../ts/generator-typescript-plugin-push",
"@hilla/generator-typescript-utils": "../../../../ts/generator-typescript-utils",
"@polymer/polymer": "3.5.1",
"@vaadin/a11y-base": "24.2.0-alpha16",
"@vaadin/accordion": "24.2.0-alpha16",
"@vaadin/app-layout": "24.2.0-alpha16",
"@vaadin/avatar": "24.2.0-alpha16",
"@vaadin/avatar-group": "24.2.0-alpha16",
"@vaadin/board": "24.2.0-alpha16",
"@vaadin/bundles": "24.2.0-alpha16",
"@vaadin/button": "24.2.0-alpha16",
"@vaadin/charts": "24.2.0-alpha16",
"@vaadin/checkbox": "24.2.0-alpha16",
"@vaadin/checkbox-group": "24.2.0-alpha16",
"@vaadin/combo-box": "24.2.0-alpha16",
"@vaadin/common-frontend": "0.0.18",
"@vaadin/component-base": "24.2.0-alpha16",
"@vaadin/confirm-dialog": "24.2.0-alpha16",
"@vaadin/context-menu": "24.2.0-alpha16",
"@vaadin/cookie-consent": "24.2.0-alpha16",
"@vaadin/crud": "24.2.0-alpha16",
"@vaadin/custom-field": "24.2.0-alpha16",
"@vaadin/date-picker": "24.2.0-alpha16",
"@vaadin/date-time-picker": "24.2.0-alpha16",
"@vaadin/details": "24.2.0-alpha16",
"@vaadin/dialog": "24.2.0-alpha16",
"@vaadin/email-field": "24.2.0-alpha16",
"@vaadin/field-base": "24.2.0-alpha16",
"@vaadin/field-highlighter": "24.2.0-alpha16",
"@vaadin/form-layout": "24.2.0-alpha16",
"@vaadin/grid": "24.2.0-alpha16",
"@vaadin/grid-pro": "24.2.0-alpha16",
"@vaadin/horizontal-layout": "24.2.0-alpha16",
"@vaadin/icon": "24.2.0-alpha16",
"@vaadin/icons": "24.2.0-alpha16",
"@vaadin/input-container": "24.2.0-alpha16",
"@vaadin/integer-field": "24.2.0-alpha16",
"@vaadin/item": "24.2.0-alpha16",
"@vaadin/list-box": "24.2.0-alpha16",
"@vaadin/lit-renderer": "24.2.0-alpha16",
"@vaadin/login": "24.2.0-alpha16",
"@vaadin/map": "24.2.0-alpha16",
"@vaadin/menu-bar": "24.2.0-alpha16",
"@vaadin/message-input": "24.2.0-alpha16",
"@vaadin/message-list": "24.2.0-alpha16",
"@vaadin/multi-select-combo-box": "24.2.0-alpha16",
"@vaadin/notification": "24.2.0-alpha16",
"@vaadin/number-field": "24.2.0-alpha16",
"@vaadin/overlay": "24.2.0-alpha16",
"@vaadin/password-field": "24.2.0-alpha16",
"@vaadin/polymer-legacy-adapter": "24.2.0-alpha16",
"@vaadin/progress-bar": "24.2.0-alpha16",
"@vaadin/radio-group": "24.2.0-alpha16",
"@vaadin/rich-text-editor": "24.2.0-alpha16",
"@vaadin/router": "1.7.5",
"@vaadin/scroller": "24.2.0-alpha16",
"@vaadin/select": "24.2.0-alpha16",
"@vaadin/side-nav": "24.2.0-alpha16",
"@vaadin/split-layout": "24.2.0-alpha16",
"@vaadin/tabs": "24.2.0-alpha16",
"@vaadin/tabsheet": "24.2.0-alpha16",
"@vaadin/text-area": "24.2.0-alpha16",
"@vaadin/text-field": "24.2.0-alpha16",
"@vaadin/time-picker": "24.2.0-alpha16",
"@vaadin/tooltip": "24.2.0-alpha16",
"@vaadin/upload": "24.2.0-alpha16",
"@vaadin/vaadin-development-mode-detector": "2.0.6",
"@vaadin/vaadin-lumo-styles": "24.2.0-alpha16",
"@vaadin/vaadin-material-styles": "24.2.0-alpha16",
"@vaadin/vaadin-usage-statistics": "2.1.2",
"@vaadin/vertical-layout": "24.2.0-alpha16",
"@vaadin/virtual-list": "24.2.0-alpha16",
"construct-style-sheets-polyfill": "3.1.0",
"lit": "2.8.0"
},
Expand All @@ -37,6 +105,7 @@
},
"vaadin": {
"dependencies": {
"@hilla/form": "2.3.0-alpha5",
"@hilla/frontend": "2.3.0-alpha5",
"@hilla/generator-typescript-cli": "2.3.0-alpha5",
"@hilla/generator-typescript-core": "2.3.0-alpha5",
Expand All @@ -47,8 +116,75 @@
"@hilla/generator-typescript-plugin-push": "2.3.0-alpha5",
"@hilla/generator-typescript-utils": "2.3.0-alpha5",
"@polymer/polymer": "3.5.1",
"@vaadin/a11y-base": "24.2.0-alpha16",
"@vaadin/accordion": "24.2.0-alpha16",
"@vaadin/app-layout": "24.2.0-alpha16",
"@vaadin/avatar": "24.2.0-alpha16",
"@vaadin/avatar-group": "24.2.0-alpha16",
"@vaadin/board": "24.2.0-alpha16",
"@vaadin/bundles": "24.2.0-alpha16",
"@vaadin/button": "24.2.0-alpha16",
"@vaadin/charts": "24.2.0-alpha16",
"@vaadin/checkbox": "24.2.0-alpha16",
"@vaadin/checkbox-group": "24.2.0-alpha16",
"@vaadin/combo-box": "24.2.0-alpha16",
"@vaadin/common-frontend": "0.0.18",
"@vaadin/component-base": "24.2.0-alpha16",
"@vaadin/confirm-dialog": "24.2.0-alpha16",
"@vaadin/context-menu": "24.2.0-alpha16",
"@vaadin/cookie-consent": "24.2.0-alpha16",
"@vaadin/crud": "24.2.0-alpha16",
"@vaadin/custom-field": "24.2.0-alpha16",
"@vaadin/date-picker": "24.2.0-alpha16",
"@vaadin/date-time-picker": "24.2.0-alpha16",
"@vaadin/details": "24.2.0-alpha16",
"@vaadin/dialog": "24.2.0-alpha16",
"@vaadin/email-field": "24.2.0-alpha16",
"@vaadin/field-base": "24.2.0-alpha16",
"@vaadin/field-highlighter": "24.2.0-alpha16",
"@vaadin/form-layout": "24.2.0-alpha16",
"@vaadin/grid": "24.2.0-alpha16",
"@vaadin/grid-pro": "24.2.0-alpha16",
"@vaadin/horizontal-layout": "24.2.0-alpha16",
"@vaadin/icon": "24.2.0-alpha16",
"@vaadin/icons": "24.2.0-alpha16",
"@vaadin/input-container": "24.2.0-alpha16",
"@vaadin/integer-field": "24.2.0-alpha16",
"@vaadin/item": "24.2.0-alpha16",
"@vaadin/list-box": "24.2.0-alpha16",
"@vaadin/lit-renderer": "24.2.0-alpha16",
"@vaadin/login": "24.2.0-alpha16",
"@vaadin/map": "24.2.0-alpha16",
"@vaadin/menu-bar": "24.2.0-alpha16",
"@vaadin/message-input": "24.2.0-alpha16",
"@vaadin/message-list": "24.2.0-alpha16",
"@vaadin/multi-select-combo-box": "24.2.0-alpha16",
"@vaadin/notification": "24.2.0-alpha16",
"@vaadin/number-field": "24.2.0-alpha16",
"@vaadin/overlay": "24.2.0-alpha16",
"@vaadin/password-field": "24.2.0-alpha16",
"@vaadin/polymer-legacy-adapter": "24.2.0-alpha16",
"@vaadin/progress-bar": "24.2.0-alpha16",
"@vaadin/radio-group": "24.2.0-alpha16",
"@vaadin/rich-text-editor": "24.2.0-alpha16",
"@vaadin/router": "1.7.5",
"@vaadin/scroller": "24.2.0-alpha16",
"@vaadin/select": "24.2.0-alpha16",
"@vaadin/side-nav": "24.2.0-alpha16",
"@vaadin/split-layout": "24.2.0-alpha16",
"@vaadin/tabs": "24.2.0-alpha16",
"@vaadin/tabsheet": "24.2.0-alpha16",
"@vaadin/text-area": "24.2.0-alpha16",
"@vaadin/text-field": "24.2.0-alpha16",
"@vaadin/time-picker": "24.2.0-alpha16",
"@vaadin/tooltip": "24.2.0-alpha16",
"@vaadin/upload": "24.2.0-alpha16",
"@vaadin/vaadin-development-mode-detector": "2.0.6",
"@vaadin/vaadin-lumo-styles": "24.2.0-alpha16",
"@vaadin/vaadin-material-styles": "24.2.0-alpha16",
"@vaadin/vaadin-usage-statistics": "2.1.2",
"@vaadin/vertical-layout": "24.2.0-alpha16",
"@vaadin/virtual-list": "24.2.0-alpha16",
"construct-style-sheets-polyfill": "3.1.0",
"lit": "2.8.0"
},
Expand All @@ -69,7 +205,7 @@
"workbox-core": "7.0.0",
"workbox-precaching": "7.0.0"
},
"hash": "a90eca5b02dcc2ada8d7af34f783f6827a4051990a84c51dca3aa5ffd39ab01e"
"hash": "59abee59e375f62daa0b7ff8be48faf218271fb72df78af36363c4cc91f44332"
},
"overrides": {
"@vaadin/common-frontend": "$@vaadin/common-frontend",
Expand All @@ -85,6 +221,74 @@
"@hilla/generator-typescript-plugin-client": "$@hilla/generator-typescript-plugin-client",
"@hilla/generator-typescript-plugin-model": "$@hilla/generator-typescript-plugin-model",
"@hilla/generator-typescript-plugin-push": "$@hilla/generator-typescript-plugin-push",
"@hilla/generator-typescript-utils": "$@hilla/generator-typescript-utils"
"@hilla/generator-typescript-utils": "$@hilla/generator-typescript-utils",
"@vaadin/bundles": "$@vaadin/bundles",
"@vaadin/a11y-base": "$@vaadin/a11y-base",
"@vaadin/accordion": "$@vaadin/accordion",
"@vaadin/app-layout": "$@vaadin/app-layout",
"@vaadin/avatar": "$@vaadin/avatar",
"@vaadin/avatar-group": "$@vaadin/avatar-group",
"@vaadin/button": "$@vaadin/button",
"@vaadin/checkbox": "$@vaadin/checkbox",
"@vaadin/checkbox-group": "$@vaadin/checkbox-group",
"@vaadin/combo-box": "$@vaadin/combo-box",
"@vaadin/component-base": "$@vaadin/component-base",
"@vaadin/confirm-dialog": "$@vaadin/confirm-dialog",
"@vaadin/context-menu": "$@vaadin/context-menu",
"@vaadin/custom-field": "$@vaadin/custom-field",
"@vaadin/date-picker": "$@vaadin/date-picker",
"@vaadin/date-time-picker": "$@vaadin/date-time-picker",
"@vaadin/details": "$@vaadin/details",
"@vaadin/dialog": "$@vaadin/dialog",
"@vaadin/email-field": "$@vaadin/email-field",
"@vaadin/field-base": "$@vaadin/field-base",
"@vaadin/field-highlighter": "$@vaadin/field-highlighter",
"@vaadin/form-layout": "$@vaadin/form-layout",
"@vaadin/grid": "$@vaadin/grid",
"@vaadin/horizontal-layout": "$@vaadin/horizontal-layout",
"@vaadin/icon": "$@vaadin/icon",
"@vaadin/icons": "$@vaadin/icons",
"@vaadin/input-container": "$@vaadin/input-container",
"@vaadin/integer-field": "$@vaadin/integer-field",
"@vaadin/item": "$@vaadin/item",
"@vaadin/list-box": "$@vaadin/list-box",
"@vaadin/lit-renderer": "$@vaadin/lit-renderer",
"@vaadin/login": "$@vaadin/login",
"@vaadin/menu-bar": "$@vaadin/menu-bar",
"@vaadin/message-input": "$@vaadin/message-input",
"@vaadin/message-list": "$@vaadin/message-list",
"@vaadin/multi-select-combo-box": "$@vaadin/multi-select-combo-box",
"@vaadin/notification": "$@vaadin/notification",
"@vaadin/number-field": "$@vaadin/number-field",
"@vaadin/overlay": "$@vaadin/overlay",
"@vaadin/password-field": "$@vaadin/password-field",
"@vaadin/polymer-legacy-adapter": "$@vaadin/polymer-legacy-adapter",
"@vaadin/progress-bar": "$@vaadin/progress-bar",
"@vaadin/radio-group": "$@vaadin/radio-group",
"@vaadin/scroller": "$@vaadin/scroller",
"@vaadin/select": "$@vaadin/select",
"@vaadin/side-nav": "$@vaadin/side-nav",
"@vaadin/split-layout": "$@vaadin/split-layout",
"@vaadin/tabs": "$@vaadin/tabs",
"@vaadin/tabsheet": "$@vaadin/tabsheet",
"@vaadin/text-area": "$@vaadin/text-area",
"@vaadin/text-field": "$@vaadin/text-field",
"@vaadin/time-picker": "$@vaadin/time-picker",
"@vaadin/tooltip": "$@vaadin/tooltip",
"@vaadin/upload": "$@vaadin/upload",
"@vaadin/vaadin-development-mode-detector": "$@vaadin/vaadin-development-mode-detector",
"@vaadin/vaadin-lumo-styles": "$@vaadin/vaadin-lumo-styles",
"@vaadin/vaadin-material-styles": "$@vaadin/vaadin-material-styles",
"@vaadin/vaadin-usage-statistics": "$@vaadin/vaadin-usage-statistics",
"@vaadin/vertical-layout": "$@vaadin/vertical-layout",
"@vaadin/virtual-list": "$@vaadin/virtual-list",
"@vaadin/board": "$@vaadin/board",
"@vaadin/charts": "$@vaadin/charts",
"@vaadin/cookie-consent": "$@vaadin/cookie-consent",
"@vaadin/crud": "$@vaadin/crud",
"@vaadin/grid-pro": "$@vaadin/grid-pro",
"@vaadin/map": "$@vaadin/map",
"@vaadin/rich-text-editor": "$@vaadin/rich-text-editor",
"@hilla/form": "$@hilla/form"
}
}
27 changes: 6 additions & 21 deletions packages/java/tests/spring/endpoints discovery/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +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"
<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">
<modelVersion>4.0.0</modelVersion>
<parent>
Expand All @@ -18,24 +19,12 @@

<dependencies>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-spring</artifactId>
<groupId>dev.hilla</groupId>
<artifactId>hilla</artifactId>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-dev-server</artifactId>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>flow-polymer-template</artifactId>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>flow-html-components</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<groupId>dev.hilla</groupId>
<artifactId>hilla-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand All @@ -46,10 +35,6 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
</dependency>
</dependencies>

<build>
Expand Down
Loading

0 comments on commit 5008904

Please sign in to comment.