From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Fri, 29 May 2015 13:23:05 +0000 (+0200)
Subject: Replace references to jira.codehaus.org by jira.sonarsource.com
X-Git-Tag: 5.2-RC1~1773
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=52fec9954c6d5225d6ea4ee61a3ae71721fd3881;p=sonarqube.git

Replace references to jira.codehaus.org by jira.sonarsource.com
---

diff --git a/README.md b/README.md
index 7633cde651b..9609230d848 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Copyright 2008-2015 SonarSource.
 Licensed under the GNU Lesser General Public License, Version 3.0: http://www.gnu.org/licenses/lgpl.txt
 
  [1]: http://www.sonarqube.org/
- [2]: http://jira.codehaus.org/browse/SONAR
+ [2]: http://jira.sonarsource.com/browse/SONAR
  [3]: http://docs.sonarqube.org/display/SONAR
 
 ### Build status
diff --git a/pom.xml b/pom.xml
index 4ceec468ab9..32e7f3e65da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
 
   <issueManagement>
     <system>jira</system>
-    <url>http://jira.codehaus.org/browse/SONAR</url>
+    <url>http://jira.sonarsource.com/browse/SONAR</url>
   </issueManagement>
 
   <distributionManagement>
diff --git a/server/sonar-process-monitor/src/test/resources/org/sonar/process/ProcessTest/sonar.properties b/server/sonar-process-monitor/src/test/resources/org/sonar/process/ProcessTest/sonar.properties
index 4d323dabfef..4c4ddb2f130 100644
--- a/server/sonar-process-monitor/src/test/resources/org/sonar/process/ProcessTest/sonar.properties
+++ b/server/sonar-process-monitor/src/test/resources/org/sonar/process/ProcessTest/sonar.properties
@@ -46,14 +46,14 @@ sonar.jdbc.url=jdbc:h2:tcp://localhost:9092/sonar
 # - It's recommended to use the latest version of the JDBC driver (ojdbc6.jar).
 #   Download it in http://www.oracle.com/technetwork/database/enterprise-edition/jdbc-112010-090769.html
 # - Copy the driver to the directory extensions/jdbc-driver/oracle/
-# - If you need to set the schema, please refer to http://jira.codehaus.org/browse/SONAR-5000
+# - If you need to set the schema, please refer to http://jira.sonarsource.com/browse/SONAR-5000
 # - Comment the embedded database and uncomment the following line:
 #sonar.jdbc.url=jdbc:oracle:thin:@localhost/XE
 
 
 #----- PostgreSQL 8.x/9.x
 # Comment the embedded database and uncomment the following property to use PostgreSQL.
-# If you don't use the schema named "public", please refer to http://jira.codehaus.org/browse/SONAR-5000
+# If you don't use the schema named "public", please refer to http://jira.sonarsource.com/browse/SONAR-5000
 #sonar.jdbc.url=jdbc:postgresql://localhost/sonar
 
 
