REL: v0.16.0 (#209)

- bumped maven version -> 0.16.0; - updated version in batch start files; and - updated version in README and other documentation.
openpreserve · Oct 30, 2024 · aebc547 · aebc547
1 parent cc1bc7b
commit aebc547
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # ODF Validator
 
-Latest version is 0.15.0-SNAPSHOT.
+Latest version is 0.16.0.
 
 ## About
 

diff --git a/docs/developer/index.md b/docs/developer/index.md
@@ -44,7 +44,7 @@ To include the core validation library in your project, add the following depend
 <dependency>
     <groupId>org.openpreservation.odf</groupId>
     <artifactId>odf-core</artifactId>
-    <version>0.15.0-SNAPSHOT</version>
+    <version>0.16.0</version>
 </dependency>
 ```
 

diff --git a/odf-apps/pom.xml b/odf-apps/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.openpreservation.odf</groupId>
     <artifactId>odf-validator</artifactId>
-    <version>0.15.0-SNAPSHOT</version>
+    <version>0.16.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/odf-apps/src/main/java/org/openpreservation/odf/apps/CliValidator.java b/odf-apps/src/main/java/org/openpreservation/odf/apps/CliValidator.java
@@ -125,10 +125,14 @@ private static Integer results(final Path path, final ValidationReport report) {
             ConsoleFormatter.info(FACTORY.getInfo("APP-3").getMessage());
         }
         results(report.documentMessages.getMessages());
-        outputSummary(report.documentMessages);
+        outputSummary(isEncrypted(report), report.documentMessages);
         return status;
     }
 
+    private static boolean isEncrypted(final ValidationReport report) {
+        return report.document.isPackage() && report.document.getPackage().isEncrypted();
+    }
+
     private static Integer results(final Map<String, List<Message>> messageMap) {
         Integer status = 0;
         for (Map.Entry<String, List<Message>> entry : messageMap.entrySet()) {
@@ -150,7 +154,7 @@ private static Integer results(final Path path, final ProfileResult report) {
                 ? report.getValidationReport().documentMessages
                 : Messages.messageLogInstance();
         profileMessages.add(report.getMessageLog().getMessages());
-        outputSummary(profileMessages);
+        outputSummary(isEncrypted(report.getValidationReport()), profileMessages);
         return status;
     }
 
@@ -165,8 +169,12 @@ private static Integer results(final String path, final List<Message> messages)
         return status;
     }
 
-    private static void outputSummary(final MessageLog messageLog) {
-        if (messageLog.hasErrors()) {
+    private static void outputSummary(final boolean isEncrypted, final MessageLog messageLog) {
+        if (isEncrypted) {
+            ConsoleFormatter.error(String.format(
+                    "INCOMPLETE encrypted entries are not supported, %d errors, %d warnings and %d info messages.",
+                    messageLog.getErrorCount(), messageLog.getWarningCount(), messageLog.getInfoCount()));
+        } else if (messageLog.hasErrors()) {
             ConsoleFormatter.error(String.format("NOT VALID, %d errors, %d warnings and %d info messages.",
                     messageLog.getErrorCount(), messageLog.getWarningCount(), messageLog.getInfoCount()));
         } else if (messageLog.hasWarnings()) {

diff --git a/odf-core/pom.xml b/odf-core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.openpreservation.odf</groupId>
     <artifactId>odf-validator</artifactId>
-    <version>0.15.0-SNAPSHOT</version>
+    <version>0.16.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/odf-reporting/pom.xml b/odf-reporting/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.openpreservation.odf</groupId>
     <artifactId>odf-validator</artifactId>
-    <version>0.15.0-SNAPSHOT</version>
+    <version>0.16.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/odf-validator b/odf-validator
@@ -78,5 +78,5 @@ fi
 
 exec "$JAVACMD" -Dfile.encoding=UTF8 -XX:+IgnoreUnrecognizedVMOptions \
   -Dapp.name="ODF Validator" \
-  -jar odf-apps/target/odf-apps-0.15.0-SNAPSHOT-jar-with-dependencies.jar \
+  -jar odf-apps/target/odf-apps-0.16.0-jar-with-dependencies.jar \
   "$@"
diff --git a/odf-validator.bat b/odf-validator.bat
@@ -85,7 +85,7 @@ if NOT "%CLASSPATH_PREFIX%" == "" set CLASSPATH=%CLASSPATH_PREFIX%;%CLASSPATH%
 @REM Reaching here means variables are defined and arguments have been captured
 :endInit
 
-"%JAVACMD%" -Dfile.encoding=UTF8 -XX:+IgnoreUnrecognizedVMOptions -Dapp.name="ODF Validator" -jar .\odf-apps\target\odf-apps-0.15.0-SNAPSHOT-jar-with-dependencies.jar %CMD_LINE_ARGS%
+"%JAVACMD%" -Dfile.encoding=UTF8 -XX:+IgnoreUnrecognizedVMOptions -Dapp.name="ODF Validator" -jar .\odf-apps\target\odf-apps-0.16.0-jar-with-dependencies.jar %CMD_LINE_ARGS%
 if %ERRORLEVEL% NEQ 0 goto error
 goto end
 

diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>org.openpreservation.odf</groupId>
   <artifactId>odf-validator</artifactId>
-  <version>0.15.0-SNAPSHOT</version>
+  <version>0.16.0</version>
   <packaging>pom</packaging>
 
   <modules>