Browse Source

remove all other dependencies onto sonar-server

was causing funky dependency tree for tests (almost loop)
dependency was sometimes added for transitive dependencies
module was super large yet hardly a couple classes were used
tags/8.0
Sébastien Lesaint 4 years ago
parent
commit
c980b1b86b
20 changed files with 28 additions and 22 deletions
  1. 0
    1
      server/sonar-ce-task-projectanalysis/build.gradle
  2. 0
    13
      server/sonar-server/build.gradle
  3. 0
    0
      server/sonar-webserver-common/src/main/java/org/sonar/server/platform/ClusterFeature.java
  4. 0
    0
      server/sonar-webserver-common/src/main/java/org/sonar/server/telemetry/LicenseReader.java
  5. 23
    0
      server/sonar-webserver-common/src/main/java/org/sonar/server/telemetry/package-info.java
  6. 0
    0
      server/sonar-webserver-common/src/main/java/org/sonar/server/util/GlobalLockManager.java
  7. 0
    0
      server/sonar-webserver-common/src/test/java/org/sonar/server/util/BooleanTypeValidationTest.java
  8. 0
    0
      server/sonar-webserver-common/src/test/java/org/sonar/server/util/FloatTypeValidationTest.java
  9. 0
    0
      server/sonar-webserver-common/src/test/java/org/sonar/server/util/GlobalLockManagerTest.java
  10. 0
    0
      server/sonar-webserver-common/src/test/java/org/sonar/server/util/IntegerTypeValidationTest.java
  11. 0
    0
      server/sonar-webserver-common/src/test/java/org/sonar/server/util/LongTypeValidationTest.java
  12. 0
    0
      server/sonar-webserver-common/src/test/java/org/sonar/server/util/StringListTypeValidationTest.java
  13. 0
    0
      server/sonar-webserver-common/src/test/java/org/sonar/server/util/StringTypeValidationTest.java
  14. 0
    0
      server/sonar-webserver-common/src/test/java/org/sonar/server/util/TextTypeValidationTest.java
  15. 0
    0
      server/sonar-webserver-common/src/test/java/org/sonar/server/util/TypeValidationModuleTest.java
  16. 0
    0
      server/sonar-webserver-common/src/test/java/org/sonar/server/util/TypeValidationsTest.java
  17. 0
    0
      server/sonar-webserver-common/src/test/java/org/sonar/server/util/TypeValidationsTesting.java
  18. 0
    2
      server/sonar-webserver-webapi/build.gradle
  19. 3
    3
      sonar-plugin-api-impl/build.gradle
  20. 2
    3
      sonar-plugin-api-impl/src/test/java/org/sonar/api/impl/utils/DefaultTempFolderTest.java

+ 0
- 1
server/sonar-ce-task-projectanalysis/build.gradle View File

testCompile project(':server:sonar-db-testing') testCompile project(':server:sonar-db-testing')
testCompile project(':sonar-testing-harness') testCompile project(':sonar-testing-harness')
testCompile project(path: ":server:sonar-ce-task", configuration: "tests") testCompile project(path: ":server:sonar-ce-task", configuration: "tests")
testCompile project(path: ":server:sonar-server", configuration: "tests")
testCompile project(path: ":server:sonar-server-common", configuration: "tests") testCompile project(path: ":server:sonar-server-common", configuration: "tests")
} }



+ 0
- 13
server/sonar-server/build.gradle View File



runtime 'io.jsonwebtoken:jjwt-jackson' runtime 'io.jsonwebtoken:jjwt-jackson'
} }

task testJar(type: Jar) {
classifier = 'tests'
from sourceSets.test.output
}

configurations {
tests
}

artifacts {
tests testJar
}

server/sonar-server/src/main/java/org/sonar/server/platform/ClusterFeature.java → server/sonar-webserver-common/src/main/java/org/sonar/server/platform/ClusterFeature.java View File


server/sonar-server/src/main/java/org/sonar/server/telemetry/LicenseReader.java → server/sonar-webserver-common/src/main/java/org/sonar/server/telemetry/LicenseReader.java View File


+ 23
- 0
server/sonar-webserver-common/src/main/java/org/sonar/server/telemetry/package-info.java View File

