From e8af0ee7cd49ea55caa3bb153a493334829eb710 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Mon, 24 Jun 2024 10:48:55 +0200
Subject: [PATCH] Adjust changelog for release

---
 CHANGELOG.md                       |  6 ++++++
 Jenkinsfile                        | 25 -------------------------
 gradle/changelog/rename_check.yaml |  2 --
 3 files changed, 6 insertions(+), 27 deletions(-)
 delete mode 100644 gradle/changelog/rename_check.yaml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b50e9090e3..c3cc572d15 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.46.4] - 2024-06-24
+### Fixed
+- Check for already existing Namespace and Name when renaming a repository
+- Repositories with the same namespace and name will get unique names on startup
+
 ## [2.46.3] - 2024-05-29
 ### Fixed
 - Exception in SVN repositories due to incorrect git initialization (Backport from 2.47)
@@ -1375,3 +1380,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [2.46.1]: https://scm-manager.org/download/2.46.1
 [2.46.2]: https://scm-manager.org/download/2.46.2
 [2.46.3]: https://scm-manager.org/download/2.46.3
+[2.46.4]: https://scm-manager.org/download/2.46.4
diff --git a/Jenkinsfile b/Jenkinsfile
index 6c06ed3186..89a42e884e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -80,31 +80,6 @@ pipeline {
       }
     }
 
-     stage('SonarQube') {
-      steps {
-        sh 'git config --replace-all "remote.origin.fetch" "+refs/heads/*:refs/remotes/origin/*"'
-        sh 'git fetch origin develop'
-        script {
-          withSonarQubeEnv('sonarcloud.io-scm') {
-            String parameters = ' -Dsonar.organization=scm-manager -Dsonar.analysis.scmm-repo=scm-manager/scm-manager'
-            if (env.CHANGE_ID) {
-              parameters += ' -Dsonar.pullrequest.provider=GitHub'
-              parameters += ' -Dsonar.pullrequest.github.repository=scm-manager/scm-manager'
-              parameters += " -Dsonar.pullrequest.key=${env.CHANGE_ID}"
-              parameters += " -Dsonar.pullrequest.branch=${env.CHANGE_BRANCH}"
-              parameters += " -Dsonar.pullrequest.base=${env.CHANGE_TARGET}"
-            } else {
-              parameters += " -Dsonar.branch.name=${env.BRANCH_NAME}"
-              if (env.BRANCH_NAME != "develop") {
-                parameters += " -Dsonar.branch.target=develop"
-              }
-            }
-            gradle "sonarqube ${parameters}"
-          }
-        }
-      }
-    }
-
     stage('Deployment') {
       when {
         anyOf {
diff --git a/gradle/changelog/rename_check.yaml b/gradle/changelog/rename_check.yaml
deleted file mode 100644
index 178e148b82..0000000000
--- a/gradle/changelog/rename_check.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: fixed
-  description: Check for already existing Namespace and Name when renaming a repository