Merge branch 'develop'

wcm-io · Mar 27, 2023 · 22daa95 · 22daa95
2 parents 5af698e + 5624df6
commit 22daa95
Show file tree

Hide file tree

Showing 37 changed files with 832 additions and 450 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: [8, 11, 17]
+        java: [11, 17]
         os: [ubuntu-latest]
         distribution: [temurin]
 

diff --git a/.github/workflows/maven-deploy.yml b/.github/workflows/maven-deploy.yml
@@ -1,4 +1,4 @@
-# Deploy snapshots to Sonatpe OSS repository and deploy site to GitHub Pages
+# Deploy snapshots to Sonatype OSS repository and deploy site to GitHub Pages
 
 name: Deploy
 
@@ -15,19 +15,19 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Configure GIT
         run: |
           git config --global user.email "${{ secrets.GH_SITE_DEPLOY_EMAIL }}"
           git config --global user.name "${{ secrets.GH_SITE_DEPLOY_NAME }}"
 
       - name: Setup JDK
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 8
-          cache: 'maven'
+          java-version: 11
+          cache: maven
 
       - name: Build, verify, deploy, generate site
         env:

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@v2
+    - uses: actions/checkout@v3
     - uses: ncipollo/release-action@v1
       with:
         body: 'Changes: https://wcm.io/testing/aem-mock/changes-report.html'

diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 Mock implementation of selected AEM APIs.
 
 Documentation: https://wcm.io/testing/aem-mock/<br/>
-Issues: https://wcm-io.atlassian.net/browse/WTES<br/>
+Issues: https://github.com/wcm-io/io.wcm.testing.aem-mock/issues<br/>
 Wiki: https://wcm-io.atlassian.net/wiki/<br/>
 Continuous Integration: https://github.com/wcm-io/io.wcm.testing.aem-mock/actions<br/>
 Commercial support: https://wcm.io/commercial-support.html

diff --git a/changes.xml b/changes.xml
@@ -23,6 +23,24 @@
     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.2.0" date="2023-03-27">
+      <action type="add" dev="royteeuwen" issue="4">
+        Implement all mock methods that were added since AEM 6.5.6+ for LanguageManager.
+      </action>
+      <action type="add" dev="catalinadumitruu" issue="8">
+        Implement MockTag.getTitlePath methods.
+      </action>
+      <action type="update" dev="sseifert">
+        Update to latest JCR Mock, OSGi Mock, Sling Mock, Servlet Helpers.
+      </action>
+      <action type="update" dev="sseifert">
+        Switch to Java 11 as minimum version.
+      </action>
+      <action type="update" dev="sseifert" issue="6">
+        AemContextBuilder: Allow mixture of plugins/callbacks.
+      </action>
+    </release>
+
     <release version="5.1.2" date="2022-12-15">
       <action type="update" dev="sseifert">
         Update to latest OSGi Mock.

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.1.2</version>
+    <version>5.2.0</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
@@ -110,7 +110,7 @@
     <dependency>
       <groupId>org.apache.sling</groupId>
       <artifactId>org.apache.sling.testing.sling-mock-oak</artifactId>
-      <version>${sling-mock.oak.version}</version>
+      <version>${sling-mock-oak.version}</version>
       <scope>test</scope>
     </dependency>
 

diff --git a/core/src/main/java/io/wcm/testing/mock/aem/MockContentFragment.java b/core/src/main/java/io/wcm/testing/mock/aem/MockContentFragment.java
@@ -45,6 +45,7 @@
 import com.day.cq.commons.jcr.JcrConstants;
 import com.day.cq.dam.api.Asset;
 import com.day.cq.dam.api.DamConstants;
+import com.day.cq.tagging.Tag;
 
 /**
  * Mock implementation of {@link ContentFragment}.
@@ -271,4 +272,28 @@ public void removeVariation(String variation) throws ContentFragmentException {
     throw new UnsupportedOperationException();
   }
 
+  // latest AEM Cloud API
+  @SuppressWarnings("unused")
+  public void setTags(@NotNull Tag[] tags) throws ContentFragmentException {
+    throw new UnsupportedOperationException();
+  }
+
+  // latest AEM Cloud API
+  @SuppressWarnings("unused")
+  public @NotNull Tag[] getTags() throws ContentFragmentException {
+    throw new UnsupportedOperationException();
+  }
+
+  // latest AEM Cloud API
+  @SuppressWarnings("unused")
+  public void setVariationTags(@NotNull Tag[] tags, @NotNull String variationName) throws ContentFragmentException {
+    throw new UnsupportedOperationException();
+  }
+
+  // latest AEM Cloud API
+  @SuppressWarnings("unused")
+  public @NotNull Tag[] getVariationTags(@NotNull String variationName) throws ContentFragmentException {
+    throw new UnsupportedOperationException();
+  }
+
 }