From a3b3b91d5034a192daa767b97c7a7caf1ab3d9c5 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Thu, 2 Jun 2022 08:37:32 +0000 Subject: [PATCH] update key git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1901544 13f79535-47bb-0310-9956-ffa450edef68 --- KEYS | 53 ++++++++++++++++--------------- poi-ooxml-full/build.gradle | 4 ++- poi-ooxml-lite-agent/build.gradle | 3 +- poi-ooxml-lite/build.gradle | 3 +- poi-ooxml/build.gradle | 3 +- 5 files changed, 37 insertions(+), 29 deletions(-) diff --git a/KEYS b/KEYS index 31c1289be2..e376c6bc3d 100644 --- a/KEYS +++ b/KEYS @@ -2545,11 +2545,14 @@ bpjAhwE2YmGQ7oB+3V798HtAmceRNf8AY0GWrZswJlg7xUn+WJNwQ9uIHI1fxYHx 2Nr+AmDDs6ZOEI5zhwxioePw/Cg= =9lKb -----END PGP PUBLIC KEY BLOCK----- -pub rsa2048 2018-05-02 [SC] [expires: 2022-05-17] - 6BA4DA8B1C88A49428A29C3D0C69C1EF41181E13 -uid [ultimate] PJ Fanning (http://www.apache.org/) +pub rsa2048 2018-05-02 [SC] [expires: 2024-05-25] + 6BA4 DA8B 1C88 A494 28A2 9C3D 0C69 C1EF 4118 1E13 uid [ultimate] PJ Fanning -sub rsa2048 2018-05-02 [E] [expires: 2022-05-17] +sig 3 0C69C1EF41181E13 2022-04-06 PJ Fanning +uid [ultimate] PJ Fanning (http://www.apache.org/) +sig 3 0C69C1EF41181E13 2022-04-06 PJ Fanning +sub rsa2048 2018-05-02 [E] [expires: 2024-05-25] +sig 0C69C1EF41181E13 2022-04-06 PJ Fanning -----BEGIN PGP PUBLIC KEY BLOCK----- @@ -2561,34 +2564,34 @@ TOwYB1p9tKPHvfni1qgD3QLWUJ2oyBGSA9IgEF5rm8LtR6vADKQwORjg99a7HE2h lDBZi/tmu23fgWSioiy084fB5GqmApK/681DABEBAAG0OlBKIEZhbm5pbmcgKGh0 dHA6Ly93d3cuYXBhY2hlLm9yZy8pIDxmYW5uaW5ncGpAYXBhY2hlLm9yZz6JAVQE EwEIAD4CGwMFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AWIQRrpNqLHIiklCiinD0M -acHvQRgeEwUCXsE82gUJB5owBAAKCRAMacHvQRgeE6ZAB/40Lysb8A5J1PtwJhdJ -m236LINbMmPhqTkTa45ozjOAXBKKGiUyoCmUjcc22hbcB6f3RmE59MP9YBfIbuP9 -F9pujP5QdFzGf8sdZ5qwvLEePng0CDwy18+aQtCV2GWYKuO5gL2AubRo2pRCZirL -zftnZm3pctRESXhbDae1PjMjWCsvMaTrqZLzkYMsypsrzLiXPpVgXgMW37IHFsIP -cLPWvKgipaUeXHFT/3lcZl9MlUO/X/URrGjHL1EJVgLPhmGZcq7+VU5RqBWdhduQ -HUwYPOpKFhDjbj1du8effvdurJTZamJH/gS1N6r+V073J6dIQOHw9Mu81RNHBlwi -1QUntCBQSiBGYW5uaW5nIDxmYW5uaW5ncGpAeWFob28uY29tPokBVAQTAQgAPgIb +acHvQRgeEwUCYk2YRAUJC2h2bgAKCRAMacHvQRgeE7nTB/4tZq9/gQcpCKgPVKI8 +MKtY/NWOc9nRr5LrNjY/qFU2Z2gMoUQT1fIBm6gjd9iI92QgLMeekuR2fXBBOx3y +JbiklXfQVGytEOochkemylwtaCZTHB61KWkemDfS+YeG3qBKwFa5B+zJvp7LqYdQ +GrNFFgtHwkhNiviDN7JFxsMGM2IpopgvNYB72B35q3YnrDsgDNlD3eraKU25sMx7 +2vNHABrdHzd1ZnKDA1hSV6any5Ifw4NJsPaM0RrmwuwoWkL7WHPftbqkM0zy6RIe +O+2tlKsJ6cKfOCYL9fbS7/UmkVVcrSLpJCCwmdsra3/57uha7TofDvl+R32CWzrv +yWfXtCBQSiBGYW5uaW5nIDxmYW5uaW5ncGpAeWFob28uY29tPokBVAQTAQgAPgIb AwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgBYhBGuk2osciKSUKKKcPQxpwe9BGB4T -BQJewTzaBQkHmjAEAAoJEAxpwe9BGB4TW1gH+gOewMCrUGRSh9r3oS8wnL/cHXxF -9+S0dXmLP4T4zGJtz7Q6h0RPIorY7jwAFzzU0zohFIB7/9ECo9dKFmuGlYlNLNax -d4if7QFxdC/yCuZOrvUUhWus/f+7hM06E7qQ+64DhJy2BBk1Kfp2mLFGtP+yVhUM -9F2seTRuJWzzC4gyRpNg8P7W1Sic/Pc0xXpEkO4JPRa9dl4DeV66Gk5HVrb+4SYV -YXFmIMqTvK9ksZs+XwcBjHsv7eA9bv3MzHKYOnM5d+BQEJUPcD52F1Y6rb41Yvrk -QQew6R3lJZio1TbZW6S86h3a1I6L+byQ1V8TjVZvaMqt5mMHRWmh/WwcOai5AQ0E +BQJiTZhKBQkLaHZuAAoJEAxpwe9BGB4T58UH/RBEOnA9TDTKTi7T4y+R1/q2SUp+ +tMzv91jhmlaDvNnA2lGVFNGj1tdy1O7xoCEEw9diKCVqVwHecuBQCaLI70r1W4Qw +qixjKJwDDnPoMKfhjuvHEHRZV0Pg+uZ50DxkFNn+bPPlXABGelliAPTvetK3ELPJ +EIRzVJkFsS0McHwXJgmIPAz8ZVlwd1/Xu21MIKOkPzgXML7uq4PN++L+mM4RmpGU +phOetyxLO1xf6ZixCoUnA7Ayi0hAKUAhu9acuc8SoDacfKm1EQ26SHUhOTNm0YCH +PPfucHJbUgqSUOYjkEftOtT0ZqVGWS7tR3iEIJu90MJ6SJRovag7khCsYY65AQ0E Wulz1gEIAORuS4e+Ek+d+0gBMlnigNJ2HoQalKFaERf5K/iQZY4E6Z2ahJ4UFIj7 ri3isWgOleP+REJJPfeSrWQ5XgdklDlHHyv4O5iMkEFWQHttiaTuvdomDncQrNRP TaIOe9iQgfQzDw6mqsb7ZWd5ICA8Krd97BwNHjq/CZ9+WrU6GDc6ImissLVVGGdk EGO7qZTqNUCeH4Znm/00mNMI4OH8xkwA2vzV5o3J5116zIuv29XQDtcSM+9NQ/Hd sjKIA0OpDyWE7Ek/SO+/CvkylwaOcmkuf33ADNjpF4BsBxn7L9XI1WJDtRaMkpbq MsymIxi35VUOGD+ms+72CcUStfYj4NEAEQEAAYkBPAQYAQgAJgIbDBYhBGuk2osc -iKSUKKKcPQxpwe9BGB4TBQJewT2iBQkHmjDMAAoJEAxpwe9BGB4TNXoIAJunpJ8r -DC5v3GMRCVu21DEIwAcAzBQhB7lK7VfDqkeB/ivCkoTpqs+ZFK2LT5uJQgRmPhF7 -xgMDn2WXrsD76eOzPr0qMr9qCa66Ou4EBywvZdPDVFJI4J5e2BgZYf5cq9YvO3qv -feL0IKFyljSCk+DPGW+A57KgGTGBMWuicSn3b6OEYewtzVWhbyFKYChZyV7fRv/i -UKo4gBqFrn4nUqDocG2Pl0qTngNL+LllThFHq9Wq5+ngMUk+Qtw8Um8xOnyNO3er -a1pShs2sKKgQwtXpEIZ+l7B193A/35RPTH1kDQSu2GBSFebQfl9yimW22T/ncEeP -dXK7AeuHr+AogJ8= -=aV2J +iKSUKKKcPQxpwe9BGB4TBQJiTZhrBQkLaHaVAAoJEAxpwe9BGB4TfjUH/24Q/H5u +vXlb/Dpx4eFcyLhRVgREoMwwAlzM5GKInHO1W7SHeD7iVR8H1XQVHTgUBNBQ1bUd +f2R2fyNAbSgCP9VooN6Q/+uTjRsm5gRD7KY5NHxjTC/SZMwKNy/haXQk/qSjDLUy +cD/2fQovuSLgoqZrTvyvz9e4JhFPk0i1it7I6KWnyyLGOItKc3Cv4p/vkD1ldYKN +XBhAxmErC9KHQK8pNi8y5z+F1JuZV74i3FRWa+3L2730qIDfR9K3jGIqOow59iqZ +c8cQLjcGU9lL4dzHh5Hcph8OC5U2aZaJOuMpCndD6XXPvq5/3QQU5rMqP//6tuVi +aAMwT8RaYPiJJPI= +=2Ips -----END PGP PUBLIC KEY BLOCK----- pub 2048R/1556F3A4 2016-10-04 uid Greg Woolsey diff --git a/poi-ooxml-full/build.gradle b/poi-ooxml-full/build.gradle index 513720a722..7a46178743 100644 --- a/poi-ooxml-full/build.gradle +++ b/poi-ooxml-full/build.gradle @@ -36,7 +36,9 @@ sourceSets { } dependencies { - api "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}" + //api "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}" + api files("/Users/pj.fanning/Downloads/xmlbeans-5.1.0.jar") + api "org.apache.logging.log4j:log4j-api:${log4jVersion}" } idea { diff --git a/poi-ooxml-lite-agent/build.gradle b/poi-ooxml-lite-agent/build.gradle index d89680f47a..e9e543f407 100644 --- a/poi-ooxml-lite-agent/build.gradle +++ b/poi-ooxml-lite-agent/build.gradle @@ -26,7 +26,8 @@ sourceSets { dependencies { api 'net.bytebuddy:byte-buddy:1.12.+' api 'net.bytebuddy:byte-buddy-agent:1.12.+' - api "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}" + //api "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}" + api files("/Users/pj.fanning/Downloads/xmlbeans-5.1.0.jar") } final MODULE_NAME = 'org.apache.poi.ooxml_lite' diff --git a/poi-ooxml-lite/build.gradle b/poi-ooxml-lite/build.gradle index 7f6c5a4776..45bc04cbde 100644 --- a/poi-ooxml-lite/build.gradle +++ b/poi-ooxml-lite/build.gradle @@ -36,7 +36,8 @@ sourceSets { } dependencies { - api "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}" + //api "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}" + api files("/Users/pj.fanning/Downloads/xmlbeans-5.1.0.jar") compileOnly project(':poi-ooxml-full') } diff --git a/poi-ooxml/build.gradle b/poi-ooxml/build.gradle index b28b7d2fcf..5ebee3bfbb 100644 --- a/poi-ooxml/build.gradle +++ b/poi-ooxml/build.gradle @@ -67,7 +67,8 @@ dependencies { api project(':poi-ooxml-full') api project(path: ':poi-ooxml-full', configuration: 'archives') - api "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}" + //api "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}" + api files("/Users/pj.fanning/Downloads/xmlbeans-5.1.0.jar") api "org.apache.commons:commons-compress:${commonsCompressVersion}" api "commons-io:commons-io:${commonsIoVersion}" api 'com.github.virtuald:curvesapi:1.07'