@@ -10,7 +10,7 @@ | |||
<groupId>org.codehaus.sonar.plugins</groupId> | |||
<artifactId>sonar-core-plugin</artifactId> | |||
<packaging>sonar-plugin</packaging> | |||
<name>Sonar :: Plugins :: Core</name> | |||
<name>SonarQube :: Plugins :: Core</name> | |||
<dependencies> | |||
<dependency> |
@@ -57,7 +57,7 @@ import java.util.List; | |||
key = CoreProperties.SERVER_BASE_URL, | |||
defaultValue = CoreProperties.SERVER_BASE_URL_DEFAULT_VALUE, | |||
name = "Server base URL", | |||
description = "HTTP URL of this Sonar server, such as <i>http://yourhost.yourdomain/sonar</i>. This value is used i.e. to create links in emails.", | |||
description = "HTTP URL of this SonarQube server, such as <i>http://yourhost.yourdomain/sonar</i>. This value is used i.e. to create links in emails.", | |||
project = false, | |||
global = true, | |||
category = CoreProperties.CATEGORY_GENERAL), | |||
@@ -170,7 +170,7 @@ import java.util.List; | |||
key = CoreProperties.CORE_FORCE_AUTHENTICATION_PROPERTY, | |||
defaultValue = "" + CoreProperties.CORE_FORCE_AUTHENTICATION_DEFAULT_VALUE, | |||
name = "Force user authentication", | |||
description = "Forcing user authentication stops un-logged users to access Sonar.", | |||
description = "Forcing user authentication stops un-logged users to access SonarQube.", | |||
project = false, | |||
global = true, | |||
category = CoreProperties.CATEGORY_SECURITY, |
@@ -9,7 +9,7 @@ | |||
</parent> | |||
<groupId>org.codehaus.sonar.plugins</groupId> | |||
<artifactId>sonar-cpd-plugin</artifactId> | |||
<name>Sonar :: Plugins :: CPD</name> | |||
<name>SonarQube :: Plugins :: CPD</name> | |||
<packaging>sonar-plugin</packaging> | |||
<description>Find duplicated source code within project.</description> | |||
@@ -38,7 +38,7 @@ public final class CpdPlugin extends SonarPlugin { | |||
PropertyDefinition.builder(CoreProperties.CPD_CROSS_RPOJECT) | |||
.defaultValue(CoreProperties.CPD_CROSS_RPOJECT_DEFAULT_VALUE + "") | |||
.name("Cross project duplication detection") | |||
.description("SonarQube supports the detection of cross project duplications. Activating this property will slightly increase each Sonar analysis time.") | |||
.description("SonarQube supports the detection of cross project duplications. Activating this property will slightly increase each SonarQube analysis time.") | |||
.onQualifiers(Qualifiers.PROJECT, Qualifiers.MODULE) | |||
.category(CoreProperties.CATEGORY_DUPLICATIONS) | |||
.type(PropertyType.BOOLEAN) |
@@ -11,7 +11,7 @@ | |||
<artifactId>sonar-dbcleaner-plugin</artifactId> | |||
<packaging>sonar-plugin</packaging> | |||
<name>Sonar :: Plugins :: Database Cleaner</name> | |||
<name>SonarQube :: Plugins :: Database Cleaner</name> | |||
<description>Optimizes database performances by removing old and useless data.</description> | |||
<dependencies> |
@@ -10,7 +10,7 @@ | |||
<groupId>org.codehaus.sonar.plugins</groupId> | |||
<artifactId>sonar-design-plugin</artifactId> | |||
<packaging>sonar-plugin</packaging> | |||
<name>Sonar :: Plugins :: Design</name> | |||
<name>SonarQube :: Plugins :: Design</name> | |||
<dependencies> | |||
<dependency> |
@@ -13,7 +13,7 @@ | |||
<artifactId>sonar-email-notifications-plugin</artifactId> | |||
<packaging>sonar-plugin</packaging> | |||
<name>Sonar :: Plugins :: Email Notifications</name> | |||
<name>SonarQube :: Plugins :: Email Notifications</name> | |||
<description>Email Notifications</description> | |||
<dependencies> |
@@ -12,7 +12,7 @@ | |||
<groupId>org.codehaus.sonar.plugins</groupId> | |||
<artifactId>sonar-l10n-en-plugin</artifactId> | |||
<packaging>sonar-plugin</packaging> | |||
<name>Sonar :: Plugins :: English Pack</name> | |||
<name>SonarQube :: Plugins :: English Pack</name> | |||
<dependencies> | |||
<dependency> |
@@ -7,12 +7,12 @@ | |||
<version>3.7-SNAPSHOT</version> | |||
<relativePath>../..</relativePath> | |||
</parent> | |||
<groupId>org.codehaus.sonar.plugins</groupId> | |||
<artifactId>sonar-maven-batch-plugin</artifactId> | |||
<packaging>sonar-plugin</packaging> | |||
<name>Sonar :: Maven Batch Plugin</name> | |||
<name>SonarQube :: Maven Batch Plugin</name> | |||
<properties> | |||
<maven.version>3.0</maven.version> | |||
</properties> | |||
@@ -41,7 +41,7 @@ | |||
<version>${maven.version}</version> | |||
<scope>provided</scope> | |||
</dependency> | |||
<!-- unit tests --> | |||
<dependency> | |||
<groupId>org.codehaus.sonar</groupId> | |||
@@ -49,7 +49,7 @@ | |||
<scope>test</scope> | |||
</dependency> | |||
</dependencies> | |||
<build> | |||
<plugins> | |||
@@ -48,7 +48,7 @@ import java.util.Map; | |||
public class MavenProjectConverter implements TaskExtension { | |||
private static final String UNABLE_TO_DETERMINE_PROJECT_STRUCTURE_EXCEPTION_MESSAGE = "Unable to determine structure of project." + | |||
" Probably you use Maven Advanced Reactor Options, which is not supported by Sonar and should not be used."; | |||
" Probably you use Maven Advanced Reactor Options, which is not supported by SonarQube and should not be used."; | |||
public ProjectDefinition configure(List<MavenProject> poms, MavenProject root) { | |||
// projects by canonical path to pom.xml |
@@ -6,7 +6,7 @@ | |||
<artifactId>sonar</artifactId> | |||
<packaging>pom</packaging> | |||
<version>3.7-SNAPSHOT</version> | |||
<name>Sonar</name> | |||
<name>SonarQube</name> | |||
<url>http://www.sonarsource.org/</url> | |||
<description>Open source platform for continuous inspection of code quality</description> | |||
@@ -11,7 +11,7 @@ | |||
<artifactId>sonar-application</artifactId> | |||
<packaging>jar</packaging> | |||
<name>Sonar :: Application</name> | |||
<name>SonarQube :: Application</name> | |||
<description>Package the standalone distribution</description> | |||
<dependencies> |
@@ -9,7 +9,7 @@ | |||
</parent> | |||
<artifactId>sonar-batch-maven-compat</artifactId> | |||
<name>Sonar :: Batch Maven Compat</name> | |||
<name>SonarQube :: Batch Maven Compat</name> | |||
<description>Compatibility layer, which provides MavenProject for non-Maven environments.</description> | |||
<dependencies> | |||
@@ -43,7 +43,7 @@ | |||
</plugin> | |||
</plugins> | |||
</build> | |||
<profiles> | |||
<profile> | |||
<id>release</id> |
@@ -9,7 +9,7 @@ | |||
<groupId>org.codehaus.sonar</groupId> | |||
<artifactId>sonar-batch</artifactId> | |||
<name>Sonar :: Batch</name> | |||
<name>SonarQube :: Batch</name> | |||
<dependencies> | |||
<dependency> |
@@ -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"); |
@@ -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; |
@@ -61,7 +61,7 @@ public class DatabaseCompatibilityTest { | |||
when(databaseVersion.getStatus()).thenReturn(DatabaseVersion.Status.REQUIRES_DOWNGRADE); | |||
thrown.expect(BadDatabaseVersion.class); | |||
thrown.expectMessage("Database relates to a more recent version of Sonar. Please check your settings (JDBC settings, version of Maven plugin)"); | |||
thrown.expectMessage("Database relates to a more recent version of SonarQube. Please check your settings (JDBC settings, version of Maven plugin)"); | |||
new DatabaseCompatibility(databaseVersion, server, settings).start(); | |||
} |
@@ -11,7 +11,7 @@ | |||
<artifactId>sonar-channel</artifactId> | |||
<name>Sonar :: Channel</name> | |||
<name>SonarQube :: Channel</name> | |||
<description>Code Channel</description> | |||
<dependencies> |
@@ -8,7 +8,7 @@ | |||
<relativePath>..</relativePath> | |||
</parent> | |||
<artifactId>sonar-check-api</artifactId> | |||
<name>Sonar :: Check API</name> | |||
<name>SonarQube :: Check API</name> | |||
<description>Check API</description> | |||
<dependencies> |
@@ -11,7 +11,7 @@ | |||
<artifactId>sonar-colorizer</artifactId> | |||
<name>Sonar :: Code Colorizer</name> | |||
<name>SonarQube :: Code Colorizer</name> | |||
<description>Code syntax highlighter</description> | |||
<dependencies> |
@@ -95,7 +95,7 @@ public class HtmlDecorator extends Tokenizer { | |||
return new String(ByteStreams.toByteArray(input)); | |||
} catch (IOException e) { | |||
throw new SynhtaxHighlightingException("Sonar Colorizer CSS file not found: " + CSS_PATH, e); | |||
throw new SynhtaxHighlightingException("SonarQube Colorizer CSS file not found: " + CSS_PATH, e); | |||
} finally { | |||
Closeables.closeQuietly(input); |
@@ -10,7 +10,7 @@ | |||
<artifactId>sonar-core</artifactId> | |||
<name>Sonar :: Core</name> | |||
<name>SonarQube :: Core</name> | |||
<description>Core components shared to batch and server</description> | |||
<dependencies> | |||
@@ -147,7 +147,7 @@ | |||
<!-- | |||
JDBC drivers for MyBatis integration tests. | |||
They can't be moved to the profile run-mybatis-its because | |||
They can't be moved to the profile run-mybatis-its because | |||
--> | |||
<dependency> | |||
<groupId>mysql</groupId> |
@@ -7,7 +7,7 @@ | |||
<version>3.7-SNAPSHOT</version> | |||
</parent> | |||
<artifactId>sonar-deprecated</artifactId> | |||
<name>Sonar :: Deprecated</name> | |||
<name>SonarQube :: Deprecated</name> | |||
<dependencies> | |||
<dependency> |
@@ -9,7 +9,7 @@ | |||
<artifactId>sonar-duplications</artifactId> | |||
<name>Sonar :: Duplications</name> | |||
<name>SonarQube :: Duplications</name> | |||
<description>Detect duplicated code</description> | |||
<properties> |
@@ -10,7 +10,7 @@ | |||
<groupId>org.codehaus.sonar</groupId> | |||
<artifactId>sonar-graph</artifactId> | |||
<packaging>jar</packaging> | |||
<name>Sonar :: Graph</name> | |||
<name>SonarQube :: Graph</name> | |||
<dependencies> | |||
<dependency> | |||
@@ -37,4 +37,4 @@ | |||
<scope>test</scope> | |||
</dependency> | |||
</dependencies> | |||
</project> | |||
</project> |
@@ -10,7 +10,7 @@ | |||
<artifactId>sonar-home</artifactId> | |||
<name>Sonar :: Home</name> | |||
<name>SonarQube :: Home</name> | |||
<description>Access the user home directory that contains cache of files</description> | |||
<dependencies> |
@@ -7,7 +7,7 @@ | |||
<version>3.7-SNAPSHOT</version> | |||
</parent> | |||
<artifactId>sonar-java-api</artifactId> | |||
<name>Sonar :: Java API</name> | |||
<name>SonarQube :: Java API</name> | |||
<dependencies> | |||
<dependency> | |||
<groupId>org.codehaus.sonar</groupId> |
@@ -10,7 +10,7 @@ | |||
</parent> | |||
<artifactId>sonar-markdown</artifactId> | |||
<name>Sonar :: Markdown</name> | |||
<name>SonarQube :: Markdown</name> | |||
<dependencies> | |||
<dependency> |
@@ -8,7 +8,7 @@ | |||
</parent> | |||
<artifactId>sonar-maven-plugin</artifactId> | |||
<packaging>maven-plugin</packaging> | |||
<name>Sonar :: Maven2 Plugin</name> | |||
<name>SonarQube :: Maven2 Plugin</name> | |||
<dependencies> | |||
<dependency> |
@@ -8,12 +8,12 @@ | |||
</parent> | |||
<artifactId>sonar-maven3-plugin</artifactId> | |||
<packaging>pom</packaging> | |||
<name>Sonar :: Maven3 Plugin</name> | |||
<name>SonarQube :: Maven3 Plugin</name> | |||
<!-- Since Sonar 3.7 there is no more difference between Maven 2 and Maven 3 so relocate to Maven 2 plugin to avoid duplication --> | |||
<distributionManagement> | |||
<relocation> | |||
<artifactId>sonar-maven-plugin</artifactId> | |||
</relocation> | |||
</distributionManagement> | |||
</project> |
@@ -11,7 +11,7 @@ | |||
<artifactId>sonar-plugin-api</artifactId> | |||
<packaging>jar</packaging> | |||
<name>Sonar :: Plugin API</name> | |||
<name>SonarQube :: Plugin API</name> | |||
<dependencies> | |||
<dependency> | |||
<groupId>org.codehaus.sonar</groupId> |
@@ -8,7 +8,7 @@ | |||
</parent> | |||
<artifactId>sonar-server</artifactId> | |||
<packaging>war</packaging> | |||
<name>Sonar :: Server</name> | |||
<name>SonarQube :: Server</name> | |||
<dependencies> | |||
<dependency> |
@@ -69,9 +69,9 @@ public class DefaultServerFileSystem implements ServerFileSystem { | |||
} | |||
public void start() { | |||
LOGGER.info("Sonar home: " + homeDir.getAbsolutePath()); | |||
LOGGER.info("SonarQube home: " + homeDir.getAbsolutePath()); | |||
if (!homeDir.isDirectory() || !homeDir.exists()) { | |||
throw new IllegalStateException("Sonar home directory does not exist"); | |||
throw new IllegalStateException("SonarQube home directory does not exist"); | |||
} | |||
if (deployDir == null) { |
@@ -352,7 +352,7 @@ public final class Platform { | |||
started = false; | |||
profiler.stop(); | |||
} catch (Exception e) { | |||
LoggerFactory.getLogger(getClass()).debug("Fail to stop Sonar - ignored", e); | |||
LoggerFactory.getLogger(getClass()).debug("Fail to stop SonarQube - ignored", e); | |||
} | |||
} | |||
} |
@@ -66,10 +66,10 @@ public final class ServerImpl extends Server { | |||
implementationBuild = read(buildProperties).getProperty("Implementation-Build"); | |||
if (StringUtils.isBlank(version)) { | |||
throw new IllegalStateException("Unknown Sonar version"); | |||
throw new IllegalStateException("Unknown SonarQube version"); | |||
} | |||
LOG.info("Sonar {}", Joiner.on(" / ").skipNulls().join("Server", version, implementationBuild)); | |||
LOG.info("SonarQube {}", Joiner.on(" / ").skipNulls().join("Server", version, implementationBuild)); | |||
} catch (IOException e) { | |||
throw new IllegalStateException("Can not load metadata", e); |
@@ -36,7 +36,7 @@ import java.util.Properties; | |||
* <li>environment variable SONAR_HOME</li> | |||
* <li>property SONAR_HOME in the file WEB-INF/classes/sonar-war.properties</li> | |||
* </ol> | |||
* | |||
* | |||
* @since 2.12 | |||
*/ | |||
final class SonarHome { | |||
@@ -68,7 +68,7 @@ final class SonarHome { | |||
} | |||
if (StringUtils.isBlank(value)) { | |||
throw new IllegalStateException("Sonar value is not defined. " + | |||
throw new IllegalStateException("SonarQube value is not defined. " + | |||
"Please set the environment variable/system property " + PROPERTY + " or edit the file WEB-INF/classes/sonar-war.properties"); | |||
} | |||
@@ -200,7 +200,7 @@ public class PluginDeployer implements ServerComponent { | |||
LOG.info("Deploy plugin {}", Joiner.on(" / ").skipNulls().join(plugin.getName(), plugin.getVersion(), plugin.getImplementationBuild())); | |||
Preconditions.checkState(plugin.isCompatibleWith(server.getVersion()), | |||
"Plugin %s needs a more recent version of Sonar than %s. At least %s is expected", | |||
"Plugin %s needs a more recent version of SonarQube than %s. At least %s is expected", | |||
plugin.getKey(), server.getVersion(), plugin.getSonarVersion()); | |||
try { |
@@ -69,7 +69,7 @@ public class ServerImplTest { | |||
@Test | |||
public void testFileWithNoVersion() { | |||
exception.expect(IllegalStateException.class); | |||
exception.expectMessage("Unknown Sonar version"); | |||
exception.expectMessage("Unknown SonarQube version"); | |||
ServerImpl server = new ServerImpl(new Settings(), "", "/org/sonar/server/platform/ServerImplTest/pom-without-version.properties"); | |||
server.start(); | |||
@@ -78,7 +78,7 @@ public class ServerImplTest { | |||
@Test | |||
public void testFileWithEmptyVersionParameter() { | |||
exception.expect(IllegalStateException.class); | |||
exception.expectMessage("Unknown Sonar version"); | |||
exception.expectMessage("Unknown SonarQube version"); | |||
ServerImpl server = new ServerImpl(new Settings(), "", "/org/sonar/server/platform/ServerImplTest/pom-with-empty-version.properties"); | |||
server.start(); | |||
@@ -87,7 +87,7 @@ public class ServerImplTest { | |||
@Test | |||
public void shouldFailIfFileNotFound() { | |||
exception.expect(IllegalStateException.class); | |||
exception.expectMessage("Unknown Sonar version"); | |||
exception.expectMessage("Unknown SonarQube version"); | |||
ServerImpl server = new ServerImpl(new Settings(), "", "/org/sonar/server/platform/ServerImplTest/unknown-file.properties"); | |||
server.start(); |
@@ -109,7 +109,7 @@ public class PluginDeployerTest { | |||
when(server.getVersion()).thenReturn("2.0"); | |||
exception.expect(IllegalStateException.class); | |||
exception.expectMessage("Plugin switchoffviolations needs a more recent version of Sonar than 2.0. At least 2.5 is expected"); | |||
exception.expectMessage("Plugin switchoffviolations needs a more recent version of SonarQube than 2.0. At least 2.5 is expected"); | |||
deployer.start(); | |||
} |
@@ -10,7 +10,7 @@ | |||
<groupId>org.codehaus.sonar</groupId> | |||
<artifactId>sonar-squid</artifactId> | |||
<packaging>jar</packaging> | |||
<name>Sonar :: Squid</name> | |||
<name>SonarQube :: Squid</name> | |||
<dependencies> | |||
<dependency> | |||
@@ -74,4 +74,4 @@ | |||
</testResource> | |||
</testResources> | |||
</build> | |||
</project> | |||
</project> |
@@ -8,7 +8,7 @@ | |||
</parent> | |||
<artifactId>sonar-testing-harness</artifactId> | |||
<packaging>jar</packaging> | |||
<name>Sonar :: Testing Harness</name> | |||
<name>SonarQube :: Testing Harness</name> | |||
<dependencies> | |||
<dependency> | |||
@@ -30,7 +30,7 @@ | |||
<dependency> | |||
<groupId>xmlunit</groupId> | |||
<artifactId>xmlunit</artifactId> | |||
</dependency> | |||
</dependency> | |||
<dependency> | |||
<groupId>ch.qos.logback</groupId> | |||
<artifactId>logback-classic</artifactId> |
@@ -9,7 +9,7 @@ | |||
</parent> | |||
<artifactId>sonar-ws-client</artifactId> | |||
<packaging>jar</packaging> | |||
<name>Sonar :: Web Service Client</name> | |||
<name>SonarQube :: Web Service Client</name> | |||
<description>Java Client Library for Sonar Web Services</description> | |||
<properties> |