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 2022/05/01 18:07:20 UTC
[airavata-custos] branch develop updated: update README of deployment scripts
This is an automated email from the ASF dual-hosted git repository.
isjarana 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 c866d3aa update README of deployment scripts
new 8ca70682 Merge pull request #268 from isururanawaka/deployment_scripts
c866d3aa is described below
commit c866d3aa97912043cb1ba44d7680f8d2600f5efd
Author: Isuru Ranawaka <ir...@gmail.com>
AuthorDate: Sun May 1 14:05:30 2022 -0400
update README of deployment scripts
---
.../agent-management-client/pom.xml | 2 +-
.../custos-clients-core/pom.xml | 2 +-
.../group-management-client/pom.xml | 2 +-
.../identity-management-client/pom.xml | 2 +-
custos-client-sdks/custos-java-clients/pom.xml | 2 +-
.../resource-secret-management-client/pom.xml | 2 +-
.../sharing-management-client/pom.xml | 2 +-
.../tenant-management-client/pom.xml | 2 +-
.../user-management-client/pom.xml | 2 +-
custos-client-sdks/custos-java-sdk/pom.xml | 2 +-
custos-client-sdks/pom.xml | 2 +-
.../agent-profile-core-service-client-stub/pom.xml | 2 +-
.../pom.xml | 2 +-
.../pom.xml | 2 +-
.../custos-logging-client-stub/pom.xml | 2 +-
.../pom.xml | 2 +-
.../iam-admin-core-service-client-stub/pom.xml | 2 +-
.../identity-core-service-client-stub/pom.xml | 2 +-
.../messaging-core-service-client-stub/pom.xml | 2 +-
custos-core-services-client-stubs/pom.xml | 2 +-
.../pom.xml | 2 +-
.../sharing-core-service-client-stub/pom.xml | 2 +-
.../pom.xml | 2 +-
.../user-profile-core-service-client-stub/pom.xml | 2 +-
.../agent-profile-core-service/pom.xml | 2 +-
.../src/main/helm/values.yaml | 2 +-
.../cluster-management-core-service/pom.xml | 2 +-
.../src/main/helm/values.yaml | 2 +-
.../credential-store-core-service/pom.xml | 2 +-
.../src/main/helm/values.yaml | 2 +-
.../custos-core-services-commons/pom.xml | 2 +-
custos-core-services/custos-logging/pom.xml | 2 +-
.../custos-logging/src/main/helm/values.yaml | 2 +-
.../custos-messaging-core-service/pom.xml | 2 +-
.../src/main/helm/values.yaml | 2 +-
.../federated-authentication-core-service/pom.xml | 2 +-
.../src/main/helm/values.yaml | 2 +-
.../iam-admin-core-service/pom.xml | 2 +-
.../src/main/helm/values.yaml | 2 +-
custos-core-services/identity-core-service/pom.xml | 2 +-
.../src/main/helm/values.yaml | 2 +-
custos-core-services/pom.xml | 2 +-
.../resource-secret-core-service/pom.xml | 2 +-
.../src/main/helm/values.yaml | 2 +-
custos-core-services/sharing-core-service/pom.xml | 2 +-
.../sharing-core-service/src/main/helm/values.yaml | 2 +-
.../tenant-profile-core-service/pom.xml | 2 +-
.../src/main/helm/values.yaml | 2 +-
.../user-profile-core-service/pom.xml | 2 +-
.../src/main/helm/values.yaml | 2 +-
.../custos-configuration-service/pom.xml | 2 +-
.../src/main/helm/values.yaml | 2 +-
.../custos-grpc-web-proxy/pom.xml | 2 +-
.../src/main/helm/values.yaml | 4 +--
.../custos-keycloak/pom.xml | 2 +-
custos-external-services-distributions/pom.xml | 2 +-
custos-federated-services-clients/pom.xml | 2 +-
custos-integration-core/pom.xml | 2 +-
.../agent-management-service-sidecar/pom.xml | 2 +-
.../agent-management-service/pom.xml | 2 +-
.../src/main/helm/values.yaml | 4 +--
.../agent-management-service-parent/pom.xml | 2 +-
.../custos-integration-services-commons/pom.xml | 2 +-
.../custos-integration-services-swagger/pom.xml | 2 +-
.../src/main/helm/values.yaml | 2 +-
.../group-management-service-sidecar/pom.xml | 2 +-
.../group-management-service/pom.xml | 2 +-
.../src/main/helm/values.yaml | 4 +--
.../group-management-service-parent/pom.xml | 2 +-
.../identity-management-service-sidecar/pom.xml | 2 +-
.../identity-management-service/pom.xml | 2 +-
.../src/main/helm/values.yaml | 4 +--
.../identity-management-service-parent/pom.xml | 2 +-
.../log-management-service-sidecar/pom.xml | 2 +-
.../log-management-service/pom.xml | 2 +-
.../src/main/helm/values.yaml | 4 +--
.../log-management-service-parent/pom.xml | 2 +-
custos-integration-services/pom.xml | 2 +-
.../pom.xml | 2 +-
.../pom.xml | 2 +-
.../resource-secret-management-service/pom.xml | 2 +-
.../src/main/helm/values.yaml | 4 +--
custos-integration-services/scim-service/pom.xml | 2 +-
.../scim-service/src/main/helm/values.yaml | 2 +-
.../sharing-management-service-parent/pom.xml | 2 +-
.../sharing-management-service-sidecar/pom.xml | 2 +-
.../sharing-management-service/pom.xml | 2 +-
.../src/main/helm/values.yaml | 4 +--
.../tenant-management-service-parent/pom.xml | 2 +-
.../tenant-management-service-sidecar/pom.xml | 2 +-
.../tenant-management-service/pom.xml | 2 +-
.../src/main/helm/values.yaml | 4 +--
.../user-management-service-parent/pom.xml | 2 +-
.../user-management-service-sidecar/pom.xml | 2 +-
.../user-management-service/pom.xml | 2 +-
.../src/main/helm/values.yaml | 4 +--
custos-tests/pom.xml | 2 +-
custos-utilities/deployment-scripts/README.MD | 29 +++++++++++++++-
pom.xml | 39 ++++------------------
99 files changed, 141 insertions(+), 139 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 2e99e332..42197fe5 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
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-java-clients</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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 506d2f02..e3a27ae3 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
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-java-clients</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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 e3111c62..b854d397 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
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-java-clients</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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 39c6a9fb..971e0e1b 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
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-java-clients</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-client-sdks/custos-java-clients/pom.xml b/custos-client-sdks/custos-java-clients/pom.xml
index aa0cfb9c..e44905a2 100644
--- a/custos-client-sdks/custos-java-clients/pom.xml
+++ b/custos-client-sdks/custos-java-clients/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-client-sdks</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>custos-java-clients</artifactId>
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 c9cbf413..6bb34c77 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
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-java-clients</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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 6e46f3b2..b8e51610 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
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-java-clients</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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 95013e48..06c637e5 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
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-java-clients</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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 69b54826..d99470a9 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
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-java-clients</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-client-sdks/custos-java-sdk/pom.xml b/custos-client-sdks/custos-java-sdk/pom.xml
index a9ece4bd..eb542fc3 100644
--- a/custos-client-sdks/custos-java-sdk/pom.xml
+++ b/custos-client-sdks/custos-java-sdk/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-client-sdks</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-client-sdks/pom.xml b/custos-client-sdks/pom.xml
index 5e41c1ea..0b2fe3e9 100644
--- a/custos-client-sdks/pom.xml
+++ b/custos-client-sdks/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-core-services-client-stubs/agent-profile-core-service-client-stub/pom.xml b/custos-core-services-client-stubs/agent-profile-core-service-client-stub/pom.xml
index ce0f2086..68d76d07 100644
--- a/custos-core-services-client-stubs/agent-profile-core-service-client-stub/pom.xml
+++ b/custos-core-services-client-stubs/agent-profile-core-service-client-stub/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-core-services-client-stubs</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-core-services-client-stubs/cluster-management-core-service-client-stub/pom.xml b/custos-core-services-client-stubs/cluster-management-core-service-client-stub/pom.xml
index a4589d54..a6c55eca 100644
--- a/custos-core-services-client-stubs/cluster-management-core-service-client-stub/pom.xml
+++ b/custos-core-services-client-stubs/cluster-management-core-service-client-stub/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-core-services-client-stubs</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-core-services-client-stubs/credential-store-core-service-client-stubs/pom.xml b/custos-core-services-client-stubs/credential-store-core-service-client-stubs/pom.xml
index 5504fba0..76e7dba2 100644
--- a/custos-core-services-client-stubs/credential-store-core-service-client-stubs/pom.xml
+++ b/custos-core-services-client-stubs/credential-store-core-service-client-stubs/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-core-services-client-stubs</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-core-services-client-stubs/custos-logging-client-stub/pom.xml b/custos-core-services-client-stubs/custos-logging-client-stub/pom.xml
index ddaadcc0..ae923cf7 100644
--- a/custos-core-services-client-stubs/custos-logging-client-stub/pom.xml
+++ b/custos-core-services-client-stubs/custos-logging-client-stub/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-core-services-client-stubs</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-core-services-client-stubs/federated-authentication-core-service-client-stub/pom.xml b/custos-core-services-client-stubs/federated-authentication-core-service-client-stub/pom.xml
index 199bde32..33182ce4 100644
--- a/custos-core-services-client-stubs/federated-authentication-core-service-client-stub/pom.xml
+++ b/custos-core-services-client-stubs/federated-authentication-core-service-client-stub/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-core-services-client-stubs</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-core-services-client-stubs/iam-admin-core-service-client-stub/pom.xml b/custos-core-services-client-stubs/iam-admin-core-service-client-stub/pom.xml
index 1d19d2e0..bb380ed9 100644
--- a/custos-core-services-client-stubs/iam-admin-core-service-client-stub/pom.xml
+++ b/custos-core-services-client-stubs/iam-admin-core-service-client-stub/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-core-services-client-stubs</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-core-services-client-stubs/identity-core-service-client-stub/pom.xml b/custos-core-services-client-stubs/identity-core-service-client-stub/pom.xml
index a23b6f82..0e7328db 100644
--- a/custos-core-services-client-stubs/identity-core-service-client-stub/pom.xml
+++ b/custos-core-services-client-stubs/identity-core-service-client-stub/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-core-services-client-stubs</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-core-services-client-stubs/messaging-core-service-client-stub/pom.xml b/custos-core-services-client-stubs/messaging-core-service-client-stub/pom.xml
index 15339618..cf8f9c21 100644
--- a/custos-core-services-client-stubs/messaging-core-service-client-stub/pom.xml
+++ b/custos-core-services-client-stubs/messaging-core-service-client-stub/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-core-services-client-stubs</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-core-services-client-stubs/pom.xml b/custos-core-services-client-stubs/pom.xml
index 09ff6a53..9bd45fc6 100644
--- a/custos-core-services-client-stubs/pom.xml
+++ b/custos-core-services-client-stubs/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>custos</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-core-services-client-stubs/resource-secret-core-service-client-stub/pom.xml b/custos-core-services-client-stubs/resource-secret-core-service-client-stub/pom.xml
index 03f83b86..3f03c15d 100644
--- a/custos-core-services-client-stubs/resource-secret-core-service-client-stub/pom.xml
+++ b/custos-core-services-client-stubs/resource-secret-core-service-client-stub/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-core-services-client-stubs</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-core-services-client-stubs/sharing-core-service-client-stub/pom.xml b/custos-core-services-client-stubs/sharing-core-service-client-stub/pom.xml
index 1631ce33..ed64fca2 100644
--- a/custos-core-services-client-stubs/sharing-core-service-client-stub/pom.xml
+++ b/custos-core-services-client-stubs/sharing-core-service-client-stub/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-core-services-client-stubs</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-core-services-client-stubs/tenant-profile-core-service-client-stub/pom.xml b/custos-core-services-client-stubs/tenant-profile-core-service-client-stub/pom.xml
index d2d69070..949a02f6 100644
--- a/custos-core-services-client-stubs/tenant-profile-core-service-client-stub/pom.xml
+++ b/custos-core-services-client-stubs/tenant-profile-core-service-client-stub/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-core-services-client-stubs</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-core-services-client-stubs/user-profile-core-service-client-stub/pom.xml b/custos-core-services-client-stubs/user-profile-core-service-client-stub/pom.xml
index 3561e991..ce57d7b1 100644
--- a/custos-core-services-client-stubs/user-profile-core-service-client-stub/pom.xml
+++ b/custos-core-services-client-stubs/user-profile-core-service-client-stub/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-core-services-client-stubs</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-core-services/agent-profile-core-service/pom.xml b/custos-core-services/agent-profile-core-service/pom.xml
index e2f25b06..01be5554 100644
--- a/custos-core-services/agent-profile-core-service/pom.xml
+++ b/custos-core-services/agent-profile-core-service/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-core-services</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-core-services/agent-profile-core-service/src/main/helm/values.yaml b/custos-core-services/agent-profile-core-service/src/main/helm/values.yaml
index 3214df30..4526040f 100644
--- a/custos-core-services/agent-profile-core-service/src/main/helm/values.yaml
+++ b/custos-core-services/agent-profile-core-service/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 1
image:
- repository: apachecustos/${artifactId}
+ repository: ${docker.image.prefix}/${artifactId}
tag: "${project.version}"
pullPolicy: Always
diff --git a/custos-core-services/cluster-management-core-service/pom.xml b/custos-core-services/cluster-management-core-service/pom.xml
index dd1c121d..5cd12117 100644
--- a/custos-core-services/cluster-management-core-service/pom.xml
+++ b/custos-core-services/cluster-management-core-service/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-core-services</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-core-services/cluster-management-core-service/src/main/helm/values.yaml b/custos-core-services/cluster-management-core-service/src/main/helm/values.yaml
index 2d949582..d9815284 100644
--- a/custos-core-services/cluster-management-core-service/src/main/helm/values.yaml
+++ b/custos-core-services/cluster-management-core-service/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 1
image:
- repository: apachecustos/${artifactId}
+ repository: ${docker.image.prefix}/${artifactId}
tag: "${project.version}"
pullPolicy: Always
diff --git a/custos-core-services/credential-store-core-service/pom.xml b/custos-core-services/credential-store-core-service/pom.xml
index 265aa8c7..d7b299dc 100644
--- a/custos-core-services/credential-store-core-service/pom.xml
+++ b/custos-core-services/credential-store-core-service/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-core-services</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-core-services/credential-store-core-service/src/main/helm/values.yaml b/custos-core-services/credential-store-core-service/src/main/helm/values.yaml
index 7d88ee81..0da9177a 100644
--- a/custos-core-services/credential-store-core-service/src/main/helm/values.yaml
+++ b/custos-core-services/credential-store-core-service/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 1
image:
- repository: apachecustos/${artifactId}
+ repository: ${docker.image.prefix}/${artifactId}
tag: "${project.version}"
pullPolicy: Always
diff --git a/custos-core-services/custos-core-services-commons/pom.xml b/custos-core-services/custos-core-services-commons/pom.xml
index 0cb48603..6c335f48 100644
--- a/custos-core-services/custos-core-services-commons/pom.xml
+++ b/custos-core-services/custos-core-services-commons/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-core-services</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-core-services/custos-logging/pom.xml b/custos-core-services/custos-logging/pom.xml
index 786be4fa..d965994b 100644
--- a/custos-core-services/custos-logging/pom.xml
+++ b/custos-core-services/custos-logging/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-core-services</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-core-services/custos-logging/src/main/helm/values.yaml b/custos-core-services/custos-logging/src/main/helm/values.yaml
index 19446d54..dea997b7 100644
--- a/custos-core-services/custos-logging/src/main/helm/values.yaml
+++ b/custos-core-services/custos-logging/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 1
image:
- repository: apachecustos/${artifactId}
+ repository: ${docker.image.prefix}/${artifactId}
tag: "${project.version}"
pullPolicy: Always
diff --git a/custos-core-services/custos-messaging-core-service/pom.xml b/custos-core-services/custos-messaging-core-service/pom.xml
index 425a2352..938bd0a5 100644
--- a/custos-core-services/custos-messaging-core-service/pom.xml
+++ b/custos-core-services/custos-messaging-core-service/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-core-services</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-core-services/custos-messaging-core-service/src/main/helm/values.yaml b/custos-core-services/custos-messaging-core-service/src/main/helm/values.yaml
index b30e16fa..c14635f1 100644
--- a/custos-core-services/custos-messaging-core-service/src/main/helm/values.yaml
+++ b/custos-core-services/custos-messaging-core-service/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 1
image:
- repository: apachecustos/${artifactId}
+ repository: ${docker.image.prefix}/${artifactId}
tag: "${project.version}"
pullPolicy: IfNotPresent
diff --git a/custos-core-services/federated-authentication-core-service/pom.xml b/custos-core-services/federated-authentication-core-service/pom.xml
index 097eb670..727fcbda 100644
--- a/custos-core-services/federated-authentication-core-service/pom.xml
+++ b/custos-core-services/federated-authentication-core-service/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-core-services</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-core-services/federated-authentication-core-service/src/main/helm/values.yaml b/custos-core-services/federated-authentication-core-service/src/main/helm/values.yaml
index afbb212e..a66b72f7 100644
--- a/custos-core-services/federated-authentication-core-service/src/main/helm/values.yaml
+++ b/custos-core-services/federated-authentication-core-service/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 1
image:
- repository: apachecustos/${artifactId}
+ repository: ${docker.image.prefix}/${artifactId}
tag: "${project.version}"
pullPolicy: Always
diff --git a/custos-core-services/iam-admin-core-service/pom.xml b/custos-core-services/iam-admin-core-service/pom.xml
index f4059036..161030c6 100644
--- a/custos-core-services/iam-admin-core-service/pom.xml
+++ b/custos-core-services/iam-admin-core-service/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-core-services</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-core-services/iam-admin-core-service/src/main/helm/values.yaml b/custos-core-services/iam-admin-core-service/src/main/helm/values.yaml
index 1f0c6dea..036cef0d 100644
--- a/custos-core-services/iam-admin-core-service/src/main/helm/values.yaml
+++ b/custos-core-services/iam-admin-core-service/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 1
image:
- repository: apachecustos/${artifactId}
+ repository: ${docker.image.prefix}/${artifactId}
tag: "${project.version}"
pullPolicy: Always
diff --git a/custos-core-services/identity-core-service/pom.xml b/custos-core-services/identity-core-service/pom.xml
index 677c2aaf..23845974 100644
--- a/custos-core-services/identity-core-service/pom.xml
+++ b/custos-core-services/identity-core-service/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-core-services</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-core-services/identity-core-service/src/main/helm/values.yaml b/custos-core-services/identity-core-service/src/main/helm/values.yaml
index e194a671..1352adb9 100644
--- a/custos-core-services/identity-core-service/src/main/helm/values.yaml
+++ b/custos-core-services/identity-core-service/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 1
image:
- repository: apachecustos/${artifactId}
+ repository: ${docker.image.prefix}/${artifactId}
tag: "${project.version}"
pullPolicy: Always
diff --git a/custos-core-services/pom.xml b/custos-core-services/pom.xml
index f8231b03..b0a0b84f 100644
--- a/custos-core-services/pom.xml
+++ b/custos-core-services/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-core-services/resource-secret-core-service/pom.xml b/custos-core-services/resource-secret-core-service/pom.xml
index a965f71b..8a649477 100644
--- a/custos-core-services/resource-secret-core-service/pom.xml
+++ b/custos-core-services/resource-secret-core-service/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-core-services</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-core-services/resource-secret-core-service/src/main/helm/values.yaml b/custos-core-services/resource-secret-core-service/src/main/helm/values.yaml
index e2ee8ed9..2632d6da 100644
--- a/custos-core-services/resource-secret-core-service/src/main/helm/values.yaml
+++ b/custos-core-services/resource-secret-core-service/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 1
image:
- repository: apachecustos/${artifactId}
+ repository: ${docker.image.prefix}/${artifactId}
tag: "${project.version}"
pullPolicy: Always
diff --git a/custos-core-services/sharing-core-service/pom.xml b/custos-core-services/sharing-core-service/pom.xml
index fb45473b..fffa0a12 100644
--- a/custos-core-services/sharing-core-service/pom.xml
+++ b/custos-core-services/sharing-core-service/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-core-services</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-core-services/sharing-core-service/src/main/helm/values.yaml b/custos-core-services/sharing-core-service/src/main/helm/values.yaml
index 899b6e9b..0482cb0d 100644
--- a/custos-core-services/sharing-core-service/src/main/helm/values.yaml
+++ b/custos-core-services/sharing-core-service/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 1
image:
- repository: apachecustos/${artifactId}
+ repository: ${docker.image.prefix}/${artifactId}
tag: "${project.version}"
pullPolicy: Always
diff --git a/custos-core-services/tenant-profile-core-service/pom.xml b/custos-core-services/tenant-profile-core-service/pom.xml
index e3f77ec3..37738dc7 100644
--- a/custos-core-services/tenant-profile-core-service/pom.xml
+++ b/custos-core-services/tenant-profile-core-service/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-core-services</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-core-services/tenant-profile-core-service/src/main/helm/values.yaml b/custos-core-services/tenant-profile-core-service/src/main/helm/values.yaml
index 2ec5f496..d667b6b1 100644
--- a/custos-core-services/tenant-profile-core-service/src/main/helm/values.yaml
+++ b/custos-core-services/tenant-profile-core-service/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 1
image:
- repository: apachecustos/${artifactId}
+ repository: ${docker.image.prefix}/${artifactId}
tag: "${project.version}"
pullPolicy: Always
diff --git a/custos-core-services/user-profile-core-service/pom.xml b/custos-core-services/user-profile-core-service/pom.xml
index e362d78d..cb8ca2c8 100644
--- a/custos-core-services/user-profile-core-service/pom.xml
+++ b/custos-core-services/user-profile-core-service/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-core-services</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-core-services/user-profile-core-service/src/main/helm/values.yaml b/custos-core-services/user-profile-core-service/src/main/helm/values.yaml
index 899b6e9b..0482cb0d 100644
--- a/custos-core-services/user-profile-core-service/src/main/helm/values.yaml
+++ b/custos-core-services/user-profile-core-service/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 1
image:
- repository: apachecustos/${artifactId}
+ repository: ${docker.image.prefix}/${artifactId}
tag: "${project.version}"
pullPolicy: Always
diff --git a/custos-core-services/utility-services/custos-configuration-service/pom.xml b/custos-core-services/utility-services/custos-configuration-service/pom.xml
index 212721f5..93a03d9a 100644
--- a/custos-core-services/utility-services/custos-configuration-service/pom.xml
+++ b/custos-core-services/utility-services/custos-configuration-service/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-core-services</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-core-services/utility-services/custos-configuration-service/src/main/helm/values.yaml b/custos-core-services/utility-services/custos-configuration-service/src/main/helm/values.yaml
index 08d6c301..1d542cc8 100644
--- a/custos-core-services/utility-services/custos-configuration-service/src/main/helm/values.yaml
+++ b/custos-core-services/utility-services/custos-configuration-service/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 1
image:
- repository: apachecustos/${artifactId}
+ repository: ${docker.image.prefix}/${artifactId}
tag: "${project.version}"
pullPolicy: Always
diff --git a/custos-external-services-distributions/custos-grpc-web-proxy/pom.xml b/custos-external-services-distributions/custos-grpc-web-proxy/pom.xml
index 83c34abc..14107c68 100644
--- a/custos-external-services-distributions/custos-grpc-web-proxy/pom.xml
+++ b/custos-external-services-distributions/custos-grpc-web-proxy/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-external-services-distributions</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-external-services-distributions/custos-grpc-web-proxy/src/main/helm/values.yaml b/custos-external-services-distributions/custos-grpc-web-proxy/src/main/helm/values.yaml
index 02eaf67e..0d722254 100644
--- a/custos-external-services-distributions/custos-grpc-web-proxy/src/main/helm/values.yaml
+++ b/custos-external-services-distributions/custos-grpc-web-proxy/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 1
image:
- repository: apachecustos/${artifactId}
+ repository: ${docker.image.prefix}/${artifactId}
tag: "${project.version}"
pullPolicy: Always
@@ -75,7 +75,7 @@ role:
proxy:
- repository: apachecustos/${artifactId}
+ repository: ${docker.image.prefix}/${artifactId}
tag: "${project.version}"
port: 40000
adminport: 9901
diff --git a/custos-external-services-distributions/custos-keycloak/pom.xml b/custos-external-services-distributions/custos-keycloak/pom.xml
index 67d5dcd4..b2c8fd22 100644
--- a/custos-external-services-distributions/custos-keycloak/pom.xml
+++ b/custos-external-services-distributions/custos-keycloak/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>custos-external-services-distributions</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-external-services-distributions/pom.xml b/custos-external-services-distributions/pom.xml
index 61f79446..c0866bb4 100644
--- a/custos-external-services-distributions/pom.xml
+++ b/custos-external-services-distributions/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>custos</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-federated-services-clients/pom.xml b/custos-federated-services-clients/pom.xml
index 5170d39e..048fbba1 100644
--- a/custos-federated-services-clients/pom.xml
+++ b/custos-federated-services-clients/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-integration-core/pom.xml b/custos-integration-core/pom.xml
index 97b544a3..5b3750dc 100644
--- a/custos-integration-core/pom.xml
+++ b/custos-integration-core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-integration-services/agent-management-service-parent/agent-management-service-sidecar/pom.xml b/custos-integration-services/agent-management-service-parent/agent-management-service-sidecar/pom.xml
index 9b301506..8032551b 100644
--- a/custos-integration-services/agent-management-service-parent/agent-management-service-sidecar/pom.xml
+++ b/custos-integration-services/agent-management-service-parent/agent-management-service-sidecar/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>agent-management-service-parent</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-integration-services/agent-management-service-parent/agent-management-service/pom.xml b/custos-integration-services/agent-management-service-parent/agent-management-service/pom.xml
index 91996bc4..41bead62 100644
--- a/custos-integration-services/agent-management-service-parent/agent-management-service/pom.xml
+++ b/custos-integration-services/agent-management-service-parent/agent-management-service/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>agent-management-service-parent</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/helm/values.yaml b/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/helm/values.yaml
index 1b96aff4..443fdade 100644
--- a/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/helm/values.yaml
+++ b/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 1
image:
- repository: apachecustos/${artifactId}
+ repository: ${docker.image.prefix}/${artifactId}
tag: "${project.version}"
pullPolicy: IfNotPresent
@@ -70,7 +70,7 @@ tolerations: []
affinity: {}
proxy:
- repository: apachecustos/agent-management-service-sidecar
+ repository: ${docker.image.prefix}/agent-management-service-sidecar
tag: "${project.version}"
port: 50000
adminport: 9901
diff --git a/custos-integration-services/agent-management-service-parent/pom.xml b/custos-integration-services/agent-management-service-parent/pom.xml
index 2944ec4e..593ee67c 100644
--- a/custos-integration-services/agent-management-service-parent/pom.xml
+++ b/custos-integration-services/agent-management-service-parent/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-integration-services</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-integration-services/custos-integration-services-commons/pom.xml b/custos-integration-services/custos-integration-services-commons/pom.xml
index cfde8fcb..17025a2d 100644
--- a/custos-integration-services/custos-integration-services-commons/pom.xml
+++ b/custos-integration-services/custos-integration-services-commons/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-integration-services</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-integration-services/custos-integration-services-swagger/pom.xml b/custos-integration-services/custos-integration-services-swagger/pom.xml
index 79098fea..071adfaf 100644
--- a/custos-integration-services/custos-integration-services-swagger/pom.xml
+++ b/custos-integration-services/custos-integration-services-swagger/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-integration-services</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-integration-services/custos-integration-services-swagger/src/main/helm/values.yaml b/custos-integration-services/custos-integration-services-swagger/src/main/helm/values.yaml
index f1b38c00..738ff98a 100644
--- a/custos-integration-services/custos-integration-services-swagger/src/main/helm/values.yaml
+++ b/custos-integration-services/custos-integration-services-swagger/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 1
image:
- repository: apachecustos/${artifactId}
+ repository: ${docker.image.prefix}/${artifactId}
tag: "${project.version}"
pullPolicy: Always
diff --git a/custos-integration-services/group-management-service-parent/group-management-service-sidecar/pom.xml b/custos-integration-services/group-management-service-parent/group-management-service-sidecar/pom.xml
index 37329b0d..0cf4d85d 100644
--- a/custos-integration-services/group-management-service-parent/group-management-service-sidecar/pom.xml
+++ b/custos-integration-services/group-management-service-parent/group-management-service-sidecar/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>group-management-service-parent</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-integration-services/group-management-service-parent/group-management-service/pom.xml b/custos-integration-services/group-management-service-parent/group-management-service/pom.xml
index f191a173..f65f1a35 100644
--- a/custos-integration-services/group-management-service-parent/group-management-service/pom.xml
+++ b/custos-integration-services/group-management-service-parent/group-management-service/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>group-management-service-parent</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-integration-services/group-management-service-parent/group-management-service/src/main/helm/values.yaml b/custos-integration-services/group-management-service-parent/group-management-service/src/main/helm/values.yaml
index 25e9f8f0..1e69d456 100644
--- a/custos-integration-services/group-management-service-parent/group-management-service/src/main/helm/values.yaml
+++ b/custos-integration-services/group-management-service-parent/group-management-service/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 1
image:
- repository: apachecustos/${artifactId}
+ repository: ${docker.image.prefix}/${artifactId}
tag: "${project.version}"
pullPolicy: Always
@@ -70,7 +70,7 @@ tolerations: []
affinity: {}
proxy:
- repository: apachecustos/group-management-service-sidecar
+ repository: ${docker.image.prefix}/group-management-service-sidecar
tag: "${project.version}"
port: 50000
adminport: 9901
diff --git a/custos-integration-services/group-management-service-parent/pom.xml b/custos-integration-services/group-management-service-parent/pom.xml
index 13d31f97..159a94b6 100644
--- a/custos-integration-services/group-management-service-parent/pom.xml
+++ b/custos-integration-services/group-management-service-parent/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-integration-services</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-integration-services/identity-management-service-parent/identity-management-service-sidecar/pom.xml b/custos-integration-services/identity-management-service-parent/identity-management-service-sidecar/pom.xml
index 3bc1ddb3..289f5aaa 100644
--- a/custos-integration-services/identity-management-service-parent/identity-management-service-sidecar/pom.xml
+++ b/custos-integration-services/identity-management-service-parent/identity-management-service-sidecar/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>identity-management-service-parent</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-integration-services/identity-management-service-parent/identity-management-service/pom.xml b/custos-integration-services/identity-management-service-parent/identity-management-service/pom.xml
index f994ad75..c887cc95 100644
--- a/custos-integration-services/identity-management-service-parent/identity-management-service/pom.xml
+++ b/custos-integration-services/identity-management-service-parent/identity-management-service/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>identity-management-service-parent</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/helm/values.yaml b/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/helm/values.yaml
index eb81e614..0ce5f492 100644
--- a/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/helm/values.yaml
+++ b/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 1
image:
- repository: apachecustos/${artifactId}
+ repository: ${docker.image.prefix}/${artifactId}
tag: "${project.version}"
pullPolicy: Always
@@ -70,7 +70,7 @@ tolerations: []
affinity: {}
proxy:
- repository: apachecustos/identity-management-service-sidecar
+ repository: ${docker.image.prefix}/identity-management-service-sidecar
tag: "${project.version}"
port: 50000
adminport: 9901
diff --git a/custos-integration-services/identity-management-service-parent/pom.xml b/custos-integration-services/identity-management-service-parent/pom.xml
index f83b31ca..7d00a1f9 100644
--- a/custos-integration-services/identity-management-service-parent/pom.xml
+++ b/custos-integration-services/identity-management-service-parent/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-integration-services</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-integration-services/log-management-service-parent/log-management-service-sidecar/pom.xml b/custos-integration-services/log-management-service-parent/log-management-service-sidecar/pom.xml
index 7730d2cc..50ae7573 100644
--- a/custos-integration-services/log-management-service-parent/log-management-service-sidecar/pom.xml
+++ b/custos-integration-services/log-management-service-parent/log-management-service-sidecar/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>log-management-service-parent</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-integration-services/log-management-service-parent/log-management-service/pom.xml b/custos-integration-services/log-management-service-parent/log-management-service/pom.xml
index 7d5f7037..a5991512 100644
--- a/custos-integration-services/log-management-service-parent/log-management-service/pom.xml
+++ b/custos-integration-services/log-management-service-parent/log-management-service/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>log-management-service-parent</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-integration-services/log-management-service-parent/log-management-service/src/main/helm/values.yaml b/custos-integration-services/log-management-service-parent/log-management-service/src/main/helm/values.yaml
index b8103017..54380f34 100644
--- a/custos-integration-services/log-management-service-parent/log-management-service/src/main/helm/values.yaml
+++ b/custos-integration-services/log-management-service-parent/log-management-service/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 1
image:
- repository: apachecustos/${artifactId}
+ repository: ${docker.image.prefix}/${artifactId}
tag: "${project.version}"
pullPolicy: Always
@@ -75,7 +75,7 @@ role:
proxy:
- repository: apachecustos/log-management-service-sidecar
+ repository: ${docker.image.prefix}/log-management-service-sidecar
tag: "${project.version}"
port: 50000
webport: 50001
diff --git a/custos-integration-services/log-management-service-parent/pom.xml b/custos-integration-services/log-management-service-parent/pom.xml
index cba7a681..8c28e0ed 100644
--- a/custos-integration-services/log-management-service-parent/pom.xml
+++ b/custos-integration-services/log-management-service-parent/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-integration-services</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-integration-services/pom.xml b/custos-integration-services/pom.xml
index a607ece1..d021539c 100644
--- a/custos-integration-services/pom.xml
+++ b/custos-integration-services/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-integration-services/resource-secret-management-service-parent/pom.xml b/custos-integration-services/resource-secret-management-service-parent/pom.xml
index 499a67d0..4a1987c8 100644
--- a/custos-integration-services/resource-secret-management-service-parent/pom.xml
+++ b/custos-integration-services/resource-secret-management-service-parent/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-integration-services</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service-sidecar/pom.xml b/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service-sidecar/pom.xml
index f72b07db..c7c9fbd3 100644
--- a/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service-sidecar/pom.xml
+++ b/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service-sidecar/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>resource-secret-management-service-parent</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/pom.xml b/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/pom.xml
index b36d0186..5e48fc29 100644
--- a/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/pom.xml
+++ b/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>resource-secret-management-service-parent</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/helm/values.yaml b/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/helm/values.yaml
index 4dcbc552..1eae7330 100644
--- a/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/helm/values.yaml
+++ b/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 1
image:
- repository: apachecustos/${artifactId}
+ repository: ${docker.image.prefix}/${artifactId}
tag: "${project.version}"
pullPolicy: Always
@@ -75,7 +75,7 @@ role:
proxy:
- repository: apachecustos/resource-secret-management-service-sidecar
+ repository: ${docker.image.prefix}/resource-secret-management-service-sidecar
tag: "${project.version}"
port: 50000
webport: 50001
diff --git a/custos-integration-services/scim-service/pom.xml b/custos-integration-services/scim-service/pom.xml
index f9767744..c25fb86b 100644
--- a/custos-integration-services/scim-service/pom.xml
+++ b/custos-integration-services/scim-service/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-integration-services</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-integration-services/scim-service/src/main/helm/values.yaml b/custos-integration-services/scim-service/src/main/helm/values.yaml
index 7520b360..42f212dd 100644
--- a/custos-integration-services/scim-service/src/main/helm/values.yaml
+++ b/custos-integration-services/scim-service/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 1
image:
- repository: apachecustos/${artifactId}
+ repository: ${docker.image.prefix}/${artifactId}
tag: "${project.version}"
pullPolicy: Always
diff --git a/custos-integration-services/sharing-management-service-parent/pom.xml b/custos-integration-services/sharing-management-service-parent/pom.xml
index e9f49365..472a69a2 100644
--- a/custos-integration-services/sharing-management-service-parent/pom.xml
+++ b/custos-integration-services/sharing-management-service-parent/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-integration-services</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-integration-services/sharing-management-service-parent/sharing-management-service-sidecar/pom.xml b/custos-integration-services/sharing-management-service-parent/sharing-management-service-sidecar/pom.xml
index 9b65d19d..f541d79a 100644
--- a/custos-integration-services/sharing-management-service-parent/sharing-management-service-sidecar/pom.xml
+++ b/custos-integration-services/sharing-management-service-parent/sharing-management-service-sidecar/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>sharing-management-service-parent</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-integration-services/sharing-management-service-parent/sharing-management-service/pom.xml b/custos-integration-services/sharing-management-service-parent/sharing-management-service/pom.xml
index 48161dce..e6f455df 100644
--- a/custos-integration-services/sharing-management-service-parent/sharing-management-service/pom.xml
+++ b/custos-integration-services/sharing-management-service-parent/sharing-management-service/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>sharing-management-service-parent</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/helm/values.yaml b/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/helm/values.yaml
index 3ce15fd7..f2c09b0f 100644
--- a/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/helm/values.yaml
+++ b/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 1
image:
- repository: apachecustos/${artifactId}
+ repository: ${docker.image.prefix}/${artifactId}
tag: "${project.version}"
pullPolicy: Always
@@ -70,7 +70,7 @@ tolerations: []
affinity: {}
proxy:
- repository: apachecustos/sharing-management-service-sidecar
+ repository: ${docker.image.prefix}/sharing-management-service-sidecar
tag: "${project.version}"
port: 50000
adminport: 9901
diff --git a/custos-integration-services/tenant-management-service-parent/pom.xml b/custos-integration-services/tenant-management-service-parent/pom.xml
index 4d59908a..16aa0bac 100644
--- a/custos-integration-services/tenant-management-service-parent/pom.xml
+++ b/custos-integration-services/tenant-management-service-parent/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-integration-services</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-integration-services/tenant-management-service-parent/tenant-management-service-sidecar/pom.xml b/custos-integration-services/tenant-management-service-parent/tenant-management-service-sidecar/pom.xml
index afd66a83..e4baf940 100644
--- a/custos-integration-services/tenant-management-service-parent/tenant-management-service-sidecar/pom.xml
+++ b/custos-integration-services/tenant-management-service-parent/tenant-management-service-sidecar/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>tenant-management-service-parent</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-integration-services/tenant-management-service-parent/tenant-management-service/pom.xml b/custos-integration-services/tenant-management-service-parent/tenant-management-service/pom.xml
index ebb4dd3d..20279aa4 100644
--- a/custos-integration-services/tenant-management-service-parent/tenant-management-service/pom.xml
+++ b/custos-integration-services/tenant-management-service-parent/tenant-management-service/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>tenant-management-service-parent</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/helm/values.yaml b/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/helm/values.yaml
index 721c8589..29ae00dd 100644
--- a/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/helm/values.yaml
+++ b/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 1
image:
- repository: apachecustos/${artifactId}
+ repository: ${docker.image.prefix}/${artifactId}
tag: "${project.version}"
pullPolicy: Always
@@ -70,7 +70,7 @@ tolerations: []
affinity: {}
proxy:
- repository: apachecustos/tenant-management-service-sidecar
+ repository: ${docker.image.prefix}/tenant-management-service-sidecar
tag: "${project.version}"
port: 50000
adminport: 9901
diff --git a/custos-integration-services/user-management-service-parent/pom.xml b/custos-integration-services/user-management-service-parent/pom.xml
index 7d5a3ee5..a4bf0718 100644
--- a/custos-integration-services/user-management-service-parent/pom.xml
+++ b/custos-integration-services/user-management-service-parent/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos-integration-services</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-integration-services/user-management-service-parent/user-management-service-sidecar/pom.xml b/custos-integration-services/user-management-service-parent/user-management-service-sidecar/pom.xml
index cd215d1e..696f0bcf 100644
--- a/custos-integration-services/user-management-service-parent/user-management-service-sidecar/pom.xml
+++ b/custos-integration-services/user-management-service-parent/user-management-service-sidecar/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>user-management-service-parent</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-integration-services/user-management-service-parent/user-management-service/pom.xml b/custos-integration-services/user-management-service-parent/user-management-service/pom.xml
index a0cd5b2e..6c1f1147 100644
--- a/custos-integration-services/user-management-service-parent/user-management-service/pom.xml
+++ b/custos-integration-services/user-management-service-parent/user-management-service/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>user-management-service-parent</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-integration-services/user-management-service-parent/user-management-service/src/main/helm/values.yaml b/custos-integration-services/user-management-service-parent/user-management-service/src/main/helm/values.yaml
index 564c7014..f7dd5af1 100644
--- a/custos-integration-services/user-management-service-parent/user-management-service/src/main/helm/values.yaml
+++ b/custos-integration-services/user-management-service-parent/user-management-service/src/main/helm/values.yaml
@@ -5,7 +5,7 @@
replicaCount: 1
image:
- repository: apachecustos/${artifactId}
+ repository: ${docker.image.prefix}/${artifactId}
tag: "${project.version}"
pullPolicy: Always
@@ -70,7 +70,7 @@ tolerations: []
affinity: {}
proxy:
- repository: apachecustos/user-management-service-sidecar
+ repository: ${docker.image.prefix}/user-management-service-sidecar
tag: "${project.version}"
port: 50000
adminport: 9901
diff --git a/custos-tests/pom.xml b/custos-tests/pom.xml
index 517f221d..aa1d4504 100644
--- a/custos-tests/pom.xml
+++ b/custos-tests/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>custos</artifactId>
<groupId>org.apache.custos</groupId>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/custos-utilities/deployment-scripts/README.MD b/custos-utilities/deployment-scripts/README.MD
index 3a8fff1e..956be8be 100644
--- a/custos-utilities/deployment-scripts/README.MD
+++ b/custos-utilities/deployment-scripts/README.MD
@@ -30,4 +30,31 @@
- Keycloak
- Vault
- Custos Services
-
\ No newline at end of file
+
+
+##### Deploying Custos Services
+
+- First change the following parameters in pom.xml
+ - <ssh.username>CHANGE_ME</ssh.username> (your ssh key password)
+ - <ssh.privatekey>CHANGE_ME</ssh.privatekey> (your ssh privatekey)
+ - <host>CHANGE_ME</host> (your host)
+ - <spring.profiles.active>dev</spring.profiles.active> (yout profile)
+ - <vault.token>CHANGE_ME</vault.token> (your vault token)
+ - <iam.dev.username>CHANGE_ME}</iam.dev.username> ( keycloak username)
+ - <iam.dev.password>CHANGE_ME}</iam.dev.password> ( keycloak password)
+ - <cilogon.dev.id>CHANGE_ME</cilogon.dev.id> (cilogon client id )
+ - <cilogon.dev.sec>CHANGE_ME</cilogon.dev.sec> (cilogon client sec)
+ - <custos.email.password>CHANGE_ME</custos.email.password> (your email)
+ - <spring.datasource.username>CHANGE_ME</spring.datasource.username> (mysql database username)
+ - <spring.datasource.password>CHANGE_ME</spring.datasource.password> (myslq password)
+ - <docker.image.prefix>CHANGEME</docker.image.prefix> (dockerhub image prefix)
+ - <docker.image.repo>CHAGEME</docker.image.repo> (dockerhub repo account)
+
+- Build code
+ `mvn clean install -P container`
+
+- Push code images to repo
+ `mvn dockerfile:push -P container`
+
+- deploy artifacts
+ `mvn antrun:run -P scp-to-remote`
diff --git a/pom.xml b/pom.xml
index 95541f0e..f4abee0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
<groupId>org.apache.custos</groupId>
<artifactId>custos</artifactId>
<packaging>pom</packaging>
- <version>1.1</version>
+ <version>1.1-SNAPSHOT</version>
<modules>
<module>custos-core-services</module>
@@ -353,62 +353,37 @@
</profile>
<profile>
<id>container</id>
-<<<<<<< Updated upstream
- <properties>
- <spring.profiles.active>production</spring.profiles.active>
- <vault.token>s.SoaSEW6VF1zAHwiRp5hpzSf2</vault.token>
- <vault.scheme>http</vault.scheme>
- <vault.host>vault.vault.svc.cluster.local</vault.host>
- <vault.port>8200</vault.port>
- <vault.uri>http://vault.vault.svc.cluster.local:8200</vault.uri>
-=======
-<<<<<<< Updated upstream
-=======
<properties>
<spring.profiles.active>dev</spring.profiles.active>
- <vault.token>s.gqEMkyNMcotIi332CDiITUHf</vault.token>
+ <vault.token>{{token}}</vault.token>
<vault.scheme>https</vault.scheme>
<vault.host>https://vault.custos.scigap.org</vault.host>
<vault.port>31190</vault.port>
<vault.uri>https://vault.custos.scigap.org:31190</vault.uri>
->>>>>>> Stashed changes
+
<iam.dev.username>{{token}}</iam.dev.username>
<iam.dev.password>{{token}}</iam.dev.password>
<iam.staging.username>{{token}}</iam.staging.username>
<iam.staging.password>{{token}}</iam.staging.password>
-<<<<<<< Updated upstream
- <iam.production.username>admin</iam.production.username>
- <iam.production.password>dwqZkp5OOfKiew==</iam.production.password>
-=======
+
<iam.production.username>{{token}}</iam.production.username>
<iam.production.password>{{token}}</iam.production.password>
->>>>>>> Stashed changes
<cilogon.dev.id>{{token}}</cilogon.dev.id>
<cilogon.dev.sec>{{token}}</cilogon.dev.sec>
<cilogon.staging.id>{{token}}</cilogon.staging.id>
<cilogon.staging.sec>{{token}}</cilogon.staging.sec>
-<<<<<<< Updated upstream
- <cilogon.production.id>cilogon:/adminClient/2f039527fe4715c2f6f19eb0ae327ba7/1633292562101</cilogon.production.id>
- <cilogon.production.sec>qiOYx_WR3BAfFeE3y9tLFPAsRn2ytblkXIMCVwGJzl07GAdwmBQRfgVc2eW65ZzA2L2Wy7ByZexS0wTqWtUHRA</cilogon.production.sec>
- <custos.email.password>{{token}}</custos.email.password>
- <spring.datasource.username>root</spring.datasource.username>
- <spring.datasource.password>UtahSALTlakeCITY</spring.datasource.password>
-=======
+
<cilogon.production.id>{{token}}</cilogon.production.id>
<cilogon.production.sec>{{token}}</cilogon.production.sec>
<custos.email.password>{{token}}</custos.email.password>
<spring.datasource.username>root</spring.datasource.username>
<spring.datasource.password>root</spring.datasource.password>
->>>>>>> Stashed changes
+
</properties>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
-<<<<<<< Updated upstream
-=======
->>>>>>> Stashed changes
->>>>>>> Stashed changes
<build>
<resources>
<resource>
@@ -726,7 +701,7 @@
<email.version>1.5.0-b01</email.version>
<!-- <ssh.username>custos</ssh.username>-->
<ssh.username>custosadmin</ssh.username>
- <project.version>1.0</project.version>
+ <project.version>1.1-SNAPSHOT</project.version>
<clusterIssuer>letsencrypt-prod</clusterIssuer>