Skip to content

Commit 6310c63

Browse files
committed
[jgitflow-maven-plugin] merging 'release/io.wcm.testing.aem-mock.root-4.1.8' into 'master'
2 parents 34d9386 + fd9e16d commit 6310c63

File tree

10 files changed

+26
-20
lines changed

10 files changed

+26
-20
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="4.1.8" date="2021-12-11">
27+
<action type="update" dev="sseifert">
28+
Update to latest OSGi Mock.
29+
</action>
30+
</release>
31+
2632
<release version="4.1.6" date="2021-12-06">
2733
<action type="update" dev="sseifert"><![CDATA[
2834
Update to latest OSGi Mock, Sling Mock and Resource Resolver Mock.<br/>

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>4.1.6</version>
28+
<version>4.1.8</version>
2929
<relativePath>../parent/pom.xml</relativePath>
3030
</parent>
3131

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
org.slf4j.simpleLogger.defaultLogLevel=WARN
22

3-
org.slf4j.simpleLogger.log.org.apache.sling.testing.mock.osgi=DEBUG
4-
org.slf4j.simpleLogger.log.org.apache.sling.testing.mock.sling=DEBUG
5-
org.slf4j.simpleLogger.log.io.wcm.testing.mock.aem=DEBUG
3+
org.slf4j.simpleLogger.log.org.apache.sling.testing.mock.osgi=WARN
4+
org.slf4j.simpleLogger.log.org.apache.sling.testing.mock.sling=WARN
5+
org.slf4j.simpleLogger.log.io.wcm.testing.mock.aem=WARN

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>4.1.6</version>
28+
<version>4.1.8</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>4.1.6</version>
57+
<version>4.1.8</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>4.1.6</version>
90+
<version>4.1.8</version>
9191
<classifier>tests</classifier>
9292
<scope>test</scope>
9393
</dependency>
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
org.slf4j.simpleLogger.defaultLogLevel=WARN
22

3-
org.slf4j.simpleLogger.log.org.apache.sling.testing.mock.osgi=DEBUG
4-
org.slf4j.simpleLogger.log.org.apache.sling.testing.mock.sling=DEBUG
5-
org.slf4j.simpleLogger.log.io.wcm.testing.mock.aem=DEBUG
3+
org.slf4j.simpleLogger.log.org.apache.sling.testing.mock.osgi=WARN
4+
org.slf4j.simpleLogger.log.org.apache.sling.testing.mock.sling=WARN
5+
org.slf4j.simpleLogger.log.io.wcm.testing.mock.aem=WARN

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>4.1.6</version>
28+
<version>4.1.8</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>4.1.6</version>
57+
<version>4.1.8</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>4.1.6</version>
64+
<version>4.1.8</version>
6565
<classifier>tests</classifier>
6666
<scope>test</scope>
6767
</dependency>
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
org.slf4j.simpleLogger.defaultLogLevel=WARN
22

3-
org.slf4j.simpleLogger.log.org.apache.sling.testing.mock.osgi=DEBUG
4-
org.slf4j.simpleLogger.log.org.apache.sling.testing.mock.sling=DEBUG
5-
org.slf4j.simpleLogger.log.io.wcm.testing.mock.aem=DEBUG
3+
org.slf4j.simpleLogger.log.org.apache.sling.testing.mock.osgi=WARN
4+
org.slf4j.simpleLogger.log.org.apache.sling.testing.mock.sling=WARN
5+
org.slf4j.simpleLogger.log.io.wcm.testing.mock.aem=WARN

parent/pom.xml

Lines changed: 2 additions & 2 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>4.1.6</version>
34+
<version>4.1.8</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.2.0</osgi-mock.version>
43+
<osgi-mock.version>3.2.2</osgi-mock.version>
4444

4545
<!-- JCR Mocks -->
4646
<jcr-mock.version>1.5.4</jcr-mock.version>

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>4.1.6</version>
28+
<version>4.1.8</version>
2929
<relativePath>parent/pom.xml</relativePath>
3030
</parent>
3131

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>4.1.6</version>
28+
<version>4.1.8</version>
2929
<relativePath>../parent/pom.xml</relativePath>
3030
</parent>
3131

0 commit comments

Comments
 (0)