From ef51f101e45c3edbcc834fb8cb12eabfa888416d Mon Sep 17 00:00:00 2001 From: Swati Goel Date: Thu, 1 Aug 2024 19:43:30 +0530 Subject: [PATCH 1/2] [MOSIP-34747] - set spring.profiles.active composite (#1553) -- Update readme with example to support different type of repositories - git, svn, native Signed-off-by: Swati Goel --- kernel/kernel-config-server/README.md | 106 ++++++++++++------ .../src/main/resources/bootstrap.properties | 21 +--- 2 files changed, 77 insertions(+), 50 deletions(-) diff --git a/kernel/kernel-config-server/README.md b/kernel/kernel-config-server/README.md index f2ff0838f0a..736dfc5e8e4 100644 --- a/kernel/kernel-config-server/README.md +++ b/kernel/kernel-config-server/README.md @@ -24,34 +24,52 @@ For more information look [here]( https://cloud.spring.io/spring-cloud-config/si **How To Run**
To run the application:
-Make sure you have configured ssh keys to connect to git, because it will take ssh keys from default location (${user.home}/.ssh) . +Make sure you have configured ssh keys to connect to git, because it will take ssh keys from default location (${user.home}/.ssh) . + +Set environment variables to support git repos for composite profile. Here 0,1 indicates list items. +If any property exists in multiple repositories then repo at 0 index will have high priority and value will be referred from that repo. +``` +export SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_URI= +export SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_TYPE=git +export SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_DEFAULT_LABEL= + +export SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_1_URI= +export SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_1_TYPE=git +export SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_1_DEFAULT_LABEL= +``` Now run the jar using the following command:

-`java -jar -Dspring.cloud.config.server.git.uri=< git-repo-ssh-url > -Dspring.cloud.config.server.git.search-paths=< config-folder-location-in-git-repo > -Dencrypt.keyStore.location=file:///< file-location-of-keystore > -Dencrypt.keyStore.password=< keystore-passowrd > -Dencrypt.keyStore.alias=< keystore-alias > -Dencrypt.keyStore.secret=< keystore-secret > < jar-name >` +`java -jar -Dencrypt.keyStore.location=file:///< file-location-of-keystore > -Dencrypt.keyStore.password=< keystore-passowrd > -Dencrypt.keyStore.alias=< keystore-alias > -Dencrypt.keyStore.secret=< keystore-secret > < jar-name >`

-To run it inside Docker container provide the follwing run time arguments: -1. git_url_env +To run it inside Docker container provide the following run time arguments: +1. SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_URI The URL of your Git repo -2. git_config_folder_env +2. SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_TYPE +Repo type, which is git + +3. SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_DEFAULT_LABEL +branch to refer in git repo. If not provided, it will default to `main` branch + +4. SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_SEARCH_PATHS The folder inside your git repo which contains the configuration -3. encrypt_keyStore_location_env +5. encrypt_keyStore_location_env The encrypt keystore location -4. encrypt_keyStore_password_env +6. encrypt_keyStore_password_env The encryption keystore password -5. encrypt_keyStore_alias_env +7. encrypt_keyStore_alias_env The encryption keystore alias -6. encrypt_keyStore_secret_env +8. encrypt_keyStore_secret_env The encryption keyStore secret The final docker run command should look like: -`docker run --name= -d -v /server.keystore:/server.keystore:z -v /home/madmin/:/.ssh:z -e git_url_env= -e git_config_folder_env= -e encrypt_keyStore_location_env=file:////server.keystore -e encrypt_keyStore_password_env= -e encrypt_keyStore_alias_env= -e encrypt_keyStore_secret_env= -p 51000:51000 ` +`docker run --name= -d -v /server.keystore:/server.keystore:z -v /home/madmin/:/.ssh:z -e SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_URI= -e SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_TYPE=git -e SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_DEFAULT_LABEL= -e encrypt_keyStore_location_env=file:////server.keystore -e encrypt_keyStore_password_env= -e encrypt_keyStore_alias_env= -e encrypt_keyStore_secret_env= -p 51000:51000 `

**To Encrypt any property:**
@@ -78,38 +96,39 @@ server.port = 51000 #adding context path server.servlet.path=/config -# Uncomment spring.cloud.config.server.git.uri and spring.cloud.config.server.git.search-paths for # connecting to git Repo for configuration. -################################################################# -#Git repository location where configuration files are stored -#spring.cloud.config.server.git.uri= +spring.profiles.active=composite -#Path inside the GIT repo where config files are stored, in our case they are inside config directory -#spring.cloud.config.server.git.search-paths= +#Server would return a HTTP 404 status, if the application is not found.By default, this flag is set to true. +spring.cloud.config.server.accept-empty=false -# Uncomment spring.profiles.active and spring.cloud.config.server.native.search-locations for # connecting to local file system for configuration. -################################################################# -# spring.profiles.active=native +## As spring.profiles.active is composite, use env variable to provide values for git configuration as below +########################## +##Git repository location where configuration files are stored +# SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_URI= -# spring.cloud.config.server.native.search-locations=file:/// +##Type of repository, possible types are git, svn, native +# SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_TYPE=git -#Server would return a HTTP 404 status, if the application is not found.By default, this flag is set to true. -spring.cloud.config.server.accept-empty=false +##Branch/label to refer for in config repository +# SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_DEFAULT_LABEL= -#Spring Cloud Config Server makes a clone of the remote git repository and if somehow the local copy gets +#Spring Cloud Config Server makes a clone of the remote git repository and if somehow the local copy gets #dirty (e.g. folder content changes by OS process) so Spring Cloud Config Server cannot update the local copy #from remote repository. For Force-pull in such case, we are setting the flag to true. -spring.cloud.config.server.git.force-pull=true - -# Disabling health endpoints to improve performance of config server while in development, can be commented out in production. -health.config.enabled=false +# SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_FORCE_PULL=true -# Setting up refresh rate to 1 minute so that config server will check for updates in Git repo after every one minute, +# Setting up refresh rate to 5 seconds so that config server will check for updates in Git repo after every one minute, #can be lowered down for production. -spring.cloud.config.server.git.refreshRate=60 - +# SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_REFRESH_RATE=5 # adding provision to clone on start of server instead of first request -spring.cloud.config.server.git.cloneOnStart=true +# SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_CLONE_ON_START=true + +#Path inside the GIT repo where config files are stored, in our case they are inside config directory +#SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_SEARCH_PATHS= + +# Disabling health endpoints to improve performance of config server while in development, can be commented out in production. +health.config.enabled=false #For encryption of properties ########################################### @@ -148,7 +167,7 @@ spring.cloud.config.uri=http://: spring.cloud.config.label= spring.application.name= spring.cloud.config.name= -spring.profiles.active= +spring.profiles.active=composite management.endpoints.web.exposure.include=refresh #management.security.enabled=false @@ -157,3 +176,26 @@ management.endpoints.web.exposure.include=refresh spring.cloud.config.server.health.enabled=false ``` + +**cloud config supported for git type repository** + +``` +SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_URI= +SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_TYPE=git +SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_DEFAULT_LABEL= +``` + +**cloud config supported for svn type repository** + +``` +SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_URI= +SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_TYPE=git +SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_DEFAULT_LABEL= +``` + +**cloud config supported for native** + +``` +SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_URI= +SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_TYPE=native +``` \ No newline at end of file diff --git a/kernel/kernel-config-server/src/main/resources/bootstrap.properties b/kernel/kernel-config-server/src/main/resources/bootstrap.properties index 088020c6c6f..961e1b42bef 100644 --- a/kernel/kernel-config-server/src/main/resources/bootstrap.properties +++ b/kernel/kernel-config-server/src/main/resources/bootstrap.properties @@ -22,31 +22,16 @@ server.servlet.context-path=${server.servlet.path} #Path inside the GIT repo where config files are stored, in our case they are inside config directory #spring.cloud.config.server.git.search-paths= -# Uncomment spring.profiles.active and spring.cloud.config.server.native.search-locations for # connecting to local file system for configuration. -################################################################# -#spring.profiles.active=native - -#spring.cloud.config.server.native.search-locations=file:/// +#support for composite property. +#use env variables to provide list of repos. +spring.profiles.active=composite #Server would return a HTTP 404 status, if the application is not found.By default, this flag is set to true. spring.cloud.config.server.accept-empty=false -#Spring Cloud Config Server makes a clone of the remote git repository and if somehow the local copy gets -#dirty (e.g. folder content changes by OS process) so Spring Cloud Config Server cannot update the local copy -#from remote repository. For Force-pull in such case, we are setting the flag to true. -spring.cloud.config.server.git.force-pull=true - # Disabling health endpoints to improve performance of config server while in development, can be commented out in production. health.config.enabled=false -# Setting up refresh rate to 5 seconds so that config server will check for updates in Git repo after every one minute, -#can be lowered down for production. -spring.cloud.config.server.git.refreshRate=5 - - -# adding provision to clone on start of server instead of first request -spring.cloud.config.server.git.cloneOnStart=true - #For encryption of properties ########################################### #pass at runtime From 1378d520d9b05aa277605404feeb7e5c0b899777 Mon Sep 17 00:00:00 2001 From: Swati Goel Date: Fri, 20 Sep 2024 10:47:04 +0530 Subject: [PATCH 2/2] Sync with develop (#1570) * fix: kernel/kernel-idobjectvalidator/pom.xml to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JAVA-COMGOOGLEGUAVA-32236 - https://snyk.io/vuln/SNYK-JAVA-COMGOOGLEGUAVA-1015415 - https://snyk.io/vuln/SNYK-JAVA-COMGOOGLEGUAVA-5710356 Signed-off-by: rajapandi.m * fix: kernel/kernel-bom/pom.xml to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JAVA-ORGJSON-5488379 - https://snyk.io/vuln/SNYK-JAVA-ORGJSON-5962464 Signed-off-by: rajapandi.m * fix: kernel/kernel-pdfgenerator-itext/pom.xml to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JAVA-COMITEXTPDF-2320389 - https://snyk.io/vuln/SNYK-JAVA-ORGBOUNCYCASTLE-1052448 - https://snyk.io/vuln/SNYK-JAVA-ORGBOUNCYCASTLE-2841508 - https://snyk.io/vuln/SNYK-JAVA-COMITEXTPDF-541282 - https://snyk.io/vuln/SNYK-JAVA-COMITEXTPDF-541284 - https://snyk.io/vuln/SNYK-JAVA-COMITEXTPDF-2391484 - https://snyk.io/vuln/SNYK-JAVA-COMITEXTPDF-2391485 - https://snyk.io/vuln/SNYK-JAVA-COMITEXTPDF-2391486 Signed-off-by: rajapandi.m * Revert "fix: kernel/kernel-pdfgenerator-itext/pom.xml to reduce vulnerabilities" This reverts commit 80a480eeefe55ae0b4d64c2da017a26a0d5ee64e. Signed-off-by: rajapandi.m * fix: kernel/kernel-authcodeflowproxy-api/pom.xml to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JAVA-ORGAPACHETOMCATEMBED-6435950 - https://snyk.io/vuln/SNYK-JAVA-ORGHIBERNATEVALIDATOR-541187 - https://snyk.io/vuln/SNYK-JAVA-ORGHIBERNATEVALIDATOR-6247635 - https://snyk.io/vuln/SNYK-JAVA-ORGSPRINGFRAMEWORK-467268 - https://snyk.io/vuln/SNYK-JAVA-ORGHIBERNATEVALIDATOR-568163 - https://snyk.io/vuln/SNYK-JAVA-COMGOOGLEGUAVA-5710356 Signed-off-by: rajapandi.m * fix: kernel/kernel-bom/pom.xml to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JAVA-ORGAPACHETOMCATEMBED-7430175 - https://snyk.io/vuln/SNYK-JAVA-COMMONSIO-1277109 - https://snyk.io/vuln/SNYK-JAVA-ORGSPRINGFRAMEWORKSECURITY-6457293 - https://snyk.io/vuln/SNYK-JAVA-IONETTY-6483812 - https://snyk.io/vuln/SNYK-JAVA-ORGSPRINGFRAMEWORK-6444790 - https://snyk.io/vuln/SNYK-JAVA-ORGSPRINGFRAMEWORK-6597980 - https://snyk.io/vuln/SNYK-JAVA-ORGAPACHEHTTPCOMPONENTS-1048058 Signed-off-by: rajapandi.m * Update pom.xml Signed-off-by: rajapandi1234 <138785181+rajapandi1234@users.noreply.github.com> Signed-off-by: rajapandi.m * Update pom.xml Signed-off-by: rajapandi1234 <138785181+rajapandi1234@users.noreply.github.com> Signed-off-by: rajapandi.m * Update pom.xml Signed-off-by: rajapandi1234 <138785181+rajapandi1234@users.noreply.github.com> Signed-off-by: rajapandi.m * Update pom.xml Signed-off-by: rajapandi1234 <138785181+rajapandi1234@users.noreply.github.com> * [DSD-6020] Updated nexus-staging-maven-plugin version in pom.xml Signed-off-by: techno-467 * [MOSIP-35226] Enabled config-server to pull configurations from local git repo. (#1566) * [MOSIP-35226] Updated bootstrap.properties Signed-off-by: Mohan E * Updated bootstrap.properties Signed-off-by: Mohan E * [MOSIP-35226] Updated Dockerfile Signed-off-by: Mohan E * Updated bootstrap.properties Signed-off-by: Mohan E * Updated bootstrap.properties Signed-off-by: Mohan E * Updated bootstrap.properties Signed-off-by: Mohan E * Updated Dockerfile Signed-off-by: Mohan E * Updated bootstrap.properties Signed-off-by: Mohan E * Updated Dockerfile Signed-off-by: Mohan E * [MOSIP-35226] Updated bootstrap.properties Signed-off-by: Mohan E * [MOSIP-35226] Updated bootstrap.properties Signed-off-by: Mohan E * [MOSIP-35226] Updated bootstrap.properties Signed-off-by: Mohan E --------- Signed-off-by: Mohan E * [MOSIP-35160] Updated URL from https://github.com/mosip/mosip-infra/blob/master/deployment/v3/utils/copy_cm_func.sh to https://raw.githubusercontent.com/mosip/mosip-infra/master/deployment/v3/utils/copy_cm_func.sh Signed-off-by: techno-467 --------- Signed-off-by: rajapandi.m Signed-off-by: rajapandi1234 <138785181+rajapandi1234@users.noreply.github.com> Signed-off-by: techno-467 Signed-off-by: Mohan E Co-authored-by: snyk-bot Co-authored-by: rajapandi1234 <138785181+rajapandi1234@users.noreply.github.com> Co-authored-by: Chandra Keshav Mishra Co-authored-by: techno-467 Co-authored-by: Mohan E --- deploy/copy_cm.sh | 2 +- kernel/kernel-applicanttype-api/pom.xml | 2 +- kernel/kernel-authcodeflowproxy-api/pom.xml | 8 ++++---- kernel/kernel-bioapi-provider/pom.xml | 2 +- kernel/kernel-biometrics-api/pom.xml | 2 +- kernel/kernel-bom/pom.xml | 4 ++-- kernel/kernel-config-server/Dockerfile | 2 +- kernel/kernel-config-server/pom.xml | 2 +- .../src/main/resources/bootstrap.properties | 1 - kernel/kernel-core/pom.xml | 2 +- kernel/kernel-dataaccess-hibernate/pom.xml | 2 +- kernel/kernel-datamapper-orika/pom.xml | 2 +- kernel/kernel-demographics-api/pom.xml | 2 +- kernel/kernel-idgenerator-machineid/pom.xml | 2 +- kernel/kernel-idgenerator-mispid/pom.xml | 2 +- kernel/kernel-idgenerator-partnerid/pom.xml | 2 +- kernel/kernel-idgenerator-prid/pom.xml | 2 +- kernel/kernel-idgenerator-regcenterid/pom.xml | 2 +- kernel/kernel-idgenerator-rid/pom.xml | 2 +- kernel/kernel-idgenerator-service/pom.xml | 2 +- kernel/kernel-idgenerator-tokenid/pom.xml | 2 +- kernel/kernel-idgenerator-vid/pom.xml | 2 +- kernel/kernel-idobjectvalidator/pom.xml | 4 ++-- kernel/kernel-idvalidator-mispid/pom.xml | 2 +- kernel/kernel-idvalidator-prid/pom.xml | 2 +- kernel/kernel-idvalidator-rid/pom.xml | 2 +- kernel/kernel-idvalidator-uin/pom.xml | 2 +- kernel/kernel-idvalidator-vid/pom.xml | 2 +- kernel/kernel-licensekeygenerator-misp/pom.xml | 2 +- kernel/kernel-logger-logback/pom.xml | 2 +- kernel/kernel-notification-service/pom.xml | 2 +- kernel/kernel-pdfgenerator-itext/pom.xml | 2 +- kernel/kernel-pinvalidator/pom.xml | 2 +- kernel/kernel-pridgenerator-service/pom.xml | 2 +- kernel/kernel-qrcodegenerator-zxing/pom.xml | 2 +- kernel/kernel-ridgenerator-service/pom.xml | 2 +- kernel/kernel-salt-generator/pom.xml | 2 +- kernel/kernel-templatemanager-velocity/pom.xml | 2 +- kernel/kernel-transliteration-icu4j/pom.xml | 2 +- kernel/kernel-websubclient-api/pom.xml | 2 +- kernel/pom.xml | 2 +- pom.xml | 2 +- 42 files changed, 46 insertions(+), 47 deletions(-) diff --git a/deploy/copy_cm.sh b/deploy/copy_cm.sh index 8006ee3343c..f3b71de08f3 100755 --- a/deploy/copy_cm.sh +++ b/deploy/copy_cm.sh @@ -3,7 +3,7 @@ # DST_NS: Destination namespace function copying_cm() { - UTIL_URL=https://github.com/mosip/mosip-infra/blob/master/deployment/v3/utils/copy_cm_func.sh + UTIL_URL=https://raw.githubusercontent.com/mosip/mosip-infra/master/deployment/v3/utils/copy_cm_func.sh COPY_UTIL=./copy_cm_func.sh DST_NS=kernel diff --git a/kernel/kernel-applicanttype-api/pom.xml b/kernel/kernel-applicanttype-api/pom.xml index 1473bdef3d2..c3149d131b3 100644 --- a/kernel/kernel-applicanttype-api/pom.xml +++ b/kernel/kernel-applicanttype-api/pom.xml @@ -69,7 +69,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.14 true diff --git a/kernel/kernel-authcodeflowproxy-api/pom.xml b/kernel/kernel-authcodeflowproxy-api/pom.xml index 69a247be7a8..3a3e276efc8 100644 --- a/kernel/kernel-authcodeflowproxy-api/pom.xml +++ b/kernel/kernel-authcodeflowproxy-api/pom.xml @@ -26,7 +26,7 @@ 2.3 - 2.0.2.RELEASE + 3.1.9 2.0.7.RELEASE 5.0.5.RELEASE 2.0.4.RELEASE @@ -131,7 +131,7 @@ 2.3 - 2.0.2.RELEASE + 3.1.9 2.0.7.RELEASE 5.0.5.RELEASE 2.0.4.RELEASE @@ -238,7 +238,7 @@ com.auth0 jwks-rsa - 0.18.0 + 0.22.1 org.powermock @@ -281,7 +281,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.14 true diff --git a/kernel/kernel-bioapi-provider/pom.xml b/kernel/kernel-bioapi-provider/pom.xml index 3e478d7aa56..84e2efa320f 100644 --- a/kernel/kernel-bioapi-provider/pom.xml +++ b/kernel/kernel-bioapi-provider/pom.xml @@ -265,7 +265,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.14 true diff --git a/kernel/kernel-biometrics-api/pom.xml b/kernel/kernel-biometrics-api/pom.xml index b965ff1040c..cbe199ef813 100644 --- a/kernel/kernel-biometrics-api/pom.xml +++ b/kernel/kernel-biometrics-api/pom.xml @@ -276,7 +276,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.14 true diff --git a/kernel/kernel-bom/pom.xml b/kernel/kernel-bom/pom.xml index 62484149570..a2abc29683b 100644 --- a/kernel/kernel-bom/pom.xml +++ b/kernel/kernel-bom/pom.xml @@ -34,7 +34,7 @@ 1.9.21.2 - 4.5.6 + 4.5.13 3.9.13 3.9.4 @@ -46,7 +46,7 @@ 2.0.9 - 20180813 + 20231013 1.1.1 0.6.0 3.2.2 diff --git a/kernel/kernel-config-server/Dockerfile b/kernel/kernel-config-server/Dockerfile index 173c818c8d1..69381d3b4f7 100644 --- a/kernel/kernel-config-server/Dockerfile +++ b/kernel/kernel-config-server/Dockerfile @@ -59,7 +59,7 @@ LABEL build_time=${BUILD_TIME} # install packages and create user RUN apt-get -y update \ -&& apt-get install -y unzip sudo\ +&& apt-get install -y unzip sudo git \ && groupadd -g ${container_user_gid} ${container_user_group} \ && useradd -u ${container_user_uid} -g ${container_user_group} -s /bin/sh -m ${container_user} \ && usermod -aG sudo ${container_user} \ diff --git a/kernel/kernel-config-server/pom.xml b/kernel/kernel-config-server/pom.xml index 7b82136d640..6e8947c226c 100644 --- a/kernel/kernel-config-server/pom.xml +++ b/kernel/kernel-config-server/pom.xml @@ -112,7 +112,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.14 true diff --git a/kernel/kernel-config-server/src/main/resources/bootstrap.properties b/kernel/kernel-config-server/src/main/resources/bootstrap.properties index 961e1b42bef..502421f1658 100644 --- a/kernel/kernel-config-server/src/main/resources/bootstrap.properties +++ b/kernel/kernel-config-server/src/main/resources/bootstrap.properties @@ -41,4 +41,3 @@ health.config.enabled=false #encrypt.keyStore.secret= mosip.config.dnd.services={'consul','kernel-config-service'} - diff --git a/kernel/kernel-core/pom.xml b/kernel/kernel-core/pom.xml index cb1504b8b47..4cca53523f6 100644 --- a/kernel/kernel-core/pom.xml +++ b/kernel/kernel-core/pom.xml @@ -285,7 +285,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.14 true diff --git a/kernel/kernel-dataaccess-hibernate/pom.xml b/kernel/kernel-dataaccess-hibernate/pom.xml index 5fd9bf113a2..007a61d5bda 100644 --- a/kernel/kernel-dataaccess-hibernate/pom.xml +++ b/kernel/kernel-dataaccess-hibernate/pom.xml @@ -89,7 +89,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.14 true diff --git a/kernel/kernel-datamapper-orika/pom.xml b/kernel/kernel-datamapper-orika/pom.xml index cd80b0d6ae8..b6963288218 100644 --- a/kernel/kernel-datamapper-orika/pom.xml +++ b/kernel/kernel-datamapper-orika/pom.xml @@ -70,7 +70,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.14 true diff --git a/kernel/kernel-demographics-api/pom.xml b/kernel/kernel-demographics-api/pom.xml index 6e75cd6b27b..46b4c876d4b 100644 --- a/kernel/kernel-demographics-api/pom.xml +++ b/kernel/kernel-demographics-api/pom.xml @@ -177,7 +177,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.14 true diff --git a/kernel/kernel-idgenerator-machineid/pom.xml b/kernel/kernel-idgenerator-machineid/pom.xml index 8b6ddd46b6e..ecad1d0186e 100644 --- a/kernel/kernel-idgenerator-machineid/pom.xml +++ b/kernel/kernel-idgenerator-machineid/pom.xml @@ -87,7 +87,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.14 true diff --git a/kernel/kernel-idgenerator-mispid/pom.xml b/kernel/kernel-idgenerator-mispid/pom.xml index fdfdb35525f..bb0759e6ccc 100644 --- a/kernel/kernel-idgenerator-mispid/pom.xml +++ b/kernel/kernel-idgenerator-mispid/pom.xml @@ -91,7 +91,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.14 true diff --git a/kernel/kernel-idgenerator-partnerid/pom.xml b/kernel/kernel-idgenerator-partnerid/pom.xml index cb02c4d8a57..426eb5e7e62 100644 --- a/kernel/kernel-idgenerator-partnerid/pom.xml +++ b/kernel/kernel-idgenerator-partnerid/pom.xml @@ -89,7 +89,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.14 true diff --git a/kernel/kernel-idgenerator-prid/pom.xml b/kernel/kernel-idgenerator-prid/pom.xml index b1598624cd0..542975fb276 100644 --- a/kernel/kernel-idgenerator-prid/pom.xml +++ b/kernel/kernel-idgenerator-prid/pom.xml @@ -94,7 +94,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.14 true diff --git a/kernel/kernel-idgenerator-regcenterid/pom.xml b/kernel/kernel-idgenerator-regcenterid/pom.xml index 00580e12180..2be8d160e76 100644 --- a/kernel/kernel-idgenerator-regcenterid/pom.xml +++ b/kernel/kernel-idgenerator-regcenterid/pom.xml @@ -89,7 +89,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.14 true diff --git a/kernel/kernel-idgenerator-rid/pom.xml b/kernel/kernel-idgenerator-rid/pom.xml index 4b1f8e8ce63..34b14154be3 100644 --- a/kernel/kernel-idgenerator-rid/pom.xml +++ b/kernel/kernel-idgenerator-rid/pom.xml @@ -89,7 +89,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.14 true diff --git a/kernel/kernel-idgenerator-service/pom.xml b/kernel/kernel-idgenerator-service/pom.xml index afbe7c520a6..1f451e9055a 100644 --- a/kernel/kernel-idgenerator-service/pom.xml +++ b/kernel/kernel-idgenerator-service/pom.xml @@ -214,7 +214,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.14 true diff --git a/kernel/kernel-idgenerator-tokenid/pom.xml b/kernel/kernel-idgenerator-tokenid/pom.xml index 446f800ffd9..611781336ff 100644 --- a/kernel/kernel-idgenerator-tokenid/pom.xml +++ b/kernel/kernel-idgenerator-tokenid/pom.xml @@ -101,7 +101,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.14 true diff --git a/kernel/kernel-idgenerator-vid/pom.xml b/kernel/kernel-idgenerator-vid/pom.xml index 270ab6a7f0d..f404cad7a6d 100644 --- a/kernel/kernel-idgenerator-vid/pom.xml +++ b/kernel/kernel-idgenerator-vid/pom.xml @@ -64,7 +64,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.14 true diff --git a/kernel/kernel-idobjectvalidator/pom.xml b/kernel/kernel-idobjectvalidator/pom.xml index d50d65743d0..3b5792be214 100644 --- a/kernel/kernel-idobjectvalidator/pom.xml +++ b/kernel/kernel-idobjectvalidator/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT 0.8.11 - 2.2.10 + 2.2.14 @@ -124,7 +124,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.14 true diff --git a/kernel/kernel-idvalidator-mispid/pom.xml b/kernel/kernel-idvalidator-mispid/pom.xml index c32c654c0a1..e9927eac4a4 100644 --- a/kernel/kernel-idvalidator-mispid/pom.xml +++ b/kernel/kernel-idvalidator-mispid/pom.xml @@ -58,7 +58,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.14 true diff --git a/kernel/kernel-idvalidator-prid/pom.xml b/kernel/kernel-idvalidator-prid/pom.xml index 8ac157ac3a5..5a95be0e5e7 100644 --- a/kernel/kernel-idvalidator-prid/pom.xml +++ b/kernel/kernel-idvalidator-prid/pom.xml @@ -61,7 +61,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.14 true diff --git a/kernel/kernel-idvalidator-rid/pom.xml b/kernel/kernel-idvalidator-rid/pom.xml index be066ae203b..6540957be51 100644 --- a/kernel/kernel-idvalidator-rid/pom.xml +++ b/kernel/kernel-idvalidator-rid/pom.xml @@ -58,7 +58,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.14 true diff --git a/kernel/kernel-idvalidator-uin/pom.xml b/kernel/kernel-idvalidator-uin/pom.xml index b615aaedb11..3444c280aec 100644 --- a/kernel/kernel-idvalidator-uin/pom.xml +++ b/kernel/kernel-idvalidator-uin/pom.xml @@ -58,7 +58,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.14 true diff --git a/kernel/kernel-idvalidator-vid/pom.xml b/kernel/kernel-idvalidator-vid/pom.xml index 6a41ea05552..73652614492 100644 --- a/kernel/kernel-idvalidator-vid/pom.xml +++ b/kernel/kernel-idvalidator-vid/pom.xml @@ -61,7 +61,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.14 true diff --git a/kernel/kernel-licensekeygenerator-misp/pom.xml b/kernel/kernel-licensekeygenerator-misp/pom.xml index 14e07a303e6..c749cd97425 100644 --- a/kernel/kernel-licensekeygenerator-misp/pom.xml +++ b/kernel/kernel-licensekeygenerator-misp/pom.xml @@ -87,7 +87,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.14 true diff --git a/kernel/kernel-logger-logback/pom.xml b/kernel/kernel-logger-logback/pom.xml index 108c080404f..81ceaf64d84 100644 --- a/kernel/kernel-logger-logback/pom.xml +++ b/kernel/kernel-logger-logback/pom.xml @@ -91,7 +91,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.14 true diff --git a/kernel/kernel-notification-service/pom.xml b/kernel/kernel-notification-service/pom.xml index 94ee8b66d5c..730089b22ff 100644 --- a/kernel/kernel-notification-service/pom.xml +++ b/kernel/kernel-notification-service/pom.xml @@ -140,7 +140,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.14 true diff --git a/kernel/kernel-pdfgenerator-itext/pom.xml b/kernel/kernel-pdfgenerator-itext/pom.xml index a7672a4404d..883abadc4a7 100644 --- a/kernel/kernel-pdfgenerator-itext/pom.xml +++ b/kernel/kernel-pdfgenerator-itext/pom.xml @@ -114,7 +114,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.14 true diff --git a/kernel/kernel-pinvalidator/pom.xml b/kernel/kernel-pinvalidator/pom.xml index 767872d85be..2d966ae1741 100644 --- a/kernel/kernel-pinvalidator/pom.xml +++ b/kernel/kernel-pinvalidator/pom.xml @@ -74,7 +74,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.14 true diff --git a/kernel/kernel-pridgenerator-service/pom.xml b/kernel/kernel-pridgenerator-service/pom.xml index c01d5a6237f..905220ddd6e 100644 --- a/kernel/kernel-pridgenerator-service/pom.xml +++ b/kernel/kernel-pridgenerator-service/pom.xml @@ -194,7 +194,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.14 true diff --git a/kernel/kernel-qrcodegenerator-zxing/pom.xml b/kernel/kernel-qrcodegenerator-zxing/pom.xml index aff673346ec..2f04024b0b9 100644 --- a/kernel/kernel-qrcodegenerator-zxing/pom.xml +++ b/kernel/kernel-qrcodegenerator-zxing/pom.xml @@ -62,7 +62,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.14 true diff --git a/kernel/kernel-ridgenerator-service/pom.xml b/kernel/kernel-ridgenerator-service/pom.xml index a14e2908500..5a2fd3f9246 100644 --- a/kernel/kernel-ridgenerator-service/pom.xml +++ b/kernel/kernel-ridgenerator-service/pom.xml @@ -128,7 +128,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.14 true diff --git a/kernel/kernel-salt-generator/pom.xml b/kernel/kernel-salt-generator/pom.xml index 40e02308d00..6b59aaeb895 100644 --- a/kernel/kernel-salt-generator/pom.xml +++ b/kernel/kernel-salt-generator/pom.xml @@ -146,7 +146,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.14 true diff --git a/kernel/kernel-templatemanager-velocity/pom.xml b/kernel/kernel-templatemanager-velocity/pom.xml index 709e0eeb198..1f8b42734b5 100644 --- a/kernel/kernel-templatemanager-velocity/pom.xml +++ b/kernel/kernel-templatemanager-velocity/pom.xml @@ -78,7 +78,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.14 true diff --git a/kernel/kernel-transliteration-icu4j/pom.xml b/kernel/kernel-transliteration-icu4j/pom.xml index 87761555091..d7a07b01d47 100644 --- a/kernel/kernel-transliteration-icu4j/pom.xml +++ b/kernel/kernel-transliteration-icu4j/pom.xml @@ -83,7 +83,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.14 true diff --git a/kernel/kernel-websubclient-api/pom.xml b/kernel/kernel-websubclient-api/pom.xml index d3e3d9a07ab..c7b82b0c20f 100644 --- a/kernel/kernel-websubclient-api/pom.xml +++ b/kernel/kernel-websubclient-api/pom.xml @@ -79,7 +79,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.14 true diff --git a/kernel/pom.xml b/kernel/pom.xml index 34c59c73540..7218bd8823c 100644 --- a/kernel/pom.xml +++ b/kernel/pom.xml @@ -240,7 +240,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.14 true diff --git a/pom.xml b/pom.xml index f3a01516ea7..f12c57c816e 100644 --- a/pom.xml +++ b/pom.xml @@ -134,7 +134,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.14 true