diff options
| author | inder123 <inder123@gmail.com> | 2015-08-10 19:32:00 +0530 |
|---|---|---|
| committer | inder123 <inder123@gmail.com> | 2015-08-10 19:32:00 +0530 |
| commit | 09839be00420a6294628915defa93fdd042ff406 (patch) | |
| tree | b9af3397bba23cf2bb47302ddeb31f0f80cbb70f | |
| parent | 0a93efada5edd251516eb6927b295a1bd1864509 (diff) | |
| parent | 2ee680a64529ac6f31306e06d43eae8cf53f7c55 (diff) | |
| download | android_external_gson-09839be00420a6294628915defa93fdd042ff406.tar.gz android_external_gson-09839be00420a6294628915defa93fdd042ff406.tar.bz2 android_external_gson-09839be00420a6294628915defa93fdd042ff406.zip | |
Merge pull request #684 from google/revert-664-issue-613
Revert "Add a JSR-305 @ThreadSafe annotation to the Gson class"
| -rw-r--r-- | gson/pom.xml | 6 | ||||
| -rw-r--r-- | gson/src/main/java/com/google/gson/Gson.java | 3 |
2 files changed, 0 insertions, 9 deletions
diff --git a/gson/pom.xml b/gson/pom.xml index 053be3b2..236c1e1b 100644 --- a/gson/pom.xml +++ b/gson/pom.xml @@ -51,12 +51,6 @@ </organization> <dependencies> <dependency> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jsr305</artifactId> - <version>3.0.0</version> - <optional>true</optional> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>3.8.2</version> diff --git a/gson/src/main/java/com/google/gson/Gson.java b/gson/src/main/java/com/google/gson/Gson.java index 9d5d6ffd..844188ac 100644 --- a/gson/src/main/java/com/google/gson/Gson.java +++ b/gson/src/main/java/com/google/gson/Gson.java @@ -31,8 +31,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.annotation.concurrent.ThreadSafe; - import com.google.gson.internal.ConstructorConstructor; import com.google.gson.internal.Excluder; import com.google.gson.internal.Primitives; @@ -98,7 +96,6 @@ import com.google.gson.stream.MalformedJsonException; * @author Joel Leitch * @author Jesse Wilson */ -@ThreadSafe public final class Gson { static final boolean DEFAULT_JSON_NON_EXECUTABLE = false; |