You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by mg...@apache.org on 2015/08/06 14:49:54 UTC
isis git commit: ISIS-1061 Upgrade Wicket to 6.20.0
Repository: isis
Updated Branches:
refs/heads/ISIS-1061-upgrade-Wicket-to-6.20.0 [created] 637fb556e
ISIS-1061 Upgrade Wicket to 6.20.0
Also update Wicket-Bootstrap to 0.9.11 and Wicket Webjars to 0.4.6
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/637fb556
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/637fb556
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/637fb556
Branch: refs/heads/ISIS-1061-upgrade-Wicket-to-6.20.0
Commit: 637fb556e61a8934d814fa62dc224c18c7f62147
Parents: a930c1d
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Aug 6 15:48:26 2015 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Aug 6 15:48:26 2015 +0300
----------------------------------------------------------------------
core/pom.xml | 8 ++++----
.../org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/637fb556/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 729b8b7..b3d6517 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -131,11 +131,11 @@
<jetty.version>9.2.11.v20150529</jetty.version>
- <wicket.version>6.17.0</wicket.version>
- <wicketstuff.version>6.17.0</wicketstuff.version>
+ <wicket.version>6.20.0</wicket.version>
+ <wicketstuff.version>6.20.0</wicketstuff.version>
- <wicket-webjars.version>0.4.3</wicket-webjars.version>
- <wicket-bootstrap.version>0.9.7</wicket-bootstrap.version>
+ <wicket-webjars.version>0.4.6</wicket-webjars.version>
+ <wicket-bootstrap.version>0.9.11</wicket-bootstrap.version>
<wicket-source.version>6.0.0.8</wicket-source.version>
<wicket-select2.version>2.2.3</wicket-select2.version>
http://git-wip-us.apache.org/repos/asf/isis/blob/637fb556/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index daf886e..60e273d 100644
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++ b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -20,7 +20,7 @@
package org.apache.isis.viewer.wicket.ui.pages;
import de.agilecoders.wicket.core.Bootstrap;
-import de.agilecoders.wicket.core.markup.html.references.BootlintJavaScriptReference;
+import de.agilecoders.wicket.core.markup.html.references.BootlintHeaderItem;
import de.agilecoders.wicket.core.settings.IBootstrapSettings;
import de.agilecoders.wicket.core.settings.ITheme;
import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesomeCssReference;
@@ -271,7 +271,7 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
}
private void addBootLint(final IHeaderResponse response) {
- response.render(JavaScriptHeaderItem.forReference(BootlintJavaScriptReference.INSTANCE));
+ response.render(BootlintHeaderItem.INSTANCE);
}
private boolean isModernBrowser() {