Skip to content

Commit 4325dc1

Browse files
jcgueriaud1jcgueriaud1
authored
Merge pull request #13 from vaadin-component-factory/feature/fix_js_error
Bump the version of the webomponent and fix the header
2 parents 1ae806e + 5afe154 commit 4325dc1

File tree

5 files changed

+38
-57
lines changed

5 files changed

+38
-57
lines changed

‎.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,8 @@ vaadin-crud-flow-integration-tests/error-screenshots/
66
**/build-tools/node_modules
77
**/package-lock.json
88
**/bower_components/
9+
10+
# The following files are generated/updated by flow-maven-plugin
11+
package*.json
12+
webpack.*.js
13+
node_modules/

‎autocomplete-demo/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<groupId>com.vaadin.componentfactory</groupId>
77
<artifactId>autocomplete-demo</artifactId>
88
<packaging>war</packaging>
9-
<version>2.3.1</version>
9+
<version>2.3.2</version>
1010
<name>Autocomplete Demo</name>
1111
<inceptionYear>2018</inceptionYear>
1212

@@ -17,8 +17,8 @@
1717

1818
<properties>
1919
<failOnMissingWebXml>false</failOnMissingWebXml>
20-
<vaadin.version>14.4.1</vaadin.version>
21-
<flow.version>2.4.0</flow.version>
20+
<vaadin.version>14.6.3</vaadin.version>
21+
<flow.version>2.6.3</flow.version>
2222
<testbench.version>6.0.1</testbench.version>
2323
<maven.compiler.source>1.8</maven.compiler.source>
2424
<maven.compiler.target>1.8</maven.compiler.target>

‎autocomplete/pom.xml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,20 @@
66
<groupId>com.vaadin.componentfactory</groupId>
77
<artifactId>autocomplete</artifactId>
88
<packaging>jar</packaging>
9-
<version>2.3.1</version>
9+
<version>2.3.2</version>
1010

1111
<name>Autocomplete</name>
1212

1313
<inceptionYear>2018</inceptionYear>
1414
<organization>
1515
<name>Vaadin Ltd</name>
16-
<url>http://vaadin.com/</url>
16+
<url>https://vaadin.com/</url>
1717
</organization>
1818

1919

2020
<properties>
2121
<jetty.plugin.version>9.4.11.v20180605</jetty.plugin.version>
22-
<powermock.version>1.7.1</powermock.version>
23-
<vaadin.version>14.4.1</vaadin.version>
24-
<flow.version>2.4.0</flow.version>
25-
<testbench.version>6.0.1</testbench.version>
22+
<vaadin.version>14.6.3</vaadin.version>
2623
<maven.compiler.source>1.8</maven.compiler.source>
2724
<maven.compiler.target>1.8</maven.compiler.target>
2825
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

‎autocomplete/src/main/java/com/vaadin/componentfactory/Autocomplete.java

Lines changed: 23 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,38 @@
11
package com.vaadin.componentfactory;
22

3-
import java.util.Collection;
3+
import com.vaadin.componentfactory.Autocomplete.AutocompleteValueAppliedEvent;
4+
import com.vaadin.flow.component.*;
5+
import com.vaadin.flow.component.dependency.JsModule;
6+
import com.vaadin.flow.component.dependency.NpmPackage;
7+
import com.vaadin.flow.component.polymertemplate.EventHandler;
8+
import com.vaadin.flow.component.polymertemplate.Id;
9+
import com.vaadin.flow.component.polymertemplate.PolymerTemplate;
10+
import com.vaadin.flow.component.textfield.TextField;
11+
import com.vaadin.flow.shared.Registration;
12+
import com.vaadin.flow.templatemodel.TemplateModel;
13+
14+
import java.util.List;
415

516
/*
617
* #%L
718
* VCF Autocomplete for Vaadin 10
819
* %%
9-
* Copyright (C) 2017 - 2018 Vaadin Ltd
20+
* Copyright (C) 2021 Vaadin Ltd
1021
* %%
11-
* This program is available under Commercial Vaadin Add-On License 3.0
12-
* (CVALv3).
22+
* Licensed under the Apache License, Version 2.0 (the "License");
23+
* you may not use this file except in compliance with the License.
24+
* You may obtain a copy of the License at
1325
*
14-
* See the file license.html distributed with this software for more
15-
* information about licensing.
26+
* http://www.apache.org/licenses/LICENSE-2.0
1627
*
17-
* You should have received a copy of the CVALv3 along with this program.
18-
* If not, see <http://vaadin.com/license/cval-3>.
28+
* Unless required by applicable law or agreed to in writing, software
29+
* distributed under the License is distributed on an "AS IS" BASIS,
30+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
31+
* See the License for the specific language governing permissions and
32+
* limitations under the License.
1933
* #L%
2034
*/
2135

