You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2015/04/23 20:56:58 UTC
isis git commit: Revert "ISIS-1061 Upgrade Wicket to 6.19.0. Also
Wicket Bootstrap to 0.9.8"
Repository: isis
Updated Branches:
refs/heads/master de0bb1f97 -> 682f2b0c7
Revert "ISIS-1061 Upgrade Wicket to 6.19.0. Also Wicket Bootstrap to 0.9.8"
This reverts commit 6dc9084f1021995c2b6b76d8363f27366b0496a6.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/682f2b0c
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/682f2b0c
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/682f2b0c
Branch: refs/heads/master
Commit: 682f2b0c7f2b825831bd0f78430854af136b60ec
Parents: de0bb1f
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Apr 23 19:21:26 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Apr 23 19:21:26 2015 +0100
----------------------------------------------------------------------
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/682f2b0c/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 430c578..85e0e87 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -130,11 +130,11 @@
<jetty.version>8.1.16.v20140903</jetty.version>
- <wicket.version>6.19.0</wicket.version>
- <wicketstuff.version>6.19.0</wicketstuff.version>
+ <wicket.version>6.17.0</wicket.version>
+ <wicketstuff.version>6.17.0</wicketstuff.version>
- <wicket-webjars.version>0.4.4</wicket-webjars.version>
- <wicket-bootstrap.version>0.9.8</wicket-bootstrap.version>
+ <wicket-webjars.version>0.4.3</wicket-webjars.version>
+ <wicket-bootstrap.version>0.9.7</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/682f2b0c/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 60e273d..daf886e 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.BootlintHeaderItem;
+import de.agilecoders.wicket.core.markup.html.references.BootlintJavaScriptReference;
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(BootlintHeaderItem.INSTANCE);
+ response.render(JavaScriptHeaderItem.forReference(BootlintJavaScriptReference.INSTANCE));
}
private boolean isModernBrowser() {