vaadin · Ansku · Apr 8, 2024 · Mar 28, 2024 · Mar 28, 2024 · Mar 28, 2024
diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,9 @@
 .settings
 .idea
 *.iml
+/target/
 */target/
+vaadin-testbench-core/error-screenshots
 vaadin-testbench-standalone/dependency-reduced-pom.xml
 vaadin-testbench-recorder/selenium-extensions/core/user-extensions.js
 vaadin-testbench-recorder/chrome/content/selenium/scripts/selenium-api.js

diff --git a/README.md b/README.md
@@ -20,4 +20,4 @@ Please report bugs and submit feature requests as [GitHub issues](https://github
 
 ## License
 
-This add-on is distributed under [CVAL 3.0](https://vaadin.com/license/cval-3).
+This add-on is distributed under [VCL](https://vaadin.com/commercial-license-and-service-terms).
diff --git a/doc/license.html b/doc/license.html
@@ -105,9 +105,8 @@ <h1>Licensing</h1>
     <p>
         <strong><em>Vaadin TestBench</em> is a testing tool for <a href="http://vaadin.com">Vaadin Framework</a>.
         </strong><br/><br/>
-        <em>Vaadin TestBench</em> is distributed under the terms of <a href="https://vaadin.com/license/cval-3">
-        Commercial Vaadin Add-On License version 3.0</a> ("CVALv3"). A copy of the license
-        is included as <tt>LICENSE.txt</tt> in this software package.
+        <em>Vaadin TestBench</em> is distributed under the Vaadin Commercial License and Service Terms (<a href="https://vaadin.com/commercial-license-and-service-terms">
+        VCL</a>).
     </p>
     <p>
       You must either accept the terms of the above mentioned license agreement
@@ -121,7 +120,7 @@ <h3>Included Software Components</h3>
     <ul>
         <li>Selenium 3.12.0 &ndash; Apache License 2.0</li>
         <li>PhantomJSDriver 1.4.2 &ndash; The BSD 2-Clause License</li>
-        <li>Javassist 3.18.1-GA &ndash; Apache License 2.0</li>
+        <li>Javassist 3.30.2-GA &ndash; Apache License 2.0</li>
         <li>JUnit 4.12 &ndash; Common Public License Version 1.0</li>
         <li>org.json &ndash; The JSON License</li>
     </ul>

diff --git a/documentation/setup/testbench-license.asciidoc b/documentation/setup/testbench-license.asciidoc
@@ -11,12 +11,12 @@ layout: page
 == Installing License Key
 
 Before running tests, you need to install a license key.
-You can purchase Vaadin TestBench or obtain a free trial key from the
-link:https://vaadin.com/directory#addon/vaadin-testbench[Vaadin TestBench
-download page] in Vaadin Directory.
-You need to register in Vaadin Directory to obtain the key.
+You can acquire a subscription through
+link:https://vaadin.com/testbench[Vaadin TestBench page].
 
-To install the license key on a development workstation, you can copy and paste it verbatim to a [filename]#.vaadin.testbench.developer.license# file in your home directory.
+To install the license key on a development workstation,
+you can copy and paste it verbatim to a [filename]#.vaadin.testbench.developer.license# file in your home directory. The license keys for your subscription can be found in the
+link:https://vaadin.com/myaccount/licenses#classic[Licenses page].
 
 For example, in Linux and OS X:
 [subs="normal"]
@@ -94,8 +94,7 @@ As described above, Maven passes the parameter as is to JUnit, but Ant does not
 
 
 ifdef::web[]
-See link:https://vaadin.com/directory/help/installing-cval-license[the CVAL
-license key installation instructions] for more details.
+See link:https://vaadin.com/docs/v8/framework/addons/addons-cval[the license key installation instructions] for more details.
 endif::web[]
 
 [[testbench.license.proxies]]

diff --git a/pom.xml b/pom.xml
@@ -55,6 +55,7 @@
         <snapshot.repository.url>https://oss.sonatype.org/content/repositories/vaadin-snapshots/
         </snapshot.repository.url>
         <Implementation-Version>${project.version}</Implementation-Version>
+        <currentYear>2024</currentYear>
     </properties>
     <modules>
         <module>vaadin-testbench</module>
@@ -73,6 +74,35 @@
                     <skip>false</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>com.mycila</groupId>
+                <artifactId>license-maven-plugin</artifactId>
+                <version>4.3</version>
+                <configuration>
+                    <basedir>${basedir}</basedir>
+                    <header>${maven.multiModuleProjectDirectory}/vaadin-testbench-core/src/license/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>
+                    <includes>
+                        <include>/**/*.java</include>
+                        <include>*.java</include>
+                    </includes>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>format</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/test/test/Money.java b/test/test/Money.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2000-2024 Vaadin Ltd
+ * Vaadin TestBench Addon
+ *
+ * Copyright (C) 2012-2024 Vaadin Ltd
  *
  * This program is available under Vaadin Commercial License and Service Terms.
  *

diff --git a/test/test/Money_tst.java b/test/test/Money_tst.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2000-2024 Vaadin Ltd
+ * Vaadin TestBench Addon
+ *
+ * Copyright (C) 2012-2024 Vaadin Ltd
  *
  * This program is available under Vaadin Commercial License and Service Terms.
  *

diff --git a/test/test/Money_tst2.java b/test/test/Money_tst2.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2000-2024 Vaadin Ltd
+ * Vaadin TestBench Addon
+ *
+ * Copyright (C) 2012-2024 Vaadin Ltd
  *
  * This program is available under Vaadin Commercial License and Service Terms.
  *

diff --git a/vaadin-testbench-core/pom.xml b/vaadin-testbench-core/pom.xml
@@ -142,37 +142,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/cval3/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>
 
@@ -219,7 +188,7 @@
         <dependency>
             <groupId>org.javassist</groupId>
             <artifactId>javassist</artifactId>
-            <version>3.18.1-GA</version>
+            <version>3.30.2-GA</version>
         </dependency>
         <dependency>
             <groupId>com.google.gwt</groupId>
@@ -232,5 +201,12 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <!-- License-checker uses SLF4J logging -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>1.7.36</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/vaadin-testbench-core/src/license/cval3/header.txt b/vaadin-testbench-core/src/license/cval3/header.txt
diff --git a/vaadin-testbench-core/src/license/header.txt b/vaadin-testbench-core/src/license/header.txt
@@ -0,0 +1,8 @@
+Vaadin TestBench Addon
+
+Copyright (C) 2012-${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.
diff --git a/vaadin-testbench-core/src/license/license.txt b/vaadin-testbench-core/src/license/license.txt
@@ -0,0 +1,3 @@
+This program is available under Vaadin Commercial License and Service Terms.
+See https://vaadin.com/commercial-license-and-service-terms for the full
+license.
diff --git a/...estbench-core/src/main/java/com/vaadin/testbench/AbstractHasTestBenchCommandExecutor.java b/...estbench-core/src/main/java/com/vaadin/testbench/AbstractHasTestBenchCommandExecutor.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2000-2024 Vaadin Ltd
+ * Vaadin TestBench Addon
+ *
+ * Copyright (C) 2012-2024 Vaadin Ltd
  *
  * This program is available under Vaadin Commercial License and Service Terms.
  *

diff --git a/vaadin-testbench-core/src/main/java/com/vaadin/testbench/By.java b/vaadin-testbench-core/src/main/java/com/vaadin/testbench/By.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2000-2024 Vaadin Ltd
+ * Vaadin TestBench Addon
+ *
+ * Copyright (C) 2012-2024 Vaadin Ltd
  *
  * This program is available under Vaadin Commercial License and Service Terms.
  *

diff --git a/vaadin-testbench-core/src/main/java/com/vaadin/testbench/DriverInvocationHandler.java b/vaadin-testbench-core/src/main/java/com/vaadin/testbench/DriverInvocationHandler.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2000-2024 Vaadin Ltd
+ * Vaadin TestBench Addon
+ *
+ * Copyright (C) 2012-2024 Vaadin Ltd
  *
  * This program is available under Vaadin Commercial License and Service Terms.
  *

diff --git a/vaadin-testbench-core/src/main/java/com/vaadin/testbench/ElementQuery.java b/vaadin-testbench-core/src/main/java/com/vaadin/testbench/ElementQuery.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2000-2024 Vaadin Ltd
+ * Vaadin TestBench Addon
+ *
+ * Copyright (C) 2012-2024 Vaadin Ltd
  *
  * This program is available under Vaadin Commercial License and Service Terms.
  *

diff --git a/vaadin-testbench-core/src/main/java/com/vaadin/testbench/HasDriver.java b/vaadin-testbench-core/src/main/java/com/vaadin/testbench/HasDriver.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2000-2024 Vaadin Ltd
+ * Vaadin TestBench Addon
+ *
+ * Copyright (C) 2012-2024 Vaadin Ltd
  *
  * This program is available under Vaadin Commercial License and Service Terms.
  *

diff --git a/vaadin-testbench-core/src/main/java/com/vaadin/testbench/HasSearchContext.java b/vaadin-testbench-core/src/main/java/com/vaadin/testbench/HasSearchContext.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2000-2024 Vaadin Ltd
+ * Vaadin TestBench Addon
+ *
+ * Copyright (C) 2012-2024 Vaadin Ltd
  *
  * This program is available under Vaadin Commercial License and Service Terms.
  *

diff --git a/vaadin-testbench-core/src/main/java/com/vaadin/testbench/HasTestBenchCommandExecutor.java b/vaadin-testbench-core/src/main/java/com/vaadin/testbench/HasTestBenchCommandExecutor.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2000-2024 Vaadin Ltd
+ * Vaadin TestBench Addon
+ *
+ * Copyright (C) 2012-2024 Vaadin Ltd
  *
  * This program is available under Vaadin Commercial License and Service Terms.
  *

diff --git a/vaadin-testbench-core/src/main/java/com/vaadin/testbench/Parameters.java b/vaadin-testbench-core/src/main/java/com/vaadin/testbench/Parameters.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2000-2024 Vaadin Ltd
+ * Vaadin TestBench Addon
+ *
+ * Copyright (C) 2012-2024 Vaadin Ltd
  *
  * This program is available under Vaadin Commercial License and Service Terms.
  *

diff --git a/vaadin-testbench-core/src/main/java/com/vaadin/testbench/RetryRule.java b/vaadin-testbench-core/src/main/java/com/vaadin/testbench/RetryRule.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2000-2024 Vaadin Ltd
+ * Vaadin TestBench Addon
+ *
+ * Copyright (C) 2012-2024 Vaadin Ltd
  *
  * This program is available under Vaadin Commercial License and Service Terms.
  *

diff --git a/vaadin-testbench-core/src/main/java/com/vaadin/testbench/ScreenshotOnFailureRule.java b/vaadin-testbench-core/src/main/java/com/vaadin/testbench/ScreenshotOnFailureRule.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2000-2024 Vaadin Ltd
+ * Vaadin TestBench Addon
+ *
+ * Copyright (C) 2012-2024 Vaadin Ltd
  *
  * This program is available under Vaadin Commercial License and Service Terms.
  *

diff --git a/vaadin-testbench-core/src/main/java/com/vaadin/testbench/TestBench.java b/vaadin-testbench-core/src/main/java/com/vaadin/testbench/TestBench.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2000-2024 Vaadin Ltd
+ * Vaadin TestBench Addon
+ *
+ * Copyright (C) 2012-2024 Vaadin Ltd
  *
  * This program is available under Vaadin Commercial License and Service Terms.
  *

diff --git a/vaadin-testbench-core/src/main/java/com/vaadin/testbench/TestBenchDriverProxy.java b/vaadin-testbench-core/src/main/java/com/vaadin/testbench/TestBenchDriverProxy.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2000-2024 Vaadin Ltd
+ * Vaadin TestBench Addon
+ *
+ * Copyright (C) 2012-2024 Vaadin Ltd
  *
  * This program is available under Vaadin Commercial License and Service Terms.
  *

diff --git a/vaadin-testbench-core/src/main/java/com/vaadin/testbench/TestBenchElement.java b/vaadin-testbench-core/src/main/java/com/vaadin/testbench/TestBenchElement.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2000-2024 Vaadin Ltd
+ * Vaadin TestBench Addon
+ *
+ * Copyright (C) 2012-2024 Vaadin Ltd
  *
  * This program is available under Vaadin Commercial License and Service Terms.
  *

diff --git a/vaadin-testbench-core/src/main/java/com/vaadin/testbench/TestBenchTestCase.java b/vaadin-testbench-core/src/main/java/com/vaadin/testbench/TestBenchTestCase.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2000-2024 Vaadin Ltd
+ * Vaadin TestBench Addon
+ *
+ * Copyright (C) 2012-2024 Vaadin Ltd
  *
  * This program is available under Vaadin Commercial License and Service Terms.
  *

diff --git a/...n-testbench-core/src/main/java/com/vaadin/testbench/annotations/BrowserConfiguration.java b/...n-testbench-core/src/main/java/com/vaadin/testbench/annotations/BrowserConfiguration.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2000-2024 Vaadin Ltd
+ * Vaadin TestBench Addon
+ *
+ * Copyright (C) 2012-2024 Vaadin Ltd
  *
  * This program is available under Vaadin Commercial License and Service Terms.
  *

diff --git a/vaadin-testbench-core/src/main/java/com/vaadin/testbench/annotations/BrowserFactory.java b/vaadin-testbench-core/src/main/java/com/vaadin/testbench/annotations/BrowserFactory.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2000-2024 Vaadin Ltd
+ * Vaadin TestBench Addon
+ *
+ * Copyright (C) 2012-2024 Vaadin Ltd
  *
  * This program is available under Vaadin Commercial License and Service Terms.
  *

diff --git a/vaadin-testbench-core/src/main/java/com/vaadin/testbench/annotations/RunLocally.java b/vaadin-testbench-core/src/main/java/com/vaadin/testbench/annotations/RunLocally.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2000-2024 Vaadin Ltd
+ * Vaadin TestBench Addon
+ *
+ * Copyright (C) 2012-2024 Vaadin Ltd
  *
  * This program is available under Vaadin Commercial License and Service Terms.
  *

diff --git a/vaadin-testbench-core/src/main/java/com/vaadin/testbench/annotations/RunOnHub.java b/vaadin-testbench-core/src/main/java/com/vaadin/testbench/annotations/RunOnHub.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2000-2024 Vaadin Ltd
+ * Vaadin TestBench Addon
+ *
+ * Copyright (C) 2012-2024 Vaadin Ltd
  *
  * This program is available under Vaadin Commercial License and Service Terms.
  *

diff --git a/vaadin-testbench-core/src/main/java/com/vaadin/testbench/commands/CanCompareScreenshots.java b/vaadin-testbench-core/src/main/java/com/vaadin/testbench/commands/CanCompareScreenshots.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2000-2024 Vaadin Ltd
+ * Vaadin TestBench Addon
+ *
+ * Copyright (C) 2012-2024 Vaadin Ltd
  *
  * This program is available under Vaadin Commercial License and Service Terms.
  *
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,4 +20,4 @@ Please report bugs and submit feature requests as [GitHub issues](https://github

		## License

		This add-on is distributed under [CVAL 3.0](https://vaadin.com/license/cval-3).
		This add-on is distributed under [VCL](https://vaadin.com/commercial-license-and-service-terms).