You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by vl...@apache.org on 2023/06/02 19:49:06 UTC
[jmeter] branch master updated: Revert "fix(deps): update dependency com.sun.mail:all to v1.6.7 (#5867)"
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
The following commit(s) were added to refs/heads/master by this push:
new 1a295da0d6 Revert "fix(deps): update dependency com.sun.mail:all to v1.6.7 (#5867)"
1a295da0d6 is described below
commit 1a295da0d629c66f9c462f3e98aa72251fc5b769
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Fri Jun 2 22:47:01 2023 +0300
Revert "fix(deps): update dependency com.sun.mail:all to v1.6.7 (#5867)"
This reverts commit e09b6116918bafa59691260cf22b361779ff622e.
---
src/licenses/build.gradle.kts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/licenses/build.gradle.kts b/src/licenses/build.gradle.kts
index e0572a9a75..f1b45341e1 100644
--- a/src/licenses/build.gradle.kts
+++ b/src/licenses/build.gradle.kts
@@ -140,7 +140,7 @@ val gatherBinaryLicenses by tasks.registering(GatherLicenseTask::class) {
expectedLicense = SpdxLicense.MIT
}
- overrideLicense("com.sun.mail:all:1.6.7") {
+ overrideLicense("com.sun.mail:all") {
// Multiple licenses, specify explicitly
expectedLicense = SimpleLicense("CDDL", uri("http://www.sun.com/cddl")) and SimpleLicense("GPLv2+CE", uri("https://glassfish.java.net/public/CDDL+GPL_1_1.html"))
effectiveLicense = SpdxLicense.CDDL_1_0 and (SpdxLicense.GPL_2_0_or_later with SpdxLicenseException.Classpath_exception_2_0)