14.0.0-beta1

caalador · Dec 27, 2021 · d8fa01f · d8fa01f
1 parent 007e1d3
commit d8fa01f
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 23 deletions.
diff --git 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
@@ -4,9 +4,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.percepta.mgrankvi</groupId>
+        <groupId>org.vaadin.addons.mgrankvi</groupId>
         <artifactId>TimeSelector-root</artifactId>
-        <version>14.8.0-beta1</version>
+        <version>14.0.0-beta1</version>
     </parent>
 
     <artifactId>time-selector-demo</artifactId>
@@ -19,7 +19,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.percepta.mgrankvi</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>TimeSelector</artifactId>
             <version>${project.version}</version>
         </dependency>

diff --git 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<br/>Values: 5,10,15,20,25,30,35,40,45,50,55,0<br/>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,16 +97,16 @@ 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<br/>Values: 1,2,3,4,5,6,7,8,9,10,11,0<br/>Inner values: 13,14,15,16,17,18,19,20,21,22,23,24" +
-                "<br/>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();
         restricted.setVisibleValues(15, 30, 45, 0);
         restricted.setSectors(4);
         restricted.addValueChangeListener(e -> Notification.show("Selected from restricted: " + restricted.getValue()));
 
-        Html restrictedLabel = new Html("Sectors: 4<br/>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
@@ -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
@@ -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
@@ -4,9 +4,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.percepta.mgrankvi</groupId>
+        <groupId>org.vaadin.addons.mgrankvi</groupId>
         <artifactId>TimeSelector-root</artifactId>
-        <version>14.8.0-beta1</version>
+        <version>14.0.0-beta1</version>
     </parent>
 
     <artifactId>TimeSelector</artifactId>
@@ -47,18 +47,17 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.0.2</version>
+                <version>3.1.0</version>
                 <configuration>
                     <archive>
                         <index>true</index>
                         <manifest>
-                            <addClasspath>true</addClasspath>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addClasspath>false</addClasspath>
+                            <addDefaultImplementationEntries>true
+                            </addDefaultImplementationEntries>
                         </manifest>
                         <manifestEntries>
-                            <!-- Package format version - do not change -->
                             <Vaadin-Package-Version>1</Vaadin-Package-Version>
-                            <Vaadin-License-Title>${Vaadin-License-Title}</Vaadin-License-Title>
                         </manifestEntries>
                     </archive>
                 </configuration>
@@ -124,7 +123,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-assembly-plugin</artifactId>
-                        <version>2.6</version>
+                        <version>3.1.0</version>
                         <configuration>
                             <appendAssemblyId>false</appendAssemblyId>
                             <descriptors>
@@ -157,7 +156,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.10.4</version>
+                        <version>3.0.1</version>
                         <executions>
                             <execution>
                                 <id>attach-javadocs</id>
@@ -172,6 +171,19 @@
                             <additionalparam>-Xdoclint:none</additionalparam>
                         </configuration>
                     </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-jar-plugin</artifactId>
+                        <version>3.1.2</version>
+                        <configuration>
+                            <!-- Generated file that shouldn't be included in add-ons -->
+                            <excludes>
+                                <exclude>
+                                    META-INF/VAADIN/config/flow-build-info.json
+                                </exclude>
+                            </excludes>
+                        </configuration>
+                    </plugin>
                 </plugins>
             </build>
         </profile>

diff --git a/pom.xml b/pom.xml
@@ -2,11 +2,11 @@
 <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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.percepta.mgrankvi</groupId>
+    <groupId>org.vaadin.addons.mgrankvi</groupId>
     <artifactId>TimeSelector-root</artifactId>
     <packaging>pom</packaging>
     <name>TimeSelector Add-on Root Project</name>
-    <version>14.8.0-beta1</version>
+    <version>14.0.0-beta1</version>
 
     <properties>
         <vaadin.version>14.8.0</vaadin.version>