|
17 | 17 | import java.net.URISyntaxException; |
18 | 18 | import java.net.URL; |
19 | 19 | import java.nio.charset.StandardCharsets; |
20 | | -import java.nio.file.Paths; |
21 | 20 | import java.util.ArrayList; |
22 | 21 | import java.util.Arrays; |
23 | 22 | import java.util.Collections; |
|
34 | 33 | import com.vaadin.flow.server.Constants; |
35 | 34 | import com.vaadin.flow.server.ExecutionFailedException; |
36 | 35 | import com.vaadin.flow.server.InitParameters; |
| 36 | +import com.vaadin.flow.server.Version; |
37 | 37 | import com.vaadin.flow.server.frontend.CvdlProducts; |
38 | 38 | import com.vaadin.flow.server.frontend.FrontendTools; |
39 | 39 | import com.vaadin.flow.server.frontend.FrontendToolsSettings; |
|
46 | 46 | import com.vaadin.pro.licensechecker.BuildType; |
47 | 47 | import com.vaadin.pro.licensechecker.LicenseChecker; |
48 | 48 | import com.vaadin.pro.licensechecker.Product; |
49 | | - |
| 49 | +import elemental.json.Json; |
| 50 | +import elemental.json.JsonArray; |
| 51 | +import elemental.json.JsonObject; |
| 52 | +import elemental.json.impl.JsonUtil; |
50 | 53 | import org.apache.commons.io.FileUtils; |
51 | 54 | import org.apache.commons.io.IOUtils; |
52 | 55 | import org.slf4j.Logger; |
53 | 56 | import org.slf4j.LoggerFactory; |
54 | 57 | import org.zeroturnaround.exec.InvalidExitValueException; |
55 | 58 | import org.zeroturnaround.exec.ProcessExecutor; |
56 | 59 |
|
57 | | -import elemental.json.Json; |
58 | | -import elemental.json.JsonArray; |
59 | | -import elemental.json.JsonObject; |
60 | | -import elemental.json.impl.JsonUtil; |
61 | | - |
62 | 60 | import static com.vaadin.flow.server.Constants.CONNECT_APPLICATION_PROPERTIES_TOKEN; |
63 | 61 | import static com.vaadin.flow.server.Constants.CONNECT_JAVA_SOURCE_FOLDER_TOKEN; |
64 | | -import static com.vaadin.flow.server.Constants.JAVA_RESOURCE_FOLDER_TOKEN; |
65 | 62 | import static com.vaadin.flow.server.Constants.CONNECT_OPEN_API_FILE_TOKEN; |
66 | 63 | import static com.vaadin.flow.server.Constants.FRONTEND_TOKEN; |
67 | 64 | import static com.vaadin.flow.server.Constants.GENERATED_TOKEN; |
| 65 | +import static com.vaadin.flow.server.Constants.JAVA_RESOURCE_FOLDER_TOKEN; |
68 | 66 | import static com.vaadin.flow.server.Constants.NPM_TOKEN; |
69 | 67 | import static com.vaadin.flow.server.Constants.PROJECT_FRONTEND_GENERATED_DIR_TOKEN; |
70 | 68 | import static com.vaadin.flow.server.InitParameters.NODE_DOWNLOAD_ROOT; |
@@ -417,6 +415,8 @@ private static void runFrontendBuildTool(PluginAdapterBase adapter, |
417 | 415 | Map<String, String> environment, String... params) |
418 | 416 | throws TimeoutException, URISyntaxException { |
419 | 417 |
|
| 418 | + validateLicense(); |
| 419 | + |
420 | 420 | File buildExecutable = new File(adapter.npmFolder(), |
421 | 421 | NODE_MODULES + executable); |
422 | 422 | if (!buildExecutable.isFile()) { |
@@ -467,6 +467,11 @@ private static void runFrontendBuildTool(PluginAdapterBase adapter, |
467 | 467 | validateLicenses(adapter); |
468 | 468 | } |
469 | 469 |
|
| 470 | + private static void validateLicense() { |
| 471 | + LicenseChecker.checkLicense("flow", Version.getFullVersion(), |
| 472 | + BuildType.PRODUCTION); |
| 473 | + } |
| 474 | + |
470 | 475 | private static void validateLicenses(PluginAdapterBase adapter) { |
471 | 476 | File nodeModulesFolder = new File(adapter.npmFolder(), |
472 | 477 | FrontendUtils.NODE_MODULES); |
|
0 commit comments