Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
simasch committed Aug 23, 2022
2 parents 8aec298 + 5a41aa4 commit 2f29a4c
Show file tree
Hide file tree
Showing 15 changed files with 141 additions and 11,458 deletions.
11,050 changes: 0 additions & 11,050 deletions package-lock.json

This file was deleted.

334 changes: 20 additions & 314 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,343 +2,49 @@
"name": "no-name",
"license": "UNLICENSED",
"dependencies": {
"@polymer/iron-icon": "3.0.1",
"@polymer/iron-iconset-svg": "3.0.1",
"@polymer/iron-list": "3.1.0",
"@polymer/iron-meta": "3.0.1",
"@polymer/iron-resizable-behavior": "3.0.1",
"@polymer/polymer": "3.4.1",
"@vaadin/accordion": "23.1.3",
"@vaadin/app-layout": "23.1.3",
"@vaadin/avatar": "23.1.3",
"@vaadin/avatar-group": "23.1.3",
"@vaadin/bundles": "23.1.3",
"@vaadin/button": "23.1.3",
"@vaadin/checkbox": "23.1.3",
"@vaadin/checkbox-group": "23.1.3",
"@vaadin/combo-box": "23.1.3",
"@vaadin/common-frontend": "0.0.17",
"@vaadin/component-base": "23.1.3",
"@vaadin/context-menu": "23.1.3",
"@vaadin/custom-field": "23.1.3",
"@vaadin/date-picker": "23.1.3",
"@vaadin/date-time-picker": "23.1.3",
"@vaadin/details": "23.1.3",
"@vaadin/dialog": "23.1.3",
"@vaadin/email-field": "23.1.3",
"@vaadin/field-base": "23.1.3",
"@vaadin/field-highlighter": "23.1.3",
"@vaadin/flow-frontend": "./target/flow-frontend",
"@vaadin/form-layout": "23.1.3",
"@vaadin/grid": "23.1.3",
"@vaadin/horizontal-layout": "23.1.3",
"@vaadin/icon": "23.1.3",
"@vaadin/icons": "23.1.3",
"@vaadin/input-container": "23.1.3",
"@vaadin/integer-field": "23.1.3",
"@vaadin/item": "23.1.3",
"@vaadin/list-box": "23.1.3",
"@vaadin/lit-renderer": "23.1.3",
"@vaadin/login": "23.1.3",
"@vaadin/menu-bar": "23.1.3",
"@vaadin/message-input": "23.1.3",
"@vaadin/message-list": "23.1.3",
"@vaadin/notification": "23.1.3",
"@vaadin/number-field": "23.1.3",
"@vaadin/password-field": "23.1.3",
"@vaadin/polymer-legacy-adapter": "23.1.3",
"@vaadin/progress-bar": "23.1.3",
"@vaadin/radio-group": "23.1.3",
"@vaadin/router": "1.7.4",
"@vaadin/scroller": "23.1.3",
"@vaadin/select": "23.1.3",
"@vaadin/split-layout": "23.1.3",
"@vaadin/tabs": "23.1.3",
"@vaadin/text-area": "23.1.3",
"@vaadin/text-field": "23.1.3",
"@vaadin/time-picker": "23.1.3",
"@vaadin/upload": "23.1.3",
"@vaadin/vaadin-accordion": "23.1.3",
"@vaadin/vaadin-app-layout": "23.1.3",
"@vaadin/vaadin-avatar": "23.1.3",
"@vaadin/vaadin-button": "23.1.3",
"@vaadin/vaadin-checkbox": "23.1.3",
"@vaadin/vaadin-combo-box": "23.1.3",
"@vaadin/vaadin-context-menu": "23.1.3",
"@vaadin/vaadin-custom-field": "23.1.3",
"@vaadin/vaadin-date-picker": "23.1.3",
"@vaadin/vaadin-date-time-picker": "23.1.3",
"@vaadin/vaadin-details": "23.1.3",
"@vaadin/vaadin-development-mode-detector": "2.0.5",
"@vaadin/vaadin-dialog": "23.1.3",
"@vaadin/vaadin-form-layout": "23.1.3",
"@vaadin/vaadin-grid": "23.1.3",
"@vaadin/vaadin-icon": "23.1.3",
"@vaadin/vaadin-icons": "23.1.3",
"@vaadin/vaadin-item": "23.1.3",
"@vaadin/vaadin-list-box": "23.1.3",
"@vaadin/vaadin-list-mixin": "23.1.3",
"@vaadin/vaadin-login": "23.1.3",
"@vaadin/vaadin-lumo-styles": "23.1.3",
"@vaadin/vaadin-material-styles": "23.1.3",
"@vaadin/vaadin-menu-bar": "23.1.3",
"@vaadin/vaadin-messages": "23.1.3",
"@vaadin/vaadin-notification": "23.1.3",
"@vaadin/vaadin-ordered-layout": "23.1.3",
"@vaadin/vaadin-overlay": "23.1.3",
"@vaadin/vaadin-progress-bar": "23.1.3",
"@vaadin/vaadin-radio-button": "23.1.3",
"@vaadin/vaadin-select": "23.1.3",
"@vaadin/vaadin-split-layout": "23.1.3",
"@vaadin/vaadin-tabs": "23.1.3",
"@vaadin/vaadin-template-renderer": "23.1.3",
"@vaadin/vaadin-text-field": "23.1.3",
"@vaadin/vaadin-themable-mixin": "23.1.3",
"@vaadin/vaadin-time-picker": "23.1.3",
"@vaadin/vaadin-upload": "23.1.3",
"@vaadin/vaadin-usage-statistics": "2.1.2",
"@vaadin/vaadin-virtual-list": "23.1.3",
"@vaadin/vertical-layout": "23.1.3",
"@vaadin/virtual-list": "23.1.3",
"construct-style-sheets-polyfill": "3.1.0",
"date-fns": "2.28.0",
"line-awesome": "1.3.0",
"lit": "2.2.3",
"lumo-css-framework": "^4.0.10"
"@vaadin/router": "1.7.4",
"@polymer/polymer": "3.4.1"
},
"devDependencies": {
"@rollup/plugin-replace": "3.1.0",
"async": "3.2.2",
"glob": "7.1.6",
"mkdirp": "1.0.4",
"rollup-plugin-brotli": "3.1.0",
"typescript": "4.5.3",
"vite": "v2.9.13",
"vite-plugin-checker": "0.4.6",
"workbox-build": "6.5.0",
"workbox-core": "6.5.0",
"workbox-precaching": "6.5.0"
"rollup-plugin-brotli": "3.1.0",
"workbox-build": "6.5.0",
"vite-plugin-checker": "0.4.6",
"glob": "7.1.6",
"workbox-precaching": "6.5.0",
"typescript": "4.5.3",
"@rollup/plugin-replace": "3.1.0"
},
"overrides": {
"@vaadin/bundles": "$@vaadin/bundles",
"@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/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",
"@polymer/iron-icon": "$@polymer/iron-icon",
"@polymer/iron-iconset-svg": "$@polymer/iron-iconset-svg",
"@polymer/iron-list": "$@polymer/iron-list",
"@polymer/iron-meta": "$@polymer/iron-meta",
"@polymer/iron-resizable-behavior": "$@polymer/iron-resizable-behavior",
"@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/notification": "$@vaadin/notification",
"@vaadin/number-field": "$@vaadin/number-field",
"@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/split-layout": "$@vaadin/split-layout",
"@vaadin/tabs": "$@vaadin/tabs",
"@vaadin/text-area": "$@vaadin/text-area",
"@vaadin/text-field": "$@vaadin/text-field",
"@vaadin/time-picker": "$@vaadin/time-picker",
"@vaadin/upload": "$@vaadin/upload",
"@vaadin/vaadin-accordion": "$@vaadin/vaadin-accordion",
"@vaadin/vaadin-app-layout": "$@vaadin/vaadin-app-layout",
"@vaadin/vaadin-avatar": "$@vaadin/vaadin-avatar",
"@vaadin/vaadin-button": "$@vaadin/vaadin-button",
"@vaadin/vaadin-checkbox": "$@vaadin/vaadin-checkbox",
"@vaadin/vaadin-combo-box": "$@vaadin/vaadin-combo-box",
"@vaadin/vaadin-context-menu": "$@vaadin/vaadin-context-menu",
"@vaadin/vaadin-custom-field": "$@vaadin/vaadin-custom-field",
"@vaadin/vaadin-date-picker": "$@vaadin/vaadin-date-picker",
"@vaadin/vaadin-date-time-picker": "$@vaadin/vaadin-date-time-picker",
"@vaadin/vaadin-details": "$@vaadin/vaadin-details",
"@vaadin/vaadin-development-mode-detector": "$@vaadin/vaadin-development-mode-detector",
"@vaadin/vaadin-dialog": "$@vaadin/vaadin-dialog",
"@vaadin/vaadin-form-layout": "$@vaadin/vaadin-form-layout",
"@vaadin/vaadin-grid": "$@vaadin/vaadin-grid",
"@vaadin/vaadin-icon": "$@vaadin/vaadin-icon",
"@vaadin/vaadin-icons": "$@vaadin/vaadin-icons",
"@vaadin/vaadin-item": "$@vaadin/vaadin-item",
"@vaadin/vaadin-list-box": "$@vaadin/vaadin-list-box",
"@vaadin/vaadin-list-mixin": "$@vaadin/vaadin-list-mixin",
"@vaadin/vaadin-login": "$@vaadin/vaadin-login",
"@vaadin/vaadin-lumo-styles": "$@vaadin/vaadin-lumo-styles",
"@vaadin/vaadin-material-styles": "$@vaadin/vaadin-material-styles",
"@vaadin/vaadin-menu-bar": "$@vaadin/vaadin-menu-bar",
"@vaadin/vaadin-messages": "$@vaadin/vaadin-messages",
"@vaadin/vaadin-notification": "$@vaadin/vaadin-notification",
"@vaadin/vaadin-ordered-layout": "$@vaadin/vaadin-ordered-layout",
"@vaadin/vaadin-overlay": "$@vaadin/vaadin-overlay",
"@vaadin/vaadin-progress-bar": "$@vaadin/vaadin-progress-bar",
"@vaadin/vaadin-radio-button": "$@vaadin/vaadin-radio-button",
"@vaadin/router": "$@vaadin/router",
"@vaadin/vaadin-select": "$@vaadin/vaadin-select",
"@vaadin/vaadin-split-layout": "$@vaadin/vaadin-split-layout",
"@vaadin/vaadin-tabs": "$@vaadin/vaadin-tabs",
"@vaadin/vaadin-template-renderer": "$@vaadin/vaadin-template-renderer",
"@vaadin/vaadin-text-field": "$@vaadin/vaadin-text-field",
"@vaadin/vaadin-themable-mixin": "$@vaadin/vaadin-themable-mixin",
"@vaadin/vaadin-time-picker": "$@vaadin/vaadin-time-picker",
"@vaadin/vaadin-upload": "$@vaadin/vaadin-upload",
"@vaadin/vaadin-usage-statistics": "$@vaadin/vaadin-usage-statistics",
"@vaadin/vaadin-virtual-list": "$@vaadin/vaadin-virtual-list",
"@vaadin/vertical-layout": "$@vaadin/vertical-layout",
"@vaadin/virtual-list": "$@vaadin/virtual-list",
"@vaadin/common-frontend": "$@vaadin/common-frontend",
"construct-style-sheets-polyfill": "$construct-style-sheets-polyfill",
"lit": "$lit",
"@polymer/polymer": "$@polymer/polymer",
"date-fns": "$date-fns"

},
"vaadin": {
"dependencies": {
"@polymer/iron-icon": "3.0.1",
"@polymer/iron-iconset-svg": "3.0.1",
"@polymer/iron-list": "3.1.0",
"@polymer/iron-meta": "3.0.1",
"@polymer/iron-resizable-behavior": "3.0.1",
"@polymer/polymer": "3.4.1",
"@vaadin/accordion": "23.1.3",
"@vaadin/app-layout": "23.1.3",
"@vaadin/avatar": "23.1.3",
"@vaadin/avatar-group": "23.1.3",
"@vaadin/bundles": "23.1.3",
"@vaadin/button": "23.1.3",
"@vaadin/checkbox": "23.1.3",
"@vaadin/checkbox-group": "23.1.3",
"@vaadin/combo-box": "23.1.3",
"@vaadin/common-frontend": "0.0.17",
"@vaadin/component-base": "23.1.3",
"@vaadin/context-menu": "23.1.3",
"@vaadin/custom-field": "23.1.3",
"@vaadin/date-picker": "23.1.3",
"@vaadin/date-time-picker": "23.1.3",
"@vaadin/details": "23.1.3",
"@vaadin/dialog": "23.1.3",
"@vaadin/email-field": "23.1.3",
"@vaadin/field-base": "23.1.3",
"@vaadin/field-highlighter": "23.1.3",
"@vaadin/form-layout": "23.1.3",
"@vaadin/grid": "23.1.3",
"@vaadin/horizontal-layout": "23.1.3",
"@vaadin/icon": "23.1.3",
"@vaadin/icons": "23.1.3",
"@vaadin/input-container": "23.1.3",
"@vaadin/integer-field": "23.1.3",
"@vaadin/item": "23.1.3",
"@vaadin/list-box": "23.1.3",
"@vaadin/lit-renderer": "23.1.3",
"@vaadin/login": "23.1.3",
"@vaadin/menu-bar": "23.1.3",
"@vaadin/message-input": "23.1.3",
"@vaadin/message-list": "23.1.3",
"@vaadin/notification": "23.1.3",
"@vaadin/number-field": "23.1.3",
"@vaadin/password-field": "23.1.3",
"@vaadin/polymer-legacy-adapter": "23.1.3",
"@vaadin/progress-bar": "23.1.3",
"@vaadin/radio-group": "23.1.3",
"@vaadin/router": "1.7.4",
"@vaadin/scroller": "23.1.3",
"@vaadin/select": "23.1.3",
"@vaadin/split-layout": "23.1.3",
"@vaadin/tabs": "23.1.3",
"@vaadin/text-area": "23.1.3",
"@vaadin/text-field": "23.1.3",
"@vaadin/time-picker": "23.1.3",
"@vaadin/upload": "23.1.3",
"@vaadin/vaadin-accordion": "23.1.3",
"@vaadin/vaadin-app-layout": "23.1.3",
"@vaadin/vaadin-avatar": "23.1.3",
"@vaadin/vaadin-button": "23.1.3",
"@vaadin/vaadin-checkbox": "23.1.3",
"@vaadin/vaadin-combo-box": "23.1.3",
"@vaadin/vaadin-context-menu": "23.1.3",
"@vaadin/vaadin-custom-field": "23.1.3",
"@vaadin/vaadin-date-picker": "23.1.3",
"@vaadin/vaadin-date-time-picker": "23.1.3",
"@vaadin/vaadin-details": "23.1.3",
"@vaadin/vaadin-development-mode-detector": "2.0.5",
"@vaadin/vaadin-dialog": "23.1.3",
"@vaadin/vaadin-form-layout": "23.1.3",
"@vaadin/vaadin-grid": "23.1.3",
"@vaadin/vaadin-icon": "23.1.3",
"@vaadin/vaadin-icons": "23.1.3",
"@vaadin/vaadin-item": "23.1.3",
"@vaadin/vaadin-list-box": "23.1.3",
"@vaadin/vaadin-list-mixin": "23.1.3",
"@vaadin/vaadin-login": "23.1.3",
"@vaadin/vaadin-lumo-styles": "23.1.3",
"@vaadin/vaadin-material-styles": "23.1.3",
"@vaadin/vaadin-menu-bar": "23.1.3",
"@vaadin/vaadin-messages": "23.1.3",
"@vaadin/vaadin-notification": "23.1.3",
"@vaadin/vaadin-ordered-layout": "23.1.3",
"@vaadin/vaadin-overlay": "23.1.3",
"@vaadin/vaadin-progress-bar": "23.1.3",
"@vaadin/vaadin-radio-button": "23.1.3",
"@vaadin/vaadin-select": "23.1.3",
"@vaadin/vaadin-split-layout": "23.1.3",
"@vaadin/vaadin-tabs": "23.1.3",
"@vaadin/vaadin-template-renderer": "23.1.3",
"@vaadin/vaadin-text-field": "23.1.3",
"@vaadin/vaadin-themable-mixin": "23.1.3",
"@vaadin/vaadin-time-picker": "23.1.3",
"@vaadin/vaadin-upload": "23.1.3",
"@vaadin/vaadin-usage-statistics": "2.1.2",
"@vaadin/vaadin-virtual-list": "23.1.3",
"@vaadin/vertical-layout": "23.1.3",
"@vaadin/virtual-list": "23.1.3",
"construct-style-sheets-polyfill": "3.1.0",
"date-fns": "2.28.0",
"line-awesome": "1.3.0",
"lit": "2.2.3",
"lumo-css-framework": "^4.0.10"
"@vaadin/router": "1.7.4",
"@polymer/polymer": "3.4.1"
},
"devDependencies": {
"@rollup/plugin-replace": "3.1.0",
"async": "3.2.2",
"glob": "7.1.6",
"mkdirp": "1.0.4",
"rollup-plugin-brotli": "3.1.0",
"typescript": "4.5.3",
"vite": "v2.9.13",
"vite-plugin-checker": "0.4.6",
"workbox-build": "6.5.0",
"workbox-core": "6.5.0",
"workbox-precaching": "6.5.0"
"rollup-plugin-brotli": "3.1.0",
"workbox-build": "6.5.0",
"vite-plugin-checker": "0.4.6",
"glob": "7.1.6",
"workbox-precaching": "6.5.0",
"typescript": "4.5.3",
"@rollup/plugin-replace": "3.1.0"
},
"hash": "6ee43c65bd9e89f24670f8ed082723a6c8f97acda029548b60b9a4443deee5b8"
"hash": ""
}
}
22 changes: 21 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<groupId>ch.jtaf</groupId>
<artifactId>jtaf4</artifactId>
<version>4.3.31</version>
<version>4.3.32</version>

<name>JTAF 4</name>
<description>JTAF - Track And Field</description>
Expand Down Expand Up @@ -332,6 +332,26 @@
<maxAttempts>240</maxAttempts>
</configuration>
</plugin>
<!-- ITs in its own directory -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.5</version>
<executions>
<execution>
<id>add-test-source</id>
<phase>process-resources</phase>
<goals>
<goal>add-test-source</goal>
</goals>
<configuration>
<sources>
<source>src/it/java</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<!-- Gitflow -->
<plugin>
<groupId>com.amashchenko.maven.plugin</groupId>
Expand Down
Loading

0 comments on commit 2f29a4c

Please sign in to comment.