From 488739ddcb2de3a3e2c99c26823155ff42c0c8fd Mon Sep 17 00:00:00 2001
From: Markus Knauer <mknauer@eclipsesource.com>
Date: Wed, 24 Aug 2022 12:00:00 +0000
Subject: [PATCH] Upgrade Apache commons-fileupload to version 1.4.0

This change also includes Apache `commons-io` in version 2.11.0.

Update lower version boundaries of Apache `commons-fileupload` and
`commons-io` to the version of the updated bundles in order to ensure
that the correct versions are selected at runtime.

The new bundles are consumed from Eclipse Platform which retrieves them
from Maven Central. As part of this process, the bundle symbolic name of
the bundles changed:

- `org.apache.commons.fileupload` to `org.apache.commons.commons-fileupload`
- `org.apache.commons.io` to `org.apache.commons.commons-io`

Update features, demo launch configurations, and demo product
definitions to the new name.

This fixes #41.
---
 bundles/org.eclipse.rap.fileupload/META-INF/MANIFEST.MF   | 8 ++++----
 .../launch/RAP Controls Demo.launch                       | 4 ++--
 .../launch/RAP Examples Demo.launch                       | 4 ++--
 .../org.eclipse.rap.e4.equinox.target.feature/feature.xml | 4 ++--
 .../org.eclipse.rap.equinox.target.feature/feature.xml    | 4 ++--
 .../rapdemo/org.eclipse.rap.examples.rapdemo.product      | 4 ++--
 .../org.eclipse.rap.fileupload.test/META-INF/MANIFEST.MF  | 6 +++---
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/bundles/org.eclipse.rap.fileupload/META-INF/MANIFEST.MF b/bundles/org.eclipse.rap.fileupload/META-INF/MANIFEST.MF
index bc33381127..39a60249d8 100644
--- a/bundles/org.eclipse.rap.fileupload/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.rap.fileupload/META-INF/MANIFEST.MF
@@ -8,10 +8,10 @@ Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.rap.rwt;bundle-version="[3.22.0,4.0.0)"
 Import-Package: javax.servlet;version="[3.1.0,5.0.0)",
  javax.servlet.http;version="[3.1.0,5.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)"
+ org.apache.commons.fileupload;version="[1.4.0,2.0.0)",
+ org.apache.commons.fileupload.disk;version="[1.4.0,2.0.0)",
+ org.apache.commons.fileupload.servlet;version="[1.4.0,2.0.0)",
+ org.apache.commons.io;version="[2.11.0,3.0.0)"
 Export-Package: org.eclipse.rap.fileupload;version="3.22.0",
  org.eclipse.rap.fileupload.internal;version="3.22.0";x-friends:="org.eclipse.rap.fileupload.test"
 Bundle-Localization: plugin
diff --git a/examples/org.eclipse.rap.demo.controls/launch/RAP Controls Demo.launch b/examples/org.eclipse.rap.demo.controls/launch/RAP Controls Demo.launch
index 960e85da96..d4b0d9fff6 100644
--- a/examples/org.eclipse.rap.demo.controls/launch/RAP Controls Demo.launch	
+++ b/examples/org.eclipse.rap.demo.controls/launch/RAP Controls Demo.launch	
@@ -39,8 +39,8 @@
     <stringAttribute key="pde.version" value="3.3"/>
     <setAttribute key="selected_target_bundles">
         <setEntry value="com.ibm.icu"/>
-        <setEntry value="org.apache.commons.fileupload"/>
-        <setEntry value="org.apache.commons.io"/>
+        <setEntry value="org.apache.commons.commons-fileupload"/>
+        <setEntry value="org.apache.commons.commons-io"/>
         <setEntry value="org.apache.felix.gogo.command"/>
         <setEntry value="org.apache.felix.gogo.runtime"/>
         <setEntry value="org.apache.felix.gogo.shell"/>
