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 08123d6   Upgrade Apache Commons-IO from 1.4 to 2.6
     new 9a073a2  Merge pull request #1745 from pepness/commons-io-2.6
08123d6 is described below

commit 08123d6cb4b46d07661124f8ebe895378f680317
Author: Jose Contreras <[email protected]>
AuthorDate: Wed Dec 4 17:04:43 2019 -0600

     Upgrade Apache Commons-IO from 1.4 to 2.6
---
 platform/o.apache.commons.io/external/binaries-list                   | 2 +-
 .../{commons-io-1.4-license.txt => commons-io-2.6-license.txt}        | 4 ++--
 .../external/{commons-io-1.4-notice.txt => commons-io-2.6-notice.txt} | 2 +-
 platform/o.apache.commons.io/manifest.mf                              | 1 +
 platform/o.apache.commons.io/nbproject/project.properties             | 4 +++-
 platform/o.apache.commons.io/nbproject/project.xml                    | 2 +-
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/platform/o.apache.commons.io/external/binaries-list 
b/platform/o.apache.commons.io/external/binaries-list
index a00542d..272a680 100644
--- a/platform/o.apache.commons.io/external/binaries-list
+++ b/platform/o.apache.commons.io/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.
-A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE commons-io:commons-io:1.4
+815893DF5F31DA2ECE4040FE0A12FD44B577AFAF commons-io:commons-io:2.6
diff --git a/platform/o.apache.commons.io/external/commons-io-1.4-license.txt 
b/platform/o.apache.commons.io/external/commons-io-2.6-license.txt
similarity index 99%
rename from platform/o.apache.commons.io/external/commons-io-1.4-license.txt
rename to platform/o.apache.commons.io/external/commons-io-2.6-license.txt
index 9544faf..61fba15 100644
--- a/platform/o.apache.commons.io/external/commons-io-1.4-license.txt
+++ b/platform/o.apache.commons.io/external/commons-io-2.6-license.txt
@@ -1,9 +1,9 @@
 Name: Apache Commons IO
 Description: Assist with developing IO functionality
 Origin: Apache Software Foundation
-Version: 1.4
+Version: 2.6
 License: Apache-2.0
-URL: http://commons.apache.org/io/
+URL: https://commons.apache.org/proper/commons-io/
 
 
 
diff --git a/platform/o.apache.commons.io/external/commons-io-1.4-notice.txt 
b/platform/o.apache.commons.io/external/commons-io-2.6-notice.txt
similarity index 70%
rename from platform/o.apache.commons.io/external/commons-io-1.4-notice.txt
rename to platform/o.apache.commons.io/external/commons-io-2.6-notice.txt
index f9e09a5..a6441be 100644
--- a/platform/o.apache.commons.io/external/commons-io-1.4-notice.txt
+++ b/platform/o.apache.commons.io/external/commons-io-2.6-notice.txt
@@ -1,5 +1,5 @@
 Apache Commons IO
-Copyright 2001-2008 The Apache Software Foundation
+Copyright 2001-2019 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/platform/o.apache.commons.io/manifest.mf 
b/platform/o.apache.commons.io/manifest.mf
index 920250e..2e60b50 100644
--- a/platform/o.apache.commons.io/manifest.mf
+++ b/platform/o.apache.commons.io/manifest.mf
@@ -1 +1,2 @@
 OpenIDE-Module: org.apache.commons.io
+OpenIDE-Module-Specification-Version: 2.6
\ No newline at end of file
diff --git a/platform/o.apache.commons.io/nbproject/project.properties 
b/platform/o.apache.commons.io/nbproject/project.properties
index 634b86a..544f78b 100644
--- a/platform/o.apache.commons.io/nbproject/project.properties
+++ b/platform/o.apache.commons.io/nbproject/project.properties
@@ -14,6 +14,8 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-release.external/commons-io-1.4.jar=modules/org-apache-commons-io.jar
+javac.compilerargs=-Xlint -Xlint:-serial
+javac.source=1.8
+release.external/commons-io-2.6.jar=modules/org-apache-commons-io.jar
 is.autoload=true
 nbm.module.author=Tomas Stupka
diff --git a/platform/o.apache.commons.io/nbproject/project.xml 
b/platform/o.apache.commons.io/nbproject/project.xml
index 9687b1a..b5aa45d 100644
--- a/platform/o.apache.commons.io/nbproject/project.xml
+++ b/platform/o.apache.commons.io/nbproject/project.xml
@@ -44,7 +44,7 @@
             <public-packages/>
             <class-path-extension>
                 
<runtime-relative-path>org-apache-commons-io.jar</runtime-relative-path>
-                <binary-origin>external/commons-io-1.4.jar</binary-origin>
+                <binary-origin>external/commons-io-2.6.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists

Reply via email to