Merge branch 'develop'

wcm-io · Nov 20, 2023 · 7ccb2a7 · 7ccb2a7
2 parents 81503b5 + 2963fc3
commit 7ccb2a7
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 8 deletions.
diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
@@ -19,13 +19,13 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java: [11, 17]
+        java: [11, 17, 21]
         os: [ubuntu-latest]
         distribution: [temurin]
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup JDK
         uses: actions/setup-java@v3

diff --git a/.github/workflows/maven-deploy.yml b/.github/workflows/maven-deploy.yml
@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Configure GIT
         run: |

diff --git a/.github/workflows/release-from-tag.yml b/.github/workflows/release-from-tag.yml
@@ -12,7 +12,7 @@ jobs:
     permissions:
       contents: write
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: ncipollo/release-action@v1
       with:
         body: 'Changes: https://github.com/wcm-io/io.wcm.parent_toplevel/blob/develop/changes.xml'

diff --git a/changes.xml b/changes.xml
@@ -23,6 +23,18 @@
     xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
   <body>
 
+    <release version="2.2.4" date="2023-11-20">
+      <action type="update" dev="sseifert">
+        Update to aem-global-parent 2.1.12.
+      </action>
+      <action type="update" dev="sseifert">
+        Update testing dependencies.
+      </action>
+      <action type="update" dev="sseifert">
+        Disable parallel test execution for JUnit 5 for Java 21: We had problems in some modules with ThreadsafeMockAdapterManagerWrapper not working properly on GitHub runners.
+      </action>
+    </release>
+
     <release version="2.2.2" date="2023-09-04">
       <action type="update" dev="sseifert">
         Update to aem-global-parent 2.1.6.

diff --git a/pom.xml b/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm.maven</groupId>
     <artifactId>io.wcm.maven.aem-global-parent</artifactId>
-    <version>2.1.6</version>
+    <version>2.1.12</version>
     <relativePath />
   </parent>
 
   <groupId>io.wcm</groupId>
   <artifactId>io.wcm.parent_toplevel</artifactId>
-  <version>2.2.2</version>
+  <version>2.2.4</version>
   <packaging>pom</packaging>
 
   <name>Toplevel Parent</name>
@@ -89,7 +89,7 @@
     <site.deploy.url>scm:git:https://github.com/wcm-io/wcm-io.github.io.git</site.deploy.url>
 
     <!-- Versions -->
-    <mockito.version>5.5.0</mockito.version>
+    <mockito.version>5.7.0</mockito.version>
 
     <!-- set default empty argLine when not executing jacoco -->
     <argLine />
@@ -172,7 +172,7 @@
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
-        <version>5.10.0</version>
+        <version>5.10.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -452,6 +452,7 @@
   </reporting>
 
   <profiles>
+
     <!-- profile used for building releases and deployment to sonatype/maven central -->
     <profile>
       <id>release-profile</id>
@@ -494,6 +495,32 @@
         </plugins>
       </build>
     </profile>
+
+    <!-- Disable parallel test execution for JUnit 5 for Java 21: We had problems in some modules with ThreadsafeMockAdapterManagerWrapper not working properly on GitHub runners -->
+    <profile>
+      <id>disable-junit5-parallel-test-execution-java21</id>
+      <activation>
+        <jdk>21</jdk>
+      </activation>
+      <build>
+        <pluginManagement>
+          <plugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-surefire-plugin</artifactId>
+              <configuration>
+                <properties>
+                  <configurationParameters>
+                    junit.jupiter.execution.parallel.enabled = false
+                  </configurationParameters>
+                </properties>
+              </configuration>
+            </plugin>
+          </plugins>
+        </pluginManagement>
+      </build>
+    </profile>
+
   </profiles>
 
   <distributionManagement>