This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 916c66db9afffaf609a297d01abd462947151310
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Wed May 27 11:57:38 2020 +0200
ISIS-2340: also bump node.js stuff
---
.gitignore | 2 ++
examples/demo/vaadin/pom.xml | 39 ++++++++++++++++++++-------------------
incubator/viewers/vaadin/pom.xml | 20 --------------------
3 files changed, 22 insertions(+), 39 deletions(-)
diff --git a/.gitignore b/.gitignore
index 391e673..0d2ed80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,3 +75,5 @@ package-lock.json
package.json
webpack.config.js
webpack.generated.js
+pnpm*
+
diff --git a/examples/demo/vaadin/pom.xml b/examples/demo/vaadin/pom.xml
index f7c4683..4f571b3 100644
--- a/examples/demo/vaadin/pom.xml
+++ b/examples/demo/vaadin/pom.xml
@@ -33,15 +33,13 @@
<maven-war-plugin.warName>${project.artifactId}</maven-war-plugin.warName>
- <!--
- Versions of node/npm/vaadin not yet listed in
isis-app-starter-parent
- still investigating whether there is a way to not
require these
- with the web-application. Ideally these dependencies
are just referenced
- in module viewer-vaadin-ui.
- See https://nodejs.org/en/download/ for latest node and
npm (lts) versions
- -->
- <node.version>v12.14.0</node.version>
- <npm.version>6.13.1</npm.version>
+ <!-- Versions of node/npm/vaadin not yet listed in
isis-app-starter-parent
+ still investigating whether there is a way to not
require these with the
+ web-application. Ideally these dependencies are just
referenced in module
+ viewer-vaadin-ui. See https://nodejs.org/en/download/
for latest node and
+ npm (lts) versions -->
+ <node.version>v12.17.0</node.version>
+ <npm.version>6.14.4</npm.version>
<vaadin.version>14.2.0</vaadin.version>
</properties>
@@ -49,11 +47,11 @@
<build>
<plugins>
-
+
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
- <version>1.7.6</version>
+ <version>1.10.0</version>
<executions>
<execution>
@@ -71,12 +69,15 @@
</executions>
</plugin>
-
-
+
+
<plugin>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-maven-plugin</artifactId>
<version>${vaadin.version}</version>
+ <configuration>
+ <pnpmEnable>true</pnpmEnable>
+ </configuration>
<executions>
<execution>
<goals>
@@ -85,22 +86,22 @@
</execution>
</executions>
</plugin>
-
+
</plugins>
</build>
<dependencies>
-
+
<!-- DEMO DOMAIN -->
-
+
<dependency>
<groupId>org.apache.isis.examples.apps</groupId>
<artifactId>demo-domain</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
-
+
<!-- JDK11+ SUPPORT -->
<dependency>
@@ -119,7 +120,7 @@
</dependency>
<!-- EXTENSIONS -->
-
+
<dependency>
<groupId>org.apache.isis.valuetypes</groupId>
<artifactId>isis-valuetypes-asciidoc-ui-vaa</artifactId>
@@ -132,7 +133,7 @@
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
-
+
</dependencies>
<profiles>
diff --git a/incubator/viewers/vaadin/pom.xml b/incubator/viewers/vaadin/pom.xml
index 3a59316..70056ce 100644
--- a/incubator/viewers/vaadin/pom.xml
+++ b/incubator/viewers/vaadin/pom.xml
@@ -36,26 +36,6 @@
<packaging>pom</packaging>
-<!-- <build> -->
-
-<!-- <plugins> -->
-<!-- <plugin> -->
-<!-- <groupId>com.vaadin</groupId> -->
-<!-- <artifactId>vaadin-maven-plugin</artifactId> -->
-<!-- <version>${vaadin.version}</version> -->
-<!-- <executions> -->
-<!-- <execution> -->
-<!-- <goals> -->
-<!--
<goal>prepare-frontend</goal> -->
-<!--
<goal>build-frontend</goal> -->
-<!-- </goals> -->
-<!-- </execution> -->
-<!-- </executions> -->
-<!-- </plugin> -->
-<!-- </plugins> -->
-
-<!-- </build> -->
-
<dependencyManagement>
<dependencies>
