From d8fa01fd1195defdd24b6d1c1eca2368df2718c7 Mon Sep 17 00:00:00 2001 From: Mikael Grankvist Date: Mon, 27 Dec 2021 15:23:27 +0200 Subject: [PATCH] 14.0.0-beta1 --- .gitignore | 7 +++++ TimeSelector-demo/pom.xml | 6 ++-- .../percepta/mgrankvi/TimeSelectorDemo.java | 8 ++--- TimeSelector/MANIFEST.MF | 6 ++++ TimeSelector/assembly/MANIFEST.MF | 9 +++--- TimeSelector/pom.xml | 30 +++++++++++++------ pom.xml | 4 +-- 7 files changed, 47 insertions(+), 23 deletions(-) create mode 100644 TimeSelector/MANIFEST.MF diff --git a/.gitignore b/.gitignore index 6ce748d..824d86d 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,10 @@ TimeSelector-demo/package-lock.json .vscode .project **/.classpath +TimeSelector-demo/frontend/generated +TimeSelector-demo/frontend/index.html +TimeSelector-demo/.npmrc +TimeSelector-demo/pnpmfile.js +TimeSelector-demo/pnpm-lock.yaml +TimeSelector-demo/tsconfig.json +TimeSelector-demo/types.d.ts diff --git a/TimeSelector-demo/pom.xml b/TimeSelector-demo/pom.xml index c360f1d..ce85a3a 100644 --- a/TimeSelector-demo/pom.xml +++ b/TimeSelector-demo/pom.xml @@ -4,9 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.percepta.mgrankvi + org.vaadin.addons.mgrankvi TimeSelector-root - 14.8.0-beta1 + 14.0.0-beta1 time-selector-demo @@ -19,7 +19,7 @@ - org.percepta.mgrankvi + ${project.groupId} TimeSelector ${project.version} diff --git a/TimeSelector-demo/src/main/java/org/percepta/mgrankvi/TimeSelectorDemo.java b/TimeSelector-demo/src/main/java/org/percepta/mgrankvi/TimeSelectorDemo.java index afaa688..f99cc1c 100644 --- a/TimeSelector-demo/src/main/java/org/percepta/mgrankvi/TimeSelectorDemo.java +++ b/TimeSelector-demo/src/main/java/org/percepta/mgrankvi/TimeSelectorDemo.java @@ -88,7 +88,7 @@ public TimeSelectorDemo() { minutes.addValueChangeListener(e -> Notification.show("Selected from minutes: " + minutes.getValue()) ); - Html minutesLabel = new Html("Sectors: 60
Values: 5,10,15,20,25,30,35,40,45,50,55,0
Note! 0 returns 60"); + Span minutesLabel = new Span("Sectors: 60\nValues: 5,10,15,20,25,30,35,40,45,50,55,0\nNote! 0 returns 60"); circles.add(new VerticalLayout(minutes, minutesLabel)); final CircleSelect fullDay = new CircleSelect(); @@ -97,8 +97,8 @@ public TimeSelectorDemo() { fullDay.setInnerValues(13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24); fullDay.setValue(18); fullDay.addValueChangeListener(e -> Notification.show("Selected from full day: " + fullDay.getValue())); - Html fullDayLabel = new Html("Sectors: 12
Values: 1,2,3,4,5,6,7,8,9,10,11,0
Inner values: 13,14,15,16,17,18,19,20,21,22,23,24" + - "
Note! values are returned the same as the labels."); + Span fullDayLabel = new Span("Sectors: 12\nValues: 1,2,3,4,5,6,7,8,9,10,11,0\nInner values: 13,14,15,16,17,18,19,20,21,22,23,24" + + "\nNote! values are returned the same as the labels."); circles.add(new VerticalLayout(fullDay, fullDayLabel)); final CircleSelect restricted = new CircleSelect(); @@ -106,7 +106,7 @@ public TimeSelectorDemo() { restricted.setSectors(4); restricted.addValueChangeListener(e -> Notification.show("Selected from restricted: " + restricted.getValue())); - Html restrictedLabel = new Html("Sectors: 4
Values: 15,30,45,0"); + Span restrictedLabel = new Span("Sectors: 4\nValues: 15,30,45,0"); circles.add(new VerticalLayout(restricted, restrictedLabel)); contentLayout.add(circles); diff --git a/TimeSelector/MANIFEST.MF b/TimeSelector/MANIFEST.MF new file mode 100644 index 0000000..f798110 --- /dev/null +++ b/TimeSelector/MANIFEST.MF @@ -0,0 +1,6 @@ +Manifest-Version: 1.0 +Vaadin-Package-Version: 1 +Vaadin-Addon: ${project.build.finalName}.${project.packaging} +Implementation-Vendor: ${organization.name} +Implementation-Title: ${project.name} +Implementation-Version: ${project.version} diff --git a/TimeSelector/assembly/MANIFEST.MF b/TimeSelector/assembly/MANIFEST.MF index 18464f5..f798110 100644 --- a/TimeSelector/assembly/MANIFEST.MF +++ b/TimeSelector/assembly/MANIFEST.MF @@ -1,7 +1,6 @@ Manifest-Version: 1.0 Vaadin-Package-Version: 1 -Vaadin-Addon: ${Vaadin-Addon} -Vaadin-License-Title: ${Vaadin-License-Title} -Implementation-Vendor: ${Implementation-Vendor-Id} -Implementation-Title: ${Implementation-Title} -Implementation-Version: ${Implementation-Version} +Vaadin-Addon: ${project.build.finalName}.${project.packaging} +Implementation-Vendor: ${organization.name} +Implementation-Title: ${project.name} +Implementation-Version: ${project.version} diff --git a/TimeSelector/pom.xml b/TimeSelector/pom.xml index fcce1b1..5b53635 100644 --- a/TimeSelector/pom.xml +++ b/TimeSelector/pom.xml @@ -4,9 +4,9 @@ 4.0.0 - org.percepta.mgrankvi + org.vaadin.addons.mgrankvi TimeSelector-root - 14.8.0-beta1 + 14.0.0-beta1 TimeSelector @@ -47,18 +47,17 @@ org.apache.maven.plugins maven-jar-plugin - 3.0.2 + 3.1.0 true - true - true + false + true + - 1 - ${Vaadin-License-Title} @@ -124,7 +123,7 @@ org.apache.maven.plugins maven-assembly-plugin - 2.6 + 3.1.0 false @@ -157,7 +156,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.10.4 + 3.0.1 attach-javadocs @@ -172,6 +171,19 @@ -Xdoclint:none + + org.apache.maven.plugins + maven-jar-plugin + 3.1.2 + + + + + META-INF/VAADIN/config/flow-build-info.json + + + + diff --git a/pom.xml b/pom.xml index 219303d..3adc15b 100644 --- a/pom.xml +++ b/pom.xml @@ -2,11 +2,11 @@ 4.0.0 - org.percepta.mgrankvi + org.vaadin.addons.mgrankvi TimeSelector-root pom TimeSelector Add-on Root Project - 14.8.0-beta1 + 14.0.0-beta1 14.8.0