#98 prepare next release

CondationCMS · Dec 4, 2023 · 5b032bf · 5b032bf
1 parent 6811a87
commit 5b032bf
Show file tree

Hide file tree

Showing 20 changed files with 29 additions and 19 deletions.
diff --git a/cms-api/pom.xml b/cms-api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>2.14.0</version>
+		<version>2.15.0</version>
 	</parent>
 	<artifactId>cms-api</artifactId>
 	<packaging>jar</packaging>

diff --git a/cms-api/src/main/java/com/github/thmarx/cms/api/db/ContentNode.java b/cms-api/src/main/java/com/github/thmarx/cms/api/db/ContentNode.java
@@ -50,6 +50,10 @@ public ContentNode(String uri, String name, Map<String, Object> data) {
 			this(uri, name, data, false, new HashMap<String, ContentNode>(), LocalDate.now());
 		}
 
+		public ContentNode(String uri, String name, Map<String, Object> data, LocalDate lastmodified) {
+			this(uri, name, data, false, new HashMap<String, ContentNode>(), lastmodified);
+		}
+
 		public boolean isDirectory() {
 			return directory;
 		}

diff --git a/cms-filesystem/pom.xml b/cms-filesystem/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>2.14.0</version>
+		<version>2.15.0</version>
 	</parent>
 	<artifactId>cms-filesystem</artifactId>
 	<packaging>jar</packaging>

diff --git a/cms-filesystem/src/main/java/com/github/thmarx/cms/filesystem/FileSystem.java b/cms-filesystem/src/main/java/com/github/thmarx/cms/filesystem/FileSystem.java
@@ -40,6 +40,9 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.attribute.BasicFileAttributes;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -261,7 +264,9 @@ private void addOrUpdateMetaData(Path file) throws IOException {
 
 		var uri = PathUtil.toRelativeFile(file, contentBase);
 
-		metaData.addFile(uri, fileMeta);
+		var lastModified = LocalDate.ofInstant(Files.getLastModifiedTime(file).toInstant(), ZoneId.systemDefault());
+
+		metaData.addFile(uri, fileMeta, lastModified);
 	}
 
 	public void init() throws IOException {

diff --git a/cms-filesystem/src/main/java/com/github/thmarx/cms/filesystem/MetaData.java b/cms-filesystem/src/main/java/com/github/thmarx/cms/filesystem/MetaData.java
@@ -29,6 +29,7 @@
 import com.github.thmarx.cms.filesystem.datafilter.DataFilter;
 import com.google.common.base.Strings;
 import java.time.Instant;
+import java.time.LocalDate;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
@@ -161,10 +162,10 @@ private Optional<ContentNode> getFolder(String uri) {
 		return Optional.ofNullable(folder.get());
 	}
 
-	public void addFile(final String uri, final Map<String, Object> data) {
+	public void addFile(final String uri, final Map<String, Object> data, final LocalDate lastModified) {
 
 		var parts = uri.split(Constants.SPLIT_PATH_PATTERN);
-		final ContentNode node = new ContentNode(uri, parts[parts.length - 1], data);
+		final ContentNode node = new ContentNode(uri, parts[parts.length - 1], data, lastModified);
 
 		nodes.put(uri, node);
 		dataFilter.add(node);

diff --git a/cms-git/pom.xml b/cms-git/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>2.14.0</version>
+		<version>2.15.0</version>
 	</parent>
 	<artifactId>cms-git</artifactId>
 	<packaging>jar</packaging>

diff --git a/cms-media/pom.xml b/cms-media/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>2.14.0</version>
+		<version>2.15.0</version>
 	</parent>
 	<artifactId>cms-media</artifactId>
 	<packaging>jar</packaging>

diff --git a/cms-server/modules/seo-module/libs/seo-module-2.14.0.jar b/cms-server/modules/seo-module/libs/seo-module-2.14.0.jar
diff --git a/cms-server/pom.xml b/cms-server/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>2.14.0</version>
+		<version>2.15.0</version>
 	</parent>
 	<artifactId>cms-server</artifactId>
 	<packaging>jar</packaging>

diff --git a/modules/example-module/pom.xml b/modules/example-module/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms.modules</groupId>
 		<artifactId>cms-modules</artifactId>
-		<version>2.14.0</version>
+		<version>2.15.0</version>
 	</parent>
 	<artifactId>example-module</artifactId>
 	<packaging>jar</packaging>

diff --git a/modules/flexmark-module/pom.xml b/modules/flexmark-module/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms.modules</groupId>
 		<artifactId>cms-modules</artifactId>
-		<version>2.14.0</version>
+		<version>2.15.0</version>
 	</parent>
 	<artifactId>flexmark-module</artifactId>
 	<packaging>jar</packaging>

diff --git a/modules/freemarker-module/pom.xml b/modules/freemarker-module/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms.modules</groupId>
 		<artifactId>cms-modules</artifactId>
-		<version>2.14.0</version>
+		<version>2.15.0</version>
 	</parent>
 	<artifactId>freemarker-module</artifactId>
 	<packaging>jar</packaging>

diff --git a/modules/markedjs-module/pom.xml b/modules/markedjs-module/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms.modules</groupId>
 		<artifactId>cms-modules</artifactId>
-		<version>2.14.0</version>
+		<version>2.15.0</version>
 	</parent>
 	<artifactId>markedjs-module</artifactId>
 	<packaging>jar</packaging>

diff --git a/modules/pebble-module/pom.xml b/modules/pebble-module/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms.modules</groupId>
 		<artifactId>cms-modules</artifactId>
-		<version>2.14.0</version>
+		<version>2.15.0</version>
 	</parent>
 	<artifactId>pebble-module</artifactId>
 	<packaging>jar</packaging>

diff --git a/modules/pom.xml b/modules/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>2.14.0</version>
+		<version>2.15.0</version>
 	</parent>
 	<groupId>com.github.thmarx.cms.modules</groupId>
 	<artifactId>cms-modules</artifactId>

diff --git a/modules/pug-module/pom.xml b/modules/pug-module/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms.modules</groupId>
 		<artifactId>cms-modules</artifactId>
-		<version>2.14.0</version>
+		<version>2.15.0</version>
 	</parent>
 	<artifactId>pug-module</artifactId>
 	<packaging>jar</packaging>

diff --git a/modules/search-module/pom.xml b/modules/search-module/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms.modules</groupId>
 		<artifactId>cms-modules</artifactId>
-		<version>2.14.0</version>
+		<version>2.15.0</version>
 	</parent>
 	<artifactId>search-module</artifactId>
 	<packaging>jar</packaging>

diff --git a/modules/seo-module/pom.xml b/modules/seo-module/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms.modules</groupId>
 		<artifactId>cms-modules</artifactId>
-		<version>2.14.0</version>
+		<version>2.15.0</version>
 	</parent>
 	<artifactId>seo-module</artifactId>
 	<packaging>jar</packaging>

diff --git a/modules/thymeleaf-module/pom.xml b/modules/thymeleaf-module/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms.modules</groupId>
 		<artifactId>cms-modules</artifactId>
-		<version>2.14.0</version>
+		<version>2.15.0</version>
 	</parent>
 	<artifactId>thymeleaf-module</artifactId>
 	<packaging>jar</packaging>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.github.thmarx.cms</groupId>
 	<artifactId>cms-parent</artifactId>
-	<version>2.14.0</version>
+	<version>2.15.0</version>
 	<packaging>pom</packaging>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>