/*
* SonarQube
* Copyright (C) 2009-2019 SonarSource SA
* mailto:info AT sonarsource DOT com
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
@ParametersAreNonnullByDefault
package org.sonar.server.telemetry;

import javax.annotation.ParametersAreNonnullByDefault;

server/sonar-server/src/main/java/org/sonar/server/util/GlobalLockManager.java → server/sonar-webserver-common/src/main/java/org/sonar/server/util/GlobalLockManager.java View File


server/sonar-server/src/test/java/org/sonar/server/util/BooleanTypeValidationTest.java → server/sonar-webserver-common/src/test/java/org/sonar/server/util/BooleanTypeValidationTest.java View File


server/sonar-server/src/test/java/org/sonar/server/util/FloatTypeValidationTest.java → server/sonar-webserver-common/src/test/java/org/sonar/server/util/FloatTypeValidationTest.java View File


server/sonar-server/src/test/java/org/sonar/server/util/GlobalLockManagerTest.java → server/sonar-webserver-common/src/test/java/org/sonar/server/util/GlobalLockManagerTest.java View File


server/sonar-server/src/test/java/org/sonar/server/util/IntegerTypeValidationTest.java → server/sonar-webserver-common/src/test/java/org/sonar/server/util/IntegerTypeValidationTest.java View File


server/sonar-server/src/test/java/org/sonar/server/util/LongTypeValidationTest.java → server/sonar-webserver-common/src/test/java/org/sonar/server/util/LongTypeValidationTest.java View File


server/sonar-server/src/test/java/org/sonar/server/util/StringListTypeValidationTest.java → server/sonar-webserver-common/src/test/java/org/sonar/server/util/StringListTypeValidationTest.java View File


server/sonar-server/src/test/java/org/sonar/server/util/StringTypeValidationTest.java → server/sonar-webserver-common/src/test/java/org/sonar/server/util/StringTypeValidationTest.java View File


server/sonar-server/src/test/java/org/sonar/server/util/TextTypeValidationTest.java → server/sonar-webserver-common/src/test/java/org/sonar/server/util/TextTypeValidationTest.java View File


server/sonar-server/src/test/java/org/sonar/server/util/TypeValidationModuleTest.java → server/sonar-webserver-common/src/test/java/org/sonar/server/util/TypeValidationModuleTest.java View File


server/sonar-server/src/test/java/org/sonar/server/util/TypeValidationsTest.java → server/sonar-webserver-common/src/test/java/org/sonar/server/util/TypeValidationsTest.java View File


server/sonar-server/src/test/java/org/sonar/server/util/TypeValidationsTesting.java → server/sonar-webserver-common/src/test/java/org/sonar/server/util/TypeValidationsTesting.java View File


+ 0
- 2
server/sonar-webserver-webapi/build.gradle View File

compile project(':server:sonar-ce-task') compile project(':server:sonar-ce-task')
compile project(':server:sonar-db-dao') compile project(':server:sonar-db-dao')
compile project(':server:sonar-process') compile project(':server:sonar-process')
compile project(':server:sonar-server')
compile project(':server:sonar-webserver-auth') compile project(':server:sonar-webserver-auth')
compile project(':server:sonar-webserver-es') compile project(':server:sonar-webserver-es')
compile project(':server:sonar-webserver-ws') compile project(':server:sonar-webserver-ws')
testCompile 'javax.servlet:javax.servlet-api' testCompile 'javax.servlet:javax.servlet-api'
testCompile 'org.mockito:mockito-core' testCompile 'org.mockito:mockito-core'
testCompile project(':server:sonar-db-testing') testCompile project(':server:sonar-db-testing')
testCompile project(path: ":server:sonar-server", configuration: "tests")
testCompile project(path: ":server:sonar-server-common", configuration: "tests") testCompile project(path: ":server:sonar-server-common", configuration: "tests")
testCompile project(path: ":server:sonar-webserver-auth", configuration: "tests") testCompile project(path: ":server:sonar-webserver-auth", configuration: "tests")
testCompile project(path: ":server:sonar-webserver-common", configuration: "tests") testCompile project(path: ":server:sonar-webserver-common", configuration: "tests")

+ 3
- 3
sonar-plugin-api-impl/build.gradle View File

compileOnly 'com.google.code.findbugs:jsr305' compileOnly 'com.google.code.findbugs:jsr305'
compileOnly 'junit:junit' compileOnly 'junit:junit'


testCompile 'junit:junit'
testCompile 'com.google.code.findbugs:jsr305'
testCompileOnly 'com.google.code.findbugs:jsr305'


testCompile 'com.google.guava:guava'
testCompile 'com.tngtech.java:junit-dataprovider' testCompile 'com.tngtech.java:junit-dataprovider'
testCompile 'junit:junit'
testCompile 'org.assertj:assertj-core' testCompile 'org.assertj:assertj-core'
testCompile 'org.mockito:mockito-core' testCompile 'org.mockito:mockito-core'
testCompile project(':server:sonar-server')
} }


artifactoryPublish.skip = false artifactoryPublish.skip = false

+ 2
- 3
sonar-plugin-api-impl/src/test/java/org/sonar/api/impl/utils/DefaultTempFolderTest.java View File

import org.junit.rules.TemporaryFolder; import org.junit.rules.TemporaryFolder;
import org.sonar.api.utils.log.LogTester; import org.sonar.api.utils.log.LogTester;
import org.sonar.api.utils.log.LoggerLevel; import org.sonar.api.utils.log.LoggerLevel;
import org.sonar.server.util.TempFolderCleaner;


import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;


File file = underTest.newFile(); File file = underTest.newFile();
assertThat(file).exists().isFile(); assertThat(file).exists().isFile();


new TempFolderCleaner(underTest).stop();
underTest.clean();
assertThat(rootTempFolder).doesNotExist(); assertThat(rootTempFolder).doesNotExist();
} }


assertThat(dir).exists().isDirectory(); assertThat(dir).exists().isDirectory();
assertThat(new File(rootTempFolder, "sample")).isEqualTo(dir); assertThat(new File(rootTempFolder, "sample")).isEqualTo(dir);


new TempFolderCleaner(underTest).stop();
underTest.clean();
assertThat(rootTempFolder).doesNotExist(); assertThat(rootTempFolder).doesNotExist();
} }



Loading…
Cancel
Save