Merge pull request #157 from DataONEorg/develop

3.1.1 Release merge develop --> main

RELEASE-NOTES.md

@@ -1,9 +1,20 @@
 # dataone-indexer Release Notes
 
+## dataone-indexer version 3.1.1 & helm chart version 1.1.1
+
+* Release date: 2024-12-17
+* **dataone-indexer version 3.1.1**
+  * This is a minor release to fix logging issues. Changes were made to the `slf4j` and `log4j`
+    dependencies to ensure that log messages are written correctly
+    (see [PR #155](https://github.com/DataONEorg/dataone-indexer/pull/155)).
+* **helm chart version 1.1.1**
+  * Bump Application version to 3.1.1
+  * Change log4j properties configMap mount-point from `log4j.properties` to `log4j2.properties`
+
 ## dataone-indexer version 3.1.0 & helm chart version 1.1.0
 
 * Release date: 2024-11-21
-* dataone-indexer version 3.1.0
+* **dataone-indexer version 3.1.0**
   * Integrate with the new Dataone hash-based storage library
     [`hashstore-java`](https://github.com/DataONEorg/hashstore-java).
     * Indexer no longer needs access to an aut token in order to index private datasets.
@@ -18,33 +29,33 @@
     * org.apache.logging.log4j:log4j-jcl from 2.17.1 to 2.24.0
     * org.apache.maven.plugins:maven-clean-plugin from 3.2.0 to 3.4.0
     * com.fasterxml.jackson.core:jackson-annotations from 2.13.3 to 2.18.0
-* helm chart version 1.0.2
+* **helm chart version 1.1.0**
   * Bump Application version to 3.1.0
   * Add `storage` to values.yaml for new hashstore integration
 
 ## dataone-indexer version 3.0.2 & helm chart version 1.0.2
 
 * Release date: 2024-07-29
-* dataone-indexer version 3.0.2
+* **dataone-indexer version 3.0.2**
   * Bug fix - RabbitMQ Channel timeouts (PR #119)
-* helm chart version 1.0.2
+* **helm chart version 1.0.2**
   * Bump Application version to 3.0.2
   * Make .Values.rabbitmq.auth.existingPasswordSecret a required value
 
 ## dataone-indexer version 3.0.1 & helm chart version 1.0.1
 
 * Release date: 2024-07-08
-* dataone-indexer version 3.0.1
+* **dataone-indexer version 3.0.1**
   * Bump rmq amqp client to 5.21.0
   * Add healthcheck code
   * Exit app if unrecoverable exception occurs when started from `main()` method
-* helm chart version 1.0.1
+* **helm chart version 1.0.1**
   * Change `.Values.idxworker.cn_url` to `.Values.global.d1ClientCnUrl`
   * Get `fullname` from metacat chart or provide in values.yaml
   * Add simple 'exec' liveness probe. Remove readiness probe
 
 ## dataone-indexer version 3.0.0 & helm chart version 1.0.0
 
 * Release date: 2024-04-25
-* dataone-indexer version 3.0.0 -- first release of dataone-indexer
-* helm chart version 1.0.0 -- first release of helm chart
+* **dataone-indexer version 3.0.0** -- first release of dataone-indexer
+* **helm chart version 1.0.0** -- first release of helm chart

docker/Dockerfile

@@ -4,7 +4,7 @@
 # Note: the prior alpine-based openjdk image had network DNS issues, so replacing with Eclipse Temurin
 FROM eclipse-temurin:17.0.12_7-jre-jammy
 
-ARG TAG=3.0.0-SNAPSHOT
+ARG TAG="NO-TAG"
 ENV TAG=${TAG}
 ENV DATAONE_INDEXER_CONFIG=/etc/dataone/dataone-indexer.properties
 

helm/Chart.yaml

@@ -21,13 +21,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: "1.1.0"
+version: "1.1.1"
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "3.1.0"
+appVersion: "3.1.1"
 
 # Chart dependencies
 dependencies:

helm/templates/deployment.yaml

@@ -65,7 +65,7 @@ spec:
             - mountPath: /etc/dataone/dataone-indexer.properties
               subPath: dataone-indexer.properties
               name: {{ .Release.Name }}-config-volume
-            - mountPath: /etc/dataone/log4j.properties
+            - mountPath: /etc/dataone/log4j2.properties
               subPath: log4j2.properties
               name: {{ .Release.Name }}-config-volume
             - mountPath: {{ .Values.persistence.mountPath }}

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.dataone</groupId>
     <artifactId>dataone-index-worker</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.1</version>
     <packaging>jar</packaging>
     <name>dataone-index-worker</name>
     <url>http://maven.apache.org</url>
@@ -16,6 +16,7 @@
         <d1_libclient_java.version>2.3.1</d1_libclient_java.version>
         <solr.version>8.11.2</solr.version>
         <solr.test.home>solr8home</solr.test.home>
+        <log4j.version>2.17.1</log4j.version>
     </properties>
 
     <profiles>
@@ -217,7 +218,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>2.0.16</version>
+            <version>1.6.1</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -278,17 +279,27 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-1.2-api</artifactId>
-            <version>2.24.0</version>
+            <version>${log4j.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.24.0</version>
+            <version>${log4j.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-jcl</artifactId>
-            <version>2.24.0</version>
+            <version>${log4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-layout-template-json</artifactId>
+            <version>2.17.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.solr</groupId>