Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade to ZK 9.6.6 version #3171

Merged
merged 4 commits into from
Mar 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.setting
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ optimize=true
#Invoke the shell script directly
#start.service=Apache Tomcat 6
#Used if Tomcat is installed as a Windows service
version=9.6.5-FL
version=9.6.6-FL
2 changes: 1 addition & 1 deletion deploy/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9.6.5
9.6.6
Binary file modified dist/lib/breeze.jar
Binary file not shown.
Binary file modified dist/lib/iceblue_c.jar
Binary file not shown.
Binary file modified dist/lib/sapphire.jar
Binary file not shown.
Binary file modified dist/lib/silvertail.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion jsdoc/version
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
9.6.5
9.6.6
project=ZK Client Engine
2 changes: 1 addition & 1 deletion zcommon/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<groupId>org.zkoss.zk</groupId>
<artifactId>zk-parent</artifactId>
<relativePath>../zk-parent/pom.xml</relativePath>
<version>9.6.5-SNAPSHOT</version>
<version>9.6.6-SNAPSHOT</version>
</parent>
<groupId>org.zkoss.common</groupId>
<artifactId>zcommon</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions zcommon/src/archive/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
Specification-Title: Potix Common Library
Specification-Version: 9.6.5
Specification-Version: 9.6.6
Specification-Vendor: Potix Corporation
Implementation-Title: org.zkoss
Implementation-URL: http://www.zkoss.org/prj/zcommon
Implementation-Version: 9.6.5
Implementation-Version: 9.6.6
Implementation-Vendor: Potix Corporation
2 changes: 1 addition & 1 deletion zcommon/src/archive/metainfo/xel/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Copyright (C) 2007 Potix Corporation. All Rights Reserved.
<config>
<version>
<version-class>org.zkoss.Version</version-class>
<version-uid>9.6.5</version-uid>
<version-uid>9.6.6</version-uid>
</version>

<xel-config>
Expand Down
2 changes: 1 addition & 1 deletion zcommon/src/org/zkoss/Version.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@
public class Version {
/** The version UID used to identify the resources.
*/
public static final String UID = "9.6.5";
public static final String UID = "9.6.6";
}
2 changes: 1 addition & 1 deletion zcommon/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9.6.5
9.6.6
2 changes: 1 addition & 1 deletion zel/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<groupId>org.zkoss.zk</groupId>
<artifactId>zk-parent</artifactId>
<relativePath>../zk-parent/pom.xml</relativePath>
<version>9.6.5-SNAPSHOT</version>
<version>9.6.6-SNAPSHOT</version>
</parent>
<groupId>org.zkoss.common</groupId>
<artifactId>zel</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions zel/src/archive/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
Specification-Title: The ZK EL Library
Specification-Version: 9.6.5
Specification-Version: 9.6.6
Specification-Vendor: Potix Corporation
Implementation-Title: org.zkoss.zel
Implementation-URL: http://www.zkoss.org/prj/zel
Implementation-Version: 9.6.5
Implementation-Version: 9.6.6
Implementation-Vendor: Potix Corporation
2 changes: 1 addition & 1 deletion zel/src/org/zkoss/zel/Version.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@
public class Version {
/** The version UID used to identify the resources.
*/
public static final String UID = "9.6.5";
public static final String UID = "9.6.6";
}
2 changes: 1 addition & 1 deletion zel/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9.6.5
9.6.6
2 changes: 1 addition & 1 deletion zhtml/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<groupId>org.zkoss.zk</groupId>
<artifactId>zk-parent</artifactId>
<relativePath>../zk-parent/pom.xml</relativePath>
<version>9.6.5-SNAPSHOT</version>
<version>9.6.6-SNAPSHOT</version>
</parent>
<artifactId>zhtml</artifactId>
<packaging>jar</packaging>
Expand Down
4 changes: 2 additions & 2 deletions zhtml/src/archive/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
Specification-Title: ZK XHTML Components
Specification-Version: 9.6.5
Specification-Version: 9.6.6
Specification-Vendor: Potix Corporation
Implementation-Title: org.zkoss.zhtml
Implementation-URL: http://www.zkoss.org/prj/zhtml
Implementation-Version: 9.6.5
Implementation-Version: 9.6.6
Implementation-Vendor: Potix Corporation
2 changes: 1 addition & 1 deletion zhtml/src/archive/metainfo/zk/lang.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Copyright (C) 2005 Potix Corporation. All Rights Reserved.

