This is an automated email from the ASF dual-hosted git repository. struberg pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwebbeans-meecrowave-examples.git
commit 0bd68b239a79237c51c48890a1439d7889fc457f Author: Sven Ruppert <[email protected]> AuthorDate: Thu Mar 14 10:45:28 2019 +0100 version updates --- pom.xml | 1 + servlet-vaadin-v08/pom.xml | 2 +- servlet-vaadin-v10/pom.xml | 5 +- {servlet-vaadin-v10 => servlet-vaadin-vxx}/pom.xml | 58 +++------------------- .../servlet/vaadin/HelloVaadinVLatest.java | 41 +++++++++++++++ 5 files changed, 52 insertions(+), 55 deletions(-) diff --git a/pom.xml b/pom.xml index ca5d461..725e2f2 100644 --- a/pom.xml +++ b/pom.xml @@ -43,6 +43,7 @@ <module>mw_bundle_config</module> <module>servlet-vaadin-v08</module> <module>servlet-vaadin-v10</module> + <module>servlet-vaadin-vxx</module> <module>docker</module> </modules> diff --git a/servlet-vaadin-v08/pom.xml b/servlet-vaadin-v08/pom.xml index 8f56b32..d490ab6 100644 --- a/servlet-vaadin-v08/pom.xml +++ b/servlet-vaadin-v08/pom.xml @@ -28,7 +28,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>samples-servlet-vaadin-v08</artifactId> - <name>Servlet (Vaadin - V08)</name> + <name>Servlet (Vaadin - V08 (LTS))</name> <properties> <vaadin.version>8.7.0</vaadin.version> diff --git a/servlet-vaadin-v10/pom.xml b/servlet-vaadin-v10/pom.xml index cc75938..6363723 100644 --- a/servlet-vaadin-v10/pom.xml +++ b/servlet-vaadin-v10/pom.xml @@ -28,13 +28,12 @@ <modelVersion>4.0.0</modelVersion> <artifactId>samples-servlet-vaadin-v10</artifactId> - <name>Servlet (Vaadin - V10 / VXX)</name> + <name>Servlet (Vaadin - V10 (LTS))</name> <packaging>jar</packaging> <properties> <transpilation.output>${project.build.directory}/build</transpilation.output> - <!--<vaadin.version>10.0.1</vaadin.version>--> - <vaadin.version>12.0.5</vaadin.version> + <vaadin.version>10.0.11</vaadin.version> </properties> <pluginRepositories> diff --git a/servlet-vaadin-v10/pom.xml b/servlet-vaadin-vxx/pom.xml similarity index 53% copy from servlet-vaadin-v10/pom.xml copy to servlet-vaadin-vxx/pom.xml index cc75938..71d491b 100644 --- a/servlet-vaadin-v10/pom.xml +++ b/servlet-vaadin-vxx/pom.xml @@ -1,40 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- - 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. ---> -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="http://maven.apache.org/POM/4.0.0"; +<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> - <groupId>org.apache.meecrowave</groupId> <artifactId>meecrowave-examples</artifactId> + <groupId>org.apache.meecrowave</groupId> <version>1.2.7-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>samples-servlet-vaadin-v10</artifactId> - <name>Servlet (Vaadin - V10 / VXX)</name> + <artifactId>samples-servlet-vaadin-vxx</artifactId> + <name>Servlet (Vaadin - Latest)</name> <packaging>jar</packaging> <properties> - <transpilation.output>${project.build.directory}/build</transpilation.output> - <!--<vaadin.version>10.0.1</vaadin.version>--> - <vaadin.version>12.0.5</vaadin.version> + <vaadin.version>13.0.1</vaadin.version> </properties> <pluginRepositories> @@ -85,6 +65,7 @@ <groupId>com.vaadin</groupId> <artifactId>vaadin-core</artifactId> </dependency> + </dependencies> @@ -99,35 +80,10 @@ <artifactId>meecrowave-maven-plugin</artifactId> <version>${meecrowave.version}</version> </plugin> - - <plugin> - <groupId>com.vaadin</groupId> - <artifactId>vaadin-maven-plugin</artifactId> - <version>${vaadin.version}</version> - <executions> - <execution> - <goals> - <goal>copy-production-files</goal> - <goal>package-for-production</goal> - </goals> - <configuration> - <transpileOutputDirectory>${transpilation.output}</transpileOutputDirectory> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> <version>3.2.2</version> - <configuration> - <webResources> - <resource> - <directory>${transpilation.output}</directory> - </resource> - </webResources> - </configuration> </plugin> </plugins> </build> 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 new file mode 100644 index 0000000..99261c1 --- /dev/null +++ b/servlet-vaadin-vxx/src/main/java/com/superbiz/servlet/vaadin/HelloVaadinVLatest.java @@ -0,0 +1,41 @@ +/* + * 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 HelloVaadinVLatest extends Composite<Div> { + + 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); + + } +}
