diff options
Diffstat (limited to 'sonar-batch/src/main')
| -rw-r--r-- | sonar-batch/src/main/java/org/sonar/batch/bootstrap/DatabaseCompatibility.java | 2 | ||||
| -rw-r--r-- | sonar-batch/src/main/java/org/sonar/batch/index/DefaultIndex.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/DatabaseCompatibility.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/DatabaseCompatibility.java index 34b6f60d9bf..6b373735b2a 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/DatabaseCompatibility.java +++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/DatabaseCompatibility.java @@ -66,7 +66,7 @@ public class DatabaseCompatibility implements BatchComponent { private void checkDatabaseStatus() { DatabaseVersion.Status status = version.getStatus(); if (status == DatabaseVersion.Status.REQUIRES_DOWNGRADE) { - throw new BadDatabaseVersion("Database relates to a more recent version of Sonar. Please check your settings (JDBC settings, version of Maven plugin)"); + throw new BadDatabaseVersion("Database relates to a more recent version of SonarQube. Please check your settings (JDBC settings, version of Maven plugin)"); } if (status == DatabaseVersion.Status.REQUIRES_UPGRADE) { throw new BadDatabaseVersion("Database must be upgraded. Please browse " + server.getURL() + "/setup"); diff --git a/sonar-batch/src/main/java/org/sonar/batch/index/DefaultIndex.java b/sonar-batch/src/main/java/org/sonar/batch/index/DefaultIndex.java index 650462ca6ba..40a2b99c773 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/index/DefaultIndex.java +++ b/sonar-batch/src/main/java/org/sonar/batch/index/DefaultIndex.java @@ -557,12 +557,12 @@ public class DefaultIndex extends SonarIndex { if (lock.isFailWhenLocked()) { throw new ResourceNotIndexedException(resource); } - LOG.warn("Resource will be ignored in next Sonar versions, index is locked: " + resource); + LOG.warn("Resource will be ignored in next SonarQube versions, index is locked: " + resource); } if (Scopes.isDirectory(resource) || Scopes.isFile(resource)) { bucket = doIndex(resource); } else if (!lock.isLocked()) { - LOG.warn("Resource will be ignored in next Sonar versions, it must be indexed before adding data: " + resource); + LOG.warn("Resource will be ignored in next SonarQube versions, it must be indexed before adding data: " + resource); } } return bucket; |