Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update to latest version: v1.4.2 #18

Merged
merged 1 commit into from
Oct 10, 2024
Merged

update to latest version: v1.4.2 #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.4.1
1.4.2
18 changes: 9 additions & 9 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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+
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down
8 changes: 1 addition & 7 deletions src/main/java/com/trend/cloudone/amaas/AMaasClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Loading