diff options
| author |  Vitaly Takmazov | 2016-11-02 17:23:44 +0300 |
|---|---|---|
| committer | Vitaly Takmazov | 2016-11-02 17:23:44 +0300 |
| commit | 38cf47b815f820d9745d7ede6b1f40811b98d52f (patch) | |
| tree | 23df22f62208cc99f7776413d76c4d107a9eb1de /juick-core | |
| parent | e6e51acf09648ffb94eeecfa74a180e25b784e67 (diff) | |
| parent | 38071510b3888f5a4edb31705953a0995256d882 (diff) | |
Merge branch 'master' of ssh://den.jabber.ru:2205/var/lib/git/com.juick.http.www
Diffstat (limited to 'juick-core')
| -rw-r--r-- | juick-core/build.gradle | 6 | ||||
| -rw-r--r-- | juick-core/src/main/java/com/juick/Message.java | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/juick-core/build.gradle b/juick-core/build.gradle index 64950ea6a..52c717397 100644 --- a/juick-core/build.gradle +++ b/juick-core/build.gradle @@ -7,14 +7,14 @@ repositories { dependencies { compile project(':deps:com.juick.xmpp') - def jacksonVersion = '2.8.1' + def jacksonVersion = '2.8.4' compile "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}" compile "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}" compile "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}" compile "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${jacksonVersion}" compile 'org.apache.httpcomponents:httpclient:4.5.2' - compile 'org.apache.commons:commons-lang3:3.4' - compile "org.springframework:spring-jdbc:4.3.2.RELEASE" + compile 'org.apache.commons:commons-lang3:3.5' + compile "org.springframework:spring-jdbc:4.3.3.RELEASE" compile 'org.json:json:20160810' } diff --git a/juick-core/src/main/java/com/juick/Message.java b/juick-core/src/main/java/com/juick/Message.java index cc2381d82..2c004f5a3 100644 --- a/juick-core/src/main/java/com/juick/Message.java +++ b/juick-core/src/main/java/com/juick/Message.java @@ -42,10 +42,12 @@ public class Message implements Comparable { public List<Tag> Tags = new ArrayList<>(); private Date date; public int TimeAgo = 0; + @JsonIgnore public int Privacy = 1; public boolean FriendsOnly = false; public boolean ReadOnly = false; public boolean Hidden = false; + @JsonIgnore public boolean VisitorCanComment = true; public int Replies = 0; public String RepliesBy = null; |