Aligned with master

sebfz1 · Feb 12, 2015 · 06519e9 · 06519e9
1 parent 808d76e
commit 06519e9
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ Once done, just include the jar(s) in your project's build path.
 <dependency>
     <groupId>com.googlecode.wicket-jquery-ui</groupId>
     <artifactId>wicket-jquery-ui</artifactId>
-    <version>6.18.0</version> <!-- or 1.5.11, or 7.0.0-M3 -->
+    <version>6.19.0</version> <!-- or 1.5.11, or 7.0.0-M5 -->
 </dependency>
 ```
 
@@ -47,6 +47,8 @@ If the version you specified is *snapshot*, you might define this repository:
 
 <table>
 <tr><th>wicket-jquery-ui</th><th>Wicket</th><th>jQuery UI</th></tr>
+<tr><td>7.0.0-M5</td><td>7.0.0-M5</td><td>1.11.2</td></tr>
+<tr><td>6.19.0</td><td>6.19.0</td><td>1.11.2</td></tr>
 <tr><td>6.18.0</td><td>6.18.0</td><td>1.11.2</td></tr>
 <tr><td>6.17.0</td><td>6.17.0</td><td>1.11.1</td></tr>
 <tr><td>6.16.0</td><td>6.16.0</td><td>1.11.0</td></tr>
@@ -67,6 +69,8 @@ If the version you specified is *snapshot*, you might define this repository:
 
 <table>
 <tr><th>wicket-kendo-ui</th><th>Wicket</th><th>Kendo UI</th></tr>
+<tr><td>7.0.0-M5</td><td>7.0.0-M5</td><td>2014.3.1119 (ASFv2)</td></tr>
+<tr><td>6.19.0</td><td>6.19.0</td><td>2014.3.1119 (ASFv2)</td></tr>
 <tr><td>6.18.0</td><td>6.18.0</td><td>2014.2.716 (ASFv2)</td></tr>
 <tr><td>6.17.0</td><td>6.17.0</td><td>2014.2.716 (ASFv2)</td></tr>
 <tr><td>6.16.0</td><td>6.16.0</td><td>2014.1.416 (ASFv2)</td></tr>
@@ -94,7 +98,7 @@ To use wicket-jquery-ui with a standard theme, just add the corresponding theme
 <dependency>
 	<groupId>com.googlecode.wicket-jquery-ui</groupId>
 	<artifactId>wicket-jquery-ui-theme-uilightness</artifactId>
-	<version>6.18.0</version>
+	<version>6.19.0</version>
 </dependency>
 ```
 
@@ -110,7 +114,7 @@ To use wicket-kendo-ui with a standard theme, just add the corresponding theme d
 <dependency>
 	<groupId>com.googlecode.wicket-jquery-ui</groupId>
 	<artifactId>wicket-kendo-ui-theme-default</artifactId>
-	<version>6.18.0</version>
+	<version>6.19.0</version>
 </dependency>
 ```
 

diff --git a/pom.xml b/pom.xml
@@ -43,7 +43,7 @@
 	</scm>
 
 	<properties>
-		<wicket.version>7.0.0-M5</wicket.version>
+		<wicket.version>7.0.0-SNAPSHOT</wicket.version>
 		<junit.version>4.12</junit.version>
 		<jetty.version>8.1.16.v20140903</jetty.version>
 	</properties>

diff --git a/.../googlecode/wicket/jquery/ui/samples/pages/kendo/datetimepicker/LocaleDatePickerPage.java b/.../googlecode/wicket/jquery/ui/samples/pages/kendo/datetimepicker/LocaleDatePickerPage.java
@@ -73,6 +73,6 @@ public void renderHead(IHeaderResponse response)
 
 		// response.render(JavaScriptHeaderItem.forReference(new KendoGlobalizeResourceReference("fr"))); // or fr-FR
 		// response.render(JavaScriptHeaderItem.forReference(new KendoGlobalizeResourceReference(KendoCulture.FR_FR)));
-		response.render(JavaScriptHeaderItem.forReference(new KendoGlobalizeResourceReference(Locale.FRENCH))); // wicket7
+		response.render(JavaScriptHeaderItem.forReference(new KendoGlobalizeResourceReference(Locale.FRENCH)));
 	}
 }
diff --git a/wicket-kendo-ui-culture/pom.xml b/wicket-kendo-ui-culture/pom.xml
@@ -19,6 +19,13 @@
 
 	<dependencies>
 
+		<!-- PROJECT DEPENDENCIES -->
+		<dependency>
+			<groupId>com.googlecode.wicket-jquery-ui</groupId>
+			<artifactId>wicket-jquery-ui-core</artifactId>
+			<version>7.0.0-SNAPSHOT</version>
+		</dependency>
+
 		<!-- WICKET DEPENDENCIES -->
 		<dependency>
 			<groupId>org.apache.wicket</groupId>

diff --git a/...rc/main/java/com/googlecode/wicket/kendo/ui/resource/KendoGlobalizeResourceReference.java b/...rc/main/java/com/googlecode/wicket/kendo/ui/resource/KendoGlobalizeResourceReference.java
@@ -25,7 +25,7 @@
 /**
  * The resource reference for the Kendo Globalize javascript library.<br/>
  * <br/>
- * <b>Warning:</b> When globalize.js is registered before Kendo scripts, then Kendo will use globalize.js features instead of Kendo Globalization.  
+ * <b>Warning:</b> When globalize.js is registered before Kendo scripts, then Kendo will use globalize.js features instead of Kendo Globalization.
  *
  * @author Sebastien Briquet - sebfz1
  *

diff --git a/wicket-kendo-ui/src/main/java/com/googlecode/wicket/kendo/ui/console/Console.java b/wicket-kendo-ui/src/main/java/com/googlecode/wicket/kendo/ui/console/Console.java
@@ -101,7 +101,6 @@ public void info(AjaxRequestTarget target, Serializable message)
 	 * @deprecated too confusing with error(Serializable), use log(Serializable, true) or error(AjaxRequestTarget, Serializable)
 	 */
 	@Deprecated
-	// XXX
 	public void error(String message)
 	{
 		this.log(message, true);