From 22013f2267d042fab2032f0c9be9a77927775f07 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 29 May 2025 22:42:28 +0000 Subject: [PATCH 1/6] Update dependency com.h2database:h2 to v2 [SECURITY] --- tools/antclick/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/antclick/build.gradle b/tools/antclick/build.gradle index 760fcf68..9b906d7c 100644 --- a/tools/antclick/build.gradle +++ b/tools/antclick/build.gradle @@ -11,7 +11,7 @@ clean { } dependencies { - implementation 'com.h2database:h2:1.4.200' + implementation 'com.h2database:h2:2.2.220' } configurations { From 67573db0e0bcabcc4c94034ba9529145110bfeb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobi=20Sch=C3=A4fer?= Date: Fri, 30 May 2025 22:14:54 +0200 Subject: [PATCH 2/6] =?UTF-8?q?Add=20work-around=20allowing=20the=20reserv?= =?UTF-8?q?ed=20keyword=20=E2=80=9Cvalue=E2=80=9C=20as=20identifier?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See --- db/h2.compat/db.properties | 2 +- tools/antclick/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/db/h2.compat/db.properties b/db/h2.compat/db.properties index 7223f5bf..b1f054d0 100644 --- a/db/h2.compat/db.properties +++ b/db/h2.compat/db.properties @@ -15,7 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -antville.url = jdbc:h2:./db/antville;ifexists=true;mode=postgresql +antville.url = jdbc:h2:./db/antville;ifexists=true;mode=postgresql;non_keywords=value antville.driver = org.h2.Driver antville.user = antville antville.password = antville diff --git a/tools/antclick/build.gradle b/tools/antclick/build.gradle index 9b906d7c..46f629d8 100644 --- a/tools/antclick/build.gradle +++ b/tools/antclick/build.gradle @@ -130,7 +130,7 @@ tasks.register('buildDatabase', JavaExec) { args = [ '-continueOnError', '-script', inputFile, - '-url', "jdbc:h2:$outputDir/antville", + '-url', "jdbc:h2:$outputDir/antville;mode=postgresql;non_keywords=value", '-user', 'antville', '-password', 'antville' ] From 354c9788c8acf963512ece802680f9a6e51ae4af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobi=20Sch=C3=A4fer?= Date: Fri, 30 May 2025 22:16:39 +0200 Subject: [PATCH 3/6] Make it less cumbersome to build/run the H2 database/console --- tools/antclick/build.gradle | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/antclick/build.gradle b/tools/antclick/build.gradle index 46f629d8..9bc7c962 100644 --- a/tools/antclick/build.gradle +++ b/tools/antclick/build.gradle @@ -112,9 +112,8 @@ tasks.register('installJars', Copy) { tasks.register('buildDatabase', JavaExec) { description 'Builds the H2 SQL database file.' group 'build' - dependsOn ':assemble' - def inputFile = "$antvilleInstallDir/db/postgre.sql" + def inputFile = "${project.rootDir}/db/postgre.sql" def outputDir = "$helmaInstallDir/db" inputs.file inputFile @@ -165,7 +164,7 @@ task assembleDist { tasks.register('runH2Console', JavaExec) { description 'Runs the H2 SQL database console.' group 'Help' - dependsOn 'installJars' + dependsOn 'buildDatabase' def h2Jar = configurations.library.files.find { jar -> jar.name.startsWith('h2') From ae79a596397fc57b304dff3feafecb6a364def91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobi=20Sch=C3=A4fer?= Date: Fri, 30 May 2025 22:16:50 +0200 Subject: [PATCH 4/6] Remove stale code in comments --- tools/antclick/build.gradle | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/antclick/build.gradle b/tools/antclick/build.gradle index 9bc7c962..d60f57df 100644 --- a/tools/antclick/build.gradle +++ b/tools/antclick/build.gradle @@ -177,9 +177,6 @@ tasks.register('runH2Console', JavaExec) { '-user', 'antville', '-password', 'antville' ] - - // standardOutput = new ByteArrayOutputStream() - // ignoreExitValue true } tasks.register('distZip', Zip) { From ad4e35f452676b070113d23be8d553365ecaa437 Mon Sep 17 00:00:00 2001 From: tobi Date: Sun, 1 Jun 2025 12:41:24 +0000 Subject: [PATCH 5/6] Prevent exception when a diff line is falsy --- code/Skin/Skin.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/Skin/Skin.js b/code/Skin/Skin.js index c7b18bf3..9805e186 100644 --- a/code/Skin/Skin.js +++ b/code/Skin/Skin.js @@ -223,6 +223,9 @@ Skin.prototype.compare_action = function() { res.push(); var param = {}, leftLineNumber = rightLineNumber = 0; for (let line of diff) { + if (!line) { + continue; + } if (line.deleted) { param.right = encode(line.value); param.leftStatus = 'added'; From 87640ed8da821cd3cac1dd8d8bc1b2e6b66b93e5 Mon Sep 17 00:00:00 2001 From: tobi Date: Sun, 1 Jun 2025 13:00:46 +0000 Subject: [PATCH 6/6] =?UTF-8?q?Prevent=20=E2=80=9Cundefined=E2=80=9D=20sho?= =?UTF-8?q?wing=20up=20in=20skin=20diff?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/Skin/Skin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/Skin/Skin.js b/code/Skin/Skin.js index 9805e186..ef395a41 100644 --- a/code/Skin/Skin.js +++ b/code/Skin/Skin.js @@ -252,7 +252,7 @@ Skin.prototype.compare_action = function() { this.renderSkin('$Skin#difference', param); } } - if (line.value !== null) { + if (line.value !== null && typeof line.value !== 'undefined') { leftLineNumber += 1; rightLineNumber += 1; param.leftLineNumber = leftLineNumber;