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.

Sign up for GitHub

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

ZCS-8339: Compiling zm-mailbox against JDK13 #160

Open
wants to merge 9 commits into
base: develop
Choose a base branch
from
Open

ZCS-8339: Compiling zm-mailbox against JDK13 #160

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6695dc8
ZCS-8339: add support for jdk13
nileshpawar1 Dec 18, 2019
b079b2f
ZCS-8339: removed junixsocket entries
nileshpawar1 Dec 19, 2019
58ac7fc
ZCS-8339: Compiling zm-mailbox against JDK13
nileshpawar1 Dec 24, 2019
4e18ced
ZCS-8339: junixsocket changes for jdk13
nileshpawar1 Jan 17, 2020
a86ed32
ZCS-8339: junixsocket testing for jdk13
nileshpawar1 Jan 18, 2020
4302131
ZCS-8339: junixsocket testing for jdk13
nileshpawar1 Jan 18, 2020
b881b9b
ZCS-8339: updated libjunixsocket-native file path
nileshpawar1 Jan 21, 2020
6ee307e
ZCS-8339: typo fix
nileshpawar1 Jan 21, 2020
69ed197
ZCS-8339: Fix file copy issue
nileshpawar1 Jan 21, 2020
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 instructions/FOSS_repo_list.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{ name => "ant-1.7.0-ziputil-patched", },
{ name => "ant-tar-patched", },
{ name => "ical4j-0.9.16-patched", },
{ name => "junixsocket", tag => "junixsocket-parent-2.0.4", remote => "gh-ks",},
# { name => "junixsocket", tag => "junixsocket-parent-2.2.1", remote => "gh-ks",},
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this is commented.

{ name => "nekohtml-1.9.13", },
{ name => "java-html-sanitizer-release-20190610.1",remote => "zm-ow",},
{ name => "antisamy", remote => "zm-ow", },
Expand Down
9 changes: 0 additions & 9 deletions instructions/FOSS_staging_list.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,6 @@
"ant_targets" => ["pkg"],
"deploy_pkg_into" => "bundle",
},
{
"dir" => "junixsocket/junixsocket-native",
"mvn_targets" => ["package"],
"stage_cmd" => sub {
SysExec("mkdir -p $CFG{BUILD_DIR}/junixsocket/junixsocket-native/build");
SysExec("cp -f target/nar/junixsocket-native-*/lib/*/jni/libjunixsocket-native-*.so $CFG{BUILD_DIR}/junixsocket/junixsocket-native/build/");
SysExec("cp -f target/junixsocket-native-*.nar $CFG{BUILD_DIR}/junixsocket/junixsocket-native/build/");
},
},
{
"dir" => "zm-taglib",
"ant_targets" => ["publish-local"],
Expand Down
4 changes: 2 additions & 2 deletions instructions/bundling-scripts/zimbra-core.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,8 +580,8 @@ main()
Copy ${repoDir}/zm-mta/zmconfigd/smtpd_sender_login_maps.cf ${repoDir}/zm-build/${currentPackage}/opt/zimbra/conf/zmconfigd/smtpd_sender_login_maps.cf
Copy ${repoDir}/zm-mta/zmconfigd/smtpd_sender_restrictions.cf ${repoDir}/zm-build/${currentPackage}/opt/zimbra/conf/zmconfigd/smtpd_sender_restrictions.cf

Cpy2 ${repoDir}/junixsocket/junixsocket-native/build/junixsocket-native-*.nar ${repoDir}/zm-build/${currentPackage}/opt/zimbra/lib/
Cpy2 ${repoDir}/junixsocket/junixsocket-native/build/libjunixsocket-native-*.so ${repoDir}/zm-build/${currentPackage}/opt/zimbra/lib/
# Cpy2 ${repoDir}/junixsocket/junixsocket-native/build/junixsocket-native-*.nar ${repoDir}/zm-build/${currentPackage}/opt/zimbra/lib/
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These configurations are required or not for jdk13

# Cpy2 ${repoDir}/junixsocket/junixsocket-native/build/libjunixsocket-native-*.so ${repoDir}/zm-build/${currentPackage}/opt/zimbra/lib/

Copy ${repoDir}/zm-bulkprovision-store/build/dist/commons-csv-1.2.jar ${repoDir}/zm-build/${currentPackage}/opt/zimbra/lib/ext/com_zimbra_bulkprovision/commons-csv-1.2.jar
Copy ${repoDir}/zm-bulkprovision-store/build/dist/zm-bulkprovision-store*.jar ${repoDir}/zm-build/${currentPackage}/opt/zimbra/lib/ext/com_zimbra_bulkprovision/com_zimbra_bulkprovision.jar
Expand Down