Minimize dependencies

diff --git a/build.gradle b/build.gradle
index e9349ec8367db9a82b69992faf96f9caf1a200e4..e2c25d44403aaa5b6f1fb131d78cf899108c2d66 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -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'

diff --git a/server/sonar-auth-saml/src/test/java/org/sonar/auth/saml/SamlIdentityProviderTest.java b/server/sonar-auth-saml/src/test/java/org/sonar/auth/saml/SamlIdentityProviderTest.java
index fe143bdc9754cf7845b7984215c822bd067574a9..6f285db5456a1f620cc90c3271cb36f477849d07 100644 (file)
--- a/server/sonar-auth-saml/src/test/java/org/sonar/auth/saml/SamlIdentityProviderTest.java
+++ b/server/sonar-auth-saml/src/test/java/org/sonar/auth/saml/SamlIdentityProviderTest.java
@@ -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;

diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/qualityprofile/QPMeasureData.java b/server/sonar-server-common/src/main/java/org/sonar/server/qualityprofile/QPMeasureData.java
index 332f606f94fb1f860f93442e01ce3234b5aeebb9..ecdbc7d96a9ef843ab207e04c29022c991704d41 100644 (file)
--- a/server/sonar-server-common/src/main/java/org/sonar/server/qualityprofile/QPMeasureData.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/qualityprofile/QPMeasureData.java
@@ -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;
 

diff --git a/sonar-plugin-api/build.gradle b/sonar-plugin-api/build.gradle
index 37ee4e5521ea6b287998cbbda3a9dcb872a501c1..a50c2883ad5c6bc5743c20db31a62aa32a215ac4 100644 (file)
--- a/sonar-plugin-api/build.gradle
+++ b/sonar-plugin-api/build.gradle
@@ -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')
 }