You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2014/02/07 09:22:36 UTC
git commit: Fix the path to jquery for the tests
Updated Branches:
refs/heads/wicket-6.x 28e1b0fe4 -> c7ed5a0d5
Fix the path to jquery for the tests
(cherry picked from commit 2c2df2efecdefe7f602063234bf25fece246b1b0)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c7ed5a0d
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c7ed5a0d
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c7ed5a0d
Branch: refs/heads/wicket-6.x
Commit: c7ed5a0d5b9608a42d0f0b35fce006a59d0ebe04
Parents: 28e1b0f
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Feb 7 09:21:28 2014 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Feb 7 09:22:05 2014 +0100
----------------------------------------------------------------------
wicket-core/src/test/js/all.html | 2 +-
wicket-core/src/test/js/amd.html | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/c7ed5a0d/wicket-core/src/test/js/all.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/js/all.html b/wicket-core/src/test/js/all.html
index 09f01bf..be9af61 100644
--- a/wicket-core/src/test/js/all.html
+++ b/wicket-core/src/test/js/all.html
@@ -5,7 +5,7 @@
<title id="titleId">All tests</title>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="qunit/qunit.css" type="text/css" media="screen" />
- <script src="../../main/java/org/apache/wicket/resource/jquery/jquery-1.10.2.js"></script>
+ <script src="../../main/java/org/apache/wicket/resource/jquery/jquery-1.11.0.js"></script>
<script src="../../main/java/org/apache/wicket/ajax/res/js/wicket-event-jquery.js"></script>
<script src="../../main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js"></script>
<script src="../../main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery-debug.js"></script>
http://git-wip-us.apache.org/repos/asf/wicket/blob/c7ed5a0d/wicket-core/src/test/js/amd.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/js/amd.html b/wicket-core/src/test/js/amd.html
index 50b88c6..73a9376 100644
--- a/wicket-core/src/test/js/amd.html
+++ b/wicket-core/src/test/js/amd.html
@@ -9,7 +9,7 @@
<script type="text/javascript">
var require = {
paths: {
- 'jquery': '../../main/java/org/apache/wicket/resource/jquery/jquery-1.10.2', // no .js extension
+ 'jquery': '../../main/java/org/apache/wicket/resource/jquery/jquery-1.11.0', // no .js extension
'wicket-event': '../../main/java/org/apache/wicket/ajax/res/js/wicket-event-jquery',
'Wicket': '../../main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery',
'WicketDebugWindow': '../../main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery-debug'