<version>
<version-class>org.zkoss.zhtml.Version</version-class>
<version-uid>9.6.5</version-uid>
<version-uid>9.6.6</version-uid>
</version>

<treebuilder-class>org.zkoss.zhtml.impl.HtmlTreeBuilder</treebuilder-class>
Expand Down
2 changes: 1 addition & 1 deletion zhtml/src/org/zkoss/zhtml/Version.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ public class Version {
/**
* Returns the version UID.
*/
public static final String UID = "9.6.5";
public static final String UID = "9.6.6";
}
2 changes: 1 addition & 1 deletion zhtml/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9.6.5
9.6.6
2 changes: 1 addition & 1 deletion zk-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<groupId>org.zkoss.zk</groupId>
<artifactId>zk-parent</artifactId>
<relativePath>../zk-parent/pom.xml</relativePath>
<version>9.6.5-SNAPSHOT</version>
<version>9.6.6-SNAPSHOT</version>
</parent>
<artifactId>zk-bom</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion zk-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<groupId>org.zkoss.zk</groupId>
<artifactId>zk-parent</artifactId>
<packaging>pom</packaging>
<version>9.6.5-SNAPSHOT</version>
<version>9.6.6-SNAPSHOT</version>
<name>ZK Parent POM</name>
<url>https://www.zkoss.org/</url>
<description>ZK Parent POM Module</description>
Expand Down
2 changes: 1 addition & 1 deletion zk/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<groupId>org.zkoss.zk</groupId>
<artifactId>zk-parent</artifactId>
<relativePath>../zk-parent/pom.xml</relativePath>
<version>9.6.5-SNAPSHOT</version>
<version>9.6.6-SNAPSHOT</version>
</parent>
<artifactId>zk</artifactId>
<packaging>jar</packaging>
Expand Down
4 changes: 2 additions & 2 deletions zk/src/archive/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
Specification-Title: ZK Framework
Specification-Version: 9.6.5
Specification-Version: 9.6.6
Specification-Vendor: Potix Corporation
Implementation-Title: org.zkoss.zk
Implementation-URL: http://www.zkoss.org/prj/zk
Implementation-Version: 9.6.5
Implementation-Version: 9.6.6
Implementation-Vendor: Potix Corporation
2 changes: 1 addition & 1 deletion zk/src/archive/metainfo/tld/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Copyright (C) 2007 Potix Corporation. All Rights Reserved.
<depends>zweb</depends>
<version>
<version-class>org.zkoss.zk.Version</version-class>
<version-uid>9.6.5</version-uid>
<version-uid>9.6.6</version-uid>
</version>
<taglib>
<taglib-uri>http://www.zkoss.org/dsp/zk/core</taglib-uri>
Expand Down
2 changes: 1 addition & 1 deletion zk/src/archive/metainfo/zk/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Copyright (C) 2007 Potix Corporation. All Rights Reserved.
<config-name>zk</config-name><!-- used to resolve dependency -->
<version>
<version-class>org.zkoss.zk.Version</version-class>
<version-uid>9.6.5</version-uid>
<version-uid>9.6.6</version-uid>
</version>

