Merge remote-tracking branch 'origin/maven/fixes/9.0' into maven/rele…

…ase/9.0
edu-sharing · May 21, 2024 · 91788fd · 91788fd
2 parents 75dacc1 + 77ab16f
commit 91788fd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/archetypes/docker/src/main/resources/archetype-resources/src/main/build/Dockerfile b/archetypes/docker/src/main/resources/archetype-resources/src/main/build/Dockerfile
@@ -12,11 +12,11 @@ ARG project_version=dev
 ########################################################################################################################
 
 # TODO default value substituion doesn't work because of the '.' delimiter
-LABEL git.branch=${git_branch}
-LABEL git.closest.tag.name=${git_closest_tag_fixed}
-LABEL git.commit.id=${git_commit_id}
-LABEL git.dirty=${git_dirty}
-LABEL mvn.project.artifactId=${project_artifactId}
-LABEL mvn.project.groupId=${project_groupId}
-LABEL mvn.project.version=${project_version}
+LABEL git.branch=${git_branch} \
+git.closest.tag.name=${git_closest_tag_fixed} \
+git.commit.id=${git_commit_id} \
+git.dirty=${git_dirty} \
+mvn.project.artifactId=${project_artifactId} \
+mvn.project.groupId=${project_groupId} \
+mvn.project.version=${project_version}
 
diff --git a/archetypes/project/src/main/resources/archetype-resources/deploy/docker/pom.xml b/archetypes/project/src/main/resources/archetype-resources/deploy/docker/pom.xml
@@ -31,15 +31,15 @@
     </docker.edu_sharing.community.common.redis.exporter.name>
 
     <docker.edu_sharing.community.common.redis.exporter.tag>
-      1.45.0
+      1.59.0
     </docker.edu_sharing.community.common.redis.exporter.tag>
 
     <docker.edu_sharing.community.common.redis-cluster.name>
       edu_sharing-community-common-docker-redis-cluster
     </docker.edu_sharing.community.common.redis-cluster.name>
 
     <docker.edu_sharing.community.common.redis-cluster.tag>
-      6.2.7
+      6.2.14
     </docker.edu_sharing.community.common.redis-cluster.tag>
 
     <helm.kube.version>&gt;= 1.20.0</helm.kube.version>

diff --git a/archetypes/project/src/main/resources/archetype-resources/repository/deploy/docker/pom.xml b/archetypes/project/src/main/resources/archetype-resources/repository/deploy/docker/pom.xml
@@ -31,7 +31,7 @@
     </docker.edu_sharing.community.common.postgresql.name>
 
     <docker.edu_sharing.community.common.postgresql.tag>
-      13.14.0
+      13.15.0
     </docker.edu_sharing.community.common.postgresql.tag>
 
     <docker.edu_sharing.community.common.postgresql.exporter.name>
@@ -47,15 +47,15 @@
     </docker.edu_sharing.community.common.redis.exporter.name>
 
     <docker.edu_sharing.community.common.redis.exporter.tag>
-      1.45.0
+      1.59.0
     </docker.edu_sharing.community.common.redis.exporter.tag>
 
     <docker.edu_sharing.community.common.redis-cluster.name>
       edu_sharing-community-common-docker-redis-cluster
     </docker.edu_sharing.community.common.redis-cluster.name>
 
     <docker.edu_sharing.community.common.redis-cluster.tag>
-      6.2.7
+      6.2.14
     </docker.edu_sharing.community.common.redis-cluster.tag>
 
     <helm.kube.version>&gt;= 1.20.0</helm.kube.version>