This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch m1-compatibility in repository https://gitbox.apache.org/repos/asf/airavata-custos.git
commit 0463d60e693514e4b71c34ad05fc0f6a12ad6b13 Author: Marcus Christie <[email protected]> AuthorDate: Fri Mar 31 09:56:23 2023 -0400 mac m1 protobuf compatibility (ported to baremetal branch) --- .../custos-java-clients/agent-management-client/pom.xml | 6 +++--- .../custos-java-clients/group-management-client/pom.xml | 6 +++--- .../custos-java-clients/identity-management-client/pom.xml | 6 +++--- .../resource-secret-management-client/pom.xml | 6 +++--- .../custos-java-clients/sharing-management-client/pom.xml | 4 ++-- .../custos-java-clients/tenant-management-client/pom.xml | 6 +++--- .../custos-java-clients/user-management-client/pom.xml | 6 +++--- custos-core/sharing-core-impl/pom.xml | 6 +++--- .../agent-profile-core-service-client-stub/pom.xml | 6 +++--- .../apache/custos/agent/profile/client/AgentProfileClient.java | 2 +- .../cluster-management-core-service-client-stub/pom.xml | 6 +++--- .../cluster/management/client/ClusterManagementClient.java | 2 +- .../credential-store-core-service-client-stubs/pom.xml | 6 +++--- .../credential/store/client/CredentialStoreServiceClient.java | 2 +- .../custos-logging-client-stub/pom.xml | 6 +++--- .../java/org/apache/custos/logging/client/LoggingClient.java | 2 +- .../federated-authentication-core-service-client-stub/pom.xml | 6 +++--- .../authentication/client/FederatedAuthenticationClient.java | 2 +- .../iam-admin-core-service-client-stub/pom.xml | 6 +++--- .../apache/custos/iam/admin/client/IamAdminServiceClient.java | 2 +- .../identity-core-service-client-stub/pom.xml | 6 +++--- .../java/org/apache/custos/identity/client/IdentityClient.java | 2 +- .../messaging-core-service-client-stub/pom.xml | 6 +++--- .../org/apache/custos/messaging/client/MessagingClient.java | 2 +- .../resource-secret-core-service-client-stub/pom.xml | 6 +++--- .../custos/resource/secret/client/ResourceSecretClient.java | 2 +- .../sharing-core-service-client-stub/pom.xml | 6 +++--- .../java/org/apache/custos/sharing/client/SharingClient.java | 2 +- .../tenant-profile-core-service-client-stub/pom.xml | 6 +++--- .../tenant/profile/client/async/TenantProfileClient.java | 2 +- .../user-profile-core-service-client-stub/pom.xml | 6 +++--- .../apache/custos/user/profile/client/UserProfileClient.java | 2 +- pom.xml | 10 +++++----- 33 files changed, 76 insertions(+), 76 deletions(-) diff --git a/custos-client-sdks/custos-java-clients/agent-management-client/pom.xml b/custos-client-sdks/custos-java-clients/agent-management-client/pom.xml index 1841b85f8..565adc16c 100644 --- a/custos-client-sdks/custos-java-clients/agent-management-client/pom.xml +++ b/custos-client-sdks/custos-java-clients/agent-management-client/pom.xml @@ -101,9 +101,9 @@ <groupId>org.xolstice.maven.plugins</groupId> <artifactId>protobuf-maven-plugin</artifactId> <configuration> - <protocArtifact>com.google.protobuf:protoc:3.0.2:exe:${os.detected.classifier}</protocArtifact> + <protocArtifact>com.google.protobuf:protoc:${com.google.protobuf.util}:exe:${os.detected.classifier}</protocArtifact> <pluginId>grpc-java</pluginId> - <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.0.1:exe:${os.detected.classifier}</pluginArtifact> + <pluginArtifact>io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier}</pluginArtifact> <protoSourceRoot> ../../../custos-services/custos-integration-services/agent-management-service/src/main/proto </protoSourceRoot> @@ -122,4 +122,4 @@ </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/custos-client-sdks/custos-java-clients/group-management-client/pom.xml b/custos-client-sdks/custos-java-clients/group-management-client/pom.xml index f877879ff..3a1d670b9 100644 --- a/custos-client-sdks/custos-java-clients/group-management-client/pom.xml +++ b/custos-client-sdks/custos-java-clients/group-management-client/pom.xml @@ -100,9 +100,9 @@ <groupId>org.xolstice.maven.plugins</groupId> <artifactId>protobuf-maven-plugin</artifactId> <configuration> - <protocArtifact>com.google.protobuf:protoc:3.0.2:exe:${os.detected.classifier}</protocArtifact> + <protocArtifact>com.google.protobuf:protoc:${com.google.protobuf.util}:exe:${os.detected.classifier}</protocArtifact> <pluginId>grpc-java</pluginId> - <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.0.1:exe:${os.detected.classifier}</pluginArtifact> + <pluginArtifact>io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier}</pluginArtifact> <protoSourceRoot> ../../../custos-services/custos-integration-services/group-management-service/src/main/proto </protoSourceRoot> @@ -121,4 +121,4 @@ </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/custos-client-sdks/custos-java-clients/identity-management-client/pom.xml b/custos-client-sdks/custos-java-clients/identity-management-client/pom.xml index e6abf62fd..39db1e18d 100644 --- a/custos-client-sdks/custos-java-clients/identity-management-client/pom.xml +++ b/custos-client-sdks/custos-java-clients/identity-management-client/pom.xml @@ -103,9 +103,9 @@ <groupId>org.xolstice.maven.plugins</groupId> <artifactId>protobuf-maven-plugin</artifactId> <configuration> - <protocArtifact>com.google.protobuf:protoc:3.0.2:exe:${os.detected.classifier}</protocArtifact> + <protocArtifact>com.google.protobuf:protoc:${com.google.protobuf.util}:exe:${os.detected.classifier}</protocArtifact> <pluginId>grpc-java</pluginId> - <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.0.1:exe:${os.detected.classifier}</pluginArtifact> + <pluginArtifact>io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier}</pluginArtifact> <protoSourceRoot>../../../custos-services/custos-integration-services/identity-management-service/src/main/proto</protoSourceRoot> </configuration> <executions> @@ -124,4 +124,4 @@ </build> -</project> \ No newline at end of file +</project> diff --git a/custos-client-sdks/custos-java-clients/resource-secret-management-client/pom.xml b/custos-client-sdks/custos-java-clients/resource-secret-management-client/pom.xml index 8ec968d33..c358703c0 100644 --- a/custos-client-sdks/custos-java-clients/resource-secret-management-client/pom.xml +++ b/custos-client-sdks/custos-java-clients/resource-secret-management-client/pom.xml @@ -106,9 +106,9 @@ <groupId>org.xolstice.maven.plugins</groupId> <artifactId>protobuf-maven-plugin</artifactId> <configuration> - <protocArtifact>com.google.protobuf:protoc:3.0.2:exe:${os.detected.classifier}</protocArtifact> + <protocArtifact>com.google.protobuf:protoc:${com.google.protobuf.util}:exe:${os.detected.classifier}</protocArtifact> <pluginId>grpc-java</pluginId> - <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.0.1:exe:${os.detected.classifier}</pluginArtifact> + <pluginArtifact>io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier}</pluginArtifact> <protoSourceRoot> ../../../custos-services/custos-integration-services/resource-secret-management-service/src/main/proto </protoSourceRoot> @@ -127,4 +127,4 @@ </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/custos-client-sdks/custos-java-clients/sharing-management-client/pom.xml b/custos-client-sdks/custos-java-clients/sharing-management-client/pom.xml index 581511f56..b4d517523 100644 --- a/custos-client-sdks/custos-java-clients/sharing-management-client/pom.xml +++ b/custos-client-sdks/custos-java-clients/sharing-management-client/pom.xml @@ -102,9 +102,9 @@ <groupId>org.xolstice.maven.plugins</groupId> <artifactId>protobuf-maven-plugin</artifactId> <configuration> - <protocArtifact>com.google.protobuf:protoc:3.0.2:exe:${os.detected.classifier}</protocArtifact> + <protocArtifact>com.google.protobuf:protoc:${com.google.protobuf.util}:exe:${os.detected.classifier}</protocArtifact> <pluginId>grpc-java</pluginId> - <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.0.1:exe:${os.detected.classifier}</pluginArtifact> + <pluginArtifact>io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier}</pluginArtifact> <protoSourceRoot> ../../../custos-services/custos-integration-services/sharing-management-service/src/main/proto </protoSourceRoot> diff --git a/custos-client-sdks/custos-java-clients/tenant-management-client/pom.xml b/custos-client-sdks/custos-java-clients/tenant-management-client/pom.xml index 08c4031dd..4bb6d760c 100644 --- a/custos-client-sdks/custos-java-clients/tenant-management-client/pom.xml +++ b/custos-client-sdks/custos-java-clients/tenant-management-client/pom.xml @@ -103,9 +103,9 @@ <groupId>org.xolstice.maven.plugins</groupId> <artifactId>protobuf-maven-plugin</artifactId> <configuration> - <protocArtifact>com.google.protobuf:protoc:3.0.2:exe:${os.detected.classifier}</protocArtifact> + <protocArtifact>com.google.protobuf:protoc:${com.google.protobuf.util}:exe:${os.detected.classifier}</protocArtifact> <pluginId>grpc-java</pluginId> - <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.0.1:exe:${os.detected.classifier}</pluginArtifact> + <pluginArtifact>io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier}</pluginArtifact> <protoSourceRoot> ../../../custos-services/custos-integration-services/tenant-management-service/src/main/proto </protoSourceRoot> @@ -124,4 +124,4 @@ </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/custos-client-sdks/custos-java-clients/user-management-client/pom.xml b/custos-client-sdks/custos-java-clients/user-management-client/pom.xml index 03b4f7137..c154afa6e 100644 --- a/custos-client-sdks/custos-java-clients/user-management-client/pom.xml +++ b/custos-client-sdks/custos-java-clients/user-management-client/pom.xml @@ -101,9 +101,9 @@ <groupId>org.xolstice.maven.plugins</groupId> <artifactId>protobuf-maven-plugin</artifactId> <configuration> - <protocArtifact>com.google.protobuf:protoc:3.0.2:exe:${os.detected.classifier}</protocArtifact> + <protocArtifact>com.google.protobuf:protoc:${com.google.protobuf.util}:exe:${os.detected.classifier}</protocArtifact> <pluginId>grpc-java</pluginId> - <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.0.1:exe:${os.detected.classifier}</pluginArtifact> + <pluginArtifact>io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier}</pluginArtifact> <protoSourceRoot> ../../../custos-services/custos-integration-services/user-management-service/src/main/proto </protoSourceRoot> @@ -121,4 +121,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/custos-core/sharing-core-impl/pom.xml b/custos-core/sharing-core-impl/pom.xml index 80d91709d..acae2db1b 100644 --- a/custos-core/sharing-core-impl/pom.xml +++ b/custos-core/sharing-core-impl/pom.xml @@ -23,8 +23,8 @@ <artifactId>spring-boot-starter-data-jpa</artifactId> </dependency> <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> + <groupId>io.grpc</groupId> + <artifactId>grpc-protobuf</artifactId> </dependency> <dependency> <groupId>jakarta.persistence</groupId> @@ -41,4 +41,4 @@ <!-- </dependency>--> </dependencies> -</project> \ No newline at end of file +</project> diff --git a/custos-services/custos-core-services-client-stubs/agent-profile-core-service-client-stub/pom.xml b/custos-services/custos-core-services-client-stubs/agent-profile-core-service-client-stub/pom.xml index 68d76d07d..1c39caeca 100644 --- a/custos-services/custos-core-services-client-stubs/agent-profile-core-service-client-stub/pom.xml +++ b/custos-services/custos-core-services-client-stubs/agent-profile-core-service-client-stub/pom.xml @@ -71,9 +71,9 @@ <groupId>org.xolstice.maven.plugins</groupId> <artifactId>protobuf-maven-plugin</artifactId> <configuration> - <protocArtifact>com.google.protobuf:protoc:3.0.2:exe:${os.detected.classifier}</protocArtifact> + <protocArtifact>com.google.protobuf:protoc:${com.google.protobuf.util}:exe:${os.detected.classifier}</protocArtifact> <pluginId>grpc-java</pluginId> - <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.0.1:exe:${os.detected.classifier}</pluginArtifact> + <pluginArtifact>io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier}</pluginArtifact> <protoSourceRoot>../../custos-core-services/agent-profile-core-service/src/main/proto</protoSourceRoot> </configuration> <executions> @@ -89,4 +89,4 @@ </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/custos-services/custos-core-services-client-stubs/agent-profile-core-service-client-stub/src/main/java/org/apache/custos/agent/profile/client/AgentProfileClient.java b/custos-services/custos-core-services-client-stubs/agent-profile-core-service-client-stub/src/main/java/org/apache/custos/agent/profile/client/AgentProfileClient.java index 7729d6b50..6ea6d07c3 100644 --- a/custos-services/custos-core-services-client-stubs/agent-profile-core-service-client-stub/src/main/java/org/apache/custos/agent/profile/client/AgentProfileClient.java +++ b/custos-services/custos-core-services-client-stubs/agent-profile-core-service-client-stub/src/main/java/org/apache/custos/agent/profile/client/AgentProfileClient.java @@ -50,7 +50,7 @@ public class AgentProfileClient { @Value("${core.services.server.port:7070}") int servicePort) { this.clientInterceptorList = clientInterceptorList; managedChannel = ManagedChannelBuilder.forAddress( - serviceHost, servicePort).usePlaintext(true).intercept(clientInterceptorList).build(); + serviceHost, servicePort).usePlaintext().intercept(clientInterceptorList).build(); agentProfileServiceStub = AgentProfileServiceGrpc.newStub(managedChannel); agentProfileServiceBlockingStub = AgentProfileServiceGrpc.newBlockingStub(managedChannel); } diff --git a/custos-services/custos-core-services-client-stubs/cluster-management-core-service-client-stub/pom.xml b/custos-services/custos-core-services-client-stubs/cluster-management-core-service-client-stub/pom.xml index a6c55eca7..f7f0653ec 100644 --- a/custos-services/custos-core-services-client-stubs/cluster-management-core-service-client-stub/pom.xml +++ b/custos-services/custos-core-services-client-stubs/cluster-management-core-service-client-stub/pom.xml @@ -71,9 +71,9 @@ <groupId>org.xolstice.maven.plugins</groupId> <artifactId>protobuf-maven-plugin</artifactId> <configuration> - <protocArtifact>com.google.protobuf:protoc:3.0.2:exe:${os.detected.classifier}</protocArtifact> + <protocArtifact>com.google.protobuf:protoc:${com.google.protobuf.util}:exe:${os.detected.classifier}</protocArtifact> <pluginId>grpc-java</pluginId> - <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.0.1:exe:${os.detected.classifier}</pluginArtifact> + <pluginArtifact>io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier}</pluginArtifact> <protoSourceRoot>../../custos-core-services/cluster-management-core-service/src/main/proto</protoSourceRoot> </configuration> <executions> @@ -89,4 +89,4 @@ </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/custos-services/custos-core-services-client-stubs/cluster-management-core-service-client-stub/src/main/java/org/apache/custos/cluster/management/client/ClusterManagementClient.java b/custos-services/custos-core-services-client-stubs/cluster-management-core-service-client-stub/src/main/java/org/apache/custos/cluster/management/client/ClusterManagementClient.java index d5f59f554..3187a566f 100644 --- a/custos-services/custos-core-services-client-stubs/cluster-management-core-service-client-stub/src/main/java/org/apache/custos/cluster/management/client/ClusterManagementClient.java +++ b/custos-services/custos-core-services-client-stubs/cluster-management-core-service-client-stub/src/main/java/org/apache/custos/cluster/management/client/ClusterManagementClient.java @@ -45,7 +45,7 @@ public class ClusterManagementClient { @Value("${core.services.server.port:7070}") int servicePort) { this.clientInterceptorList = clientInterceptorList; managedChannel = ManagedChannelBuilder.forAddress( - serviceHost, servicePort).usePlaintext(true).intercept(clientInterceptorList).build(); + serviceHost, servicePort).usePlaintext().intercept(clientInterceptorList).build(); clusterManagementServiceStub = ClusterManagementServiceGrpc.newStub(managedChannel); clusterManagementServiceBlockingStub = ClusterManagementServiceGrpc.newBlockingStub(managedChannel); } diff --git a/custos-services/custos-core-services-client-stubs/credential-store-core-service-client-stubs/pom.xml b/custos-services/custos-core-services-client-stubs/credential-store-core-service-client-stubs/pom.xml index 76e7dba2c..c6e3f0e17 100644 --- a/custos-services/custos-core-services-client-stubs/credential-store-core-service-client-stubs/pom.xml +++ b/custos-services/custos-core-services-client-stubs/credential-store-core-service-client-stubs/pom.xml @@ -70,9 +70,9 @@ <groupId>org.xolstice.maven.plugins</groupId> <artifactId>protobuf-maven-plugin</artifactId> <configuration> - <protocArtifact>com.google.protobuf:protoc:3.0.2:exe:${os.detected.classifier}</protocArtifact> + <protocArtifact>com.google.protobuf:protoc:${com.google.protobuf.util}:exe:${os.detected.classifier}</protocArtifact> <pluginId>grpc-java</pluginId> - <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.0.1:exe:${os.detected.classifier}</pluginArtifact> + <pluginArtifact>io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier}</pluginArtifact> <protoSourceRoot>../../custos-core-services/credential-store-core-service/src/main/proto</protoSourceRoot> </configuration> <executions> @@ -88,4 +88,4 @@ </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/custos-services/custos-core-services-client-stubs/credential-store-core-service-client-stubs/src/main/java/org/apache/custos/credential/store/client/CredentialStoreServiceClient.java b/custos-services/custos-core-services-client-stubs/credential-store-core-service-client-stubs/src/main/java/org/apache/custos/credential/store/client/CredentialStoreServiceClient.java index c58b343de..c031ba5b3 100644 --- a/custos-services/custos-core-services-client-stubs/credential-store-core-service-client-stubs/src/main/java/org/apache/custos/credential/store/client/CredentialStoreServiceClient.java +++ b/custos-services/custos-core-services-client-stubs/credential-store-core-service-client-stubs/src/main/java/org/apache/custos/credential/store/client/CredentialStoreServiceClient.java @@ -49,7 +49,7 @@ public class CredentialStoreServiceClient { @Value("${core.services.server.port:7070}") int servicePort) { this.clientInterceptorList = clientInterceptorList; managedChannel = ManagedChannelBuilder.forAddress( - serviceHost, servicePort).usePlaintext(true).intercept(clientInterceptorList).build(); + serviceHost, servicePort).usePlaintext().intercept(clientInterceptorList).build(); credentialStoreServiceStub = CredentialStoreServiceGrpc.newStub(managedChannel); credentialStoreServiceBlockingStub = CredentialStoreServiceGrpc.newBlockingStub(managedChannel); } diff --git a/custos-services/custos-core-services-client-stubs/custos-logging-client-stub/pom.xml b/custos-services/custos-core-services-client-stubs/custos-logging-client-stub/pom.xml index ae923cf7f..7548edc18 100644 --- a/custos-services/custos-core-services-client-stubs/custos-logging-client-stub/pom.xml +++ b/custos-services/custos-core-services-client-stubs/custos-logging-client-stub/pom.xml @@ -71,9 +71,9 @@ <groupId>org.xolstice.maven.plugins</groupId> <artifactId>protobuf-maven-plugin</artifactId> <configuration> - <protocArtifact>com.google.protobuf:protoc:3.0.2:exe:${os.detected.classifier}</protocArtifact> + <protocArtifact>com.google.protobuf:protoc:${com.google.protobuf.util}:exe:${os.detected.classifier}</protocArtifact> <pluginId>grpc-java</pluginId> - <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.0.1:exe:${os.detected.classifier}</pluginArtifact> + <pluginArtifact>io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier}</pluginArtifact> <protoSourceRoot>../../custos-core-services/custos-logging/src/main/proto</protoSourceRoot> </configuration> <executions> @@ -88,4 +88,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/custos-services/custos-core-services-client-stubs/custos-logging-client-stub/src/main/java/org/apache/custos/logging/client/LoggingClient.java b/custos-services/custos-core-services-client-stubs/custos-logging-client-stub/src/main/java/org/apache/custos/logging/client/LoggingClient.java index fa1510076..7bc6c6f60 100644 --- a/custos-services/custos-core-services-client-stubs/custos-logging-client-stub/src/main/java/org/apache/custos/logging/client/LoggingClient.java +++ b/custos-services/custos-core-services-client-stubs/custos-logging-client-stub/src/main/java/org/apache/custos/logging/client/LoggingClient.java @@ -51,7 +51,7 @@ public class LoggingClient { @Value("${core.services.server.port:7070}") int servicePort) { this.clientInterceptorList = clientInterceptorList; managedChannel = ManagedChannelBuilder.forAddress( - serviceHost, servicePort).usePlaintext(true).intercept(clientInterceptorList).build(); + serviceHost, servicePort).usePlaintext().intercept(clientInterceptorList).build(); loggingServiceBlockingStub = LoggingServiceGrpc.newBlockingStub(managedChannel); loggingServiceFutureStub = LoggingServiceGrpc.newFutureStub(managedChannel); diff --git a/custos-services/custos-core-services-client-stubs/federated-authentication-core-service-client-stub/pom.xml b/custos-services/custos-core-services-client-stubs/federated-authentication-core-service-client-stub/pom.xml index 33182ce48..75705a133 100644 --- a/custos-services/custos-core-services-client-stubs/federated-authentication-core-service-client-stub/pom.xml +++ b/custos-services/custos-core-services-client-stubs/federated-authentication-core-service-client-stub/pom.xml @@ -70,9 +70,9 @@ <groupId>org.xolstice.maven.plugins</groupId> <artifactId>protobuf-maven-plugin</artifactId> <configuration> - <protocArtifact>com.google.protobuf:protoc:3.0.2:exe:${os.detected.classifier}</protocArtifact> + <protocArtifact>com.google.protobuf:protoc:${com.google.protobuf.util}:exe:${os.detected.classifier}</protocArtifact> <pluginId>grpc-java</pluginId> - <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.0.1:exe:${os.detected.classifier}</pluginArtifact> + <pluginArtifact>io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier}</pluginArtifact> <protoSourceRoot>../../custos-core-services/federated-authentication-core-service/src/main/proto</protoSourceRoot> </configuration> <executions> @@ -90,4 +90,4 @@ -</project> \ No newline at end of file +</project> diff --git a/custos-services/custos-core-services-client-stubs/federated-authentication-core-service-client-stub/src/main/java/org/apache/custos/federated/authentication/client/FederatedAuthenticationClient.java b/custos-services/custos-core-services-client-stubs/federated-authentication-core-service-client-stub/src/main/java/org/apache/custos/federated/authentication/client/FederatedAuthenticationClient.java index 29c638d0f..819e6cc07 100644 --- a/custos-services/custos-core-services-client-stubs/federated-authentication-core-service-client-stub/src/main/java/org/apache/custos/federated/authentication/client/FederatedAuthenticationClient.java +++ b/custos-services/custos-core-services-client-stubs/federated-authentication-core-service-client-stub/src/main/java/org/apache/custos/federated/authentication/client/FederatedAuthenticationClient.java @@ -48,7 +48,7 @@ public class FederatedAuthenticationClient { @Value("${core.services.server.port:7070}") int servicePort) { this.clientInterceptorList = clientInterceptorList; managedChannel = ManagedChannelBuilder.forAddress( - serviceHost, servicePort).usePlaintext(true).intercept(clientInterceptorList).build(); + serviceHost, servicePort).usePlaintext().intercept(clientInterceptorList).build(); federatedAuthenticationServiceStub = FederatedAuthenticationServiceGrpc.newStub(managedChannel); federatedAuthenticationServiceBlockingStub = FederatedAuthenticationServiceGrpc.newBlockingStub(managedChannel); } diff --git a/custos-services/custos-core-services-client-stubs/iam-admin-core-service-client-stub/pom.xml b/custos-services/custos-core-services-client-stubs/iam-admin-core-service-client-stub/pom.xml index bb380ed90..08234f7aa 100644 --- a/custos-services/custos-core-services-client-stubs/iam-admin-core-service-client-stub/pom.xml +++ b/custos-services/custos-core-services-client-stubs/iam-admin-core-service-client-stub/pom.xml @@ -70,9 +70,9 @@ <groupId>org.xolstice.maven.plugins</groupId> <artifactId>protobuf-maven-plugin</artifactId> <configuration> - <protocArtifact>com.google.protobuf:protoc:3.0.2:exe:${os.detected.classifier}</protocArtifact> + <protocArtifact>com.google.protobuf:protoc:${com.google.protobuf.util}:exe:${os.detected.classifier}</protocArtifact> <pluginId>grpc-java</pluginId> - <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.0.1:exe:${os.detected.classifier}</pluginArtifact> + <pluginArtifact>io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier}</pluginArtifact> <protoSourceRoot>../../custos-core-services/iam-admin-core-service/src/main/proto</protoSourceRoot> </configuration> <executions> @@ -91,4 +91,4 @@ -</project> \ No newline at end of file +</project> diff --git a/custos-services/custos-core-services-client-stubs/iam-admin-core-service-client-stub/src/main/java/org/apache/custos/iam/admin/client/IamAdminServiceClient.java b/custos-services/custos-core-services-client-stubs/iam-admin-core-service-client-stub/src/main/java/org/apache/custos/iam/admin/client/IamAdminServiceClient.java index 4a463e542..38fa7a2e2 100644 --- a/custos-services/custos-core-services-client-stubs/iam-admin-core-service-client-stub/src/main/java/org/apache/custos/iam/admin/client/IamAdminServiceClient.java +++ b/custos-services/custos-core-services-client-stubs/iam-admin-core-service-client-stub/src/main/java/org/apache/custos/iam/admin/client/IamAdminServiceClient.java @@ -52,7 +52,7 @@ public class IamAdminServiceClient { @Value("${iam.server.url:https://localhost/auth}";) String url) { this.clientInterceptorList = clientInterceptorList; managedChannel = ManagedChannelBuilder.forAddress( - serviceHost, servicePort).usePlaintext(true).intercept(clientInterceptorList).build(); + serviceHost, servicePort).usePlaintext().intercept(clientInterceptorList).build(); iamAdminServiceStub = IamAdminServiceGrpc.newStub(managedChannel); iamAdminServiceBlockingStub = IamAdminServiceGrpc.newBlockingStub(managedChannel); this.iamServerURL = url; diff --git a/custos-services/custos-core-services-client-stubs/identity-core-service-client-stub/pom.xml b/custos-services/custos-core-services-client-stubs/identity-core-service-client-stub/pom.xml index 0e7328db6..d97508673 100644 --- a/custos-services/custos-core-services-client-stubs/identity-core-service-client-stub/pom.xml +++ b/custos-services/custos-core-services-client-stubs/identity-core-service-client-stub/pom.xml @@ -69,9 +69,9 @@ <groupId>org.xolstice.maven.plugins</groupId> <artifactId>protobuf-maven-plugin</artifactId> <configuration> - <protocArtifact>com.google.protobuf:protoc:3.0.2:exe:${os.detected.classifier}</protocArtifact> + <protocArtifact>com.google.protobuf:protoc:${com.google.protobuf.util}:exe:${os.detected.classifier}</protocArtifact> <pluginId>grpc-java</pluginId> - <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.0.1:exe:${os.detected.classifier}</pluginArtifact> + <pluginArtifact>io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier}</pluginArtifact> <protoSourceRoot>../../custos-core-services/identity-core-service/src/main/proto</protoSourceRoot> </configuration> <executions> @@ -87,4 +87,4 @@ </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/custos-services/custos-core-services-client-stubs/identity-core-service-client-stub/src/main/java/org/apache/custos/identity/client/IdentityClient.java b/custos-services/custos-core-services-client-stubs/identity-core-service-client-stub/src/main/java/org/apache/custos/identity/client/IdentityClient.java index 6e9ada436..8aba1d9c8 100644 --- a/custos-services/custos-core-services-client-stubs/identity-core-service-client-stub/src/main/java/org/apache/custos/identity/client/IdentityClient.java +++ b/custos-services/custos-core-services-client-stubs/identity-core-service-client-stub/src/main/java/org/apache/custos/identity/client/IdentityClient.java @@ -49,7 +49,7 @@ public class IdentityClient { @Value("${core.services.server.port:7070}") int servicePort) { this.clientInterceptorList = clientInterceptorList; managedChannel = ManagedChannelBuilder.forAddress( - serviceHost, servicePort).usePlaintext(true).intercept(clientInterceptorList).build(); + serviceHost, servicePort).usePlaintext().intercept(clientInterceptorList).build(); identityServiceStub = IdentityServiceGrpc.newStub(managedChannel); identityServiceBlockingStub = IdentityServiceGrpc.newBlockingStub(managedChannel); } diff --git a/custos-services/custos-core-services-client-stubs/messaging-core-service-client-stub/pom.xml b/custos-services/custos-core-services-client-stubs/messaging-core-service-client-stub/pom.xml index cf8f9c218..5763b203b 100644 --- a/custos-services/custos-core-services-client-stubs/messaging-core-service-client-stub/pom.xml +++ b/custos-services/custos-core-services-client-stubs/messaging-core-service-client-stub/pom.xml @@ -83,9 +83,9 @@ <groupId>org.xolstice.maven.plugins</groupId> <artifactId>protobuf-maven-plugin</artifactId> <configuration> - <protocArtifact>com.google.protobuf:protoc:3.0.2:exe:${os.detected.classifier}</protocArtifact> + <protocArtifact>com.google.protobuf:protoc:${com.google.protobuf.util}:exe:${os.detected.classifier}</protocArtifact> <pluginId>grpc-java</pluginId> - <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.0.1:exe:${os.detected.classifier}</pluginArtifact> + <pluginArtifact>io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier}</pluginArtifact> <protoSourceRoot>../../custos-core-services/custos-messaging-core-service/src/main/proto</protoSourceRoot> </configuration> <executions> @@ -101,4 +101,4 @@ </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/custos-services/custos-core-services-client-stubs/messaging-core-service-client-stub/src/main/java/org/apache/custos/messaging/client/MessagingClient.java b/custos-services/custos-core-services-client-stubs/messaging-core-service-client-stub/src/main/java/org/apache/custos/messaging/client/MessagingClient.java index f7bade669..6fcb0478b 100644 --- a/custos-services/custos-core-services-client-stubs/messaging-core-service-client-stub/src/main/java/org/apache/custos/messaging/client/MessagingClient.java +++ b/custos-services/custos-core-services-client-stubs/messaging-core-service-client-stub/src/main/java/org/apache/custos/messaging/client/MessagingClient.java @@ -50,7 +50,7 @@ public class MessagingClient { @Value("${core.services.server.port:7070}") int servicePort) { this.clientInterceptorList = clientInterceptorList; managedChannel = ManagedChannelBuilder.forAddress( - serviceHost, servicePort).usePlaintext(true).intercept(clientInterceptorList).build(); + serviceHost, servicePort).usePlaintext().intercept(clientInterceptorList).build(); messagingServiceBlockingStub = MessagingServiceGrpc.newBlockingStub(managedChannel); messagingServiceFutureStub = MessagingServiceGrpc.newStub(managedChannel); emailServiceStub = EmailServiceGrpc.newStub(managedChannel); diff --git a/custos-services/custos-core-services-client-stubs/resource-secret-core-service-client-stub/pom.xml b/custos-services/custos-core-services-client-stubs/resource-secret-core-service-client-stub/pom.xml index 3f03c15dd..e423bc2af 100644 --- a/custos-services/custos-core-services-client-stubs/resource-secret-core-service-client-stub/pom.xml +++ b/custos-services/custos-core-services-client-stubs/resource-secret-core-service-client-stub/pom.xml @@ -70,9 +70,9 @@ <groupId>org.xolstice.maven.plugins</groupId> <artifactId>protobuf-maven-plugin</artifactId> <configuration> - <protocArtifact>com.google.protobuf:protoc:3.0.2:exe:${os.detected.classifier}</protocArtifact> + <protocArtifact>com.google.protobuf:protoc:${com.google.protobuf.util}:exe:${os.detected.classifier}</protocArtifact> <pluginId>grpc-java</pluginId> - <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.0.1:exe:${os.detected.classifier}</pluginArtifact> + <pluginArtifact>io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier}</pluginArtifact> <protoSourceRoot>../../custos-core-services/resource-secret-core-service/src/main/proto</protoSourceRoot> </configuration> <executions> @@ -88,4 +88,4 @@ </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/custos-services/custos-core-services-client-stubs/resource-secret-core-service-client-stub/src/main/java/org/apache/custos/resource/secret/client/ResourceSecretClient.java b/custos-services/custos-core-services-client-stubs/resource-secret-core-service-client-stub/src/main/java/org/apache/custos/resource/secret/client/ResourceSecretClient.java index ee7e3d08c..935e23a02 100644 --- a/custos-services/custos-core-services-client-stubs/resource-secret-core-service-client-stub/src/main/java/org/apache/custos/resource/secret/client/ResourceSecretClient.java +++ b/custos-services/custos-core-services-client-stubs/resource-secret-core-service-client-stub/src/main/java/org/apache/custos/resource/secret/client/ResourceSecretClient.java @@ -41,7 +41,7 @@ public class ResourceSecretClient { @Value("${core.services.server.port:7070}") int servicePort) { this.clientInterceptorList = clientInterceptorList; managedChannel = ManagedChannelBuilder.forAddress( - serviceHost, servicePort).usePlaintext(true).intercept(clientInterceptorList).build(); + serviceHost, servicePort).usePlaintext().intercept(clientInterceptorList).build(); resourceSecretServiceBlockingStub = ResourceSecretServiceGrpc.newBlockingStub(managedChannel); } diff --git a/custos-services/custos-core-services-client-stubs/sharing-core-service-client-stub/pom.xml b/custos-services/custos-core-services-client-stubs/sharing-core-service-client-stub/pom.xml index e29c626d4..9eec9fa14 100644 --- a/custos-services/custos-core-services-client-stubs/sharing-core-service-client-stub/pom.xml +++ b/custos-services/custos-core-services-client-stubs/sharing-core-service-client-stub/pom.xml @@ -77,9 +77,9 @@ <groupId>org.xolstice.maven.plugins</groupId> <artifactId>protobuf-maven-plugin</artifactId> <configuration> - <protocArtifact>com.google.protobuf:protoc:3.0.2:exe:${os.detected.classifier}</protocArtifact> + <protocArtifact>com.google.protobuf:protoc:${com.google.protobuf.util}:exe:${os.detected.classifier}</protocArtifact> <pluginId>grpc-java</pluginId> - <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.0.1:exe:${os.detected.classifier}</pluginArtifact> + <pluginArtifact>io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier}</pluginArtifact> <protoSourceRoot>../../../custos-grpc-data-models/proto</protoSourceRoot> </configuration> <executions> @@ -95,4 +95,4 @@ </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/custos-services/custos-core-services-client-stubs/sharing-core-service-client-stub/src/main/java/org/apache/custos/sharing/client/SharingClient.java b/custos-services/custos-core-services-client-stubs/sharing-core-service-client-stub/src/main/java/org/apache/custos/sharing/client/SharingClient.java index 6e6ce94c6..84a1e6b63 100644 --- a/custos-services/custos-core-services-client-stubs/sharing-core-service-client-stub/src/main/java/org/apache/custos/sharing/client/SharingClient.java +++ b/custos-services/custos-core-services-client-stubs/sharing-core-service-client-stub/src/main/java/org/apache/custos/sharing/client/SharingClient.java @@ -47,7 +47,7 @@ public class SharingClient { @Value("${core.services.server.port:7070}") int servicePort) { this.clientInterceptorList = clientInterceptorList; managedChannel = ManagedChannelBuilder.forAddress( - serviceHost, servicePort).usePlaintext(true).intercept(clientInterceptorList).build(); + serviceHost, servicePort).usePlaintext().intercept(clientInterceptorList).build(); sharingServiceBlockingStub = SharingServiceGrpc.newBlockingStub(managedChannel); } diff --git a/custos-services/custos-core-services-client-stubs/tenant-profile-core-service-client-stub/pom.xml b/custos-services/custos-core-services-client-stubs/tenant-profile-core-service-client-stub/pom.xml index 949a02f69..a24630e0e 100644 --- a/custos-services/custos-core-services-client-stubs/tenant-profile-core-service-client-stub/pom.xml +++ b/custos-services/custos-core-services-client-stubs/tenant-profile-core-service-client-stub/pom.xml @@ -72,9 +72,9 @@ <groupId>org.xolstice.maven.plugins</groupId> <artifactId>protobuf-maven-plugin</artifactId> <configuration> - <protocArtifact>com.google.protobuf:protoc:3.0.2:exe:${os.detected.classifier}</protocArtifact> + <protocArtifact>com.google.protobuf:protoc:${com.google.protobuf.util}:exe:${os.detected.classifier}</protocArtifact> <pluginId>grpc-java</pluginId> - <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.0.1:exe:${os.detected.classifier}</pluginArtifact> + <pluginArtifact>io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier}</pluginArtifact> <protoSourceRoot>../../custos-core-services/tenant-profile-core-service/src/main/proto</protoSourceRoot> </configuration> <executions> @@ -93,4 +93,4 @@ -</project> \ No newline at end of file +</project> diff --git a/custos-services/custos-core-services-client-stubs/tenant-profile-core-service-client-stub/src/main/java/org/apache/custos/tenant/profile/client/async/TenantProfileClient.java b/custos-services/custos-core-services-client-stubs/tenant-profile-core-service-client-stub/src/main/java/org/apache/custos/tenant/profile/client/async/TenantProfileClient.java index 5e341b024..eed615fbc 100644 --- a/custos-services/custos-core-services-client-stubs/tenant-profile-core-service-client-stub/src/main/java/org/apache/custos/tenant/profile/client/async/TenantProfileClient.java +++ b/custos-services/custos-core-services-client-stubs/tenant-profile-core-service-client-stub/src/main/java/org/apache/custos/tenant/profile/client/async/TenantProfileClient.java @@ -51,7 +51,7 @@ public class TenantProfileClient { @Value("${core.services.server.port:7070}") int servicePort) { this.clientInterceptorList = clientInterceptorList; managedChannel = ManagedChannelBuilder.forAddress( - serviceHost, servicePort).usePlaintext(true).intercept(clientInterceptorList).build(); + serviceHost, servicePort).usePlaintext().intercept(clientInterceptorList).build(); profileServiceStub = TenantProfileServiceGrpc.newStub(managedChannel); profileServiceBlockingStub = TenantProfileServiceGrpc.newBlockingStub(managedChannel); } diff --git a/custos-services/custos-core-services-client-stubs/user-profile-core-service-client-stub/pom.xml b/custos-services/custos-core-services-client-stubs/user-profile-core-service-client-stub/pom.xml index ce57d7b11..beb62ef3e 100644 --- a/custos-services/custos-core-services-client-stubs/user-profile-core-service-client-stub/pom.xml +++ b/custos-services/custos-core-services-client-stubs/user-profile-core-service-client-stub/pom.xml @@ -71,9 +71,9 @@ <groupId>org.xolstice.maven.plugins</groupId> <artifactId>protobuf-maven-plugin</artifactId> <configuration> - <protocArtifact>com.google.protobuf:protoc:3.0.2:exe:${os.detected.classifier}</protocArtifact> + <protocArtifact>com.google.protobuf:protoc:${com.google.protobuf.util}:exe:${os.detected.classifier}</protocArtifact> <pluginId>grpc-java</pluginId> - <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.0.1:exe:${os.detected.classifier}</pluginArtifact> + <pluginArtifact>io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier}</pluginArtifact> <protoSourceRoot>../../custos-core-services/user-profile-core-service/src/main/proto</protoSourceRoot> </configuration> <executions> @@ -90,4 +90,4 @@ </build> -</project> \ No newline at end of file +</project> diff --git a/custos-services/custos-core-services-client-stubs/user-profile-core-service-client-stub/src/main/java/org/apache/custos/user/profile/client/UserProfileClient.java b/custos-services/custos-core-services-client-stubs/user-profile-core-service-client-stub/src/main/java/org/apache/custos/user/profile/client/UserProfileClient.java index a5242d013..610fbe185 100644 --- a/custos-services/custos-core-services-client-stubs/user-profile-core-service-client-stub/src/main/java/org/apache/custos/user/profile/client/UserProfileClient.java +++ b/custos-services/custos-core-services-client-stubs/user-profile-core-service-client-stub/src/main/java/org/apache/custos/user/profile/client/UserProfileClient.java @@ -50,7 +50,7 @@ public class UserProfileClient { @Value("${core.services.server.port:7070}") int servicePort) { this.clientInterceptorList = clientInterceptorList; managedChannel = ManagedChannelBuilder.forAddress( - serviceHost, servicePort).usePlaintext(true).intercept(clientInterceptorList).build(); + serviceHost, servicePort).usePlaintext().intercept(clientInterceptorList).build(); userProfileServiceStub = UserProfileServiceGrpc.newStub(managedChannel); userProfileServiceBlockingStub = UserProfileServiceGrpc.newBlockingStub(managedChannel); } diff --git a/pom.xml b/pom.xml index f5d6cb477..276047bd5 100644 --- a/pom.xml +++ b/pom.xml @@ -302,10 +302,10 @@ <artifactId>protobuf-maven-plugin</artifactId> <version>${protobuf.maven.plugin}</version> <configuration> - <protocArtifact>com.google.protobuf:protoc:3.0.2:exe:${os.detected.classifier} + <protocArtifact>com.google.protobuf:protoc:${com.google.protobuf.util}:exe:${os.detected.classifier} </protocArtifact> <pluginId>grpc-java</pluginId> - <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.0.1:exe:${os.detected.classifier} + <pluginArtifact>io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier} </pluginArtifact> </configuration> <executions> @@ -400,7 +400,7 @@ <spring.cloud.stream.version>2.0.0.RELEASE</spring.cloud.stream.version> <spring.cloud.slueth.version>2.1.6.RELEASE</spring.cloud.slueth.version> - <io.grpc.version>1.25.0</io.grpc.version> + <io.grpc.version>1.51.0</io.grpc.version> <google.common.protos>1.17.0</google.common.protos> <io.micrometer.version>1.3.1</io.micrometer.version> <brave.version>5.9.1</brave.version> @@ -419,7 +419,7 @@ <reasteasy.client.version>3.0.14.Final</reasteasy.client.version> - <com.google.protobuf.util>3.11.3</com.google.protobuf.util> + <com.google.protobuf.util>3.21.11</com.google.protobuf.util> <springfox.swagger.version>2.9.2</springfox.swagger.version> <org.wso2.charon>3.3.16</org.wso2.charon> @@ -462,4 +462,4 @@ </properties> -</project> \ No newline at end of file +</project>