<!-- Note: zscript-config is applied to the whole system. Not just this language.
Expand Down
4 changes: 2 additions & 2 deletions zk/src/org/zkoss/zk/Version.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
public class Version {
/** The version UID used to identify the resources.
*/
public static final String UID = "9.6.5";
public static final String UID = "9.6.6";
/** The release version. The official version.
* It is the same as {@link org.zkoss.zk.ui.WebApp#getVersion}.
* @since 3.0.0
*/
public static final String RELEASE = "9.6.5-FL";
public static final String RELEASE = "9.6.6-FL";
}
2 changes: 1 addition & 1 deletion zk/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9.6.5
9.6.6
2 changes: 1 addition & 1 deletion zkbind/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<groupId>org.zkoss.zk</groupId>
<artifactId>zk-parent</artifactId>
<relativePath>../zk-parent/pom.xml</relativePath>
<version>9.6.5-SNAPSHOT</version>
<version>9.6.6-SNAPSHOT</version>
</parent>
<artifactId>zkbind</artifactId>
<packaging>jar</packaging>
Expand Down
4 changes: 2 additions & 2 deletions zkbind/src/archive/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
Specification-Title: ZK Bind
Specification-Version: 9.6.5
Specification-Version: 9.6.6
Specification-Vendor: Potix Corporation
Implementation-Title: org.zkoss.bind
Implementation-URL: http://www.zkoss.org/prj/zkbind
Implementation-Version: 9.6.5
Implementation-Version: 9.6.6
Implementation-Vendor: Potix Corporation
2 changes: 1 addition & 1 deletion zkbind/src/archive/metainfo/zk/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Copyright (C) 2011 Potix Corporation. All Rights Reserved.

<version>
<version-class>org.zkoss.bind.Version</version-class>
<version-uid>9.6.5</version-uid>
<version-uid>9.6.6</version-uid>
</version>

<listener>
Expand Down
4 changes: 2 additions & 2 deletions zkbind/src/archive/metainfo/zk/lang-addon.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ Copyright (C) 2011 Potix Corporation. All Rights Reserved.
<javascript package="zkbind"/>
<version>
<version-class>org.zkoss.bind.Version</version-class>
<version-uid>9.6.5</version-uid>
<zk-version>9.6.5</zk-version><!-- or later -->
<version-uid>9.6.6</version-uid>
<zk-version>9.6.6</zk-version><!-- or later -->
</version>

<zscript language="Java">
Expand Down
2 changes: 1 addition & 1 deletion zkbind/src/org/zkoss/bind/Version.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@
public class Version {
/** Returns the version UID.
*/
public static final String UID = "9.6.5";
public static final String UID = "9.6.6";
}
2 changes: 1 addition & 1 deletion zkbind/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9.6.5
9.6.6
9 changes: 9 additions & 0 deletions zkdoc/release-note
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
ZK 9.6.6
* Features

* Bugs

* Upgrade Notes

