Merge branch 'develop' into 11305-export-drafts #11305

Author: pdurbin

.github/workflows/copy_labels.yml

@@ -6,6 +6,10 @@ on:
 
 jobs:
   copy-labels:
+    # Avoid being triggered by forks
+    if: "! github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]'"
+    permissions:
+      pull-requests: write
     runs-on: ubuntu-latest
     name: Copy labels from linked issues
     steps:

src/test/java/edu/harvard/iq/dataverse/MailServiceBeanIT.java

@@ -75,7 +75,7 @@ static void setUp() {
     @Container
     static GenericContainer<?> maildev = new GenericContainer<>("dockage/mailcatcher")
         .withExposedPorts(PORT_HTTP, PORT_SMTP)
-        .waitingFor(Wait.forHttp("/"));
+        .waitingFor(Wait.forHttp("/").forPort(PORT_HTTP));
 
     static String tcSmtpHost() {
         return maildev.getHost();