diff options
| author | ssjenka <ssjenka@ops-slave-centos7-1.internal.sonarsource.com> | 2016-06-01 09:53:21 +0200 |
|---|---|---|
| committer | ssjenka <ssjenka@ops-slave-centos7-1.internal.sonarsource.com> | 2016-06-01 09:53:21 +0200 |
| commit | 18c639410cb131327b37df652226a77812b64330 (patch) | |
| tree | f051899032114c751c3cc1554448c72c765d0925 /sonar-plugin-api/src | |
| parent | 2f2c558ffec0c57bcca9b83297fcbcfaf195eeb5 (diff) | |
| parent | 2e74a995d3d26177f15a1660a2d9bab1dc0d97a5 (diff) | |
| download | sonarqube-18c639410cb131327b37df652226a77812b64330.tar.gz sonarqube-18c639410cb131327b37df652226a77812b64330.zip | |
Automatic merge from branch-5.6
* origin/branch-5.6:
Deprecate SonarPlugin in favour of Plugin
SONAR-7681 Use public implementation of List in MyBatis
SONAR-7681 WS api/ce/activity requires administer permissions when searching with a task id
SONAR-7669 WS api/issues/search createdBefore cannot be equal to createdAfter
Diffstat (limited to 'sonar-plugin-api/src')
| -rw-r--r-- | sonar-plugin-api/src/main/java/org/sonar/api/Plugin.java | 2 | ||||
| -rw-r--r-- | sonar-plugin-api/src/main/java/org/sonar/api/SonarPlugin.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/Plugin.java b/sonar-plugin-api/src/main/java/org/sonar/api/Plugin.java index 659f5c6e948..fc010d2271f 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/Plugin.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/Plugin.java @@ -19,7 +19,6 @@ */ package org.sonar.api; -import com.google.common.annotations.Beta; import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -83,7 +82,6 @@ import static java.util.Objects.requireNonNull; * * @since 5.5 */ -@Beta public interface Plugin { class Context { diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/SonarPlugin.java b/sonar-plugin-api/src/main/java/org/sonar/api/SonarPlugin.java index a44838b745d..b49cf73a07b 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/SonarPlugin.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/SonarPlugin.java @@ -28,7 +28,9 @@ import java.util.List; * This property is automatically set by sonar-packaging-maven-plugin when building plugin. * * @since 2.8 + * @deprecated replaced by {@link Plugin} in version 5.6. */ +@Deprecated public abstract class SonarPlugin implements Plugin { /** |