Merge branch 'develop'

wcm-io · Nov 20, 2023 · 58ce426 · 58ce426
2 parents 74a468e + 046dd4c
commit 58ce426
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 17 deletions.
diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java: [11, 17]
+        java: [11, 17, 21]
         os: [ubuntu-latest]
         distribution: [temurin]
 

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://wcm.io/testing/aem-mock/changes-report.html'

diff --git a/changes.xml b/changes.xml
@@ -23,6 +23,12 @@
     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="5.4.2" date="2023-11-20">
+      <action type="update" dev="sseifert">
+        Update to latest OSGi Mock.
+      </action>
+    </release>
+
     <release version="5.4.0" date="2023-10-17">
       <action type="add" dev="royteeuwen" issue="22">
         Add mocks for ExperienceFragment and ExperienceFragmentVariation, adaptable from page objects.

diff --git a/core/pom.xml b/core/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.testing.aem-mock.parent</artifactId>
-    <version>5.4.0</version>
+    <version>5.4.2</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 

diff --git a/junit4/pom.xml b/junit4/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.testing.aem-mock.parent</artifactId>
-    <version>5.4.0</version>
+    <version>5.4.2</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>io.wcm</groupId>
       <artifactId>io.wcm.testing.aem-mock.core</artifactId>
-      <version>5.4.0</version>
+      <version>5.4.2</version>
       <scope>compile</scope>
     </dependency>
 
@@ -87,7 +87,7 @@
     <dependency>
       <groupId>io.wcm</groupId>
       <artifactId>io.wcm.testing.aem-mock.core</artifactId>
-      <version>5.4.0</version>
+      <version>5.4.2</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>

diff --git a/junit5/pom.xml b/junit5/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.testing.aem-mock.parent</artifactId>
-    <version>5.4.0</version>
+    <version>5.4.2</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
@@ -54,14 +54,14 @@
     <dependency>
       <groupId>io.wcm</groupId>
       <artifactId>io.wcm.testing.aem-mock.core</artifactId>
-      <version>5.4.0</version>
+      <version>5.4.2</version>
       <scope>compile</scope>
     </dependency>
 
     <dependency>
       <groupId>io.wcm</groupId>
       <artifactId>io.wcm.testing.aem-mock.core</artifactId>
-      <version>5.4.0</version>
+      <version>5.4.2</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.parent_toplevel</artifactId>
-    <version>2.2.2</version>
+    <version>2.2.4</version>
     <relativePath />
   </parent>
 
   <groupId>io.wcm</groupId>
   <artifactId>io.wcm.testing.aem-mock.parent</artifactId>
-  <version>5.4.0</version>
+  <version>5.4.2</version>
   <packaging>pom</packaging>
 
   <name>AEM Mocks</name>
@@ -50,7 +50,7 @@
   <properties>
 
     <!-- OSGi Mocks -->
-    <osgi-mock.version>3.3.10</osgi-mock.version>
+    <osgi-mock.version>3.4.0</osgi-mock.version>
 
     <!-- JCR Mocks -->
     <jcr-mock.version>1.6.10</jcr-mock.version>
@@ -71,7 +71,7 @@
     <logging-logback.version>1.0.0</logging-logback.version>
 
     <!-- Enable reproducible builds -->
-    <project.build.outputTimestamp>2023-10-17T08:06:19Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2023-11-20T15:38:25Z</project.build.outputTimestamp>
 
   </properties>
 

diff --git a/pom.xml b/pom.xml
@@ -25,14 +25,14 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.testing.aem-mock.parent</artifactId>
-    <version>5.4.0</version>
+    <version>5.4.2</version>
     <relativePath>parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm</groupId>
   <artifactId>io.wcm.testing.aem-mock.root</artifactId>
   <packaging>pom</packaging>
-  <version>5.4.0</version>
+  <version>5.4.2</version>
 
   <name>AEM Mocks</name>
   <url>${site.url}/${site.url.module.prefix}/</url>

diff --git a/relocate/pom.xml b/relocate/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.testing.aem-mock.parent</artifactId>
-    <version>5.4.0</version>
+    <version>5.4.2</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>