@@ -7,7 +7,7 @@ buildscript { | |||
dependencies { | |||
// Ordered alphabeticly to avoid duplication | |||
classpath 'com.github.ben-manes:gradle-versions-plugin:0.27.0' | |||
classpath 'com.github.jengelman.gradle.plugins:shadow:5.1.0' | |||
classpath 'com.github.jengelman.gradle.plugins:shadow:5.2.0' | |||
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.10' | |||
classpath 'com.moowork.gradle:gradle-node-plugin:1.3.1' | |||
classpath 'gradle.plugin.nl.javadude.gradle.plugins:license-gradle-plugin:0.14.0' |
@@ -32,7 +32,7 @@ import org.junit.Test; | |||
import org.junit.rules.ExpectedException; | |||
import org.sonar.api.config.PropertyDefinitions; | |||
import org.sonar.api.config.internal.MapSettings; | |||
import org.sonar.api.internal.apachecommons.io.IOUtils; | |||
import org.apache.commons.io.IOUtils; | |||
import org.sonar.api.server.authentication.OAuth2IdentityProvider; | |||
import org.sonar.api.server.authentication.UnauthorizedException; | |||
import org.sonar.api.server.authentication.UserIdentity; |
@@ -20,6 +20,8 @@ | |||
package org.sonar.server.qualityprofile; | |||
import com.google.common.collect.ImmutableSortedSet; | |||
import com.google.gson.JsonObject; | |||
import com.google.gson.JsonParser; | |||
import java.io.StringWriter; | |||
import java.util.Comparator; | |||
import java.util.Map; | |||
@@ -27,8 +29,6 @@ import java.util.SortedSet; | |||
import java.util.stream.Collectors; | |||
import java.util.stream.StreamSupport; | |||
import javax.annotation.concurrent.Immutable; | |||
import org.sonar.api.internal.google.gson.JsonObject; | |||
import org.sonar.api.internal.google.gson.JsonParser; | |||
import org.sonar.api.utils.text.JsonWriter; | |||
import org.sonar.core.util.UtcDateUtils; | |||
@@ -58,6 +58,9 @@ processResources { | |||
shadowJar { | |||
configurations = [project.configurations.default] | |||
minimize { | |||
exclude(project(':sonar-check-api')) | |||
} | |||
relocate('com.google', 'org.sonar.api.internal.google') | |||
relocate('org.apache.commons', 'org.sonar.api.internal.apachecommons') | |||
} |