aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-application
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2014-09-30 00:07:03 +0200
committerSimon Brandhof <simon.brandhof@sonarsource.com>2014-09-30 00:07:03 +0200
commitc6dab978b4e06918c7b96684a06c50c8aca74315 (patch)
treed16b803b094b8984ad722d87ae23d709da37f9df /sonar-application
parent73e2ceadeb3d0f44d3a96a07947e26531c409053 (diff)
downloadsonarqube-c6dab978b4e06918c7b96684a06c50c8aca74315.tar.gz
sonarqube-c6dab978b4e06918c7b96684a06c50c8aca74315.zip
Maven profiles for each technical stack
and remove sonar-channel helpers from sonar-testing-harness
Diffstat (limited to 'sonar-application')
-rw-r--r--sonar-application/pom.xml7
-rw-r--r--sonar-application/src/test/java/org/sonar/application/DefaultSettingsTest.java2
2 files changed, 8 insertions, 1 deletions
diff --git a/sonar-application/pom.xml b/sonar-application/pom.xml
index c63b6cf0142..2245914d1cc 100644
--- a/sonar-application/pom.xml
+++ b/sonar-application/pom.xml
@@ -265,6 +265,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/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();
}
}