--------
ZK 9.6.5
Mar 5, 2024
* Features
ZK-5142: Handle GET and POST requests more strictly
ZK-5619: Review and update 3rd party dependencies
Expand Down
2 changes: 1 addition & 1 deletion zkplus-legacy/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<groupId>org.zkoss.zk</groupId>
<artifactId>zk-parent</artifactId>
<relativePath>../zk-parent/pom.xml</relativePath>
<version>9.6.5-SNAPSHOT</version>
<version>9.6.6-SNAPSHOT</version>
</parent>
<artifactId>zkplus-legacy</artifactId>
<packaging>jar</packaging>
Expand Down
4 changes: 2 additions & 2 deletions zkplus-legacy/src/archive/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
Specification-Title: The ZK Plus Utilities (Legacy)
Specification-Version: 9.6.5
Specification-Version: 9.6.6
Specification-Vendor: Potix Corporation
Implementation-Title: org.zkoss.zkplus
Implementation-URL: http://www.zkoss.org/prj/zkplus-legacy
Implementation-Version: 9.6.5
Implementation-Version: 9.6.6
Implementation-Vendor: Potix Corporation
4 changes: 2 additions & 2 deletions zkplus-legacy/src/archive/metainfo/zk/lang-addon.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ Copyright (C) 2006 Potix Corporation. All Rights Reserved.
<language-name>xul/html</language-name>
<version>
<version-class>org.zkoss.zkplus.legacy.Version</version-class>
<version-uid>9.6.5</version-uid>
<zk-version>9.6.5</zk-version><!-- or later -->
<version-uid>9.6.6</version-uid>
<zk-version>9.6.6</zk-version><!-- or later -->
</version>
<zscript language="Java">
import org.zkoss.zkplus.databind.*;
Expand Down
2 changes: 1 addition & 1 deletion zkplus-legacy/src/org/zkoss/zkplus/legacy/Version.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@
public class Version {
/** Returns the version UID.
*/
public static final String UID = "9.6.5";
public static final String UID = "9.6.6";
}
2 changes: 1 addition & 1 deletion zkplus-legacy/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9.6.5
9.6.6
2 changes: 1 addition & 1 deletion zkplus/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<groupId>org.zkoss.zk</groupId>
<artifactId>zk-parent</artifactId>
<relativePath>../zk-parent/pom.xml</relativePath>
<version>9.6.5-SNAPSHOT</version>
<version>9.6.6-SNAPSHOT</version>
</parent>
<artifactId>zkplus</artifactId>
<packaging>jar</packaging>
Expand Down
4 changes: 2 additions & 2 deletions zkplus/src/archive/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
Specification-Title: The ZK Plus Utilities
Specification-Version: 9.6.5
Specification-Version: 9.6.6
Specification-Vendor: Potix Corporation
Implementation-Title: org.zkoss.zkplus
Implementation-URL: http://www.zkoss.org/prj/zkplus
Implementation-Version: 9.6.5
Implementation-Version: 9.6.6
Implementation-Vendor: Potix Corporation
4 changes: 2 additions & 2 deletions zkplus/src/archive/metainfo/zk/lang-addon.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Copyright (C) 2006 Potix Corporation. All Rights Reserved.
<language-name>xul/html</language-name>
<version>
<version-class>org.zkoss.zkplus.Version</version-class>
<version-uid>9.6.5</version-uid>
<zk-version>9.6.5</zk-version><!-- or later -->
<version-uid>9.6.6</version-uid>
<zk-version>9.6.6</zk-version><!-- or later -->
</version>
</language-addon>
2 changes: 1 addition & 1 deletion zkplus/src/org/zkoss/zkplus/Version.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@
public class Version {
/** Returns the version UID.
*/
public static final String UID = "9.6.5";
public static final String UID = "9.6.6";
}
2 changes: 1 addition & 1 deletion zkplus/version
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
9.6.5
9.6.6
deprecation=off
2 changes: 1 addition & 1 deletion zksandbox/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<groupId>org.zkoss.zk</groupId>
<artifactId>zk-parent</artifactId>
<relativePath>../zk-parent/pom.xml</relativePath>
<version>9.6.5-SNAPSHOT</version>
<version>9.6.6-SNAPSHOT</version>
</parent>
<artifactId>zksandbox</artifactId>
<properties>
Expand Down
4 changes: 2 additions & 2 deletions zksandbox/src/archive/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
Specification-Title: ZK DEMO
Specification-Version: 9.6.5
Specification-Version: 9.6.6
Specification-Vendor: Potix Corporation
Implementation-Title: org.zkoss.zksandbox
Implementation-URL: http://www.zkoss.org/prj/zksandbox
Implementation-Version: 9.6.5
Implementation-Version: 9.6.6
Implementation-Vendor: Potix Corporation
2 changes: 1 addition & 1 deletion zksandbox/version
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
9.6.5
9.6.6
unchecked=off
deprecation=off
4 changes: 2 additions & 2 deletions zksandboxs/src/archive/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
Specification-Title: ZK Demo
Specification-Version: 9.6.5
Specification-Version: 9.6.6
Specification-Vendor: Potix Corporation
Implementation-Title: org.zkoss.zksandbox
Implementation-URL: http://www.zkoss.org/prj/zksandbox
Implementation-Version: 9.6.5
Implementation-Version: 9.6.6
Implementation-Vendor: Potix Corporation
2 changes: 1 addition & 1 deletion zksandboxs/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9.6.5
9.6.6
Loading
Loading