Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore:update vaadin license #1579

Merged
merged 4 commits into from
Nov 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1,313 changes: 1,085 additions & 228 deletions LICENSE.txt

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ Please report bugs and submit feature requests as [GitHub issues](https://github

## License

This add-on is distributed under [CVDL 4.0](https://vaadin.com/license/cvdl-4.0).
This add-on is distributed under [Vaadin Commercial License and Service Terms](https://vaadin.com/commercial-license-and-service-terms).
36 changes: 32 additions & 4 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 All @@ -43,6 +42,7 @@
<slf4j.version>2.0.3</slf4j.version>
<failsafe.version>3.0.0-M7</failsafe.version>
<surefire.version>3.0.0-M7</surefire.version>
<currentYear>2022</currentYear>
</properties>
<modules>
<module>vaadin-testbench-bom</module>
Expand Down Expand Up @@ -77,7 +77,7 @@
<id>spring milestones</id>
<url>https://repo.spring.io/milestone</url>
</repository>

</repositories>
<pluginRepositories>
<pluginRepository>
Expand Down Expand Up @@ -119,5 +119,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.
36 changes: 2 additions & 34 deletions vaadin-testbench-core-junit5/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 @@ -135,37 +134,6 @@
</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-junit5/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) 2022 Vaadin Ltd
* Copyright (C) 2000-2022 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) 2022 Vaadin Ltd
* Copyright (C) 2000-2022 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) 2022 Vaadin Ltd
* Copyright (C) 2000-2022 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) 2022 Vaadin Ltd
* Copyright (C) 2000-2022 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) 2022 Vaadin Ltd
* Copyright (C) 2000-2022 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) 2022 Vaadin Ltd
* Copyright (C) 2000-2022 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) 2022 Vaadin Ltd
* Copyright (C) 2000-2022 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) 2022 Vaadin Ltd
* Copyright (C) 2000-2022 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.browser;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
/**
* Copyright (C) 2022 Vaadin Ltd
* Copyright (C) 2000-2022 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.browser;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
/**
* Copyright (C) 2022 Vaadin Ltd
* Copyright (C) 2000-2022 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.browser;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
/**
* Copyright (C) 2022 Vaadin Ltd
* Copyright (C) 2000-2022 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.browser;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
/**
* Copyright (C) 2000-2022 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.
*/
package com.vaadin.testbench.parallel;

import org.junit.platform.engine.ConfigurationParameters;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#
# Copyright (C) 2022 Vaadin Ltd
# Copyright (C) 2000-2022 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.
#

testbench.version=${version}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
/**
* Copyright (C) 2022 Vaadin Ltd
* Copyright (C) 2000-2022 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) 2022 Vaadin Ltd
* Copyright (C) 2000-2022 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) 2022 Vaadin Ltd
* Copyright (C) 2000-2022 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