Merge branch 'integration' into rel/1.30

Dockerfile

@@ -2,7 +2,7 @@
 # First build the app on a maven open jdk 11 container
 FROM maven:3-eclipse-temurin-11-focal as dev-builder
 ARG JHOVE_VERSION
-ENV JHOVE_VERSION=${JHOVE_VERSION:-1.27.0-SNAPSHOT}
+ENV JHOVE_VERSION=${JHOVE_VERSION:-1.32.0-RC1}
 
 # Copy the current dev source branch to a local build dir
 COPY . /build/jhove/
@@ -31,7 +31,7 @@ ARG JAVA_OPTS
 ENV JAVA_OPTS=$JAVA_OPTS
 # Specify the veraPDF REST version if you want to (to be used in build automation)
 ARG JHOVE_VERSION
-ENV JHOVE_VERSION=${JHOVE_VERSION:-1.27.0-SNAPSHOT}
+ENV JHOVE_VERSION=${JHOVE_VERSION:-1.32.0-RC1}
 
 # Copy the JRE from the previous stage
 ENV JAVA_HOME=/opt/java/openjdk

docs/index.html

@@ -11,17 +11,17 @@
   <header class="jumbotron vertical-center">
     <img src="img/jhovelogo.png" alt="JHOVE logo"/>
     <h2>Open source file format identification, validation &amp; characterisation</h2>
-    <a href="http://software.openpreservation.org/rel/jhove-latest.jar" class="btn btn-primary btn-lg pad" download>Download JHOVE</a>
+    <a href="https://software.openpreservation.org/rel/jhove-latest.jar" class="btn btn-primary btn-lg pad" download>Download JHOVE</a>
   </header>
   <main>
     <a class="name" name="software">
       <h2>Software</h2>
     </a>
-    <p class="version">Currently v1.28 19-05-2023</p>
+    <p class="version">Currently v1.30.1 31-07-2024</p>
     <p>Details of the latest release, including release notes <a href="https://github.com/openpreserve/jhove/releases/latest">can be found on GitHub</a>.</p>
     <p>
       JHOVE is a file format identification, validation and characterisation tool. It is implemented as a
-      <a href="http://www.oracle.com/technetwork/java/index.html">Java</a>
+      <a href="https://www.oracle.com/java/technologies/">Java</a>
       application and is usable on any Unix, Windows, or OS X platform with appropriate Java installation.
     </p>
     <h3>Supported Formats</h3>
@@ -156,21 +156,21 @@ <h2>License</h2>
     </a>
     <p>
       JHOVE is made available by the
-      <a href="http://openpreservation.org" title="Open Preservation Foundation home page.">Open
+      <a href="https://openpreservation.org" title="Open Preservation Foundation home page.">Open
         Preservation Foundation</a>
       under the <a href="http://www.gnu.org/">GNU</a>
-      <a href="http://www.gnu.org/licenses/licenses.html#LGPL">Lesser General Public
+      <a href="https://www.gnu.org/licenses/licenses.html#LGPL">Lesser General Public
       License</a> (LGPL).
     </p>
     <p>
       Note that some previous versions of JHOVE were released under the
-      <a href="http://www.gnu.org/">GNU</a>
-      <a href="http://www.gnu.org/licenses/licenses.html#GPL">General Public
+      <a href="https://www.gnu.org/">GNU</a>
+      <a href="https://www.gnu.org/licenses/licenses.html#GPL">General Public
       License</a> (GPL).
     </p>
       <h2>Mailing list</h2>
     <p>
-      <a href="http://lists.openpreservation.org/listinfo/jhove">Subscribe</a> to the JHOVE mailing list.
+      <a href="https://lists.openpreservation.org/listinfo/jhove">Subscribe</a> to the JHOVE mailing list.
     </p>
   </main>
 </div>

jhove-apps/pom.xml

@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.openpreservation.jhove</groupId>
     <artifactId>jhove</artifactId>
-    <version>1.30.0</version>
+    <version>1.32.0-RC1</version>
   </parent>
 
   <artifactId>jhove-apps</artifactId>
   <packaging>jar</packaging>
-  <version>1.30.1</version>
+  <version>1.32.0-RC1</version>
 
 
   <name>JHOVE Applications</name>
@@ -60,7 +60,7 @@
     <dependency>
       <groupId>org.openpreservation.jhove</groupId>
       <artifactId>jhove-core</artifactId>
-      <version>1.30.0</version>
+      <version>1.32.0-RC1</version>
     </dependency>
   </dependencies>