Merge pull request #18 from trendmicro/update_to_latest_version_v1.4.2

update to latest version: v1.4.2
trendmicro · Oct 10, 2024 · 2a6d64d · 2a6d64d
2 parents f571828 + d4ce7f0
commit 2a6d64d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.4.2 - 2024-10-10
+
+* Update dependencies: protobuf-java, protobuf-java-util, grpc-netty
+
 ## 1.4.1 - 2024-08-28
 
 * Support certificate verification bypass using environment variable

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.4.1
+1.4.2
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>com.trend</groupId>
   <artifactId>file-security-java-sdk</artifactId>
-  <version>1.4.1</version>
+  <version>1.4.2</version>
 
   <name>file-security-java-sdk</name>
   <url>https://github.com/trendmicro/tm-v1-fs-java-sdk</url>
@@ -59,12 +59,12 @@
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java</artifactId>
-      <version>3.24.2</version>
+      <version>4.28.2</version>
     </dependency>
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java-util</artifactId>
-      <version>3.24.2</version>
+      <version>4.28.2</version>
     </dependency>
     <dependency>
       <groupId>javax.annotation</groupId>
@@ -74,22 +74,22 @@
     <dependency>
       <groupId>io.grpc</groupId>
       <artifactId>grpc-stub</artifactId>
-      <version>1.56.0</version>
+      <version>1.68.0</version>
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
       <artifactId>grpc-protobuf</artifactId>
-      <version>1.56.0</version>
+      <version>1.68.0</version>
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
       <artifactId>grpc-netty</artifactId>
-      <version>1.56.0</version>
+      <version>1.68.0</version>
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
       <artifactId>grpc-testing</artifactId>
-      <version>1.57.2</version>
+      <version>1.68.0</version>
       <scope>test</scope>
     </dependency>
     <!-- necessary for Java 9+
@@ -121,7 +121,7 @@
                 <goal>run</goal>
               </goals>
               <configuration>
-                <protocArtifact>com.google.protobuf:protoc:3.21.7</protocArtifact>
+                <protocArtifact>com.google.protobuf:protoc:4.28.2</protocArtifact>
                 <inputDirectories>
                   <include>protos</include>
                 </inputDirectories>
@@ -132,7 +132,7 @@
                   </outputTarget>
                   <outputTarget>
                     <type>grpc-java</type>
-                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.56.0</pluginArtifact>
+                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.68.0</pluginArtifact>
                   </outputTarget>
                 </outputTargets>
               </configuration>

diff --git a/src/main/java/com/trend/cloudone/amaas/AMaasClient.java b/src/main/java/com/trend/cloudone/amaas/AMaasClient.java
@@ -144,13 +144,7 @@ private String identifyHostAddr(final String region, final String host) {
         if (host != null && !host.isEmpty()) {
             return host;
         }
-        // TBD: keep this to pass BVT. Remove in next PR
-        // overwrite region setting with host setting
-        String target = System.getenv("TM_AM_SERVER_ADDR");
-        if (target == null || target == "") {
-            target = AMaasRegion.getServiceFqdn(region);
-        }
-        return target;
+        return AMaasRegion.getServiceFqdn(region);
     }
 
     private static void log(final Level level, final String msg, final Object... params) {