aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPJ Fanning <fanningpj@apache.org>2024-11-12 09:52:42 +0000
committerPJ Fanning <fanningpj@apache.org>2024-11-12 09:52:42 +0000
commit7bc2dced2f7d7506b7e3d197635fe2fcaaebe16d (patch)
tree2c8c138782c64aec0214233b7222839a079506ad
parent1d620e87143fffd6e49abf1f2e19631b4313656c (diff)
downloadpoi-7bc2dced2f7d7506b7e3d197635fe2fcaaebe16d.tar.gz
poi-7bc2dced2f7d7506b7e3d197635fe2fcaaebe16d.zip
revert log4j and xmlbeans upgrades due to log4j issues
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1921859 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--build.gradle4
-rw-r--r--build.xml12
-rw-r--r--osgi/pom.xml2
-rw-r--r--poi-examples/src/main/groovy/build.gradle4
4 files changed, 11 insertions, 11 deletions
diff --git a/build.gradle b/build.gradle
index 722f134277..c26317ef68 100644
--- a/build.gradle
+++ b/build.gradle
@@ -124,10 +124,10 @@ subprojects {
commonsIoVersion = '2.17.0'
commonsMathVersion = '3.6.1'
junitVersion = '5.11.3'
- log4jVersion = '2.24.1'
+ log4jVersion = '2.23.1'
mockitoVersion = '4.11.0'
hamcrestVersion = '3.0'
- xmlbeansVersion = '5.2.2'
+ xmlbeansVersion = '5.2.1'
batikVersion = '1.18'
graphics2dVersion = '3.0.2'
pdfboxVersion = '3.0.3'
diff --git a/build.xml b/build.xml
index 11f99b889e..84684d444c 100644
--- a/build.xml
+++ b/build.xml
@@ -268,7 +268,7 @@ under the License.
<dependency prefix="main.commons-math3" artifact="org.apache.commons:commons-math3:3.6.1" usage="main"/>
<dependency prefix="main.commons-io" artifact="commons-io:commons-io:2.17.0" usage="main"/>
<dependency prefix="main.com.zaxxer" artifact="com.zaxxer:SparseBitSet:1.3" usage="main"/>
- <dependency prefix="main.log4j-api" artifact="org.apache.logging.log4j:log4j-api:2.24.1" usage="main"/>
+ <dependency prefix="main.log4j-api" artifact="org.apache.logging.log4j:log4j-api:2.23.1" usage="main"/>
<dependency prefix="main.junit-api" artifact="org.junit.jupiter:junit-jupiter-api:5.11.3" usage="main-tests"/>
<dependency prefix="main.junit-jengine" artifact="org.junit.jupiter:junit-jupiter-engine:5.11.3" usage="main-tests"/>
@@ -288,7 +288,7 @@ under the License.
<dependency prefix="main.byte-buddy" artifact="net.bytebuddy:byte-buddy:1.15.10" usage="main-tests"/>
<dependency prefix="main.byte-buddy-agent" artifact="net.bytebuddy:byte-buddy-agent:1.15.10" usage="main-tests"/>
<dependency prefix="main.objenesis" artifact="org.objenesis:objenesis:3.1" usage="main-tests"/>
- <dependency prefix="main.log4j-core" artifact="org.apache.logging.log4j:log4j-core:2.24.1" usage="main-tests"/>
+ <dependency prefix="main.log4j-core" artifact="org.apache.logging.log4j:log4j-core:2.23.1" usage="main-tests"/>
<dependency prefix="main.commons-logging" artifact="commons-logging:commons-logging:1.2" usage="main-tests"/>
<dependency prefix="main.ant" artifact="org.apache.ant:ant:1.10.15" usage="excelant"/>
@@ -332,7 +332,7 @@ under the License.
<!-- jars in the ooxml-lib directory, see the fetch-ooxml-jars target-->
<dependency prefix="ooxml.curvesapi" artifact="com.github.virtuald:curvesapi:1.08" usage="ooxml"/>
- <dependency prefix="ooxml.xmlbeans" artifact="org.apache.xmlbeans:xmlbeans:5.2.2" usage="ooxml"/>
+ <dependency prefix="ooxml.xmlbeans" artifact="org.apache.xmlbeans:xmlbeans:5.2.1" usage="ooxml"/>
<dependency prefix="ooxml.commons-compress" artifact="org.apache.commons:commons-compress:1.27.1" usage="ooxml"/>
<dependency prefix="ooxml.commons-lang3" artifact="org.apache.commons:commons-lang3:3.12.0" usage="ooxml"/>
@@ -2582,9 +2582,9 @@ under the License.
<dependency prefix="spotbugs.commons-logging" artifact="commons-logging:commons-logging:1.2" usage="${spotbugs.lib}"/>
<dependency prefix="spotbugs.jcip-annotations" artifact="net.jcip:jcip-annotations:1.0" usage="${spotbugs.lib}"/>
<dependency prefix="spotbugs.icu4j" artifact="com.ibm.icu:icu4j:68.2" usage="${spotbugs.lib}" target="icu4j-68.2.jar"/>
- <dependency prefix="spotbugs.log4j-api" artifact="org.apache.logging.log4j:log4j-api:2.24.1" usage="${spotbugs.lib}"/>
- <dependency prefix="spotbugs.log4j-core" artifact="org.apache.logging.log4j:log4j-core:2.24.1" usage="${spotbugs.lib}"/>
- <dependency prefix="spotbugs.log4j-slf4j18-impl" artifact="org.apache.logging.log4j:log4j-slf4j2-impl:2.24.1" usage="${spotbugs.lib}"/>
+ <dependency prefix="spotbugs.log4j-api" artifact="org.apache.logging.log4j:log4j-api:2.23.1" usage="${spotbugs.lib}"/>
+ <dependency prefix="spotbugs.log4j-core" artifact="org.apache.logging.log4j:log4j-core:2.23.1" usage="${spotbugs.lib}"/>
+ <dependency prefix="spotbugs.log4j-slf4j18-impl" artifact="org.apache.logging.log4j:log4j-slf4j2-impl:2.23.1" usage="${spotbugs.lib}"/>
<dependency prefix="spotbugs.saxon" artifact="net.sf.saxon:Saxon-HE:12.5" usage="${spotbugs.lib}"/>
<dependency prefix="spotbugs.xmlresolver" artifact="org.xmlresolver:xmlresolver:4.2.0" usage="${spotbugs.lib}"/>
diff --git a/osgi/pom.xml b/osgi/pom.xml
index 8b1a8cc1d2..b43bb22554 100644
--- a/osgi/pom.xml
+++ b/osgi/pom.xml
@@ -231,7 +231,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
- <version>2.24.1</version>
+ <version>2.23.1</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/poi-examples/src/main/groovy/build.gradle b/poi-examples/src/main/groovy/build.gradle
index cc8e6f738f..653471e501 100644
--- a/poi-examples/src/main/groovy/build.gradle
+++ b/poi-examples/src/main/groovy/build.gradle
@@ -23,8 +23,8 @@ repositories {
}
dependencies {
compile 'org.codehaus.groovy:groovy-all:2.4.21'
- compile 'org.apache.poi:poi:5.2.2'
- compile 'org.apache.poi:poi-ooxml:5.2.2'
+ compile 'org.apache.poi:poi:5.2.1'
+ compile 'org.apache.poi:poi-ooxml:5.2.1'
}
// Our files are in the current directory