From c4beed1d3861c02985bdcae0031b22b24eb07c54 Mon Sep 17 00:00:00 2001
From: Makhtar DIAGNE <makhtar.diagne@teamdlab.com>
Date: Tue, 12 May 2020 14:41:34 +0200
Subject: [PATCH] [DEVOPS] Fix vitam-ui dpeloyment
---
api/api-iam/iam-commons/pom.xml | 2 +-
api/api-iam/iam-external-client/pom.xml | 2 +-
api/api-iam/iam-external/pom.xml | 2 +-
api/api-iam/iam-internal-client/pom.xml | 2 +-
api/api-iam/iam-internal/pom.xml | 2 +-
api/api-iam/iam-security/pom.xml | 2 +-
api/api-iam/pom.xml | 2 +-
api/api-security/pom.xml | 2 +-
api/api-security/security-client/pom.xml | 2 +-
api/api-security/security-commons/pom.xml | 2 +-
api/api-security/security-internal/pom.xml | 2 +-
api/pom.xml | 2 +-
.../packaging/sysconfig.cmd_line_args | 2 +-
cas/cas-server/pom.xml | 27 +++-
.../config/cas-server-application-dev.yml | 9 ++
cas/pom.xml | 2 +-
commons/commons-api/pom.xml | 2 +-
commons/commons-logbook/pom.xml | 2 +-
commons/commons-mongo/pom.xml | 2 +-
commons/commons-rest/pom.xml | 2 +-
commons/commons-security/pom.xml | 2 +-
commons/commons-test/pom.xml | 2 +-
commons/commons-utils/pom.xml | 2 +-
commons/commons-vitam/pom.xml | 2 +-
commons/pom.xml | 2 +-
cots/pom.xml | 2 +-
cots/vitamui-logstash/Makefile | 2 +-
cots/vitamui-logstash/pom.xml | 4 +-
cots/vitamui-logstash/templates/jvm.options | 2 -
cots/vitamui-mongo-express/package-lock.json | 72 +++++-----
cots/vitamui-mongo-express/pom.xml | 2 +-
cots/vitamui-mongod/pom.xml | 2 +-
cots/vitamui-nginx/pom.xml | 2 +-
.../group_vars/all/vitamui_vars.yml | 8 +-
deployment/pom.xml | 24 +++-
deployment/roles/checks/tasks/check_java.yml | 2 +-
.../roles/logstash/templates/jvm.options.j2 | 2 -
deployment/roles/vitamui/defaults/main.yml | 2 +-
.../iam-internal => files}/customer-init.yml | 0
.../ui/assets/{vitamui-logo.png => logo.png} | Bin
deployment/roles/vitamui/tasks/cas-server.yml | 10 --
deployment/roles/vitamui/tasks/ui.yml | 4 +-
.../templates/cas-server/application.yml.j2 | 72 ++++++----
.../cas-server/vitamui-cas-server.json.j2 | 17 ---
.../ui-identity-admin/application.yml.j2 | 5 +-
.../templates/ui-identity/application.yml.j2 | 5 +-
.../templates/ui-portal/application.yml.j2 | 5 +-
docs/Modules Cots.md | 2 +-
integration-tests/pom.xml | 2 +-
packaging/pom.xml | 2 +-
pom.xml | 2 +-
.../mongo/database_scripts_templater.yml | 4 +-
tools/docker/mongo/mongo_cluster.yml | 20 +--
tools/docker/mongo/mongo_vars_dev.yml | 50 +++----
tools/docker/mongo/start_dev.sh | 14 +-
tools/docker/vitamui-osbase/pom.xml | 4 +-
tools/docker/vitamui/pom.xml | 4 +-
tools/start_vitamui.sh | 2 +-
tools/start_vitamui2.sh | 2 +-
ui/pom.xml | 2 +-
ui/ui-commons/pom.xml | 2 +-
ui/ui-frontend-common/package-lock.json | 123 ++++++++++++++----
ui/ui-frontend-common/package.json | 2 +-
ui/ui-frontend-common/pom.xml | 2 +-
ui/ui-frontend/package-lock.json | 90 ++++++++++---
ui/ui-frontend/package.json | 4 +-
ui/ui-frontend/pom.xml | 2 +-
ui/ui-identity/pom.xml | 2 +-
ui/ui-portal/pom.xml | 2 +-
69 files changed, 418 insertions(+), 247 deletions(-)
rename deployment/roles/vitamui/{templates/iam-internal => files}/customer-init.yml (100%)
rename deployment/roles/vitamui/files/ui/assets/{vitamui-logo.png => logo.png} (100%)
delete mode 100644 deployment/roles/vitamui/tasks/cas-server.yml
delete mode 100644 deployment/roles/vitamui/templates/cas-server/vitamui-cas-server.json.j2
diff --git a/api/api-iam/iam-commons/pom.xml b/api/api-iam/iam-commons/pom.xml
index 095a20e7..cb4bec57 100644
--- a/api/api-iam/iam-commons/pom.xml
+++ b/api/api-iam/iam-commons/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>api-iam</artifactId>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/api/api-iam/iam-external-client/pom.xml b/api/api-iam/iam-external-client/pom.xml
index de732b56..cf556322 100644
--- a/api/api-iam/iam-external-client/pom.xml
+++ b/api/api-iam/iam-external-client/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>api-iam</artifactId>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/api/api-iam/iam-external/pom.xml b/api/api-iam/iam-external/pom.xml
index e0f5a7d0..b9709263 100644
--- a/api/api-iam/iam-external/pom.xml
+++ b/api/api-iam/iam-external/pom.xml
@@ -11,7 +11,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>api-iam</artifactId>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<properties>
diff --git a/api/api-iam/iam-internal-client/pom.xml b/api/api-iam/iam-internal-client/pom.xml
index c9f72a68..f07e886b 100644
--- a/api/api-iam/iam-internal-client/pom.xml
+++ b/api/api-iam/iam-internal-client/pom.xml
@@ -11,7 +11,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>api-iam</artifactId>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/api/api-iam/iam-internal/pom.xml b/api/api-iam/iam-internal/pom.xml
index 06f594ed..696e6548 100644
--- a/api/api-iam/iam-internal/pom.xml
+++ b/api/api-iam/iam-internal/pom.xml
@@ -11,7 +11,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>api-iam</artifactId>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<properties>
diff --git a/api/api-iam/iam-security/pom.xml b/api/api-iam/iam-security/pom.xml
index 30e2fc9c..2b5ba85a 100644
--- a/api/api-iam/iam-security/pom.xml
+++ b/api/api-iam/iam-security/pom.xml
@@ -12,7 +12,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>api-iam</artifactId>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/api/api-iam/pom.xml b/api/api-iam/pom.xml
index 5cca9bc7..658b7cc1 100644
--- a/api/api-iam/pom.xml
+++ b/api/api-iam/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>api-parent</artifactId>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<modules>
diff --git a/api/api-security/pom.xml b/api/api-security/pom.xml
index f8696595..b74ccfb1 100644
--- a/api/api-security/pom.xml
+++ b/api/api-security/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>api-parent</artifactId>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<modules>
diff --git a/api/api-security/security-client/pom.xml b/api/api-security/security-client/pom.xml
index 4e964ba6..eeb94482 100644
--- a/api/api-security/security-client/pom.xml
+++ b/api/api-security/security-client/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>api-security</artifactId>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/api/api-security/security-commons/pom.xml b/api/api-security/security-commons/pom.xml
index 073c949e..a5e9faba 100644
--- a/api/api-security/security-commons/pom.xml
+++ b/api/api-security/security-commons/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>api-security</artifactId>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/api/api-security/security-internal/pom.xml b/api/api-security/security-internal/pom.xml
index 55a81782..c61200a9 100644
--- a/api/api-security/security-internal/pom.xml
+++ b/api/api-security/security-internal/pom.xml
@@ -11,7 +11,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>api-security</artifactId>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<properties>
diff --git a/api/pom.xml b/api/pom.xml
index fd324e1b..cd84bd58 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>parent</artifactId>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<modules>
diff --git a/cas/cas-server/packaging/sysconfig.cmd_line_args b/cas/cas-server/packaging/sysconfig.cmd_line_args
index b6ab15fe..c2eb8643 100644
--- a/cas/cas-server/packaging/sysconfig.cmd_line_args
+++ b/cas/cas-server/packaging/sysconfig.cmd_line_args
@@ -1 +1 @@
-CMD_LINE_ARGS=-jar "/vitamui/app/__NAME__/__JAR_FILE__" $JAVA_OPTS --spring.config.location="/vitamui/conf/__NAME__/application.yml"
+CMD_LINE_ARGS=-jar "/vitamui/app/__NAME__/__JAR_FILE__" $JAVA_OPTS --spring.config.additional-location="/vitamui/conf/__NAME__/application.yml"
diff --git a/cas/cas-server/pom.xml b/cas/cas-server/pom.xml
index a33ad127..74cb2703 100644
--- a/cas/cas-server/pom.xml
+++ b/cas/cas-server/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>cas</artifactId>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<artifactId>cas-server</artifactId>
<packaging>war</packaging>
@@ -17,10 +17,10 @@
<micrometer.version>1.3.0</micrometer.version>
<mockito.version>1.10.19</mockito.version>
<spring.boot.version>2.2.0.RELEASE</spring.boot.version>
- <spring.security.version>5.2.0.RELEASE</spring.security.version>
- <spring.version>5.2.0.RELEASE</spring.version>
+ <spring.cloud.consul.version>2.2.2.RELEASE</spring.cloud.consul.version>
<spring.security.version>5.2.0.RELEASE</spring.security.version>
<spring.test.version>5.2.0.RELEASE</spring.test.version>
+ <spring.version>5.2.0.RELEASE</spring.version>
<swagger.version>1.5.18</swagger.version>
<thymeleaf-spring5.version>3.0.11.RELEASE</thymeleaf-spring5.version>
@@ -35,6 +35,20 @@
<artifactId>iam-external-client</artifactId>
</dependency>
+ <!-- Consul -->
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-consul-discovery</artifactId>
+ <version>${spring.cloud.consul.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-commons</artifactId>
+ <version>${spring.cloud.consul.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
<!-- CAS server -->
<dependency>
<groupId>org.apereo.cas</groupId>
@@ -49,6 +63,12 @@
<groupId>org.apereo.cas</groupId>
<artifactId>cas-server-support-mongo-service-registry</artifactId>
<version>${cas.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>io.dropwizard.metrics</groupId>
+ <artifactId>metrics-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- authentication delegation -->
@@ -230,6 +250,7 @@
<version>${cas.version}</version>
</dependency>
+
<!-- OAuth support -->
<dependency>
<groupId>org.apereo.cas</groupId>
diff --git a/cas/cas-server/src/main/config/cas-server-application-dev.yml b/cas/cas-server/src/main/config/cas-server-application-dev.yml
index 283291ea..23773137 100644
--- a/cas/cas-server/src/main/config/cas-server-application-dev.yml
+++ b/cas/cas-server/src/main/config/cas-server-application-dev.yml
@@ -18,6 +18,14 @@ server:
context-path: /cas
+management:
+ server:
+ port: 7080
+ ssl:
+ enabled: false
+#management.metrics.export.prometheus.enabled: true
+
+
vitamui.cas.tenant.identifier: -1
vitamui.cas.identity: cas
iam-client:
@@ -142,6 +150,7 @@ theme:
primary: '#ff4a54'
secondary: '#241f63'
+debug: true
logging:
config: src/main/config/logback-dev.xml
level:
diff --git a/cas/pom.xml b/cas/pom.xml
index e8bb7255..5c639015 100644
--- a/cas/pom.xml
+++ b/cas/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>parent</artifactId>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<artifactId>cas</artifactId>
<packaging>pom</packaging>
diff --git a/commons/commons-api/pom.xml b/commons/commons-api/pom.xml
index 74d57ec7..30fc1a0e 100644
--- a/commons/commons-api/pom.xml
+++ b/commons/commons-api/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>commons-parent</artifactId>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/commons/commons-logbook/pom.xml b/commons/commons-logbook/pom.xml
index 03f9cf9b..f05c776d 100644
--- a/commons/commons-logbook/pom.xml
+++ b/commons/commons-logbook/pom.xml
@@ -13,7 +13,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>commons-parent</artifactId>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/commons/commons-mongo/pom.xml b/commons/commons-mongo/pom.xml
index 6f8ec36a..29e775a9 100644
--- a/commons/commons-mongo/pom.xml
+++ b/commons/commons-mongo/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>commons-parent</artifactId>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/commons/commons-rest/pom.xml b/commons/commons-rest/pom.xml
index a720d52d..4afda1c2 100644
--- a/commons/commons-rest/pom.xml
+++ b/commons/commons-rest/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>commons-parent</artifactId>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/commons/commons-security/pom.xml b/commons/commons-security/pom.xml
index a66ed8e5..85136747 100644
--- a/commons/commons-security/pom.xml
+++ b/commons/commons-security/pom.xml
@@ -11,7 +11,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>commons-parent</artifactId>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/commons/commons-test/pom.xml b/commons/commons-test/pom.xml
index e5052b3e..7981da30 100644
--- a/commons/commons-test/pom.xml
+++ b/commons/commons-test/pom.xml
@@ -11,7 +11,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>commons-parent</artifactId>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/commons/commons-utils/pom.xml b/commons/commons-utils/pom.xml
index 9e959a52..ca29c392 100644
--- a/commons/commons-utils/pom.xml
+++ b/commons/commons-utils/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>commons-parent</artifactId>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/commons/commons-vitam/pom.xml b/commons/commons-vitam/pom.xml
index 2886407d..28e9d2d8 100644
--- a/commons/commons-vitam/pom.xml
+++ b/commons/commons-vitam/pom.xml
@@ -11,7 +11,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>commons-parent</artifactId>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/commons/pom.xml b/commons/pom.xml
index 28d3fdf5..e48ae7cc 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>parent</artifactId>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<artifactId>commons-parent</artifactId>
diff --git a/cots/pom.xml b/cots/pom.xml
index c14837e3..5ae6ec6b 100644
--- a/cots/pom.xml
+++ b/cots/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>parent</artifactId>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<modules>
diff --git a/cots/vitamui-logstash/Makefile b/cots/vitamui-logstash/Makefile
index dc4955ca..7ef76b6b 100644
--- a/cots/vitamui-logstash/Makefile
+++ b/cots/vitamui-logstash/Makefile
@@ -6,7 +6,7 @@
# Args parsing
NAME := logstash
VERSION := 0.0.0
-LOGSTASH_VERSION := 6.4.2
+LOGSTASH_VERSION := 7.6.0
DEPENDENCIES := systemd,java-11-openjdk
diff --git a/cots/vitamui-logstash/pom.xml b/cots/vitamui-logstash/pom.xml
index 277e1d29..54eb950f 100644
--- a/cots/vitamui-logstash/pom.xml
+++ b/cots/vitamui-logstash/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>cots</artifactId>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<properties>
@@ -43,7 +43,7 @@
<argument>rpm</argument>
<argument>NAME=${project.artifactId}</argument>
<argument>VERSION=${project.version}</argument>
- <argument>LOGSTASH_VERSION=6.4.2</argument>
+ <argument>LOGSTASH_VERSION=7.6.0</argument>
<argument>USER=vitamuidb</argument>
<!-- Call packaging dir makefile for use preset functions and templating -->
<argument>PACKAGING_MAKEFILE=${vitamui.project.root}/tools/packaging/Makefile</argument>
diff --git a/cots/vitamui-logstash/templates/jvm.options b/cots/vitamui-logstash/templates/jvm.options
index daae9d96..3534023d 100644
--- a/cots/vitamui-logstash/templates/jvm.options
+++ b/cots/vitamui-logstash/templates/jvm.options
@@ -17,8 +17,6 @@
################################################################
## GC configuration
--XX:+UseParNewGC
--XX:+UseConcMarkSweepGC
-XX:CMSInitiatingOccupancyFraction=75
-XX:+UseCMSInitiatingOccupancyOnly
diff --git a/cots/vitamui-mongo-express/package-lock.json b/cots/vitamui-mongo-express/package-lock.json
index 0f6c4964..565577bf 100644
--- a/cots/vitamui-mongo-express/package-lock.json
+++ b/cots/vitamui-mongo-express/package-lock.json
@@ -160,7 +160,7 @@
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"requires": {
"ansi-styles": "^2.2.1",
- "escape-string-regexp": "^1.0.2",
+ "escape-string-regexp": "^1.0.2-SNAPSHOT",
"has-ansi": "^2.0.0",
"strip-ansi": "^3.0.0",
"supports-color": "^2.0.0"
@@ -275,8 +275,8 @@
"integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
},
"core-util-is": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+ "version": "1.0.2-SNAPSHOT",
+ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2-SNAPSHOT.tgz",
"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
},
"crc": {
@@ -343,13 +343,13 @@
"integrity": "sha1-eIwNLB3iyBuebowBhDtrl+uSB1A=",
"requires": {
"inherits": "2.0.3",
- "setprototypeof": "1.0.2",
+ "setprototypeof": "1.0.2-SNAPSHOT",
"statuses": ">= 1.3.1 < 2"
}
},
"setprototypeof": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.2.tgz",
+ "version": "1.0.2-SNAPSHOT",
+ "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.2-SNAPSHOT.tgz",
"integrity": "sha1-gaVSFB7BBLiOic44MQOtXGZWTQg="
}
}
@@ -455,8 +455,8 @@
"integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
},
"encodeurl": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+ "version": "1.0.2-SNAPSHOT",
+ "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2-SNAPSHOT.tgz",
"integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
},
"error-ex": {
@@ -559,7 +559,7 @@
"cookie-signature": "1.0.6",
"debug": "2.6.9",
"depd": "~1.1.2",
- "encodeurl": "~1.0.2",
+ "encodeurl": "~1.0.2-SNAPSHOT",
"escape-html": "~1.0.3",
"etag": "~1.8.1",
"finalhandler": "1.1.1",
@@ -698,7 +698,7 @@
"integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==",
"requires": {
"debug": "2.6.9",
- "encodeurl": "~1.0.2",
+ "encodeurl": "~1.0.2-SNAPSHOT",
"escape-html": "~1.0.3",
"on-finished": "~2.3.0",
"parseurl": "~1.3.2",
@@ -764,7 +764,7 @@
"read-all-stream": "^3.0.0",
"readable-stream": "^2.0.5",
"timed-out": "^3.0.0",
- "unzip-response": "^1.0.2",
+ "unzip-response": "^1.0.2-SNAPSHOT",
"url-parse-lax": "^1.0.0"
},
"dependencies": {
@@ -873,8 +873,8 @@
"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
},
"is-finite": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
+ "version": "1.0.2-SNAPSHOT",
+ "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2-SNAPSHOT.tgz",
"integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
"requires": {
"number-is-nan": "^1.0.0"
@@ -919,8 +919,8 @@
"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
},
"is-windows": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+ "version": "1.0.2-SNAPSHOT",
+ "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2-SNAPSHOT.tgz",
"integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
},
"isarray": {
@@ -1057,7 +1057,7 @@
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz",
"integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
"requires": {
- "pseudomap": "^1.0.2",
+ "pseudomap": "^1.0.2-SNAPSHOT",
"yallist": "^2.1.2"
}
},
@@ -1184,7 +1184,7 @@
"morgan": "^1.9.0",
"serve-favicon": "^2.5.0",
"swig-templates": "2.0.2",
- "update-notifier": "1.0.2"
+ "update-notifier": "1.0.2-SNAPSHOT"
}
},
"mongodb": {
@@ -1292,13 +1292,13 @@
}
},
"os-homedir": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+ "version": "1.0.2-SNAPSHOT",
+ "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2-SNAPSHOT.tgz",
"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
},
"os-tmpdir": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+ "version": "1.0.2-SNAPSHOT",
+ "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2-SNAPSHOT.tgz",
"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
},
"osenv": {
@@ -1377,8 +1377,8 @@
}
},
"pseudomap": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+ "version": "1.0.2-SNAPSHOT",
+ "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2-SNAPSHOT.tgz",
"integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
},
"qs": {
@@ -1567,7 +1567,7 @@
"debug": "2.6.9",
"depd": "~1.1.2",
"destroy": "~1.0.4",
- "encodeurl": "~1.0.2",
+ "encodeurl": "~1.0.2-SNAPSHOT",
"escape-html": "~1.0.3",
"etag": "~1.8.1",
"fresh": "0.5.2",
@@ -1610,7 +1610,7 @@
"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz",
"integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==",
"requires": {
- "encodeurl": "~1.0.2",
+ "encodeurl": "~1.0.2-SNAPSHOT",
"escape-html": "~1.0.3",
"parseurl": "~1.3.2",
"send": "0.16.2"
@@ -1660,8 +1660,8 @@
"integrity": "sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo="
},
"string-width": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+ "version": "1.0.2-SNAPSHOT",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2-SNAPSHOT.tgz",
"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
"requires": {
"code-point-at": "^1.0.0",
@@ -1741,8 +1741,8 @@
}
},
"uglify-to-browserify": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
+ "version": "1.0.2-SNAPSHOT",
+ "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2-SNAPSHOT.tgz",
"integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc="
},
"uid-safe": {
@@ -1764,13 +1764,13 @@
"integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
},
"unzip-response": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz",
+ "version": "1.0.2-SNAPSHOT",
+ "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2-SNAPSHOT.tgz",
"integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4="
},
"update-notifier": {
- "version": "1.0.2",
- "resolved": "http://registry.npmjs.org/update-notifier/-/update-notifier-1.0.2.tgz",
+ "version": "1.0.2-SNAPSHOT",
+ "resolved": "http://registry.npmjs.org/update-notifier/-/update-notifier-1.0.2-SNAPSHOT.tgz",
"integrity": "sha1-J8kFGRltwVAVvgKjTqUphv6riHc=",
"requires": {
"boxen": "^0.6.0",
@@ -1792,8 +1792,8 @@
}
},
"util-deprecate": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+ "version": "1.0.2-SNAPSHOT",
+ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2-SNAPSHOT.tgz",
"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
},
"utils-merge": {
@@ -1865,7 +1865,7 @@
"resolved": "http://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
"integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
"requires": {
- "camelcase": "^1.0.2",
+ "camelcase": "^1.0.2-SNAPSHOT",
"cliui": "^2.1.0",
"decamelize": "^1.0.0",
"window-size": "0.1.0"
diff --git a/cots/vitamui-mongo-express/pom.xml b/cots/vitamui-mongo-express/pom.xml
index fe3e3e05..56bafba6 100644
--- a/cots/vitamui-mongo-express/pom.xml
+++ b/cots/vitamui-mongo-express/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>cots</artifactId>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<properties>
diff --git a/cots/vitamui-mongod/pom.xml b/cots/vitamui-mongod/pom.xml
index fc87c799..1de78bf3 100644
--- a/cots/vitamui-mongod/pom.xml
+++ b/cots/vitamui-mongod/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>cots</artifactId>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<properties>
diff --git a/cots/vitamui-nginx/pom.xml b/cots/vitamui-nginx/pom.xml
index 3b9c80b1..97046206 100644
--- a/cots/vitamui-nginx/pom.xml
+++ b/cots/vitamui-nginx/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>cots</artifactId>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<properties>
diff --git a/deployment/environments/group_vars/all/vitamui_vars.yml b/deployment/environments/group_vars/all/vitamui_vars.yml
index 0ce0ebe5..d5e299ac 100755
--- a/deployment/environments/group_vars/all/vitamui_vars.yml
+++ b/deployment/environments/group_vars/all/vitamui_vars.yml
@@ -60,7 +60,7 @@ vitamui:
vitamui_level: "INFO"
# Custom directories linked to the module
dirs:
- - "{{ vitam_defaults.folder.root_path }}/conf/assets"
+ - "{{ vitamui_defaults.folder.root_path }}/conf/assets"
identity_admin:
host: "identity-admin.service.consul"
vitamui_component: "ui-identity-admin"
@@ -81,7 +81,7 @@ vitamui:
vitamui_level: "INFO"
# Custom directories linked to the module
dirs:
- - "{{ vitam_defaults.folder.root_path }}/conf/assets"
+ - "{{ vitamui_defaults.folder.root_path }}/conf/assets"
portal:
host: "portal.service.consul"
vitamui_component: "ui-portal"
@@ -102,7 +102,7 @@ vitamui:
vitamui_level: "INFO"
# Custom directories linked to the module
dirs:
- - "{{ vitam_defaults.folder.root_path }}/conf/assets"
+ - "{{ vitamui_defaults.folder.root_path }}/conf/assets"
iam_external:
host: "iam-external.service.consul"
vitamui_component: "iam-external"
@@ -152,7 +152,7 @@ vitamui:
store_name: "cas-server"
service_name: "vitamui-cas-server"
port_service: 8001
- port_admin: 7001 # declared but is useless
+ port_admin: 7001
secure: true
jvm_log: false
logging_level: "INFO"
diff --git a/deployment/pom.xml b/deployment/pom.xml
index 6404a891..8d6f0d45 100644
--- a/deployment/pom.xml
+++ b/deployment/pom.xml
@@ -4,11 +4,33 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>parent</artifactId>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<artifactId>deployment</artifactId>
<name>VITAMUI Deployment - Stub</name>
<packaging>pom</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>assembly-ansible.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
\ No newline at end of file
diff --git a/deployment/roles/checks/tasks/check_java.yml b/deployment/roles/checks/tasks/check_java.yml
index fbc0f858..620d8eb6 100644
--- a/deployment/roles/checks/tasks/check_java.yml
+++ b/deployment/roles/checks/tasks/check_java.yml
@@ -21,4 +21,4 @@
package:
name: "java-11-openjdk-headless"
state: present
- when: ansible_os_family == "RedHat
\ No newline at end of file
+ when: ansible_os_family == "RedHat"
\ No newline at end of file
diff --git a/deployment/roles/logstash/templates/jvm.options.j2 b/deployment/roles/logstash/templates/jvm.options.j2
index 159fb24f..8c325052 100644
--- a/deployment/roles/logstash/templates/jvm.options.j2
+++ b/deployment/roles/logstash/templates/jvm.options.j2
@@ -17,8 +17,6 @@
################################################################
## GC configuration
--XX:+UseParNewGC
--XX:+UseConcMarkSweepGC
-XX:CMSInitiatingOccupancyFraction=75
-XX:+UseCMSInitiatingOccupancyOnly
diff --git a/deployment/roles/vitamui/defaults/main.yml b/deployment/roles/vitamui/defaults/main.yml
index 56ceb62d..a84ca7b5 100644
--- a/deployment/roles/vitamui/defaults/main.yml
+++ b/deployment/roles/vitamui/defaults/main.yml
@@ -2,7 +2,7 @@
# defaults file for common
memory_opts: "-Xms512m -Xmx512m"
-gc_opts: "-Xloggc:{{ vitamui_folder_log }}/gc.log -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=10M -XX:+PrintGCDetails -XX:+PrintGCApplicationStoppedTime"
+gc_opts: ""
java_opts: ""
java_args: ""
service_name: "{{ vitamui_struct.service_name }}"
diff --git a/deployment/roles/vitamui/templates/iam-internal/customer-init.yml b/deployment/roles/vitamui/files/customer-init.yml
similarity index 100%
rename from deployment/roles/vitamui/templates/iam-internal/customer-init.yml
rename to deployment/roles/vitamui/files/customer-init.yml
diff --git a/deployment/roles/vitamui/files/ui/assets/vitamui-logo.png b/deployment/roles/vitamui/files/ui/assets/logo.png
similarity index 100%
rename from deployment/roles/vitamui/files/ui/assets/vitamui-logo.png
rename to deployment/roles/vitamui/files/ui/assets/logo.png
diff --git a/deployment/roles/vitamui/tasks/cas-server.yml b/deployment/roles/vitamui/tasks/cas-server.yml
deleted file mode 100644
index 31f3a30b..00000000
--- a/deployment/roles/vitamui/tasks/cas-server.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-- name: apply consul conf when cas-server ONLY
- template:
- src: "cas-server/vitamui-cas-server.json.j2"
- dest: "{{ vitamui_conf_consul }}/vitamui-cas-server.json"
- owner: "{{ vitamui_defaults.users.vitamui }}"
- group: "{{ vitamui_defaults.users.group }}"
- mode: "{{ vitamui_defaults.folder.folder_permission }}"
- notify:
- - restart consul
- - restart service
\ No newline at end of file
diff --git a/deployment/roles/vitamui/tasks/ui.yml b/deployment/roles/vitamui/tasks/ui.yml
index 90c315f9..fe17884b 100644
--- a/deployment/roles/vitamui/tasks/ui.yml
+++ b/deployment/roles/vitamui/tasks/ui.yml
@@ -1,6 +1,6 @@
- name: Ensure asset directory is present
file:
- path: "{{ vitam_defaults.folder.root_path}}/conf/assets"
+ path: "{{ vitamui_defaults.folder.root_path}}/conf/assets"
state: directory
owner: "{{ vitamui_defaults.users.vitamui }}"
group: "{{ vitamui_defaults.users.group }}"
@@ -9,7 +9,7 @@
- name: Deploy custom files for UI.
copy:
src: "{{ item }}"
- dest: "{{ vitam_defaults.folder.root_path}}/conf/assets"
+ dest: "{{ vitamui_defaults.folder.root_path}}/conf/assets"
owner: "{{ vitamui_defaults.users.vitamui }}"
group: "{{ vitamui_defaults.users.group }}"
mode: "{{ vitamui_defaults.folder.folder_permission }}"
diff --git a/deployment/roles/vitamui/templates/cas-server/application.yml.j2 b/deployment/roles/vitamui/templates/cas-server/application.yml.j2
index 21fa8aeb..c9ece05e 100644
--- a/deployment/roles/vitamui/templates/cas-server/application.yml.j2
+++ b/deployment/roles/vitamui/templates/cas-server/application.yml.j2
@@ -1,3 +1,14 @@
+spring:
+ cloud:
+ consul:
+ enabled: true
+ host: consul.service.consul
+ discovery:
+ preferIpAddress: true
+ tags: {{ consul_tags }}
+spring.application.name: cas-server
+
+
server:
{% if vitamui_struct.secure|lower == "true" %}
ssl:
@@ -14,6 +25,14 @@ server:
context-path: /cas
servlet.session.cookie.path: /cas
{% endif %}
+ tomcat.basedir: {{ vitamui_folder_conf }}/tomcat
+
+
+management:
+ server:
+ port: {{ vitamui_struct.port_admin }}
+ ssl:
+ enabled: false
vitamui.cas.tenant.identifier: {{ vitamui_platform_informations.cas_tenant }}
@@ -40,17 +59,23 @@ cas.authn.accept.users:
cas.messageBundle.baseNames: classpath:overriden_messages,classpath:messages
+
{% if vitamui.cas_server.base_url is undefined %}
cas.tgc.path: /cas
{% endif %}
cas.tgc.secure: false
cas.tgc.crypto.enabled: false
-cas.webflow.crypto.enabled: false
-cas.authn.pac4j.cookie.crypto.enabled: true
+cas.webflow.crypto.enabled: true
cas.authn.pm.reset.crypto.enabled: true
-cas.ticket.tgt.timeout.maxTimeToLiveInSeconds: 1200
+##
+# CAS Web Application Session Configuration
+#
+# 4 (hours) * 60 (minutes) * 60 (seconds)
+#server.servlet.session.timeout: PT14400S
+#cas.ticket.tgt.hardTimeout.timeToKillInSeconds: 14400
+
{% if vitamui.cas_server.base_url is defined %}
cas.server.prefix: {{ vitamui.cas_server.base_url }}
@@ -66,27 +91,19 @@ cas.serviceRegistry.mongo.password: {{ mongodb.cas.password }}
cas.authn.surrogate.separator: ","
-## Useless because of IamSurrogateRestAuthenticationService:
-# cas.authn.surrogate.rest.url: xxx
-# cas.authn.surrogate.rest.method: GET
cas.authn.surrogate.sms.attributeName: fakeNameToBeSureToFindNoAttributeAndNeverSendAnSMS
cas.authn.pm.enabled: true
-
-## Useless because of IamRestPasswordManagementService:
-# cas.authn.pm.rest.endpointUrlEmail: xxx
-# cas.authn.pm.rest.endpointUrlSecurityQuestions: xxx
-# cas.authn.pm.rest.endpointUrlChange: xxx
-
cas.authn.pm.policyPattern: {{ lookup('file', "{{ inventory_dir }}/templates/policy_pattern.regex") }}
cas.authn.pm.reset.mail.subject: Requete de reinitialisation de mot de passe
cas.authn.pm.reset.mail.text: "Changez de mot de passe via le lien: %s"
cas.authn.pm.reset.mail.from: {{ smtp.cas.sender }}
cas.authn.pm.reset.expirationMinutes: {{ smtp.cas.expiration }}
-cas.authn.pm.reset.mail.attributeName: xxx
+cas.authn.pm.reset.mail.attributeName: email
cas.authn.pm.reset.securityQuestionsEnabled: false
+cas.authn.pm.reset.includeServerIpAddress: false
cas.authn.pm.autoLogin: true
# Used to sign/encrypt the password-reset link
@@ -110,11 +127,6 @@ spring.mail.properties.mail.smtps.ssl.trust: "{{ smtp.smtps.trust|lower }}"
spring.mail.properties.mail.smtps.timeout: {{ smtp.smtps.timeout|default('8000') }}
{% endif %}
-# TODO OMA : check if working if not declared
-{% if sms.enabled|lower == "true" %}
-cas.authn.mfa.globalProviderId: mfa-sms
-{% endif %}
-
cas.authn.throttle.failure.threshold: 2
cas.authn.throttle.failure.rangeSeconds: 3
@@ -126,12 +138,10 @@ cas:
redirectParameter: next
-cas.adminPagesSecurity.ip: .*
-cas.monitor.endpoints.sensitive: false
-cas.monitor.endpoints.enabled: true
-endpoints.sensitive: false
-endpoints.enabled: true
-management.security.enabled: false
+management.endpoints.enabled-by-default: true
+management.endpoints.web.exposure.include: '*'
+cas.monitor.endpoints.endpoint.defaults.access[0]: PERMIT
+management.metrics.export.prometheus.enabled: true
{% if sms.enabled|lower == "true" %}
@@ -151,12 +161,23 @@ token.api.cas: tokcas_ie6UZsEcHIWrfv2x
ip.header: X-Real-IP
+# 8 hours in seconds
+api.token.ttl: 28800
+
+
server-identity:
identityName: {{ vitamui_site_name }}
identityRole: {{ vitamui_struct.vitamui_component }}
identityServerId: 1
+# Example to override theme colors and logo
+theme:
+# vitam-logo: /absolute/path/to/logo.png
+# vitamui-logo-large: /absolute/path/to/logo.png
+ primary: '#ff4a54'
+ secondary: '#241f63'
+
logging:
config: {{ vitamui_folder_conf }}/logback.xml
level:
@@ -174,6 +195,3 @@ logging:
fr.gouv.vitamui.cas: DEBUG
org.elasticsearch.metrics: DEBUG
fr.gouv.vitamui.commons: DEBUG
-
-# 8 hours in seconds
-api.token.ttl: 28800
diff --git a/deployment/roles/vitamui/templates/cas-server/vitamui-cas-server.json.j2 b/deployment/roles/vitamui/templates/cas-server/vitamui-cas-server.json.j2
deleted file mode 100644
index 7e64a4e6..00000000
--- a/deployment/roles/vitamui/templates/cas-server/vitamui-cas-server.json.j2
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-{# TODO : check probe is correct / verify file installation is made in vitamui-cas-server role #}
- "service": {
- "name": "{{ vitamui.cas_server.vitamui_component }}",
- "port": {{ vitamui.cas_server.port_service | int }},
- "address": "{{ ip_service }}",
- "enable_tag_override": false,
- "tags": ["{{ consul_tags.split(", ")|join('", "') }}"],
- "checks": [
- {
- "notes": "cas server port opened",
- "tcp": "{{ ip_service }}:{{ vitamui.cas_server.port_service }}",
- "interval": "1s"
- }
- ]
- }
-}
diff --git a/deployment/roles/vitamui/templates/ui-identity-admin/application.yml.j2 b/deployment/roles/vitamui/templates/ui-identity-admin/application.yml.j2
index a13f3d71..f3f9346c 100644
--- a/deployment/roles/vitamui/templates/ui-identity-admin/application.yml.j2
+++ b/deployment/roles/vitamui/templates/ui-identity-admin/application.yml.j2
@@ -62,7 +62,10 @@ ui-identity:
key-password: {{ password_truststore }} # TODO OMA : revoir
hostname-verification: false
{% endif %}
- assets: "{{ vitam_defaults.folder.root_path }}/conf/assets"
+ assets: "{{ vitamui_defaults.folder.root_path }}/conf/assets"
+ theme-colors:
+ vitamui-primary: "#ff4a54"
+ vitamui-secondary: "#241f63"
base-url:
{% if vitamui.portal.base_url is defined %}
portal: "{{ vitamui.portal.base_url }}"
diff --git a/deployment/roles/vitamui/templates/ui-identity/application.yml.j2 b/deployment/roles/vitamui/templates/ui-identity/application.yml.j2
index 16979fb3..3dfd2e86 100644
--- a/deployment/roles/vitamui/templates/ui-identity/application.yml.j2
+++ b/deployment/roles/vitamui/templates/ui-identity/application.yml.j2
@@ -59,7 +59,10 @@ ui-identity:
key-password: {{ password_truststore }}
hostname-verification: false
{%endif %}
- assets: "{{ vitam_defaults.folder.root_path }}/conf/assets"
+ assets: "{{ vitamui_defaults.folder.root_path }}/conf/assets"
+ theme-colors:
+ vitamui-primary: "#ff4a54"
+ vitamui-secondary: "#241f63"
base-url:
{% if vitamui.portal.base_url is defined %}
portal: "{{ vitamui.portal.base_url }}"
diff --git a/deployment/roles/vitamui/templates/ui-portal/application.yml.j2 b/deployment/roles/vitamui/templates/ui-portal/application.yml.j2
index 3ff9b527..8c1451d6 100644
--- a/deployment/roles/vitamui/templates/ui-portal/application.yml.j2
+++ b/deployment/roles/vitamui/templates/ui-portal/application.yml.j2
@@ -54,8 +54,11 @@ ui-portal:
key-path: {{ vitamui_folder_conf }}/truststore_{{ vitamui_certificate_type }}.jks
key-password: {{ password_truststore }} # TODO OMA : revoir
hostname-verification: false
- assets: "{{ vitam_defaults.folder.root_path }}/conf/assets"
{% endif %}
+ assets: "{{ vitamui_defaults.folder.root_path }}/conf/assets"
+ theme-colors:
+ vitamui-primary: "#ff4a54"
+ vitamui-secondary: "#241f63"
{% if vitamui.portal.base_url is undefined %}
base-url:
portal: "{{ url_prefix }}" # TODO OMA : revoir avec les redirections du RP
diff --git a/docs/Modules Cots.md b/docs/Modules Cots.md
index 74722376..30eae931 100644
--- a/docs/Modules Cots.md
+++ b/docs/Modules Cots.md
@@ -124,7 +124,7 @@ correspondant a la version choisie.
```xml
...
- <argument>LOGSTASH_VERSION=6.4.2</argument>
+ <argument>LOGSTASH_VERSION=7.6.0</argument>
...
```
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 1d2d221e..a42707c8 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -12,7 +12,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>parent</artifactId>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<properties>
diff --git a/packaging/pom.xml b/packaging/pom.xml
index b1a1a58c..6f5a9203 100644
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>parent</artifactId>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>package</artifactId>
diff --git a/pom.xml b/pom.xml
index 66eaaeaf..c887e195 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<groupId>fr.gouv.vitamui</groupId>
<artifactId>parent</artifactId>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>VITAMUI</name>
<description>${project.artifactId}</description>
diff --git a/tools/docker/mongo/database_scripts_templater.yml b/tools/docker/mongo/database_scripts_templater.yml
index 490e3740..5ee90c60 100644
--- a/tools/docker/mongo/database_scripts_templater.yml
+++ b/tools/docker/mongo/database_scripts_templater.yml
@@ -5,8 +5,8 @@
- hosts: localhost
gather_facts: true
roles:
- - {
- role: mongo_init,
+ - {
+ role: mongo_init,
mongod_source_template_dir: "{{playbook_dir}}/database_scripts/"
}
diff --git a/tools/docker/mongo/mongo_cluster.yml b/tools/docker/mongo/mongo_cluster.yml
index a7963350..ef45430b 100644
--- a/tools/docker/mongo/mongo_cluster.yml
+++ b/tools/docker/mongo/mongo_cluster.yml
@@ -4,19 +4,19 @@ services:
mongo-dev:
image: mongo:4.0.6
container_name: vitamui-mongo
-# environment:
- # provide your credentials here
-# - MONGO_INITDB_ROOT_USERNAME=root
-# - MONGO_INITDB_ROOT_PASSWORD=rootpwd
+ # environment:
+ # provide your credentials here
+ # - MONGO_INITDB_ROOT_USERNAME=root
+ # - MONGO_INITDB_ROOT_PASSWORD=rootpwd
networks:
- mongo-cluster
ports:
- # 27018 is selected in order to avoid a conflict with Vitam docker instance
+ # 27018 is selected in order to avoid a conflict with Vitam docker instance
- "27018:27018"
volumes:
- # if you wish to setup additional user accounts specific per DB or with different roles you can use following entry point
+ # if you wish to setup additional user accounts specific per DB or with different roles you can use following entry point
- "$PWD/mongo-entrypoint/:/scripts/mongo/data"
- "$PWD/replica-set/:/scripts/mongo/replica-set"
@@ -26,10 +26,10 @@ services:
mongo-dev2:
image: mongo:4.0.6
container_name: vitamui-mongo2
-# environment:
- # provide your credentials here
-# - MONGO_INITDB_ROOT_USERNAME=root
-# - MONGO_INITDB_ROOT_PASSWORD=rootpwd
+ # environment:
+ # provide your credentials here
+ # - MONGO_INITDB_ROOT_USERNAME=root
+ # - MONGO_INITDB_ROOT_PASSWORD=rootpwd
networks:
- mongo-cluster
diff --git a/tools/docker/mongo/mongo_vars_dev.yml b/tools/docker/mongo/mongo_vars_dev.yml
index 0fbcb2ee..3d25358a 100644
--- a/tools/docker/mongo/mongo_vars_dev.yml
+++ b/tools/docker/mongo/mongo_vars_dev.yml
@@ -17,41 +17,41 @@ mongodb:
- ".*"
excluded_scripts:
- "nothing"
- docker:
+ docker:
enable: true
internal_dir: /scripts/mongo/data
mongod_port: 27018
passphrase: mongogo
admin:
- db: admin
- user: "mongod_dbuser_admin"
- password: "mongod_dbpwd_admin"
- roles: '[{ role: "userAdminAnyDatabase", db: "admin" }, { role: "backup", db: "admin" }, { role: "restore", db: "admin" }, { role: "dbAdminAnyDatabase", db: "admin" }, { role: "readWriteAnyDatabase", db: "admin" }, { role: "clusterMonitor", db:"admin"}, { role: "root", db:"admin"}]'
+ db: admin
+ user: "mongod_dbuser_admin"
+ password: "mongod_dbpwd_admin"
+ roles: '[{ role: "userAdminAnyDatabase", db: "admin" }, { role: "backup", db: "admin" }, { role: "restore", db: "admin" }, { role: "dbAdminAnyDatabase", db: "admin" }, { role: "readWriteAnyDatabase", db: "admin" }, { role: "clusterMonitor", db:"admin"}, { role: "root", db:"admin"}]'
localadmin:
- db: admin
- user: "mongod_dbuser_localadmin"
- password: "mongod_dbpwd_localadmin"
- roles: '[{ role: "clusterAdmin", db: "admin" },{ role: "dbAdminAnyDatabase", db: "admin" },{ role: "readWriteAnyDatabase", db: "admin" }]'
+ db: admin
+ user: "mongod_dbuser_localadmin"
+ password: "mongod_dbpwd_localadmin"
+ roles: '[{ role: "clusterAdmin", db: "admin" },{ role: "dbAdminAnyDatabase", db: "admin" },{ role: "readWriteAnyDatabase", db: "admin" }]'
security:
- db: security
- user: "mongod_dbuser_security"
- password: "mongod_dbpwd_security"
- roles: '[{ role: "readWrite", db: "security" }]'
+ db: security
+ user: "mongod_dbuser_security"
+ password: "mongod_dbpwd_security"
+ roles: '[{ role: "readWrite", db: "security" }]'
iam:
- db: iam
- user: "mongod_dbuser_iam"
- password: "mongod_dbpwd_iam"
- roles: '[{ role: "readWrite", db: "iam" }]'
+ db: iam
+ user: "mongod_dbuser_iam"
+ password: "mongod_dbpwd_iam"
+ roles: '[{ role: "readWrite", db: "iam" }]'
cas:
- db: cas
- user: "mongod_dbuser_cas"
- password: "mongod_dbpwd_cas"
- roles: '[{ role: "readWrite", db: "cas" }]'
+ db: cas
+ user: "mongod_dbuser_cas"
+ password: "mongod_dbpwd_cas"
+ roles: '[{ role: "readWrite", db: "cas" }]'
versioning:
- db: versioning
- user: "mongod_dbuser_versioning"
- password: "mongod_dbpwd_versioning"
- roles: '[{ role: "readWrite", db: "versioning" }]'
+ db: versioning
+ user: "mongod_dbuser_versioning"
+ password: "mongod_dbpwd_versioning"
+ roles: '[{ role: "readWrite", db: "versioning" }]'
mongod_replicaset_name: "rs0"
diff --git a/tools/docker/mongo/start_dev.sh b/tools/docker/mongo/start_dev.sh
index 75967c36..54d911a4 100755
--- a/tools/docker/mongo/start_dev.sh
+++ b/tools/docker/mongo/start_dev.sh
@@ -3,16 +3,12 @@
#########################
# Copy mongo scripts and template them
-PWD=`pwd`
-CUR_DIR=$PWD
+CUR_DIR=`pwd`
+TEMPLATER_EXTRA_VARS="--extra-vars \"@$CUR_DIR/mongo_vars_dev.yml\""
-#echo "Remove old files (mongo-entrypoint)."
-#rm mongo-entrypoint/last/*
-
-echo "Execute $CUR_DIR/database_scripts_templater with custom variables."
-ansible-playbook -i $CUR_DIR/hosts $CUR_DIR/database_scripts_templater.yml -e "@$CUR_DIR/mongo_vars_dev.yml"
-
-#########################
+if [ ! -z "$ADDITIONNAL_VITAMUI_CONFIG_FILE" ]; then
+ TEMPLATER_EXTRA_VARS="${TEMPLATER_EXTRA_VARS} --extra-vars \"@${ADDITIONNAL_VITAMUI_CONFIG_FILE}\""
+fi
docker-compose -f ./mongo_dev.yml up -d
diff --git a/tools/docker/vitamui-osbase/pom.xml b/tools/docker/vitamui-osbase/pom.xml
index 34be12fb..3f43aee9 100644
--- a/tools/docker/vitamui-osbase/pom.xml
+++ b/tools/docker/vitamui-osbase/pom.xml
@@ -4,12 +4,12 @@
<artifactId>docker-vitamui-osbase</artifactId>
<packaging>pom</packaging>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>parent</artifactId>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/tools/docker/vitamui/pom.xml b/tools/docker/vitamui/pom.xml
index 4f1724d0..e5d75356 100644
--- a/tools/docker/vitamui/pom.xml
+++ b/tools/docker/vitamui/pom.xml
@@ -4,12 +4,12 @@
<artifactId>docker-vitamui</artifactId>
<packaging>pom</packaging>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>parent</artifactId>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/tools/start_vitamui.sh b/tools/start_vitamui.sh
index 5efe95fc..1eecbb55 100755
--- a/tools/start_vitamui.sh
+++ b/tools/start_vitamui.sh
@@ -50,7 +50,7 @@ function start_api() {
launch "../api/api-iam/iam-external" "$SPRINGBOOT"
# Start Cas Server
- launch "../cas/cas-server" "java -Dspring.config.location=src/main/config/cas-server-application-dev.yml -jar target/cas-server.war"
+ launch "../cas/cas-server" "java -Dspring.config.additional-location=src/main/config/cas-server-application-dev.yml -jar target/cas-server.war"
}
function start_ui_prod() {
diff --git a/tools/start_vitamui2.sh b/tools/start_vitamui2.sh
index 737fafdb..39b10123 100755
--- a/tools/start_vitamui2.sh
+++ b/tools/start_vitamui2.sh
@@ -73,7 +73,7 @@ function start_api() {
sleep 15
# Start Cas Server
- launch "../cas/cas-server" "java -Xmx200M -XX:+UseG1GC -Dspring.config.location=src/main/config/cas-server-application-dev.yml -jar target/cas-server.war"
+ launch "../cas/cas-server" "java -Xmx200M -XX:+UseG1GC -Dspring.config.additional-location=src/main/config/cas-server-application-dev.yml -jar target/cas-server.war"
sleep 15
diff --git a/ui/pom.xml b/ui/pom.xml
index 2a6f2f6b..f71f01ff 100644
--- a/ui/pom.xml
+++ b/ui/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>parent</artifactId>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<modules>
diff --git a/ui/ui-commons/pom.xml b/ui/ui-commons/pom.xml
index 3ff590f6..852ef468 100644
--- a/ui/ui-commons/pom.xml
+++ b/ui/ui-commons/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>ui-parent</artifactId>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<properties>
diff --git a/ui/ui-frontend-common/package-lock.json b/ui/ui-frontend-common/package-lock.json
index 3fcace4c..47880ac0 100644
--- a/ui/ui-frontend-common/package-lock.json
+++ b/ui/ui-frontend-common/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "ui-frontend-common",
- "version": "0.0.14",
+ "version": "1.0.2-SNAPSHOT",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -4433,7 +4433,8 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"aproba": {
"version": "1.2.0",
@@ -4454,12 +4455,14 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -4474,23 +4477,24 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"core-util-is": {
"version": "1.0.2",
- "bundled": true,
- "dev": true,
- "optional": true
+ "bundled": true
},
"debug": {
"version": "3.2.6",
@@ -4548,6 +4552,20 @@
"string-width": "^1.0.1",
"strip-ansi": "^3.0.1",
"wide-align": "^1.1.0"
+ },
+ "dependencies": {
+ "string-width": {
+ "version": "1.0.2",
+ "resolved": "https://nexus.teamdlab.com/repository/npm/string-width/-/string-width-1.0.2.tgz",
+ "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "code-point-at": "^1.0.0",
+ "is-fullwidth-code-point": "^1.0.0",
+ "strip-ansi": "^3.0.0"
+ }
+ }
}
},
"glob": {
@@ -4596,12 +4614,22 @@
"requires": {
"once": "^1.3.0",
"wrappy": "1"
+ },
+ "dependencies": {
+ "wrappy": {
+ "version": "1.0.2",
+ "resolved": "https://nexus.teamdlab.com/repository/npm/wrappy/-/wrappy-1.0.2.tgz",
+ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+ "dev": true,
+ "optional": true
+ }
}
},
"inherits": {
"version": "2.0.4",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"ini": {
"version": "1.3.5",
@@ -4613,6 +4641,7 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@@ -4627,6 +4656,7 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@@ -4634,12 +4664,14 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"minipass": {
"version": "2.9.0",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@@ -4658,6 +4690,7 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"minimist": "0.0.8"
}
@@ -4747,7 +4780,8 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"object-assign": {
"version": "4.1.1",
@@ -4759,21 +4793,27 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"wrappy": "1"
+ },
+ "dependencies": {
+ "wrappy": {
+ "version": "1.0.2",
+ "resolved": "https://nexus.teamdlab.com/repository/npm/wrappy/-/wrappy-1.0.2.tgz",
+ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+ "dev": true,
+ "optional": true
+ }
}
},
"os-homedir": {
"version": "1.0.2",
- "bundled": true,
- "dev": true,
- "optional": true
+ "bundled": true
},
"os-tmpdir": {
"version": "1.0.2",
- "bundled": true,
- "dev": true,
- "optional": true
+ "bundled": true
},
"osenv": {
"version": "0.1.5",
@@ -4783,6 +4823,22 @@
"requires": {
"os-homedir": "^1.0.0",
"os-tmpdir": "^1.0.0"
+ },
+ "dependencies": {
+ "os-homedir": {
+ "version": "1.0.2",
+ "resolved": "https://nexus.teamdlab.com/repository/npm/os-homedir/-/os-homedir-1.0.2.tgz",
+ "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+ "dev": true,
+ "optional": true
+ },
+ "os-tmpdir": {
+ "version": "1.0.2",
+ "resolved": "https://nexus.teamdlab.com/repository/npm/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+ "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+ "dev": true,
+ "optional": true
+ }
}
},
"path-is-absolute": {
@@ -4830,6 +4886,22 @@
"safe-buffer": "~5.1.1",
"string_decoder": "~1.1.1",
"util-deprecate": "~1.0.1"
+ },
+ "dependencies": {
+ "core-util-is": {
+ "version": "1.0.2",
+ "resolved": "https://nexus.teamdlab.com/repository/npm/core-util-is/-/core-util-is-1.0.2.tgz",
+ "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+ "dev": true,
+ "optional": true
+ },
+ "util-deprecate": {
+ "version": "1.0.2",
+ "resolved": "https://nexus.teamdlab.com/repository/npm/util-deprecate/-/util-deprecate-1.0.2.tgz",
+ "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+ "dev": true,
+ "optional": true
+ }
}
},
"rimraf": {
@@ -4844,7 +4916,8 @@
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"safer-buffer": {
"version": "2.1.2",
@@ -4880,6 +4953,7 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@@ -4899,6 +4973,7 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@@ -4926,9 +5001,7 @@
},
"util-deprecate": {
"version": "1.0.2",
- "bundled": true,
- "dev": true,
- "optional": true
+ "bundled": true
},
"wide-align": {
"version": "1.1.3",
@@ -4941,13 +5014,13 @@
},
"wrappy": {
"version": "1.0.2",
- "bundled": true,
- "dev": true
+ "bundled": true
},
"yallist": {
"version": "3.1.1",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
}
}
},
diff --git a/ui/ui-frontend-common/package.json b/ui/ui-frontend-common/package.json
index 389ead49..a1c588bd 100644
--- a/ui/ui-frontend-common/package.json
+++ b/ui/ui-frontend-common/package.json
@@ -1,6 +1,6 @@
{
"name": "ui-frontend-common",
- "version": "1.0.2",
+ "version": "1.0.2-SNAPSHOT",
"main": "src/index.ts",
"scripts": {
"ng": "ng",
diff --git a/ui/ui-frontend-common/pom.xml b/ui/ui-frontend-common/pom.xml
index c3a88b4f..8db3139b 100644
--- a/ui/ui-frontend-common/pom.xml
+++ b/ui/ui-frontend-common/pom.xml
@@ -11,7 +11,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>ui-parent</artifactId>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<properties>
diff --git a/ui/ui-frontend/package-lock.json b/ui/ui-frontend/package-lock.json
index 39c24d4d..414852b3 100644
--- a/ui/ui-frontend/package-lock.json
+++ b/ui/ui-frontend/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "vitamui-ui",
- "version": "1.0.2",
+ "version": "1.0.2-SNAPSHOT",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -4169,9 +4169,7 @@
},
"core-util-is": {
"version": "1.0.2",
- "bundled": true,
- "dev": true,
- "optional": true
+ "bundled": true
},
"debug": {
"version": "3.2.6",
@@ -4229,6 +4227,20 @@
"string-width": "^1.0.1",
"strip-ansi": "^3.0.1",
"wide-align": "^1.1.0"
+ },
+ "dependencies": {
+ "string-width": {
+ "version": "1.0.2",
+ "resolved": "https://nexus.teamdlab.com/repository/npm/string-width/-/string-width-1.0.2.tgz",
+ "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "code-point-at": "^1.0.0",
+ "is-fullwidth-code-point": "^1.0.0",
+ "strip-ansi": "^3.0.0"
+ }
+ }
}
},
"glob": {
@@ -4277,6 +4289,15 @@
"requires": {
"once": "^1.3.0",
"wrappy": "1"
+ },
+ "dependencies": {
+ "wrappy": {
+ "version": "1.0.2",
+ "resolved": "https://nexus.teamdlab.com/repository/npm/wrappy/-/wrappy-1.0.2.tgz",
+ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+ "dev": true,
+ "optional": true
+ }
}
},
"inherits": {
@@ -4450,19 +4471,24 @@
"optional": true,
"requires": {
"wrappy": "1"
+ },
+ "dependencies": {
+ "wrappy": {
+ "version": "1.0.2",
+ "resolved": "https://nexus.teamdlab.com/repository/npm/wrappy/-/wrappy-1.0.2.tgz",
+ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+ "dev": true,
+ "optional": true
+ }
}
},
"os-homedir": {
"version": "1.0.2",
- "bundled": true,
- "dev": true,
- "optional": true
+ "bundled": true
},
"os-tmpdir": {
"version": "1.0.2",
- "bundled": true,
- "dev": true,
- "optional": true
+ "bundled": true
},
"osenv": {
"version": "0.1.5",
@@ -4472,6 +4498,22 @@
"requires": {
"os-homedir": "^1.0.0",
"os-tmpdir": "^1.0.0"
+ },
+ "dependencies": {
+ "os-homedir": {
+ "version": "1.0.2",
+ "resolved": "https://nexus.teamdlab.com/repository/npm/os-homedir/-/os-homedir-1.0.2.tgz",
+ "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+ "dev": true,
+ "optional": true
+ },
+ "os-tmpdir": {
+ "version": "1.0.2",
+ "resolved": "https://nexus.teamdlab.com/repository/npm/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+ "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+ "dev": true,
+ "optional": true
+ }
}
},
"path-is-absolute": {
@@ -4519,6 +4561,22 @@
"safe-buffer": "~5.1.1",
"string_decoder": "~1.1.1",
"util-deprecate": "~1.0.1"
+ },
+ "dependencies": {
+ "core-util-is": {
+ "version": "1.0.2",
+ "resolved": "https://nexus.teamdlab.com/repository/npm/core-util-is/-/core-util-is-1.0.2.tgz",
+ "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+ "dev": true,
+ "optional": true
+ },
+ "util-deprecate": {
+ "version": "1.0.2",
+ "resolved": "https://nexus.teamdlab.com/repository/npm/util-deprecate/-/util-deprecate-1.0.2.tgz",
+ "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+ "dev": true,
+ "optional": true
+ }
}
},
"rimraf": {
@@ -4618,9 +4676,7 @@
},
"util-deprecate": {
"version": "1.0.2",
- "bundled": true,
- "dev": true,
- "optional": true
+ "bundled": true
},
"wide-align": {
"version": "1.1.3",
@@ -4633,9 +4689,7 @@
},
"wrappy": {
"version": "1.0.2",
- "bundled": true,
- "dev": true,
- "optional": true
+ "bundled": true
},
"yallist": {
"version": "3.1.1",
@@ -10450,8 +10504,8 @@
}
},
"ui-frontend-common": {
- "version": "file:../ui-frontend-common/ui-frontend-common-1.0.2.tgz",
- "integrity": "sha512-il30Knr7aqPFrtvHBN2kgvSr9KDuS6wZqeiIsP+ikKEppwkUS08V/JCqG0shqN2gsP/8YDhubJFahY9BOL+a/Q==",
+ "version": "file:../ui-frontend-common/ui-frontend-common-1.0.2-SNAPSHOT.tgz",
+ "integrity": "sha512-82hwkIuYredacS2dQB2G8W5NcNPH+k9Imm3WMosQN3D3Ka7pbWvIgDmQ62nWQoOXmzbZ3ImtwN9kmuF69Rg1GA==",
"requires": {
"@angular/animations": "8.0.0",
"@angular/cdk": "^8.0.0",
diff --git a/ui/ui-frontend/package.json b/ui/ui-frontend/package.json
index 8a1773d5..a6e5cdb5 100644
--- a/ui/ui-frontend/package.json
+++ b/ui/ui-frontend/package.json
@@ -1,6 +1,6 @@
{
"name": "vitamui-ui",
- "version": "1.0.2",
+ "version": "1.0.2-SNAPSHOT",
"license": "MIT",
"scripts": {
"ng": "ng",
@@ -60,7 +60,7 @@
"ngx-color-picker": "^9.0.0",
"rxjs": "^6.5.2",
"tslib": "^1.9.0",
- "ui-frontend-common": "file:../ui-frontend-common/ui-frontend-common-1.0.2.tgz",
+ "ui-frontend-common": "file:../ui-frontend-common/ui-frontend-common-1.0.2-SNAPSHOT.tgz",
"underscore": "^1.9.1",
"web-animations-js": "^2.3.2",
"zone.js": "~0.9.1"
diff --git a/ui/ui-frontend/pom.xml b/ui/ui-frontend/pom.xml
index a510a9ce..b168a513 100644
--- a/ui/ui-frontend/pom.xml
+++ b/ui/ui-frontend/pom.xml
@@ -11,7 +11,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>ui-parent</artifactId>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/ui/ui-identity/pom.xml b/ui/ui-identity/pom.xml
index b2bee632..209a522b 100644
--- a/ui/ui-identity/pom.xml
+++ b/ui/ui-identity/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>ui-parent</artifactId>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<properties>
diff --git a/ui/ui-portal/pom.xml b/ui/ui-portal/pom.xml
index 245855a8..5d46439a 100644
--- a/ui/ui-portal/pom.xml
+++ b/ui/ui-portal/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>ui-parent</artifactId>
- <version>1.0.2</version>
+ <version>1.0.2-SNAPSHOT</version>
</parent>
<properties>
--
GitLab