chore: add license info to pro parent modules (#320)

* chore: add license info to pro parent modules * chore: fix dependency in ITs
vaadin · Oct 27, 2020 · be8baa9 · be8baa9
1 parent 44e473e
commit be8baa9
Show file tree

Hide file tree

Showing 10 changed files with 88 additions and 2 deletions.
diff --git a/scripts/templates/pom-parent-pro.xml b/scripts/templates/pom-parent-pro.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.vaadin</groupId>
+        <artifactId>vaadin-flow-components</artifactId>
+        <version>component</version>
+    </parent>
+
+    <artifactId>component-flow-parent</artifactId>
+    <packaging>pom</packaging>
+    <name>component Parent</name>
+
+    <licenses>
+        <license>
+            <name>cval3</name>
+            <url>https://vaadin.com/license/cval-3</url>
+        </license>
+    </licenses>    
+
+    <modules>
+        <module>component-flow</module>
+        <module>component-testbench</module>
+        <module>component-flow-demo</module>
+    </modules>
+
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <property>
+                    <name>!release</name>
+                </property>
+            </activation>
+            <modules>
+                <module>component-flow-integration-tests</module>
+            </modules>
+        </profile>
+    </profiles>
+</project>
diff --git a/scripts/updateJavaPOMs.js b/scripts/updateJavaPOMs.js
@@ -128,7 +128,8 @@ async function consolidate(template, pom, cb) {
 }
 
 async function consolidatePomParent() {
-  await consolidate('pom-parent.xml', `${mod}/pom.xml`, js => {
+  const template = proComponents.includes(componentName) ? 'pom-parent-pro.xml' : 'pom-parent.xml';
+  await consolidate(template, `${mod}/pom.xml`, js => {
     renameComponent(js.project.modules[0].module, name);
     renameComponent(js.project.profiles[0].profile[0].modules[0].module, name);
     js.project.parent[0].version = [rootVersion];

diff --git a/vaadin-board-flow-parent/pom.xml b/vaadin-board-flow-parent/pom.xml
@@ -9,6 +9,12 @@
   <artifactId>vaadin-board-flow-parent</artifactId>
   <packaging>pom</packaging>
   <name>Vaadin Board Parent</name>
+  <licenses>
+    <license>
+      <name>cval3</name>
+      <url>https://vaadin.com/license/cval-3</url>
+    </license>
+  </licenses>
   <modules>
     <module>vaadin-board-flow</module>
     <module>vaadin-board-testbench</module>

diff --git a/vaadin-charts-flow-parent/pom.xml b/vaadin-charts-flow-parent/pom.xml
@@ -9,6 +9,12 @@
   <artifactId>vaadin-charts-flow-parent</artifactId>
   <packaging>pom</packaging>
   <name>Vaadin Charts Parent</name>
+  <licenses>
+    <license>
+      <name>cval3</name>
+      <url>https://vaadin.com/license/cval-3</url>
+    </license>
+  </licenses>
   <modules>
     <module>vaadin-charts-flow</module>
     <module>vaadin-charts-testbench</module>

diff --git a/vaadin-confirm-dialog-flow-parent/pom.xml b/vaadin-confirm-dialog-flow-parent/pom.xml
@@ -9,6 +9,12 @@
   <artifactId>vaadin-confirm-dialog-flow-parent</artifactId>
   <packaging>pom</packaging>
   <name>Vaadin Confirm Dialog Parent</name>
+  <licenses>
+    <license>
+      <name>cval3</name>
+      <url>https://vaadin.com/license/cval-3</url>
+    </license>
+  </licenses>
   <modules>
     <module>vaadin-confirm-dialog-flow</module>
     <module>vaadin-confirm-dialog-testbench</module>

diff --git a/vaadin-cookie-consent-flow-parent/pom.xml b/vaadin-cookie-consent-flow-parent/pom.xml
@@ -9,6 +9,12 @@
   <artifactId>vaadin-cookie-consent-flow-parent</artifactId>
   <packaging>pom</packaging>
   <name>Vaadin Cookie Consent Parent</name>
+  <licenses>
+    <license>
+      <name>cval3</name>
+      <url>https://vaadin.com/license/cval-3</url>
+    </license>
+  </licenses>
   <modules>
     <module>vaadin-cookie-consent-flow</module>
     <module>vaadin-cookie-consent-testbench</module>

diff --git a/vaadin-crud-flow-parent/pom.xml b/vaadin-crud-flow-parent/pom.xml
@@ -9,6 +9,12 @@
   <artifactId>vaadin-crud-flow-parent</artifactId>
   <packaging>pom</packaging>
   <name>Vaadin Crud Parent</name>
+  <licenses>
+    <license>
+      <name>cval3</name>
+      <url>https://vaadin.com/license/cval-3</url>
+    </license>
+  </licenses>
   <modules>
     <module>vaadin-crud-flow</module>
     <module>vaadin-crud-testbench</module>

diff --git a/vaadin-grid-pro-flow-parent/pom.xml b/vaadin-grid-pro-flow-parent/pom.xml
@@ -9,6 +9,12 @@
   <artifactId>vaadin-grid-pro-flow-parent</artifactId>
   <packaging>pom</packaging>
   <name>Vaadin Grid Pro Parent</name>
+  <licenses>
+    <license>
+      <name>cval3</name>
+      <url>https://vaadin.com/license/cval-3</url>
+    </license>
+  </licenses>
   <modules>
     <module>vaadin-grid-pro-flow</module>
     <module>vaadin-grid-pro-testbench</module>

diff --git a/vaadin-radio-button-flow-parent/vaadin-radio-button-flow-integration-tests/pom.xml b/vaadin-radio-button-flow-parent/vaadin-radio-button-flow-integration-tests/pom.xml
@@ -73,7 +73,7 @@
     <dependency>
       <groupId>com.vaadin</groupId>
       <artifactId>vaadin-radio-button-testbench</artifactId>
-      <version>${project.version}</version>
+      <version>${vaadin.radio.button.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/vaadin-rich-text-editor-flow-parent/pom.xml b/vaadin-rich-text-editor-flow-parent/pom.xml
@@ -9,6 +9,12 @@
   <artifactId>vaadin-rich-text-editor-flow-parent</artifactId>
   <packaging>pom</packaging>
   <name>Vaadin Rich Text Editor Parent</name>
+  <licenses>
+    <license>
+      <name>cval3</name>
+      <url>https://vaadin.com/license/cval-3</url>
+    </license>
+  </licenses>
   <modules>
     <module>vaadin-rich-text-editor-flow</module>
     <module>vaadin-rich-text-editor-testbench</module>