diff options
| author | Julien Lancelot <julien.lancelot@sonarsource.com> | 2014-04-18 13:27:05 +0200 |
|---|---|---|
| committer | Julien Lancelot <julien.lancelot@sonarsource.com> | 2014-04-18 13:27:05 +0200 |
| commit | c41842fc961af612d03ab6f21d47fd05c2c070d8 (patch) | |
| tree | 56b50a4f62508f7653ba5180c73a1f8ca79f5434 /sonar-plugin-api | |
| parent | b6083abec8c95e5bb7c68fb83d09fe40d154e23d (diff) | |
| parent | eebc6d31b2750c1aae890e716c2c37854543980f (diff) | |
| download | sonarqube-c41842fc961af612d03ab6f21d47fd05c2c070d8.tar.gz sonarqube-c41842fc961af612d03ab6f21d47fd05c2c070d8.zip | |
Merge branch medium-tests
Diffstat (limited to 'sonar-plugin-api')
| -rw-r--r-- | sonar-plugin-api/pom.xml | 11 | ||||
| -rw-r--r-- | sonar-plugin-api/src/main/java/org/sonar/api/platform/Server.java | 7 | ||||
| -rw-r--r-- | sonar-plugin-api/src/main/resources/sq-version.txt | 1 |
3 files changed, 18 insertions, 1 deletions
diff --git a/sonar-plugin-api/pom.xml b/sonar-plugin-api/pom.xml index 5f199d70642..09d12366d3f 100644 --- a/sonar-plugin-api/pom.xml +++ b/sonar-plugin-api/pom.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -191,6 +192,14 @@ </executions> </plugin> </plugins> + + <resources> + <resource> + <!-- Used to set SonarQube version in sq-version.txt file --> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> </build> </project> diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/platform/Server.java b/sonar-plugin-api/src/main/java/org/sonar/api/platform/Server.java index d6c39401c2d..7fd8afd1b1e 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/platform/Server.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/platform/Server.java @@ -22,6 +22,7 @@ package org.sonar.api.platform; import org.sonar.api.BatchComponent; import org.sonar.api.ServerComponent; +import java.io.File; import java.util.Date; /** @@ -35,6 +36,12 @@ public abstract class Server implements BatchComponent, ServerComponent { public abstract Date getStartedAt(); + public abstract File getRootDir(); + + public abstract File getDeployDir(); + + public abstract String getContextPath(); + /** * @return the server URL when executed from batch, else null. * @since 2.4 diff --git a/sonar-plugin-api/src/main/resources/sq-version.txt b/sonar-plugin-api/src/main/resources/sq-version.txt new file mode 100644 index 00000000000..ad96e7cf933 --- /dev/null +++ b/sonar-plugin-api/src/main/resources/sq-version.txt @@ -0,0 +1 @@ +${project.version} |