Merge pull request #800 from anthony-symphony/legacy-1.3.9

Legacy 1.3.9

build.gradle

@@ -1,6 +1,6 @@
 description = 'Symphony Java BDK Legacy Modules'
 
-ext.projectVersion = '1.3.8'
+ext.projectVersion = '1.3.9-SNAPSHOT'
 ext.isReleaseVersion = !ext.projectVersion.endsWith('SNAPSHOT')
 
 ext.mavenRepoUrl = project.properties['mavenRepoUrl'] ?: 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
@@ -46,10 +46,13 @@ buildscript {
     }
     dependencies {
         classpath 'io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.22.0'
+        classpath("gradle.plugin.io.snyk.gradle.plugin:snyk:0.6.1")
     }
 }
 
 apply plugin: 'io.codearte.nexus-staging'
+apply plugin: "io.snyk.gradle.plugin.snykplugin"
+
 
 nexusStaging {
     username = rootProject.ext.mavenRepoUsername
@@ -82,11 +85,16 @@ subprojects {
             compileOnly 'org.projectlombok:lombok:1.18.16'
             annotationProcessor 'org.projectlombok:lombok:1.18.16'
 
-            implementation 'com.fasterxml.jackson.core:jackson-databind:2.11.2'
+            implementation 'com.fasterxml.jackson.core:jackson-databind:2.17.0'
 
-            implementation 'com.github.jknack:handlebars-guava-cache:4.2.0'
-            implementation 'com.github.jknack:handlebars-jackson2:4.2.0'
-            implementation 'com.github.jknack:handlebars:4.2.0'
+            implementation 'com.github.jknack:handlebars-guava-cache:4.3.1'
+            implementation 'com.github.jknack:handlebars-jackson2:4.3.1'
+            implementation 'com.github.jknack:handlebars:4.3.1'
+            implementation ('com.google.guava:guava:33.1.0-jre'){
+                attributes{
+                    attribute(Attribute.of("org.gradle.jvm.environment", String),"standard-jvm")
+                }
+            }
 
             implementation 'com.google.code.findbugs:jsr305:3.0.2'
             implementation 'com.googlecode.json-simple:json-simple:1.1.1'
@@ -98,6 +106,7 @@ subprojects {
             implementation 'io.github.resilience4j:resilience4j-bulkhead:1.4.0'
             implementation 'io.github.resilience4j:resilience4j-circuitbreaker:1.4.0'
             implementation 'io.github.resilience4j:resilience4j-retry:1.4.0'
+
             implementation 'io.jsonwebtoken:jjwt:0.9.1'
 
             implementation 'io.springfox:springfox-swagger2:2.10.0'
@@ -106,34 +115,34 @@ subprojects {
             implementation 'javax.servlet:javax.servlet-api:4.0.1'
             implementation 'javax.xml.bind:jaxb-api:2.3.1'
             implementation 'org.apiguardian:apiguardian-api:1.1.0'
-            implementation 'org.bitbucket.b_c:jose4j:0.7.2'
+            implementation 'org.bitbucket.b_c:jose4j:0.9.6'
             implementation 'org.glassfish.jersey.connectors:jersey-apache-connector:2.34'
             implementation 'org.glassfish.jersey.core:jersey-client:2.34'
             implementation 'org.glassfish.jersey.inject:jersey-hk2:2.34'
-            implementation 'org.glassfish.jersey.media:jersey-media-json-jackson:2.34'
+            implementation 'org.glassfish.jersey.media:jersey-media-json-jackson:2.42'
             implementation 'org.glassfish.jersey.media:jersey-media-multipart:2.34'
             implementation 'org.owasp.esapi:esapi:2.2.3.1'
             implementation 'org.owasp.antisamy:antisamy:1.6.4'
             implementation 'org.projectlombok:lombok:1.18.12'
 
             implementation 'org.slf4j:slf4j-api:1.7.32'
 
-            implementation 'org.springframework.boot:spring-boot-starter-security:2.6.1'
-            implementation 'org.springframework.boot:spring-boot-starter-web:2.6.1'
-            implementation 'org.springframework.boot:spring-boot-starter-aop:2.6.1'
-            implementation 'org.springframework.boot:spring-boot-starter-actuator:2.6.1'
-            implementation 'org.springframework.boot:spring-boot-starter-test:2.6.1'
-            implementation 'org.springframework.security:spring-security-test:5.6.0'
+            implementation 'org.springframework.boot:spring-boot-starter-security:2.7.18'
+            implementation 'org.springframework.boot:spring-boot-starter-web:2.7.18'
+            implementation 'org.springframework.boot:spring-boot-starter-aop:2.7.18'
+            implementation 'org.springframework.boot:spring-boot-starter-actuator:2.7.18'
+            implementation 'org.springframework.boot:spring-boot-starter-test:2.7.18'
+            implementation 'org.springframework.security:spring-security-test:5.8.12'
 
-            implementation 'org.symphonyoss.symphony:messageml:0.9.81'
+            implementation 'org.symphonyoss.symphony:messageml:0.12.0'
             implementation 'io.micrometer:micrometer-registry-prometheus:1.5.1'
 
             testCompileOnly 'org.projectlombok:lombok:1.18.16'
             testAnnotationProcessor 'org.projectlombok:lombok:1.18.16'
 
             implementation 'junit:junit:4.13.1'
             implementation 'org.mockito:mockito-core:3.6.0'
-            implementation 'com.github.tomakehurst:wiremock-jre8:2.32.0'
+            implementation 'com.github.tomakehurst:wiremock-jre8:2.35.2'
         }
     }
 

sms-sdk-renderer-java/build.gradle

@@ -10,11 +10,7 @@ dependencies {
     api 'com.github.jknack:handlebars'
     api 'com.github.jknack:handlebars-jackson2'
     api 'com.github.jknack:handlebars-guava-cache'
-    constraints {
-        api('com.google.guava:guava:30.0-jre') {
-            because 'version 18.0 pulled by com.github.jknack:handlebars-guava-cache:4.2.0 is way too old!'
-        }
-    }
+
     api 'com.googlecode.json-simple:json-simple'
 
     testImplementation 'junit:junit'

symphony-api-client-java/src/main/java/model/AdminNewUser.java

@@ -1,7 +1,10 @@
 package model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import java.util.List;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class AdminNewUser {
 
     private AdminUserAttributes userAttributes;

symphony-api-client-java/src/main/java/model/AdminStreamFilter.java

@@ -1,7 +1,10 @@
 package model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import java.util.List;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class AdminStreamFilter {
 
     private List<String> streamTypes;

symphony-api-client-java/src/main/java/model/AdminUserInfoList.java

@@ -1,6 +1,9 @@
 package model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import java.util.ArrayList;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class AdminUserInfoList extends ArrayList<AdminUserInfo> {
 }

symphony-api-client-java/src/main/java/model/AppAuthResponse.java

@@ -1,5 +1,8 @@
 package model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class AppAuthResponse {
     private String appToken;
     private String symphonyToken;

symphony-api-client-java/src/main/java/model/Application.java

@@ -1,7 +1,10 @@
 package model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import java.util.List;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Application {
 
     private ApplicationInfo applicationInfo;

symphony-api-client-java/src/main/java/model/ApplicationEntitlementList.java

@@ -1,6 +1,9 @@
 package model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import java.util.ArrayList;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class ApplicationEntitlementList extends ArrayList<ApplicationEntitlement> {
 }

symphony-api-client-java/src/main/java/model/ApplicationInfo.java

@@ -1,5 +1,8 @@
 package model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class ApplicationInfo {
 
     private String appId;

symphony-api-client-java/src/main/java/model/ApplicationProduct.java

@@ -1,5 +1,8 @@
 package model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class ApplicationProduct {
 
     private String appId;

symphony-api-client-java/src/main/java/model/AvatarList.java

@@ -1,6 +1,9 @@
 package model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import java.util.ArrayList;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class AvatarList extends ArrayList<Avatar> {
 }

symphony-api-client-java/src/main/java/model/DropdownMenuOption.java

@@ -1,5 +1,8 @@
 package model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class DropdownMenuOption {
     private String value;
     private String display;

symphony-api-client-java/src/main/java/model/FeatureEntitlement.java

@@ -1,5 +1,8 @@
 package model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class FeatureEntitlement {
 
     private String entitlment;

symphony-api-client-java/src/main/java/model/FeatureEntitlementList.java

@@ -1,6 +1,9 @@
 package model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import java.util.ArrayList;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class FeatureEntitlementList extends ArrayList<FeatureEntitlement> {
 }

symphony-api-client-java/src/main/java/model/InboundImportMessage.java

@@ -1,5 +1,8 @@
 package model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class InboundImportMessage {
 
     private String messageId;

symphony-api-client-java/src/main/java/model/InboundImportMessageList.java

@@ -1,6 +1,9 @@
 package model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import java.util.ArrayList;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class InboundImportMessageList extends ArrayList<InboundImportMessage> {
 }

symphony-api-client-java/src/main/java/model/InboundMessageList.java

@@ -1,6 +1,9 @@
 package model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import java.util.ArrayList;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class InboundMessageList extends ArrayList<InboundMessage> {
 }

symphony-api-client-java/src/main/java/model/MemberList.java

@@ -1,6 +1,9 @@
 package model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import java.util.ArrayList;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class MemberList extends ArrayList<RoomMember> {
 }

symphony-api-client-java/src/main/java/model/OutboundImportMessage.java

@@ -1,5 +1,8 @@
 package model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class OutboundImportMessage {
     private String message;
     private String data;

symphony-api-client-java/src/main/java/model/OutboundImportMessageList.java

@@ -1,6 +1,9 @@
 package model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import java.util.ArrayList;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class OutboundImportMessageList extends ArrayList<OutboundImportMessage> {
 }

symphony-api-client-java/src/main/java/model/OutboundShare.java

@@ -1,5 +1,8 @@
 package model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class OutboundShare {
 
     private String articleId;

symphony-api-client-java/src/main/java/model/Password.java

@@ -1,5 +1,8 @@
 package model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Password {
     private String hhSalt;
     private String hhPassword;

symphony-api-client-java/src/main/java/model/PodCert.java

@@ -1,5 +1,8 @@
 package model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class PodCert {
     String certificate;
 

symphony-api-client-java/src/main/java/model/SessionToken.java

@@ -1,5 +1,8 @@
 package model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class SessionToken {
     private String sessionToken;
 

symphony-api-client-java/src/main/java/model/SignalList.java

@@ -1,6 +1,9 @@
 package model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import java.util.ArrayList;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class SignalList extends ArrayList<Signal> {
 }

symphony-api-client-java/src/main/java/model/SignalSubscriber.java

@@ -1,5 +1,8 @@
 package model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class SignalSubscriber {
 
     private boolean pushed;

symphony-api-client-java/src/main/java/model/SignalSubscriberList.java

@@ -1,7 +1,10 @@
 package model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import java.util.List;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class SignalSubscriberList {
 
     private int offset;

symphony-api-client-java/src/main/java/model/Status.java

@@ -1,5 +1,8 @@
 package model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Status {
     private String status;
 

symphony-api-client-java/src/main/java/model/Stream.java

@@ -12,6 +12,7 @@ public class Stream {
     private List<User> members;
     private Boolean external;
     private Boolean crossPod;
+    private List<Integer> recipientTenantIds;
 
     public String getStreamId() {
         return streamId;
@@ -60,4 +61,12 @@ public Boolean getCrossPod() {
     public void setCrossPod(Boolean crossPod) {
         this.crossPod = crossPod;
     }
+
+    public List<Integer> getRecipientTenantIds() {
+      return recipientTenantIds;
+    }
+
+    public void setRecipientTenantIds(List<Integer> recipientTenantIds) {
+      this.recipientTenantIds = recipientTenantIds;
+    }
 }

symphony-api-client-java/src/main/java/model/StreamInfoList.java

@@ -1,6 +1,9 @@
 package model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import java.util.ArrayList;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class StreamInfoList extends ArrayList<StreamListItem> {
 }

symphony-api-client-java/src/main/java/model/UserFilter.java

@@ -1,5 +1,8 @@
 package model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class UserFilter {
 
     private String title;