Update org.apache.commons.[io,fileupload] dependencies
- Use org.apache.commons.fileupload version 1.3.1
Bug 428508: [FileUpload] Update apache-commons-fileupload
https://bugs.eclipse.org/bugs/show_bug.cgi?id=428508
CQ 8219: Apache Commons FileUpload Version: 1.3.1
https://dev.eclipse.org/ipzilla/show_bug.cgi?id=8219
- Use org.apache.commons.io version 2.2.0
Bug 434178: [FileUpload] org.apache.commons.io version restriction
https://bugs.eclipse.org/bugs/show_bug.cgi?id=434178
CQ 8284: Apache Commons IO Version: 2.2
https://dev.eclipse.org/ipzilla/show_bug.cgi?id=8284
Change-Id: Ic838efb75e6458693ebf252e36e785a078aae9cc
Signed-off-by: Markus Knauer <mknauer@eclipsesource.com>
diff --git a/bundles/org.eclipse.rap.addons.fileupload/META-INF/MANIFEST.MF b/bundles/org.eclipse.rap.addons.fileupload/META-INF/MANIFEST.MF
index fd4cfe2..03d04a0 100644
--- a/bundles/org.eclipse.rap.addons.fileupload/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.rap.addons.fileupload/META-INF/MANIFEST.MF
@@ -8,10 +8,10 @@
Require-Bundle: org.eclipse.rap.rwt;bundle-version="[2.3.0,3.0.0)"
Import-Package: javax.servlet;version="[2.3.0,4.0.0)",
javax.servlet.http;version="[2.3.0,4.0.0)",
- org.apache.commons.fileupload;version="[1.2.2,2.0.0)",
- org.apache.commons.fileupload.disk;version="[1.2.2,2.0.0)",
- org.apache.commons.fileupload.servlet;version="[1.2.2,2.0.0)",
- org.apache.commons.io;version="[2.0.1,3.0.0)"
+ org.apache.commons.fileupload;version="[1.3.1,2.0.0)",
+ org.apache.commons.fileupload.disk;version="[1.3.1,2.0.0)",
+ org.apache.commons.fileupload.servlet;version="[1.3.1,2.0.0)",
+ org.apache.commons.io;version="[2.2.0,3.0.0)"
Export-Package: org.eclipse.rap.addons.fileupload;version="0.6.0",
org.eclipse.rap.addons.fileupload.internal;version="0.6.0";x-friends:="org.eclipse.rap.addons.fileupload.test"
Bundle-Localization: plugin
diff --git a/features/org.eclipse.rap.fileupload.feature/.forceQualifierUpdate b/features/org.eclipse.rap.fileupload.feature/.forceQualifierUpdate
new file mode 100644
index 0000000..5635300
--- /dev/null
+++ b/features/org.eclipse.rap.fileupload.feature/.forceQualifierUpdate
@@ -0,0 +1 @@
+2.3.0.20140517-1300
diff --git a/releng/org.eclipse.rap.fileupload.build/pom.xml b/releng/org.eclipse.rap.fileupload.build/pom.xml
index 37a016c..d99ff81 100644
--- a/releng/org.eclipse.rap.fileupload.build/pom.xml
+++ b/releng/org.eclipse.rap.fileupload.build/pom.xml
@@ -22,10 +22,15 @@
</parent>
<repositories>
+ <!-- we used to consume the org.apache.commons.[io,fileupload] bundles from Orbit
+ but right now we need a newer version that we need to consume from our own repository
+ until we can make these bundles available from a regular Orbit build.
+ These versions are available in our RAP base-platforms/2.3/extra-dependencies
+ repository that is already part of the build - see parent pom. -->
<repository>
<id>orbit-dependencies-repository</id>
<layout>p2</layout>
- <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20130827064939/repository</url>
+ <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20140114142710/repository</url>
</repository>
</repositories>
diff --git a/tests/org.eclipse.rap.addons.fileupload.test/META-INF/MANIFEST.MF b/tests/org.eclipse.rap.addons.fileupload.test/META-INF/MANIFEST.MF
index 85b567a..792b997 100644
--- a/tests/org.eclipse.rap.addons.fileupload.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.rap.addons.fileupload.test/META-INF/MANIFEST.MF
@@ -8,9 +8,9 @@
Bundle-Vendor: %Bundle-Vendor
Import-Package: javax.servlet;version="[2.5.0,4.0.0)",
javax.servlet.http;version="[2.5.0,4.0.0)",
- org.apache.commons.fileupload;version="1.2.2",
- org.apache.commons.fileupload.disk;version="1.2.2",
- org.apache.commons.fileupload.servlet;version="1.2.2",
+ org.apache.commons.fileupload;version="1.3.1",
+ org.apache.commons.fileupload.disk;version="1.3.1",
+ org.apache.commons.fileupload.servlet;version="1.3.1",
org.eclipse.rap.rwt.testfixture;version="[2.3.0,3.0.0)"
Require-Bundle: org.junit;bundle-version="[4.8.2,5.0.0)",
org.eclipse.rap.rwt;bundle-version="[2.3.0,3.0.0)",
