You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/05/27 09:14:31 UTC

[isis] branch master updated: ISIS-2340: enable pnpm (replaces npm since Vaadin 14.2)

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


The following commit(s) were added to refs/heads/master by this push:
     new 558606d  ISIS-2340: enable pnpm (replaces npm since Vaadin 14.2)
558606d is described below

commit 558606dd320747976affb8a6ef70819539627227
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed May 27 11:14:22 2020 +0200

    ISIS-2340: enable pnpm (replaces npm since Vaadin 14.2)
---
 incubator/viewers/vaadin/ui/pom.xml | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/incubator/viewers/vaadin/ui/pom.xml b/incubator/viewers/vaadin/ui/pom.xml
index e1b3924..8dcb86e 100644
--- a/incubator/viewers/vaadin/ui/pom.xml
+++ b/incubator/viewers/vaadin/ui/pom.xml
@@ -29,13 +29,13 @@
 		<git-plugin.propertiesDir>org/apache/isis/incubator/viewer/vaadin/ui</git-plugin.propertiesDir>
 	</properties>
 
-<!-- IN CASE WE WANT TO USE VAADIN ADDONS -->
-<!-- 	<repositories> -->
-<!-- 		<repository> -->
-<!-- 			<id>vaadin-addons</id> -->
-<!-- 			<url>https://maven.vaadin.com/vaadin-addons</url> -->
-<!-- 		</repository> -->
-<!-- 	</repositories> -->
+	<!-- IN CASE WE WANT TO USE VAADIN ADDONS -->
+	<!-- <repositories> -->
+	<!-- <repository> -->
+	<!-- <id>vaadin-addons</id> -->
+	<!-- <url>https://maven.vaadin.com/vaadin-addons</url> -->
+	<!-- </repository> -->
+	<!-- </repositories> -->
 
 	<build>
 
@@ -67,6 +67,9 @@
 				<groupId>com.vaadin</groupId>
 				<artifactId>vaadin-maven-plugin</artifactId>
 				<version>${vaadin.version}</version>
+				<configuration>
+					<pnpmEnable>true</pnpmEnable>
+				</configuration>
 				<executions>
 					<execution>
 						<goals>
@@ -116,12 +119,12 @@
 
 		<!-- VAADIN ADDONS -->
 
-<!-- 		<dependency> -->
-<!-- 			<groupId>com.github.appreciated</groupId> -->
-<!-- 			<artifactId>vaadin-css-grid</artifactId> -->
-<!-- 			<version>2.0.0.beta3</version> -->
-<!-- 			<version>0.8.4</version> -->
-<!-- 		</dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>com.github.appreciated</groupId> -->
+		<!-- <artifactId>vaadin-css-grid</artifactId> -->
+		<!-- <version>2.0.0.beta3</version> -->
+		<!-- <version>0.8.4</version> -->
+		<!-- </dependency> -->
 
 	</dependencies>