diff --git a/examples/org.eclipse.rap.examples/launch/RAP Examples Demo.launch b/examples/org.eclipse.rap.examples/launch/RAP Examples Demo.launch
index 7d5aeedcb7..234aed3b81 100644
--- a/examples/org.eclipse.rap.examples/launch/RAP Examples Demo.launch	
+++ b/examples/org.eclipse.rap.examples/launch/RAP Examples Demo.launch	
@@ -39,8 +39,8 @@
     <stringAttribute key="pde.version" value="3.3"/>
     <setAttribute key="selected_target_bundles">
         <setEntry value="com.ibm.icu"/>
-        <setEntry value="org.apache.commons.fileupload"/>
-        <setEntry value="org.apache.commons.io"/>
+        <setEntry value="org.apache.commons.commons-fileupload"/>
+        <setEntry value="org.apache.commons.commons-io"/>
         <setEntry value="org.apache.felix.gogo.command"/>
         <setEntry value="org.apache.felix.gogo.runtime"/>
         <setEntry value="org.apache.felix.gogo.shell"/>
diff --git a/features/org.eclipse.rap.e4.equinox.target.feature/feature.xml b/features/org.eclipse.rap.e4.equinox.target.feature/feature.xml
index b7e80657f3..460e304528 100644
--- a/features/org.eclipse.rap.e4.equinox.target.feature/feature.xml
+++ b/features/org.eclipse.rap.e4.equinox.target.feature/feature.xml
@@ -793,14 +793,14 @@
          unpack="false"/>
 
    <plugin
-         id="org.apache.commons.fileupload"
+         id="org.apache.commons.commons-fileupload"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.apache.commons.io"
+         id="org.apache.commons.commons-io"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/features/org.eclipse.rap.equinox.target.feature/feature.xml b/features/org.eclipse.rap.equinox.target.feature/feature.xml
index e50f9abf96..f98b08f6df 100644
--- a/features/org.eclipse.rap.equinox.target.feature/feature.xml
+++ b/features/org.eclipse.rap.equinox.target.feature/feature.xml
@@ -793,14 +793,14 @@
          unpack="false"/>
 
    <plugin
-         id="org.apache.commons.fileupload"
+         id="org.apache.commons.commons-fileupload"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.apache.commons.io"
+         id="org.apache.commons.commons-io"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/releng/org.eclipse.rap.examples.build/rapdemo/org.eclipse.rap.examples.rapdemo.product b/releng/org.eclipse.rap.examples.build/rapdemo/org.eclipse.rap.examples.rapdemo.product
index e38a549c24..e1edc14506 100644
--- a/releng/org.eclipse.rap.examples.build/rapdemo/org.eclipse.rap.examples.rapdemo.product
+++ b/releng/org.eclipse.rap.examples.build/rapdemo/org.eclipse.rap.examples.rapdemo.product
@@ -11,8 +11,8 @@
 
    <plugins>
       <plugin id="com.ibm.icu"/>
-      <plugin id="org.apache.commons.fileupload"/>
-      <plugin id="org.apache.commons.io"/>
+      <plugin id="org.apache.commons.commons-fileupload"/>
+      <plugin id="org.apache.commons.commons-io"/>
       <plugin id="org.apache.felix.gogo.command"/>
       <plugin id="org.apache.felix.gogo.runtime"/>
       <plugin id="org.apache.felix.gogo.shell"/>
diff --git a/tests/org.eclipse.rap.fileupload.test/META-INF/MANIFEST.MF b/tests/org.eclipse.rap.fileupload.test/META-INF/MANIFEST.MF
index ffc0103b9a..73a2284049 100644
--- a/tests/org.eclipse.rap.fileupload.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.rap.fileupload.test/META-INF/MANIFEST.MF
@@ -8,9 +8,9 @@ Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Import-Package: javax.servlet;version="[3.1.0,5.0.0)",
  javax.servlet.http;version="[3.1.0,5.0.0)",
- 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.apache.commons.fileupload;version="1.4.0",
+ org.apache.commons.fileupload.disk;version="1.4.0",
+ org.apache.commons.fileupload.servlet;version="1.4.0",
  org.eclipse.rap.rwt.testfixture;version="[3.22.0,4.0.0)",
  org.eclipse.rap.rwt.testfixture.internal;version="[3.22.0,4.0.0)",
  org.eclipse.rap.rwt.testfixture.internal.engine;version="[3.22.0,4.0.0)",