Skip to content

Commit

Permalink
chore: Update vaadin license (#1579) (CP: 8.2)
Browse files Browse the repository at this point in the history
  • Loading branch information
ZheSun88 authored and mshabarov committed Nov 30, 2022
1 parent fd2a566 commit b02cc73
Show file tree
Hide file tree
Showing 296 changed files with 2,534 additions and 1,913 deletions.
1,313 changes: 1,085 additions & 228 deletions LICENSE.txt

Large diffs are not rendered by default.

33 changes: 30 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,8 @@
</issueManagement>
<licenses>
<license>
<name>Commercial Vaadin Developer License version 4.0</name>
<url>https://vaadin.com/license/cvdl-4.0</url>
<distribution>manual</distribution>
<name>Vaadin Commercial License and Service Terms</name>
<url>https://vaadin.com/commercial-license-and-service-terms</url>
</license>
</licenses>
<properties>
Expand Down Expand Up @@ -104,5 +103,33 @@
</configuration>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>2.6</version>
<configuration>
<header>src/license/vclst/header.txt</header>
<quiet>false</quiet>
<failIfMissing>true</failIfMissing>
<aggregate>false</aggregate>
<useDefaultExcludes>true</useDefaultExcludes>
<useDefaultMapping>true</useDefaultMapping>
<encoding>UTF-8</encoding>
<properties>
<year>${currentYear}</year>
</properties>
<excludes>
<exclude>target/**</exclude>
<exclude>**/*.xml</exclude>
<exclude>**/*.properties</exclude>
<exclude>src/license/**/*</exclude>
<exclude>**/*.txt</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>
6 changes: 6 additions & 0 deletions src/license/vclst/header.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Copyright (C) 2000-${year} Vaadin Ltd

This program is available under Vaadin Commercial License and Service Terms.

See <https://vaadin.com/commercial-license-and-service-terms> for the full
license.
43 changes: 6 additions & 37 deletions vaadin-testbench-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@

<licenses>
<license>
<name>Commercial Vaadin Developer License version 4.0</name>
<url>https://vaadin.com/license/cvdl-4.0</url>
<distribution>manual</distribution>
<name>Vaadin Commercial License and Service Terms</name>
<url>https://vaadin.com/commercial-license-and-service-terms</url>
</license>
</licenses>

Expand Down Expand Up @@ -57,18 +56,18 @@
<index>true</index>
<manifest>
<addClasspath>true</addClasspath>
<!-- Implementation-Title and Implementation-Version
<!-- Implementation-Title and Implementation-Version
come from the POM by default -->
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
<manifestEntries>
<!-- Package format version - do not
<!-- Package format version - do not
change -->
<Vaadin-Package-Version>1</Vaadin-Package-Version>
</manifestEntries>
</archive>
<excludes>
<!-- Remove resources included due to gwt
<!-- Remove resources included due to gwt
compilation -->
<exclude>**/demoandtestapp/*</exclude>
</excludes>
Expand Down Expand Up @@ -130,37 +129,7 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>2.6</version>
<configuration>
<basedir>${basedir}</basedir>
<header>${basedir}/src/license/cvdl4/header.txt</header>
<quiet>false</quiet>
<failIfMissing>true</failIfMissing>
<aggregate>false</aggregate>
<useDefaultExcludes>true</useDefaultExcludes>
<useDefaultMapping>true</useDefaultMapping>
<encoding>UTF-8</encoding>
<properties>
<year>${project.inceptionYear}</year>
</properties>
<excludes>
<exclude>target/**</exclude>
<exclude>**/*.xml</exclude>
<exclude>src/license/**/*</exclude>
<exclude>**/*.txt</exclude>
</excludes>
</configuration>
<executions>
<execution>
<goals>
<goal>format</goal>
</goals>
</execution>
</executions>
</plugin>

</plugins>
</build>
<dependencyManagement>
Expand Down
7 changes: 0 additions & 7 deletions vaadin-testbench-core/src/license/cvdl4/header.txt

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
/**
* Copyright (C) 2020 Vaadin Ltd
* Copyright (C) 2000-${year} Vaadin Ltd
*
* This program is available under Commercial Vaadin Developer License
* 4.0 (CVDLv4).
* This program is available under Vaadin Commercial License and Service Terms.
*
*
* For the full License, see <https://vaadin.com/license/cvdl-4.0>.
* See <https://vaadin.com/commercial-license-and-service-terms> for the full
* license.
*/
package com.vaadin.testbench;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
/**
* Copyright (C) 2020 Vaadin Ltd
* Copyright (C) 2000-${year} Vaadin Ltd
*
* This program is available under Commercial Vaadin Developer License
* 4.0 (CVDLv4).
* This program is available under Vaadin Commercial License and Service Terms.
*
*
* For the full License, see <https://vaadin.com/license/cvdl-4.0>.
* See <https://vaadin.com/commercial-license-and-service-terms> for the full
* license.
*/
package com.vaadin.testbench;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
/**
* Copyright (C) 2020 Vaadin Ltd
* Copyright (C) 2000-${year} Vaadin Ltd
*
* This program is available under Commercial Vaadin Developer License
* 4.0 (CVDLv4).
* This program is available under Vaadin Commercial License and Service Terms.
*
*
* For the full License, see <https://vaadin.com/license/cvdl-4.0>.
* See <https://vaadin.com/commercial-license-and-service-terms> for the full
* license.
*/
package com.vaadin.testbench;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
/**
* Copyright (C) 2020 Vaadin Ltd
* Copyright (C) 2000-${year} Vaadin Ltd
*
* This program is available under Commercial Vaadin Developer License
* 4.0 (CVDLv4).
* This program is available under Vaadin Commercial License and Service Terms.
*
*
* For the full License, see <https://vaadin.com/license/cvdl-4.0>.
* See <https://vaadin.com/commercial-license-and-service-terms> for the full
* license.
*/
package com.vaadin.testbench;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
/**
* Copyright (C) 2020 Vaadin Ltd
* Copyright (C) 2000-${year} Vaadin Ltd
*
* This program is available under Commercial Vaadin Developer License
* 4.0 (CVDLv4).
* This program is available under Vaadin Commercial License and Service Terms.
*
*
* For the full License, see <https://vaadin.com/license/cvdl-4.0>.
* See <https://vaadin.com/commercial-license-and-service-terms> for the full
* license.
*/
package com.vaadin.testbench;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
/**
* Copyright (C) 2020 Vaadin Ltd
* Copyright (C) 2000-${year} Vaadin Ltd
*
* This program is available under Commercial Vaadin Developer License
* 4.0 (CVDLv4).
* This program is available under Vaadin Commercial License and Service Terms.
*
*
* For the full License, see <https://vaadin.com/license/cvdl-4.0>.
* See <https://vaadin.com/commercial-license-and-service-terms> for the full
* license.
*/
package com.vaadin.testbench;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
/**
* Copyright (C) 2020 Vaadin Ltd
* Copyright (C) 2000-${year} Vaadin Ltd
*
* This program is available under Commercial Vaadin Developer License
* 4.0 (CVDLv4).
* This program is available under Vaadin Commercial License and Service Terms.
*
*
* For the full License, see <https://vaadin.com/license/cvdl-4.0>.
* See <https://vaadin.com/commercial-license-and-service-terms> for the full
* license.
*/
package com.vaadin.testbench;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
/**
* Copyright (C) 2020 Vaadin Ltd
* Copyright (C) 2000-${year} Vaadin Ltd
*
* This program is available under Commercial Vaadin Developer License
* 4.0 (CVDLv4).
* This program is available under Vaadin Commercial License and Service Terms.
*
*
* For the full License, see <https://vaadin.com/license/cvdl-4.0>.
* See <https://vaadin.com/commercial-license-and-service-terms> for the full
* license.
*/
package com.vaadin.testbench;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
/**
* Copyright (C) 2020 Vaadin Ltd
* Copyright (C) 2000-${year} Vaadin Ltd
*
* This program is available under Commercial Vaadin Developer License
* 4.0 (CVDLv4).
* This program is available under Vaadin Commercial License and Service Terms.
*
*
* For the full License, see <https://vaadin.com/license/cvdl-4.0>.
* See <https://vaadin.com/commercial-license-and-service-terms> for the full
* license.
*/
package com.vaadin.testbench;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
/**
* Copyright (C) 2020 Vaadin Ltd
* Copyright (C) 2000-${year} Vaadin Ltd
*
* This program is available under Commercial Vaadin Developer License
* 4.0 (CVDLv4).
* This program is available under Vaadin Commercial License and Service Terms.
*
*
* For the full License, see <https://vaadin.com/license/cvdl-4.0>.
* See <https://vaadin.com/commercial-license-and-service-terms> for the full
* license.
*/
package com.vaadin.testbench;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
/**
* Copyright (C) 2020 Vaadin Ltd
* Copyright (C) 2000-${year} Vaadin Ltd
*
* This program is available under Commercial Vaadin Developer License
* 4.0 (CVDLv4).
* This program is available under Vaadin Commercial License and Service Terms.
*
*
* For the full License, see <https://vaadin.com/license/cvdl-4.0>.
* See <https://vaadin.com/commercial-license-and-service-terms> for the full
* license.
*/
package com.vaadin.testbench;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
/**
* Copyright (C) 2020 Vaadin Ltd
* Copyright (C) 2000-${year} Vaadin Ltd
*
* This program is available under Commercial Vaadin Developer License
* 4.0 (CVDLv4).
* This program is available under Vaadin Commercial License and Service Terms.
*
*
* For the full License, see <https://vaadin.com/license/cvdl-4.0>.
* See <https://vaadin.com/commercial-license-and-service-terms> for the full
* license.
*/
package com.vaadin.testbench;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
/**
* Copyright (C) 2020 Vaadin Ltd
* Copyright (C) 2000-${year} Vaadin Ltd
*
* This program is available under Commercial Vaadin Developer License
* 4.0 (CVDLv4).
* This program is available under Vaadin Commercial License and Service Terms.
*
*
* For the full License, see <https://vaadin.com/license/cvdl-4.0>.
* See <https://vaadin.com/commercial-license-and-service-terms> for the full
* license.
*/
package com.vaadin.testbench;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
/**
* Copyright (C) 2020 Vaadin Ltd
* Copyright (C) 2000-${year} Vaadin Ltd
*
* This program is available under Commercial Vaadin Developer License
* 4.0 (CVDLv4).
* This program is available under Vaadin Commercial License and Service Terms.
*
*
* For the full License, see <https://vaadin.com/license/cvdl-4.0>.
* See <https://vaadin.com/commercial-license-and-service-terms> for the full
* license.
*/
package com.vaadin.testbench;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
/**
* Copyright (C) 2020 Vaadin Ltd
* Copyright (C) 2000-${year} Vaadin Ltd
*
* This program is available under Commercial Vaadin Developer License
* 4.0 (CVDLv4).
* This program is available under Vaadin Commercial License and Service Terms.
*
*
* For the full License, see <https://vaadin.com/license/cvdl-4.0>.
* See <https://vaadin.com/commercial-license-and-service-terms> for the full
* license.
*/
package com.vaadin.testbench;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
/**
* Copyright (C) 2020 Vaadin Ltd
* Copyright (C) 2000-${year} Vaadin Ltd
*
* This program is available under Commercial Vaadin Developer License
* 4.0 (CVDLv4).
* This program is available under Vaadin Commercial License and Service Terms.
*
*
* For the full License, see <https://vaadin.com/license/cvdl-4.0>.
* See <https://vaadin.com/commercial-license-and-service-terms> for the full
* license.
*/
package com.vaadin.testbench;

Expand Down
Loading

0 comments on commit b02cc73

Please sign in to comment.