diff --git a/server/sonar-process/src/main/java/org/sonar/process/ProcessProperties.java b/server/sonar-process/src/main/java/org/sonar/process/ProcessProperties.java
index 9532d3bace2..f9bf1353b4b 100644
--- a/server/sonar-process/src/main/java/org/sonar/process/ProcessProperties.java
+++ b/server/sonar-process/src/main/java/org/sonar/process/ProcessProperties.java
@@ -74,7 +74,7 @@ public class ProcessProperties {
   public static final String ES_PLUGIN_LISTUPDATE_VALUE = "value";
 
   public static final String WEB_ENFORCED_JVM_ARGS = "-Djava.awt.headless=true -Dfile.encoding=UTF-8 -Djruby.management.enabled=false " +
-    // jruby is slow with java 8: https://jira.codehaus.org/browse/SONAR-6115
+    // jruby is slow with java 8: https://jira.sonarsource.com/browse/SONAR-6115
     "-Djruby.compile.invokedynamic=false";
 
   private ProcessProperties() {
diff --git a/server/sonar-process/src/test/resources/org/sonar/process/ProcessTest/sonar.properties b/server/sonar-process/src/test/resources/org/sonar/process/ProcessTest/sonar.properties
index 4d323dabfef..4c4ddb2f130 100644
--- a/server/sonar-process/src/test/resources/org/sonar/process/ProcessTest/sonar.properties
+++ b/server/sonar-process/src/test/resources/org/sonar/process/ProcessTest/sonar.properties
@@ -46,14 +46,14 @@ sonar.jdbc.url=jdbc:h2:tcp://localhost:9092/sonar
 # - It's recommended to use the latest version of the JDBC driver (ojdbc6.jar).
 #   Download it in http://www.oracle.com/technetwork/database/enterprise-edition/jdbc-112010-090769.html
 # - Copy the driver to the directory extensions/jdbc-driver/oracle/
-# - If you need to set the schema, please refer to http://jira.codehaus.org/browse/SONAR-5000
+# - If you need to set the schema, please refer to http://jira.sonarsource.com/browse/SONAR-5000
 # - Comment the embedded database and uncomment the following line:
 #sonar.jdbc.url=jdbc:oracle:thin:@localhost/XE
 
 
 #----- PostgreSQL 8.x/9.x
 # Comment the embedded database and uncomment the following property to use PostgreSQL.
-# If you don't use the schema named "public", please refer to http://jira.codehaus.org/browse/SONAR-5000
+# If you don't use the schema named "public", please refer to http://jira.sonarsource.com/browse/SONAR-5000
 #sonar.jdbc.url=jdbc:postgresql://localhost/sonar
 
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/app/TomcatConnectors.java b/server/sonar-server/src/main/java/org/sonar/server/app/TomcatConnectors.java
index 61f4718bfdc..9f385a11161 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/app/TomcatConnectors.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/app/TomcatConnectors.java
@@ -120,7 +120,7 @@ class TomcatConnectors {
       setConnectorAttribute(connector, "clientAuth", props.value("sonar.web.https.clientAuth", "false"));
       setConnectorAttribute(connector, "ciphers", props.value(PROP_HTTPS_CIPHERS));
       // SSLv3 must not be enable because of Poodle vulnerability
-      // See https://jira.codehaus.org/browse/SONAR-5860
+      // See https://jira.sonarsource.com/browse/SONAR-5860
       setConnectorAttribute(connector, "sslEnabledProtocols", "TLSv1,TLSv1.1,TLSv1.2");
       setConnectorAttribute(connector, "sslProtocol", "TLS");
       setConnectorAttribute(connector, "SSLEnabled", true);
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistIssuesStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistIssuesStep.java
index 0c781491669..f7b790cf497 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistIssuesStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistIssuesStep.java
@@ -79,7 +79,7 @@ public class PersistIssuesStep implements ComputationStep {
             int updateCount = mapper.updateIfBeforeSelectedDate(dto);
             if (updateCount == 0) {
               // End-user and scan changed the issue at the same time.
-              // See https://jira.codehaus.org/browse/SONAR-4309
+              // See https://jira.sonarsource.com/browse/SONAR-4309
               conflictResolver.resolve(issue, mapper);
             }
           }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/DatabaseChecker.java b/server/sonar-server/src/main/java/org/sonar/server/db/DatabaseChecker.java
index 0cb1d9dbeaf..209f9f48423 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/db/DatabaseChecker.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/db/DatabaseChecker.java
@@ -66,7 +66,7 @@ public class DatabaseChecker implements Startable {
     Connection connection = db.getDataSource().getConnection();
     try {
       // check version of db
-      // See http://jira.codehaus.org/browse/SONAR-6434
+      // See http://jira.sonarsource.com/browse/SONAR-6434
       int majorVersion = connection.getMetaData().getDatabaseMajorVersion();
       if (majorVersion < ORACLE_MIN_MAJOR_VERSION) {
         throw MessageException.of(String.format(
diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigrationStep.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigrationStep.java
index 9f29e1ec628..182240ed855 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigrationStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v43/ConvertIssueDebtToMinutesMigrationStep.java
@@ -54,7 +54,7 @@ public class ConvertIssueDebtToMinutesMigrationStep extends BaseDataChange {
     final Date now = new Date(system2.now());
     MassUpdate massUpdate = context.prepareMassUpdate();
 
-    // See https://jira.codehaus.org/browse/SONAR-5394
+    // See https://jira.sonarsource.com/browse/SONAR-5394
     // The SQL request should not set the filter on technical_debt is not null. There's no index
     // on this column, so filtering is done programmatically.
     massUpdate.select("select id, technical_debt from issues");
diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v45/DeleteMeasuresOnDeletedProfilesMigrationStep.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v45/DeleteMeasuresOnDeletedProfilesMigrationStep.java
index b61c62a09ad..22b51826422 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v45/DeleteMeasuresOnDeletedProfilesMigrationStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v45/DeleteMeasuresOnDeletedProfilesMigrationStep.java
@@ -27,7 +27,7 @@ import org.sonar.server.db.migrations.MigrationStep;
 import org.sonar.server.db.migrations.v44.ConvertProfileMeasuresMigrationStep;
 
 /**
- * See http://jira.codehaus.org/browse/SONAR-5580
+ * See http://jira.sonarsource.com/browse/SONAR-5580
  * {@link ConvertProfileMeasuresMigrationStep}
  * introduced a regression in 4.4. Measures on orphan profiles were kept 
  * in old format (no JSON data but numeric value of profile id)
diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v451/AddMissingCustomRuleParametersMigrationStep.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v451/AddMissingCustomRuleParametersMigrationStep.java
index 55e26815b53..5bd93c59bf5 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v451/AddMissingCustomRuleParametersMigrationStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v451/AddMissingCustomRuleParametersMigrationStep.java
@@ -42,7 +42,7 @@ import com.google.common.collect.Iterables;
 import com.google.common.collect.Multimap;
 
 /**
- * See http://jira.codehaus.org/browse/SONAR-5575
+ * See http://jira.sonarsource.com/browse/SONAR-5575
  *
  * Add missing parameters (with no value) on each custom rules
  *
diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v451/DeleteUnescapedActivities.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v451/DeleteUnescapedActivities.java
index 234867cbb3c..ead377abd52 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v451/DeleteUnescapedActivities.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v451/DeleteUnescapedActivities.java
@@ -31,7 +31,7 @@ import org.sonar.server.db.migrations.Select;
 import org.sonar.server.db.migrations.SqlStatement;
 
 /**
- * See http://jira.codehaus.org/browse/SONAR-5758
+ * See http://jira.sonarsource.com/browse/SONAR-5758
  *
  * @since 4.5.1
  */
diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/AddNewCharacteristics.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/AddNewCharacteristics.java
index 0602f7f025b..395ff13cc37 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/AddNewCharacteristics.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/AddNewCharacteristics.java
@@ -38,7 +38,7 @@ import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 
 /**
- * See http://jira.codehaus.org/browse/SONAR-6187
+ * See http://jira.sonarsource.com/browse/SONAR-6187
  *
  * Add a new Characteristic 'Usability' with 2 sub-characteristics 'Accessibility' and 'Ease of Use'
  * and add a new sub-characteristic 'Compliance' for all characteristics.
diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/RemovePermissionsOnModulesMigrationStep.java b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/RemovePermissionsOnModulesMigrationStep.java
index 1261393b694..4d8799635bf 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/RemovePermissionsOnModulesMigrationStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v51/RemovePermissionsOnModulesMigrationStep.java
@@ -29,7 +29,7 @@ import org.sonar.server.db.migrations.Select;
 import org.sonar.server.db.migrations.SqlStatement;
 
 /**
- * See http://jira.codehaus.org/browse/SONAR-5596
+ * See http://jira.sonarsource.com/browse/SONAR-5596
  *
  * It's no possible to set permission on a module or a sub-view, but the batch was setting default permission on it on their creation.
  * As now it's no more the case, we need to purge this useless data.
diff --git a/server/sonar-server/src/main/java/org/sonar/server/notifications/NotificationService.java b/server/sonar-server/src/main/java/org/sonar/server/notifications/NotificationService.java
index e13137ebead..7d4e786c9a6 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/notifications/NotificationService.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/notifications/NotificationService.java
@@ -111,7 +111,7 @@ public class NotificationService implements Startable {
           LOG.error("Error in NotificationService", e);
         } finally {
           // Free Hibernate session
-          // See https://jira.codehaus.org/browse/SONAR-6566
+          // See https://jira.sonarsource.com/browse/SONAR-6566
           databaseSessionFactory.clear();
         }
       }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileService.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileService.java
index a9d03ea9858..d9cb64268af 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileService.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileService.java
@@ -128,7 +128,7 @@ public class QProfileService {
   }
 
   public void backup(String profileKey, Writer writer) {
-    // Allowed to non-admin users (see http://jira.codehaus.org/browse/SONAR-2039)
+    // Allowed to non-admin users (see http://jira.sonarsource.com/browse/SONAR-2039)
     backuper.backup(profileKey, writer);
   }
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java b/server/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java
index 3b2c1cdc0c6..3fc1d2c0b86 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java
@@ -223,7 +223,7 @@ public abstract class BaseIndex<DOMAIN, DTO extends Dto<KEY>, KEY extends Serial
 
     // In case there is a replication factor set by the index,
     // it is removed since we're using global cluster state
-    // see https://jira.codehaus.org/browse/SONAR-5687
+    // see https://jira.sonarsource.com/browse/SONAR-5687
     settings.remove("index.number_of_replicas");
 
     return settings.build();
diff --git a/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterServletFilters.java b/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterServletFilters.java
index f9976d7b257..7e682efae71 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterServletFilters.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterServletFilters.java
@@ -44,7 +44,7 @@ public class RegisterServletFilters {
     if (MasterServletFilter.INSTANCE != null) {
       // Probably a database upgrade. MasterSlaveFilter was instantiated by the servlet container
       // while picocontainer was not completely up.
-      // See https://jira.codehaus.org/browse/SONAR-3612
+      // See https://jira.sonarsource.com/browse/SONAR-3612
       MasterServletFilter.INSTANCE.initFilters(Arrays.asList(filters));
     }
   }
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-upgrades_plugins.json b/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-upgrades_plugins.json
index 83abaa3db82..43ca2a76e17 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-upgrades_plugins.json
+++ b/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/example-upgrades_plugins.json
@@ -4,7 +4,7 @@
       "version": "5.1",
       "description": "New overall layout, merge Issues Drilldown [...]",
       "releaseDate": "2015-04-02",
-      "changeLogUrl": "http://jira.codehaus.org/secure/ReleaseNote.jspa?projectId=11694&version=20666",
+      "changeLogUrl": "http://jira.sonarsource.com/secure/ReleaseNote.jspa?projectId=11694&version=20666",
       "downloadUrl": "http://dist.sonar.codehaus.org/sonarqube-5.1.zip",
       "plugins": {
         "requireUpdate": [
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-installed_plugins.json b/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-installed_plugins.json
index bf4326a6390..5380dff2fc6 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-installed_plugins.json
+++ b/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-installed_plugins.json
@@ -9,7 +9,7 @@
       "organizationName": "SonarSource",
       "organizationUrl": "http://www.sonarsource.com",
       "homepageUrl": "http://redirect.sonarsource.com/plugins/scmgit.html",
-      "issueTrackerUrl": "http://jira.codehaus.org/browse/SONARSCGIT",
+      "issueTrackerUrl": "http://jira.sonarsource.com/browse/SONARSCGIT",
       "implementationBuild": "9ce9d330c313c296fab051317cc5ad4b26319e07"
     },
     {
@@ -21,7 +21,7 @@
       "organizationName": "SonarSource",
       "organizationUrl": "http://www.sonarsource.com",
       "homepageUrl": "http://redirect.sonarsource.com/plugins/java.html",
-      "issueTrackerUrl": "http://jira.codehaus.org/browse/SONARJAVA",
+      "issueTrackerUrl": "http://jira.sonarsource.com/browse/SONARJAVA",
       "implementationBuild": "65396a609ddface8b311a6a665aca92a7da694f1"
     },
     {
@@ -33,7 +33,7 @@
       "organizationName": "SonarSource",
       "organizationUrl": "http://www.sonarsource.com",
       "homepageUrl": "http://redirect.sonarsource.com/plugins/scmsvn.html",
-      "issueTrackerUrl": "http://jira.codehaus.org/browse/SONARSCSVN",
+      "issueTrackerUrl": "http://jira.sonarsource.com/browse/SONARSCSVN",
       "implementationBuild": "213fc8a8b582ff530b12dd4a59a6512be1071234"
     }
   ]
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-pending_plugins.json b/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-pending_plugins.json
index 85515adbd91..3849ec874f0 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-pending_plugins.json
+++ b/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-pending_plugins.json
@@ -9,7 +9,7 @@
       "organizationName": "SonarSource",
       "organizationUrl": "http://www.sonarsource.com",
       "homepageUrl": "http://redirect.sonarsource.com/plugins/scmgit.html",
-      "issueTrackerUrl": "http://jira.codehaus.org/browse/SONARSCGIT",
+      "issueTrackerUrl": "http://jira.sonarsource.com/browse/SONARSCGIT",
       "implementationBuild": "9ce9d330c313c296fab051317cc5ad4b26319e07"
     },
     {
@@ -21,7 +21,7 @@
       "organizationName": "SonarSource",
       "organizationUrl": "http://www.sonarsource.com",
       "homepageUrl": "http://redirect.sonarsource.com/plugins/java.html",
-      "issueTrackerUrl": "http://jira.codehaus.org/browse/SONARJAVA",
+      "issueTrackerUrl": "http://jira.sonarsource.com/browse/SONARJAVA",
       "implementationBuild": "65396a609ddface8b311a6a665aca92a7da694f1"
     }
   ],
@@ -35,7 +35,7 @@
       "organizationName": "SonarSource",
       "organizationUrl": "http://www.sonarsource.com",
       "homepageUrl": "http://redirect.sonarsource.com/plugins/scmsvn.html",
-      "issueTrackerUrl": "http://jira.codehaus.org/browse/SONARSCSVN",
+      "issueTrackerUrl": "http://jira.sonarsource.com/browse/SONARSCSVN",
       "implementationBuild": "213fc8a8b582ff530b12dd4a59a6512be1071234"
     }
   ]
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-updates_plugins.json b/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-updates_plugins.json
index c9aec692554..cee849909a3 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-updates_plugins.json
+++ b/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-updates_plugins.json
@@ -46,7 +46,7 @@
             "version": "1.0",
             "date": "2014-03-31",
             "description": "Makes the plugin compatible with multi-language analysis introduced in SonarQube 4.2 and adds support of Emma 2.0 reports",
-            "changeLogUrl": "http://jira.codehaus.org/secure/ReleaseNote.jspa?projectId=13235&version=20187"
+            "changeLogUrl": "http://jira.sonarsource.com/secure/ReleaseNote.jspa?projectId=13235&version=20187"
           },
           "status": "COMPATIBLE",
           "requires": [
diff --git a/server/sonar-server/src/test/filteredresources/org/sonar/server/plugins/ws/PluginsWsMediumTest/update-center.properties b/server/sonar-server/src/test/filteredresources/org/sonar/server/plugins/ws/PluginsWsMediumTest/update-center.properties
index 950fb73c902..ffd69ef8724 100644
--- a/server/sonar-server/src/test/filteredresources/org/sonar/server/plugins/ws/PluginsWsMediumTest/update-center.properties
+++ b/server/sonar-server/src/test/filteredresources/org/sonar/server/plugins/ws/PluginsWsMediumTest/update-center.properties
@@ -12,7 +12,7 @@ ltsVersion=3.7.1
 
 # Describe each version listed in "publicVersions" and "privateVersions" : release date, URL to release notes, plain-text description, URL to ZIP distribution
 3.7.1.date=2012-05-20
-3.7.1.changelogUrl=http://jira.codehaus.org/secure/ReleaseNote.jspa?projectId=11694&version=232323
+3.7.1.changelogUrl=http://jira.sonarsource.com/secure/ReleaseNote.jspa?projectId=11694&version=232323
 3.7.1.description=Fix regressions
 3.7.1.downloadUrl=http://dist.sonar.codehaus.org/sonar-3.7.1.zip
 
@@ -35,13 +35,13 @@ decoy.1.0.date=2012-03-18
 decoy.1.0.sqVersions=${project.version}
 decoy.1.0.description=Surprise
 decoy.1.0.downloadUrl=[[decoy.10.jar]]
-decoy.1.0.changelogUrl=http://jira.codehaus.org/foo
+decoy.1.0.changelogUrl=http://jira.sonarsource.com/foo
 
 decoy.1.1.date=2012-03-18
 decoy.1.1.sqVersions=${project.version}
 decoy.1.1.description=Surprise
 decoy.1.1.downloadUrl=[[decoy.11.jar]]
-decoy.1.1.changelogUrl=http://jira.codehaus.org/foo
+decoy.1.1.changelogUrl=http://jira.sonarsource.com/foo
 
 # =============== decoy plugin
 # Releases. Note that no need for "privateVersions" for now.
@@ -59,4 +59,4 @@ foo.1.0.date=2012-03-18
 foo.1.0.sqVersions=${project.version}
 foo.1.0.description=Surprise
 foo.1.0.downloadUrl=[[foo.10.jar]]
-foo.1.0.changelogUrl=http://jira.codehaus.org/foo
+foo.1.0.changelogUrl=http://jira.sonarsource.com/foo
diff --git a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/ConvertProfileMeasuresMigrationTest.java b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/ConvertProfileMeasuresMigrationTest.java
index ee404bc07e8..1e37ec60c79 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/ConvertProfileMeasuresMigrationTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/db/migrations/v44/ConvertProfileMeasuresMigrationTest.java
@@ -66,7 +66,7 @@ public class ConvertProfileMeasuresMigrationTest {
   }
 
   /**
-   * http://jira.codehaus.org/browse/SONAR-5515
+   * http://jira.sonarsource.com/browse/SONAR-5515
    * Version of quality profile was introduced in SQ 2.9. Migration must not fail
    * when there are still some projects which last analysis was done with SQ <= 2.8.
    */
@@ -91,7 +91,7 @@ public class ConvertProfileMeasuresMigrationTest {
   }
 
   /**
-   * http://jira.codehaus.org/browse/SONAR-5580
+   * http://jira.sonarsource.com/browse/SONAR-5580
    */
   @Test
   public void delete_measure_when_profile_does_not_exist() throws Exception {
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/UpgradesActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/UpgradesActionTest.java
index e5939d5a45d..305fdab3cdd 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/UpgradesActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/UpgradesActionTest.java
@@ -107,7 +107,7 @@ public class UpgradesActionTest {
       .setLicense("GNU LGPL 3")
       .setOrganization("SonarSource")
       .setOrganizationUrl("http://www.sonarsource.com")
-      .setIssueTrackerUrl("http://jira.codehaus.org/browse/SONARPLUGINS/component/14663")
+      .setIssueTrackerUrl("http://jira.sonarsource.com/browse/SONARPLUGINS/component/14663")
       .setSourcesUrl("https://github.com/SonarCommunity/sonar-branding");
     Plugin viewsPlugin = new Plugin("views")
       .setName("Views")
@@ -125,7 +125,7 @@ public class UpgradesActionTest {
         .setDate(DateUtils.parseDate("2015-04-02"))
         .setDescription("New overall layout, merge Issues Drilldown [...]")
         .setDownloadUrl("http://dist.sonar.codehaus.org/sonarqube-5.1.zip")
-        .setChangelogUrl("http://jira.codehaus.org/secure/ReleaseNote.jspa?projectId=11694&version=20666")
+        .setChangelogUrl("http://jira.sonarsource.com/secure/ReleaseNote.jspa?projectId=11694&version=20666")
       );
 
     sonarUpdate.addIncompatiblePlugin(brandingPlugin);
diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PendingActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PendingActionTest.java
index a9620d490c6..143747095e8 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PendingActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PendingActionTest.java
@@ -92,7 +92,7 @@ public class PendingActionTest {
         "      \"organizationName\": \"SonarSource\"," +
         "      \"organizationUrl\": \"http://www.sonarsource.com\"," +
         "      \"homepageUrl\": \"http://redirect.sonarsource.com/plugins/scmgit.html\"," +
-        "      \"issueTrackerUrl\": \"http://jira.codehaus.org/browse/SONARSCGIT\"," +
+        "      \"issueTrackerUrl\": \"http://jira.sonarsource.com/browse/SONARSCGIT\"," +
         "      \"implementationBuild\": \"9ce9d330c313c296fab051317cc5ad4b26319e07\"" +
         "    }" +
         "  ]," +
@@ -121,7 +121,7 @@ public class PendingActionTest {
         "      \"organizationName\": \"SonarSource\"," +
         "      \"organizationUrl\": \"http://www.sonarsource.com\"," +
         "      \"homepageUrl\": \"http://redirect.sonarsource.com/plugins/scmgit.html\"," +
-        "      \"issueTrackerUrl\": \"http://jira.codehaus.org/browse/SONARSCGIT\"," +
+        "      \"issueTrackerUrl\": \"http://jira.sonarsource.com/browse/SONARSCGIT\"," +
         "      \"implementationBuild\": \"9ce9d330c313c296fab051317cc5ad4b26319e07\"" +
         "    }" +
         "  ]" +
@@ -202,7 +202,7 @@ public class PendingActionTest {
       .setOrganizationName("SonarSource")
       .setOrganizationUrl("http://www.sonarsource.com")
       .setHomepageUrl("http://redirect.sonarsource.com/plugins/scmgit.html")
-      .setIssueTrackerUrl("http://jira.codehaus.org/browse/SONARSCGIT")
+      .setIssueTrackerUrl("http://jira.sonarsource.com/browse/SONARSCGIT")
       .setImplementationBuild("9ce9d330c313c296fab051317cc5ad4b26319e07");
   }
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginWSCommonsTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginWSCommonsTest.java
index 761cf9ee45c..11403c59936 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginWSCommonsTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginWSCommonsTest.java
@@ -57,7 +57,7 @@ public class PluginWSCommonsTest {
       "  \"organizationName\": \"SonarSource\"," +
       "  \"organizationUrl\": \"http://www.sonarsource.com\"," +
       "  \"homepageUrl\": \"http://redirect.sonarsource.com/plugins/scmgit.html\"," +
-      "  \"issueTrackerUrl\": \"http://jira.codehaus.org/browse/SONARSCGIT\"" +
+      "  \"issueTrackerUrl\": \"http://jira.sonarsource.com/browse/SONARSCGIT\"" +
       "}");
   }
 
@@ -77,7 +77,7 @@ public class PluginWSCommonsTest {
       "  \"organizationName\": \"SonarSource\"," +
       "  \"organizationUrl\": \"http://www.sonarsource.com\"," +
       "  \"homepageUrl\": \"http://redirect.sonarsource.com/plugins/scmgit.html\"," +
-      "  \"issueTrackerUrl\": \"http://jira.codehaus.org/browse/SONARSCGIT\"," +
+      "  \"issueTrackerUrl\": \"http://jira.sonarsource.com/browse/SONARSCGIT\"," +
       "}");
   }
 
@@ -215,7 +215,7 @@ public class PluginWSCommonsTest {
       .setOrganizationName("SonarSource")
       .setOrganizationUrl("http://www.sonarsource.com")
       .setHomepageUrl("http://redirect.sonarsource.com/plugins/scmgit.html")
-      .setIssueTrackerUrl("http://jira.codehaus.org/browse/SONARSCGIT");
+      .setIssueTrackerUrl("http://jira.sonarsource.com/browse/SONARSCGIT");
   }
 
   private Plugin newPlugin() {
diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UpdatesActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UpdatesActionTest.java
index 54aeddee145..30c33a49e40 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UpdatesActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UpdatesActionTest.java
@@ -66,7 +66,7 @@ public class UpdatesActionTest extends AbstractUpdateCenterBasedPluginsWsActionT
     .setDate(DateUtils.parseDate("2014-03-31"))
     .setDescription("Makes the plugin compatible with multi-language analysis introduced in SonarQube 4.2 and adds support of Emma 2.0 reports")
     .setDownloadUrl("http://repository.codehaus.org/org/codehaus/sonar-plugins/android/sonar-android-plugin/1.0/sonar-android-plugin-1.0.jar")
-    .setChangelogUrl("http://jira.codehaus.org/secure/ReleaseNote.jspa?projectId=13235&version=20187")
+    .setChangelogUrl("http://jira.sonarsource.com/secure/ReleaseNote.jspa?projectId=13235&version=20187")
 
     .addOutgoingDependency(release(JAVA_PLUGIN, "1.0"));
 
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/models/api/utils.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/models/api/utils.rb
index e136dd2c89a..fffa5f2e8c5 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/models/api/utils.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/models/api/utils.rb
@@ -121,16 +121,16 @@ class Api::Utils
 
   # Splits a string into an array of lines
   # For history reference:
-  #   - http://jira.codehaus.org/browse/SONAR-2282 first modified the behaviour to keep the trailing lines
-  #   - then http://jira.codehaus.org/browse/SONAR-3003 reverted this modification to remove potential last empty line
-  #   - then http://jira.codehaus.org/browse/SONAR-3896 reactivate this modification to display last empty line
+  #   - http://jira.sonarsource.com/browse/SONAR-2282 first modified the behaviour to keep the trailing lines
+  #   - then http://jira.sonarsource.com/browse/SONAR-3003 reverted this modification to remove potential last empty line
+  #   - then http://jira.sonarsource.com/browse/SONAR-3896 reactivate this modification to display last empty line
   def self.split_newlines(input)
     input.split(/\r?\n|\r/, -1)
   end
 
   def self.convert_string_to_unix_newlines(input)
     # Don't use '\n' here
-    # See http://jira.codehaus.org/browse/SONAR-2571
+    # See http://jira.sonarsource.com/browse/SONAR-2571
     split_newlines(input).join("\n")
   end
 
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/models/event.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/models/event.rb
index 01e4c8ef7f1..b9d1b345cf7 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/models/event.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/models/event.rb
@@ -58,7 +58,7 @@ class Event < ActiveRecord::Base
   end
   
   # Use this method to display event description, as missing descriptions are not stored in the same way
-  # on different DBs (see https://jira.codehaus.org/browse/SONAR-3326)
+  # on different DBs (see https://jira.sonarsource.com/browse/SONAR-3326)
   def description_text
     description || ''
   end
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/models/snapshot.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/models/snapshot.rb
index f11ffcb5d8b..fd175224e56 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/models/snapshot.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/models/snapshot.rb
@@ -71,7 +71,7 @@ class Snapshot < ActiveRecord::Base
   end
 
   def self.for_timemachine_matrix(resource)
-    # http://jira.codehaus.org/browse/SONAR-1850
+    # http://jira.sonarsource.com/browse/SONAR-1850
     # Conditions on scope and qualifier are required to exclude library snapshots.
     # Use-case :
     #   1. project A 2.0 is analyzed -> new snapshot A with qualifier TRK
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/settings/_properties.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/settings/_properties.html.erb
index c856dfa9488..9ef0f8ba55d 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/settings/_properties.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/settings/_properties.html.erb
@@ -208,7 +208,7 @@
     })
     .on('keypress', 'form', function (e) {
       if (e.which == 13 && e.target.nodeName != "TEXTAREA") {
-        /* See https://jira.codehaus.org/browse/SONAR-4363 */
+        /* See https://jira.sonarsource.com/browse/SONAR-4363 */
         submit_settings.click();
         return false;
       }
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/config/environment.rb b/server/sonar-web/src/main/webapp/WEB-INF/config/environment.rb
index c5c7739fd05..825def7bd25 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/config/environment.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/config/environment.rb
@@ -1,7 +1,7 @@
 RAILS_GEM_VERSION = '2.3.15'
 
 # Avoid conflict with local ruby installations
-# See http://jira.codehaus.org/browse/SONAR-3579
+# See http://jira.sonarsource.com/browse/SONAR-3579
 ENV['GEM_HOME'] = $servlet_context.getRealPath('/WEB-INF/gems')
 
 # Bootstrap the Rails environment, frameworks, and default configuration
@@ -180,7 +180,7 @@ class ActiveRecord::Migration
   def self.add_varchar_index(table_name, column_name, options = {})
     if dialect()=='mysql' && !options[:length]
       # Index of varchar column is limited to 767 bytes on mysql (<= 255 UTF-8 characters)
-      # See http://jira.codehaus.org/browse/SONAR-4137 and
+      # See http://jira.sonarsource.com/browse/SONAR-4137 and
       # http://dev.mysql.com/doc/refman/5.6/en/innodb-restrictions.html
       options[:length]=255
     end
@@ -315,5 +315,5 @@ DatabaseVersion.automatic_setup
 #
 
 # Increase size of form parameters
-# See http://jira.codehaus.org/browse/SONAR-5577
+# See http://jira.sonarsource.com/browse/SONAR-5577
 Rack::Utils.key_space_limit = 262144 # 4 times the default size
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/231_refactor_rule_measures.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/231_refactor_rule_measures.rb
index ce57fd2579f..aaa2113df77 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/231_refactor_rule_measures.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/231_refactor_rule_measures.rb
@@ -20,7 +20,7 @@
 
 #
 # Sonar 2.13
-# http://jira.codehaus.org/browse/SONAR-1974
+# http://jira.sonarsource.com/browse/SONAR-1974
 #
 class RefactorRuleMeasures < ActiveRecord::Migration
 
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/603_add_enabled_to_projects_kee_index.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/603_add_enabled_to_projects_kee_index.rb
index 6e80a8f8ee3..8f38167d47a 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/603_add_enabled_to_projects_kee_index.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/603_add_enabled_to_projects_kee_index.rb
@@ -29,7 +29,7 @@ class AddEnabledToProjectsKeeIndex < ActiveRecord::Migration
 
     if dialect=='mysql'
       # Index of varchar column is limited to 767 bytes on mysql (<= 255 UTF-8 characters)
-      # See http://jira.codehaus.org/browse/SONAR-4137 and
+      # See http://jira.sonarsource.com/browse/SONAR-4137 and
       # http://dev.mysql.com/doc/refman/5.6/en/innodb-restrictions.html
       add_index :projects, [:kee, :enabled], :name => 'projects_kee', :length => {:kee => 255}
     else
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/callbacks.rb b/server/sonar-web/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/callbacks.rb
index 27375c60a68..d90ce8c728c 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/callbacks.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/callbacks.rb
@@ -40,7 +40,7 @@ module ActiveRecord
         #sonar
         # Why do we try to reconnect ? It opens two connections instead of a single one.
         # Commenting the reconnection allows to have a single JDBC connection per HTTP request
-        # https://jira.codehaus.org/browse/SONAR-2784
+        # https://jira.sonarsource.com/browse/SONAR-2784
         #reconnect!
         #/sonar
       end
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mysql/adapter.rb b/server/sonar-web/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mysql/adapter.rb
index 163c27c06e7..740db48cbe1 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mysql/adapter.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/mysql/adapter.rb
@@ -372,7 +372,7 @@ module ::ArJdbc
     end
 
     # SONAR - support the length parameter when creating indices
-    # See http://jira.codehaus.org/browse/SONAR-4137
+    # See http://jira.sonarsource.com/browse/SONAR-4137
     def quoted_columns_for_index(column_names, options = {})
       length = options[:length] if options.is_a?(Hash)
 
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/oracle/adapter.rb b/server/sonar-web/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/oracle/adapter.rb
index 954c838f9c2..03613383541 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/oracle/adapter.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/oracle/adapter.rb
@@ -160,7 +160,7 @@ module ::ArJdbc
 
     def sql_literal?(value)
       # SonarQube
-      # See http://jira.codehaus.org/browse/SONAR-4994
+      # See http://jira.sonarsource.com/browse/SONAR-4994
       # This code always returns false (we use ActiveRecord 2.3) and is heavy-CPU consuming
       # because of raised exceptions.
       #defined?(::Arel::SqlLiteral) && ::Arel::SqlLiteral === value
diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties
index fa88713a16d..82c1d5a261c 100644
--- a/sonar-application/src/main/assembly/conf/sonar.properties
+++ b/sonar-application/src/main/assembly/conf/sonar.properties
@@ -33,12 +33,12 @@
 # - Only thin client is supported
 # - Only versions 11.2.* of Oracle JDBC driver are supported
 # - The JDBC driver must be copied into the directory extensions/jdbc-driver/oracle/
-# - If you need to set the schema, please refer to http://jira.codehaus.org/browse/SONAR-5000
+# - If you need to set the schema, please refer to http://jira.sonarsource.com/browse/SONAR-5000
 #sonar.jdbc.url=jdbc:oracle:thin:@localhost/XE
 
 
 #----- PostgreSQL 8.x/9.x
-# If you don't use the schema named "public", please refer to http://jira.codehaus.org/browse/SONAR-5000
+# If you don't use the schema named "public", please refer to http://jira.sonarsource.com/browse/SONAR-5000
 #sonar.jdbc.url=jdbc:postgresql://localhost/sonar
 
 
diff --git a/sonar-batch/src/main/java/org/sonar/batch/maven/MavenProjectConverter.java b/sonar-batch/src/main/java/org/sonar/batch/maven/MavenProjectConverter.java
index 21623db784d..ee78f0ea7c7 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/maven/MavenProjectConverter.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/maven/MavenProjectConverter.java
@@ -144,7 +144,7 @@ public class MavenProjectConverter implements TaskExtension {
   }
 
   private static void guessEncoding(MavenProject pom, ProjectDefinition definition) {
-    // See http://jira.codehaus.org/browse/SONAR-2151
+    // See http://jira.sonarsource.com/browse/SONAR-2151
     String encoding = MavenUtils.getSourceEncoding(pom);
     if (encoding != null) {
       definition.setProperty(CoreProperties.ENCODING_PROPERTY, encoding);
@@ -152,7 +152,7 @@ public class MavenProjectConverter implements TaskExtension {
   }
 
   private static void guessJavaVersion(MavenProject pom, ProjectDefinition definition) {
-    // See http://jira.codehaus.org/browse/SONAR-2148
+    // See http://jira.sonarsource.com/browse/SONAR-2148
     // Get Java source and target versions from maven-compiler-plugin.
     String version = MavenUtils.getJavaSourceVersion(pom);
     if (version != null) {
diff --git a/sonar-batch/src/test/java/org/sonar/batch/compute/CountUnresolvedIssuesDecoratorTest.java b/sonar-batch/src/test/java/org/sonar/batch/compute/CountUnresolvedIssuesDecoratorTest.java
index 8473e0a3da7..19637289747 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/compute/CountUnresolvedIssuesDecoratorTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/compute/CountUnresolvedIssuesDecoratorTest.java
@@ -139,7 +139,7 @@ public class CountUnresolvedIssuesDecoratorTest {
   }
 
   /**
-   * See http://jira.codehaus.org/browse/SONAR-1729
+   * See http://jira.sonarsource.com/browse/SONAR-1729
    */
   @Test
   public void should_not_count_issues_if_measure_already_exists() {
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/compute/ProjectLinksSensorTest/shouldSaveLinks.xml b/sonar-batch/src/test/resources/org/sonar/batch/compute/ProjectLinksSensorTest/shouldSaveLinks.xml
index a44ea429019..204af70a615 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/compute/ProjectLinksSensorTest/shouldSaveLinks.xml
+++ b/sonar-batch/src/test/resources/org/sonar/batch/compute/ProjectLinksSensorTest/shouldSaveLinks.xml
@@ -16,7 +16,7 @@
 
   <issueManagement>
     <system>jira</system>
-    <url>http://jira.codehaus.org/browse/SONAR</url>
+    <url>http://jira.sonarsource.com/browse/SONAR</url>
   </issueManagement>
 
   <mailingLists>
@@ -48,4 +48,4 @@
     </license>
   </licenses>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/sonar-core/src/main/java/org/sonar/core/i18n/RuleI18nManager.java b/sonar-core/src/main/java/org/sonar/core/i18n/RuleI18nManager.java
index 3be29861044..d529ee02c31 100644
--- a/sonar-core/src/main/java/org/sonar/core/i18n/RuleI18nManager.java
+++ b/sonar-core/src/main/java/org/sonar/core/i18n/RuleI18nManager.java
@@ -30,7 +30,7 @@ import javax.annotation.CheckForNull;
 import java.util.Locale;
 
 /**
- * @deprecated in 4.1. Rules are not localized anymore. See http://jira.codehaus.org/browse/SONAR-4885
+ * @deprecated in 4.1. Rules are not localized anymore. See http://jira.sonarsource.com/browse/SONAR-4885
  */
 @Deprecated
 @BatchSide
@@ -47,7 +47,7 @@ public class RuleI18nManager implements RuleI18n {
   }
 
   /**
-   * @deprecated in 4.1. Rules are not localized anymore. See http://jira.codehaus.org/browse/SONAR-4885
+   * @deprecated in 4.1. Rules are not localized anymore. See http://jira.sonarsource.com/browse/SONAR-4885
    */
   @Override
   @Deprecated
@@ -56,7 +56,7 @@ public class RuleI18nManager implements RuleI18n {
   }
 
   /**
-   * @deprecated in 4.1. Rules are not localized anymore. See http://jira.codehaus.org/browse/SONAR-4885
+   * @deprecated in 4.1. Rules are not localized anymore. See http://jira.sonarsource.com/browse/SONAR-4885
    */
   @Override
   @Deprecated
@@ -65,7 +65,7 @@ public class RuleI18nManager implements RuleI18n {
   }
 
   /**
-   * @deprecated in 4.1. Rules are not localized anymore. See http://jira.codehaus.org/browse/SONAR-4885
+   * @deprecated in 4.1. Rules are not localized anymore. See http://jira.sonarsource.com/browse/SONAR-4885
    */
   @Override
   @Deprecated
@@ -74,7 +74,7 @@ public class RuleI18nManager implements RuleI18n {
   }
 
   /**
-   * @deprecated in 4.1. Rules are not localized anymore. See http://jira.codehaus.org/browse/SONAR-4885
+   * @deprecated in 4.1. Rules are not localized anymore. See http://jira.sonarsource.com/browse/SONAR-4885
    */
   @Override
   @Deprecated
@@ -112,7 +112,7 @@ public class RuleI18nManager implements RuleI18n {
    * Method used to ensure backward compatibility for language plugins that store HTML rule description files in the former
    * location (which was used prior to Sonar 3.0).
    * 
-   * See http://jira.codehaus.org/browse/SONAR-3319
+   * See http://jira.sonarsource.com/browse/SONAR-3319
    */
   private String lookUpDescriptionInFormerLocation(String ruleKey, String relatedProperty) {
     return defaultI18n.messageFromFile(Locale.ENGLISH, ruleKey + ".html", relatedProperty);
diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/UpdateConflictResolver.java b/sonar-core/src/main/java/org/sonar/core/issue/db/UpdateConflictResolver.java
index 5c4457e3637..4fbd892d499 100644
--- a/sonar-core/src/main/java/org/sonar/core/issue/db/UpdateConflictResolver.java
+++ b/sonar-core/src/main/java/org/sonar/core/issue/db/UpdateConflictResolver.java
@@ -26,7 +26,7 @@ import org.sonar.api.issue.internal.DefaultIssue;
 
 /**
  * Support concurrent modifications on issues made by analysis and users at the same time
- * See https://jira.codehaus.org/browse/SONAR-4309
+ * See https://jira.sonarsource.com/browse/SONAR-4309
  */
 public class UpdateConflictResolver {
 
diff --git a/sonar-core/src/main/java/org/sonar/core/resource/ResourceDao.java b/sonar-core/src/main/java/org/sonar/core/resource/ResourceDao.java
index a0ac581d2fa..ad12d18d368 100644
--- a/sonar-core/src/main/java/org/sonar/core/resource/ResourceDao.java
+++ b/sonar-core/src/main/java/org/sonar/core/resource/ResourceDao.java
@@ -208,7 +208,7 @@ public class ResourceDao implements DaoComponent {
    * Will return the component itself if it's already the root project
    * Can return null if the component does not exists.
    *
-   * The implementation should rather use a new column already containing the root project, see https://jira.codehaus.org/browse/SONAR-5188.
+   * The implementation should rather use a new column already containing the root project, see https://jira.sonarsource.com/browse/SONAR-5188.
    */
   @CheckForNull
   public ResourceDto getRootProjectByComponentKey(DbSession session, String componentKey) {
@@ -253,7 +253,7 @@ public class ResourceDao implements DaoComponent {
    * Will return the component itself if it's already the root project
    * Can return null if the component that does exists.
    *
-   * The implementation should rather use a new column already containing the root project, see https://jira.codehaus.org/browse/SONAR-5188.
+   * The implementation should rather use a new column already containing the root project, see https://jira.sonarsource.com/browse/SONAR-5188.
    */
   @CheckForNull
   public ResourceDto getRootProjectByComponentId(long componentId) {
diff --git a/sonar-core/src/main/java/org/sonar/jpa/session/JpaDatabaseSession.java b/sonar-core/src/main/java/org/sonar/jpa/session/JpaDatabaseSession.java
index ab43555dd4f..fb07c08c09f 100644
--- a/sonar-core/src/main/java/org/sonar/jpa/session/JpaDatabaseSession.java
+++ b/sonar-core/src/main/java/org/sonar/jpa/session/JpaDatabaseSession.java
@@ -130,7 +130,7 @@ public class JpaDatabaseSession extends DatabaseSession {
       getEntityManager().persist(model);
     } catch (PersistenceException e) {
       /*
-       * See http://jira.codehaus.org/browse/SONAR-2234
+       * See http://jira.sonarsource.com/browse/SONAR-2234
        * In some cases Hibernate can throw exceptions without meaningful information about context, so we improve them here.
        */
       throw new PersistenceException("Unable to persist : " + model, e);
@@ -197,7 +197,7 @@ public class JpaDatabaseSession extends DatabaseSession {
   @Override
   public <T> T getSingleResult(Query query, T defaultValue) {
     /*
-     * See http://jira.codehaus.org/browse/SONAR-2225
+     * See http://jira.sonarsource.com/browse/SONAR-2225
      * By default Hibernate throws NonUniqueResultException without meaningful information about context,
      * so we improve it here by adding all results in error message.
      * Note that in some rare situations we can receive too many results, which may lead to OOME,
diff --git a/sonar-core/src/test/java/org/sonar/core/i18n/RuleI18nManagerTest.java b/sonar-core/src/test/java/org/sonar/core/i18n/RuleI18nManagerTest.java
index 2c589597fb4..3dbf9a83a35 100644
--- a/sonar-core/src/test/java/org/sonar/core/i18n/RuleI18nManagerTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/i18n/RuleI18nManagerTest.java
@@ -70,7 +70,7 @@ public class RuleI18nManagerTest {
     verifyNoMoreInteractions(i18n);
   }
 
-  // see http://jira.codehaus.org/browse/SONAR-3319
+  // see http://jira.sonarsource.com/browse/SONAR-3319
   @Test
   public void shouldGetDescriptionFromFileWithBackwardCompatibility() {
     String propertyKeyForName = "rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationUseStyleCheck.name";
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/CoreProperties.java b/sonar-plugin-api/src/main/java/org/sonar/api/CoreProperties.java
index 4b60af8f368..4df29867109 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/CoreProperties.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/CoreProperties.java
@@ -77,7 +77,7 @@ public interface CoreProperties {
   /**
    * @see #SUBCATEGORY_DUPLICATIONS
    * @since 2.11
-   * @deprecated since 4.0. See http://jira.codehaus.org/browse/SONAR-4660. Do not forget to remove the properties from core bundles
+   * @deprecated since 4.0. See http://jira.sonarsource.com/browse/SONAR-4660. Do not forget to remove the properties from core bundles
    */
   @Deprecated
   String CATEGORY_DUPLICATIONS = "duplications";
@@ -90,7 +90,7 @@ public interface CoreProperties {
   /**
    * @see #SUBCATEGORY_L10N
    * @since 2.11
-   * @deprecated since 4.0. See http://jira.codehaus.org/browse/SONAR-4660. Do not forget to remove the properties from core bundles
+   * @deprecated since 4.0. See http://jira.sonarsource.com/browse/SONAR-4660. Do not forget to remove the properties from core bundles
    */
   @Deprecated
   String CATEGORY_L10N = "localization";
@@ -103,7 +103,7 @@ public interface CoreProperties {
   /**
    * @see #SUBCATEGORY_DIFFERENTIAL_VIEWS
    * @since 2.11
-   * @deprecated since 4.0. See http://jira.codehaus.org/browse/SONAR-4660. Do not forget to remove the properties from core bundles
+   * @deprecated since 4.0. See http://jira.sonarsource.com/browse/SONAR-4660. Do not forget to remove the properties from core bundles
    */
   @Deprecated
   String CATEGORY_DIFFERENTIAL_VIEWS = "differentialViews";
@@ -177,7 +177,7 @@ public interface CoreProperties {
   String PROJECT_LANGUAGE_PROPERTY = "sonar.language";
 
   /**
-   * @deprecated since 4.3. See http://jira.codehaus.org/browse/SONAR-5185
+   * @deprecated since 4.3. See http://jira.sonarsource.com/browse/SONAR-5185
    */
   @Deprecated
   String DYNAMIC_ANALYSIS_PROPERTY = "sonar.dynamicAnalysis";
@@ -200,7 +200,7 @@ public interface CoreProperties {
   /* Sonar Core */
 
   /**
-   * @deprecated since 4.1. See http://jira.codehaus.org/browse/SONAR-4875
+   * @deprecated since 4.1. See http://jira.sonarsource.com/browse/SONAR-4875
    */
   @Deprecated
   String CORE_VIOLATION_LOCALE_PROPERTY = "sonar.violationLocale";
@@ -208,14 +208,14 @@ public interface CoreProperties {
   String CORE_VIOLATION_LOCALE_DEFAULT_VALUE = "en";
 
   /**
-   * @deprecated since 4.3. See http://jira.codehaus.org/browse/SONAR-5109
+   * @deprecated since 4.3. See http://jira.sonarsource.com/browse/SONAR-5109
    */
   @Deprecated
   String CORE_SKIPPED_MODULES_PROPERTY = "sonar.skippedModules";
 
   /**
    * @since 4.0
-   * @deprecated since 4.3. See http://jira.codehaus.org/browse/SONAR-5109
+   * @deprecated since 4.3. See http://jira.sonarsource.com/browse/SONAR-5109
    */
   @Deprecated
   String CORE_INCLUDED_MODULES_PROPERTY = "sonar.includedModules";
@@ -228,7 +228,7 @@ public interface CoreProperties {
   boolean CORE_ALLOW_USERS_TO_SIGNUP_DEAULT_VALUE = false;
 
   /**
-   * @deprecated since 2.14. See http://jira.codehaus.org/browse/SONAR-3153. Replaced by {@link #CORE_AUTHENTICATOR_REALM}.
+   * @deprecated since 2.14. See http://jira.sonarsource.com/browse/SONAR-3153. Replaced by {@link #CORE_AUTHENTICATOR_REALM}.
    */
   @Deprecated
   String CORE_AUTHENTICATOR_CLASS = "sonar.authenticator.class";
@@ -274,7 +274,7 @@ public interface CoreProperties {
 
   /**
    * @deprecated in 5.0
-   * @see <a href="https://jira.codehaus.org/browse/SONAR-5339">SONAR-5339</a>
+   * @see <a href="https://jira.sonarsource.com/browse/SONAR-5339">SONAR-5339</a>
    */
   @Deprecated
   String CPD_SKIP_PROPERTY = "sonar.cpd.skip";
@@ -408,7 +408,7 @@ public interface CoreProperties {
 
   /**
    * @deprecated replaced in v3.4 by properties specific to languages, for example sonar.java.coveragePlugin
-   * See http://jira.codehaus.org/browse/SONARJAVA-39 for more details.
+   * See http://jira.sonarsource.com/browse/SONARJAVA-39 for more details.
    */
   @Deprecated
   String CORE_COVERAGE_PLUGIN_PROPERTY = "sonar.core.codeCoveragePlugin";
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/TimeMachine.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/TimeMachine.java
index 9fbd6fc0b72..4183d18fd95 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/TimeMachine.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/TimeMachine.java
@@ -42,7 +42,7 @@ public interface TimeMachine {
   List<Measure> getMeasures(TimeMachineQuery query);
 
   /**
-   * Return an empty list since 5.2. See https://jira.codehaus.org/browse/SONAR-6392
+   * Return an empty list since 5.2. See https://jira.sonarsource.com/browse/SONAR-6392
    */
   List<Object[]> getMeasuresFields(TimeMachineQuery query);
 
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/database/model/MeasureModel.java b/sonar-plugin-api/src/main/java/org/sonar/api/database/model/MeasureModel.java
index 4d9a29db93f..c2924048691 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/database/model/MeasureModel.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/database/model/MeasureModel.java
@@ -213,7 +213,7 @@ public class MeasureModel implements Cloneable {
 
   /**
    * Concept of measure trend is dropped. This method always returns {@code null} since version 5.2.
-   * @deprecated since 5.2. See https://jira.codehaus.org/browse/SONAR-6392
+   * @deprecated since 5.2. See https://jira.sonarsource.com/browse/SONAR-6392
    * @return null
    */
   @CheckForNull
@@ -224,7 +224,7 @@ public class MeasureModel implements Cloneable {
 
   /**
    * Concept of measure trend is dropped. This method does nothing.
-   * @deprecated since 5.2. See https://jira.codehaus.org/browse/SONAR-6392
+   * @deprecated since 5.2. See https://jira.sonarsource.com/browse/SONAR-6392
    */
   @Deprecated
   public MeasureModel setTendency(Integer tendency) {
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/i18n/RuleI18n.java b/sonar-plugin-api/src/main/java/org/sonar/api/i18n/RuleI18n.java
index fcfb5369dcc..6f2deeca942 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/i18n/RuleI18n.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/i18n/RuleI18n.java
@@ -31,7 +31,7 @@ import java.util.Locale;
  * {@link I18n}-companion component that provides translation facilities for rule names, descriptions and parameter names.
  * 
  * @since 3.2
- * @deprecated in 4.1. Rules are not localized anymore. See http://jira.codehaus.org/browse/SONAR-4885
+ * @deprecated in 4.1. Rules are not localized anymore. See http://jira.sonarsource.com/browse/SONAR-4885
  */
 @Deprecated
 @BatchSide
@@ -48,7 +48,7 @@ public interface RuleI18n {
    * @param ruleKey the rule key
    * @param locale not used
    * @return the translated name of the rule, or the default English one if the given locale is not supported, or null
-   * @deprecated since 4.1. Rules are not localized anymore. See http://jira.codehaus.org/browse/SONAR-4885
+   * @deprecated since 4.1. Rules are not localized anymore. See http://jira.sonarsource.com/browse/SONAR-4885
    */
   @Deprecated
   @CheckForNull
@@ -76,7 +76,7 @@ public interface RuleI18n {
    * @param rule the rule
    * @param locale the locale to translate into
    * @return the translated name of the rule, or the default English one if the given locale is not supported, or the rule name.
-   * @deprecated since 4.1. Rules are not localized anymore. See http://jira.codehaus.org/browse/SONAR-4885
+   * @deprecated since 4.1. Rules are not localized anymore. See http://jira.sonarsource.com/browse/SONAR-4885
    */
   @Deprecated
   @CheckForNull
@@ -104,7 +104,7 @@ public interface RuleI18n {
    * @param ruleKey the rule key
    * @param locale  the locale to translate into
    * @return the translated description of the rule, or the default English one if the given locale is not supported
-   * @deprecated since 4.1. Rules are not localized anymore. See http://jira.codehaus.org/browse/SONAR-4885
+   * @deprecated since 4.1. Rules are not localized anymore. See http://jira.sonarsource.com/browse/SONAR-4885
    */
   @Deprecated
   String getDescription(String repositoryKey, String ruleKey, Locale locale);
@@ -133,7 +133,7 @@ public interface RuleI18n {
    * @param locale the locale to translate into
    * @return the translated name of the rule parameter, or the default English one if the given locale is not supported, or null if
    *         no translation can be found.
-   * @deprecated since 4.1. Rules are not localized anymore. See http://jira.codehaus.org/browse/SONAR-4885
+   * @deprecated since 4.1. Rules are not localized anymore. See http://jira.sonarsource.com/browse/SONAR-4885
    */
   @Deprecated
   @CheckForNull
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/CoreMetrics.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/CoreMetrics.java
index 227a27d7d73..874c873ae25 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/CoreMetrics.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/CoreMetrics.java
@@ -169,14 +169,14 @@ public final class CoreMetrics {
 
   /**
    * @deprecated since 5.0.
-   * @see <a href="https://jira.codehaus.org/browse/SONAR-5224">SONAR-5224</a>
+   * @see <a href="https://jira.sonarsource.com/browse/SONAR-5224">SONAR-5224</a>
    */
   @Deprecated
   public static final String ACCESSORS_KEY = "accessors";
 
   /**
    * @deprecated since 5.0.
-   * @see <a href="https://jira.codehaus.org/browse/SONAR-5224">SONAR-5224</a>
+   * @see <a href="https://jira.sonarsource.com/browse/SONAR-5224">SONAR-5224</a>
    */
   @Deprecated
   public static final Metric<Integer> ACCESSORS = new Metric.Builder(ACCESSORS_KEY, "Accessors", Metric.ValueType.INT)
@@ -1668,13 +1668,13 @@ public final class CoreMetrics {
     .create();
 
   /**
-   * @deprecated in 4.1. See http://jira.codehaus.org/browse/SONAR-4853
+   * @deprecated in 4.1. See http://jira.sonarsource.com/browse/SONAR-4853
    */
   @Deprecated
   public static final String LCOM4_KEY = "lcom4";
 
   /**
-   * @deprecated in 4.1. See http://jira.codehaus.org/browse/SONAR-4853
+   * @deprecated in 4.1. See http://jira.sonarsource.com/browse/SONAR-4853
    */
   @Deprecated
   public static final transient Metric<Double> LCOM4 = new Metric.Builder(LCOM4_KEY, "LCOM4", Metric.ValueType.FLOAT)
@@ -1687,13 +1687,13 @@ public final class CoreMetrics {
     .create();
 
   /**
-   * @deprecated in 4.1. See http://jira.codehaus.org/browse/SONAR-4853
+   * @deprecated in 4.1. See http://jira.sonarsource.com/browse/SONAR-4853
    */
   @Deprecated
   public static final String LCOM4_BLOCKS_KEY = "lcom4_blocks";
 
   /**
-   * @deprecated in 4.1. See http://jira.codehaus.org/browse/SONAR-4853
+   * @deprecated in 4.1. See http://jira.sonarsource.com/browse/SONAR-4853
    */
   @Deprecated
   public static final transient Metric<String> LCOM4_BLOCKS = new Metric.Builder(LCOM4_BLOCKS_KEY, "LCOM4 blocks", Metric.ValueType.DATA)
@@ -1706,13 +1706,13 @@ public final class CoreMetrics {
     .create();
 
   /**
-   * @deprecated in 4.1. See http://jira.codehaus.org/browse/SONAR-4853
+   * @deprecated in 4.1. See http://jira.sonarsource.com/browse/SONAR-4853
    */
   @Deprecated
   public static final String LCOM4_DISTRIBUTION_KEY = "lcom4_distribution";
 
   /**
-   * @deprecated in 4.1. See http://jira.codehaus.org/browse/SONAR-4853
+   * @deprecated in 4.1. See http://jira.sonarsource.com/browse/SONAR-4853
    */
   @Deprecated
   public static final transient Metric<String> LCOM4_DISTRIBUTION = new Metric.Builder(LCOM4_DISTRIBUTION_KEY, "Class distribution /LCOM4", Metric.ValueType.DISTRIB)
@@ -1725,13 +1725,13 @@ public final class CoreMetrics {
     .create();
 
   /**
-   * @deprecated in 4.1. See http://jira.codehaus.org/browse/SONAR-4853
+   * @deprecated in 4.1. See http://jira.sonarsource.com/browse/SONAR-4853
    */
   @Deprecated
   public static final String SUSPECT_LCOM4_DENSITY_KEY = "suspect_lcom4_density";
 
   /**
-   * @deprecated in 4.1. See http://jira.codehaus.org/browse/SONAR-4853
+   * @deprecated in 4.1. See http://jira.sonarsource.com/browse/SONAR-4853
    */
   @Deprecated
   public static final transient Metric<Double> SUSPECT_LCOM4_DENSITY = new Metric.Builder(SUSPECT_LCOM4_DENSITY_KEY, "Suspect LCOM4 density", Metric.ValueType.PERCENT)
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/Measure.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/Measure.java
index 0d041a25890..2acf8a09af3 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/Measure.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/Measure.java
@@ -438,7 +438,7 @@ public class Measure<G extends Serializable> implements Serializable {
 
   /**
    * Concept of measure trend is dropped.
-   * @deprecated since 5.2. See https://jira.codehaus.org/browse/SONAR-6392
+   * @deprecated since 5.2. See https://jira.sonarsource.com/browse/SONAR-6392
    * @return {@code null} since version 5.2
    */
   @Deprecated
@@ -449,7 +449,7 @@ public class Measure<G extends Serializable> implements Serializable {
 
   /**
    * Concept of measure trend is dropped. This method does nothing.
-   * @deprecated since 5.2. See https://jira.codehaus.org/browse/SONAR-6392
+   * @deprecated since 5.2. See https://jira.sonarsource.com/browse/SONAR-6392
    * @return the measure object instance
    */
   @Deprecated
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/resources/Project.java b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Project.java
index 14549bd4433..4063ed47712 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/resources/Project.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Project.java
@@ -132,7 +132,7 @@ public class Project extends Resource implements Component {
 
   /**
    * @return the project's packaging
-   * @deprecated in 2.8. See http://jira.codehaus.org/browse/SONAR-2341
+   * @deprecated in 2.8. See http://jira.sonarsource.com/browse/SONAR-2341
    */
   @Deprecated
   public String getPackaging() {
@@ -173,7 +173,7 @@ public class Project extends Resource implements Component {
   /**
    * For internal use only.
    *
-   * @deprecated in 2.8. See http://jira.codehaus.org/browse/SONAR-2341
+   * @deprecated in 2.8. See http://jira.sonarsource.com/browse/SONAR-2341
    */
   @Deprecated
   public Project setPackaging(String packaging) {
@@ -220,7 +220,7 @@ public class Project extends Resource implements Component {
    * whether it's the latest analysis done on this project (displayed in sonar dashboard) or an analysis on a past revision.
    *
    * @since 2.0
-   * @deprecated in 3.6. The analysis is now always the latest one (past analysis must be done in a chronological order). See http://jira.codehaus.org/browse/SONAR-4334
+   * @deprecated in 3.6. The analysis is now always the latest one (past analysis must be done in a chronological order). See http://jira.sonarsource.com/browse/SONAR-4334
    */
   @Deprecated
   public boolean isLatestAnalysis() {
@@ -231,7 +231,7 @@ public class Project extends Resource implements Component {
    * For internal use only.
    *
    * @deprecated in 3.6. It's not possible to analyze a project before the latest known quality snapshot.
-   * See http://jira.codehaus.org/browse/SONAR-4334
+   * See http://jira.sonarsource.com/browse/SONAR-4334
    */
   @Deprecated
   public Project setLatestAnalysis(boolean b) {
@@ -385,7 +385,7 @@ public class Project extends Resource implements Component {
   /**
    * For internal use only.
    *
-   * @deprecated since 2.6. See http://jira.codehaus.org/browse/SONAR-2126
+   * @deprecated since 2.6. See http://jira.sonarsource.com/browse/SONAR-2126
    */
   @Deprecated
   public Project setFileSystem(ProjectFileSystem fs) {
@@ -394,7 +394,7 @@ public class Project extends Resource implements Component {
   }
 
   /**
-   * @deprecated since 2.5. See http://jira.codehaus.org/browse/SONAR-2011
+   * @deprecated since 2.5. See http://jira.sonarsource.com/browse/SONAR-2011
    */
   @Deprecated
   public String getGroupId() {
@@ -402,7 +402,7 @@ public class Project extends Resource implements Component {
   }
 
   /**
-   * @deprecated since 2.5. See http://jira.codehaus.org/browse/SONAR-2011
+   * @deprecated since 2.5. See http://jira.sonarsource.com/browse/SONAR-2011
    */
   @Deprecated
   public String getArtifactId() {
@@ -411,7 +411,7 @@ public class Project extends Resource implements Component {
 
   /**
    * @return the underlying Maven project
-   * @deprecated since 2.5. See http://jira.codehaus.org/browse/SONAR-2011 ,
+   * @deprecated since 2.5. See http://jira.sonarsource.com/browse/SONAR-2011 ,
    *             MavenProject can be retrieved as an IoC dependency
    */
   @Deprecated
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/resources/ProjectFileSystem.java b/sonar-plugin-api/src/main/java/org/sonar/api/resources/ProjectFileSystem.java
index 3aad72f7531..3780adc4a13 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/resources/ProjectFileSystem.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/resources/ProjectFileSystem.java
@@ -65,7 +65,7 @@ public interface ProjectFileSystem extends BatchComponent {
    * 
    * @return the current object
    * @deprecated since 2.6 - ProjectFileSystem should be immutable
-   *             See http://jira.codehaus.org/browse/SONAR-2126
+   *             See http://jira.sonarsource.com/browse/SONAR-2126
    */
   @Deprecated
   ProjectFileSystem addSourceDir(File dir);
@@ -80,7 +80,7 @@ public interface ProjectFileSystem extends BatchComponent {
    * 
    * @return the current object
    * @deprecated since 2.6 - ProjectFileSystem should be immutable
-   *             See http://jira.codehaus.org/browse/SONAR-2126
+   *             See http://jira.sonarsource.com/browse/SONAR-2126
    */
   @Deprecated
   ProjectFileSystem addTestDir(File dir);
@@ -107,7 +107,7 @@ public interface ProjectFileSystem extends BatchComponent {
    * 
    * @param langs language filter. Check all files, whatever their language, if null or empty.
    * @deprecated since 2.6 use {@link #mainFiles(String...)} instead.
-   *             See http://jira.codehaus.org/browse/SONAR-2126
+   *             See http://jira.sonarsource.com/browse/SONAR-2126
    */
   @Deprecated
   List<File> getSourceFiles(Language... langs);
@@ -116,7 +116,7 @@ public interface ProjectFileSystem extends BatchComponent {
    * Java source files, excluding unit tests and files matching project exclusion patterns. Shortcut for getSourceFiles(Java.INSTANCE)
    * 
    * @deprecated since 2.6 use {@link #mainFiles(String...)} instead.
-   *             See http://jira.codehaus.org/browse/SONAR-2126
+   *             See http://jira.sonarsource.com/browse/SONAR-2126
    */
   @Deprecated
   List<File> getJavaSourceFiles();
@@ -133,7 +133,7 @@ public interface ProjectFileSystem extends BatchComponent {
    * Unit test files, excluding files matching project exclusion patterns.
    * 
    * @deprecated since 2.6 use {@link #testFiles(String...)} instead.
-   *             See http://jira.codehaus.org/browse/SONAR-2126
+   *             See http://jira.sonarsource.com/browse/SONAR-2126
    */
   @Deprecated
   List<File> getTestFiles(Language... langs);
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/rules/ActiveRule.java b/sonar-plugin-api/src/main/java/org/sonar/api/rules/ActiveRule.java
index d9bc510c1fa..86f207d9c93 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/rules/ActiveRule.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/rules/ActiveRule.java
@@ -130,7 +130,7 @@ public class ActiveRule implements Cloneable {
   }
 
   /**
-   * @deprecated since 2.5 use {@link #getSeverity()} instead. See http://jira.codehaus.org/browse/SONAR-1829
+   * @deprecated since 2.5 use {@link #getSeverity()} instead. See http://jira.sonarsource.com/browse/SONAR-1829
    */
   @Deprecated
   public RulePriority getPriority() {
@@ -138,7 +138,7 @@ public class ActiveRule implements Cloneable {
   }
 
   /**
-   * @deprecated since 2.5 use {@link #setSeverity(RulePriority)} instead. See http://jira.codehaus.org/browse/SONAR-1829
+   * @deprecated since 2.5 use {@link #setSeverity(RulePriority)} instead. See http://jira.sonarsource.com/browse/SONAR-1829
    */
   @Deprecated
   public void setPriority(RulePriority priority) {
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/rules/Violation.java b/sonar-plugin-api/src/main/java/org/sonar/api/rules/Violation.java
index 7f19e8214cd..39b7ddfc940 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/rules/Violation.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/rules/Violation.java
@@ -127,7 +127,7 @@ public class Violation {
    */
   public Violation setLineId(Integer lineId) {
     if (lineId != null && lineId < 1) {
-      // TODO this normalization was added in 2.8, throw exception in future versions - see http://jira.codehaus.org/browse/SONAR-2386
+      // TODO this normalization was added in 2.8, throw exception in future versions - see http://jira.sonarsource.com/browse/SONAR-2386
       Loggers.get(getClass()).warn("line must not be less than 1 - in future versions this will cause IllegalArgumentException");
       this.lineId = null;
     } else {
@@ -162,7 +162,7 @@ public class Violation {
   }
 
   /**
-   * @deprecated since 2.5 use {@link #getSeverity()} instead. See http://jira.codehaus.org/browse/SONAR-1829
+   * @deprecated since 2.5 use {@link #getSeverity()} instead. See http://jira.sonarsource.com/browse/SONAR-1829
    */
   @Deprecated
   public RulePriority getPriority() {
@@ -172,7 +172,7 @@ public class Violation {
   /**
    * For internal use only
    *
-   * @deprecated since 2.5 use {@link #setSeverity(RulePriority)} instead. See http://jira.codehaus.org/browse/SONAR-1829
+   * @deprecated since 2.5 use {@link #setSeverity(RulePriority)} instead. See http://jira.sonarsource.com/browse/SONAR-1829
    */
   @Deprecated
   public Violation setPriority(RulePriority priority) {
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RulesDefinition.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RulesDefinition.java
index cd884949aeb..1c1aab3f78a 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RulesDefinition.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RulesDefinition.java
@@ -456,7 +456,7 @@ public interface RulesDefinition {
       if (newRules.containsKey(ruleKey)) {
         // Should fail in a perfect world, but at the time being the Findbugs plugin
         // defines several times the rule EC_INCOMPATIBLE_ARRAY_COMPARE
-        // See http://jira.codehaus.org/browse/SONARJAVA-428
+        // See http://jira.sonarsource.com/browse/SONARJAVA-428
         Loggers.get(getClass()).warn(String.format("The rule '%s' of repository '%s' is declared several times", ruleKey, key));
       }
       NewRule newRule = new NewRule(key, ruleKey);
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/web/NavigationSection.java b/sonar-plugin-api/src/main/java/org/sonar/api/web/NavigationSection.java
index 349862d1874..d9a57ec6705 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/web/NavigationSection.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/web/NavigationSection.java
@@ -37,9 +37,9 @@ public @interface NavigationSection {
   String RESOURCE = "resource";
 
   /**
-   * Support removed in 5.1. See https://jira.codehaus.org/browse/SONAR-6016.
+   * Support removed in 5.1. See https://jira.sonarsource.com/browse/SONAR-6016.
    * @deprecated in 4.5, as it costs too much to maintain and update.
-   * @see <a href="https://jira.codehaus.org/browse/SONAR-5321">SONAR-5321</a>
+   * @see <a href="https://jira.sonarsource.com/browse/SONAR-5321">SONAR-5321</a>
    */
   @Deprecated
   String RESOURCE_TAB = "resource_tab";
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/rules/ViolationTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/rules/ViolationTest.java
index 029fcc9d9f6..6cfba7e385c 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/rules/ViolationTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/rules/ViolationTest.java
@@ -35,7 +35,7 @@ public class ViolationTest {
   }
 
   /**
-   * See http://jira.codehaus.org/browse/SONAR-2386
+   * See http://jira.sonarsource.com/browse/SONAR-2386
    */
   @Test
   public void testLineIdContract() {
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/server/rule/RulesDefinitionTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/server/rule/RulesDefinitionTest.java
index e3ee4f76be9..b4158ce60ba 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/server/rule/RulesDefinitionTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/server/rule/RulesDefinitionTest.java
@@ -243,7 +243,7 @@ public class RulesDefinitionTest {
     RulesDefinition.NewRepository findbugs = context.createRepository("findbugs", "java");
     findbugs.createRule("NPE");
     findbugs.createRule("NPE");
-    // do not fail as long as http://jira.codehaus.org/browse/SONARJAVA-428 is not fixed
+    // do not fail as long as http://jira.sonarsource.com/browse/SONARJAVA-428 is not fixed
   }
 
   @Test
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/utils/WildcardPatternTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/utils/WildcardPatternTest.java
index 6e3001795d8..ae4aadd8aa3 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/utils/WildcardPatternTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/utils/WildcardPatternTest.java
@@ -123,7 +123,7 @@ public class WildcardPatternTest {
   }
 
   /**
-   * See http://jira.codehaus.org/browse/SONAR-2193
+   * See http://jira.sonarsource.com/browse/SONAR-2193
    */
   @Test
   public void issue2193() {