You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by is...@apache.org on 2023/04/03 01:19:16 UTC
[airavata-custos] branch baremetal updated: update spring boot to 3.0.1 and change namespace from javax.persistence to jakarta.namespace
This is an automated email from the ASF dual-hosted git repository.
isjarana pushed a commit to branch baremetal
in repository https://gitbox.apache.org/repos/asf/airavata-custos.git
The following commit(s) were added to refs/heads/baremetal by this push:
new 9b3ffcc64 update spring boot to 3.0.1 and change namespace from javax.persistence to jakarta.namespace
new f9ea05162 Merge pull request #370 from isururanawaka/jakarta-conversion
9b3ffcc64 is described below
commit 9b3ffcc646724313dd9a1c923fbc8db42e55941d
Author: Isuru Ranawaka <ir...@gmail.com>
AuthorDate: Sun Apr 2 21:17:53 2023 -0400
update spring boot to 3.0.1 and change namespace from javax.persistence to jakarta.namespace
---
.../agent-management-client/pom.xml | 14 +++
.../custos-clients-core/pom.xml | 29 +++---
.../group-management-client/pom.xml | 10 ++
.../identity-management-client/pom.xml | 10 ++
.../resource-secret-management-client/pom.xml | 14 +++
.../sharing-management-client/pom.xml | 10 ++
.../tenant-management-client/pom.xml | 10 ++
.../user-management-client/pom.xml | 14 +++
custos-core/pom.xml | 4 +-
custos-core/sharing-core-impl/pom.xml | 26 +++---
.../sharing/core/persistance/model/Sharing.java | 2 +-
custos-rest-proxy/pom.xml | 86 +++++++++++++++++
.../agent-profile-core-service-client-stub/pom.xml | 14 ++-
.../pom.xml | 22 ++++-
.../pom.xml | 14 ++-
.../custos-logging-client-stub/pom.xml | 36 ++++++-
.../pom.xml | 22 ++++-
.../iam-admin-core-service-client-stub/pom.xml | 14 ++-
.../identity-core-service-client-stub/pom.xml | 14 ++-
.../messaging-core-service-client-stub/pom.xml | 24 ++---
.../pom.xml | 14 ++-
.../sharing-core-service-client-stub/pom.xml | 14 ++-
.../pom.xml | 14 ++-
.../user-profile-core-service-client-stub/pom.xml | 10 +-
.../custos-core-services-server/Dockerfile | 2 +-
.../custos-core-services-server/pom.xml | 101 ++++++++++++--------
.../src/main/resources/application.properties | 22 ++++-
.../src/main/resources/bootstrap.properties | 1 +
.../agent-profile-core-service/pom.xml | 69 +++++++++++---
.../agent/profile/persistance/model/Agent.java | 4 +-
.../profile/persistance/model/AgentAttribute.java | 2 +-
.../agent/profile/persistance/model/AgentRole.java | 2 +-
.../cluster-management-core-service/pom.xml | 67 ++++++++++---
.../credential-store-core-service/pom.xml | 97 +++++++++++++++++--
.../persistance/model/AgentCredentialEntity.java | 2 +-
.../store/persistance/model/CredentialEntity.java | 2 +-
.../custos-core-services-commons/pom.xml | 46 +++++++--
.../commons/persistance/model/StatusEntity.java | 2 +-
.../custos-core-services/custos-logging/pom.xml | 60 +++++++++---
.../custos/logging/persistance/model/LogEvent.java | 2 +-
.../persistance/model/LoggingEnabledStatus.java | 2 +-
.../persistance/repository/LogEventRepoImpl.java | 6 +-
.../custos-messaging-core-service/pom.xml | 73 ++++++++++-----
.../events/model/MessageDeserializer.java | 1 +
.../persistance/model/EmailBodyParams.java | 2 +-
.../persistance/model/EmailReceivers.java | 2 +-
.../messaging/persistance/model/EmailTemplate.java | 2 +-
.../persistance/model/MessagingMetadata.java | 2 +-
.../federated-authentication-core-service/pom.xml | 62 +++++++++---
.../persistance/model/CILogonInstitution.java | 2 +-
.../iam-admin-core-service/pom.xml | 62 +++++++++---
.../identity-core-service/pom.xml | 52 ++++++++---
.../resource-secret-core-service/pom.xml | 98 +++++++++++++++++--
.../secret/persistance/local/model/Secret.java | 2 +-
.../sharing-core-service/pom.xml | 67 +++++++++----
.../tenant-profile-core-service/pom.xml | 76 ++++++++++++---
.../custos/tenant/profile/mapper/TenantMapper.java | 2 +-
.../tenant/profile/persistance/model/Contact.java | 2 +-
.../profile/persistance/model/RedirectURI.java | 2 +-
.../tenant/profile/persistance/model/Tenant.java | 2 +-
.../model/TenantAttributeUpdateMetadata.java | 2 +-
.../model/TenantStatusUpdateMetadata.java | 2 +-
.../respository/SearchTenantRepositoryImpl.java | 6 +-
.../validator/TenantProfileInputValidator.java | 12 +--
.../user-profile-core-service/pom.xml | 60 ++++++++----
.../persistance/model/AttributeUpdateMetadata.java | 2 +-
.../user/profile/persistance/model/Group.java | 2 +-
.../profile/persistance/model/GroupAttribute.java | 2 +-
.../user/profile/persistance/model/GroupRole.java | 2 +-
.../persistance/model/GroupToGroupMembership.java | 2 +-
.../persistance/model/StatusUpdateMetadata.java | 2 +-
.../profile/persistance/model/UserAttribute.java | 2 +-
.../persistance/model/UserGroupMembership.java | 2 +-
.../persistance/model/UserGroupMembershipType.java | 2 +-
.../profile/persistance/model/UserProfile.java | 2 +-
.../user/profile/persistance/model/UserRole.java | 2 +-
.../repository/SearchGroupsRepositoryImpl.java | 6 +-
.../custos-external-services-distributions/pom.xml | 3 +-
.../custos-federated-services-clients/pom.xml | 21 ++---
custos-services/custos-integration-core/pom.xml | 26 +++++-
.../custos-integration-services-server/Dockerfile | 2 +-
.../custos-integration-services-server/pom.xml | 104 +++++++++++++++++----
.../src/main/resources/application.properties | 15 ++-
.../agent-management-service/pom.xml | 46 ++++-----
.../custos-integration-services-commons/pom.xml | 30 ++++--
.../custos-integration-services-swagger/pom.xml | 34 +++----
.../group-management-service/pom.xml | 33 ++++---
.../identity-management-service/pom.xml | 41 ++++----
.../log-management-service/pom.xml | 52 +++++------
.../resource-secret-management-service/pom.xml | 48 ++++------
.../scim-service/pom.xml | 41 ++------
.../sharing-management-service/pom.xml | 49 +++++-----
.../tenant-management-service/pom.xml | 68 +++++---------
.../user-management-service/pom.xml | 48 ++++------
custos-services/pom.xml | 4 +-
custos-utilities/custos-bootstrap-service/pom.xml | 11 ++-
custos-utilities/ide-integration/Dockerfile | 5 +
custos-utilities/ide-integration/pom.xml | 50 ++++++----
.../ide-integration/src/main/containers/Dockerfile | 5 -
.../src/main/containers/docker-compose.yml | 2 +-
pom.xml | 72 ++++++++++++--
101 files changed, 1650 insertions(+), 711 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 565adc16c..6acf170bb 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
@@ -34,9 +34,23 @@
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-stub</artifactId>
+ </dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
diff --git a/custos-client-sdks/custos-java-clients/custos-clients-core/pom.xml b/custos-client-sdks/custos-java-clients/custos-clients-core/pom.xml
index e3a27ae38..5ad8a37d7 100644
--- a/custos-client-sdks/custos-java-clients/custos-clients-core/pom.xml
+++ b/custos-client-sdks/custos-java-clients/custos-clients-core/pom.xml
@@ -30,26 +30,10 @@
<artifactId>custos-clients-core</artifactId>
<dependencies>
- <dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-stub</artifactId>
- </dependency>
- <dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-protobuf</artifactId>
- </dependency>
- <dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-netty</artifactId>
- </dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
@@ -58,6 +42,12 @@
<dependency>
<groupId>io.github.lognet</groupId>
<artifactId>grpc-spring-boot-starter</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java-util</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
@@ -66,7 +56,14 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
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 3a1d670b9..92886cf1e 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
@@ -37,6 +37,16 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
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 39db1e18d..63baa7685 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
@@ -37,6 +37,16 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
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 c358703c0..33b86a9f5 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
@@ -34,9 +34,23 @@
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-stub</artifactId>
+ </dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
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 b4d517523..0e3639914 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
@@ -37,6 +37,16 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
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 4bb6d760c..544d986c4 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
@@ -37,6 +37,16 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
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 c154afa6e..7793ac420 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
@@ -34,9 +34,23 @@
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-stub</artifactId>
+ </dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
diff --git a/custos-core/pom.xml b/custos-core/pom.xml
index d1ae79056..3621df60f 100644
--- a/custos-core/pom.xml
+++ b/custos-core/pom.xml
@@ -36,8 +36,8 @@
</modules>
<properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
</properties>
</project>
\ No newline at end of file
diff --git a/custos-core/sharing-core-impl/pom.xml b/custos-core/sharing-core-impl/pom.xml
index acae2db1b..17db62bbd 100644
--- a/custos-core/sharing-core-impl/pom.xml
+++ b/custos-core/sharing-core-impl/pom.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <artifactId>custos-core-services</artifactId>
+ <artifactId>custos-core</artifactId>
<groupId>org.apache.custos</groupId>
<version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
@@ -13,32 +13,36 @@
<artifactId>sharing-core-impl</artifactId>
<properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>jakarta.persistence</groupId>
<artifactId>jakarta.persistence-api</artifactId>
<version>3.1.0</version>
</dependency>
-<!-- <dependency>-->
-<!-- <groupId>com.jcraft</groupId>-->
-<!-- <artifactId>jsch</artifactId>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>commons-io</groupId>-->
-<!-- <artifactId>commons-io</artifactId>-->
-<!-- </dependency>-->
</dependencies>
</project>
diff --git a/custos-core/sharing-core-impl/src/main/java/org/apache/custos/sharing/core/persistance/model/Sharing.java b/custos-core/sharing-core-impl/src/main/java/org/apache/custos/sharing/core/persistance/model/Sharing.java
index 24544fcbf..00196f5e4 100644
--- a/custos-core/sharing-core-impl/src/main/java/org/apache/custos/sharing/core/persistance/model/Sharing.java
+++ b/custos-core/sharing-core-impl/src/main/java/org/apache/custos/sharing/core/persistance/model/Sharing.java
@@ -47,7 +47,7 @@ import java.util.Date;
public class Sharing {
@Id
- @Column(length = 1000)
+ @Column
private String id;
@Column(nullable = false)
diff --git a/custos-rest-proxy/pom.xml b/custos-rest-proxy/pom.xml
new file mode 100644
index 000000000..4af91e582
--- /dev/null
+++ b/custos-rest-proxy/pom.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>custos</artifactId>
+ <groupId>org.apache.custos</groupId>
+ <version>1.1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>custos-rest-proxy</artifactId>
+
+ <properties>
+ <maven.compiler.source>11</maven.compiler.source>
+ <maven.compiler.target>11</maven.compiler.target>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <configuration>
+ <mainClass>org.apache.custos.ide.integration.CustosServer</mainClass>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>dockerfile-maven-plugin</artifactId>
+ <version>${docker.plugin.version}</version>
+ <executions>
+ <execution>
+ <id>container</id>
+ <goals>
+ <goal>build</goal>
+ <goal>push</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <noCache>true</noCache>
+ <serverId>docker.io</serverId>
+ <repository>${docker.image.prefix}/custos-rest-proxy</repository>
+ <tag>latest</tag>
+ <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
+ <buildArgs>
+ <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
+ </buildArgs>
+ <skip>false</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
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 1c39caeca..d068a796a 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
@@ -31,10 +31,10 @@
<artifactId>agent-profile-core-service-client-stub</artifactId>
<dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot-starter-web</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>io.grpc</groupId>
@@ -43,6 +43,12 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
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 f7f0653ec..25a399a64 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
@@ -31,18 +31,30 @@
<artifactId>cluster-management-core-service-client-stub</artifactId>
<dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot-starter-web</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>io.grpc</groupId>
- <artifactId>grpc-stub</artifactId>
+ <artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
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 c6e3f0e17..0d219fa4d 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
@@ -31,10 +31,10 @@
<artifactId>credential-store-core-service-client-stubs</artifactId>
<dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot-starter-web</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
@@ -42,6 +42,12 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
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 7548edc18..fdc9326d9 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
@@ -32,17 +32,43 @@
<artifactId>custos-logging-client-stub</artifactId>
<dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot-starter-web</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>io.grpc</groupId>
- <artifactId>grpc-stub</artifactId>
+ <artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java-util</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
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 75705a133..7dd749020 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
@@ -31,17 +31,29 @@
<artifactId>federated-authentication-core-service-client-stub</artifactId>
<dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot-starter-web</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>io.grpc</groupId>
- <artifactId>grpc-stub</artifactId>
+ <artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
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 08234f7aa..8b03ced31 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
@@ -31,10 +31,10 @@
<artifactId>iam-admin-core-service-client-stub</artifactId>
<dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot-starter-web</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
@@ -42,6 +42,12 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
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 d97508673..345c9b9d0 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
@@ -30,10 +30,10 @@
<artifactId>identity-core-service-client-stub</artifactId>
<dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot-starter-web</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
@@ -41,6 +41,12 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
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 5763b203b..5b4594965 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
@@ -32,15 +32,15 @@
<artifactId>messaging-core-service-client-stub</artifactId>
<properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
</properties>
<dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot-starter-web</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>io.grpc</groupId>
@@ -49,6 +49,12 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
@@ -63,12 +69,6 @@
<artifactId>custos-integration-core</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>5.2.0.RELEASE</version>
- <scope>compile</scope>
- </dependency>
</dependencies>
<build>
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 e423bc2af..89463a3f2 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
@@ -31,10 +31,10 @@
<artifactId>resource-secret-core-service-client-stub</artifactId>
<dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot-starter-web</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
@@ -42,6 +42,12 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
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 9eec9fa14..d6b1a0b63 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
@@ -32,10 +32,10 @@
<artifactId>sharing-core-service-client-stub</artifactId>
<dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot-starter-web</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>io.grpc</groupId>
@@ -44,6 +44,12 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
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 a24630e0e..789eedf95 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
@@ -32,10 +32,10 @@
<artifactId>tenant-profile-core-service-client-stub</artifactId>
<dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot-starter-web</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>io.grpc</groupId>
@@ -44,6 +44,12 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
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 beb62ef3e..4dfaf226d 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
@@ -31,10 +31,6 @@
<artifactId>user-profile-core-service-client-stub</artifactId>
<dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
<dependency>
<groupId>io.grpc</groupId>
@@ -43,6 +39,12 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
diff --git a/custos-services/custos-core-services-server/Dockerfile b/custos-services/custos-core-services-server/Dockerfile
index 190961820..70fb7e763 100644
--- a/custos-services/custos-core-services-server/Dockerfile
+++ b/custos-services/custos-core-services-server/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:11.0.5-jdk-slim
+FROM openjdk:17.0.2-slim
COPY src/main/resources/certificate.p12 /home/ubuntu/keystore/keycloak-client-truststore.pkcs12
VOLUME /tmp
ARG JAR_FILE
diff --git a/custos-services/custos-core-services-server/pom.xml b/custos-services/custos-core-services-server/pom.xml
index d03caad5d..8a15cd351 100644
--- a/custos-services/custos-core-services-server/pom.xml
+++ b/custos-services/custos-core-services-server/pom.xml
@@ -32,54 +32,54 @@
<artifactId>custos-core-services-server</artifactId>
<properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
</properties>
<dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>custos-core-services-commons</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
-
<dependency>
<groupId>io.github.lognet</groupId>
<artifactId>grpc-spring-boot-starter</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
- <dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-stub</artifactId>
- </dependency>
- <dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-protobuf</artifactId>
- </dependency>
- <dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-netty</artifactId>
- </dependency>
-
<dependency>
<groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-jpa</artifactId>
- </dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.custos</groupId>
@@ -95,6 +95,12 @@
<groupId>org.apache.custos</groupId>
<artifactId>cluster-management-core-service</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.custos</groupId>
@@ -110,11 +116,31 @@
<groupId>org.apache.custos</groupId>
<artifactId>custos-messaging-core-service</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.custos</groupId>
<artifactId>federeted-authentication-core-service</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.apache.custos</groupId>
@@ -147,12 +173,13 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot</artifactId>
- <version>2.2.0.RELEASE</version>
- <scope>compile</scope>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ <version>1.7.26</version>
</dependency>
+
+
</dependencies>
diff --git a/custos-services/custos-core-services-server/src/main/resources/application.properties b/custos-services/custos-core-services-server/src/main/resources/application.properties
index bcdf48251..bbe4724f5 100644
--- a/custos-services/custos-core-services-server/src/main/resources/application.properties
+++ b/custos-services/custos-core-services-server/src/main/resources/application.properties
@@ -25,12 +25,13 @@ spring.main.allow-bean-definition-overriding=true
## Hibernate Properties
# The SQL dialect makes Hibernate generate better SQL for the chosen database
-spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5InnoDBDialect
+spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL55Dialect
+spring.jpa.properties.hibernate.dialect.storage_engine=innodb
spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
# Hibernate ddl auto (create, create-drop, validate, update)
spring.jpa.hibernate.ddl-auto = update
#spring.profiles.active=@spring.profiles.active@
-logging.level.root=INFO
+#logging.level.root=INFO
ciLogon.admin.auth.endpoint=https://test.cilogon.org/oauth2/oidc-cm
@@ -38,8 +39,8 @@ ciLogon.admin.auth.endpoint=https://test.cilogon.org/oauth2/oidc-cm
spring.datasource.username = root
spring.datasource.password = root
-spring.datasource.url = jdbc:mysql://host.docker.internal:3306/core_services_db?allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=UTC&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true
-
+spring.datasource.url = jdbc:mysql://host.docker.internal:3306/core_services_db?useUnicode=yes&characterEncoding=UTF-8&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=UTC&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true
+#spring.datasource.url = jdbc:mysql://localhost:3306/core_services_db?allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=UTC&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true
spring.profiles.active=local
#Keycloak properties
@@ -47,7 +48,7 @@ iam.server.admin.username=admin
iam.server.admin.password=admin
iam.server.truststore.password=keycloak
iam.server.url=https://host.docker.internal/auth/
-
+#iam.server.url=https://localhost/auth/
mail.sender.password=test
enable.messaging.service=false
@@ -56,3 +57,14 @@ enable.messaging.service=false
ciLogon.admin.client.id=abc
ciLogon.admin.client.secret=1234
iam.server.truststore.path=/home/ubuntu/keystore/keycloak-client-truststore.pkcs12
+
+#iam.server.truststore.path=/Users/isururanawaka/Documents/Airavata_Repository/airavata-custos/custos-services/custos-core-services-server/src/main/resources/certificate.p12
+
+
+spring.cloud.vault.token=00000000-0000-0000-0000-000000000000
+spring.cloud.vault.scheme=http
+spring.cloud.vault.host=host.docker.internal
+spring.cloud.vault.port=8200
+#spring.cloud.vault.uri=http://localhost:8201
+spring.cloud.vault.uri=http://host.docker.internal:8201
+spring.cloud.vault.authentication=token
diff --git a/custos-services/custos-core-services-server/src/main/resources/bootstrap.properties b/custos-services/custos-core-services-server/src/main/resources/bootstrap.properties
index 1f3b360b7..b79883f32 100644
--- a/custos-services/custos-core-services-server/src/main/resources/bootstrap.properties
+++ b/custos-services/custos-core-services-server/src/main/resources/bootstrap.properties
@@ -21,6 +21,7 @@ spring.cloud.vault.scheme=http
spring.cloud.vault.host=localhost
spring.cloud.vault.port=8200
spring.cloud.vault.uri=http://host.docker.internal:8201
+#spring.cloud.vault.uri=http://localhost:8201
spring.cloud.vault.authentication=token
#spring.cloud.vault.ssl.trust-store=file:home/ubuntu/vault-client-truststore.pkcs12
#spring.cloud.vault.ssl.trust-store-password=vaultpass
\ No newline at end of file
diff --git a/custos-services/custos-core-services/agent-profile-core-service/pom.xml b/custos-services/custos-core-services/agent-profile-core-service/pom.xml
index a4ca6c652..e1a253e9e 100644
--- a/custos-services/custos-core-services/agent-profile-core-service/pom.xml
+++ b/custos-services/custos-core-services/agent-profile-core-service/pom.xml
@@ -33,14 +33,14 @@
<dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot-starter-web</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot-starter-actuator</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>custos-core-services-commons</artifactId>
@@ -52,6 +52,20 @@
<dependency>
<groupId>io.github.lognet</groupId>
<artifactId>grpc-spring-boot-starter</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
@@ -60,27 +74,52 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
</dependency>
-
-
-
-
-
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java-util</artifactId>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>javax.persistence</groupId>-->
+<!-- <artifactId>persistence-api</artifactId>-->
+<!-- </dependency>-->
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
</dependency>
</dependencies>
diff --git a/custos-services/custos-core-services/agent-profile-core-service/src/main/java/org/apache/custos/agent/profile/persistance/model/Agent.java b/custos-services/custos-core-services/agent-profile-core-service/src/main/java/org/apache/custos/agent/profile/persistance/model/Agent.java
index 3d27ecac8..dd3bb56d8 100644
--- a/custos-services/custos-core-services/agent-profile-core-service/src/main/java/org/apache/custos/agent/profile/persistance/model/Agent.java
+++ b/custos-services/custos-core-services/agent-profile-core-service/src/main/java/org/apache/custos/agent/profile/persistance/model/Agent.java
@@ -23,14 +23,14 @@ import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.util.Date;
import java.util.Set;
/**
* Agent entity
*/
-@Entity
+@jakarta.persistence.Entity
@Table(name = "agent_entity")
@EntityListeners(AuditingEntityListener.class)
public class Agent {
diff --git a/custos-services/custos-core-services/agent-profile-core-service/src/main/java/org/apache/custos/agent/profile/persistance/model/AgentAttribute.java b/custos-services/custos-core-services/agent-profile-core-service/src/main/java/org/apache/custos/agent/profile/persistance/model/AgentAttribute.java
index c209a5adc..f1b526dda 100644
--- a/custos-services/custos-core-services/agent-profile-core-service/src/main/java/org/apache/custos/agent/profile/persistance/model/AgentAttribute.java
+++ b/custos-services/custos-core-services/agent-profile-core-service/src/main/java/org/apache/custos/agent/profile/persistance/model/AgentAttribute.java
@@ -19,7 +19,7 @@
package org.apache.custos.agent.profile.persistance.model;
-import javax.persistence.*;
+import jakarta.persistence.*;
@Entity
@Table(name = "agent_attribute")
diff --git a/custos-services/custos-core-services/agent-profile-core-service/src/main/java/org/apache/custos/agent/profile/persistance/model/AgentRole.java b/custos-services/custos-core-services/agent-profile-core-service/src/main/java/org/apache/custos/agent/profile/persistance/model/AgentRole.java
index 9b0943ab1..e8a429c87 100644
--- a/custos-services/custos-core-services/agent-profile-core-service/src/main/java/org/apache/custos/agent/profile/persistance/model/AgentRole.java
+++ b/custos-services/custos-core-services/agent-profile-core-service/src/main/java/org/apache/custos/agent/profile/persistance/model/AgentRole.java
@@ -19,7 +19,7 @@
package org.apache.custos.agent.profile.persistance.model;
-import javax.persistence.*;
+import jakarta.persistence.*;
@Entity
@Table(name = "agent_role")
diff --git a/custos-services/custos-core-services/cluster-management-core-service/pom.xml b/custos-services/custos-core-services/cluster-management-core-service/pom.xml
index 7f5f2008a..123d1310b 100644
--- a/custos-services/custos-core-services/cluster-management-core-service/pom.xml
+++ b/custos-services/custos-core-services/cluster-management-core-service/pom.xml
@@ -32,14 +32,14 @@
<artifactId>cluster-management-core-service</artifactId>
<dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot-starter-web</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot-starter-actuator</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>custos-core-services-commons</artifactId>
@@ -49,6 +49,16 @@
<dependency>
<groupId>io.github.lognet</groupId>
<artifactId>grpc-spring-boot-starter</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
@@ -57,23 +67,44 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
</dependency>
-
-
-
-
-
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javax.persistence</groupId>
@@ -82,6 +113,16 @@
<dependency>
<groupId>io.kubernetes</groupId>
<artifactId>client-java</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java-util</artifactId>
</dependency>
</dependencies>
diff --git a/custos-services/custos-core-services/credential-store-core-service/pom.xml b/custos-services/custos-core-services/credential-store-core-service/pom.xml
index c93fe8a1d..c008bba84 100644
--- a/custos-services/custos-core-services/credential-store-core-service/pom.xml
+++ b/custos-services/custos-core-services/credential-store-core-service/pom.xml
@@ -36,23 +36,52 @@
<artifactId>custos-core-services-commons</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot-starter-web</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot-starter-actuator</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-vault-config</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-cloud-starter</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.github.lognet</groupId>
<artifactId>grpc-spring-boot-starter</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java-util</artifactId>
+ </exclusion>
+
+ </exclusions>
</dependency>
<dependency>
@@ -62,6 +91,16 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
@@ -70,15 +109,53 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java-util</artifactId>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>javax.persistence</groupId>-->
+<!-- <artifactId>persistence-api</artifactId>-->
+<!-- </dependency>-->
</dependencies>
<build>
diff --git a/custos-services/custos-core-services/credential-store-core-service/src/main/java/org/apache/custos/credential/store/persistance/model/AgentCredentialEntity.java b/custos-services/custos-core-services/credential-store-core-service/src/main/java/org/apache/custos/credential/store/persistance/model/AgentCredentialEntity.java
index 4891bf921..792c46aa8 100644
--- a/custos-services/custos-core-services/credential-store-core-service/src/main/java/org/apache/custos/credential/store/persistance/model/AgentCredentialEntity.java
+++ b/custos-services/custos-core-services/credential-store-core-service/src/main/java/org/apache/custos/credential/store/persistance/model/AgentCredentialEntity.java
@@ -22,7 +22,7 @@ package org.apache.custos.credential.store.persistance.model;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.util.Date;
@Entity
diff --git a/custos-services/custos-core-services/credential-store-core-service/src/main/java/org/apache/custos/credential/store/persistance/model/CredentialEntity.java b/custos-services/custos-core-services/credential-store-core-service/src/main/java/org/apache/custos/credential/store/persistance/model/CredentialEntity.java
index c0dd89182..148637bdd 100644
--- a/custos-services/custos-core-services/credential-store-core-service/src/main/java/org/apache/custos/credential/store/persistance/model/CredentialEntity.java
+++ b/custos-services/custos-core-services/credential-store-core-service/src/main/java/org/apache/custos/credential/store/persistance/model/CredentialEntity.java
@@ -22,7 +22,7 @@ package org.apache.custos.credential.store.persistance.model;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.util.Date;
import java.util.Set;
diff --git a/custos-services/custos-core-services/custos-core-services-commons/pom.xml b/custos-services/custos-core-services/custos-core-services-commons/pom.xml
index 6c335f484..4e10ae6f8 100644
--- a/custos-services/custos-core-services/custos-core-services-commons/pom.xml
+++ b/custos-services/custos-core-services/custos-core-services-commons/pom.xml
@@ -31,10 +31,6 @@
<artifactId>custos-core-services-commons</artifactId>
<dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
@@ -43,19 +39,39 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>javax.persistence</groupId>-->
+<!-- <artifactId>persistence-api</artifactId>-->
+<!-- </dependency>-->
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- </dependency>
- <dependency>
- <groupId>io.github.lognet</groupId>
- <artifactId>grpc-spring-boot-starter</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>io.github.lognet</groupId>-->
+<!-- <artifactId>grpc-spring-boot-starter</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
@@ -63,6 +79,16 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
diff --git a/custos-services/custos-core-services/custos-core-services-commons/src/main/java/org/apache/custos/core/services/api/commons/persistance/model/StatusEntity.java b/custos-services/custos-core-services/custos-core-services-commons/src/main/java/org/apache/custos/core/services/api/commons/persistance/model/StatusEntity.java
index b85433793..d9ce3c857 100644
--- a/custos-services/custos-core-services/custos-core-services-commons/src/main/java/org/apache/custos/core/services/api/commons/persistance/model/StatusEntity.java
+++ b/custos-services/custos-core-services/custos-core-services-commons/src/main/java/org/apache/custos/core/services/api/commons/persistance/model/StatusEntity.java
@@ -22,7 +22,7 @@ package org.apache.custos.core.services.api.commons.persistance.model;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.util.Date;
/**
diff --git a/custos-services/custos-core-services/custos-logging/pom.xml b/custos-services/custos-core-services/custos-logging/pom.xml
index 7782740fc..4bb435235 100644
--- a/custos-services/custos-core-services/custos-logging/pom.xml
+++ b/custos-services/custos-core-services/custos-logging/pom.xml
@@ -36,22 +36,28 @@
<artifactId>custos-core-services-commons</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-config</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot-starter-web</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot-starter-actuator</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.cloud</groupId>-->
+<!-- <artifactId>spring-cloud-starter-config</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>io.github.lognet</groupId>
<artifactId>grpc-spring-boot-starter</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java-util</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -61,6 +67,12 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
@@ -76,14 +88,34 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>javax.persistence</groupId>-->
+<!-- <artifactId>persistence-api</artifactId>-->
+<!-- </dependency>-->
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
</dependency>
</dependencies>
diff --git a/custos-services/custos-core-services/custos-logging/src/main/java/org/apache/custos/logging/persistance/model/LogEvent.java b/custos-services/custos-core-services/custos-logging/src/main/java/org/apache/custos/logging/persistance/model/LogEvent.java
index b5bcae7c5..09f4b09cb 100644
--- a/custos-services/custos-core-services/custos-logging/src/main/java/org/apache/custos/logging/persistance/model/LogEvent.java
+++ b/custos-services/custos-core-services/custos-logging/src/main/java/org/apache/custos/logging/persistance/model/LogEvent.java
@@ -22,7 +22,7 @@ package org.apache.custos.logging.persistance.model;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-import javax.persistence.*;
+import jakarta.persistence.*;
/**
* Represents Log event
diff --git a/custos-services/custos-core-services/custos-logging/src/main/java/org/apache/custos/logging/persistance/model/LoggingEnabledStatus.java b/custos-services/custos-core-services/custos-logging/src/main/java/org/apache/custos/logging/persistance/model/LoggingEnabledStatus.java
index 5ace2d480..9ffcf0fb2 100644
--- a/custos-services/custos-core-services/custos-logging/src/main/java/org/apache/custos/logging/persistance/model/LoggingEnabledStatus.java
+++ b/custos-services/custos-core-services/custos-logging/src/main/java/org/apache/custos/logging/persistance/model/LoggingEnabledStatus.java
@@ -22,7 +22,7 @@ package org.apache.custos.logging.persistance.model;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-import javax.persistence.*;
+import jakarta.persistence.*;
/**
* Represents Logging enabled status for tenant
diff --git a/custos-services/custos-core-services/custos-logging/src/main/java/org/apache/custos/logging/persistance/repository/LogEventRepoImpl.java b/custos-services/custos-core-services/custos-logging/src/main/java/org/apache/custos/logging/persistance/repository/LogEventRepoImpl.java
index 2ddeff779..d7673f300 100644
--- a/custos-services/custos-core-services/custos-logging/src/main/java/org/apache/custos/logging/persistance/repository/LogEventRepoImpl.java
+++ b/custos-services/custos-core-services/custos-logging/src/main/java/org/apache/custos/logging/persistance/repository/LogEventRepoImpl.java
@@ -25,9 +25,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Repository;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
diff --git a/custos-services/custos-core-services/custos-messaging-core-service/pom.xml b/custos-services/custos-core-services/custos-messaging-core-service/pom.xml
index f22089e43..73e6b4136 100644
--- a/custos-services/custos-core-services/custos-messaging-core-service/pom.xml
+++ b/custos-services/custos-core-services/custos-messaging-core-service/pom.xml
@@ -32,8 +32,8 @@
<artifactId>custos-messaging-core-service</artifactId>
<properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
</properties>
<dependencies>
@@ -42,18 +42,18 @@
<artifactId>custos-core-services-commons</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-config</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot-starter-web</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot-starter-actuator</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.cloud</groupId>-->
+<!-- <artifactId>spring-cloud-starter-config</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>io.github.lognet</groupId>
@@ -67,6 +67,16 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
@@ -82,14 +92,34 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>javax.persistence</groupId>-->
+<!-- <artifactId>persistence-api</artifactId>-->
+<!-- </dependency>-->
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
</dependency>
<dependency>
@@ -102,17 +132,14 @@
<artifactId>user-profile-core-service-client-stub</artifactId>
<version>${project.version}</version>
</dependency>
-
- <dependency>
- <groupId>org.springframework.data</groupId>
- <artifactId>spring-data-jpa</artifactId>
- <version>2.2.0.RELEASE</version>
- <scope>compile</scope>
- </dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java-util</artifactId>
+ </dependency>
</dependencies>
diff --git a/custos-services/custos-core-services/custos-messaging-core-service/src/main/java/org/apache/custos/messaging/events/model/MessageDeserializer.java b/custos-services/custos-core-services/custos-messaging-core-service/src/main/java/org/apache/custos/messaging/events/model/MessageDeserializer.java
index 39741466b..862673447 100644
--- a/custos-services/custos-core-services/custos-messaging-core-service/src/main/java/org/apache/custos/messaging/events/model/MessageDeserializer.java
+++ b/custos-services/custos-core-services/custos-messaging-core-service/src/main/java/org/apache/custos/messaging/events/model/MessageDeserializer.java
@@ -19,6 +19,7 @@
package org.apache.custos.messaging.events.model;
+
import com.google.protobuf.util.JsonFormat;
import org.apache.custos.messaging.service.Message;
import org.apache.kafka.common.serialization.Deserializer;
diff --git a/custos-services/custos-core-services/custos-messaging-core-service/src/main/java/org/apache/custos/messaging/persistance/model/EmailBodyParams.java b/custos-services/custos-core-services/custos-messaging-core-service/src/main/java/org/apache/custos/messaging/persistance/model/EmailBodyParams.java
index 1cb8d7743..2e34d35f5 100644
--- a/custos-services/custos-core-services/custos-messaging-core-service/src/main/java/org/apache/custos/messaging/persistance/model/EmailBodyParams.java
+++ b/custos-services/custos-core-services/custos-messaging-core-service/src/main/java/org/apache/custos/messaging/persistance/model/EmailBodyParams.java
@@ -21,7 +21,7 @@ package org.apache.custos.messaging.persistance.model;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-import javax.persistence.*;
+import jakarta.persistence.*;
/**
* Represents Email Template
diff --git a/custos-services/custos-core-services/custos-messaging-core-service/src/main/java/org/apache/custos/messaging/persistance/model/EmailReceivers.java b/custos-services/custos-core-services/custos-messaging-core-service/src/main/java/org/apache/custos/messaging/persistance/model/EmailReceivers.java
index 9d7a1b95e..650dce5c9 100644
--- a/custos-services/custos-core-services/custos-messaging-core-service/src/main/java/org/apache/custos/messaging/persistance/model/EmailReceivers.java
+++ b/custos-services/custos-core-services/custos-messaging-core-service/src/main/java/org/apache/custos/messaging/persistance/model/EmailReceivers.java
@@ -21,7 +21,7 @@ package org.apache.custos.messaging.persistance.model;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-import javax.persistence.*;
+import jakarta.persistence.*;
@Entity
@Table(name = "email_receivers")
diff --git a/custos-services/custos-core-services/custos-messaging-core-service/src/main/java/org/apache/custos/messaging/persistance/model/EmailTemplate.java b/custos-services/custos-core-services/custos-messaging-core-service/src/main/java/org/apache/custos/messaging/persistance/model/EmailTemplate.java
index aa5528b8b..5a4e6d1db 100644
--- a/custos-services/custos-core-services/custos-messaging-core-service/src/main/java/org/apache/custos/messaging/persistance/model/EmailTemplate.java
+++ b/custos-services/custos-core-services/custos-messaging-core-service/src/main/java/org/apache/custos/messaging/persistance/model/EmailTemplate.java
@@ -23,7 +23,7 @@ import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.util.Date;
import java.util.Set;
diff --git a/custos-services/custos-core-services/custos-messaging-core-service/src/main/java/org/apache/custos/messaging/persistance/model/MessagingMetadata.java b/custos-services/custos-core-services/custos-messaging-core-service/src/main/java/org/apache/custos/messaging/persistance/model/MessagingMetadata.java
index b2aa0f576..2d8db3c2f 100644
--- a/custos-services/custos-core-services/custos-messaging-core-service/src/main/java/org/apache/custos/messaging/persistance/model/MessagingMetadata.java
+++ b/custos-services/custos-core-services/custos-messaging-core-service/src/main/java/org/apache/custos/messaging/persistance/model/MessagingMetadata.java
@@ -23,7 +23,7 @@ package org.apache.custos.messaging.persistance.model;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.util.Date;
/**
diff --git a/custos-services/custos-core-services/federated-authentication-core-service/pom.xml b/custos-services/custos-core-services/federated-authentication-core-service/pom.xml
index 5a502fa51..4217e9e28 100644
--- a/custos-services/custos-core-services/federated-authentication-core-service/pom.xml
+++ b/custos-services/custos-core-services/federated-authentication-core-service/pom.xml
@@ -36,18 +36,18 @@
<artifactId>custos-core-services-commons</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-config</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot-starter-web</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.cloud</groupId>-->
+<!-- <artifactId>spring-cloud-starter-config</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot-starter-actuator</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>org.apache.custos</groupId>
<artifactId>custos-federated-services-clients</artifactId>
@@ -66,6 +66,16 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
@@ -81,14 +91,38 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java-util</artifactId>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>javax.persistence</groupId>-->
+<!-- <artifactId>persistence-api</artifactId>-->
+<!-- </dependency>-->
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
</dependency>
</dependencies>
diff --git a/custos-services/custos-core-services/federated-authentication-core-service/src/main/java/org/apache/custos/federated/authentication/persistance/model/CILogonInstitution.java b/custos-services/custos-core-services/federated-authentication-core-service/src/main/java/org/apache/custos/federated/authentication/persistance/model/CILogonInstitution.java
index fe77b9557..bb4d4d2d3 100644
--- a/custos-services/custos-core-services/federated-authentication-core-service/src/main/java/org/apache/custos/federated/authentication/persistance/model/CILogonInstitution.java
+++ b/custos-services/custos-core-services/federated-authentication-core-service/src/main/java/org/apache/custos/federated/authentication/persistance/model/CILogonInstitution.java
@@ -23,7 +23,7 @@ import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.util.Date;
/**
diff --git a/custos-services/custos-core-services/iam-admin-core-service/pom.xml b/custos-services/custos-core-services/iam-admin-core-service/pom.xml
index 0d94e381b..b144bb119 100644
--- a/custos-services/custos-core-services/iam-admin-core-service/pom.xml
+++ b/custos-services/custos-core-services/iam-admin-core-service/pom.xml
@@ -42,18 +42,18 @@
<artifactId>custos-federated-services-clients</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-config</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot-starter-web</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot-starter-actuator</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.cloud</groupId>-->
+<!-- <artifactId>spring-cloud-starter-config</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>io.github.lognet</groupId>
@@ -67,6 +67,16 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
@@ -75,14 +85,38 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java-util</artifactId>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>javax.persistence</groupId>-->
+<!-- <artifactId>persistence-api</artifactId>-->
+<!-- </dependency>-->
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
</dependency>
</dependencies>
diff --git a/custos-services/custos-core-services/identity-core-service/pom.xml b/custos-services/custos-core-services/identity-core-service/pom.xml
index d950c2f05..548cda8e7 100644
--- a/custos-services/custos-core-services/identity-core-service/pom.xml
+++ b/custos-services/custos-core-services/identity-core-service/pom.xml
@@ -41,18 +41,18 @@
<artifactId>custos-federated-services-clients</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-config</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot-starter-web</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot-starter-actuator</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.cloud</groupId>-->
+<!-- <artifactId>spring-cloud-starter-config</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>io.github.lognet</groupId>
@@ -66,6 +66,16 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
@@ -82,14 +92,28 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>javax.persistence</groupId>-->
+<!-- <artifactId>persistence-api</artifactId>-->
+<!-- </dependency>-->
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
</dependency>
</dependencies>
diff --git a/custos-services/custos-core-services/resource-secret-core-service/pom.xml b/custos-services/custos-core-services/resource-secret-core-service/pom.xml
index 5f712dccf..3b989143b 100644
--- a/custos-services/custos-core-services/resource-secret-core-service/pom.xml
+++ b/custos-services/custos-core-services/resource-secret-core-service/pom.xml
@@ -37,21 +37,69 @@
<artifactId>custos-core-services-commons</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot-starter-web</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot-starter-actuator</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-vault-config</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.github.lognet</groupId>
<artifactId>grpc-spring-boot-starter</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java-util</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java-util</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
@@ -62,6 +110,16 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
@@ -71,14 +129,34 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>javax.persistence</groupId>-->
+<!-- <artifactId>persistence-api</artifactId>-->
+<!-- </dependency>-->
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
diff --git a/custos-services/custos-core-services/resource-secret-core-service/src/main/java/org/apache/custos/resource/secret/persistance/local/model/Secret.java b/custos-services/custos-core-services/resource-secret-core-service/src/main/java/org/apache/custos/resource/secret/persistance/local/model/Secret.java
index 50a4e04a0..e4a7fe056 100644
--- a/custos-services/custos-core-services/resource-secret-core-service/src/main/java/org/apache/custos/resource/secret/persistance/local/model/Secret.java
+++ b/custos-services/custos-core-services/resource-secret-core-service/src/main/java/org/apache/custos/resource/secret/persistance/local/model/Secret.java
@@ -23,7 +23,7 @@ import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.util.Date;
@Entity
diff --git a/custos-services/custos-core-services/sharing-core-service/pom.xml b/custos-services/custos-core-services/sharing-core-service/pom.xml
index 6f17ee284..509eee497 100644
--- a/custos-services/custos-core-services/sharing-core-service/pom.xml
+++ b/custos-services/custos-core-services/sharing-core-service/pom.xml
@@ -37,18 +37,24 @@
<artifactId>custos-core-services-commons</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot-starter-web</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot-starter-actuator</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>io.github.lognet</groupId>
<artifactId>grpc-spring-boot-starter</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java-util</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -58,6 +64,16 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
@@ -67,14 +83,38 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java-util</artifactId>
+ </dependency>
+<!-- <dependency>-->
+<!-- <groupId>javax.persistence</groupId>-->
+<!-- <artifactId>persistence-api</artifactId>-->
+<!-- </dependency>-->
+ <dependency>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
@@ -89,12 +129,7 @@
<artifactId>sharing-core-impl</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.custos</groupId>
- <artifactId>sharing-core-impl</artifactId>
- <version>1.1-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
+
</dependencies>
diff --git a/custos-services/custos-core-services/tenant-profile-core-service/pom.xml b/custos-services/custos-core-services/tenant-profile-core-service/pom.xml
index aed3c8643..e5cb2f4fb 100644
--- a/custos-services/custos-core-services/tenant-profile-core-service/pom.xml
+++ b/custos-services/custos-core-services/tenant-profile-core-service/pom.xml
@@ -33,14 +33,14 @@
<dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot-starter-web</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot-starter-actuator</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>custos-core-services-commons</artifactId>
@@ -52,14 +52,44 @@
<dependency>
<groupId>io.github.lognet</groupId>
<artifactId>grpc-spring-boot-starter</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java-util</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
@@ -67,19 +97,41 @@
</dependency>
-
-
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java-util</artifactId>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>javax.persistence</groupId>-->
+<!-- <artifactId>persistence-api</artifactId>-->
+<!-- </dependency>-->
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
</dependency>
diff --git a/custos-services/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/mapper/TenantMapper.java b/custos-services/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/mapper/TenantMapper.java
index a3b541c08..f43f5cb23 100644
--- a/custos-services/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/mapper/TenantMapper.java
+++ b/custos-services/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/mapper/TenantMapper.java
@@ -61,7 +61,7 @@ public class TenantMapper {
tenantEntity.setUri(tenant.getClientUri());
tenantEntity.setParentId(tenant.getParentTenantId());
tenantEntity.setApplicationType(tenant.getApplicationType());
- tenantEntity.setJwks(tenant.getJwksCount() > 0 ? getJWKSAsString(tenant.getJwksMap()) : null);
+// tenantEntity.setJwks(tenant.getJwksCount() > 0 ? getJWKSAsString(tenant.getJwksMap()) : null);
tenantEntity.setJwksUri(tenant.getJwksUri());
tenantEntity.setExample_extension_parameter(tenant.getExampleExtensionParameter());
tenantEntity.setTosUri(tenant.getTosUri());
diff --git a/custos-services/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/persistance/model/Contact.java b/custos-services/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/persistance/model/Contact.java
index 36517987b..7c9eedf3c 100644
--- a/custos-services/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/persistance/model/Contact.java
+++ b/custos-services/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/persistance/model/Contact.java
@@ -19,7 +19,7 @@
package org.apache.custos.tenant.profile.persistance.model;
-import javax.persistence.*;
+import jakarta.persistence.*;
/**
* This class represents the contact information of Tenant
diff --git a/custos-services/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/persistance/model/RedirectURI.java b/custos-services/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/persistance/model/RedirectURI.java
index ba7b762a2..780dcfadd 100644
--- a/custos-services/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/persistance/model/RedirectURI.java
+++ b/custos-services/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/persistance/model/RedirectURI.java
@@ -19,7 +19,7 @@
package org.apache.custos.tenant.profile.persistance.model;
-import javax.persistence.*;
+import jakarta.persistence.*;
/**
* This represents the redirectURIs of a tenants
diff --git a/custos-services/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/persistance/model/Tenant.java b/custos-services/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/persistance/model/Tenant.java
index 04497836b..3f50467fa 100644
--- a/custos-services/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/persistance/model/Tenant.java
+++ b/custos-services/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/persistance/model/Tenant.java
@@ -23,7 +23,7 @@ package org.apache.custos.tenant.profile.persistance.model;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.util.Date;
import java.util.Set;
diff --git a/custos-services/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/persistance/model/TenantAttributeUpdateMetadata.java b/custos-services/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/persistance/model/TenantAttributeUpdateMetadata.java
index a91c35ca8..426985265 100644
--- a/custos-services/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/persistance/model/TenantAttributeUpdateMetadata.java
+++ b/custos-services/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/persistance/model/TenantAttributeUpdateMetadata.java
@@ -22,7 +22,7 @@ package org.apache.custos.tenant.profile.persistance.model;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.util.Date;
/**
diff --git a/custos-services/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/persistance/model/TenantStatusUpdateMetadata.java b/custos-services/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/persistance/model/TenantStatusUpdateMetadata.java
index 89ec88551..4737d8660 100644
--- a/custos-services/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/persistance/model/TenantStatusUpdateMetadata.java
+++ b/custos-services/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/persistance/model/TenantStatusUpdateMetadata.java
@@ -22,7 +22,7 @@ package org.apache.custos.tenant.profile.persistance.model;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.util.Date;
/**
diff --git a/custos-services/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/persistance/respository/SearchTenantRepositoryImpl.java b/custos-services/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/persistance/respository/SearchTenantRepositoryImpl.java
index 735bf52ab..07c9e1dd2 100644
--- a/custos-services/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/persistance/respository/SearchTenantRepositoryImpl.java
+++ b/custos-services/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/persistance/respository/SearchTenantRepositoryImpl.java
@@ -25,9 +25,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Repository;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
diff --git a/custos-services/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/validator/TenantProfileInputValidator.java b/custos-services/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/validator/TenantProfileInputValidator.java
index 3b876d1dd..a581d1159 100644
--- a/custos-services/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/validator/TenantProfileInputValidator.java
+++ b/custos-services/custos-core-services/tenant-profile-core-service/src/main/java/org/apache/custos/tenant/profile/validator/TenantProfileInputValidator.java
@@ -110,9 +110,9 @@ public class TenantProfileInputValidator implements Validator {
throw new MissingParameterException("Redirect uris cannot be should not be null", null);
}
- if (tenant.getJwksCount() > 0 && (tenant.getJwksUri() != null && !tenant.getJwksUri().trim().equals(""))) {
- throw new RuntimeException("jwks and jwks both should not be present in a single request", null);
- }
+// if (tenant.getJwksCount() > 0 && (tenant.getJwksUri() != null && !tenant.getJwksUri().trim().equals(""))) {
+// throw new RuntimeException("jwks and jwks both should not be present in a single request", null);
+// }
} else {
@@ -166,9 +166,9 @@ public class TenantProfileInputValidator implements Validator {
throw new MissingParameterException("Redirect uris cannot be should not be null", null);
}
- if (tenant.getJwksCount() > 0 && (tenant.getJwksUri() != null && !tenant.getJwksUri().trim().equals(""))) {
- throw new RuntimeException("jwks and jwks both should not be present in a single request", null);
- }
+// if (tenant.getJwksCount() > 0 && (tenant.getJwksUri() != null && !tenant.getJwksUri().trim().equals(""))) {
+// throw new RuntimeException("jwks and jwks both should not be present in a single request", null);
+// }
} else {
throw new RuntimeException("Unexpected input type for method updateTenant");
diff --git a/custos-services/custos-core-services/user-profile-core-service/pom.xml b/custos-services/custos-core-services/user-profile-core-service/pom.xml
index 87cc1a412..c2d8f48d5 100644
--- a/custos-services/custos-core-services/user-profile-core-service/pom.xml
+++ b/custos-services/custos-core-services/user-profile-core-service/pom.xml
@@ -31,15 +31,6 @@
<artifactId>user-profile-core-service</artifactId>
<dependencies>
-
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>custos-core-services-commons</artifactId>
@@ -51,6 +42,12 @@
<dependency>
<groupId>io.github.lognet</groupId>
<artifactId>grpc-spring-boot-starter</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java-util</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
@@ -59,30 +56,57 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
</dependency>
-
-
-
-
-
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java-util</artifactId>
</dependency>
-
-
</dependencies>
diff --git a/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/AttributeUpdateMetadata.java b/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/AttributeUpdateMetadata.java
index ed1a8295a..c15c44bae 100644
--- a/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/AttributeUpdateMetadata.java
+++ b/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/AttributeUpdateMetadata.java
@@ -22,7 +22,7 @@ package org.apache.custos.user.profile.persistance.model;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.util.Date;
/**
diff --git a/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/Group.java b/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/Group.java
index c8f296120..3c384dcad 100644
--- a/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/Group.java
+++ b/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/Group.java
@@ -23,7 +23,7 @@ import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.util.Date;
import java.util.Set;
diff --git a/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/GroupAttribute.java b/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/GroupAttribute.java
index bb7292078..f4dbf144b 100644
--- a/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/GroupAttribute.java
+++ b/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/GroupAttribute.java
@@ -19,7 +19,7 @@
package org.apache.custos.user.profile.persistance.model;
-import javax.persistence.*;
+import jakarta.persistence.*;
/**
* Group attribute
diff --git a/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/GroupRole.java b/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/GroupRole.java
index 895cb4af5..12d4d426e 100644
--- a/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/GroupRole.java
+++ b/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/GroupRole.java
@@ -19,7 +19,7 @@
package org.apache.custos.user.profile.persistance.model;
-import javax.persistence.*;
+import jakarta.persistence.*;
/**
* Group roles
diff --git a/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/GroupToGroupMembership.java b/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/GroupToGroupMembership.java
index ffddc4b5f..c39922988 100644
--- a/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/GroupToGroupMembership.java
+++ b/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/GroupToGroupMembership.java
@@ -23,7 +23,7 @@ import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-import javax.persistence.*;
+import jakarta.persistence.*;
import javax.validation.constraints.NotNull;
import java.util.Date;
diff --git a/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/StatusUpdateMetadata.java b/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/StatusUpdateMetadata.java
index 45dcc1350..eca4f37ca 100644
--- a/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/StatusUpdateMetadata.java
+++ b/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/StatusUpdateMetadata.java
@@ -22,7 +22,7 @@ package org.apache.custos.user.profile.persistance.model;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.util.Date;
/**
diff --git a/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/UserAttribute.java b/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/UserAttribute.java
index 4ea49b823..f7ce64036 100644
--- a/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/UserAttribute.java
+++ b/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/UserAttribute.java
@@ -19,7 +19,7 @@
package org.apache.custos.user.profile.persistance.model;
-import javax.persistence.*;
+import jakarta.persistence.*;
@Entity
@Table(name = "user_attribute")
diff --git a/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/UserGroupMembership.java b/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/UserGroupMembership.java
index 4a6c36bb5..27d8539aa 100644
--- a/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/UserGroupMembership.java
+++ b/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/UserGroupMembership.java
@@ -23,7 +23,7 @@ import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.util.Date;
@Entity
diff --git a/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/UserGroupMembershipType.java b/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/UserGroupMembershipType.java
index 15826a4d5..c96e30a63 100644
--- a/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/UserGroupMembershipType.java
+++ b/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/UserGroupMembershipType.java
@@ -23,7 +23,7 @@ import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.util.Date;
import java.util.Set;
diff --git a/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/UserProfile.java b/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/UserProfile.java
index 0699c933e..81cc73d9f 100644
--- a/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/UserProfile.java
+++ b/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/UserProfile.java
@@ -23,7 +23,7 @@ import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.util.Date;
import java.util.Set;
diff --git a/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/UserRole.java b/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/UserRole.java
index 5daaf070c..4992a9be8 100644
--- a/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/UserRole.java
+++ b/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/model/UserRole.java
@@ -19,7 +19,7 @@
package org.apache.custos.user.profile.persistance.model;
-import javax.persistence.*;
+import jakarta.persistence.*;
@Entity
@Table(name = "user_role")
diff --git a/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/repository/SearchGroupsRepositoryImpl.java b/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/repository/SearchGroupsRepositoryImpl.java
index 21afa302e..94f99e6df 100644
--- a/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/repository/SearchGroupsRepositoryImpl.java
+++ b/custos-services/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/persistance/repository/SearchGroupsRepositoryImpl.java
@@ -24,9 +24,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Repository;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
diff --git a/custos-services/custos-external-services-distributions/pom.xml b/custos-services/custos-external-services-distributions/pom.xml
index c0866bb43..4552bb906 100644
--- a/custos-services/custos-external-services-distributions/pom.xml
+++ b/custos-services/custos-external-services-distributions/pom.xml
@@ -5,7 +5,8 @@
<parent>
<artifactId>custos</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-services/custos-federated-services-clients/pom.xml b/custos-services/custos-federated-services-clients/pom.xml
index eb57d7adb..57df9f7eb 100644
--- a/custos-services/custos-federated-services-clients/pom.xml
+++ b/custos-services/custos-federated-services-clients/pom.xml
@@ -32,11 +32,6 @@
<artifactId>custos-federated-services-clients</artifactId>
<dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
-
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
@@ -50,6 +45,10 @@
<groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-client</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-authz-client</artifactId>
@@ -61,6 +60,12 @@
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jackson2-provider</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
@@ -80,12 +85,6 @@
<artifactId>json</artifactId>
<version>20090211</version>
</dependency>
- <dependency>
- <groupId>org.apache.custos</groupId>
- <artifactId>cluster-management-core-service-client-stub</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
</dependencies>
<build>
<plugins>
diff --git a/custos-services/custos-integration-core/pom.xml b/custos-services/custos-integration-core/pom.xml
index 47abc89fb..c5e39e724 100644
--- a/custos-services/custos-integration-core/pom.xml
+++ b/custos-services/custos-integration-core/pom.xml
@@ -35,15 +35,25 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
-
<dependency>
- <groupId>io.github.lognet</groupId>
- <artifactId>grpc-spring-boot-starter</artifactId>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
@@ -52,6 +62,12 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
diff --git a/custos-services/custos-integration-services-server/Dockerfile b/custos-services/custos-integration-services-server/Dockerfile
index 08cf20f28..bdd997bc2 100644
--- a/custos-services/custos-integration-services-server/Dockerfile
+++ b/custos-services/custos-integration-services-server/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:11.0.5-jdk-slim
+FROM openjdk:17.0.2-slim
COPY src/main/resources/custos_user_schema_extention.json /home/ubuntu/custos_user_schema_extention.json
VOLUME /tmp
ARG JAR_FILE
diff --git a/custos-services/custos-integration-services-server/pom.xml b/custos-services/custos-integration-services-server/pom.xml
index 4b5f1d3c5..93d4607cc 100644
--- a/custos-services/custos-integration-services-server/pom.xml
+++ b/custos-services/custos-integration-services-server/pom.xml
@@ -25,14 +25,15 @@
<artifactId>custos</artifactId>
<groupId>org.apache.custos</groupId>
<version>1.1-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>custos-integration-services-server</artifactId>
<properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
</properties>
@@ -40,17 +41,31 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.2</version>
</dependency>
-
-
-
<dependency>
<groupId>io.github.lognet</groupId>
<artifactId>grpc-spring-boot-starter</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
@@ -59,6 +74,16 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
@@ -69,58 +94,101 @@
<groupId>org.apache.custos</groupId>
<artifactId>agent-management-service</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.custos</groupId>
<artifactId>group-management-service</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.custos</groupId>
<artifactId>identity-management-service</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.custos</groupId>
<artifactId>log-management-service</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.custos</groupId>
<artifactId>resource-secret-management-service</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.custos</groupId>
<artifactId>sharing-management-service</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.custos</groupId>
<artifactId>tenant-management-service</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.custos</groupId>
<artifactId>user-management-service</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.apache.custos</groupId>
- <artifactId>scim-service</artifactId>
- <version>${project.version}</version>
- </dependency>
-
-
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot</artifactId>
- <version>2.2.0.RELEASE</version>
- <scope>compile</scope>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
</dependency>
</dependencies>
diff --git a/custos-services/custos-integration-services-server/src/main/resources/application.properties b/custos-services/custos-integration-services-server/src/main/resources/application.properties
index 96502189d..4127bf457 100644
--- a/custos-services/custos-integration-services-server/src/main/resources/application.properties
+++ b/custos-services/custos-integration-services-server/src/main/resources/application.properties
@@ -19,21 +19,20 @@
grpc.port=7000
server.port=9000
-##spring.zipkin.baseUrl=http://149.165.169.49:9411/
spring.application.name=custos-integrations-services-server
-##spring.sleuth.sampler.probability=1
-#spring.main.allow-bean-definition-overriding=true
-#management.security.enabled=false
-#management.endpoints.web.exposure.include=*
-#management.endpoint.metrics.enabled=true
-#spring.jmx.enabled=true
+
spring.profiles.active=local
-logging.level.root=INFO
+#logging.level.root=INFO
scim.user.schema.location=/home/ubuntu/custos_user_schema_extention.json
+#scim.user.schema.location=/Users/isururanawaka/Documents/Airavata_Repository/airavata-custos/custos-services/custos-integration-services-server/src/main/resources/custos_user_schema_extention.json
core.services.server.port=7001
core.services.server.hostname=host.docker.internal
iam.server.url=https://host.docker.internal/auth/
tenant.base.uri=http://host.docker.internal/apiserver/tenant-management/v1.0.0/oauth2/tenant
+#
+#core.services.server.hostname=localhost
+#iam.server.url=https://localhost/auth/
+#tenant.base.uri=http://localhost/apiserver/tenant-management/v1.0.0/oauth2/tenant
diff --git a/custos-services/custos-integration-services/agent-management-service/pom.xml b/custos-services/custos-integration-services/agent-management-service/pom.xml
index 64236b312..620bcdb9d 100644
--- a/custos-services/custos-integration-services/agent-management-service/pom.xml
+++ b/custos-services/custos-integration-services/agent-management-service/pom.xml
@@ -66,28 +66,6 @@
<artifactId>custos-integration-services-commons</artifactId>
<version>${project.version}</version>
</dependency>
-<!-- <dependency>-->
-<!-- <groupId>org.apache.custos</groupId>-->
-<!-- <artifactId>custos-core-services-commons</artifactId>-->
-<!-- <version>${project.version}</version>-->
-<!-- </dependency>-->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
- </dependency>
-<!-- <dependency>-->
-<!-- <groupId>org.springframework.cloud</groupId>-->
-<!-- <artifactId>spring-cloud-starter-config</artifactId>-->
-<!-- </dependency>-->
-
- <dependency>
- <groupId>io.github.lognet</groupId>
- <artifactId>grpc-spring-boot-starter</artifactId>
- </dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
@@ -95,6 +73,20 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java-util</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
@@ -104,6 +96,16 @@
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-common-protos</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.github.lognet</groupId>
+ <artifactId>grpc-spring-boot-starter</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
diff --git a/custos-services/custos-integration-services/custos-integration-services-commons/pom.xml b/custos-services/custos-integration-services/custos-integration-services-commons/pom.xml
index 17025a2da..a04453808 100644
--- a/custos-services/custos-integration-services/custos-integration-services-commons/pom.xml
+++ b/custos-services/custos-integration-services/custos-integration-services-commons/pom.xml
@@ -66,19 +66,19 @@
<artifactId>custos-logging-client-stub</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot-starter-web</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</dependency>
- <dependency>
- <groupId>io.github.lognet</groupId>
- <artifactId>grpc-spring-boot-starter</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>io.github.lognet</groupId>-->
+<!-- <artifactId>grpc-spring-boot-starter</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
@@ -86,6 +86,20 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java-util</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
diff --git a/custos-services/custos-integration-services/custos-integration-services-swagger/pom.xml b/custos-services/custos-integration-services/custos-integration-services-swagger/pom.xml
index 378e34be0..26c99d390 100644
--- a/custos-services/custos-integration-services/custos-integration-services-swagger/pom.xml
+++ b/custos-services/custos-integration-services/custos-integration-services-swagger/pom.xml
@@ -32,8 +32,8 @@
<artifactId>custos-integration-services-swagger</artifactId>
<properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
</properties>
<dependencies>
<dependency>
@@ -43,6 +43,12 @@
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
@@ -55,22 +61,18 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-config</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-spring-web</artifactId>
- <version>2.9.2</version>
- <scope>compile</scope>
- </dependency>
</dependencies>
<build>
diff --git a/custos-services/custos-integration-services/group-management-service/pom.xml b/custos-services/custos-integration-services/group-management-service/pom.xml
index 1ab202d09..bb4eafc1b 100644
--- a/custos-services/custos-integration-services/group-management-service/pom.xml
+++ b/custos-services/custos-integration-services/group-management-service/pom.xml
@@ -67,22 +67,15 @@
<artifactId>custos-integration-services-commons</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
- </dependency>
-<!-- <dependency>-->
-<!-- <groupId>org.springframework.cloud</groupId>-->
-<!-- <artifactId>spring-cloud-starter-config</artifactId>-->
-<!-- </dependency>-->
-
<dependency>
<groupId>io.github.lognet</groupId>
<artifactId>grpc-spring-boot-starter</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
@@ -91,6 +84,20 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java-util</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
diff --git a/custos-services/custos-integration-services/identity-management-service/pom.xml b/custos-services/custos-integration-services/identity-management-service/pom.xml
index 377866020..157d46f5d 100644
--- a/custos-services/custos-integration-services/identity-management-service/pom.xml
+++ b/custos-services/custos-integration-services/identity-management-service/pom.xml
@@ -59,30 +59,15 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
- </dependency>
-<!-- <dependency>-->
-<!-- <groupId>org.springframework.cloud</groupId>-->
-<!-- <artifactId>spring-cloud-starter-config</artifactId>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>org.springframework.cloud</groupId>-->
-<!-- <artifactId>spring-cloud-starter-sleuth</artifactId>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>org.springframework.cloud</groupId>-->
-<!-- <artifactId>spring-cloud-sleuth-zipkin</artifactId>-->
-<!-- </dependency>-->
-
<dependency>
<groupId>io.github.lognet</groupId>
<artifactId>grpc-spring-boot-starter</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
@@ -91,6 +76,20 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java-util</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
diff --git a/custos-services/custos-integration-services/log-management-service/pom.xml b/custos-services/custos-integration-services/log-management-service/pom.xml
index 5d4752446..bef0ab456 100644
--- a/custos-services/custos-integration-services/log-management-service/pom.xml
+++ b/custos-services/custos-integration-services/log-management-service/pom.xml
@@ -88,25 +88,15 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
- </dependency>
-<!-- <dependency>-->
-<!-- <groupId>org.springframework.cloud</groupId>-->
-<!-- <artifactId>spring-cloud-starter-config</artifactId>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>org.springframework.cloud</groupId>-->
-<!-- <artifactId>spring-cloud-starter-sleuth</artifactId>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>org.springframework.cloud</groupId>-->
-<!-- <artifactId>spring-cloud-sleuth-zipkin</artifactId>-->
-<!-- </dependency>-->
+ <groupId>io.github.lognet</groupId>
+ <artifactId>grpc-spring-boot-starter</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>io.zipkin.brave</groupId>
<artifactId>brave-instrumentation-grpc</artifactId>
@@ -115,10 +105,6 @@
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
</dependency>
- <dependency>
- <groupId>io.github.lognet</groupId>
- <artifactId>grpc-spring-boot-starter</artifactId>
- </dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
@@ -126,6 +112,20 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java-util</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
@@ -139,12 +139,6 @@
<groupId>io.kubernetes</groupId>
<artifactId>client-java</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.custos</groupId>
- <artifactId>custos-logging-client-stub</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
</dependencies>
diff --git a/custos-services/custos-integration-services/resource-secret-management-service/pom.xml b/custos-services/custos-integration-services/resource-secret-management-service/pom.xml
index eda46b9e9..627971dad 100644
--- a/custos-services/custos-integration-services/resource-secret-management-service/pom.xml
+++ b/custos-services/custos-integration-services/resource-secret-management-service/pom.xml
@@ -82,37 +82,15 @@
<artifactId>custos-integration-services-commons</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
- </dependency>
-<!-- <dependency>-->
-<!-- <groupId>org.springframework.cloud</groupId>-->
-<!-- <artifactId>spring-cloud-starter-config</artifactId>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>org.springframework.cloud</groupId>-->
-<!-- <artifactId>spring-cloud-starter-sleuth</artifactId>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>org.springframework.cloud</groupId>-->
-<!-- <artifactId>spring-cloud-sleuth-zipkin</artifactId>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>io.zipkin.brave</groupId>-->
-<!-- <artifactId>brave-instrumentation-grpc</artifactId>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>io.micrometer</groupId>-->
-<!-- <artifactId>micrometer-registry-prometheus</artifactId>-->
-<!-- </dependency>-->
<dependency>
<groupId>io.github.lognet</groupId>
<artifactId>grpc-spring-boot-starter</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
@@ -121,6 +99,20 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java-util</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
diff --git a/custos-services/custos-integration-services/scim-service/pom.xml b/custos-services/custos-integration-services/scim-service/pom.xml
index 0dd97f4bb..3409ef263 100644
--- a/custos-services/custos-integration-services/scim-service/pom.xml
+++ b/custos-services/custos-integration-services/scim-service/pom.xml
@@ -65,44 +65,16 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
-<!-- <exclusions>-->
-<!-- <exclusion>-->
-<!-- <groupId>org.springframework.boot</groupId>-->
-<!-- <artifactId>spring-boot-starter-logging</artifactId>-->
-<!-- </exclusion>-->
-<!-- </exclusions>-->
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-config</artifactId>
- </dependency>
-<!-- <dependency>-->
-<!-- <groupId>org.springframework.cloud</groupId>-->
-<!-- <artifactId>spring-cloud-starter-sleuth</artifactId>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>org.springframework.cloud</groupId>-->
-<!-- <artifactId>spring-cloud-sleuth-zipkin</artifactId>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>io.zipkin.brave</groupId>-->
-<!-- <artifactId>brave-instrumentation-grpc</artifactId>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>io.micrometer</groupId>-->
-<!-- <artifactId>micrometer-registry-prometheus</artifactId>-->
-<!-- </dependency>-->
<dependency>
<groupId>org.apache.custos</groupId>
<artifactId>iam-admin-core-service-client-stub</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.custos</groupId>
@@ -130,6 +102,7 @@
<version>${project.version}</version>
</dependency>
+
</dependencies>
<build>
diff --git a/custos-services/custos-integration-services/sharing-management-service/pom.xml b/custos-services/custos-integration-services/sharing-management-service/pom.xml
index fd8485d5a..984f727ab 100644
--- a/custos-services/custos-integration-services/sharing-management-service/pom.xml
+++ b/custos-services/custos-integration-services/sharing-management-service/pom.xml
@@ -76,37 +76,16 @@
<artifactId>custos-integration-services-commons</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
- </dependency>
-<!-- <dependency>-->
-<!-- <groupId>org.springframework.cloud</groupId>-->
-<!-- <artifactId>spring-cloud-starter-config</artifactId>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>org.springframework.cloud</groupId>-->
-<!-- <artifactId>spring-cloud-starter-sleuth</artifactId>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>org.springframework.cloud</groupId>-->
-<!-- <artifactId>spring-cloud-sleuth-zipkin</artifactId>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>io.zipkin.brave</groupId>-->
-<!-- <artifactId>brave-instrumentation-grpc</artifactId>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>io.micrometer</groupId>-->
-<!-- <artifactId>micrometer-registry-prometheus</artifactId>-->
-<!-- </dependency>-->
+
<dependency>
<groupId>io.github.lognet</groupId>
<artifactId>grpc-spring-boot-starter</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
@@ -115,6 +94,20 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java-util</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
diff --git a/custos-services/custos-integration-services/tenant-management-service/pom.xml b/custos-services/custos-integration-services/tenant-management-service/pom.xml
index 9e7740dfe..eae4e09a0 100644
--- a/custos-services/custos-integration-services/tenant-management-service/pom.xml
+++ b/custos-services/custos-integration-services/tenant-management-service/pom.xml
@@ -84,38 +84,16 @@
<artifactId>sharing-core-service-client-stub</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
- </dependency>
-<!-- <dependency>-->
-<!-- <groupId>org.springframework.cloud</groupId>-->
-<!-- <artifactId>spring-cloud-starter-config</artifactId>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>org.springframework.cloud</groupId>-->
-<!-- <artifactId>spring-cloud-starter-sleuth</artifactId>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>org.springframework.cloud</groupId>-->
-<!-- <artifactId>spring-cloud-sleuth-zipkin</artifactId>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>io.zipkin.brave</groupId>-->
-<!-- <artifactId>brave-instrumentation-grpc</artifactId>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>io.micrometer</groupId>-->
-<!-- <artifactId>micrometer-registry-prometheus</artifactId>-->
-<!-- </dependency>-->
- <dependency>
- <groupId>io.github.lognet</groupId>
- <artifactId>grpc-spring-boot-starter</artifactId>
- </dependency>
+ <dependency>
+ <groupId>io.github.lognet</groupId>
+ <artifactId>grpc-spring-boot-starter</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
@@ -123,7 +101,21 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java-util</artifactId>
+ </dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
@@ -132,18 +124,6 @@
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-common-protos</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.custos</groupId>
- <artifactId>messaging-core-service-client-stub</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.custos</groupId>
- <artifactId>sharing-core-service-client-stub</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
</dependencies>
<build>
diff --git a/custos-services/custos-integration-services/user-management-service/pom.xml b/custos-services/custos-integration-services/user-management-service/pom.xml
index 613d1997b..085a598c1 100644
--- a/custos-services/custos-integration-services/user-management-service/pom.xml
+++ b/custos-services/custos-integration-services/user-management-service/pom.xml
@@ -66,37 +66,15 @@
<artifactId>custos-integration-services-commons</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
- </dependency>
-<!-- <dependency>-->
-<!-- <groupId>org.springframework.cloud</groupId>-->
-<!-- <artifactId>spring-cloud-starter-config</artifactId>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>org.springframework.cloud</groupId>-->
-<!-- <artifactId>spring-cloud-starter-sleuth</artifactId>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>org.springframework.cloud</groupId>-->
-<!-- <artifactId>spring-cloud-sleuth-zipkin</artifactId>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>io.zipkin.brave</groupId>-->
-<!-- <artifactId>brave-instrumentation-grpc</artifactId>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>io.micrometer</groupId>-->
-<!-- <artifactId>micrometer-registry-prometheus</artifactId>-->
-<!-- </dependency>-->
<dependency>
<groupId>io.github.lognet</groupId>
<artifactId>grpc-spring-boot-starter</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
@@ -105,6 +83,20 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.api.grpc</groupId>
+ <artifactId>proto-google-common-protos</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java-util</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
diff --git a/custos-services/pom.xml b/custos-services/pom.xml
index 2238a0f54..25ed1baf5 100644
--- a/custos-services/pom.xml
+++ b/custos-services/pom.xml
@@ -43,8 +43,8 @@
</modules>
<properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
</properties>
</project>
\ No newline at end of file
diff --git a/custos-utilities/custos-bootstrap-service/pom.xml b/custos-utilities/custos-bootstrap-service/pom.xml
index 46237a042..012161c4c 100644
--- a/custos-utilities/custos-bootstrap-service/pom.xml
+++ b/custos-utilities/custos-bootstrap-service/pom.xml
@@ -32,8 +32,8 @@
<artifactId>custos-bootstrap-service</artifactId>
<properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
</properties>
<dependencies>
<dependency>
@@ -71,6 +71,13 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
diff --git a/custos-utilities/ide-integration/Dockerfile b/custos-utilities/ide-integration/Dockerfile
new file mode 100644
index 000000000..430223b1a
--- /dev/null
+++ b/custos-utilities/ide-integration/Dockerfile
@@ -0,0 +1,5 @@
+FROM nginx:stable-alpine
+COPY src/main/containers/nginx.conf /etc/nginx/conf.d/default.conf
+COPY src/main/containers/certificate.pem /etc/nginx/certificate.pem
+COPY src/main/containers/key.pem /etc/nginx/key.pem
+EXPOSE 443
\ No newline at end of file
diff --git a/custos-utilities/ide-integration/pom.xml b/custos-utilities/ide-integration/pom.xml
index 05e9ab70f..cf24c2dc3 100644
--- a/custos-utilities/ide-integration/pom.xml
+++ b/custos-utilities/ide-integration/pom.xml
@@ -32,13 +32,11 @@
<artifactId>ide-integration</artifactId>
<properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
</properties>
-
-
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -118,18 +116,6 @@
<artifactId>custos-core-services-server</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-autoconfigure</artifactId>
- <version>2.2.0.RELEASE</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.custos</groupId>
- <artifactId>custos-integration-services-server</artifactId>
- <version>1.1-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
</dependencies>
@@ -146,6 +132,38 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>dockerfile-maven-plugin</artifactId>
+ <version>${docker.plugin.version}</version>
+ <executions>
+ <execution>
+ <id>container</id>
+ <goals>
+ <goal>build</goal>
+ <goal>push</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <noCache>true</noCache>
+ <serverId>docker.io</serverId>
+ <repository>${docker.image.prefix}/keycloak-nginx</repository>
+ <tag>latest</tag>
+ <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
+ <buildArgs>
+ <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
+ </buildArgs>
+ <skip>false</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
diff --git a/custos-utilities/ide-integration/src/main/containers/Dockerfile b/custos-utilities/ide-integration/src/main/containers/Dockerfile
deleted file mode 100644
index 97fc3de84..000000000
--- a/custos-utilities/ide-integration/src/main/containers/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM nginx:stable-alpine
-COPY nginx.conf /etc/nginx/conf.d/default.conf
-COPY certificate.pem /etc/nginx/certificate.pem
-COPY key.pem /etc/nginx/key.pem
-EXPOSE 443
\ No newline at end of file
diff --git a/custos-utilities/ide-integration/src/main/containers/docker-compose.yml b/custos-utilities/ide-integration/src/main/containers/docker-compose.yml
index 6ba7126e9..ef8404898 100644
--- a/custos-utilities/ide-integration/src/main/containers/docker-compose.yml
+++ b/custos-utilities/ide-integration/src/main/containers/docker-compose.yml
@@ -45,6 +45,7 @@ services:
container_name: my_sql_local
image: mysql:8.0.31
restart: always
+ command: --character-set-server=utf8 --collation-server=utf8_general_ci
ports:
- "3306:3306"
environment:
@@ -53,7 +54,6 @@ services:
MYSQL_USER: admin
MYSQL_PASSWORD: admin
MAX_ALLOWED_PACKET: 1073741824
- command: --character-set-server=ucs2 --collation-server=ucs2_general_ci
# volumes:
# - ./init/mysql/scripts/bash:/docker-entrypoint-initdb.d
# - ./init/mysql/scripts/sql:/tmp/sql
diff --git a/pom.xml b/pom.xml
index 276047bd5..52a688d50 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,11 +37,12 @@
<modules>
<module>custos-client-sdks</module>
- <module>custos-tests</module>
+<!-- <module>custos-tests</module>-->
<module>custos-services</module>
<module>custos-core</module>
<module>custos-utilities/ide-integration</module>
<module>custos-utilities/custos-bootstrap-service</module>
+ <module>custos-rest-proxy</module>
</modules>
<dependencyManagement>
@@ -136,6 +137,11 @@
<artifactId>persistence-api</artifactId>
<version>${javax.persistance}</version>
</dependency>
+ <dependency>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
+ <version>${jakarta.persistance}</version>
+ </dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-client</artifactId>
@@ -227,6 +233,17 @@
<version>${org.json.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
@@ -273,6 +290,19 @@
<version>${email.version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ <version>${javax.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ <version>${org.slf4j.version}</version>
+ </dependency>
+
+
+
</dependencies>
</dependencyManagement>
@@ -317,6 +347,24 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.4.1</version>
+ <executions>
+ <execution>
+ <id>enforce</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireUpperBoundDeps/>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
@@ -377,15 +425,17 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <org.slf4j.version>1.7.25</org.slf4j.version>
+ <org.slf4j.version>2.0.6</org.slf4j.version>
<log4j.version>1.2.17</log4j.version>
+ <log4j2.version>2.8.2</log4j2.version>
+ <log4j-slf4j></log4j-slf4j>
<thrift.version>0.12.0</thrift.version>
<openjpa.version>2.4.3</openjpa.version>
<mysql.connector.version>5.1.34</mysql.connector.version>
<maven.assembly.plugin>3.3.0</maven.assembly.plugin>
<junit.version>4.8.1</junit.version>
<jmockit.version>1.8</jmockit.version>
- <java.version>11</java.version>
+ <java.version>17</java.version>
<javax.annotation.version>1.3.2</javax.annotation.version>
<maven.compiler.plugin>3.8.1</maven.compiler.plugin>
@@ -393,9 +443,9 @@
<os.maven.plugin>1.5.0.Final</os.maven.plugin>
<!-- Spring dependencies -->
- <spring.boot.version>2.2.0.RELEASE</spring.boot.version>
- <spring.cloud.version>Greenwich.RELEASE</spring.cloud.version>
- <grpc.spring.boot.version>2.4.4</grpc.spring.boot.version>
+ <spring.boot.version>3.0.1</spring.boot.version>
+ <spring.cloud.version>2022.0.2</spring.cloud.version>
+ <grpc.spring.boot.version>5.0.0</grpc.spring.boot.version>
<spring.cloud.stream.version>2.0.0.RELEASE</spring.cloud.stream.version>
<spring.cloud.slueth.version>2.1.6.RELEASE</spring.cloud.slueth.version>
@@ -414,14 +464,15 @@
<mysql.connector.java>8.0.18</mysql.connector.java>
<javax.persistance>1.0.2</javax.persistance>
+ <jakarta.persistance>3.1.0</jakarta.persistance>
<keycloak.admin.version>9.0.2</keycloak.admin.version>
- <reasteasy.client.version>3.0.14.Final</reasteasy.client.version>
+ <reasteasy.client.version>3.9.1.Final</reasteasy.client.version>
<com.google.protobuf.util>3.21.11</com.google.protobuf.util>
- <springfox.swagger.version>2.9.2</springfox.swagger.version>
+ <springfox.swagger.version>3.0.0</springfox.swagger.version>
<org.wso2.charon>3.3.16</org.wso2.charon>
<jaxb.version>2.1</jaxb.version>
@@ -460,6 +511,11 @@
<clusterIssuer>letsencrypt-prod</clusterIssuer>
+ <javax.version>2.0.1.Final</javax.version>
+
+ <jackson.version>2.14.2</jackson.version>
+
+
</properties>
</project>