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

1. ZK-5466: include Guava instead of closure-compiler #3013

Merged
merged 1 commit into from
Aug 23, 2023
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
Binary file added dist/lib/ext/guava.jar
Binary file not shown.
1 change: 1 addition & 0 deletions javadoc.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ def javadocClassPath = files(
"$rootDir/dist/lib/ext/js.jar",
"$rootDir/dist/lib/ext/jruby.jar",
"$rootDir/dist/lib/ext/bsh.jar",
"$rootDir/dist/lib/ext/guava.jar",
"$rootDir/dist/lib/ext/groovy.jar",
"$rootDir/dist/lib/ext/portlet-api.jar",
"$rootDir/dist/lib/ext/closure-compiler.jar",
Expand Down
1 change: 1 addition & 0 deletions release.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ task prepareBin() {
include "**/commons-logging.jar"
include "**/Filters.jar"
include "**/gson.jar"
include "**/guava.jar"
include "**/itext.jar"
include "**/jasperreports.jar"
include "**/javassist.jar"
Expand Down
3 changes: 2 additions & 1 deletion zk/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ dependencies {
compileOnly "javax.servlet:servlet-api:${servletVersion}"
compileOnly "javax.portlet:portlet-api:${portletVersion}"
compileOnly 'javax.websocket:javax.websocket-api:1.1'
api 'com.google.javascript:closure-compiler-unshaded:v20210601'
api 'com.google.guava:guava:32.1.2-jre'
optionalImplementation 'com.google.javascript:closure-compiler-unshaded:v20210601'
optionalImplementation('org.codehaus.groovy:groovy-all:1.5.6') {
exclude group: '*', module: '*'
}
Expand Down
1 change: 1 addition & 0 deletions zkdoc/release-note
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ ZK 10.0.0
ZK-5441: Provide a better way to override za11y module
ZK-5532: Remove all unsupported HTML tags in ZK 10 ZHTML
ZK-5531: Remove Applet, Flash, and FusionChart components in ZK 10
ZK-5466: include Guava instead of closure-compiler

* Bugs
ZK-5089: AfterSizeEvent doesn't return a correct size of a Window component
Expand Down