You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2020/12/28 15:22:50 UTC
[axis-axis2-java-core] branch master updated: Update commons-io
This is an automated email from the ASF dual-hosted git repository.
veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
The following commit(s) were added to refs/heads/master by this push:
new a7b1336 Update commons-io
a7b1336 is described below
commit a7b1336587b751b10fd058fc154458bdb6c47c39
Author: Andreas Veithen <an...@gmail.com>
AuthorDate: Mon Dec 28 15:22:31 2020 +0000
Update commons-io
---
modules/osgi-tests/src/test/java/OSGiTest.java | 6 +-----
pom.xml | 3 +--
systests/webapp-tests/pom.xml | 10 ----------
3 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/modules/osgi-tests/src/test/java/OSGiTest.java b/modules/osgi-tests/src/test/java/OSGiTest.java
index b1bb0d9..39f3650 100644
--- a/modules/osgi-tests/src/test/java/OSGiTest.java
+++ b/modules/osgi-tests/src/test/java/OSGiTest.java
@@ -67,12 +67,8 @@ public class OSGiTest {
url("link:classpath:org.apache.james.apache-mime4j-core.link"),
url("link:classpath:org.apache.ws.commons.axiom.axiom-api.link"),
url("link:classpath:org.apache.ws.commons.axiom.axiom-impl.link"),
- // commons-file upload 1.4 changed the MANIFEST.MF file from:
- // Bundle-SymbolicName: org.apache.commons.fileupload
- // to:
- // Bundle-SymbolicName: org.apache.commons.commons-fileupload
url("link:classpath:org.apache.commons.commons-fileupload.link"),
- url("link:classpath:org.apache.commons.io.link"),
+ url("link:classpath:org.apache.commons.commons-io.link"),
url("link:classpath:org.apache.servicemix.bundles.commons-httpclient.link"), // TODO: still necessary???
url("link:classpath:org.apache.servicemix.bundles.commons-codec.link"), // TODO: still necessary???
url("link:classpath:org.apache.httpcomponents.httpcore.link"),
diff --git a/pom.xml b/pom.xml
index 27cd9f7..7a44ff8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -501,7 +501,6 @@
<bsf.version>2.4.0</bsf.version>
<commons.fileupload.version>1.4</commons.fileupload.version>
<commons.httpclient.version>3.1</commons.httpclient.version>
- <commons.io.version>2.1</commons.io.version>
<commons.logging.version>1.2</commons.logging.version>
<fi.version>2.0.0</fi.version>
<geronimo.spec.annotation.version>1.1.1</geronimo.spec.annotation.version>
@@ -846,7 +845,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>${commons.io.version}</version>
+ <version>2.8.0</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
diff --git a/systests/webapp-tests/pom.xml b/systests/webapp-tests/pom.xml
index 6597f8c..fd5a4e8 100644
--- a/systests/webapp-tests/pom.xml
+++ b/systests/webapp-tests/pom.xml
@@ -58,16 +58,6 @@
<scope>test</scope>
</dependency>
</dependencies>
- <!-- htmlunit requires newer versions of certain libraries -->
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.4</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
<build>
<plugins>
<plugin>