Skip to content

Commit c59bb76

Browse files
stefanseifertstefanseifert
committed
Merge branch 'develop'
2 parents a2133b6 + 3819e1a commit c59bb76

File tree

9 files changed

+21
-16
lines changed

9 files changed

+21
-16
lines changed

‎changes.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@
2323
xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
2424
<body>
2525

26+
<release version="5.1.2" date="2022-12-15">
27+
<action type="update" dev="sseifert">
28+
Update to latest OSGi Mock.
29+
</action>
30+
</release>
31+
2632
<release version="5.1.0" date="2022-09-30">
2733
<action type="add" dev="sseifert"><![CDATA[
2834
Add support for new Resource Resovler Type <code>RESOURCEPROVIDER_MOCK</code> introduced with <a href="https://issues.apache.org/jira/browse/SLING-11548">SLING-11548</a>.

‎core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<parent>
2626
<groupId>io.wcm</groupId>
2727
<artifactId>io.wcm.testing.aem-mock.parent</artifactId>
28-
<version>5.1.0</version>
28+
<version>5.1.2</version>
2929
<relativePath>../parent/pom.xml</relativePath>
3030
</parent>
3131

‎core/src/main/java/io/wcm/testing/mock/aem/MockStyle.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
import org.apache.sling.api.resource.Resource;
2727
import org.apache.sling.api.resource.ValueMap;
2828
import org.jetbrains.annotations.NotNull;
29+
import org.jetbrains.annotations.Nullable;
2930

3031
import com.day.cq.wcm.api.designer.Cell;
3132
import com.day.cq.wcm.api.designer.Design;
3233
import com.day.cq.wcm.api.designer.Style;
33-
import com.drew.lang.annotations.Nullable;
3434

3535
/**
3636
* Mock implementation of {@link Style}.

‎junit4/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<parent>
2626
<groupId>io.wcm</groupId>
2727
<artifactId>io.wcm.testing.aem-mock.parent</artifactId>
28-
<version>5.1.0</version>
28+
<version>5.1.2</version>
2929
<relativePath>../parent/pom.xml</relativePath>
3030
</parent>
3131

@@ -54,7 +54,7 @@
5454
<dependency>
5555
<groupId>io.wcm</groupId>
5656
<artifactId>io.wcm.testing.aem-mock.core</artifactId>
57-
<version>5.1.0</version>
57+
<version>5.1.2</version>
5858
<scope>compile</scope>
5959
</dependency>
6060

@@ -87,7 +87,7 @@
8787
<dependency>
8888
<groupId>io.wcm</groupId>
8989
<artifactId>io.wcm.testing.aem-mock.core</artifactId>
90-
<version>5.1.0</version>
90+
<version>5.1.2</version>
9191
<classifier>tests</classifier>
9292
<scope>test</scope>
9393
</dependency>

‎junit5/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<parent>
2626
<groupId>io.wcm</groupId>
2727
<artifactId>io.wcm.testing.aem-mock.parent</artifactId>
28-
<version>5.1.0</version>
28+
<version>5.1.2</version>
2929
<relativePath>../parent/pom.xml</relativePath>
3030
</parent>
3131

@@ -54,14 +54,14 @@
5454
<dependency>
5555
<groupId>io.wcm</groupId>
5656
<artifactId>io.wcm.testing.aem-mock.core</artifactId>
57-
<version>5.1.0</version>
57+
<version>5.1.2</version>
5858
<scope>compile</scope>
5959
</dependency>
6060

6161
<dependency>
6262
<groupId>io.wcm</groupId>
6363
<artifactId>io.wcm.testing.aem-mock.core</artifactId>
64-
<version>5.1.0</version>
64+
<version>5.1.2</version>
6565
<classifier>tests</classifier>
6666
<scope>test</scope>
6767
</dependency>

‎parent/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
<groupId>io.wcm</groupId>
3333
<artifactId>io.wcm.testing.aem-mock.parent</artifactId>
34-
<version>5.1.0</version>
34+
<version>5.1.2</version>
3535
<packaging>pom</packaging>
3636

3737
<name>AEM Mocks</name>
@@ -40,7 +40,7 @@
4040
<properties>
4141

4242
<!-- OSGi Mocks -->
43-
<osgi-mock.version>3.3.2</osgi-mock.version>
43+
<osgi-mock.version>3.3.4</osgi-mock.version>
4444

4545
<!-- JCR Mocks -->
4646
<jcr-mock.version>1.6.0</jcr-mock.version>
@@ -61,7 +61,7 @@
6161
<logging-logback.version>1.0.0</logging-logback.version>
6262

6363
<!-- Enable reproducible builds -->
64-
<project.build.outputTimestamp>2022-09-30T08:27:05Z</project.build.outputTimestamp>
64+
<project.build.outputTimestamp>2022-12-15T11:02:11Z</project.build.outputTimestamp>
6565

6666
</properties>
6767

‎pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
<parent>
2626
<groupId>io.wcm</groupId>
2727
<artifactId>io.wcm.testing.aem-mock.parent</artifactId>
28-
<version>5.1.0</version>
28+
<version>5.1.2</version>
2929
<relativePath>parent/pom.xml</relativePath>
3030
</parent>
3131

3232
<groupId>io.wcm</groupId>
3333
<artifactId>io.wcm.testing.aem-mock.root</artifactId>
3434
<packaging>pom</packaging>
35-
<version>5.1.0</version>
35+
<version>5.1.2</version>
3636

3737
<name>AEM Mocks</name>
3838
<url>${site.url}/${site.url.module.prefix}/</url>

‎relocate/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<parent>
2626
<groupId>io.wcm</groupId>
2727
<artifactId>io.wcm.testing.aem-mock.parent</artifactId>
28-
<version>5.1.0</version>
28+
<version>5.1.2</version>
2929
<relativePath>../parent/pom.xml</relativePath>
3030
</parent>
3131

‎src/site/markdown/index.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ The mock implementation supports:
4949
### Further Resources
5050

5151
* [adaptTo() 2021 Talk: What's new in AEM Mocks][adaptto-talk-2021-whats-new-in-aem-mocks]
52-
* [Ask the AEM Community Expert March 2019: Unit Testing with AEM Mocks][atace-03-19-unit-testing-with-aem-mocks] | [Video][atace-03-19-unit-testing-with-aem-mocks-video] | [Slides][atace-03-19-unit-testing-with-aem-mocks-slides]
52+
* [Ask the AEM Community Expert March 2019: Unit Testing with AEM Mocks][atace-03-19-unit-testing-with-aem-mocks-video] | [Slides][atace-03-19-unit-testing-with-aem-mocks-slides]
5353
* [adaptTo() 2018 Talk: JUnit 5 and Sling/AEM Mocks][adaptto-talk-2018-junit5-sling-aem-mocks]
5454
* [adaptTo() 2016 Talk: Unit Testing with Sling & AEM Mocks][adaptto-talk-2016-unittesting-sling-aem-mocks]
5555
* [adaptTo() 2014 Lightning Talk: Mock AEM & Co for Unit Tests][adaptto-talk-2014-mock-aem-unit-tests]
@@ -68,6 +68,5 @@ Sources: https://github.com/wcm-io/io.wcm.testing.aem-mock
6868
[adaptto-talk-2018-junit5-sling-aem-mocks]: https://adapt.to/2018/en/schedule/junit-5-and-sling-aem-mocks.html
6969
[adaptto-talk-2016-unittesting-sling-aem-mocks]: https://adapt.to/2016/en/schedule/unit-testing-with-sling-aem-mocks.html
7070
[adaptto-talk-2014-mock-aem-unit-tests]: https://adapt.to/2014/en/schedule/lightning-talks.html
71-
[atace-03-19-unit-testing-with-aem-mocks]: https://helpx.adobe.com/experience-manager/kt/eseminars/ask-the-expert/unit-testing-with-aem-mocks.html
7271
[atace-03-19-unit-testing-with-aem-mocks-video]: https://youtu.be/1xPzcukvzNk
7372
[atace-03-19-unit-testing-with-aem-mocks-slides]: slides/190319_AtACE_UnitTestingWithAEMMocks.pdf

0 commit comments

Comments
 (0)