22-
import java.util.List;
23-
24-
import com.vaadin.flow.component.ComponentEvent;
25-
import com.vaadin.flow.component.ComponentEventListener;
26-
import com.vaadin.flow.component.DomEvent;
27-
import com.vaadin.flow.component.EventData;
28-
import com.vaadin.flow.component.Focusable;
29-
import com.vaadin.flow.component.HasSize;
30-
import com.vaadin.flow.component.HasTheme;
31-
import com.vaadin.flow.component.HasValidation;
32-
import com.vaadin.flow.component.HasValue;
33-
import com.vaadin.flow.component.Key;
34-
import com.vaadin.flow.component.KeyModifier;
35-
import com.vaadin.flow.component.ShortcutRegistration;
36-
import com.vaadin.flow.component.Synchronize;
37-
import com.vaadin.flow.component.Tag;
38-
import com.vaadin.flow.component.dependency.HtmlImport;
39-
import com.vaadin.flow.component.dependency.JsModule;
40-
import com.vaadin.flow.component.dependency.NpmPackage;
41-
import com.vaadin.flow.component.polymertemplate.EventHandler;
42-
import com.vaadin.flow.component.polymertemplate.Id;
43-
import com.vaadin.flow.component.polymertemplate.PolymerTemplate;
44-
import com.vaadin.flow.component.textfield.TextField;
45-
import com.vaadin.flow.shared.Registration;
46-
import com.vaadin.flow.templatemodel.TemplateModel;
47-
import com.vaadin.componentfactory.Autocomplete.AutocompleteValueAppliedEvent;
48-
4936
/**
5037
* Server-side component for the <code>vcf-autocomplete</code> element.
5138
* <p>
@@ -55,7 +42,7 @@
5542
* @author Vaadin Ltd
5643
*/
5744
@Tag("vcf-autocomplete")
58-
@NpmPackage(value = "@vaadin-component-factory/vcf-autocomplete", version = "1.2.7")
45+
@NpmPackage(value = "@vaadin-component-factory/vcf-autocomplete", version = "1.2.8")
5946
@JsModule("@vaadin-component-factory/vcf-autocomplete/src/vcf-autocomplete.js")
6047
public class Autocomplete extends
6148
PolymerTemplate<Autocomplete.AutocompleteTemplateModel> implements

‎pom.xml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<groupId>com.vaadin.componentfactory</groupId>
77
<artifactId>autocomplete-root</artifactId>
88
<packaging>pom</packaging>
9-
<version>2.3.1</version>
9+
<version>2.3.2</version>
1010
<name>Autocomplete Root</name>
1111
<inceptionYear>2018</inceptionYear>
1212
<organization>
@@ -15,9 +15,7 @@
1515
</organization>
1616

1717
<properties>
18-
<vaadin.version>14.4.1</vaadin.version>
19-
<flow.version>2.4.0</flow.version>
20-
<testbench.version>6.0.1</testbench.version>
18+
<vaadin.version>14.6.3</vaadin.version>
2119
<maven.compiler.source>1.8</maven.compiler.source>
2220
<maven.compiler.target>1.8</maven.compiler.target>
2321
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -32,21 +30,15 @@
3230
<repositories>
3331
<repository>
3432
<id>vaadin-prereleases</id>
35-
<url>http://maven.vaadin.com/vaadin-prereleases</url>
33+
<url>https://maven.vaadin.com/vaadin-prereleases</url>
3634
</repository>
3735
</repositories>
3836

3937
<pluginRepositories>
4038
<pluginRepository>
4139
<id>vaadin-prereleases</id>
42-
<url>http://maven.vaadin.com/vaadin-prereleases</url>
40+
<url>https://maven.vaadin.com/vaadin-prereleases</url>
4341
</pluginRepository>
4442
</pluginRepositories>
4543

46-
<licenses>
47-
<license>
48-
<name>CVALv3</name>
49-
<url>https://vaadin.com/license/cval-3</url>
50-
</license>
51-
</licenses>
5244
</project>

0 commit comments

Comments
 (0)