Merge pull request #1 from vaadin-learning-center/release/2.0.0

Release/2.0.0

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)
 
 
@@ -13,16 +11,16 @@ 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
   <repositories>
     <repository>
-      <id>jitpack.io</id>
-      <url>https://jitpack.io</url>
+      <name>bintray</name>
+      <id>bintray-vaadin-tutorials-maven</id>
+      <url>https://dl.bintray.com/vaadin-tutorials/maven</url>
+      <snapshots><enabled>false</enabled></snapshots>
     </repository>
   </repositories>
 ```
@@ -33,31 +31,31 @@ This project supports all LTS versions up from Vaadin8 and the current version.
 ### V8 (LTS)
 ```xml
   <parent>
-    <groupId>com.github.vaadin-learning-center.vaadin-dependencies</groupId>
+    <groupId>org.vaadintutorials</groupId>
     <artifactId>vaadin-dependencies-v08</artifactId>
     <version>XXXX</version>
   </parent>
 ```
 ### V10 (LTS)
 ```xml
   <parent>
-    <groupId>com.github.vaadin-learning-center.vaadin-dependencies</groupId>
+    <groupId>org.vaadintutorials</groupId>
     <artifactId>vaadin-dependencies-v10</artifactId>
     <version>XXXX</version>
   </parent>
 ```
 ### V14 (LTS)
 ```xml
   <parent>
-    <groupId>com.github.vaadin-learning-center.vaadin-dependencies</groupId>
+    <groupId>org.vaadintutorials</groupId>
     <artifactId>vaadin-dependencies-v14</artifactId>
     <version>XXXX</version>
   </parent>
 ```
 ### Current 
 ```xml
   <parent>
-    <groupId>com.github.vaadin-learning-center.vaadin-dependencies</groupId>
+    <groupId>org.vaadintutorials</groupId>
     <artifactId>vaadin-dependencies-vXX</artifactId>
     <version>XXXX</version>
   </parent>
@@ -68,6 +66,12 @@ This project supports all LTS versions up from Vaadin8 and the current version.
 ### NEXT
 * TBD
 
+### 2.0.0
+* changed structure
+* switched to bintray repos
+* using nano-vaadin for jetty and undertow
+
+
 ### 1.0.6
 * added java-faker to scope test
 

core/pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright © 2013 Sven Ruppert (sven.ruppert@gmail.com)
+    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.
@@ -21,8 +21,8 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>vaadin-dependencies</artifactId>
-    <groupId>org.vaadin</groupId>
-    <version>0.0.0-SNAPSHOT</version>
+    <groupId>org.vaadintutorials</groupId>
+    <version>2.0.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

core/src/module-info.java

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2013 Sven Ruppert (sven.ruppert@gmail.com)
+ * 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.

deploy.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright © 2013 Sven Ruppert (sven.ruppert@gmail.com)
+# 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.
@@ -15,5 +15,5 @@
 # limitations under the License.
 #
 
-docker rm deploy
+docker rm deploy-vaadin-dependencies
 docker-compose up

docker-compose.yml

@@ -1,5 +1,5 @@
 #
-# Copyright © 2013 Sven Ruppert (sven.ruppert@gmail.com)
+# 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.
@@ -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

docker_compile_locale.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright © 2013 Sven Ruppert (sven.ruppert@gmail.com)
+# 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.

nano-jetty-junit5/pom.xml

@@ -1,26 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright © 2019 Vaadin - Marketing Team - Developer Relations ([email protected])
+
+    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.
+
+-->
 <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">
   <parent>
     <artifactId>vaadin-dependencies</artifactId>
-    <groupId>org.vaadin</groupId>
-    <version>0.0.0-SNAPSHOT</version>
+    <groupId>org.vaadintutorials</groupId>
+    <version>2.0.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>vaadin-dependencies-nano-jetty-junit5</artifactId>
 
   <dependencies>
     <dependency>
-      <groupId>org.vaadin</groupId>
+      <groupId>org.vaadintutorials</groupId>
       <artifactId>vaadin-dependencies-core</artifactId>
       <scope>compile</scope>
 
     </dependency>
+
     <dependency>
-      <groupId>org.vaadin</groupId>
-      <artifactId>vaadin-dependencies-nano-jetty</artifactId>
+      <groupId>org.rapidpm.vaadin</groupId>
+      <artifactId>nano-vaadin-jetty</artifactId>
       <scope>compile</scope>
     </dependency>
     <dependency>

nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/ServletContainerExtension.java

@@ -0,0 +1,47 @@
+/**
+ * Copyright © 2019 Vaadin - Marketing Team - Developer Relations ([email protected])
+ *
+ * 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;
+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();
+      }
+    });
+  }
+}

nano-jetty-junit5/src/main/java/org/vaadin/tutorial/nano/junit5/VaadinTutorial.java

@@ -0,0 +1,31 @@
+/**
+ * Copyright © 2019 Vaadin - Marketing Team - Developer Relations ([email protected])
+ *
+ * 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;
+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 { }