diff --git a/.gitignore b/.gitignore index ed4d3bc..94ac970 100755 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,7 @@ target *~ *.diff *.patch + + +node/* +node_modules/* \ No newline at end of file diff --git a/docker/pom.xml b/docker/pom.xml index e1a3ded..dbcd9e0 100644 --- a/docker/pom.xml +++ b/docker/pom.xml @@ -5,7 +5,7 @@ meecrowave-examples org.apache.meecrowave - 1.2.8-SNAPSHOT + 1.2.9-SNAPSHOT 4.0.0 diff --git a/mw_bundle_config/pom.xml b/mw_bundle_config/pom.xml index 1546a43..c9459d4 100644 --- a/mw_bundle_config/pom.xml +++ b/mw_bundle_config/pom.xml @@ -24,7 +24,7 @@ org.apache.meecrowave meecrowave-examples - 1.2.8-SNAPSHOT + 1.2.9-SNAPSHOT samples-bundle-config diff --git a/pom.xml b/pom.xml index 5b2e2fb..dd8e4c2 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.meecrowave meecrowave-examples - 1.2.8-SNAPSHOT + 1.2.9-SNAPSHOT pom Apache Meecrowave Examples @@ -43,15 +43,19 @@ mw_bundle_config servlet-vaadin-v08 servlet-vaadin-v10 + servlet-vaadin-v14 servlet-vaadin-vxx docker - 1.2.8 + 1.2.9 1.8 1.8 + + + 1.3.61 UTF-8 UTF-8 @@ -62,9 +66,9 @@ 1.4.0 0.5 - 4.12 - 5.4.0 - 1.4.0 + 4.13 + 5.6.0 + 1.6.0 diff --git a/rest-trivial-kotlin/pom.xml b/rest-trivial-kotlin/pom.xml index 8270fc8..ed80cd0 100644 --- a/rest-trivial-kotlin/pom.xml +++ b/rest-trivial-kotlin/pom.xml @@ -7,7 +7,7 @@ org.apache.meecrowave meecrowave-examples - 1.2.8-SNAPSHOT + 1.2.9-SNAPSHOT @@ -15,8 +15,6 @@ REST (trivial) - Kotlin - - 1.3.40 diff --git a/rest-trivial/pom.xml b/rest-trivial/pom.xml index d473bf4..2e0e347 100644 --- a/rest-trivial/pom.xml +++ b/rest-trivial/pom.xml @@ -7,7 +7,7 @@ org.apache.meecrowave meecrowave-examples - 1.2.8-SNAPSHOT + 1.2.9-SNAPSHOT diff --git a/rest/pom.xml b/rest/pom.xml index d521e13..27e22ad 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -5,7 +5,7 @@ org.apache.meecrowave meecrowave-examples - 1.2.8-SNAPSHOT + 1.2.9-SNAPSHOT 4.0.0 diff --git a/servlet-trivial/pom.xml b/servlet-trivial/pom.xml index 3dbd30c..973d5ca 100644 --- a/servlet-trivial/pom.xml +++ b/servlet-trivial/pom.xml @@ -23,7 +23,7 @@ org.apache.meecrowave meecrowave-examples - 1.2.8-SNAPSHOT + 1.2.9-SNAPSHOT 4.0.0 diff --git a/servlet-vaadin-v08/pom.xml b/servlet-vaadin-v08/pom.xml index 98fc037..1e0937e 100644 --- a/servlet-vaadin-v08/pom.xml +++ b/servlet-vaadin-v08/pom.xml @@ -23,7 +23,7 @@ org.apache.meecrowave meecrowave-examples - 1.2.8-SNAPSHOT + 1.2.9-SNAPSHOT 4.0.0 @@ -31,7 +31,7 @@ Servlet (Vaadin - V08 (LTS)) - 8.8.2 + 8.9.4 jar diff --git a/servlet-vaadin-v10/pom.xml b/servlet-vaadin-v10/pom.xml index bc78a9a..7084490 100644 --- a/servlet-vaadin-v10/pom.xml +++ b/servlet-vaadin-v10/pom.xml @@ -23,7 +23,7 @@ org.apache.meecrowave meecrowave-examples - 1.2.8-SNAPSHOT + 1.2.9-SNAPSHOT 4.0.0 @@ -36,25 +36,12 @@ 10.0.16 - - - vaadin-prereleases - https://maven.vaadin.com/vaadin-prereleases - - - vaadin-addons http://maven.vaadin.com/vaadin-addons - - - - vaadin-prereleases - http://maven.vaadin.com/vaadin-prereleases - diff --git a/servlet-vaadin-v14/.gitignore b/servlet-vaadin-v14/.gitignore new file mode 100644 index 0000000..dfbfe03 --- /dev/null +++ b/servlet-vaadin-v14/.gitignore @@ -0,0 +1,115 @@ + +node/ +node_modules/ +package-lock.json +package.json +webpack.config.js +webpack.generated.js + +# Created by .ignore support plugin (hsz.mobi) +### Node template +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* +lerna-debug.log* + +# Diagnostic reports (https://nodejs.org/api/report.html) +report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json + +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage +*.lcov + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (https://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ +jspm_packages/ + +# TypeScript v1 declaration files +typings/ + +# TypeScript cache +*.tsbuildinfo + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Microbundle cache +.rpt2_cache/ +.rts2_cache_cjs/ +.rts2_cache_es/ +.rts2_cache_umd/ + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variables file +.env +.env.test + +# parcel-bundler cache (https://parceljs.org/) +.cache + +# Next.js build output +.next + +# Nuxt.js build / generate output +.nuxt +dist + +# Gatsby files +.cache/ +# Comment in the public line in if your project uses Gatsby and *not* Next.js +# https://nextjs.org/blog/next-9-1#public-directory-support +# public + +# vuepress build output +.vuepress/dist + +# Serverless directories +.serverless/ + +# FuseBox cache +.fusebox/ + +# DynamoDB Local files +.dynamodb/ + +# TernJS port file +.tern-port + diff --git a/servlet-vaadin-v14/pom.xml b/servlet-vaadin-v14/pom.xml new file mode 100644 index 0000000..db36e54 --- /dev/null +++ b/servlet-vaadin-v14/pom.xml @@ -0,0 +1,162 @@ + + + + meecrowave-examples + org.apache.meecrowave + 1.2.9-SNAPSHOT + + 4.0.0 + + samples-servlet-vaadin-v14 + Servlet (Vaadin - V14 (LTS)) + jar + + + 14.1.5 + v12.13.0 + 6.12.0 + + + + + + vaadin-addons + http://maven.vaadin.com/vaadin-addons + + + + + + + + + com.vaadin + vaadin-bom + ${vaadin.version} + pom + import + + + + + + + + org.apache.meecrowave + meecrowave-specs-api + ${meecrowave.version} + + + + + com.vaadin + flow-server + + + com.vaadin + flow-push + + + com.vaadin + flow-client + + + com.vaadin + flow-html-components + + + com.vaadin + flow-data + + + + + com.vaadin + vaadin-lumo-theme + + + + com.vaadin + vaadin-button-flow + + + com.vaadin + vaadin-ordered-layout-flow + + + + + + + + + + org.apache.meecrowave + meecrowave-maven-plugin + ${meecrowave.version} + + + org.apache.maven.plugins + maven-war-plugin + 3.2.2 + + + com.vaadin + vaadin-maven-plugin + ${vaadin.version} + + + test-compile + + prepare-frontend + build-frontend + + + + + + + + + + vaadin-install-nodejs + + true + + + + + com.github.eirslett + frontend-maven-plugin + + + + install node and npm + + install-node-and-npm + + + generate-resources + + + + ${frontend-maven-plugin.nodeVersion} + + ${frontend-maven-plugin.npmVersion} + + + ${frontend-maven-plugin.installDirectory} + + + + + + + + + \ No newline at end of file diff --git a/servlet-vaadin-v14/src/main/java/com/superbiz/servlet/vaadin/HelloVaadinV14.java b/servlet-vaadin-v14/src/main/java/com/superbiz/servlet/vaadin/HelloVaadinV14.java new file mode 100644 index 0000000..bf11b19 --- /dev/null +++ b/servlet-vaadin-v14/src/main/java/com/superbiz/servlet/vaadin/HelloVaadinV14.java @@ -0,0 +1,38 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package com.superbiz.servlet.vaadin; + +import com.vaadin.flow.component.Composite; +import com.vaadin.flow.component.button.Button; +import com.vaadin.flow.component.html.Div; +import com.vaadin.flow.component.html.Label; +import com.vaadin.flow.component.orderedlayout.VerticalLayout; +import com.vaadin.flow.router.Route; + +@Route("") +public class HelloVaadinV14 + extends Composite { + + public HelloVaadinV14() { + getContent() + .add(new Button("click me", + event -> getContent().add(new Label("clicked again")) + )); + } +} diff --git a/servlet-vaadin-vxx/.gitignore b/servlet-vaadin-vxx/.gitignore new file mode 100644 index 0000000..e22f892 --- /dev/null +++ b/servlet-vaadin-vxx/.gitignore @@ -0,0 +1,117 @@ + +node/ +node_modules/ +tsconfig.json +pnpm-lock.yaml +package-lock.json +package.json +webpack.config.js +webpack.generated.js + +# Created by .ignore support plugin (hsz.mobi) +### Node template +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* +lerna-debug.log* + +# Diagnostic reports (https://nodejs.org/api/report.html) +report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json + +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage +*.lcov + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (https://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ +jspm_packages/ + +# TypeScript v1 declaration files +typings/ + +# TypeScript cache +*.tsbuildinfo + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Microbundle cache +.rpt2_cache/ +.rts2_cache_cjs/ +.rts2_cache_es/ +.rts2_cache_umd/ + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variables file +.env +.env.test + +# parcel-bundler cache (https://parceljs.org/) +.cache + +# Next.js build output +.next + +# Nuxt.js build / generate output +.nuxt +dist + +# Gatsby files +.cache/ +# Comment in the public line in if your project uses Gatsby and *not* Next.js +# https://nextjs.org/blog/next-9-1#public-directory-support +# public + +# vuepress build output +.vuepress/dist + +# Serverless directories +.serverless/ + +# FuseBox cache +.fusebox/ + +# DynamoDB Local files +.dynamodb/ + +# TernJS port file +.tern-port + diff --git a/servlet-vaadin-vxx/pom.xml b/servlet-vaadin-vxx/pom.xml index 6135454..b52fd69 100644 --- a/servlet-vaadin-vxx/pom.xml +++ b/servlet-vaadin-vxx/pom.xml @@ -5,7 +5,7 @@ meecrowave-examples org.apache.meecrowave - 1.2.8-SNAPSHOT + 1.2.9-SNAPSHOT 4.0.0 @@ -14,7 +14,9 @@ jar - 14.0.0.rc1 + 15.0.0.alpha10 + v12.13.0 + 6.12.0 @@ -63,7 +65,38 @@ com.vaadin - vaadin-core + flow-server + + + com.vaadin + flow-push + + + com.vaadin + flow-client + + + com.vaadin + flow-html-components + + + com.vaadin + flow-data + + + + + com.vaadin + vaadin-lumo-theme + + + + com.vaadin + vaadin-button-flow + + + com.vaadin + vaadin-ordered-layout-flow @@ -85,7 +118,58 @@ maven-war-plugin 3.2.2 + + com.vaadin + vaadin-maven-plugin + ${vaadin.version} + + + test-compile + + prepare-frontend + build-frontend + + + + + + + vaadin-install-nodejs + + true + + + + + com.github.eirslett + frontend-maven-plugin + + + + install node and npm + + install-node-and-npm + + + generate-resources + + + + ${frontend-maven-plugin.nodeVersion} + + ${frontend-maven-plugin.npmVersion} + + + ${frontend-maven-plugin.installDirectory} + + + + + + + + \ No newline at end of file diff --git a/servlet-vaadin-vxx/src/main/java/com/superbiz/servlet/vaadin/HelloVaadinVLatest.java b/servlet-vaadin-vxx/src/main/java/com/superbiz/servlet/vaadin/HelloVaadinVLatest.java index 99261c1..c193074 100644 --- a/servlet-vaadin-vxx/src/main/java/com/superbiz/servlet/vaadin/HelloVaadinVLatest.java +++ b/servlet-vaadin-vxx/src/main/java/com/superbiz/servlet/vaadin/HelloVaadinVLatest.java @@ -26,16 +26,13 @@ import com.vaadin.flow.router.Route; @Route("") -public class HelloVaadinVLatest extends Composite
{ +public class HelloVaadinVLatest + extends Composite { - public HelloVaadinVLatest() { - final VerticalLayout layout = new VerticalLayout(); - layout - .add(new Button("click me", - event -> layout.add(new Label("clicked again")) - )); - //set the main Component - getContent().add(layout); - - } + public HelloVaadinVLatest() { + getContent() + .add(new Button("click me", + event -> getContent().add(new Label("clicked again")) + )); + } }