You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ma...@apache.org on 2019/12/26 21:18:42 UTC
[netbeans] branch master updated: Upgrade Apache commons-fileupload
from 1.3 to 1.4
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 846a026 Upgrade Apache commons-fileupload from 1.3 to 1.4
new d2d36e7 Merge pull request #1787 from pepness/commons-fileupload-1.4
846a026 is described below
commit 846a026302afa610b5ccf6b5419d9c8d6dd90e9d
Author: Jose Contreras <pe...@gmail.com>
AuthorDate: Wed Dec 11 15:18:04 2019 -0600
Upgrade Apache commons-fileupload from 1.3 to 1.4
---
enterprise/libs.commons_fileupload/external/binaries-list | 2 +-
.../external/commons-fileupload-1.3-notice.txt | 5 -----
...leupload-1.3-license.txt => commons-fileupload-1.4-license.txt} | 4 ++--
.../external/commons-fileupload-1.4-notice.txt | 5 +++++
enterprise/libs.commons_fileupload/manifest.mf | 2 +-
enterprise/libs.commons_fileupload/nbproject/project.properties | 7 ++++---
.../src/org/netbeans/libs/commons_fileupload/Bundle.properties | 4 ++--
7 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/enterprise/libs.commons_fileupload/external/binaries-list b/enterprise/libs.commons_fileupload/external/binaries-list
index 9fbcecc..670a563 100644
--- a/enterprise/libs.commons_fileupload/external/binaries-list
+++ b/enterprise/libs.commons_fileupload/external/binaries-list
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-C89E540E4A12CB034FB973E12135839B5DE9A87E commons-fileupload:commons-fileupload:1.3
+F95188E3D372E20E7328706C37EF366E5D7859B0 commons-fileupload:commons-fileupload:1.4
diff --git a/enterprise/libs.commons_fileupload/external/commons-fileupload-1.3-notice.txt b/enterprise/libs.commons_fileupload/external/commons-fileupload-1.3-notice.txt
deleted file mode 100644
index f34fcd9..0000000
--- a/enterprise/libs.commons_fileupload/external/commons-fileupload-1.3-notice.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Commons FileUpload
-Copyright 2002-2013 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
diff --git a/enterprise/libs.commons_fileupload/external/commons-fileupload-1.3-license.txt b/enterprise/libs.commons_fileupload/external/commons-fileupload-1.4-license.txt
similarity index 99%
rename from enterprise/libs.commons_fileupload/external/commons-fileupload-1.3-license.txt
rename to enterprise/libs.commons_fileupload/external/commons-fileupload-1.4-license.txt
index 9125942..74a6013 100644
--- a/enterprise/libs.commons_fileupload/external/commons-fileupload-1.3-license.txt
+++ b/enterprise/libs.commons_fileupload/external/commons-fileupload-1.4-license.txt
@@ -1,9 +1,9 @@
Name: Apache Commons FileUpload
-Version: 1.3
+Version: 1.4
License: Apache-2.0
OSR: 2970
Description: File upload component
-Origin: http://commons.apache.org/proper/commons-fileupload/
+Origin: https://commons.apache.org/proper/commons-fileupload/
Apache License
diff --git a/enterprise/libs.commons_fileupload/external/commons-fileupload-1.4-notice.txt b/enterprise/libs.commons_fileupload/external/commons-fileupload-1.4-notice.txt
new file mode 100644
index 0000000..7133786
--- /dev/null
+++ b/enterprise/libs.commons_fileupload/external/commons-fileupload-1.4-notice.txt
@@ -0,0 +1,5 @@
+Apache Commons FileUpload
+Copyright 2002-2019 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (https://www.apache.org/).
diff --git a/enterprise/libs.commons_fileupload/manifest.mf b/enterprise/libs.commons_fileupload/manifest.mf
index 8bec5be..07af244 100644
--- a/enterprise/libs.commons_fileupload/manifest.mf
+++ b/enterprise/libs.commons_fileupload/manifest.mf
@@ -1,4 +1,4 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.libs.commons_fileupload/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/commons_fileupload/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.32
+OpenIDE-Module-Specification-Version: 1.33
diff --git a/enterprise/libs.commons_fileupload/nbproject/project.properties b/enterprise/libs.commons_fileupload/nbproject/project.properties
index ac4f8dd..8414bd0 100644
--- a/enterprise/libs.commons_fileupload/nbproject/project.properties
+++ b/enterprise/libs.commons_fileupload/nbproject/project.properties
@@ -16,7 +16,8 @@
# under the License.
is.autoload=true
-
-release.external/commons-fileupload-1.3.jar=modules/ext/commons-fileupload-1.3.jar
+javac.compilerargs=-Xlint:all -Xlint:-serial
+javac.source=1.8
+release.external/commons-fileupload-1.4.jar=modules/ext/commons-fileupload-1.4.jar
jnlp.indirect.jars=\
- modules/ext/commons-fileupload-1.3.jar
+ modules/ext/commons-fileupload-1.4.jar
diff --git a/enterprise/libs.commons_fileupload/src/org/netbeans/libs/commons_fileupload/Bundle.properties b/enterprise/libs.commons_fileupload/src/org/netbeans/libs/commons_fileupload/Bundle.properties
index 03aed01..2af09f7 100644
--- a/enterprise/libs.commons_fileupload/src/org/netbeans/libs/commons_fileupload/Bundle.properties
+++ b/enterprise/libs.commons_fileupload/src/org/netbeans/libs/commons_fileupload/Bundle.properties
@@ -19,5 +19,5 @@ OpenIDE-Module-Name=Commons FileUpload Integration
OpenIDE-Module-Display-Category=Libraries
OpenIDE-Module-Short-Description=This plugin bundles Commons FileUpload.
OpenIDE-Module-Long-Description=\
- The module bundles Apache Commons FileUpload version 1.3 \
- from http://commons.apache.org/proper/commons-fileupload/.
+ The module bundles Apache Commons FileUpload version 1.4 \
+ from https://commons.apache.org/proper/commons-fileupload/.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists