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

…ase/9.0
edu-sharing · Aug 22, 2024 · 2ea3562 · 2ea3562
2 parents bfe8fce + b00b657
commit 2ea3562
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/archetypes/project/src/main/resources/archetype-resources/repository/config/defaults/pom.xml b/archetypes/project/src/main/resources/archetype-resources/repository/config/defaults/pom.xml
@@ -24,6 +24,10 @@
       <resource>
         <directory>src/generated/resources</directory>
       </resource>
+      <resource>
+        <directory>src/main/templates</directory>
+        <filtering>true</filtering>
+      </resource>
     </resources>
 
     <plugins>

diff --git a/...in/templates/WEB-INF/classes/version.json → ...s/src/main/templates/project-version.json b/...in/templates/WEB-INF/classes/version.json → ...s/src/main/templates/project-version.json
@@ -1,7 +1,5 @@
 {
-  "build": {
-    "timestamp": "${build.timestamp}"
-  },
+  "repository": "project",
   "git": {
     "branch": "${git.branch}",
     "closest": {
@@ -18,17 +16,6 @@
     "dirty": "${git.dirty}"
   },
   "maven": {
-    "bom": {
-      "bom": "${bom.bom.version}",
-      "repository": "${bom.repository.version}",
-      "repository-antivirus": "${bom.repository-antivirus.version}",
-      "repository-cluster": "${bom.repository-cluster.version}",
-      "repository-elastic": "${bom.repository-elastic.version}",
-      "repository-mongo": "${bom.repository-mongo.version}",
-      "repository-remote": "${bom.repository-remote.version}",
-      "repository-transform": "${bom.repository-transform.version}",
-      "services-rendering": "${bom.services-rendering.version}"
-    },
     "project": {
       "artifactId": "${project.artifactId}",
       "groupId": "${project.groupId}",