You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2020/05/05 11:55:39 UTC
[airavata-custos] branch develop updated: fixing client parent pom
and refactoring custos-client to custos-java-clients
This is an automated email from the ASF dual-hosted git repository.
smarru pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-custos.git
The following commit(s) were added to refs/heads/develop by this push:
new a8c89c2 fixing client parent pom and refactoring custos-client to custos-java-clients
new 50bf082 Merge pull request #59 from smarru/develop
a8c89c2 is described below
commit a8c89c285456a81f28d6bb1cf1c1f44a9be9c7a5
Author: Suresh Marru <sm...@apache.org>
AuthorDate: Tue May 5 03:59:43 2020 -0400
fixing client parent pom and refactoring custos-client to custos-java-clients
---
.../custos-clients-core/pom.xml | 2 +-
.../src/main/java/org/apache/custos/clients/core/ClientUtils.java | 0
.../identity-management-client/pom.xml | 2 +-
.../custos/identity/management/client/IdentityManagementClient.java | 0
.../identity-management-client/src/main/resources/cert.pem | 0
custos-client-sdks/{custos-clients => custos-java-clients}/pom.xml | 4 ++--
.../tenant-management-client/pom.xml | 2 +-
.../tenant/manamgement/client/AdminTenantRegistrationClient.java | 0
.../custos/tenant/manamgement/client/TenantManagementClient.java | 0
.../user-management-client/pom.xml | 2 +-
custos-client-sdks/pom.xml | 2 +-
pom.xml | 5 -----
12 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/custos-client-sdks/custos-clients/custos-clients-core/pom.xml b/custos-client-sdks/custos-java-clients/custos-clients-core/pom.xml
similarity index 97%
rename from custos-client-sdks/custos-clients/custos-clients-core/pom.xml
rename to custos-client-sdks/custos-java-clients/custos-clients-core/pom.xml
index e5bf9e7..9c0f0bd 100644
--- a/custos-client-sdks/custos-clients/custos-clients-core/pom.xml
+++ b/custos-client-sdks/custos-java-clients/custos-clients-core/pom.xml
@@ -22,7 +22,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-client</artifactId>
+ <artifactId>custos-java-clients</artifactId>
<groupId>org.apache.custos</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
diff --git a/custos-client-sdks/custos-clients/custos-clients-core/src/main/java/org/apache/custos/clients/core/ClientUtils.java b/custos-client-sdks/custos-java-clients/custos-clients-core/src/main/java/org/apache/custos/clients/core/ClientUtils.java
similarity index 100%
rename from custos-client-sdks/custos-clients/custos-clients-core/src/main/java/org/apache/custos/clients/core/ClientUtils.java
rename to custos-client-sdks/custos-java-clients/custos-clients-core/src/main/java/org/apache/custos/clients/core/ClientUtils.java
diff --git a/custos-client-sdks/custos-clients/identity-management-client/pom.xml b/custos-client-sdks/custos-java-clients/identity-management-client/pom.xml
similarity index 98%
rename from custos-client-sdks/custos-clients/identity-management-client/pom.xml
rename to custos-client-sdks/custos-java-clients/identity-management-client/pom.xml
index ca90a4a..96546d1 100644
--- a/custos-client-sdks/custos-clients/identity-management-client/pom.xml
+++ b/custos-client-sdks/custos-java-clients/identity-management-client/pom.xml
@@ -22,7 +22,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-client</artifactId>
+ <artifactId>custos-java-clients</artifactId>
<groupId>org.apache.custos</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
diff --git a/custos-client-sdks/custos-clients/identity-management-client/src/main/java/org/apache/custos/identity/management/client/IdentityManagementClient.java b/custos-client-sdks/custos-java-clients/identity-management-client/src/main/java/org/apache/custos/identity/management/client/IdentityManagementClient.java
similarity index 100%
rename from custos-client-sdks/custos-clients/identity-management-client/src/main/java/org/apache/custos/identity/management/client/IdentityManagementClient.java
rename to custos-client-sdks/custos-java-clients/identity-management-client/src/main/java/org/apache/custos/identity/management/client/IdentityManagementClient.java
diff --git a/custos-client-sdks/custos-clients/identity-management-client/src/main/resources/cert.pem b/custos-client-sdks/custos-java-clients/identity-management-client/src/main/resources/cert.pem
similarity index 100%
rename from custos-client-sdks/custos-clients/identity-management-client/src/main/resources/cert.pem
rename to custos-client-sdks/custos-java-clients/identity-management-client/src/main/resources/cert.pem
diff --git a/custos-client-sdks/custos-clients/pom.xml b/custos-client-sdks/custos-java-clients/pom.xml
similarity index 90%
rename from custos-client-sdks/custos-clients/pom.xml
rename to custos-client-sdks/custos-java-clients/pom.xml
index 40f778e..4c7fa18 100644
--- a/custos-client-sdks/custos-clients/pom.xml
+++ b/custos-client-sdks/custos-java-clients/pom.xml
@@ -3,12 +3,12 @@
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>
+ <artifactId>custos-client-sdks</artifactId>
<groupId>org.apache.custos</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>custos-client</artifactId>
+ <artifactId>custos-java-clients</artifactId>
<packaging>pom</packaging>
<modules>
<module>identity-management-client</module>
diff --git a/custos-client-sdks/custos-clients/tenant-management-client/pom.xml b/custos-client-sdks/custos-java-clients/tenant-management-client/pom.xml
similarity index 98%
rename from custos-client-sdks/custos-clients/tenant-management-client/pom.xml
rename to custos-client-sdks/custos-java-clients/tenant-management-client/pom.xml
index e95f452..d499c8c 100644
--- a/custos-client-sdks/custos-clients/tenant-management-client/pom.xml
+++ b/custos-client-sdks/custos-java-clients/tenant-management-client/pom.xml
@@ -22,7 +22,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-client</artifactId>
+ <artifactId>custos-java-clients</artifactId>
<groupId>org.apache.custos</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
diff --git a/custos-client-sdks/custos-clients/tenant-management-client/src/main/java/org/apache/custos/tenant/manamgement/client/AdminTenantRegistrationClient.java b/custos-client-sdks/custos-java-clients/tenant-management-client/src/main/java/org/apache/custos/tenant/manamgement/client/AdminTenantRegistrationClient.java
similarity index 100%
rename from custos-client-sdks/custos-clients/tenant-management-client/src/main/java/org/apache/custos/tenant/manamgement/client/AdminTenantRegistrationClient.java
rename to custos-client-sdks/custos-java-clients/tenant-management-client/src/main/java/org/apache/custos/tenant/manamgement/client/AdminTenantRegistrationClient.java
diff --git a/custos-client-sdks/custos-clients/tenant-management-client/src/main/java/org/apache/custos/tenant/manamgement/client/TenantManagementClient.java b/custos-client-sdks/custos-java-clients/tenant-management-client/src/main/java/org/apache/custos/tenant/manamgement/client/TenantManagementClient.java
similarity index 100%
rename from custos-client-sdks/custos-clients/tenant-management-client/src/main/java/org/apache/custos/tenant/manamgement/client/TenantManagementClient.java
rename to custos-client-sdks/custos-java-clients/tenant-management-client/src/main/java/org/apache/custos/tenant/manamgement/client/TenantManagementClient.java
diff --git a/custos-client-sdks/custos-clients/user-management-client/pom.xml b/custos-client-sdks/custos-java-clients/user-management-client/pom.xml
similarity index 98%
rename from custos-client-sdks/custos-clients/user-management-client/pom.xml
rename to custos-client-sdks/custos-java-clients/user-management-client/pom.xml
index 16abe86..fb87deb 100644
--- a/custos-client-sdks/custos-clients/user-management-client/pom.xml
+++ b/custos-client-sdks/custos-java-clients/user-management-client/pom.xml
@@ -22,7 +22,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-client</artifactId>
+ <artifactId>custos-java-clients</artifactId>
<groupId>org.apache.custos</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
diff --git a/custos-client-sdks/pom.xml b/custos-client-sdks/pom.xml
index f75ecc6..f1ff35d 100644
--- a/custos-client-sdks/pom.xml
+++ b/custos-client-sdks/pom.xml
@@ -32,7 +32,7 @@
<packaging>pom</packaging>
<modules>
<module>custos-java-sdk</module>
- <module>custos-clients</module>
+ <module>custos-java-clients</module>
</modules>
<build>
<plugins>
diff --git a/pom.xml b/pom.xml
index e2b34ef..2fd1816 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,11 +147,6 @@
<version>${keycloak.admin.version}</version>
</dependency>
<dependency>
- <groupId>org.keycloak</groupId>
- <artifactId>keycloak-authz-client</artifactId>
- <version>${keycloak.admin.version}</version>
- </dependency>
- <dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-client</artifactId>
<version>${reasteasy.client.version}</version>