Skip to content
This repository has been archived by the owner on Jun 7, 2021. It is now read-only.

Commit

Permalink
vaadin version updates, added next Vaadin LTS demo (V14)
Browse files Browse the repository at this point in the history
  • Loading branch information
@svenruppert
svenruppert committed Jun 20, 2019
1 parent d8d81f5 commit 8c263db
Show file tree
Hide file tree
Showing 7 changed files with 225 additions and 7 deletions.
57 changes: 55 additions & 2 deletions jaxrs/kotlin/pom.xml
View file
Expand Up @@ -22,10 +22,12 @@
<packaging>war</packaging>

<properties>
<kotlin.version>1.0.0-beta-4589</kotlin.version>
<kotlin.version>1.3.40</kotlin.version>
</properties>

<build>
<sourceDirectory>src/main/kotlin</sourceDirectory>
<testSourceDirectory>src/it/java</testSourceDirectory>
<plugins>
<plugin>
<groupId>io.thorntail</groupId>
Expand Down Expand Up @@ -55,6 +57,51 @@
</sourceDirs>
</configuration>
</execution>
<execution>
<id>compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>test-compile</id>
<phase>test-compile</phase>
<goals>
<goal>test-compile</goal>
</goals>
</execution>
</executions>
<configuration>
<jvmTarget>1.8</jvmTarget>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
<id>default-compile</id>
<phase>none</phase>
</execution>
<execution>
<id>default-testCompile</id>
<phase>none</phase>
</execution>
<execution>
<id>compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>testCompile</id>
<phase>test-compile</phase>
<goals>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
Expand All @@ -71,8 +118,14 @@
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
<version>${kotlin.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test</artifactId>
<version>${kotlin.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
1 change: 1 addition & 0 deletions vaadin/pom.xml
View file
Expand Up @@ -20,6 +20,7 @@
<modules>
<module>vaadin08</module>
<module>vaadin10</module>
<module>vaadin14</module>
</modules>

</project>
2 changes: 1 addition & 1 deletion vaadin/vaadin08/pom.xml
View file
Expand Up @@ -51,7 +51,7 @@
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-bom</artifactId>
<version>8.6.3</version>
<version>8.8.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
6 changes: 3 additions & 3 deletions vaadin/vaadin10/pom.xml
View file
Expand Up @@ -11,7 +11,7 @@

<artifactId>example-vaadin-10</artifactId>

<name>Thorntail Examples: CDI and Vaadin 10</name>
<name>Thorntail Examples: CDI and Vaadin 10 (LTS)</name>
<description>Thorntail Examples: CDI and Vaadin 10</description>

<packaging>war</packaging>
Expand Down Expand Up @@ -46,7 +46,7 @@
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-bom</artifactId>
<version>12.0.3</version>
<version>10.0.16</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -84,7 +84,7 @@
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
<version>1.2</version>
<version>2.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
117 changes: 117 additions & 0 deletions vaadin/vaadin14/pom.xml
View file
@@ -0,0 +1,117 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>examples-vaadin</artifactId>
<groupId>io.thorntail.examples</groupId>
<version>2.4.1.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>example-vaadin-14</artifactId>
<name>Thorntail Examples: CDI and Vaadin 14 (LTS)</name>
<description>Thorntail Examples: CDI and Vaadin 14</description>

<packaging>war</packaging>

<repositories>
<!-- Repository used by many Vaadin add-ons -->
<repository>
<id>Vaadin Directory</id>
<url>http://maven.vaadin.com/vaadin-addons</url>
</repository>
<!-- Repository needed for prerelease versions of Vaadin -->
<repository>
<id>Vaadin - Prereleases</id>
<url>https://maven.vaadin.com/vaadin-prereleases</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>

<pluginRepositories>
<!-- Repository needed for prerelease versions of Vaadin -->
<pluginRepository>
<id>Vaadin - Prereleases</id>
<url>https://maven.vaadin.com/vaadin-prereleases</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
<build>
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
<plugin>
<groupId>io.thorntail</groupId>
<artifactId>thorntail-maven-plugin</artifactId>
<executions>
<execution>
<id>package</id>
</execution>
<execution>
<id>start</id>
</execution>
<execution>
<id>stop</id>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-bom</artifactId>
<version>14.0.0.rc1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>

<!-- Wildfly Swarm Fractions -->
<dependency>
<groupId>io.thorntail</groupId>
<artifactId>jaxrs</artifactId>
</dependency>
<dependency>
<groupId>io.thorntail</groupId>
<artifactId>cdi</artifactId>
</dependency>
<dependency>
<groupId>io.thorntail</groupId>
<artifactId>undertow</artifactId>
</dependency>


<dependency>
<groupId>io.thorntail.examples</groupId>
<artifactId>examples-base</artifactId>
</dependency>

<!--Vaadin related -->
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin</artifactId>
</dependency>

<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
<version>2.0</version>
<scope>provided</scope>
</dependency>
</dependencies>

</project>
47 changes: 47 additions & 0 deletions vaadin/vaadin14/src/main/java/org/wildfly/swarm/examples/vaadin/VaadinUI.java
View file
@@ -0,0 +1,47 @@
package org.wildfly.swarm.examples.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.notification.Notification;
import com.vaadin.flow.component.orderedlayout.VerticalLayout;
import com.vaadin.flow.router.Route;
import com.vaadin.flow.theme.Theme;
import com.vaadin.flow.theme.lumo.Lumo;


/**
* @author Sven Ruppert
*/

@Route("")
@Theme(value = Lumo.class, variant = Lumo.DARK)
public class VaadinUI
extends Composite<Div> {

public VaadinUI() {
getContent()
.add(new Button() {
{
setText("click me!");
addClickListener(event -> {
final Notification notification = new Notification();
notification.add(
new VerticalLayout(
new Label("Hello, I am a notification with components!"),
new Button() {
{
setText("Bye!");
addClickListener(e -> notification.close());
}
}
));
notification.setPosition(Notification.Position.MIDDLE);
notification.open();
});
}
}
);
}
}
2 changes: 1 addition & 1 deletion versionBump.sh
View file
@@ -1,6 +1,6 @@
#!/bin/sh

# Use this script to bump the version accross all POMs.
# Use this script to bump the version across all POMs.

PROGNAME=`basename "$0"`

Expand Down

0 comments on commit 8c263db

Please sign in to comment.