Release: com.io7m.idstore 2.0.1

Change: The idstore worker role was not being used to connect to the database. (Ticket: #154) Change: Update com.github.davidmoten:subethasmtp:7.0.2 → 7.1.1.
io7m-com · May 22, 2024 · feebc39 · feebc39
2 parents e00ac63 + 74f044a
commit feebc39
Show file tree

Hide file tree

Showing 64 changed files with 224 additions and 65 deletions.
diff --git a/.github/workflows/deploy-release.sh b/.github/workflows/deploy-release.sh
@@ -1,4 +1,9 @@
 #!/bin/sh
+#
+#  Automatically generated: DO NOT EDIT.
+#
+#  Generation code: https://www.github.com/io7m-com/.github/
+#
 
 fatal()
 {
@@ -22,6 +27,11 @@ fi
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
 
+  <!-- Enable deployment of OCI images. -->
+  <activeProfiles>
+    <activeProfile>io7m-oci-image</activeProfile>
+  </activeProfiles>
+
   <profiles>
     <profile>
       <id>io7m</id>
@@ -54,5 +64,6 @@ exec mvn \
 -Dio7m.deployment=true \
 --batch-mode \
 --strict-checksums \
+-Denforcer.skip=true \
 -DskipTests=true \
 -DskipITs=true deploy
diff --git a/.github/workflows/deploy-snapshot.sh b/.github/workflows/deploy-snapshot.sh
@@ -1,4 +1,9 @@
 #!/bin/sh
+#
+#  Automatically generated: DO NOT EDIT.
+#
+#  Generation code: https://www.github.com/io7m-com/.github/
+#
 
 fatal()
 {
@@ -46,5 +51,6 @@ EOF
 exec mvn \
 --batch-mode \
 --strict-checksums \
+-Denforcer.skip=true \
 -DskipTests=true \
 -DskipITs=true deploy
diff --git a/.github/workflows/deploy.linux.temurin.lts.yml b/.github/workflows/deploy.linux.temurin.lts.yml
@@ -1,3 +1,9 @@
+#
+#  Automatically generated: DO NOT EDIT.
+#
+#  Generation code: https://www.github.com/io7m-com/.github/
+#  Workflow profile: Core
+#
 
 name: deploy.linux.temurin.lts
 

diff --git a/.github/workflows/main.linux.temurin.current.yml b/.github/workflows/main.linux.temurin.current.yml
@@ -1,3 +1,9 @@
+#
+#  Automatically generated: DO NOT EDIT.
+#
+#  Generation code: https://www.github.com/io7m-com/.github/
+#  Workflow profile: Core
+#
 
 name: main.linux.temurin.current
 

diff --git a/.github/workflows/main.linux.temurin.lts.yml b/.github/workflows/main.linux.temurin.lts.yml
@@ -1,3 +1,9 @@
+#
+#  Automatically generated: DO NOT EDIT.
+#
+#  Generation code: https://www.github.com/io7m-com/.github/
+#  Workflow profile: Core
+#
 
 name: main.linux.temurin.lts
 
@@ -38,7 +44,7 @@ jobs:
           path: ./com.io7m.idstore.tests/target/surefire-reports
 
       - name: Coverage
-        uses: codecov/codecov-action@v4.3.1
+        uses: codecov/codecov-action@v4.4.1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           file: com.io7m.idstore.tests/target/site/jacoco-aggregate/jacoco.xml

diff --git a/.github/workflows/main.windows.temurin.current.yml b/.github/workflows/main.windows.temurin.current.yml
@@ -1,3 +1,9 @@
+#
+#  Automatically generated: DO NOT EDIT.
+#
+#  Generation code: https://www.github.com/io7m-com/.github/
+#  Workflow profile: Core
+#
 
 name: main.windows.temurin.current
 

diff --git a/.github/workflows/main.windows.temurin.lts.yml b/.github/workflows/main.windows.temurin.lts.yml
@@ -1,3 +1,9 @@
+#
+#  Automatically generated: DO NOT EDIT.
+#
+#  Generation code: https://www.github.com/io7m-com/.github/
+#  Workflow profile: Core
+#
 
 name: main.windows.temurin.lts
 

diff --git a/.github/workflows/pr.linux.temurin.current.yml b/.github/workflows/pr.linux.temurin.current.yml
@@ -1,3 +1,9 @@
+#
+#  Automatically generated: DO NOT EDIT.
+#
+#  Generation code: https://www.github.com/io7m-com/.github/
+#  Workflow profile: Core
+#
 
 name: pr.linux.temurin.current
 

diff --git a/.github/workflows/pr.linux.temurin.lts.yml b/.github/workflows/pr.linux.temurin.lts.yml
@@ -1,3 +1,9 @@
+#
+#  Automatically generated: DO NOT EDIT.
+#
+#  Generation code: https://www.github.com/io7m-com/.github/
+#  Workflow profile: Core
+#
 
 name: pr.linux.temurin.lts
 

diff --git a/.github/workflows/pr.windows.temurin.current.yml b/.github/workflows/pr.windows.temurin.current.yml
@@ -1,3 +1,9 @@
+#
+#  Automatically generated: DO NOT EDIT.
+#
+#  Generation code: https://www.github.com/io7m-com/.github/
+#  Workflow profile: Core
+#
 
 name: pr.windows.temurin.current
 

diff --git a/.github/workflows/pr.windows.temurin.lts.yml b/.github/workflows/pr.windows.temurin.lts.yml
@@ -1,3 +1,9 @@
+#
+#  Automatically generated: DO NOT EDIT.
+#
+#  Generation code: https://www.github.com/io7m-com/.github/
+#  Workflow profile: Core
+#
 
 name: pr.windows.temurin.lts
 

diff --git a/.github/workflows/run-with-xvfb.sh b/.github/workflows/run-with-xvfb.sh
@@ -0,0 +1,66 @@
+#!/bin/bash -ex
+#
+#  Automatically generated: DO NOT EDIT.
+#
+#  Generation code: https://www.github.com/io7m-com/.github/
+#
+
+exec > >(tee build.txt) 2>&1
+
+#---------------------------------------------------------------------
+# Install all of the various required packages.
+#
+# We use:
+#   xvfb    to provide a virtual X server
+#   fluxbox to provide a bare-minimum window manager with click-to-focus
+#   ffmpeg  to record the session
+#   feh     to set a background
+#
+
+sudo apt-get -y update
+sudo apt-get -y upgrade
+sudo apt-get -y install xvfb fluxbox feh ffmpeg
+
+#---------------------------------------------------------------------
+# Start Xvfb on a new display.
+#
+
+Xvfb :99 &
+export DISPLAY=:99
+sleep 1
+
+#---------------------------------------------------------------------
+# Start recording the session.
+#
+
+ffmpeg -f x11grab -y -r 60 -video_size 1280x1024 -i :99 -vcodec vp9 test-suite.webm &
+FFMPEG_PID="$!"
+
+#---------------------------------------------------------------------
+# Start fluxbox on the X server.
+#
+
+fluxbox &
+sleep 1
+
+#---------------------------------------------------------------------
+# Set a desktop image.
+#
+
+feh --bg-tile .github/workflows/wallpaper.png
+sleep 1
+
+#---------------------------------------------------------------------
+# Execute the passed-in build command.
+#
+
+"$@"
+
+#---------------------------------------------------------------------
+# Wait a while, and then instruct ffmpeg to stop recording. This step
+# is necessary because video files need to be processed when recording
+# stops.
+#
+
+sleep 20
+kill -INT "${FFMPEG_PID}" || true
diff --git a/.github/workflows/wallpaper.png b/.github/workflows/wallpaper.png
diff --git a/README-CHANGES.xml b/README-CHANGES.xml
@@ -48,7 +48,7 @@
         <c:change date="2024-04-07T00:00:00+00:00" summary="Re-add missing mail service implementation."/>
       </c:changes>
     </c:release>
-    <c:release date="2024-05-11T19:25:09+00:00" is-open="false" ticket-system="com.github.io7m.idstore" version="2.0.0">
+    <c:release date="2024-05-11T00:00:00+00:00" is-open="false" ticket-system="com.github.io7m.idstore" version="2.0.0">
       <c:changes>
         <c:change date="2024-04-12T00:00:00+00:00" summary="Update io.opentelemetry:opentelemetry-sdk-logs:1.36.0 → 1.37.0"/>
         <c:change date="2024-04-12T00:00:00+00:00" summary="Update io.opentelemetry:opentelemetry-bom:1.36.0 → 1.37.0"/>
@@ -88,6 +88,16 @@
         <c:change date="2024-05-11T00:00:00+00:00" summary="Update com.io7m.jbssio.version:2.0.0 → 2.1.0."/>
       </c:changes>
     </c:release>
+    <c:release date="2024-05-22T20:11:52+00:00" is-open="false" ticket-system="com.github.io7m.idstore" version="2.0.1">
+      <c:changes>
+        <c:change date="2024-05-14T00:00:00+00:00" summary="Update com.github.davidmoten:subethasmtp:7.0.2 → 7.1.1."/>
+        <c:change date="2024-05-22T00:00:00+00:00" summary="The idstore worker role was not being used to connect to the database.">
+          <c:tickets>
+            <c:ticket id="154"/>
+          </c:tickets>
+        </c:change>
+      </c:changes>
+    </c:release>
   </c:releases>
   <c:ticket-systems>
     <c:ticket-system default="true" id="com.github.io7m.idstore" url="https://www.github.com/io7m-com/idstore/issues/"/>

diff --git a/com.io7m.idstore.admin_client.api/pom.xml b/com.io7m.idstore.admin_client.api/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.idstore</artifactId>
     <groupId>com.io7m.idstore</groupId>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
   </parent>
 
   <artifactId>com.io7m.idstore.admin_client.api</artifactId>

diff --git a/com.io7m.idstore.admin_client/pom.xml b/com.io7m.idstore.admin_client/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.idstore</artifactId>
     <groupId>com.io7m.idstore</groupId>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
   </parent>
 
   <artifactId>com.io7m.idstore.admin_client</artifactId>

diff --git a/com.io7m.idstore.database.api/pom.xml b/com.io7m.idstore.database.api/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.idstore</artifactId>
     <groupId>com.io7m.idstore</groupId>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
   </parent>
 
   <artifactId>com.io7m.idstore.database.api</artifactId>

diff --git a/com.io7m.idstore.database.postgres/pom.xml b/com.io7m.idstore.database.postgres/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.idstore</artifactId>
     <groupId>com.io7m.idstore</groupId>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
   </parent>
 
   <artifactId>com.io7m.idstore.database.postgres</artifactId>

diff --git a/...store.database.postgres/src/main/java/com/io7m/idstore/database/postgres/IdDatabases.java b/...store.database.postgres/src/main/java/com/io7m/idstore/database/postgres/IdDatabases.java
@@ -207,8 +207,8 @@ private static IdDatabaseType connect(
 
     final var config = new HikariConfig();
     config.setJdbcUrl(url.toString());
-    config.setUsername(configuration.ownerRoleName());
-    config.setPassword(configuration.ownerRolePassword());
+    config.setUsername("idstore");
+    config.setPassword(configuration.workerRolePassword());
     config.setAutoCommit(false);
 
     final var dataSource =

diff --git a/com.io7m.idstore.documentation/pom.xml b/com.io7m.idstore.documentation/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.idstore</artifactId>
     <groupId>com.io7m.idstore</groupId>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
   </parent>
 
   <artifactId>com.io7m.idstore.documentation</artifactId>

diff --git a/com.io7m.idstore.error_codes/pom.xml b/com.io7m.idstore.error_codes/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.idstore</artifactId>
     <groupId>com.io7m.idstore</groupId>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
   </parent>
 
   <artifactId>com.io7m.idstore.error_codes</artifactId>

diff --git a/com.io7m.idstore.grafana/pom.xml b/com.io7m.idstore.grafana/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.idstore</artifactId>
     <groupId>com.io7m.idstore</groupId>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
   </parent>
 
   <artifactId>com.io7m.idstore.grafana</artifactId>

diff --git a/com.io7m.idstore.main/pom.xml b/com.io7m.idstore.main/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.idstore</artifactId>
     <groupId>com.io7m.idstore</groupId>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
   </parent>
 
   <artifactId>com.io7m.idstore.main</artifactId>

diff --git a/com.io7m.idstore.model/pom.xml b/com.io7m.idstore.model/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.idstore</artifactId>
     <groupId>com.io7m.idstore</groupId>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
   </parent>
 
   <artifactId>com.io7m.idstore.model</artifactId>

diff --git a/com.io7m.idstore.model/src/main/java/com/io7m/idstore/model/package-info.java b/com.io7m.idstore.model/src/main/java/com/io7m/idstore/model/package-info.java
@@ -19,7 +19,7 @@
  */
 
 @Export
-@Version("1.3.0")
+@Version("1.3.1")
 package com.io7m.idstore.model;
 
 import org.osgi.annotation.bundle.Export;

diff --git a/com.io7m.idstore.oci/pom.xml b/com.io7m.idstore.oci/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.idstore</artifactId>
     <groupId>com.io7m.idstore</groupId>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
   </parent>
 
   <artifactId>com.io7m.idstore.oci</artifactId>

diff --git a/com.io7m.idstore.protocol.admin.cb/pom.xml b/com.io7m.idstore.protocol.admin.cb/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.idstore</artifactId>
     <groupId>com.io7m.idstore</groupId>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
   </parent>
 
   <artifactId>com.io7m.idstore.protocol.admin.cb</artifactId>

diff --git a/com.io7m.idstore.protocol.admin/pom.xml b/com.io7m.idstore.protocol.admin/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.idstore</artifactId>
     <groupId>com.io7m.idstore</groupId>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
   </parent>
 
   <artifactId>com.io7m.idstore.protocol.admin</artifactId>

diff --git a/com.io7m.idstore.protocol.api/pom.xml b/com.io7m.idstore.protocol.api/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.idstore</artifactId>
     <groupId>com.io7m.idstore</groupId>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
   </parent>
 
   <artifactId>com.io7m.idstore.protocol.api</artifactId>

diff --git a/com.io7m.idstore.protocol.user.cb/pom.xml b/com.io7m.idstore.protocol.user.cb/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.idstore</artifactId>
     <groupId>com.io7m.idstore</groupId>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
   </parent>
 
   <artifactId>com.io7m.idstore.protocol.user.cb</artifactId>

diff --git a/com.io7m.idstore.protocol.user/pom.xml b/com.io7m.idstore.protocol.user/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.idstore</artifactId>
     <groupId>com.io7m.idstore</groupId>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
   </parent>
 
   <artifactId>com.io7m.idstore.protocol.user</artifactId>