[openmeetings] branch csp updated: [OPENMEETINGS-2165] bootstrap install seems to work

[solomax]

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

solomax pushed a commit to branch csp
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/csp by this push:
     new 2a55641  [OPENMEETINGS-2165] bootstrap install seems to work
2a55641 is described below

commit 2a5564171c57893c8d44979236d7c0b6b99808d9
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Fri Jan 24 20:03:44 2020 +0700

    [OPENMEETINGS-2165] bootstrap install seems to work
---
 .../src/main/java/org/apache/openmeetings/web/app/Application.java   | 5 -----
 1 file changed, 5 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
index 32d0674..0ad1235 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
@@ -142,13 +142,10 @@ import com.hazelcast.core.MembershipEvent;
 import com.hazelcast.core.MembershipListener;
 
 import de.agilecoders.wicket.core.Bootstrap;
-import 
de.agilecoders.wicket.core.markup.html.references.PopperJavaScriptReference;
 import de.agilecoders.wicket.core.settings.BootstrapSettings;
 import de.agilecoders.wicket.core.settings.IBootstrapSettings;
 import de.agilecoders.wicket.core.settings.SingleThemeProvider;
 import 
de.agilecoders.wicket.themes.markup.html.material_design.MaterialDesignTheme;
-import de.agilecoders.wicket.webjars.WicketWebjars;
-import de.agilecoders.wicket.webjars.settings.WebjarsSettings;
 
 @Component
 public class Application extends AuthenticatedWebApplication implements 
IApplication {
@@ -277,10 +274,8 @@ public class Application extends 
AuthenticatedWebApplication implements IApplica
                        }
                });
                super.init();
-               WicketWebjars.install(this, new WebjarsSettings());
                final IBootstrapSettings settings = new BootstrapSettings();
                settings.setThemeProvider(new SingleThemeProvider(new 
MaterialDesignTheme()));
-               
settings.setPopperJsResourceReference(PopperJavaScriptReference.instance());
                
Bootstrap.builder().withBootstrapSettings(settings).install(this);
 
                // register some widgets