From b25c2ae3882ad16f20bfe6c833f1dae05eba76ab Mon Sep 17 00:00:00 2001 From: sebthom Date: Fri, 21 Oct 2022 21:33:26 +0200 Subject: [PATCH 1/4] Fix typo in private variable name --- .../org/eclipse/tm4e/ui/internal/utils/MarkerUtils.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/utils/MarkerUtils.java b/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/utils/MarkerUtils.java index abd3242de..9de95581a 100644 --- a/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/utils/MarkerUtils.java +++ b/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/utils/MarkerUtils.java @@ -48,7 +48,7 @@ static MarkerConfig forTask(final int priority) { } } - private static final Map MARKERCONIG_BY_TAG = Map.of( + private static final Map MARKERCONFIG_BY_TAG = Map.of( // problem markers: "BUG", MarkerConfig.forProblem(IMarker.SEVERITY_ERROR), "NOTE", MarkerConfig.forProblem(IMarker.SEVERITY_INFO), @@ -59,7 +59,7 @@ static MarkerConfig forTask(final int priority) { "XXX", MarkerConfig.forTask(IMarker.PRIORITY_NORMAL)); private static final Pattern TAG_SELECTOR_PATTERN = Pattern.compile( - "\\b(" + MARKERCONIG_BY_TAG.keySet().stream().collect(Collectors.joining("|")) + ")\\b"); + "\\b(" + MARKERCONFIG_BY_TAG.keySet().stream().collect(Collectors.joining("|")) + ")\\b"); /** * Updates all TM4E text markers of the corresponding document starting from @@ -143,7 +143,7 @@ public static void updateTextMarkers(final TMDocumentModel docModel, final int s if (!matcher.find()) continue; - final var markerConfig = MarkerUtils.MARKERCONIG_BY_TAG.get(matcher.group()); + final var markerConfig = MarkerUtils.MARKERCONFIG_BY_TAG.get(matcher.group()); final var markerText = commentText.substring(matcher.start()).trim(); final var markerTextStartOffset = lineOffset + token.startIndex + matcher.start(); From 275938c30407c54564711638a87def9187d66e2f Mon Sep 17 00:00:00 2001 From: sebthom Date: Fri, 21 Oct 2022 21:34:19 +0200 Subject: [PATCH 2/4] use geekyeggo/delete-artifact@v2 --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0451fd85e..09e79c508 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -82,8 +82,7 @@ jobs: clean verify - name: "Delete intermediate build artifacts" - uses: geekyeggo/delete-artifact@1-glob-support # https://github.com/GeekyEggo/delete-artifact/ + uses: geekyeggo/delete-artifact@v2 # https://github.com/GeekyEggo/delete-artifact/ with: name: "*" - useGlob: true failOnError: false From f763220eb4b8f074561af39c93528ad4f813823c Mon Sep 17 00:00:00 2001 From: sebthom Date: Fri, 21 Oct 2022 21:36:07 +0200 Subject: [PATCH 3/4] chore: upgrade Maven from 3.8.5 to 3.8.6 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 09e79c508..fc357303e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -55,7 +55,7 @@ jobs: - name: Set up Maven uses: stCarolas/setup-maven@v4.4 with: - maven-version: 3.8.5 + maven-version: 3.8.6 - name: Build with Maven From 63045498d237ffe783cd4fee1d472b15cb777bb5 Mon Sep 17 00:00:00 2001 From: sebthom Date: Fri, 21 Oct 2022 21:40:42 +0200 Subject: [PATCH 4/4] chore: upgrade org.apache.batik.css from 1.14.0 to 1.15.0 This upgrade is required because https://download.eclipse.org/tools/orbit/downloads/latest-S/ does not contain 1.14.0 anymore. --- target-platform/tm4e-target.target | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target-platform/tm4e-target.target b/target-platform/tm4e-target.target index e398dfa14..d1b4876af 100644 --- a/target-platform/tm4e-target.target +++ b/target-platform/tm4e-target.target @@ -8,7 +8,7 @@ - +