Skip to content

Commit 00847a5

Browse files
committed
Merge branch 'rel-11_0' into rel-11_1
2 parents 75f3271 + fdeaf02 commit 00847a5

2 files changed

Lines changed: 2 additions & 14 deletions

File tree

cpanfile

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -293,11 +293,6 @@ feature 'div:hanextra', 'Support for feature div:hanextra' => sub {
293293

294294
};
295295

296-
feature 'div:iocompress', 'Support for feature div:iocompress' => sub {
297-
requires 'IO::Compress';
298-
299-
};
300-
301296
feature 'div:ldap', 'Support for feature div:ldap' => sub {
302297
# Required for directory authentication.
303298
requires 'Net::LDAP';
@@ -405,8 +400,6 @@ feature 'optional', 'Support for feature optional' => sub {
405400
# Required for authentication via OpenIDConnect.
406401
requires 'Crypt::JWT';
407402

408-
requires 'IO::Compress';
409-
410403
# Required to handle mails with several Chinese character sets.
411404
requires 'Encode::HanExtra', '>= 0.23';
412405

cpanfile.docker

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# ./bin/otobo.CheckModules.pl --docker-cpanfile > cpanfile.docker
44

55
# Required for compressed file generation (in perlcore).
6-
requires 'Archive::Tar', '3.12';
6+
requires 'Archive::Tar';
77

88
# Required for compressed file generation. Needed by Excel::Writer::XSLX, which is used in Kernel::System::CSV
99
requires 'Archive::Zip';
@@ -45,7 +45,7 @@ requires 'HTML::Parser', '3.75';
4545
# HTTP style message
4646
requires 'HTTP::Message', '>= 6.18';
4747

48-
requires 'HTTP::Tiny', '0.096';
48+
requires 'HTTP::Tiny';
4949

5050
# Required for SSL connections to web and mail servers
5151
# Please consider updating to version 2.066 or higher: This version fixes email sending (bug#14357).
@@ -281,11 +281,6 @@ requires 'Plack::Middleware::ReverseProxy';
281281

282282
# };
283283

284-
# feature 'div:iocompress', 'Support for feature div:iocompress' => sub {
285-
requires 'IO::Compress', '2.220';
286-
287-
# };
288-
289284
# feature 'div:ldap', 'Support for feature div:ldap' => sub {
290285
# Required for directory authentication.
291286
requires 'Net::LDAP';

0 commit comments

Comments
 (0)