From a32e5b2c6bea5dfa29edf2cbbd21646b20dcc66d Mon Sep 17 00:00:00 2001 From: Michael Bien Date: Fri, 5 Apr 2024 00:10:24 +0200 Subject: [PATCH] Revert "Upgrade commons-io from 2.15.1 to 2.16.0" This reverts commit 7068cd846a33973da38302fc5036afa319c491d2. --- ide/db.dataview/nbproject/project.xml | 8 -------- .../o.apache.commons.commons_io/external/binaries-list | 2 +- ...o-2.16.0-license.txt => commons-io-2.15.1-license.txt} | 2 +- ...-io-2.16.0-notice.txt => commons-io-2.15.1-notice.txt} | 2 +- .../nbproject/project.properties | 2 +- .../o.apache.commons.commons_io/nbproject/project.xml | 4 ++-- 6 files changed, 6 insertions(+), 14 deletions(-) rename platform/o.apache.commons.commons_io/external/{commons-io-2.16.0-license.txt => commons-io-2.15.1-license.txt} (99%) rename platform/o.apache.commons.commons_io/external/{commons-io-2.16.0-notice.txt => commons-io-2.15.1-notice.txt} (70%) diff --git a/ide/db.dataview/nbproject/project.xml b/ide/db.dataview/nbproject/project.xml index ae6ff64736c8..750dcb3b47be 100644 --- a/ide/db.dataview/nbproject/project.xml +++ b/ide/db.dataview/nbproject/project.xml @@ -25,14 +25,6 @@ org.netbeans.modules.db.dataview - - org.apache.commons.commons_io - - - - 2.15 - - org.netbeans.api.progress diff --git a/platform/o.apache.commons.commons_io/external/binaries-list b/platform/o.apache.commons.commons_io/external/binaries-list index d1f8238274d7..b47811bf48cc 100644 --- a/platform/o.apache.commons.commons_io/external/binaries-list +++ b/platform/o.apache.commons.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. -27875A7935F1DDCC13267EB6FAE1F719E0409572 commons-io:commons-io:2.16.0 +F11560DA189AB563A5C8E351941415430E9304EA commons-io:commons-io:2.15.1 diff --git a/platform/o.apache.commons.commons_io/external/commons-io-2.16.0-license.txt b/platform/o.apache.commons.commons_io/external/commons-io-2.15.1-license.txt similarity index 99% rename from platform/o.apache.commons.commons_io/external/commons-io-2.16.0-license.txt rename to platform/o.apache.commons.commons_io/external/commons-io-2.15.1-license.txt index 2278c502f08d..8ac01edd0d44 100644 --- a/platform/o.apache.commons.commons_io/external/commons-io-2.16.0-license.txt +++ b/platform/o.apache.commons.commons_io/external/commons-io-2.15.1-license.txt @@ -1,7 +1,7 @@ Name: Apache Commons IO Description: Assist with developing IO functionality Origin: Apache Software Foundation -Version: 2.16.0 +Version: 2.15.1 License: Apache-2.0 URL: https://commons.apache.org/proper/commons-io/ diff --git a/platform/o.apache.commons.commons_io/external/commons-io-2.16.0-notice.txt b/platform/o.apache.commons.commons_io/external/commons-io-2.15.1-notice.txt similarity index 70% rename from platform/o.apache.commons.commons_io/external/commons-io-2.16.0-notice.txt rename to platform/o.apache.commons.commons_io/external/commons-io-2.15.1-notice.txt index e7dbcdc22baa..20d8ffa205b7 100644 --- a/platform/o.apache.commons.commons_io/external/commons-io-2.16.0-notice.txt +++ b/platform/o.apache.commons.commons_io/external/commons-io-2.15.1-notice.txt @@ -1,5 +1,5 @@ Apache Commons IO -Copyright 2002-2024 The Apache Software Foundation +Copyright 2002-2023 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (https://www.apache.org/). diff --git a/platform/o.apache.commons.commons_io/nbproject/project.properties b/platform/o.apache.commons.commons_io/nbproject/project.properties index 463dfcb81eed..c6a76c946e3b 100644 --- a/platform/o.apache.commons.commons_io/nbproject/project.properties +++ b/platform/o.apache.commons.commons_io/nbproject/project.properties @@ -16,6 +16,6 @@ # under the License. javac.compilerargs=-Xlint -Xlint:-serial javac.source=1.8 -release.external/commons-io-2.16.0.jar=modules/ext/commons-io-2.16.0.jar +release.external/commons-io-2.15.1.jar=modules/ext/commons-io-2.15.1.jar is.autoload=true nbm.module.author=Tomas Stupka diff --git a/platform/o.apache.commons.commons_io/nbproject/project.xml b/platform/o.apache.commons.commons_io/nbproject/project.xml index 034ecc161d68..7a5ba33f05bf 100644 --- a/platform/o.apache.commons.commons_io/nbproject/project.xml +++ b/platform/o.apache.commons.commons_io/nbproject/project.xml @@ -58,8 +58,8 @@ org.apache.commons.io.serialization - ext/commons-io-2.16.0.jar - external/commons-io-2.16.0.jar + ext/commons-io-2.15.1.jar + external/commons-io-2.15.1.jar