Merge remote-tracking branch 'origin/main' into ethereum

# Conflicts:
#	.idea/jarRepositories.xml

.idea/compiler.xml

@@ -7,7 +7,6 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="jackson-annotations" />
         <module name="assertion-libraries" />
         <module name="core-java-serialization" />
         <module name="core-java-annotations" />
@@ -23,14 +22,14 @@
         <module name="core-java-datetime-conversion" />
         <module name="core-java-lambdas" />
         <module name="junit-5-basics" />
-        <module name="activejdbc" />
         <module name="spring-data-jpa-repo" />
         <module name="apache-velocity" />
         <module name="jackson-conversions-2" />
+        <module name="activejdbc" />
         <module name="codebank" />
         <module name="core-java-collections-list" />
-        <module name="image-compressing" />
         <module name="spring-data-jpa-repo-2" />
+        <module name="image-compressing" />
         <module name="core-java-streams" />
         <module name="core-java-io-2" />
         <module name="core-java-io" />
@@ -57,7 +56,9 @@
       <module name="core-java-11-2" target="11" />
       <module name="core-java-8-2" target="11" />
       <module name="core-java-collections-list-3" target="11" />
+      <module name="jackson-annotations" target="17" />
       <module name="spring-data-jpa-repo-2" target="17" />
+      <module name="xml" target="17" />
     </bytecodeTargetLevel>
   </component>
   <component name="JavacSettings">

.idea/dataSources.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
+    <data-source source="LOCAL" name="postgres@nas1120" uuid="33f98331-7e30-4939-9d10-a9d8ae4f65f2">
+      <driver-ref>postgresql</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>org.postgresql.Driver</jdbc-driver>
+      <jdbc-url>jdbc:postgresql://nas1120:5433/postgres</jdbc-url>
+      <jdbc-additional-properties>
+        <property name="com.intellij.clouds.kubernetes.db.host.port" />
+        <property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
+        <property name="com.intellij.clouds.kubernetes.db.container.port" />
+      </jdbc-additional-properties>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
+  </component>
+</project>

.idea/encodings.xml

@@ -112,5 +112,7 @@
     <file url="file://$PROJECT_DIR$/toolkits/codebank/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/toolkits/discourse/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/toolkits/discourse/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/xml/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/xml/src/main/resources" charset="UTF-8" />
   </component>
 </project>