diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-09-30 09:56:55 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-09-30 09:56:55 +0200 |
| commit | f9b616759e48519bd59f14608fdd3057881de418 (patch) | |
| tree | 8ec893d4fbffea741d06de3f3d3fbec97c1492b7 /sonar-application | |
| parent | 7a6211086f961e128a3819743c59adf6eb2cd682 (diff) | |
| parent | c48b703be87fea2174450cec018b5b3209d6d6fa (diff) | |
| download | sonarqube-f9b616759e48519bd59f14608fdd3057881de418.tar.gz sonarqube-f9b616759e48519bd59f14608fdd3057881de418.zip | |
Merge remote-tracking branch 'remotes/origin/branch-4.5'
Conflicts:
plugins/sonar-core-plugin/pom.xml
plugins/sonar-cpd-plugin/pom.xml
plugins/sonar-dbcleaner-plugin/pom.xml
plugins/sonar-design-plugin/pom.xml
plugins/sonar-email-notifications-plugin/pom.xml
plugins/sonar-l10n-en-plugin/pom.xml
plugins/sonar-xoo-plugin/pom.xml
pom.xml
server/pom.xml
server/sonar-process-monitor/pom.xml
server/sonar-process/pom.xml
server/sonar-search/pom.xml
server/sonar-server/pom.xml
server/sonar-web/pom.xml
server/sonar-ws-client/pom.xml
sonar-application/pom.xml
sonar-batch-maven-compat/pom.xml
sonar-batch-protocol/pom.xml
sonar-batch/pom.xml
sonar-check-api/pom.xml
sonar-colorizer/pom.xml
sonar-core/pom.xml
sonar-deprecated/pom.xml
sonar-duplications/pom.xml
sonar-graph/pom.xml
sonar-home/pom.xml
sonar-java-api/pom.xml
sonar-markdown/pom.xml
sonar-maven-plugin/pom.xml
sonar-maven3-plugin/pom.xml
sonar-plugin-api/pom.xml
sonar-plugin-api/src/test/java/org/sonar/api/utils/HttpDownloaderTest.java
sonar-testing-harness/pom.xml
Diffstat (limited to 'sonar-application')
| -rw-r--r-- | sonar-application/pom.xml | 7 | ||||
| -rw-r--r-- | sonar-application/src/main/assembly/conf/wrapper.conf | 2 | ||||
| -rw-r--r-- | sonar-application/src/test/java/org/sonar/application/DefaultSettingsTest.java | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/sonar-application/pom.xml b/sonar-application/pom.xml index 914c60ebf5a..495631ea4dc 100644 --- a/sonar-application/pom.xml +++ b/sonar-application/pom.xml @@ -258,6 +258,13 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skipTests>${skipServerTests}</skipTests> + </configuration> + </plugin> </plugins> </build> <profiles> diff --git a/sonar-application/src/main/assembly/conf/wrapper.conf b/sonar-application/src/main/assembly/conf/wrapper.conf index 2fb5f96c844..86834b8a80b 100644 --- a/sonar-application/src/main/assembly/conf/wrapper.conf +++ b/sonar-application/src/main/assembly/conf/wrapper.conf @@ -28,7 +28,7 @@ wrapper.java.maxmemory=32 wrapper.console.format=PM wrapper.console.loglevel=INFO -wrapper.logfile=../../logs/application.log +wrapper.logfile=../../logs/sonar.log wrapper.logfile.format=M wrapper.logfile.loglevel=INFO diff --git a/sonar-application/src/test/java/org/sonar/application/DefaultSettingsTest.java b/sonar-application/src/test/java/org/sonar/application/DefaultSettingsTest.java index 49a66bc590c..82969821f62 100644 --- a/sonar-application/src/test/java/org/sonar/application/DefaultSettingsTest.java +++ b/sonar-application/src/test/java/org/sonar/application/DefaultSettingsTest.java @@ -60,6 +60,6 @@ public class DefaultSettingsTest { @Test public void private_constructor() throws Exception { - TestUtils.assertPrivateConstructor(DefaultSettings.class); + assertThat(TestUtils.hasOnlyPrivateConstructors(DefaultSettings.class)).isTrue(); } } |