From a35eb28992c36d55190014a417c4418830d6f89e Mon Sep 17 00:00:00 2001 From: "L. Sousa" Date: Thu, 17 Oct 2024 21:42:32 +0200 Subject: [PATCH 1/7] Cleanup java config files --- .gitignore | 2 ++ AntTasks/.project | 2 +- .../org.eclipse.core.resources.prefs | 2 -- AsmParser/.classpath | 23 +++++++------- AsmParser/.project | 17 ++++++++++ .../org.eclipse.core.resources.prefs | 2 -- .../.settings/org.eclipse.jdt.core.prefs | 15 --------- CommonsCompressPlus/.classpath | 11 ++++--- CommonsCompressPlus/.project | 8 ++++- .../org.eclipse.core.resources.prefs | 2 -- CommonsLangPlus/.classpath | 11 ++++--- CommonsLangPlus/.project | 8 ++++- .../org.eclipse.core.resources.prefs | 2 -- EclipseUtils/.project | 2 +- .../org.eclipse.core.resources.prefs | 2 -- GearmanPlus/.classpath | 11 ++++--- GearmanPlus/.project | 8 ++++- .../org.eclipse.core.resources.prefs | 2 -- GitPlus/.classpath | 16 +++++----- GitPlus/.project | 8 ++++- .../org.eclipse.core.resources.prefs | 2 -- GitlabPlus/.project | 2 +- .../org.eclipse.core.resources.prefs | 2 -- .../.settings/org.eclipse.jdt.core.prefs | 14 --------- Gprofer/.classpath | 13 +++++--- Gprofer/.project | 8 ++++- .../org.eclipse.core.resources.prefs | 2 -- GsonPlus/.classpath | 11 ++++--- GsonPlus/.project | 8 ++++- .../org.eclipse.core.resources.prefs | 2 -- GuiHelper/.classpath | 12 +++++-- GuiHelper/.project | 8 ++++- .../org.eclipse.core.resources.prefs | 2 -- JacksonPlus/.classpath | 13 +++++--- JacksonPlus/.project | 8 ++++- .../org.eclipse.core.resources.prefs | 2 -- JadxPlus/.classpath | 25 ++++++++------- JadxPlus/.project | 8 ++++- .../org.eclipse.core.resources.prefs | 2 -- JavaGenerator/.classpath | 21 ++++++++++--- JavaGenerator/.project | 8 ++++- .../org.eclipse.core.resources.prefs | 2 -- JsEngine/.classpath | 28 ++++++++++++----- JsEngine/.project | 8 ++++- .../org.eclipse.core.resources.prefs | 2 -- LogbackPlus/.classpath | 31 ++++++++++++------- LogbackPlus/.project | 8 ++++- .../org.eclipse.core.resources.prefs | 2 -- MvelPlus/.project | 2 +- .../org.eclipse.core.resources.prefs | 2 -- RuntimeMutators/.project | 2 +- .../org.eclipse.core.resources.prefs | 2 -- SlackPlus/.project | 2 +- SpecsHWUtils/.project | 11 +++++++ .../org.eclipse.core.resources.prefs | 2 -- .../.settings/org.eclipse.jdt.core.prefs | 14 --------- SpecsUtils/.classpath | 28 ++++++++++++----- SpecsUtils/.project | 12 +++++-- .../org.eclipse.core.resources.prefs | 2 -- SupportJavaLibs/.project | 2 +- .../org.eclipse.core.resources.prefs | 2 -- SymjaPlus/.classpath | 20 +++++++----- SymjaPlus/.project | 8 ++++- .../org.eclipse.core.resources.prefs | 2 -- XStreamPlus/.classpath | 13 ++++---- XStreamPlus/.project | 8 ++++- .../org.eclipse.core.resources.prefs | 2 -- Z3Helper/.project | 2 +- .../org.eclipse.core.resources.prefs | 2 -- Z3Helper/.settings/sf.eclipse.javacc.prefs | 14 --------- jOptions/.classpath | 13 ++++---- jOptions/.project | 8 ++++- .../org.eclipse.core.resources.prefs | 2 -- .../persistence/PropertiesPersistence.java | 3 -- tdrcLibrary/.classpath | 22 +++++++++---- tdrcLibrary/.project | 8 ++++- .../org.eclipse.core.resources.prefs | 2 -- 77 files changed, 359 insertions(+), 261 deletions(-) delete mode 100644 AntTasks/.settings/org.eclipse.core.resources.prefs delete mode 100644 AsmParser/.settings/org.eclipse.core.resources.prefs delete mode 100644 AsmParser/.settings/org.eclipse.jdt.core.prefs delete mode 100644 CommonsCompressPlus/.settings/org.eclipse.core.resources.prefs delete mode 100644 CommonsLangPlus/.settings/org.eclipse.core.resources.prefs delete mode 100644 EclipseUtils/.settings/org.eclipse.core.resources.prefs delete mode 100644 GearmanPlus/.settings/org.eclipse.core.resources.prefs delete mode 100644 GitPlus/.settings/org.eclipse.core.resources.prefs delete mode 100644 GitlabPlus/.settings/org.eclipse.core.resources.prefs delete mode 100644 GitlabPlus/.settings/org.eclipse.jdt.core.prefs delete mode 100644 Gprofer/.settings/org.eclipse.core.resources.prefs delete mode 100644 GsonPlus/.settings/org.eclipse.core.resources.prefs delete mode 100644 GuiHelper/.settings/org.eclipse.core.resources.prefs delete mode 100644 JacksonPlus/.settings/org.eclipse.core.resources.prefs delete mode 100644 JadxPlus/.settings/org.eclipse.core.resources.prefs delete mode 100644 JavaGenerator/.settings/org.eclipse.core.resources.prefs delete mode 100644 JsEngine/.settings/org.eclipse.core.resources.prefs delete mode 100644 LogbackPlus/.settings/org.eclipse.core.resources.prefs delete mode 100644 MvelPlus/.settings/org.eclipse.core.resources.prefs delete mode 100644 RuntimeMutators/.settings/org.eclipse.core.resources.prefs delete mode 100755 SpecsHWUtils/.settings/org.eclipse.core.resources.prefs delete mode 100755 SpecsHWUtils/.settings/org.eclipse.jdt.core.prefs delete mode 100644 SpecsUtils/.settings/org.eclipse.core.resources.prefs delete mode 100644 SupportJavaLibs/.settings/org.eclipse.core.resources.prefs delete mode 100644 SymjaPlus/.settings/org.eclipse.core.resources.prefs delete mode 100644 XStreamPlus/.settings/org.eclipse.core.resources.prefs delete mode 100644 Z3Helper/.settings/org.eclipse.core.resources.prefs delete mode 100644 Z3Helper/.settings/sf.eclipse.javacc.prefs delete mode 100644 jOptions/.settings/org.eclipse.core.resources.prefs delete mode 100644 tdrcLibrary/.settings/org.eclipse.core.resources.prefs diff --git a/.gitignore b/.gitignore index ad2c77ba..f80df057 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,8 @@ RemoteSystemsTempFiles/ # Custom ignores # ################## +**/.settings/ + output/ .idea/ .gradle/ diff --git a/AntTasks/.project b/AntTasks/.project index 77e053d3..05b07f4f 100644 --- a/AntTasks/.project +++ b/AntTasks/.project @@ -17,7 +17,7 @@ - 1689258621753 + 1727907273515 30 diff --git a/AntTasks/.settings/org.eclipse.core.resources.prefs b/AntTasks/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/AntTasks/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/AsmParser/.classpath b/AsmParser/.classpath index fb67e262..400e9aee 100644 --- a/AsmParser/.classpath +++ b/AsmParser/.classpath @@ -1,20 +1,21 @@ - + - + + - - - - - - + - + + + - - + + + + + diff --git a/AsmParser/.project b/AsmParser/.project index 46ca1045..91a1c075 100644 --- a/AsmParser/.project +++ b/AsmParser/.project @@ -10,9 +10,26 @@ + + org.eclipse.buildship.core.gradleprojectbuilder + + + org.eclipse.jdt.core.javanature org.apache.ivyde.eclipse.ivynature + org.eclipse.buildship.core.gradleprojectnature + + + 1727907273522 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/AsmParser/.settings/org.eclipse.core.resources.prefs b/AsmParser/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/AsmParser/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/AsmParser/.settings/org.eclipse.jdt.core.prefs b/AsmParser/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 9478cb16..00000000 --- a/AsmParser/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,15 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 diff --git a/CommonsCompressPlus/.classpath b/CommonsCompressPlus/.classpath index 90a02a0d..f89d8201 100644 --- a/CommonsCompressPlus/.classpath +++ b/CommonsCompressPlus/.classpath @@ -1,12 +1,13 @@ - - + - + + + + - - + diff --git a/CommonsCompressPlus/.project b/CommonsCompressPlus/.project index 33b9665a..53baf608 100644 --- a/CommonsCompressPlus/.project +++ b/CommonsCompressPlus/.project @@ -10,14 +10,20 @@ + + org.eclipse.buildship.core.gradleprojectbuilder + + + org.eclipse.jdt.core.javanature org.apache.ivyde.eclipse.ivynature + org.eclipse.buildship.core.gradleprojectnature - 1689258621758 + 1727907273557 30 diff --git a/CommonsCompressPlus/.settings/org.eclipse.core.resources.prefs b/CommonsCompressPlus/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/CommonsCompressPlus/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/CommonsLangPlus/.classpath b/CommonsLangPlus/.classpath index b136b724..a4ef70c4 100644 --- a/CommonsLangPlus/.classpath +++ b/CommonsLangPlus/.classpath @@ -1,11 +1,12 @@ - - + - + + - - + + + diff --git a/CommonsLangPlus/.project b/CommonsLangPlus/.project index 23a44db7..2f6e0ddc 100644 --- a/CommonsLangPlus/.project +++ b/CommonsLangPlus/.project @@ -10,14 +10,20 @@ + + org.eclipse.buildship.core.gradleprojectbuilder + + + org.eclipse.jdt.core.javanature org.apache.ivyde.eclipse.ivynature + org.eclipse.buildship.core.gradleprojectnature - 1689258621763 + 1727907273561 30 diff --git a/CommonsLangPlus/.settings/org.eclipse.core.resources.prefs b/CommonsLangPlus/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/CommonsLangPlus/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/EclipseUtils/.project b/EclipseUtils/.project index a47a31a9..a672a44a 100644 --- a/EclipseUtils/.project +++ b/EclipseUtils/.project @@ -17,7 +17,7 @@ - 1689258621767 + 1727907273564 30 diff --git a/EclipseUtils/.settings/org.eclipse.core.resources.prefs b/EclipseUtils/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/EclipseUtils/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/GearmanPlus/.classpath b/GearmanPlus/.classpath index f675fe38..f89d8201 100644 --- a/GearmanPlus/.classpath +++ b/GearmanPlus/.classpath @@ -1,12 +1,13 @@ - - + - + + - + + - + diff --git a/GearmanPlus/.project b/GearmanPlus/.project index 152ffbd2..10f8ef6f 100644 --- a/GearmanPlus/.project +++ b/GearmanPlus/.project @@ -10,14 +10,20 @@ + + org.eclipse.buildship.core.gradleprojectbuilder + + + org.eclipse.jdt.core.javanature org.apache.ivyde.eclipse.ivynature + org.eclipse.buildship.core.gradleprojectnature - 1689258621770 + 1727907273568 30 diff --git a/GearmanPlus/.settings/org.eclipse.core.resources.prefs b/GearmanPlus/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/GearmanPlus/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/GitPlus/.classpath b/GitPlus/.classpath index 4cad51f8..f89d8201 100644 --- a/GitPlus/.classpath +++ b/GitPlus/.classpath @@ -1,15 +1,13 @@ - - - - + - + + - - - - + + + + diff --git a/GitPlus/.project b/GitPlus/.project index 983b92a9..4f91df69 100644 --- a/GitPlus/.project +++ b/GitPlus/.project @@ -10,14 +10,20 @@ + + org.eclipse.buildship.core.gradleprojectbuilder + + + org.eclipse.jdt.core.javanature org.apache.ivyde.eclipse.ivynature + org.eclipse.buildship.core.gradleprojectnature - 1689258621774 + 1727907273572 30 diff --git a/GitPlus/.settings/org.eclipse.core.resources.prefs b/GitPlus/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/GitPlus/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/GitlabPlus/.project b/GitlabPlus/.project index 374d1cda..ae70fafa 100644 --- a/GitlabPlus/.project +++ b/GitlabPlus/.project @@ -17,7 +17,7 @@ - 1689258621776 + 1727907273576 30 diff --git a/GitlabPlus/.settings/org.eclipse.core.resources.prefs b/GitlabPlus/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/GitlabPlus/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/GitlabPlus/.settings/org.eclipse.jdt.core.prefs b/GitlabPlus/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index f2525a8b..00000000 --- a/GitlabPlus/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,14 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 diff --git a/Gprofer/.classpath b/Gprofer/.classpath index 06d1c7d3..f89d8201 100644 --- a/Gprofer/.classpath +++ b/Gprofer/.classpath @@ -1,8 +1,13 @@ - + + + + + + + + - - - + diff --git a/Gprofer/.project b/Gprofer/.project index 36d6f70f..6a30cfda 100644 --- a/Gprofer/.project +++ b/Gprofer/.project @@ -10,14 +10,20 @@ + + org.eclipse.buildship.core.gradleprojectbuilder + + + org.eclipse.jdt.core.javanature org.apache.ivyde.eclipse.ivynature + org.eclipse.buildship.core.gradleprojectnature - 1689258621780 + 1727907273580 30 diff --git a/Gprofer/.settings/org.eclipse.core.resources.prefs b/Gprofer/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/Gprofer/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/GsonPlus/.classpath b/GsonPlus/.classpath index 2e416396..f89d8201 100644 --- a/GsonPlus/.classpath +++ b/GsonPlus/.classpath @@ -1,12 +1,13 @@ - - + - + + - + + - + diff --git a/GsonPlus/.project b/GsonPlus/.project index b101883b..5c51ed51 100644 --- a/GsonPlus/.project +++ b/GsonPlus/.project @@ -10,14 +10,20 @@ + + org.eclipse.buildship.core.gradleprojectbuilder + + + org.eclipse.jdt.core.javanature org.apache.ivyde.eclipse.ivynature + org.eclipse.buildship.core.gradleprojectnature - 1689258621784 + 1727907273585 30 diff --git a/GsonPlus/.settings/org.eclipse.core.resources.prefs b/GsonPlus/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/GsonPlus/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/GuiHelper/.classpath b/GuiHelper/.classpath index c105cf03..21e9f0ef 100644 --- a/GuiHelper/.classpath +++ b/GuiHelper/.classpath @@ -1,8 +1,14 @@ - + + + + + + + + - - + diff --git a/GuiHelper/.project b/GuiHelper/.project index f5076d7f..5f01ffe9 100644 --- a/GuiHelper/.project +++ b/GuiHelper/.project @@ -10,13 +10,19 @@ + + org.eclipse.buildship.core.gradleprojectbuilder + + + org.eclipse.jdt.core.javanature + org.eclipse.buildship.core.gradleprojectnature - 1689258621787 + 1727907273589 30 diff --git a/GuiHelper/.settings/org.eclipse.core.resources.prefs b/GuiHelper/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/GuiHelper/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/JacksonPlus/.classpath b/JacksonPlus/.classpath index 15b7841f..a4ef70c4 100644 --- a/JacksonPlus/.classpath +++ b/JacksonPlus/.classpath @@ -1,7 +1,12 @@ - - - - + + + + + + + + + diff --git a/JacksonPlus/.project b/JacksonPlus/.project index f03e71c7..3b7b9b7c 100644 --- a/JacksonPlus/.project +++ b/JacksonPlus/.project @@ -10,14 +10,20 @@ + + org.eclipse.buildship.core.gradleprojectbuilder + + + org.eclipse.jdt.core.javanature org.apache.ivyde.eclipse.ivynature + org.eclipse.buildship.core.gradleprojectnature - 1689258621791 + 1727907273592 30 diff --git a/JacksonPlus/.settings/org.eclipse.core.resources.prefs b/JacksonPlus/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/JacksonPlus/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/JadxPlus/.classpath b/JadxPlus/.classpath index b38b5bed..f89d8201 100644 --- a/JadxPlus/.classpath +++ b/JadxPlus/.classpath @@ -1,12 +1,13 @@ - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/JadxPlus/.project b/JadxPlus/.project index dbf79757..67cd8166 100644 --- a/JadxPlus/.project +++ b/JadxPlus/.project @@ -10,14 +10,20 @@ + + org.eclipse.buildship.core.gradleprojectbuilder + + + org.eclipse.jdt.core.javanature org.apache.ivyde.eclipse.ivynature + org.eclipse.buildship.core.gradleprojectnature - 1689258621793 + 1727907273596 30 diff --git a/JadxPlus/.settings/org.eclipse.core.resources.prefs b/JadxPlus/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/JadxPlus/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/JavaGenerator/.classpath b/JavaGenerator/.classpath index 1f6dee28..28de7ab6 100644 --- a/JavaGenerator/.classpath +++ b/JavaGenerator/.classpath @@ -1,10 +1,21 @@ - - - + + + + + + + + + + + + + + + - - + diff --git a/JavaGenerator/.project b/JavaGenerator/.project index 11abff93..f526551d 100644 --- a/JavaGenerator/.project +++ b/JavaGenerator/.project @@ -10,14 +10,20 @@ + + org.eclipse.buildship.core.gradleprojectbuilder + + + org.eclipse.jdt.core.javanature org.apache.ivyde.eclipse.ivynature + org.eclipse.buildship.core.gradleprojectnature - 1689258621797 + 1727907273601 30 diff --git a/JavaGenerator/.settings/org.eclipse.core.resources.prefs b/JavaGenerator/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/JavaGenerator/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/JsEngine/.classpath b/JsEngine/.classpath index d3e49301..aa62a472 100644 --- a/JsEngine/.classpath +++ b/JsEngine/.classpath @@ -1,17 +1,29 @@ - + - + + - - - - - + + + + + + + + + + + + + + + + - + diff --git a/JsEngine/.project b/JsEngine/.project index 1c6a7879..d3771f0e 100644 --- a/JsEngine/.project +++ b/JsEngine/.project @@ -10,14 +10,20 @@ + + org.eclipse.buildship.core.gradleprojectbuilder + + + org.eclipse.jdt.core.javanature org.apache.ivyde.eclipse.ivynature + org.eclipse.buildship.core.gradleprojectnature - 1689258621800 + 1727907273605 30 diff --git a/JsEngine/.settings/org.eclipse.core.resources.prefs b/JsEngine/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/JsEngine/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/LogbackPlus/.classpath b/LogbackPlus/.classpath index 26ce03d2..d81b88b8 100644 --- a/LogbackPlus/.classpath +++ b/LogbackPlus/.classpath @@ -1,12 +1,19 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/LogbackPlus/.project b/LogbackPlus/.project index e56de6c5..10bbbe47 100644 --- a/LogbackPlus/.project +++ b/LogbackPlus/.project @@ -10,13 +10,19 @@ + + org.eclipse.buildship.core.gradleprojectbuilder + + + org.eclipse.jdt.core.javanature + org.eclipse.buildship.core.gradleprojectnature - 1689258621802 + 1727907273662 30 diff --git a/LogbackPlus/.settings/org.eclipse.core.resources.prefs b/LogbackPlus/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/LogbackPlus/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/MvelPlus/.project b/MvelPlus/.project index 18d23989..39e7b10e 100644 --- a/MvelPlus/.project +++ b/MvelPlus/.project @@ -17,7 +17,7 @@ - 1689258621806 + 1727907273671 30 diff --git a/MvelPlus/.settings/org.eclipse.core.resources.prefs b/MvelPlus/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/MvelPlus/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/RuntimeMutators/.project b/RuntimeMutators/.project index e81c9e7b..e393fd38 100644 --- a/RuntimeMutators/.project +++ b/RuntimeMutators/.project @@ -16,7 +16,7 @@ - 1689258621809 + 1727907273674 30 diff --git a/RuntimeMutators/.settings/org.eclipse.core.resources.prefs b/RuntimeMutators/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/RuntimeMutators/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/SlackPlus/.project b/SlackPlus/.project index 91d81cac..60e3c15c 100644 --- a/SlackPlus/.project +++ b/SlackPlus/.project @@ -17,7 +17,7 @@ - 1689258621810 + 1727907273677 30 diff --git a/SpecsHWUtils/.project b/SpecsHWUtils/.project index f9b6e1cc..a027d71b 100755 --- a/SpecsHWUtils/.project +++ b/SpecsHWUtils/.project @@ -14,4 +14,15 @@ org.eclipse.jdt.core.javanature + + + 1727907273680 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/SpecsHWUtils/.settings/org.eclipse.core.resources.prefs b/SpecsHWUtils/.settings/org.eclipse.core.resources.prefs deleted file mode 100755 index 99f26c02..00000000 --- a/SpecsHWUtils/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/SpecsHWUtils/.settings/org.eclipse.jdt.core.prefs b/SpecsHWUtils/.settings/org.eclipse.jdt.core.prefs deleted file mode 100755 index f2525a8b..00000000 --- a/SpecsHWUtils/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,14 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 diff --git a/SpecsUtils/.classpath b/SpecsUtils/.classpath index cc5ba888..d361855e 100644 --- a/SpecsUtils/.classpath +++ b/SpecsUtils/.classpath @@ -1,14 +1,26 @@ - - - - - + - + + - - + + + + + + + + + + + + + + + + + diff --git a/SpecsUtils/.project b/SpecsUtils/.project index b7e0d83e..9d0b88db 100644 --- a/SpecsUtils/.project +++ b/SpecsUtils/.project @@ -6,12 +6,17 @@ - sf.eclipse.javacc.core.javaccbuilder + org.eclipse.jdt.core.javabuilder - org.eclipse.jdt.core.javabuilder + org.eclipse.buildship.core.gradleprojectbuilder + + + + + sf.eclipse.javacc.core.javaccbuilder @@ -19,10 +24,11 @@ org.eclipse.jdt.core.javanature sf.eclipse.javacc.core.javaccnature + org.eclipse.buildship.core.gradleprojectnature - 1689258621814 + 1727907273684 30 diff --git a/SpecsUtils/.settings/org.eclipse.core.resources.prefs b/SpecsUtils/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/SpecsUtils/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/SupportJavaLibs/.project b/SupportJavaLibs/.project index 275bb367..74558690 100644 --- a/SupportJavaLibs/.project +++ b/SupportJavaLibs/.project @@ -16,7 +16,7 @@ - 1689258621817 + 1727907273687 30 diff --git a/SupportJavaLibs/.settings/org.eclipse.core.resources.prefs b/SupportJavaLibs/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/SupportJavaLibs/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/SymjaPlus/.classpath b/SymjaPlus/.classpath index fdc6ba60..b753276f 100644 --- a/SymjaPlus/.classpath +++ b/SymjaPlus/.classpath @@ -1,15 +1,21 @@ - - - + - + + - + + + + + + + + + - - + diff --git a/SymjaPlus/.project b/SymjaPlus/.project index c5c5f7de..5e2ba334 100644 --- a/SymjaPlus/.project +++ b/SymjaPlus/.project @@ -10,14 +10,20 @@ + + org.eclipse.buildship.core.gradleprojectbuilder + + + org.eclipse.jdt.core.javanature org.apache.ivyde.eclipse.ivynature + org.eclipse.buildship.core.gradleprojectnature - 1689258621820 + 1727907273691 30 diff --git a/SymjaPlus/.settings/org.eclipse.core.resources.prefs b/SymjaPlus/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/SymjaPlus/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/XStreamPlus/.classpath b/XStreamPlus/.classpath index 5adde832..f89d8201 100644 --- a/XStreamPlus/.classpath +++ b/XStreamPlus/.classpath @@ -1,12 +1,13 @@ - - - + - + + - - + + + + diff --git a/XStreamPlus/.project b/XStreamPlus/.project index dd62f214..cdb1d774 100644 --- a/XStreamPlus/.project +++ b/XStreamPlus/.project @@ -10,14 +10,20 @@ + + org.eclipse.buildship.core.gradleprojectbuilder + + + org.eclipse.jdt.core.javanature org.apache.ivyde.eclipse.ivynature + org.eclipse.buildship.core.gradleprojectnature - 1689258621823 + 1727907273728 30 diff --git a/XStreamPlus/.settings/org.eclipse.core.resources.prefs b/XStreamPlus/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/XStreamPlus/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/Z3Helper/.project b/Z3Helper/.project index d1e1adfd..7184291f 100644 --- a/Z3Helper/.project +++ b/Z3Helper/.project @@ -22,7 +22,7 @@ - 1689258621825 + 1727907273734 30 diff --git a/Z3Helper/.settings/org.eclipse.core.resources.prefs b/Z3Helper/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/Z3Helper/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/Z3Helper/.settings/sf.eclipse.javacc.prefs b/Z3Helper/.settings/sf.eclipse.javacc.prefs deleted file mode 100644 index 4e515dbd..00000000 --- a/Z3Helper/.settings/sf.eclipse.javacc.prefs +++ /dev/null @@ -1,14 +0,0 @@ -CLEAR_CONSOLE=true -FORMAT_BEFORE_SAVE=false -JAVACC_OPTIONS= -JJDOC_OPTIONS= -JJTREE_OPTIONS= -JJ_NATURE=true -JTB_OPTIONS=-ia -jd -tk -KEEP_DEL_FILES_IN_HISTORY=false -MARK_GEN_FILES_AS_DERIVED=true -RUNTIME_JJJAR= -RUNTIME_JTBJAR= -RUNTIME_JVMOPTIONS= -SUPPRESS_WARNINGS=false -eclipse.preferences.version=1 diff --git a/jOptions/.classpath b/jOptions/.classpath index 90c15d5c..2f72a41f 100644 --- a/jOptions/.classpath +++ b/jOptions/.classpath @@ -1,16 +1,15 @@ - - - + - + + - - + + - + diff --git a/jOptions/.project b/jOptions/.project index 820d73f5..fa3c00f7 100644 --- a/jOptions/.project +++ b/jOptions/.project @@ -10,14 +10,20 @@ + + org.eclipse.buildship.core.gradleprojectbuilder + + + org.eclipse.jdt.core.javanature org.apache.ivyde.eclipse.ivynature + org.eclipse.buildship.core.gradleprojectnature - 1689258621829 + 1727907273736 30 diff --git a/jOptions/.settings/org.eclipse.core.resources.prefs b/jOptions/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/jOptions/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/jOptions/src/org/suikasoft/jOptions/persistence/PropertiesPersistence.java b/jOptions/src/org/suikasoft/jOptions/persistence/PropertiesPersistence.java index ed458470..74f17a51 100644 --- a/jOptions/src/org/suikasoft/jOptions/persistence/PropertiesPersistence.java +++ b/jOptions/src/org/suikasoft/jOptions/persistence/PropertiesPersistence.java @@ -33,13 +33,10 @@ */ public class PropertiesPersistence implements AppPersistence { - private final Collection> options; - // Used to check values being loaded private final StoreDefinition definition; public PropertiesPersistence(StoreDefinition storeDefinition) { - options = storeDefinition.getKeys(); definition = storeDefinition; } diff --git a/tdrcLibrary/.classpath b/tdrcLibrary/.classpath index eda15d55..b0219913 100644 --- a/tdrcLibrary/.classpath +++ b/tdrcLibrary/.classpath @@ -1,10 +1,20 @@ - - - + + + + + + + + + + + + + + + - - - + diff --git a/tdrcLibrary/.project b/tdrcLibrary/.project index 74553025..8b051ef0 100644 --- a/tdrcLibrary/.project +++ b/tdrcLibrary/.project @@ -10,14 +10,20 @@ + + org.eclipse.buildship.core.gradleprojectbuilder + + + org.eclipse.jdt.core.javanature org.apache.ivyde.eclipse.ivynature + org.eclipse.buildship.core.gradleprojectnature - 1689258621832 + 1727907273737 30 diff --git a/tdrcLibrary/.settings/org.eclipse.core.resources.prefs b/tdrcLibrary/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/tdrcLibrary/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 From 5113c488faf2c92e4d749070226a4b7d87571b0c Mon Sep 17 00:00:00 2001 From: "L. Sousa" Date: Wed, 16 Oct 2024 00:56:56 +0200 Subject: [PATCH 2/7] Remove references to Nashorn --- JsEngine/src/pt/up/fe/specs/jsengine/JsEngine.java | 4 ---- JsEngine/src/pt/up/fe/specs/jsengine/JsEngineType.java | 3 --- JsEngine/src/pt/up/fe/specs/jsengine/NodeJsEngine.java | 5 ----- .../src/pt/up/fe/specs/jsengine/graal/GraalvmJsEngine.java | 5 ----- JsEngine/test/pt/up/fe/specs/jsengine/JsEngineTest.java | 2 -- 5 files changed, 19 deletions(-) diff --git a/JsEngine/src/pt/up/fe/specs/jsengine/JsEngine.java b/JsEngine/src/pt/up/fe/specs/jsengine/JsEngine.java index 4c2567f8..2bb31625 100644 --- a/JsEngine/src/pt/up/fe/specs/jsengine/JsEngine.java +++ b/JsEngine/src/pt/up/fe/specs/jsengine/JsEngine.java @@ -305,10 +305,6 @@ default Object evalFile(File jsFile, JsFileType type, String content) { // return getEngine().createBindings(); // } - default void nashornWarning(String message) { - // Do nothing - } - /** * * @param object diff --git a/JsEngine/src/pt/up/fe/specs/jsengine/JsEngineType.java b/JsEngine/src/pt/up/fe/specs/jsengine/JsEngineType.java index 12f0b5db..2b6dccc3 100644 --- a/JsEngine/src/pt/up/fe/specs/jsengine/JsEngineType.java +++ b/JsEngine/src/pt/up/fe/specs/jsengine/JsEngineType.java @@ -24,7 +24,6 @@ public enum JsEngineType { - // NASHORN, GRAALVM_COMPAT, GRAALVM; @@ -51,8 +50,6 @@ public JsEngine newEngine(JsEngineType type, Collection> forbiddenClass // System.out.println("THREAD CLASS LOADER: " + Thread.currentThread().getContextClassLoader()); // Thread.currentThread().setContextClassLoader(GraalJSScriptEngine.class.getClassLoader()); switch (this) { - // case NASHORN: - // return new NashornEngine(forbiddenClasses); case GRAALVM_COMPAT: return new GraalvmJsEngine(forbiddenClasses, true, engineWorkingDirectory, nodeModulesFolder, laraiOutputStream); diff --git a/JsEngine/src/pt/up/fe/specs/jsengine/NodeJsEngine.java b/JsEngine/src/pt/up/fe/specs/jsengine/NodeJsEngine.java index 6f83e1e9..18938c46 100644 --- a/JsEngine/src/pt/up/fe/specs/jsengine/NodeJsEngine.java +++ b/JsEngine/src/pt/up/fe/specs/jsengine/NodeJsEngine.java @@ -176,11 +176,6 @@ public Set keySet(Object bindings) { throw new NotImplementedException(this); } - @Override - public void nashornWarning(String message) { - throw new NotImplementedException(this); - } - @Override public Object newNativeArray() { throw new NotImplementedException(this); diff --git a/JsEngine/src/pt/up/fe/specs/jsengine/graal/GraalvmJsEngine.java b/JsEngine/src/pt/up/fe/specs/jsengine/graal/GraalvmJsEngine.java index bbdb541d..cb8e6c6f 100644 --- a/JsEngine/src/pt/up/fe/specs/jsengine/graal/GraalvmJsEngine.java +++ b/JsEngine/src/pt/up/fe/specs/jsengine/graal/GraalvmJsEngine.java @@ -439,11 +439,6 @@ public double asDouble(Object value) { return asValue(value).asDouble(); } - @Override - public void nashornWarning(String message) { - SpecsLogs.warn(message); - } - @Override public boolean isArray(Object object) { return asValue(object).hasArrayElements(); diff --git a/JsEngine/test/pt/up/fe/specs/jsengine/JsEngineTest.java b/JsEngine/test/pt/up/fe/specs/jsengine/JsEngineTest.java index 05d16d50..f7829bca 100644 --- a/JsEngine/test/pt/up/fe/specs/jsengine/JsEngineTest.java +++ b/JsEngine/test/pt/up/fe/specs/jsengine/JsEngineTest.java @@ -35,7 +35,6 @@ public class JsEngineTest { // private static final Lazy GRAAL_JS = Lazy.newInstance(() -> JsEngineType.GRAALVM.newEngine()); - // private static final Lazy NASHORN = Lazy.newInstance(() -> JsEngineType.NASHORN.newEngine()); private static final String getResource(String resource) { return SpecsIo.getResource("pt/up/fe/specs/jsengine/test/" + resource); @@ -43,7 +42,6 @@ private static final String getResource(String resource) { private JsEngine getEngine() { return JsEngineType.GRAALVM.newEngine(); - // return JsEngineType.NASHORN.newEngine(); // return GRAAL_JS.get(); } From 16b47644f074c7e01e70c5362b49694a24deaf85 Mon Sep 17 00:00:00 2001 From: "L. Sousa" Date: Thu, 17 Oct 2024 21:37:29 +0200 Subject: [PATCH 3/7] Bug fix (maybe revert in the future) --- .../src/pt/up/fe/specs/jsengine/graal/GraalvmJsEngine.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/JsEngine/src/pt/up/fe/specs/jsengine/graal/GraalvmJsEngine.java b/JsEngine/src/pt/up/fe/specs/jsengine/graal/GraalvmJsEngine.java index cb8e6c6f..56bbbeda 100644 --- a/JsEngine/src/pt/up/fe/specs/jsengine/graal/GraalvmJsEngine.java +++ b/JsEngine/src/pt/up/fe/specs/jsengine/graal/GraalvmJsEngine.java @@ -137,9 +137,9 @@ private Context.Builder createBuilder(Path engineWorkingDirectory, File nodeModu // .allowPolyglotAccess(PolyglotAccess.ALL) .allowHostClassLookup(name -> !forbiddenClasses.contains(name)); - if (engineWorkingDirectory != null) { + if (nodeModulesFolder != null) { FileSystem fs = FileSystem.newDefaultFileSystem(); - fs.setCurrentWorkingDirectory(engineWorkingDirectory); + fs.setCurrentWorkingDirectory(nodeModulesFolder.toPath()); contextBuilder.fileSystem(fs); // Path path = Paths.get(engineWorkingDirectory + "/node_modules"); From 6c2ca6bc3241f16286fbe608641b88e2385723a1 Mon Sep 17 00:00:00 2001 From: "L. Sousa" Date: Sat, 19 Oct 2024 18:13:28 +0200 Subject: [PATCH 4/7] Update GraalJS to 23.0.6 --- JsEngine/build.gradle | 4 ++-- JsEngine/ivy.xml | 4 ++-- .../src/pt/up/fe/specs/jsengine/graal/GraalvmJsEngine.java | 5 +++-- JsEngine/test/pt/up/fe/specs/jsengine/JsEngineTest.java | 3 ++- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/JsEngine/build.gradle b/JsEngine/build.gradle index c17999f5..e8bf5a7d 100644 --- a/JsEngine/build.gradle +++ b/JsEngine/build.gradle @@ -23,8 +23,8 @@ dependencies { implementation ':jOptions' implementation ':SpecsUtils' - implementation group: 'org.graalvm.js', name: 'js-scriptengine', version: '22.2.0' - implementation group: 'org.graalvm.js', name: 'js', version: '22.2.0' + implementation group: 'org.graalvm.js', name: 'js-scriptengine', version: '23.0.6' + implementation group: 'org.graalvm.js', name: 'js', version: '23.0.6' implementation group: 'com.google.code.gson', name: 'gson', version: '2.4' implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.5' } diff --git a/JsEngine/ivy.xml b/JsEngine/ivy.xml index 9170f1c4..7fef5bd3 100644 --- a/JsEngine/ivy.xml +++ b/JsEngine/ivy.xml @@ -37,8 +37,8 @@ --> - - + + diff --git a/JsEngine/src/pt/up/fe/specs/jsengine/graal/GraalvmJsEngine.java b/JsEngine/src/pt/up/fe/specs/jsengine/graal/GraalvmJsEngine.java index 56bbbeda..24c603ec 100644 --- a/JsEngine/src/pt/up/fe/specs/jsengine/graal/GraalvmJsEngine.java +++ b/JsEngine/src/pt/up/fe/specs/jsengine/graal/GraalvmJsEngine.java @@ -40,6 +40,7 @@ import org.graalvm.polyglot.Source.Builder; import org.graalvm.polyglot.Value; import org.graalvm.polyglot.io.FileSystem; +import org.graalvm.polyglot.io.IOAccess; import com.oracle.truffle.js.scriptengine.GraalJSScriptEngine; import com.oracle.truffle.polyglot.SpecsPolyglot; @@ -131,7 +132,7 @@ private Context.Builder createBuilder(Path engineWorkingDirectory, File nodeModu .allowAllAccess(true) .allowHostAccess(HostAccess.ALL) // .option("js.load-from-url", "true") - // .allowIO(true) + // .allowIO(IOAccess.ALL) // .allowCreateThread(true) // .allowNativeAccess(true) // .allowPolyglotAccess(PolyglotAccess.ALL) @@ -140,7 +141,7 @@ private Context.Builder createBuilder(Path engineWorkingDirectory, File nodeModu if (nodeModulesFolder != null) { FileSystem fs = FileSystem.newDefaultFileSystem(); fs.setCurrentWorkingDirectory(nodeModulesFolder.toPath()); - contextBuilder.fileSystem(fs); + contextBuilder.allowIO(IOAccess.newBuilder().fileSystem(fs).build()); // Path path = Paths.get(engineWorkingDirectory + "/node_modules"); diff --git a/JsEngine/test/pt/up/fe/specs/jsengine/JsEngineTest.java b/JsEngine/test/pt/up/fe/specs/jsengine/JsEngineTest.java index f7829bca..da674508 100644 --- a/JsEngine/test/pt/up/fe/specs/jsengine/JsEngineTest.java +++ b/JsEngine/test/pt/up/fe/specs/jsengine/JsEngineTest.java @@ -25,6 +25,7 @@ import org.graalvm.polyglot.HostAccess; import org.graalvm.polyglot.PolyglotAccess; import org.graalvm.polyglot.Value; +import org.graalvm.polyglot.io.IOAccess; import org.junit.Test; import com.oracle.truffle.js.scriptengine.GraalJSScriptEngine; @@ -65,7 +66,7 @@ public void testModifyThis() { Context.Builder contextBuilder = Context.newBuilder("js") .allowAllAccess(true) .allowHostAccess(HostAccess.ALL) - .allowIO(true) + .allowIO(IOAccess.ALL) .allowCreateThread(true) .allowNativeAccess(true) .allowPolyglotAccess(PolyglotAccess.ALL); From 5db30be39d9bd25690e7d517b5166b63efa5bf60 Mon Sep 17 00:00:00 2001 From: "L. Sousa" Date: Sat, 1 Mar 2025 16:40:21 +0000 Subject: [PATCH 5/7] Implement method to make test pass --- JsEngine/src/pt/up/fe/specs/jsengine/NodeJsEngine.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/JsEngine/src/pt/up/fe/specs/jsengine/NodeJsEngine.java b/JsEngine/src/pt/up/fe/specs/jsengine/NodeJsEngine.java index 18938c46..41894bc9 100644 --- a/JsEngine/src/pt/up/fe/specs/jsengine/NodeJsEngine.java +++ b/JsEngine/src/pt/up/fe/specs/jsengine/NodeJsEngine.java @@ -218,8 +218,7 @@ public Object toJava(Object value) { @Override public Object toJs(Object javaObject) { - // TODO: Implement - throw new NotImplementedException(this); + return javaObject; } @Override From 24944fce64a66e282773eccacf52b9b53929a0f2 Mon Sep 17 00:00:00 2001 From: "L. Sousa" Date: Tue, 11 Mar 2025 15:10:01 +0000 Subject: [PATCH 6/7] Make projects compatible with Gradle 9 --- GearmanPlus/build.gradle | 2 +- SymjaPlus/build.gradle | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/GearmanPlus/build.gradle b/GearmanPlus/build.gradle index a9e05fe3..c4724446 100644 --- a/GearmanPlus/build.gradle +++ b/GearmanPlus/build.gradle @@ -15,7 +15,7 @@ java { repositories { // Gearman - maven { url "https://oss.sonatype.org/content/repositories/snapshots"} + maven { url="https://oss.sonatype.org/content/repositories/snapshots"} mavenCentral() } diff --git a/SymjaPlus/build.gradle b/SymjaPlus/build.gradle index 31566890..11d153ed 100644 --- a/SymjaPlus/build.gradle +++ b/SymjaPlus/build.gradle @@ -14,13 +14,13 @@ java { // Repositories providers repositories { /* - maven { url "https://repo1.maven.org/maven2/"} - maven { url "https://maven.google.com"} - maven { url "https://oss.sonatype.org/content/repositories/snapshots"} - maven { url "https://oss.sonatype.org/content/groups/public"} - maven { url "https://nexus.bedatadriven.com/content/groups/public/"} - maven { url "https://repo.clojars.org/"} - maven { url "https://repo.eclipse.org/content/repositories/eclipse-staging/"} + maven { url="https://repo1.maven.org/maven2/"} + maven { url="https://maven.google.com"} + maven { url="https://oss.sonatype.org/content/repositories/snapshots"} + maven { url="https://oss.sonatype.org/content/groups/public"} + maven { url="https://nexus.bedatadriven.com/content/groups/public/"} + maven { url="https://repo.clojars.org/"} + maven { url="https://repo.eclipse.org/content/repositories/eclipse-staging/"} */ mavenCentral() } From 931ff326a806900beba5176c82b2c417cbdce3cf Mon Sep 17 00:00:00 2001 From: "L. Sousa" Date: Sun, 16 Mar 2025 16:53:39 +0000 Subject: [PATCH 7/7] Update all Clava and Lara dependencies --- AsmParser/build.gradle | 2 +- CommonsCompressPlus/build.gradle | 2 +- CommonsLangPlus/build.gradle | 4 +- GearmanPlus/build.gradle | 2 +- GitPlus/build.gradle | 4 +- Gprofer/build.gradle | 2 +- GsonPlus/build.gradle | 2 +- JacksonPlus/build.gradle | 2 +- JsEngine/build.gradle | 8 +- SymjaPlus/build.gradle | 41 ++----- XStreamPlus/build.gradle | 2 +- jOptions/build.gradle | 6 +- tdrcLibrary/build.gradle | 6 +- tdrcLibrary/src/tdrc/utils/MarshalUtils.java | 123 ------------------- 14 files changed, 31 insertions(+), 175 deletions(-) delete mode 100644 tdrcLibrary/src/tdrc/utils/MarshalUtils.java diff --git a/AsmParser/build.gradle b/AsmParser/build.gradle index 0e6df60d..4271b9f9 100644 --- a/AsmParser/build.gradle +++ b/AsmParser/build.gradle @@ -22,7 +22,7 @@ dependencies { implementation ':SpecsUtils' implementation ':jOptions' - implementation group: 'com.google.code.gson', name: 'gson', version: '2.4' + implementation group: 'com.google.code.gson', name: 'gson', version: '2.12.1' } java { diff --git a/CommonsCompressPlus/build.gradle b/CommonsCompressPlus/build.gradle index ee12fd76..21001218 100644 --- a/CommonsCompressPlus/build.gradle +++ b/CommonsCompressPlus/build.gradle @@ -21,7 +21,7 @@ dependencies { implementation ':SpecsUtils' - implementation group: 'org.apache.commons', name: 'commons-compress', version: '1.15' + implementation group: 'org.apache.commons', name: 'commons-compress', version: '1.27.1' } java { diff --git a/CommonsLangPlus/build.gradle b/CommonsLangPlus/build.gradle index 6e4c8f2a..6169ed68 100644 --- a/CommonsLangPlus/build.gradle +++ b/CommonsLangPlus/build.gradle @@ -19,8 +19,8 @@ repositories { dependencies { testImplementation "junit:junit:4.13.1" - implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.6' - implementation group: 'org.apache.commons', name: 'commons-text', version: '1.10.0' + implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.17.0' + implementation group: 'org.apache.commons', name: 'commons-text', version: '1.13.0' } diff --git a/GearmanPlus/build.gradle b/GearmanPlus/build.gradle index c4724446..b00ab344 100644 --- a/GearmanPlus/build.gradle +++ b/GearmanPlus/build.gradle @@ -25,7 +25,7 @@ dependencies { implementation ':SpecsUtils' - implementation group: 'com.google.code.gson', name: 'gson', version: '2.4' + implementation group: 'com.google.code.gson', name: 'gson', version: '2.12.1' implementation group: 'org.gearman.jgs', name: 'java-gearman-service', version: '0.7.0-SNAPSHOT' } diff --git a/GitPlus/build.gradle b/GitPlus/build.gradle index 19397568..2a7487c8 100644 --- a/GitPlus/build.gradle +++ b/GitPlus/build.gradle @@ -21,8 +21,8 @@ dependencies { implementation ':SpecsUtils' - implementation group: 'com.google.guava', name: 'guava', version: '19.0' - implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '6.6.0.202305301015-r' + implementation group: 'com.google.guava', name: 'guava', version: '33.4.0-jre' + implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '7.1.0.202411261347-r' } java { diff --git a/Gprofer/build.gradle b/Gprofer/build.gradle index f1a6c454..a90f6e31 100644 --- a/Gprofer/build.gradle +++ b/Gprofer/build.gradle @@ -20,7 +20,7 @@ dependencies { testImplementation "junit:junit:4.13.1" implementation ':SpecsUtils' - implementation group: 'com.google.code.gson', name: 'gson', version: '2.4' + implementation group: 'com.google.code.gson', name: 'gson', version: '2.12.1' } java { diff --git a/GsonPlus/build.gradle b/GsonPlus/build.gradle index 7ecb2316..4d1b5e72 100644 --- a/GsonPlus/build.gradle +++ b/GsonPlus/build.gradle @@ -21,7 +21,7 @@ dependencies { implementation ':SpecsUtils' - implementation group: 'com.google.code.gson', name: 'gson', version: '2.4' + implementation group: 'com.google.code.gson', name: 'gson', version: '2.12.1' } java { diff --git a/JacksonPlus/build.gradle b/JacksonPlus/build.gradle index 45be8fc5..7d89e100 100644 --- a/JacksonPlus/build.gradle +++ b/JacksonPlus/build.gradle @@ -19,7 +19,7 @@ repositories { dependencies { testImplementation "junit:junit:4.13.1" - implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.10.0' + implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.18.3' } java { diff --git a/JsEngine/build.gradle b/JsEngine/build.gradle index a7165286..9173cd27 100644 --- a/JsEngine/build.gradle +++ b/JsEngine/build.gradle @@ -23,10 +23,10 @@ dependencies { implementation ':jOptions' implementation ':SpecsUtils' - implementation group: 'org.graalvm.js', name: 'js-scriptengine', version: '23.0.6' - implementation group: 'org.graalvm.js', name: 'js', version: '23.0.6' - implementation group: 'com.google.code.gson', name: 'gson', version: '2.4' - implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.5' + implementation group: 'org.graalvm.js', name: 'js-scriptengine', version: '23.0.7' + implementation group: 'org.graalvm.js', name: 'js', version: '23.0.7' + implementation group: 'com.google.code.gson', name: 'gson', version: '2.12.1' + implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.17.0' } java { diff --git a/SymjaPlus/build.gradle b/SymjaPlus/build.gradle index 11d153ed..be189da8 100644 --- a/SymjaPlus/build.gradle +++ b/SymjaPlus/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'distribution' + id 'distribution' } // Java project @@ -13,43 +13,22 @@ java { // Repositories providers repositories { -/* - maven { url="https://repo1.maven.org/maven2/"} - maven { url="https://maven.google.com"} - maven { url="https://oss.sonatype.org/content/repositories/snapshots"} - maven { url="https://oss.sonatype.org/content/groups/public"} - maven { url="https://nexus.bedatadriven.com/content/groups/public/"} - maven { url="https://repo.clojars.org/"} - maven { url="https://repo.eclipse.org/content/repositories/eclipse-staging/"} -*/ mavenCentral() } dependencies { - testImplementation "junit:junit:4.13.1" - - implementation ':SpecsUtils' - implementation ':jOptions' - - implementation('org.matheclipse:matheclipse-core:2.0.0') { -// exclude group: 'org.apfloat', module: 'apfloat' - } - -// implementation group: 'org.apfloat', name: 'apfloat', version: '2.1' + testImplementation "junit:junit:4.13.1" - implementation('org.hipparchus:hipparchus-core:2.0') - - implementation('org.matheclipse:matheclipse-gpl:2.0.0') { - exclude group: 'org.apache.logging.log4j', module: 'log4j-1.2-api' - } - - implementation('org.apache.logging.log4j:log4j-1.2-api:2.11.2') - + implementation ':SpecsUtils' + implementation ':jOptions' + implementation group: 'org.hipparchus', name: 'hipparchus-core', version: '3.1' + implementation group: 'org.matheclipse', name: 'matheclipse-core', version: '3.0.0' + implementation group: 'org.matheclipse', name: 'matheclipse-gpl', version: '3.0.0' } java { - withSourcesJar() + withSourcesJar() } // Project sources @@ -59,13 +38,13 @@ sourceSets { srcDir 'src' } } - + test { java { srcDir 'test' } - + } } diff --git a/XStreamPlus/build.gradle b/XStreamPlus/build.gradle index 5c8aae66..6dacb6fa 100644 --- a/XStreamPlus/build.gradle +++ b/XStreamPlus/build.gradle @@ -18,7 +18,7 @@ repositories { dependencies { testImplementation "junit:junit:4.13.1" - implementation group: 'com.thoughtworks.xstream', name: 'xstream', version: '1.4.20' + implementation group: 'com.thoughtworks.xstream', name: 'xstream', version: '1.4.21' implementation ':SpecsUtils' } diff --git a/jOptions/build.gradle b/jOptions/build.gradle index c9e2e1eb..1901daf3 100644 --- a/jOptions/build.gradle +++ b/jOptions/build.gradle @@ -23,9 +23,9 @@ dependencies { implementation ':XStreamPlus' implementation ':GuiHelper' - implementation group: 'com.google.guava', name: 'guava', version: '19.0' - implementation group: 'com.google.code.gson', name: 'gson', version: '2.4' - implementation group: 'com.thoughtworks.xstream', name: 'xstream', version: '1.4.20' + implementation group: 'com.google.guava', name: 'guava', version: '33.4.0-jre' + implementation group: 'com.google.code.gson', name: 'gson', version: '2.12.1' + implementation group: 'com.thoughtworks.xstream', name: 'xstream', version: '1.4.21' } java { diff --git a/tdrcLibrary/build.gradle b/tdrcLibrary/build.gradle index 1857941e..86d74b56 100644 --- a/tdrcLibrary/build.gradle +++ b/tdrcLibrary/build.gradle @@ -21,9 +21,9 @@ dependencies { implementation ':SpecsUtils' - implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.6' - implementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.4.0-b180830.0359' - implementation group: 'com.sun.xml.bind', name: 'jaxb-impl', version: '2.4.0-b180830.0438' + implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.17.0' + implementation group: 'jakarta.xml.bind', name: 'jakarta.xml.bind-api', version: '4.0.2' + implementation group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '4.0.5' } diff --git a/tdrcLibrary/src/tdrc/utils/MarshalUtils.java b/tdrcLibrary/src/tdrc/utils/MarshalUtils.java deleted file mode 100644 index 26b7dd37..00000000 --- a/tdrcLibrary/src/tdrc/utils/MarshalUtils.java +++ /dev/null @@ -1,123 +0,0 @@ -/** - * Copyright 2013 SPeCS Research Group. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. under the License. - */ - -package tdrc.utils; - -import java.io.File; -import java.io.InputStream; -import java.io.OutputStream; - -import javax.xml.XMLConstants; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.ValidationEventHandler; -import javax.xml.bind.util.ValidationEventCollector; -import javax.xml.namespace.QName; -import javax.xml.transform.Source; -import javax.xml.transform.stream.StreamSource; -import javax.xml.validation.Schema; -import javax.xml.validation.SchemaFactory; - -import org.xml.sax.SAXException; - -import com.sun.xml.bind.IDResolver; - -public class MarshalUtils { - - public static T unmarshal(File fileSource, String sourceName, InputStream schemaFile, Class rootType, - Class objectFactoryClass, boolean validate) throws JAXBException, SAXException { - // String packageName, boolean validate) throws JAXBException, SAXException { - // return unmarshal(new StreamSource(fileSource), sourceName, schemaFile, rootType, packageName, validate, null, - return unmarshal(new StreamSource(fileSource), sourceName, schemaFile, rootType, objectFactoryClass, validate, - null, - null); - } - - public static T unmarshal(File fileSource, String sourceName, InputStream schemaFile, Class rootType, - Class objectFactoryClass, boolean validate, ValidationEventHandler handler, IDResolver resolver) - // String packageName, boolean validate, ValidationEventHandler handler, IDResolver resolver) - throws JAXBException, SAXException { - // return unmarshal(new StreamSource(fileSource), sourceName, schemaFile, rootType, packageName, validate, - return unmarshal(new StreamSource(fileSource), sourceName, schemaFile, rootType, objectFactoryClass, validate, - handler, resolver); - } - - public static T unmarshal(Source source, String sourceName, InputStream schemaFile, Class rootType, - Class objectFactoryClass, boolean validate) throws JAXBException, SAXException { - // String packageName, boolean validate) throws JAXBException, SAXException { - return unmarshal(source, sourceName, schemaFile, rootType, objectFactoryClass, validate, null, null); - } - - public static T unmarshal(Source source, String sourceName, InputStream schemaFile, Class rootType, - Class objectFactoryClass, boolean validate, ValidationEventHandler handler, IDResolver resolver) - // String packageName, boolean validate, ValidationEventHandler handler, IDResolver resolver) - throws JAXBException, SAXException { - - final SchemaFactory sf = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);// W3C_XML_SCHEMA_NS_URI); - // System.out.println("BEFORE MarshalUtils.unmarshal"); - // final JAXBContext jc = JAXBContext.newInstance(packageName); - final JAXBContext jc = JAXBContext.newInstance(objectFactoryClass); - // final JAXBContext jc = JAXBContext.newInstance(objectFactoryClass.getPackage().getName(), - // JAXBContext.class.getClassLoader()); - // System.out.println("AFTER MarshalUtils.unmarshal"); - - final Unmarshaller u = jc.createUnmarshaller(); - - if (validate && schemaFile != null) { - final Source schemaSource = new StreamSource(schemaFile); - // SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); - final Schema schema = sf.newSchema(schemaSource); - u.setSchema(schema); - } - if (handler == null) { - handler = new ValidationEventCollector(); - } - - u.setEventHandler(handler); - if (resolver != null) { - u.setProperty(IDResolver.class.getName(), resolver); - } - // u.setProperty("com.sun.xml.internal.bind.IDResolver", resolver2); - // u.setProperty(UnmarshallerProperties.ID_RESOLVER, resolver); - JAXBElement jaxbEl = null; - jaxbEl = u.unmarshal(source, rootType); - - return jaxbEl.getValue(); - } - - // public static void marshal(T value, Class elementClass, Class packageName, QName q_name, - public static void marshal(T value, Class elementClass, Class packageClass, QName q_name, - OutputStream oStream) throws JAXBException { - - final JAXBElement jaxbEl = createRootElement(value, q_name, elementClass); - // System.out.println("BEFORE MarshalUtils.marshal"); - // final JAXBContext jc = JAXBContext.newInstance(packageName); - final JAXBContext jc = JAXBContext.newInstance(packageClass); - // final JAXBContext jc = JAXBContext.newInstance(packageClass.getPackage().getName(), - // JAXBContext.class.getClassLoader()); - // System.out.println("AFTER MarshalUtils.marshal"); - final Marshaller m = jc.createMarshaller(); - m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); - m.setProperty(Marshaller.JAXB_ENCODING, "UTF-8"); - - m.marshal(jaxbEl, oStream); - - } - - private static JAXBElement createRootElement(T value, QName q_name, Class elementClass) { - return new JAXBElement<>(q_name, elementClass, null, value); - } -}