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 2021/04/18 14:09:53 UTC

[isis] 07/11: Excluding popper.js through wicket-bootstrap-core

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch 2617_wicketstuff.bs4
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 7101dac119b6f9c0e8a3f41ae06921b33994c503
Author: mwhesse <mw...@gmail.com>
AuthorDate: Sun Apr 18 13:09:49 2021 +0700

    Excluding popper.js through wicket-bootstrap-core
---
 extensions/vw/fullcalendar/applib/pom.xml | 6 ++++++
 extensions/vw/pdfjs/applib/pom.xml        | 6 ++++++
 extensions/vw/pdfjs/metamodel/pom.xml     | 6 ++++++
 viewers/wicket/ui/pom.xml                 | 8 ++++++++
 viewers/wicket/viewer/pom.xml             | 4 ++++
 5 files changed, 30 insertions(+)

diff --git a/extensions/vw/fullcalendar/applib/pom.xml b/extensions/vw/fullcalendar/applib/pom.xml
index f7e6aba..df915d4 100644
--- a/extensions/vw/fullcalendar/applib/pom.xml
+++ b/extensions/vw/fullcalendar/applib/pom.xml
@@ -46,6 +46,12 @@
             <artifactId>wicket-bootstrap-core</artifactId>
             <!-- to avoid polluting the classpath -->
             <optional>true</optional>
+            <exclusions>
+				<exclusion>
+				    <groupId>org.webjars</groupId>
+				    <artifactId>popper.js</artifactId>
+				</exclusion>
+            </exclusions>
         </dependency>
 
     </dependencies>
diff --git a/extensions/vw/pdfjs/applib/pom.xml b/extensions/vw/pdfjs/applib/pom.xml
index 0c5cbd9..e9b544e 100644
--- a/extensions/vw/pdfjs/applib/pom.xml
+++ b/extensions/vw/pdfjs/applib/pom.xml
@@ -46,6 +46,12 @@
             <artifactId>wicket-bootstrap-core</artifactId>
             <!-- to avoid polluting the classpath -->
             <optional>true</optional>
+            <exclusions>
+				<exclusion>
+				    <groupId>org.webjars</groupId>
+				    <artifactId>popper.js</artifactId>
+				</exclusion>
+            </exclusions>
         </dependency>
 
     </dependencies>
diff --git a/extensions/vw/pdfjs/metamodel/pom.xml b/extensions/vw/pdfjs/metamodel/pom.xml
index 7234b3a..8ac5bdf 100644
--- a/extensions/vw/pdfjs/metamodel/pom.xml
+++ b/extensions/vw/pdfjs/metamodel/pom.xml
@@ -49,6 +49,12 @@
         <dependency>
             <groupId>de.agilecoders.wicket</groupId>
             <artifactId>wicket-bootstrap-core</artifactId>
+            <exclusions>
+				<exclusion>
+				    <groupId>org.webjars</groupId>
+				    <artifactId>popper.js</artifactId>
+				</exclusion>
+            </exclusions>
         </dependency>
 
     </dependencies>
diff --git a/viewers/wicket/ui/pom.xml b/viewers/wicket/ui/pom.xml
index c63332f..a36f451 100644
--- a/viewers/wicket/ui/pom.xml
+++ b/viewers/wicket/ui/pom.xml
@@ -203,6 +203,10 @@
             <groupId>de.agilecoders.wicket</groupId>
             <artifactId>wicket-bootstrap-core</artifactId>
             <exclusions>
+				<exclusion>
+				    <groupId>org.webjars</groupId>
+				    <artifactId>popper.js</artifactId>
+				</exclusion>
                 <exclusion>
                     <groupId>org.apache.wicket</groupId>
                     <artifactId>wicket-util</artifactId>
@@ -287,6 +291,10 @@
                     <groupId>com.google.javascript</groupId>
                     <artifactId>closure-compiler</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.google.javascript</groupId>
+                    <artifactId>closure-compiler-unshaded</artifactId>
+                </exclusion>
             	<exclusion>
             		<groupId>org.webjars.bower</groupId>
             		<artifactId>summernote</artifactId>
diff --git a/viewers/wicket/viewer/pom.xml b/viewers/wicket/viewer/pom.xml
index f0c9d54..f3c4c1e 100644
--- a/viewers/wicket/viewer/pom.xml
+++ b/viewers/wicket/viewer/pom.xml
@@ -98,6 +98,10 @@
             <groupId>de.agilecoders.wicket</groupId>
             <artifactId>wicket-bootstrap-core</artifactId>
             <exclusions>
+				<exclusion>
+				    <groupId>org.webjars</groupId>
+				    <artifactId>popper.js</artifactId>
+				</exclusion>
                 <exclusion>
                     <groupId>org.apache.wicket</groupId>
                     <artifactId>wicket-util</artifactId>