From 4db6a88037e710f444ffdd4153e63f783c068b73 Mon Sep 17 00:00:00 2001 From: guwirth Date: Fri, 3 Sep 2021 15:22:35 +0200 Subject: [PATCH 1/2] support Windows paths with forward slashes - Clang-Tidy sensor - DrMemory sensor - close #2245 --- .../java/org/sonar/cxx/sensors/clangtidy/ClangTidyParser.java | 2 +- .../java/org/sonar/cxx/sensors/drmemory/DrMemoryParser.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/clangtidy/ClangTidyParser.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/clangtidy/ClangTidyParser.java index 51aec482e0..ba27198316 100644 --- a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/clangtidy/ClangTidyParser.java +++ b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/clangtidy/ClangTidyParser.java @@ -33,7 +33,7 @@ public class ClangTidyParser { private static final Logger LOG = Loggers.get(ClangTidyParser.class); - private static final String REGEX = "((?>[a-zA-Z]:\\\\)??[^:]++):(\\d{1,5}):(\\d{1,5}): ([^:]++): (.+)"; + private static final String REGEX = "((?>[a-zA-Z]:[\\\\/])??[^:]++):(\\d{1,5}):(\\d{1,5}): ([^:]++): (.+)"; private static final Pattern PATTERN = Pattern.compile(REGEX); private final CxxClangTidySensor sensor; diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/drmemory/DrMemoryParser.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/drmemory/DrMemoryParser.java index ae7fc05954..da0c348ba0 100644 --- a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/drmemory/DrMemoryParser.java +++ b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/drmemory/DrMemoryParser.java @@ -37,7 +37,7 @@ public final class DrMemoryParser { private static final Logger LOG = Loggers.get(DrMemoryParser.class); private static final Pattern RX_MESSAGE_FINDER = Pattern.compile("^Error #\\d{1,6}:(.*)"); private static final Pattern RX_FILE_FINDER = Pattern.compile( - "\\s*+#[^\\[]++\\[((?>[a-zA-Z]:\\\\)??[^:]++):(\\d{1,5})\\]"); + "\\s*+#[^\\[]++\\[((?>[a-zA-Z]:[\\\\/])??[^:]++):(\\d{1,5})\\]"); private static final int TOP_COUNT = 4; private DrMemoryParser() { From f7605c8a2a024cc4ee0c2de697721c98ba34becd Mon Sep 17 00:00:00 2001 From: guwirth Date: Fri, 3 Sep 2021 15:23:22 +0200 Subject: [PATCH 2/2] update version number: 2.0.5 --- appveyor.yml | 2 +- cxx-checks/pom.xml | 2 +- cxx-sensors/pom.xml | 2 +- cxx-squid-bridge/pom.xml | 2 +- cxx-squid/pom.xml | 2 +- cxx-sslr-toolkit/pom.xml | 2 +- integration-tests/pom.xml | 2 +- pom.xml | 2 +- sonar-cxx-plugin/pom.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 911fcb5d06..52ade4e5df 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -82,7 +82,7 @@ build_script: - C:\Python27\Scripts\pip.exe install requests - C:\Python27\Scripts\pip.exe install behave - C:\Python27\Scripts\pip.exe install colorama - - mvn versions:set -DnewVersion=2.0.4.%APPVEYOR_BUILD_NUMBER% + - mvn versions:set -DnewVersion=2.0.5.%APPVEYOR_BUILD_NUMBER% - mvn clean install -B -e -V - IF "%APPVEYOR_PULL_REQUEST_NUMBER%"=="" (mvn sonar:sonar -B -e -V -Dsonar.organization=sonaropencommunity -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=%sonarcloudtoken%) - REM IF NOT "%APPVEYOR_PULL_REQUEST_NUMBER%"=="" (mvn sonar:sonar -B -e -X -V -Dsonar.verbose=true -Dsonar.pullrequest.base=master -Dsonar.pullrequest.branch=%APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH% -Dsonar.pullrequest.key=%APPVEYOR_PULL_REQUEST_NUMBER% -Dsonar.pullrequest.provider=GitHub -Dsonar.pullrequest.github.repository=%APPVEYOR_PROJECT_SLUG%) diff --git a/cxx-checks/pom.xml b/cxx-checks/pom.xml index 5e292e4569..2a5a02191a 100644 --- a/cxx-checks/pom.xml +++ b/cxx-checks/pom.xml @@ -5,7 +5,7 @@ org.sonarsource.sonarqube-plugins.cxx cxx - 2.0.4-SNAPSHOT + 2.0.5-SNAPSHOT cxx-checks diff --git a/cxx-sensors/pom.xml b/cxx-sensors/pom.xml index 1b69b6a008..906a874cbc 100644 --- a/cxx-sensors/pom.xml +++ b/cxx-sensors/pom.xml @@ -5,7 +5,7 @@ org.sonarsource.sonarqube-plugins.cxx cxx - 2.0.4-SNAPSHOT + 2.0.5-SNAPSHOT cxx-sensors diff --git a/cxx-squid-bridge/pom.xml b/cxx-squid-bridge/pom.xml index 978de52a99..7e77a2801f 100644 --- a/cxx-squid-bridge/pom.xml +++ b/cxx-squid-bridge/pom.xml @@ -5,7 +5,7 @@ org.sonarsource.sonarqube-plugins.cxx cxx - 2.0.4-SNAPSHOT + 2.0.5-SNAPSHOT cxx-squid-bridge diff --git a/cxx-squid/pom.xml b/cxx-squid/pom.xml index 9355765202..cfe38234fd 100644 --- a/cxx-squid/pom.xml +++ b/cxx-squid/pom.xml @@ -5,7 +5,7 @@ org.sonarsource.sonarqube-plugins.cxx cxx - 2.0.4-SNAPSHOT + 2.0.5-SNAPSHOT cxx-squid diff --git a/cxx-sslr-toolkit/pom.xml b/cxx-sslr-toolkit/pom.xml index 4415910dad..3867688190 100644 --- a/cxx-sslr-toolkit/pom.xml +++ b/cxx-sslr-toolkit/pom.xml @@ -4,7 +4,7 @@ org.sonarsource.sonarqube-plugins.cxx cxx - 2.0.4-SNAPSHOT + 2.0.5-SNAPSHOT cxx-sslr-toolkit diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 192b5c4b72..8eede21e73 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -3,7 +3,7 @@ org.sonarsource.sonarqube-plugins.cxx cxx - 2.0.4-SNAPSHOT + 2.0.5-SNAPSHOT integration-tests diff --git a/pom.xml b/pom.xml index ee0b1b34c4..0e73b96bc1 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.sonarsource.sonarqube-plugins.cxx cxx - 2.0.4-SNAPSHOT + 2.0.5-SNAPSHOT pom Cxx diff --git a/sonar-cxx-plugin/pom.xml b/sonar-cxx-plugin/pom.xml index 10a06c155e..b85fde2c11 100644 --- a/sonar-cxx-plugin/pom.xml +++ b/sonar-cxx-plugin/pom.xml @@ -5,7 +5,7 @@ org.sonarsource.sonarqube-plugins.cxx cxx - 2.0.4-SNAPSHOT + 2.0.5-SNAPSHOT sonar-cxx-plugin