diff options
| -rw-r--r-- | plugins/sonar-email-notifications-plugin/pom.xml | 5 | ||||
| -rw-r--r-- | plugins/sonar-email-notifications-plugin/src/main/java/org/sonar/plugins/emailnotifications/EmailNotificationsPlugin.java | 7 | ||||
| -rw-r--r-- | plugins/sonar-l10n-en-plugin/pom.xml | 5 | ||||
| -rw-r--r-- | plugins/sonar-xoo-plugin/pom.xml | 5 | ||||
| -rw-r--r-- | sonar-core/pom.xml | 4 | ||||
| -rw-r--r-- | sonar-plugin-api/pom.xml | 67 |
6 files changed, 78 insertions, 15 deletions
diff --git a/plugins/sonar-email-notifications-plugin/pom.xml b/plugins/sonar-email-notifications-plugin/pom.xml index 35e83bda58b..830da5e0747 100644 --- a/plugins/sonar-email-notifications-plugin/pom.xml +++ b/plugins/sonar-email-notifications-plugin/pom.xml @@ -18,6 +18,11 @@ <dependencies> <dependency> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.codehaus.sonar</groupId> <artifactId>sonar-plugin-api</artifactId> <scope>provided</scope> diff --git a/plugins/sonar-email-notifications-plugin/src/main/java/org/sonar/plugins/emailnotifications/EmailNotificationsPlugin.java b/plugins/sonar-email-notifications-plugin/src/main/java/org/sonar/plugins/emailnotifications/EmailNotificationsPlugin.java index 4d0738def07..fefc33e2916 100644 --- a/plugins/sonar-email-notifications-plugin/src/main/java/org/sonar/plugins/emailnotifications/EmailNotificationsPlugin.java +++ b/plugins/sonar-email-notifications-plugin/src/main/java/org/sonar/plugins/emailnotifications/EmailNotificationsPlugin.java @@ -19,15 +19,14 @@ */ package org.sonar.plugins.emailnotifications; -import com.google.common.collect.ImmutableList; -import org.sonar.api.SonarPlugin; - +import java.util.Arrays; import java.util.List; +import org.sonar.api.SonarPlugin; public class EmailNotificationsPlugin extends SonarPlugin { @Override public List getExtensions() { - return ImmutableList.of( + return Arrays.asList( EmailNotificationChannel.class, // Email templates diff --git a/plugins/sonar-l10n-en-plugin/pom.xml b/plugins/sonar-l10n-en-plugin/pom.xml index 817eb99e375..49163bca0f7 100644 --- a/plugins/sonar-l10n-en-plugin/pom.xml +++ b/plugins/sonar-l10n-en-plugin/pom.xml @@ -36,6 +36,11 @@ <dependencies> <dependency> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.codehaus.sonar</groupId> <artifactId>sonar-plugin-api</artifactId> <scope>provided</scope> diff --git a/plugins/sonar-xoo-plugin/pom.xml b/plugins/sonar-xoo-plugin/pom.xml index 26dddfe9e71..b46b87db148 100644 --- a/plugins/sonar-xoo-plugin/pom.xml +++ b/plugins/sonar-xoo-plugin/pom.xml @@ -15,6 +15,11 @@ <dependencies> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>10.0.1</version> + </dependency> + <dependency> <groupId>com.google.code.findbugs</groupId> <artifactId>jsr305</artifactId> <scope>provided</scope> diff --git a/sonar-core/pom.xml b/sonar-core/pom.xml index d0a816d282e..00599ab710c 100644 --- a/sonar-core/pom.xml +++ b/sonar-core/pom.xml @@ -20,6 +20,10 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </dependency> + <dependency> <groupId>org.picocontainer</groupId> <artifactId>picocontainer</artifactId> </dependency> diff --git a/sonar-plugin-api/pom.xml b/sonar-plugin-api/pom.xml index 06185b4c0a1..f3e2d0bd2a7 100644 --- a/sonar-plugin-api/pom.xml +++ b/sonar-plugin-api/pom.xml @@ -21,15 +21,10 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>jfree</groupId> - <artifactId>jfreechart</artifactId> </dependency> <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jsr305</artifactId> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> </dependency> <dependency> <groupId>org.codehaus.sonar</groupId> @@ -55,6 +50,17 @@ </exclusion> </exclusions> </dependency> + + <dependency> + <groupId>jfree</groupId> + <artifactId>jfreechart</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + <scope>provided</scope> + </dependency> <dependency> <groupId>org.codehaus.sonar</groupId> <artifactId>sonar-graph</artifactId> @@ -80,10 +86,6 @@ </exclusions> </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> <!-- TODO remove dependencies on Maven but for now they should be defined with scope provided @@ -115,6 +117,7 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <optional>true</optional> + <scope>provided</scope> </dependency> <dependency> <groupId>xpp3</groupId> @@ -143,21 +146,25 @@ <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> <version>3.0.1</version> + <scope>provided</scope> <optional>true</optional> </dependency> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> + <scope>provided</scope> <optional>true</optional> </dependency> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-core</artifactId> + <scope>provided</scope> <optional>true</optional> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <scope>provided</scope> <optional>true</optional> </dependency> @@ -183,6 +190,44 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <minimizeJar>true</minimizeJar> + <createDependencyReducedPom>true</createDependencyReducedPom> + <artifactSet> + <excludes> + <exclude>org.codehaus.sonar:sonar-duplications</exclude> + <exclude>org.codehaus.sonar:sonar-channel</exclude> + <exclude>org.codehaus.sonar:sonar-colorizer</exclude> + <exclude>org.codehaus.sonar:sonar-check-api</exclude> + <exclude>org.codehaus.sonar.plugins:sonar-email-notifications-plugin</exclude> + <exclude>org.codehaus.woodstox:woodstox-core-lgpl</exclude> + <exclude>org.codehaus.woodstox:stax2-api</exclude> + <exclude>org.codehaus.staxmate:staxmate</exclude> + </excludes> + </artifactSet> + <relocations> + <relocation> + <pattern>com.google</pattern> + <shadedPattern>org.sonar.api.internal.google</shadedPattern> + </relocation> + <relocation> + <pattern>org.apache.commons</pattern> + <shadedPattern>org.sonar.api.internal.apachecommons</shadedPattern> + </relocation> + </relocations> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <executions> <execution> |