diff options
Diffstat (limited to 'server')
4 files changed, 6 insertions, 20 deletions
diff --git a/server/sonar-process/src/main/java/org/sonar/process/Process.java b/server/sonar-process/src/main/java/org/sonar/process/Process.java index 045a5dcd0b9..d003bf153b9 100644 --- a/server/sonar-process/src/main/java/org/sonar/process/Process.java +++ b/server/sonar-process/src/main/java/org/sonar/process/Process.java @@ -188,6 +188,7 @@ public abstract class Process implements ProcessMXBean { } } LOGGER.trace("Process[{}]::terminate() END", name); + System.exit(1); } public final void terminate() { diff --git a/server/sonar-process/src/main/java/org/sonar/process/ProcessWrapper.java b/server/sonar-process/src/main/java/org/sonar/process/ProcessWrapper.java index 0f0f8ff2fd0..d2640f827b7 100644 --- a/server/sonar-process/src/main/java/org/sonar/process/ProcessWrapper.java +++ b/server/sonar-process/src/main/java/org/sonar/process/ProcessWrapper.java @@ -157,7 +157,9 @@ public class ProcessWrapper extends Thread { private List<String> getClassPath() { // java specification : "multiple path entries are separated by semi-colons", not by // system file separator, - return ImmutableList.of("-cp", StringUtils.join(classPath, ";")); + String separator = System.getProperty("file.separator"); + + return ImmutableList.of("-cp", StringUtils.join(classPath, ":")); } private String getPropertyFile() { diff --git a/server/sonar-search/pom.xml b/server/sonar-search/pom.xml index f9803aa76a9..d57bfd61bd6 100644 --- a/server/sonar-search/pom.xml +++ b/server/sonar-search/pom.xml @@ -53,23 +53,4 @@ <scope>test</scope> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - </execution> - </executions> - <configuration> - <finalName>${pom.artifactId}-${pom.version}</finalName> - </configuration> - </plugin> - </plugins> - </build> </project> diff --git a/server/sonar-server/src/main/resources/org/sonar/server/platform/logback.xml b/server/sonar-server/src/main/resources/org/sonar/server/platform/logback.xml index a4a640e59b1..ddd8285d181 100644 --- a/server/sonar-server/src/main/resources/org/sonar/server/platform/logback.xml +++ b/server/sonar-server/src/main/resources/org/sonar/server/platform/logback.xml @@ -52,6 +52,8 @@ <logger name="org.hibernate"> <level value="WARN"/> </logger> + <level value="WARN"/> + </logger> <!-- Display SQL requests and results by setting the following loggers to level DEBUG --> <logger name="org.hibernate.SQL"> |