Release 3.4.x

deploy.sh

@@ -51,7 +51,7 @@ python3 setup.py bdist_wheel
 pip install --upgrade --force-reinstall dist/sonar_tools-*-py3-*.whl
 
 if [ "$build_image" == "1" ]; then
-    docker build -t olivierkorach/sonar-tools:3.4 -t olivierkorach/sonar-tools:latest -f snapshot.Dockerfile .
+    docker build -t olivierkorach/sonar-tools:3.4.1 -t olivierkorach/sonar-tools:latest -f snapshot.Dockerfile .
 fi
 
 if [ "$build_docs" == "1" ]; then
@@ -69,5 +69,5 @@ if [ "$release" = "1" ]; then
 fi
 
 if [ "$release_docker" = "1" ]; then
-    docker buildx build --push --platform linux/amd64,linux/arm64 -t olivierkorach/sonar-tools:3.4  -t olivierkorach/sonar-tools:latest -f release.Dockerfile .
+    docker buildx build --push --platform linux/amd64,linux/arm64 -t olivierkorach/sonar-tools:3.4.1  -t olivierkorach/sonar-tools:latest -f release.Dockerfile .
 fi

doc/what-is-new.md

@@ -1,5 +1,9 @@
 # Next version yet unreleased
 
+# Version 3.4.1
+
+- Hotfix: Fix systematic crash on `sonar-findings-export`: [Issue #1358](https://github.com/okorach/sonar-tools/issues/1358)
+
 # Version 3.4
 
 - `sonar-tools` is now available as a docker image

release.Dockerfile

@@ -31,7 +31,7 @@ COPY ./LICENSE .
 COPY ./sonar/audit sonar/audit
 
 RUN pip install --upgrade pip \
-&& pip install sonar-tools==3.4
+&& pip install sonar-tools==3.4.1
 
 USER ${USERNAME}
 WORKDIR /home/${USERNAME}

sonar/branches.py

@@ -29,7 +29,7 @@
 from sonar.util import types
 import sonar.logging as log
 import sonar.sqobject as sq
-from sonar import components, syncer, settings, exceptions
+from sonar import components, settings, exceptions
 from sonar import projects
 import sonar.utilities as util
 
@@ -330,17 +330,19 @@ def sync(self, another_branch: Branch, sync_settings: types.ConfigSettings) -> t
         :return: sync report as tuple, with counts of successful and unsuccessful issue syncs
         :rtype: tuple(report, counters)
         """
+        from sonar.syncer import sync_lists
+
         report, counters = [], {}
         log.info("Syncing %s (%s) and %s (%s) issues", str(self), self.endpoint.url, str(another_branch), another_branch.endpoint.url)
-        (report, counters) = syncer.sync_lists(
+        (report, counters) = sync_lists(
             list(self.get_issues().values()),
             list(another_branch.get_issues().values()),
             self,
             another_branch,
             sync_settings=sync_settings,
         )
         log.info("Syncing %s (%s) and %s (%s) hotspots", str(self), self.endpoint.url, str(another_branch), another_branch.endpoint.url)
-        (tmp_report, tmp_counts) = syncer.sync_lists(
+        (tmp_report, tmp_counts) = sync_lists(
             list(self.get_hotspots().values()),
             list(another_branch.get_hotspots().values()),
             self,

sonar/version.py

@@ -24,5 +24,5 @@
 
 """
 
-PACKAGE_VERSION = "3.5"
-MIGRATION_TOOL_VERSION = "0.2"
+PACKAGE_VERSION = "3.4.1"
+MIGRATION_TOOL_VERSION = "0.1.1"