From 52153d46a89a6fad3fa01806e16a805f84cfd43a Mon Sep 17 00:00:00 2001 From: Sven Ruppert Date: Wed, 16 Oct 2019 13:07:24 +0200 Subject: [PATCH 01/10] changes for CI env. --- .drone.yml | 66 ---------------- README.md | 11 ++- core/pom.xml | 2 +- nano-jetty-junit5/pom.xml | 6 +- .../junit5/ServletContainerExtension.java | 1 - nano-jetty/pom.xml | 27 +------ pom.xml | 79 +++++++++++-------- vaadin-v08/pom.xml | 4 +- vaadin-v10/pom.xml | 2 +- vaadin-v14/pom.xml | 2 +- vaadin-vXX/pom.xml | 2 +- 11 files changed, 65 insertions(+), 137 deletions(-) delete mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index 94014d6..0000000 --- a/.drone.yml +++ /dev/null @@ -1,66 +0,0 @@ -# -# Copyright © 2013 Sven Ruppert (sven.ruppert@gmail.com) -# -# Licensed 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. -# - -workspace: - base: /drone/src - path: rapidpm-dependencies - -pipeline: - build: - image: ${JDK_VERSION} - pull: true - commands: - - mkdir /root/.m2 -# - cp /drone/src/rapidpm-dependencies/_data/nexus/settings.xml /root/.m2/settings.xml - - mvn clean - - mvn test - -# deploy: -# image: ${JDK_VERSION} -# pull: true -# commands: -# - mkdir /root/.m2 -# - cp /drone/src/rapidpm-dependencies/_data/nexus/settings.xml /root/.m2/settings.xml -# - mvn clean -# - mvn deploy -# when: -# matrix: -# JDK_VERSION: svenruppert/maven-3.5-jdk-10 -# branches: -# include: develop, release/* -# exclude: feature/* - - -matrix: - JDK_VERSION: - - maven:3.5-jdk-8-alpine - - svenruppert/maven-3.5-jdk-08 - - svenruppert/maven-3.5-jdk-openjdk-09 - - svenruppert/maven-3.5-jdk-openjdk-10 - - svenruppert/maven-3.5-jdk-openjdk-11 - - svenruppert/maven-3.5-jdk-openjdk-shenandoah-08 - - svenruppert/maven-3.5-jdk-openjdk-shenandoah-09 - - svenruppert/maven-3.5-jdk-openjdk-shenandoah-10 - - svenruppert/maven-3.5-jdk-graalvm-ce-01 - - svenruppert/maven-3.5-jdk-oracle-08 - - svenruppert/maven-3.5-jdk-oracle-10 - - svenruppert/maven-3.5-jdk-oracle-11 - - svenruppert/maven-3.5-jdk-zulu-08 - - svenruppert/maven-3.5-jdk-zulu-09 - - svenruppert/maven-3.5-jdk-zulu-10 - - svenruppert/maven-3.5-jdk-ibm-08 -# - maven:3.5-ibmjava-8-alpine -# - maven:3.5-ibmjava-9-alpine diff --git a/README.md b/README.md index 0ddf388..00457f9 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,10 @@ Add first to repository coordinates to your **pom.xml** ```xml - jitpack.io - https://jitpack.io + bintray + bintray-vaadin-tutorials-maven + https://dl.bintray.com/vaadin-tutorials/maven + false ``` @@ -68,6 +70,11 @@ This project supports all LTS versions up from Vaadin8 and the current version. ### NEXT * TBD +### 2.0.0 +* changed structure +* switched to bintray repos + + ### 1.0.6 * added java-faker to scope test diff --git a/core/pom.xml b/core/pom.xml index 551a498..76dcb56 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> vaadin-dependencies - org.vaadin + org.vaadin-tutorials 0.0.0-SNAPSHOT 4.0.0 diff --git a/nano-jetty-junit5/pom.xml b/nano-jetty-junit5/pom.xml index affae05..f1f8bb0 100644 --- a/nano-jetty-junit5/pom.xml +++ b/nano-jetty-junit5/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> vaadin-dependencies - org.vaadin + org.vaadin-tutorials 0.0.0-SNAPSHOT 4.0.0 @@ -13,13 +13,13 @@ - org.vaadin + org.vaadin-tutorials vaadin-dependencies-core compile - org.vaadin + org.vaadin-tutorials vaadin-dependencies-nano-jetty compile diff --git a/nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/jetty/junit5/ServletContainerExtension.java b/nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/jetty/junit5/ServletContainerExtension.java index 63519bb..3fc14d1 100644 --- a/nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/jetty/junit5/ServletContainerExtension.java +++ b/nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/jetty/junit5/ServletContainerExtension.java @@ -11,7 +11,6 @@ public class ServletContainerExtension @Override public void beforeEach(ExtensionContext ctx) throws Exception { -// Stagemonitor.init(); final CoreUIService uiService = new CoreUIService(); uiService.startup(); ctx.getStore(ExtensionContext.Namespace.GLOBAL) diff --git a/nano-jetty/pom.xml b/nano-jetty/pom.xml index 1b99504..c23ca40 100644 --- a/nano-jetty/pom.xml +++ b/nano-jetty/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> vaadin-dependencies - org.vaadin + org.vaadin-tutorials 0.0.0-SNAPSHOT 4.0.0 @@ -23,7 +23,7 @@ - org.vaadin + org.vaadin-tutorials vaadin-dependencies-core @@ -68,29 +68,6 @@ slf4j-simple - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pom.xml b/pom.xml index f7a4bd9..767fb6f 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 4.0.0 - org.vaadin + org.vaadin-tutorials vaadin-dependencies pom @@ -113,20 +113,20 @@ 0.33.0 7.1 - 1.12.0 + 1.12.1 - 8.8.5 + 8.8.6 5.2.0 - 10.0.16 + 10.0.17 6.2.0 - 14.0.2 + 14.0.8 6.2.0 - 14.0.2 + 15.0.0.alpha1 6.2.0 4.0.1 @@ -135,20 +135,32 @@ 0.89.0 0.33.0 - 1.10.0 + 1.10.1 + + + + + bintray-vaadin-tutorials-maven + vaadin-tutorials-maven + https://api.bintray.com/maven/vaadin-tutorials/maven/vaadin-dependencies/;publish=1 + + + + + - jitpack.io - https://jitpack.io + bintray-vaadin-tutorials-maven + bintray + https://dl.bintray.com/vaadin-tutorials/maven + false central https://repo1.maven.org/maven2/ - - false - + false @@ -159,27 +171,27 @@ Vaadin - Prereleases https://maven.vaadin.com/vaadin-prereleases - - false - + false + + bintray-plugins + bintray-vaadin-tutorials-maven + https://dl.bintray.com/vaadin-tutorials/maven + false + central https://repo1.maven.org/maven2/ - - false - + false Vaadin - Prereleases https://maven.vaadin.com/vaadin-prereleases - - false - + false @@ -187,25 +199,24 @@ - + - org.vaadin + org.vaadin-tutorials vaadin-dependencies-core 0.0.0-SNAPSHOT - org.vaadin + org.vaadin-tutorials vaadin-dependencies-nano-jetty 0.0.0-SNAPSHOT - org.vaadin + org.vaadin-tutorials vaadin-dependencies-nano-jetty-junit5 0.0.0-SNAPSHOT - javax.annotation @@ -236,19 +247,19 @@ org.rapidpm rapidpm-functional-reactive - 01.00.03-RPM + 01.00.04-RPM org.rapidpm rapidpm-logger-adapter - 01.00.03-RPM + 01.00.04-RPM com.google.code.gson gson - 2.8.5 + 2.8.6 true @@ -439,7 +450,7 @@ com.github.javafaker javafaker - 1.0.0 + 1.0.1 test @@ -610,7 +621,7 @@ jcip-annotations - + org.testcontainers testcontainers @@ -802,7 +813,7 @@ frontend-maven-plugin - 1.7.6 + 1.8.0 @@ -990,8 +1001,8 @@
com/mycila/maven/plugin/license/templates/APACHE-2.txt
- Sven Ruppert - sven.ruppert@gmail.com + Vaadin - Marketing Team - Developer Relations + devrel@vaadin.com **/node/** diff --git a/vaadin-v08/pom.xml b/vaadin-v08/pom.xml index cea2fe7..6533763 100644 --- a/vaadin-v08/pom.xml +++ b/vaadin-v08/pom.xml @@ -21,7 +21,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> vaadin-dependencies - org.vaadin + org.vaadin-tutorials 0.0.0-SNAPSHOT 4.0.0 @@ -81,7 +81,7 @@ - org.vaadin + org.vaadin-tutorials addon-test-helpers 2.1 test diff --git a/vaadin-v10/pom.xml b/vaadin-v10/pom.xml index 0b79f75..24e90f4 100644 --- a/vaadin-v10/pom.xml +++ b/vaadin-v10/pom.xml @@ -21,7 +21,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> vaadin-dependencies - org.vaadin + org.vaadin-tutorials 0.0.0-SNAPSHOT 4.0.0 diff --git a/vaadin-v14/pom.xml b/vaadin-v14/pom.xml index c5577cc..ec22d68 100644 --- a/vaadin-v14/pom.xml +++ b/vaadin-v14/pom.xml @@ -21,7 +21,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> vaadin-dependencies - org.vaadin + org.vaadin-tutorials 0.0.0-SNAPSHOT 4.0.0 diff --git a/vaadin-vXX/pom.xml b/vaadin-vXX/pom.xml index cb4d707..c732963 100644 --- a/vaadin-vXX/pom.xml +++ b/vaadin-vXX/pom.xml @@ -21,7 +21,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> vaadin-dependencies - org.vaadin + org.vaadin-tutorials 0.0.0-SNAPSHOT 4.0.0 From 06a0a118f7e0f82375b512cb969f01ac4cf14694 Mon Sep 17 00:00:00 2001 From: Sven Ruppert Date: Wed, 16 Oct 2019 14:39:11 +0200 Subject: [PATCH 02/10] nano jetty junit5 --- nano-jetty-junit5/pom.xml | 5 +++-- .../{jetty => }/junit5/ServletContainerExtension.java | 10 +++++----- .../nano/{jetty => }/junit5/VaadinTutorial.java | 2 +- .../{jetty => }/junit5/WebDriverParameterResolver.java | 2 +- .../nano/{jetty => }/junit5/WebdriverExtension.java | 2 +- .../tutorialnano/jetty/junit5/VaadinTutorialTest.java | 4 ++-- 6 files changed, 13 insertions(+), 12 deletions(-) rename nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/{jetty => }/junit5/ServletContainerExtension.java (67%) rename nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/{jetty => }/junit5/VaadinTutorial.java (91%) rename nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/{jetty => }/junit5/WebDriverParameterResolver.java (99%) rename nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/{jetty => }/junit5/WebdriverExtension.java (97%) diff --git a/nano-jetty-junit5/pom.xml b/nano-jetty-junit5/pom.xml index f1f8bb0..a338888 100644 --- a/nano-jetty-junit5/pom.xml +++ b/nano-jetty-junit5/pom.xml @@ -18,9 +18,10 @@ compile + - org.vaadin-tutorials - vaadin-dependencies-nano-jetty + org.rapidpm.vaadin + nano-vaadin-jetty compile diff --git a/nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/jetty/junit5/ServletContainerExtension.java b/nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/ServletContainerExtension.java similarity index 67% rename from nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/jetty/junit5/ServletContainerExtension.java rename to nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/ServletContainerExtension.java index 3fc14d1..8f4846f 100644 --- a/nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/jetty/junit5/ServletContainerExtension.java +++ b/nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/ServletContainerExtension.java @@ -1,9 +1,9 @@ -package org.vaadin.tutorial.nano.jetty.junit5; +package org.vaadin.tutorial.nano.junit5; import org.junit.jupiter.api.extension.AfterEachCallback; import org.junit.jupiter.api.extension.BeforeEachCallback; import org.junit.jupiter.api.extension.ExtensionContext; -import org.vaadin.tutorial.nano.jetty.CoreUIService; +import org.rapidpm.vaadin.nano.CoreUIServiceJava; public class ServletContainerExtension @@ -11,17 +11,17 @@ public class ServletContainerExtension @Override public void beforeEach(ExtensionContext ctx) throws Exception { - final CoreUIService uiService = new CoreUIService(); + final CoreUIServiceJava uiService = new CoreUIServiceJava(); uiService.startup(); ctx.getStore(ExtensionContext.Namespace.GLOBAL) - .put(CoreUIService.class.getSimpleName(), uiService); + .put(CoreUIServiceJava.class.getSimpleName(), uiService); } @Override public void afterEach(ExtensionContext ctx) throws Exception { ctx.getStore(ExtensionContext.Namespace.GLOBAL) - .get(CoreUIService.class.getSimpleName(), CoreUIService.class).jetty.ifPresent(server -> { + .get(CoreUIServiceJava.class.getSimpleName(), CoreUIServiceJava.class).jetty.ifPresent(server -> { try { server.stop(); } catch (Exception e) { diff --git a/nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/jetty/junit5/VaadinTutorial.java b/nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/VaadinTutorial.java similarity index 91% rename from nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/jetty/junit5/VaadinTutorial.java rename to nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/VaadinTutorial.java index f7d2578..48395d6 100644 --- a/nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/jetty/junit5/VaadinTutorial.java +++ b/nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/VaadinTutorial.java @@ -1,4 +1,4 @@ -package org.vaadin.tutorial.nano.jetty.junit5; +package org.vaadin.tutorial.nano.junit5; import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/jetty/junit5/WebDriverParameterResolver.java b/nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/WebDriverParameterResolver.java similarity index 99% rename from nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/jetty/junit5/WebDriverParameterResolver.java rename to nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/WebDriverParameterResolver.java index abf6919..1430b3c 100644 --- a/nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/jetty/junit5/WebDriverParameterResolver.java +++ b/nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/WebDriverParameterResolver.java @@ -1,4 +1,4 @@ -package org.vaadin.tutorial.nano.jetty.junit5; +package org.vaadin.tutorial.nano.junit5; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.ParameterContext; diff --git a/nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/jetty/junit5/WebdriverExtension.java b/nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/WebdriverExtension.java similarity index 97% rename from nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/jetty/junit5/WebdriverExtension.java rename to nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/WebdriverExtension.java index a0391ca..b94785c 100644 --- a/nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/jetty/junit5/WebdriverExtension.java +++ b/nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/WebdriverExtension.java @@ -1,4 +1,4 @@ -package org.vaadin.tutorial.nano.jetty.junit5; +package org.vaadin.tutorial.nano.junit5; import org.junit.jupiter.api.extension.AfterEachCallback; import org.junit.jupiter.api.extension.BeforeEachCallback; diff --git a/nano-jetty-junit5/src/test/java/junit/org/vaadin/tutorialnano/jetty/junit5/VaadinTutorialTest.java b/nano-jetty-junit5/src/test/java/junit/org/vaadin/tutorialnano/jetty/junit5/VaadinTutorialTest.java index f674a03..9577923 100644 --- a/nano-jetty-junit5/src/test/java/junit/org/vaadin/tutorialnano/jetty/junit5/VaadinTutorialTest.java +++ b/nano-jetty-junit5/src/test/java/junit/org/vaadin/tutorialnano/jetty/junit5/VaadinTutorialTest.java @@ -4,8 +4,8 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.vaadin.tutorial.nano.jetty.junit5.VaadinTutorial; -import org.vaadin.tutorial.nano.jetty.junit5.WebDriverParameterResolver.GenericPageObject; +import org.vaadin.tutorial.nano.junit5.VaadinTutorial; +import org.vaadin.tutorial.nano.junit5.WebDriverParameterResolver.GenericPageObject; @VaadinTutorial public class VaadinTutorialTest { From 0e2ac69d643797e2fe8e5a32a24b60ef39775158 Mon Sep 17 00:00:00 2001 From: Sven Ruppert Date: Wed, 16 Oct 2019 14:39:47 +0200 Subject: [PATCH 03/10] nano undertow junit5 --- nano-undertow-junit5/pom.xml | 62 +++++++++ .../junit5/ServletContainerExtension.java | 32 +++++ .../tutorial/nano/junit5/VaadinTutorial.java | 16 +++ .../junit5/WebDriverParameterResolver.java | 123 ++++++++++++++++++ .../nano/junit5/WebdriverExtension.java | 59 +++++++++ 5 files changed, 292 insertions(+) create mode 100644 nano-undertow-junit5/pom.xml create mode 100644 nano-undertow-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/ServletContainerExtension.java create mode 100644 nano-undertow-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/VaadinTutorial.java create mode 100644 nano-undertow-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/WebDriverParameterResolver.java create mode 100644 nano-undertow-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/WebdriverExtension.java diff --git a/nano-undertow-junit5/pom.xml b/nano-undertow-junit5/pom.xml new file mode 100644 index 0000000..6685239 --- /dev/null +++ b/nano-undertow-junit5/pom.xml @@ -0,0 +1,62 @@ + + + + vaadin-dependencies + org.vaadin-tutorials + 0.0.0-SNAPSHOT + + 4.0.0 + + vaadin-dependencies-nano-undertow-junit5 + + + + org.vaadin-tutorials + vaadin-dependencies-core + compile + + + + + org.rapidpm.vaadin + nano-vaadin-undertow + compile + + + org.junit.jupiter + junit-jupiter-api + compile + + + org.junit.jupiter + junit-jupiter-engine + compile + + + org.seleniumhq.selenium + selenium-api + 3.141.59 + compile + + + + org.testcontainers + selenium + compile + + + org.testcontainers + testcontainers + compile + + + org.seleniumhq.selenium + selenium-chrome-driver + 3.141.59 + compile + + + + \ No newline at end of file diff --git a/nano-undertow-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/ServletContainerExtension.java b/nano-undertow-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/ServletContainerExtension.java new file mode 100644 index 0000000..8f4846f --- /dev/null +++ b/nano-undertow-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/ServletContainerExtension.java @@ -0,0 +1,32 @@ +package org.vaadin.tutorial.nano.junit5; + +import org.junit.jupiter.api.extension.AfterEachCallback; +import org.junit.jupiter.api.extension.BeforeEachCallback; +import org.junit.jupiter.api.extension.ExtensionContext; +import org.rapidpm.vaadin.nano.CoreUIServiceJava; + + +public class ServletContainerExtension + implements BeforeEachCallback, AfterEachCallback { + + @Override + public void beforeEach(ExtensionContext ctx) throws Exception { + final CoreUIServiceJava uiService = new CoreUIServiceJava(); + uiService.startup(); + ctx.getStore(ExtensionContext.Namespace.GLOBAL) + .put(CoreUIServiceJava.class.getSimpleName(), uiService); + } + + + @Override + public void afterEach(ExtensionContext ctx) throws Exception { + ctx.getStore(ExtensionContext.Namespace.GLOBAL) + .get(CoreUIServiceJava.class.getSimpleName(), CoreUIServiceJava.class).jetty.ifPresent(server -> { + try { + server.stop(); + } catch (Exception e) { + e.printStackTrace(); + } + }); + } +} diff --git a/nano-undertow-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/VaadinTutorial.java b/nano-undertow-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/VaadinTutorial.java new file mode 100644 index 0000000..48395d6 --- /dev/null +++ b/nano-undertow-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/VaadinTutorial.java @@ -0,0 +1,16 @@ +package org.vaadin.tutorial.nano.junit5; + +import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; +import org.junit.jupiter.api.extension.ExtendWith; + +import java.lang.annotation.*; + +@Target({ElementType.TYPE, ElementType.METHOD}) +@Retention(RetentionPolicy.RUNTIME) +@Documented +@Inherited +@ExtendWith(ServletContainerExtension.class) +@ExtendWith(WebdriverExtension.class) +@ExtendWith(WebDriverParameterResolver.class) +@EnabledIfEnvironmentVariable(named = "TESTBENCH", matches = "on") +public @interface VaadinTutorial { } diff --git a/nano-undertow-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/WebDriverParameterResolver.java b/nano-undertow-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/WebDriverParameterResolver.java new file mode 100644 index 0000000..1430b3c --- /dev/null +++ b/nano-undertow-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/WebDriverParameterResolver.java @@ -0,0 +1,123 @@ +package org.vaadin.tutorial.nano.junit5; + +import org.junit.jupiter.api.extension.ExtensionContext; +import org.junit.jupiter.api.extension.ParameterContext; +import org.junit.jupiter.api.extension.ParameterResolutionException; +import org.junit.jupiter.api.extension.ParameterResolver; +import org.openqa.selenium.WebDriver; +import org.rapidpm.dependencies.core.logger.HasLogger; +import org.rapidpm.frp.Transformations; +import org.rapidpm.frp.functions.CheckedPredicate; +import org.rapidpm.frp.functions.CheckedSupplier; +import org.testcontainers.containers.BrowserWebDriverContainer; + +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.net.Inet4Address; +import java.net.InetAddress; +import java.net.NetworkInterface; +import java.util.Collections; +import java.util.Enumeration; +import java.util.function.Supplier; + +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; +import static org.rapidpm.frp.StringFunctions.notEmpty; +import static org.rapidpm.frp.StringFunctions.notStartsWith; +import static org.rapidpm.frp.Transformations.not; + +public class WebDriverParameterResolver + implements ParameterResolver, HasLogger { + + @Override + public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) + throws ParameterResolutionException { + final Class type = parameterContext.getParameter() + .getType(); + return GenericPageObject.class.isAssignableFrom(type); + } + + @Override + public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) + throws ParameterResolutionException { + + final BrowserWebDriverContainer container = extensionContext.getStore(GLOBAL) + .get(BrowserWebDriverContainer.class.getSimpleName(), + BrowserWebDriverContainer.class); + + + final String property = System.getProperty("os.name"); + final boolean osx = property.contains("Mac OS X"); + +// return new WebDriverInfo(container.getWebDriver(), (osx) +// ? "host.docker.internal" +// : localeIP().get(), container.getVncAddress()); + final Class type = parameterContext.getParameter() + .getType(); + + try { + final Constructor declaredConstructor = type.getDeclaredConstructor(WebDriver.class, String.class, + String.class); + return declaredConstructor.newInstance((WebDriver) container.getWebDriver(), localeIP().get(), + container.getVncAddress()); + } catch (NoSuchMethodException | IllegalAccessException | InstantiationException | InvocationTargetException e) { + logger().warning(e.getMessage()); + } + throw new RuntimeException("no Page Object created"); +// return ReflectionUtils.newInstance(type, (WebDriver)container.getWebDriver(), localeIP().get(), container.getVncAddress()); +// return new GenericPageObject(container.getWebDriver(), localeIP().get(), container.getVncAddress()); + } + + public static class GenericPageObject { + private WebDriver webdriver; + private String hostIpAddress; + private String vncAdress; + + public GenericPageObject(WebDriver webdriver, String hostIpAddress, String vncAdress) { + this.webdriver = webdriver; + this.hostIpAddress = hostIpAddress; + this.vncAdress = vncAdress; + } + + public WebDriver getWebdriver() { + return webdriver; + } + + public String getHostIpAddress() { + return hostIpAddress; + } + + public String getVncAdress() { + return vncAdress; + } + } + + public static Supplier localeIP() { + return () -> { + final CheckedSupplier> checkedSupplier = NetworkInterface::getNetworkInterfaces; + + return Transformations.enumToStream().apply( + checkedSupplier.getOrElse(Collections::emptyEnumeration)) + .filter( + (CheckedPredicate) NetworkInterface::isUp) + .map(NetworkInterface::getInetAddresses) + .flatMap( + iaEnum -> Transformations.enumToStream().apply( + iaEnum)) + .filter(inetAddress -> inetAddress instanceof Inet4Address) + .filter(not(InetAddress::isMulticastAddress)) + .filter(not(InetAddress::isLoopbackAddress)) + .map(InetAddress::getHostAddress) + .filter(notEmpty()) + .filter(adr -> notStartsWith().apply(adr, "127")) + .filter(adr -> notStartsWith().apply(adr, "169.254")) + .filter( + adr -> notStartsWith().apply(adr, "255.255.255.255")) + .filter( + adr -> notStartsWith().apply(adr, "255.255.255.255")) + .filter(adr -> notStartsWith().apply(adr, "0.0.0.0")) + // .filter(adr -> range(224, 240).noneMatch(nr -> adr.startsWith(valueOf(nr)))) + .findFirst() + .orElse("localhost"); + }; + } +} diff --git a/nano-undertow-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/WebdriverExtension.java b/nano-undertow-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/WebdriverExtension.java new file mode 100644 index 0000000..b94785c --- /dev/null +++ b/nano-undertow-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/WebdriverExtension.java @@ -0,0 +1,59 @@ +package org.vaadin.tutorial.nano.junit5; + +import org.junit.jupiter.api.extension.AfterEachCallback; +import org.junit.jupiter.api.extension.BeforeEachCallback; +import org.junit.jupiter.api.extension.ExtensionContext; +import org.openqa.selenium.chrome.ChromeOptions; +import org.testcontainers.containers.BrowserWebDriverContainer; +import org.testcontainers.containers.DefaultRecordingFileFactory; +import org.testcontainers.lifecycle.TestDescription; + +import java.io.File; +import java.util.Optional; + +import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL; +import static org.testcontainers.containers.BrowserWebDriverContainer.VncRecordingMode.RECORD_ALL; + +public class WebdriverExtension implements + BeforeEachCallback, + AfterEachCallback { + + @Override + public void beforeEach(ExtensionContext extensionContext) throws Exception { + + final BrowserWebDriverContainer container = new BrowserWebDriverContainer() + .withCapabilities(new ChromeOptions()) + .withRecordingMode(RECORD_ALL , new File("./target/")) +// .withRecordingMode(SKIP , new File("./target/")) + .withRecordingFileFactory(new DefaultRecordingFileFactory()); + + container.start(); + extensionContext + .getStore(GLOBAL) + .put(BrowserWebDriverContainer.class.getSimpleName() , container); + + } + + @Override + public void afterEach(ExtensionContext extensionContext) throws Exception { + + final BrowserWebDriverContainer container = extensionContext + .getStore(GLOBAL) + .get(BrowserWebDriverContainer.class.getSimpleName() , BrowserWebDriverContainer.class); + + final String uniqueId = extensionContext.getUniqueId(); + final String name = extensionContext.getRequiredTestMethod().getName(); + + + container.afterTest(new TestDescription() { + @Override + public String getTestId() { return uniqueId; } + + @Override + public String getFilesystemFriendlyName() { return name; } + } , Optional.empty()); + + container + .stop(); + } +} From 37660b9adad35b6e49f130167c8ceb5692541c01 Mon Sep 17 00:00:00 2001 From: Sven Ruppert Date: Wed, 16 Oct 2019 14:43:59 +0200 Subject: [PATCH 04/10] added nano undertow and junit5 extensions --- README.md | 1 + nano-jetty/pom.xml | 102 ------------------ .../tutorial/nano/jetty/CoreUIService.java | 87 --------------- .../tutorial/nano/jetty/NanoVaadin.java | 57 ---------- .../nano/jetty/CoreUIServiceTest.java | 18 ---- pom.xml | 19 +++- vaadin-v14/pom.xml | 64 +++++------ vaadin-vXX/pom.xml | 64 +++++------ 8 files changed, 85 insertions(+), 327 deletions(-) delete mode 100644 nano-jetty/pom.xml delete mode 100644 nano-jetty/src/main/java/org/vaadin/tutorial/nano/jetty/CoreUIService.java delete mode 100644 nano-jetty/src/main/java/org/vaadin/tutorial/nano/jetty/NanoVaadin.java delete mode 100644 nano-jetty/src/test/java/junit/org/vaadin/tutorial/nano/jetty/CoreUIServiceTest.java diff --git a/README.md b/README.md index 00457f9..c7308ed 100644 --- a/README.md +++ b/README.md @@ -73,6 +73,7 @@ This project supports all LTS versions up from Vaadin8 and the current version. ### 2.0.0 * changed structure * switched to bintray repos +* using nano-vaadin for jetty and undertow ### 1.0.6 diff --git a/nano-jetty/pom.xml b/nano-jetty/pom.xml deleted file mode 100644 index c23ca40..0000000 --- a/nano-jetty/pom.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - - vaadin-dependencies - org.vaadin-tutorials - 0.0.0-SNAPSHOT - - 4.0.0 - - vaadin-dependencies-nano-jetty - - - 9.4.19.v20190610 - - - - - - - - - - - org.vaadin-tutorials - vaadin-dependencies-core - - - - javax.servlet - javax.servlet-api - - - - org.eclipse.jetty - jetty-continuation - ${jetty.version} - - - org.eclipse.jetty - jetty-server - ${jetty.version} - - - org.eclipse.jetty.websocket - websocket-server - ${jetty.version} - - - org.eclipse.jetty.websocket - javax-websocket-server-impl - ${jetty.version} - - - - commons-cli - commons-cli - - - - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-simple - - - - - - - - - org.apache.maven.plugins - maven-shade-plugin - - - package - - shade - - - vaadin-app - - - - - org.vaadin.tutorial.nano.jetty.NanoVaadin - - - - - - - - - - \ No newline at end of file diff --git a/nano-jetty/src/main/java/org/vaadin/tutorial/nano/jetty/CoreUIService.java b/nano-jetty/src/main/java/org/vaadin/tutorial/nano/jetty/CoreUIService.java deleted file mode 100644 index 1c67796..0000000 --- a/nano-jetty/src/main/java/org/vaadin/tutorial/nano/jetty/CoreUIService.java +++ /dev/null @@ -1,87 +0,0 @@ -/** - * Copyright © 2017 Sven Ruppert (sven.ruppert@gmail.com) - *

- * Licensed 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 org.vaadin.tutorial.nano.jetty; - -import org.eclipse.jetty.annotations.AnnotationConfiguration; -import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.util.resource.Resource; -import org.eclipse.jetty.webapp.*; -import org.rapidpm.dependencies.core.logger.HasLogger; -import org.rapidpm.frp.model.Result; - -import static java.lang.System.getProperty; -import static org.rapidpm.frp.model.Result.failure; - -/** - * - */ -public class CoreUIService - implements HasLogger { - - public static final String JAR_PATTERN = "org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern"; - - public static final String CORE_UI_SERVER_HOST_DEFAULT = "0.0.0.0"; - public static final String CORE_UI_SERVER_PORT_DEFAULT = "8899"; - - public static final String CORE_UI_SERVER_HOST = "core-ui-server-host"; - public static final String CORE_UI_SERVER_PORT = "core-ui-server-port"; - - public Result jetty = failure("not initialised so far"); - - public void startupAndBlock() { - try { - startup(); - jetty.get() - .join(); -// jetty = Result.success(server); - } catch (Exception e) { - logger().warning(e.getLocalizedMessage()); - } - } - - public void startup() { - initServer(); - try { - jetty.get() - .start(); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * This will init the Server instance only - */ - - public void initServer() { - WebAppContext context = new WebAppContext(); - context.setLogUrlOnStart(true); - context.setConfigurationDiscovered(true); - context.setConfigurations(new Configuration[]{ - new AnnotationConfiguration(), new WebInfConfiguration(), new WebXmlConfiguration(), new MetaInfConfiguration() - }); - - context.setContextPath("/"); - Resource classPathResource = Resource.newClassPathResource("/META-INF/resources", true, true); - context.setBaseResource(classPathResource); - context.setAllowNullPathInfo(true); - context.setAttribute(JAR_PATTERN, ".*"); - - Server server = new Server(Integer.parseInt(getProperty(CORE_UI_SERVER_PORT, CORE_UI_SERVER_PORT_DEFAULT))); - server.setHandler(context); - jetty = Result.success(server); - } -} diff --git a/nano-jetty/src/main/java/org/vaadin/tutorial/nano/jetty/NanoVaadin.java b/nano-jetty/src/main/java/org/vaadin/tutorial/nano/jetty/NanoVaadin.java deleted file mode 100644 index 71214f0..0000000 --- a/nano-jetty/src/main/java/org/vaadin/tutorial/nano/jetty/NanoVaadin.java +++ /dev/null @@ -1,57 +0,0 @@ -/** - * Copyright © 2017 Sven Ruppert (sven.ruppert@gmail.com) - *

- * Licensed 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 org.vaadin.tutorial.nano.jetty; - -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.DefaultParser; -import org.apache.commons.cli.Options; -import org.apache.commons.cli.ParseException; - -import static java.lang.System.setProperty; - - -/** - * - */ -public class NanoVaadin { - private NanoVaadin() { - } - - public static final String APM = "apm"; - - public static final String CLI_HOST = "host"; - public static final String CLI_PORT = "port"; - - public static void main(String[] args) throws ParseException { - //init i18n - final Options options = new Options(); - options.addOption(CLI_HOST, true, "host to use"); - options.addOption(CLI_PORT, true, "port to use"); - options.addOption(APM, false, "activate APM on"); - - DefaultParser parser = new DefaultParser(); - CommandLine cmd = parser.parse(options, args); - - if (cmd.hasOption(CLI_HOST)) { - setProperty(CoreUIService.CORE_UI_SERVER_HOST, cmd.getOptionValue(CLI_HOST)); - } if (cmd.hasOption(CLI_PORT)) { - setProperty(CoreUIService.CORE_UI_SERVER_PORT, cmd.getOptionValue(CLI_PORT)); - } if(cmd.hasOption(APM)){ - //Stagemonitor.init(); - } - new CoreUIService().startupAndBlock(); - } -} diff --git a/nano-jetty/src/test/java/junit/org/vaadin/tutorial/nano/jetty/CoreUIServiceTest.java b/nano-jetty/src/test/java/junit/org/vaadin/tutorial/nano/jetty/CoreUIServiceTest.java deleted file mode 100644 index e28141c..0000000 --- a/nano-jetty/src/test/java/junit/org/vaadin/tutorial/nano/jetty/CoreUIServiceTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package junit.org.vaadin.tutorial.nano.jetty; - -import org.junit.jupiter.api.Test; -import org.vaadin.tutorial.nano.jetty.CoreUIService; - -public class CoreUIServiceTest { - - - @Test - void test001() throws Exception { - final CoreUIService service = new CoreUIService(); - service.initServer(); - - service.jetty.get().stop(); - - - } -} diff --git a/pom.xml b/pom.xml index 767fb6f..a4dd222 100644 --- a/pom.xml +++ b/pom.xml @@ -205,14 +205,16 @@ vaadin-dependencies-core 0.0.0-SNAPSHOT + org.vaadin-tutorials - vaadin-dependencies-nano-jetty + vaadin-dependencies-nano-jetty-junit5 0.0.0-SNAPSHOT + org.vaadin-tutorials - vaadin-dependencies-nano-jetty-junit5 + vaadin-dependencies-nano-undertow-junit5 0.0.0-SNAPSHOT @@ -354,6 +356,17 @@ 3.0.2 + + + org.rapidpm.vaadin + nano-vaadin-undertow + 01.00.02-RPM + + + org.rapidpm.vaadin + nano-vaadin-jetty + 01.00.01-RPM + @@ -534,7 +547,7 @@ core - nano-jetty + nano-undertow-junit5 nano-jetty-junit5 vaadin-v08 vaadin-v10 diff --git a/vaadin-v14/pom.xml b/vaadin-v14/pom.xml index ec22d68..91c057b 100644 --- a/vaadin-v14/pom.xml +++ b/vaadin-v14/pom.xml @@ -103,38 +103,41 @@ - + + org.rapidpm.vaadin + nano-vaadin-undertow + + + + org.vaadin-tutorials + vaadin-dependencies-core + + com.vaadin - - vaadin - - - - com.vaadin.webjar - * - - - org.webjars.bowergithub.insites - * - - - org.webjars.bowergithub.polymer - * - - - org.webjars.bowergithub.polymerelements - * - - - org.webjars.bowergithub.vaadin - * - - - org.webjars.bowergithub.webcomponents - * - - + flow-server + + + com.vaadin + flow-push + + + com.vaadin + flow-client + + + com.vaadin + flow-html-components + + + com.vaadin + flow-data + + + + + org.vaadin-tutorials + vaadin-dependencies-nano-undertow-junit5 @@ -159,6 +162,7 @@ ${vaadin-v14.version} + test-compile prepare-frontend build-frontend diff --git a/vaadin-vXX/pom.xml b/vaadin-vXX/pom.xml index c732963..e255d4e 100644 --- a/vaadin-vXX/pom.xml +++ b/vaadin-vXX/pom.xml @@ -100,39 +100,42 @@ - + + org.rapidpm.vaadin + nano-vaadin-undertow + + + + org.vaadin-tutorials + vaadin-dependencies-core + com.vaadin - - vaadin - - - - com.vaadin.webjar - * - - - org.webjars.bowergithub.insites - * - - - org.webjars.bowergithub.polymer - * - - - org.webjars.bowergithub.polymerelements - * - - - org.webjars.bowergithub.vaadin - * - - - org.webjars.bowergithub.webcomponents - * - - + flow-server + + com.vaadin + flow-push + + + com.vaadin + flow-client + + + com.vaadin + flow-html-components + + + com.vaadin + flow-data + + + + + org.vaadin-tutorials + vaadin-dependencies-nano-undertow-junit5 + + com.vaadin vaadin-testbench @@ -156,6 +159,7 @@ ${vaadin-vXX.version} + test-compile prepare-frontend build-frontend From 2e8b444bb0b267e299c0f429dfc4954abf87adbc Mon Sep 17 00:00:00 2001 From: Sven Ruppert Date: Wed, 16 Oct 2019 16:25:22 +0200 Subject: [PATCH 05/10] added nano undertow and junit5 extensions --- core/pom.xml | 2 +- deploy.sh | 2 +- docker-compose.yml | 4 +-- nano-jetty-junit5/pom.xml | 4 +-- nano-undertow-junit5/pom.xml | 4 +-- .../junit5/ServletContainerExtension.java | 2 +- pom.xml | 32 +++++++++---------- vaadin-v08/pom.xml | 4 +-- vaadin-v10/pom.xml | 2 +- vaadin-v14/pom.xml | 6 ++-- vaadin-vXX/pom.xml | 6 ++-- 11 files changed, 34 insertions(+), 34 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 76dcb56..8d0982c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> vaadin-dependencies - org.vaadin-tutorials + org.vaadintutorials 0.0.0-SNAPSHOT 4.0.0 diff --git a/deploy.sh b/deploy.sh index 3b6bea4..db990ac 100755 --- a/deploy.sh +++ b/deploy.sh @@ -15,5 +15,5 @@ # limitations under the License. # -docker rm deploy +docker rm deploy-vaadin-dependencies docker-compose up diff --git a/docker-compose.yml b/docker-compose.yml index 03806dd..f13d2a3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,8 +19,8 @@ version: '3.5' services: deploy: image: svenruppert/maven-3.6.1-adopt:1.8.212-04 - container_name: deploy - hostname: deploy + container_name: deploy-vaadin-dependencies + hostname: deploy-vaadin-dependencies volumes: - /var/run/docker.sock:/tmp/docker.sock:ro - $PWD/:/usr/src/mymaven diff --git a/nano-jetty-junit5/pom.xml b/nano-jetty-junit5/pom.xml index a338888..ae32bda 100644 --- a/nano-jetty-junit5/pom.xml +++ b/nano-jetty-junit5/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> vaadin-dependencies - org.vaadin-tutorials + org.vaadintutorials 0.0.0-SNAPSHOT 4.0.0 @@ -13,7 +13,7 @@ - org.vaadin-tutorials + org.vaadintutorials vaadin-dependencies-core compile diff --git a/nano-undertow-junit5/pom.xml b/nano-undertow-junit5/pom.xml index 6685239..9337b94 100644 --- a/nano-undertow-junit5/pom.xml +++ b/nano-undertow-junit5/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> vaadin-dependencies - org.vaadin-tutorials + org.vaadintutorials 0.0.0-SNAPSHOT 4.0.0 @@ -13,7 +13,7 @@ - org.vaadin-tutorials + org.vaadintutorials vaadin-dependencies-core compile diff --git a/nano-undertow-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/ServletContainerExtension.java b/nano-undertow-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/ServletContainerExtension.java index 8f4846f..b050656 100644 --- a/nano-undertow-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/ServletContainerExtension.java +++ b/nano-undertow-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/ServletContainerExtension.java @@ -21,7 +21,7 @@ public void beforeEach(ExtensionContext ctx) throws Exception { @Override public void afterEach(ExtensionContext ctx) throws Exception { ctx.getStore(ExtensionContext.Namespace.GLOBAL) - .get(CoreUIServiceJava.class.getSimpleName(), CoreUIServiceJava.class).jetty.ifPresent(server -> { + .get(CoreUIServiceJava.class.getSimpleName(), CoreUIServiceJava.class).undertow.ifPresent(server -> { try { server.stop(); } catch (Exception e) { diff --git a/pom.xml b/pom.xml index a4dd222..b01a9b8 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 4.0.0 - org.vaadin-tutorials + org.vaadintutorials vaadin-dependencies pom @@ -98,7 +98,7 @@ 2.12.1 0.8.4 - 1.4.9 + 1.4.10 0.9 org.vaadin.* junit.org.vaadin* @@ -106,14 +106,14 @@ 1.21 - 5.5.1 - 1.5.1 + 5.5.2 + 1.5.2 1.0.0-M5 0.33.0 7.1 - 1.12.1 + 1.12.2 8.8.6 @@ -201,19 +201,19 @@ - org.vaadin-tutorials + org.vaadintutorials vaadin-dependencies-core 0.0.0-SNAPSHOT - org.vaadin-tutorials + org.vaadintutorials vaadin-dependencies-nano-jetty-junit5 0.0.0-SNAPSHOT - org.vaadin-tutorials + org.vaadintutorials vaadin-dependencies-nano-undertow-junit5 0.0.0-SNAPSHOT @@ -235,13 +235,13 @@ net.oneandone.reflections8 reflections8 - 0.11.5 + 0.11.6 org.javassist javassist - 3.25.0-GA + 3.26.0-GA @@ -282,7 +282,7 @@ org.apache.commons commons-compress - 1.18 + 1.19 org.apache.commons @@ -297,17 +297,17 @@ org.apache.commons commons-vfs2 - 2.4 + 2.4.1 org.apache.httpcomponents httpclient - 4.5.9 + 4.5.10 org.apache.httpcomponents fluent-hc - 4.5.9 + 4.5.10 @@ -341,7 +341,7 @@ com.zaxxer HikariCP - 3.3.1 + 3.4.1 compile @@ -472,7 +472,7 @@ io.gatling.highcharts gatling-charts-highcharts - 3.2.0 + 3.2.1 test diff --git a/vaadin-v08/pom.xml b/vaadin-v08/pom.xml index 6533763..4dd4ef0 100644 --- a/vaadin-v08/pom.xml +++ b/vaadin-v08/pom.xml @@ -21,7 +21,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> vaadin-dependencies - org.vaadin-tutorials + org.vaadintutorials 0.0.0-SNAPSHOT 4.0.0 @@ -81,7 +81,7 @@ - org.vaadin-tutorials + org.vaadintutorials addon-test-helpers 2.1 test diff --git a/vaadin-v10/pom.xml b/vaadin-v10/pom.xml index 24e90f4..f8056a2 100644 --- a/vaadin-v10/pom.xml +++ b/vaadin-v10/pom.xml @@ -21,7 +21,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> vaadin-dependencies - org.vaadin-tutorials + org.vaadintutorials 0.0.0-SNAPSHOT 4.0.0 diff --git a/vaadin-v14/pom.xml b/vaadin-v14/pom.xml index 91c057b..8f9b36c 100644 --- a/vaadin-v14/pom.xml +++ b/vaadin-v14/pom.xml @@ -21,7 +21,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> vaadin-dependencies - org.vaadin-tutorials + org.vaadintutorials 0.0.0-SNAPSHOT 4.0.0 @@ -109,7 +109,7 @@ - org.vaadin-tutorials + org.vaadintutorials vaadin-dependencies-core @@ -136,7 +136,7 @@ - org.vaadin-tutorials + org.vaadintutorials vaadin-dependencies-nano-undertow-junit5 diff --git a/vaadin-vXX/pom.xml b/vaadin-vXX/pom.xml index e255d4e..c832116 100644 --- a/vaadin-vXX/pom.xml +++ b/vaadin-vXX/pom.xml @@ -21,7 +21,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> vaadin-dependencies - org.vaadin-tutorials + org.vaadintutorials 0.0.0-SNAPSHOT 4.0.0 @@ -106,7 +106,7 @@ - org.vaadin-tutorials + org.vaadintutorials vaadin-dependencies-core @@ -132,7 +132,7 @@ - org.vaadin-tutorials + org.vaadintutorials vaadin-dependencies-nano-undertow-junit5 From c0786776c71896a2358c75be7a89c17a11efc117 Mon Sep 17 00:00:00 2001 From: Sven Ruppert Date: Wed, 16 Oct 2019 16:37:48 +0200 Subject: [PATCH 06/10] added lic header --- core/pom.xml | 2 +- core/src/module-info.java | 2 +- deploy.sh | 2 +- docker-compose.yml | 2 +- docker_compile_locale.sh | 2 +- nano-jetty-junit5/pom.xml | 17 +++++++++++++++++ .../nano/junit5/ServletContainerExtension.java | 15 +++++++++++++++ .../tutorial/nano/junit5/VaadinTutorial.java | 15 +++++++++++++++ .../nano/junit5/WebDriverParameterResolver.java | 15 +++++++++++++++ .../nano/junit5/WebdriverExtension.java | 15 +++++++++++++++ .../src/test/java/demo/DemoAppServlet.java | 15 +++++++++++++++ .../jetty/junit5/VaadinTutorialTest.java | 15 +++++++++++++++ nano-undertow-junit5/pom.xml | 17 +++++++++++++++++ .../nano/junit5/ServletContainerExtension.java | 15 +++++++++++++++ .../tutorial/nano/junit5/VaadinTutorial.java | 15 +++++++++++++++ .../nano/junit5/WebDriverParameterResolver.java | 15 +++++++++++++++ .../nano/junit5/WebdriverExtension.java | 15 +++++++++++++++ pom.xml | 2 +- vaadin-v08/pom.xml | 2 +- vaadin-v10/pom.xml | 2 +- vaadin-v14/pom.xml | 2 +- vaadin-vXX/pom.xml | 2 +- 22 files changed, 194 insertions(+), 10 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 8d0982c..3d2bc28 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -1,7 +1,7 @@ diff --git a/nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/ServletContainerExtension.java b/nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/ServletContainerExtension.java index 8f4846f..24dc922 100644 --- a/nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/ServletContainerExtension.java +++ b/nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/ServletContainerExtension.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2019 Vaadin - Marketing Team - Developer Relations (devrel@vaadin.com) + * + * Licensed 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 org.vaadin.tutorial.nano.junit5; import org.junit.jupiter.api.extension.AfterEachCallback; diff --git a/nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/VaadinTutorial.java b/nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/VaadinTutorial.java index 48395d6..a012b6e 100644 --- a/nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/VaadinTutorial.java +++ b/nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/VaadinTutorial.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2019 Vaadin - Marketing Team - Developer Relations (devrel@vaadin.com) + * + * Licensed 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 org.vaadin.tutorial.nano.junit5; import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; diff --git a/nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/WebDriverParameterResolver.java b/nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/WebDriverParameterResolver.java index 1430b3c..d1d1f74 100644 --- a/nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/WebDriverParameterResolver.java +++ b/nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/WebDriverParameterResolver.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2019 Vaadin - Marketing Team - Developer Relations (devrel@vaadin.com) + * + * Licensed 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 org.vaadin.tutorial.nano.junit5; import org.junit.jupiter.api.extension.ExtensionContext; diff --git a/nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/WebdriverExtension.java b/nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/WebdriverExtension.java index b94785c..0097216 100644 --- a/nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/WebdriverExtension.java +++ b/nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/WebdriverExtension.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2019 Vaadin - Marketing Team - Developer Relations (devrel@vaadin.com) + * + * Licensed 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 org.vaadin.tutorial.nano.junit5; import org.junit.jupiter.api.extension.AfterEachCallback; diff --git a/nano-jetty-junit5/src/test/java/demo/DemoAppServlet.java b/nano-jetty-junit5/src/test/java/demo/DemoAppServlet.java index bba24af..0bd3deb 100644 --- a/nano-jetty-junit5/src/test/java/demo/DemoAppServlet.java +++ b/nano-jetty-junit5/src/test/java/demo/DemoAppServlet.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2019 Vaadin - Marketing Team - Developer Relations (devrel@vaadin.com) + * + * Licensed 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 demo; import javax.servlet.ServletException; diff --git a/nano-jetty-junit5/src/test/java/junit/org/vaadin/tutorialnano/jetty/junit5/VaadinTutorialTest.java b/nano-jetty-junit5/src/test/java/junit/org/vaadin/tutorialnano/jetty/junit5/VaadinTutorialTest.java index 9577923..978cc9e 100644 --- a/nano-jetty-junit5/src/test/java/junit/org/vaadin/tutorialnano/jetty/junit5/VaadinTutorialTest.java +++ b/nano-jetty-junit5/src/test/java/junit/org/vaadin/tutorialnano/jetty/junit5/VaadinTutorialTest.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2019 Vaadin - Marketing Team - Developer Relations (devrel@vaadin.com) + * + * Licensed 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 junit.org.vaadin.tutorialnano.jetty.junit5; import demo.DemoAppServlet; diff --git a/nano-undertow-junit5/pom.xml b/nano-undertow-junit5/pom.xml index 9337b94..dca80e3 100644 --- a/nano-undertow-junit5/pom.xml +++ b/nano-undertow-junit5/pom.xml @@ -1,4 +1,21 @@ + diff --git a/nano-undertow-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/ServletContainerExtension.java b/nano-undertow-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/ServletContainerExtension.java index b050656..03a7947 100644 --- a/nano-undertow-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/ServletContainerExtension.java +++ b/nano-undertow-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/ServletContainerExtension.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2019 Vaadin - Marketing Team - Developer Relations (devrel@vaadin.com) + * + * Licensed 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 org.vaadin.tutorial.nano.junit5; import org.junit.jupiter.api.extension.AfterEachCallback; diff --git a/nano-undertow-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/VaadinTutorial.java b/nano-undertow-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/VaadinTutorial.java index 48395d6..a012b6e 100644 --- a/nano-undertow-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/VaadinTutorial.java +++ b/nano-undertow-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/VaadinTutorial.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2019 Vaadin - Marketing Team - Developer Relations (devrel@vaadin.com) + * + * Licensed 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 org.vaadin.tutorial.nano.junit5; import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; diff --git a/nano-undertow-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/WebDriverParameterResolver.java b/nano-undertow-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/WebDriverParameterResolver.java index 1430b3c..d1d1f74 100644 --- a/nano-undertow-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/WebDriverParameterResolver.java +++ b/nano-undertow-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/WebDriverParameterResolver.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2019 Vaadin - Marketing Team - Developer Relations (devrel@vaadin.com) + * + * Licensed 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 org.vaadin.tutorial.nano.junit5; import org.junit.jupiter.api.extension.ExtensionContext; diff --git a/nano-undertow-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/WebdriverExtension.java b/nano-undertow-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/WebdriverExtension.java index b94785c..0097216 100644 --- a/nano-undertow-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/WebdriverExtension.java +++ b/nano-undertow-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/WebdriverExtension.java @@ -1,3 +1,18 @@ +/** + * Copyright © 2019 Vaadin - Marketing Team - Developer Relations (devrel@vaadin.com) + * + * Licensed 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 org.vaadin.tutorial.nano.junit5; import org.junit.jupiter.api.extension.AfterEachCallback; diff --git a/pom.xml b/pom.xml index b01a9b8..c5e13ad 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ - 0.0.0-SNAPSHOT + 2.0.0 2019 @@ -203,19 +203,19 @@ org.vaadintutorials vaadin-dependencies-core - 0.0.0-SNAPSHOT + 2.0.0 org.vaadintutorials vaadin-dependencies-nano-jetty-junit5 - 0.0.0-SNAPSHOT + 2.0.0 org.vaadintutorials vaadin-dependencies-nano-undertow-junit5 - 0.0.0-SNAPSHOT + 2.0.0 @@ -1018,6 +1018,10 @@ devrel@vaadin.com + package.json + package-lock.json + webpack.config.js + webpack.generated.js **/node/** **/node_modules/** **/*.iml diff --git a/vaadin-v08/pom.xml b/vaadin-v08/pom.xml index 3664150..1da1cb3 100644 --- a/vaadin-v08/pom.xml +++ b/vaadin-v08/pom.xml @@ -22,7 +22,7 @@ vaadin-dependencies org.vaadintutorials - 0.0.0-SNAPSHOT + 2.0.0 4.0.0 diff --git a/vaadin-v10/pom.xml b/vaadin-v10/pom.xml index c0229d7..8096047 100644 --- a/vaadin-v10/pom.xml +++ b/vaadin-v10/pom.xml @@ -22,7 +22,7 @@ vaadin-dependencies org.vaadintutorials - 0.0.0-SNAPSHOT + 2.0.0 4.0.0 vaadin-dependencies-v10 diff --git a/vaadin-v14/pom.xml b/vaadin-v14/pom.xml index b94cde5..c806b4a 100644 --- a/vaadin-v14/pom.xml +++ b/vaadin-v14/pom.xml @@ -22,7 +22,7 @@ vaadin-dependencies org.vaadintutorials - 0.0.0-SNAPSHOT + 2.0.0 4.0.0 pom diff --git a/vaadin-vXX/pom.xml b/vaadin-vXX/pom.xml index d2ca07d..e99e370 100644 --- a/vaadin-vXX/pom.xml +++ b/vaadin-vXX/pom.xml @@ -22,7 +22,7 @@ vaadin-dependencies org.vaadintutorials - 0.0.0-SNAPSHOT + 2.0.0 4.0.0 From 2dda987cad6c71a040fad24736292dbe28aa702f Mon Sep 17 00:00:00 2001 From: Sven Ruppert Date: Thu, 17 Oct 2019 10:39:44 +0200 Subject: [PATCH 08/10] prepare release/2.0.0 --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index c7308ed..7e94681 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ This project supports all LTS versions up from Vaadin8 and the current version. ### V8 (LTS) ```xml - com.github.vaadin-learning-center.vaadin-dependencies + org.vaadintutorials vaadin-dependencies-v08 XXXX @@ -43,7 +43,7 @@ This project supports all LTS versions up from Vaadin8 and the current version. ### V10 (LTS) ```xml - com.github.vaadin-learning-center.vaadin-dependencies + org.vaadintutorials vaadin-dependencies-v10 XXXX @@ -51,7 +51,7 @@ This project supports all LTS versions up from Vaadin8 and the current version. ### V14 (LTS) ```xml - com.github.vaadin-learning-center.vaadin-dependencies + org.vaadintutorials vaadin-dependencies-v14 XXXX @@ -59,7 +59,7 @@ This project supports all LTS versions up from Vaadin8 and the current version. ### Current ```xml - com.github.vaadin-learning-center.vaadin-dependencies + org.vaadintutorials vaadin-dependencies-vXX XXXX From 433792688ea574225ffa13af171ec948de7614ac Mon Sep 17 00:00:00 2001 From: Sven Ruppert Date: Thu, 17 Oct 2019 10:54:37 +0200 Subject: [PATCH 09/10] prepare release/2.0.0 --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 7e94681..5ba65b6 100644 --- a/README.md +++ b/README.md @@ -13,9 +13,7 @@ This project is a minimized version of [https://github.com/RapidPM/rapidpm-dependencies](https://github.com/RapidPM/rapidpm-dependencies) ## How to use -The dependency is distributed via -jitpack [https://jitpack.io/#vaadin-learning-center/vaadin-dependencies/](https://jitpack.io/#vaadin-learning-center/vaadin-dependencies/) - +The dependency is distributed via Bintray. Add first to repository coordinates to your **pom.xml** ```xml From 7a7c76760ffb1329efac26fe1b7751515b12b520 Mon Sep 17 00:00:00 2001 From: Sven Ruppert Date: Thu, 17 Oct 2019 11:41:05 +0200 Subject: [PATCH 10/10] prepare release/2.0.0 --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 5ba65b6..7bf556b 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,6 @@ #Parent POM for Vaadin Tutorials ## Current state -[![](https://jitpack.io/v/vaadin-learning-center/vaadin-dependencies.svg)](https://jitpack.io/#vaadin-learning-center/vaadin-dependencies) -[![](https://jitci.com/gh/vaadin-learning-center/vaadin-dependencies/svg)](https://jitci.com/gh/vaadin-learning-center/vaadin-dependencies) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)