From e5ba6794e5ec9ab530babd4714615b183615651b Mon Sep 17 00:00:00 2001 From: Greg DiCristofaro Date: Tue, 17 Sep 2024 09:11:22 -0400 Subject: [PATCH 1/2] jna update for 9/17/24 --- CoreLibs/ivy.xml | 2 +- CoreLibs/nbproject/project.properties | 4 ++-- CoreLibs/nbproject/project.xml | 8 ++++---- Tika/nbproject/project.properties | 2 +- Tika/nbproject/project.xml | 4 ++-- thirdparty/pasco2/.project | 11 +++++++++++ 6 files changed, 21 insertions(+), 10 deletions(-) diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml index 3566041703..446106e111 100644 --- a/CoreLibs/ivy.xml +++ b/CoreLibs/ivy.xml @@ -62,7 +62,7 @@ - + diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties index 9bd3153105..3dcee33819 100644 --- a/CoreLibs/nbproject/project.properties +++ b/CoreLibs/nbproject/project.properties @@ -118,8 +118,8 @@ file.reference.jericho-html-3.4.jar=release/modules/ext/jericho-html-3.4.jar file.reference.jfxtras-common-17-r1.jar=release/modules/ext/jfxtras-common-17-r1.jar file.reference.jfxtras-controls-17-r1.jar=release/modules/ext/jfxtras-controls-17-r1.jar file.reference.jfxtras-fxml-17-r1.jar=release/modules/ext/jfxtras-fxml-17-r1.jar -file.reference.jna-5.14.0.jar=release/modules/ext/jna-5.14.0.jar -file.reference.jna-platform-5.14.0.jar=release/modules/ext/jna-platform-5.14.0.jar +file.reference.jna-5.15.0.jar=release/modules/ext/jna-5.15.0.jar +file.reference.jna-platform-5.15.0.jar=release/modules/ext/jna-platform-5.15.0.jar file.reference.joda-time-2.10.14.jar=release/modules/ext/joda-time-2.10.14.jar file.reference.jsr305-3.0.2.jar=release/modules/ext/jsr305-3.0.2.jar file.reference.LGoodDatePicker-11.2.1.jar=release/modules/ext/LGoodDatePicker-11.2.1.jar diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml index 49cdfcd0c1..ba5941acfb 100644 --- a/CoreLibs/nbproject/project.xml +++ b/CoreLibs/nbproject/project.xml @@ -1041,12 +1041,12 @@ release/modules/ext/jfxtras-fxml-17-r1.jar - ext/jna-5.14.0.jar - release/modules/ext/jna-5.14.0.jar + ext/jna-5.15.0.jar + release/modules/ext/jna-5.15.0.jar - ext/jna-platform-5.14.0.jar - release/modules/ext/jna-platform-5.14.0.jar + ext/jna-platform-5.15.0.jar + release/modules/ext/jna-platform-5.15.0.jar ext/joda-time-2.10.14.jar diff --git a/Tika/nbproject/project.properties b/Tika/nbproject/project.properties index 2ebead2a20..92b72c53ea 100755 --- a/Tika/nbproject/project.properties +++ b/Tika/nbproject/project.properties @@ -64,7 +64,7 @@ file.reference.jdom2-2.0.6.1.jar=release/modules/ext/jdom2-2.0.6.1.jar file.reference.jempbox-1.8.16.jar=release/modules/ext/jempbox-1.8.16.jar file.reference.jhighlight-1.0.3.jar=release/modules/ext/jhighlight-1.0.3.jar file.reference.jmatio-1.5.jar=release/modules/ext/jmatio-1.5.jar -file.reference.jna-5.10.0.jar=release/modules/ext/jna-5.10.0.jar +file.reference.jna-5.15.0.jar=release/modules/ext/jna-5.15.0.jar file.reference.joda-time-2.2.jar=release/modules/ext/joda-time-2.2.jar file.reference.json-simple-1.1.1.jar=release/modules/ext/json-simple-1.1.1.jar file.reference.jsr305-3.0.2.jar=release/modules/ext/jsr305-3.0.2.jar diff --git a/Tika/nbproject/project.xml b/Tika/nbproject/project.xml index c103d1a1c6..244530be96 100755 --- a/Tika/nbproject/project.xml +++ b/Tika/nbproject/project.xml @@ -620,8 +620,8 @@ release/modules/ext/jmatio-1.5.jar - ext/jna-5.10.0.jar - release/modules/ext/jna-5.10.0.jar + ext/jna-5.15.0.jar + release/modules/ext/jna-5.15.0.jar ext/joda-time-2.2.jar diff --git a/thirdparty/pasco2/.project b/thirdparty/pasco2/.project index 454c782dbe..da19f3f41f 100644 --- a/thirdparty/pasco2/.project +++ b/thirdparty/pasco2/.project @@ -21,6 +21,17 @@ C:/Development/42six/trunk/thirdparty/pasco2/lib + + + 1725499152609 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + BIN_DIR From 223dbc96dc79448cdff8f1678363f87eb6f54917 Mon Sep 17 00:00:00 2001 From: Greg DiCristofaro Date: Tue, 17 Sep 2024 09:13:19 -0400 Subject: [PATCH 2/2] revert accidental change --- thirdparty/pasco2/.project | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/thirdparty/pasco2/.project b/thirdparty/pasco2/.project index da19f3f41f..454c782dbe 100644 --- a/thirdparty/pasco2/.project +++ b/thirdparty/pasco2/.project @@ -21,17 +21,6 @@ C:/Development/42six/trunk/thirdparty/pasco2/lib - - - 1725499152609 - - 30 - - org.eclipse.core.resources.regexFilterMatcher - node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ - - - BIN_DIR