You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2021/08/30 16:51:04 UTC
[sling-org-apache-sling-testing-sling-mock] branch master updated
(07a211c -> 303392e)
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git.
from 07a211c update to latest osgi-mock
new be40c41 update to sling-bundle-parent 45
new 55d4f28 fix javadoc errors
new 869ca54 update dependencies
new 303392e [maven-release-plugin] prepare release org.apache.sling.testing.sling-mock.reactor-3.1.0
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
core/pom.xml | 2 +-
.../sling/testing/mock/sling/loader/ContentLoader.java | 8 ++++----
junit4/pom.xml | 6 +++---
junit5/pom.xml | 6 +++---
parent/pom.xml | 14 +++++++-------
pom.xml | 4 ++--
relocate/pom.xml | 2 +-
7 files changed, 21 insertions(+), 21 deletions(-)
[sling-org-apache-sling-testing-sling-mock] 01/04: update to
sling-bundle-parent 45
Posted by ss...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit be40c414b465894222dfaaffd6efafa82e164461
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Mon Aug 30 18:30:41 2021 +0200
update to sling-bundle-parent 45
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index c8531eb..6198fed 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-bundle-parent</artifactId>
- <version>44</version>
+ <version>45</version>
<relativePath />
</parent>
[sling-org-apache-sling-testing-sling-mock] 03/04: update
dependencies
Posted by ss...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit 869ca546cecd97456654987b95384dba237ac7a8
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Mon Aug 30 18:49:09 2021 +0200
update dependencies
---
parent/pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 6198fed..d4c21e6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -35,8 +35,8 @@
<description>Mock implementation of selected Sling APIs.</description>
<properties>
- <osgi-mock.version>3.1.3-SNAPSHOT</osgi-mock.version>
- <jcr-mock.version>1.5.3-SNAPSHOT</jcr-mock.version>
+ <osgi-mock.version>3.1.4</osgi-mock.version>
+ <jcr-mock.version>1.5.4</jcr-mock.version>
<resourceresolver-mock.version>1.2.2</resourceresolver-mock.version>
<logging-mock.version>2.0.0</logging-mock.version>
<servlet-helpers.version>1.4.2</servlet-helpers.version>
@@ -237,7 +237,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.fsresource</artifactId>
- <version>2.1.17-SNAPSHOT</version>
+ <version>2.2.0</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
[sling-org-apache-sling-testing-sling-mock] 02/04: fix javadoc
errors
Posted by ss...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit 55d4f28958e643a3ba88fdf24176bfc353b130e2
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Mon Aug 30 18:36:46 2021 +0200
fix javadoc errors
---
.../org/apache/sling/testing/mock/sling/loader/ContentLoader.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/core/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java b/core/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java
index 8f271b7..108892a 100644
--- a/core/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java
+++ b/core/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java
@@ -526,7 +526,7 @@ public final class ContentLoader {
/**
* Mount a folder (file system) containing content in JSON (Sling-Inital-Content) format in repository.
- * @param mountFolder Root folder path to mount
+ * @param mountFolderPath Root folder path to mount
* @param destPath Path to mount folder into
*/
public void folderJson(@NotNull String mountFolderPath, @NotNull String destPath) {
@@ -535,7 +535,7 @@ public final class ContentLoader {
/**
* Mount a folder containing content in JSON (Sling-Inital-Content) format in repository.
- * @param mountFolderPath Root folder to mount
+ * @param mountFolder Root folder to mount
* @param parentResource Parent resource
* @param childName Name of child resource to mount folder into
*/
@@ -575,7 +575,7 @@ public final class ContentLoader {
/**
* Mount a folder (file system) containing content in FileVault XML format in repository.
- * @param mountFolder Root folder path to mount. Path needs to point to the root folder of the content package structure.
+ * @param mountFolderPath Root folder path to mount. Path needs to point to the root folder of the content package structure.
* @param destPath Path to mount folder into
*/
public void folderFileVaultXml(@NotNull String mountFolderPath, @NotNull String destPath) {
@@ -584,7 +584,7 @@ public final class ContentLoader {
/**
* Mount a folder containing content in FileVault XML format in repository.
- * @param mountFolderPath Root folder to mount. Path needs to point to the root folder of the content package structure.
+ * @param mountFolder Root folder to mount. Path needs to point to the root folder of the content package structure.
* @param parentResource Parent resource
* @param childName Name of child resource to mount folder into
*/
[sling-org-apache-sling-testing-sling-mock] 04/04:
[maven-release-plugin] prepare release
org.apache.sling.testing.sling-mock.reactor-3.1.0
Posted by ss...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit 303392e6360bf2faf952cb7d27e44e1716cba82f
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Mon Aug 30 18:51:00 2021 +0200
[maven-release-plugin] prepare release org.apache.sling.testing.sling-mock.reactor-3.1.0
---
core/pom.xml | 2 +-
junit4/pom.xml | 6 +++---
junit5/pom.xml | 6 +++---
parent/pom.xml | 6 +++---
pom.xml | 4 ++--
relocate/pom.xml | 2 +-
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 7226a24..c7696ba 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock.parent</artifactId>
- <version>3.0.3-SNAPSHOT</version>
+ <version>3.1.0</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
diff --git a/junit4/pom.xml b/junit4/pom.xml
index 544e253..5df0d59 100644
--- a/junit4/pom.xml
+++ b/junit4/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock.parent</artifactId>
- <version>3.0.3-SNAPSHOT</version>
+ <version>3.1.0</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -37,13 +37,13 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock.core</artifactId>
- <version>3.0.3-SNAPSHOT</version>
+ <version>3.1.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock.core</artifactId>
- <version>3.0.3-SNAPSHOT</version>
+ <version>3.1.0</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
diff --git a/junit5/pom.xml b/junit5/pom.xml
index 1e4841c..f9e5555 100644
--- a/junit5/pom.xml
+++ b/junit5/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock.parent</artifactId>
- <version>3.0.3-SNAPSHOT</version>
+ <version>3.1.0</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -37,13 +37,13 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock.core</artifactId>
- <version>3.0.3-SNAPSHOT</version>
+ <version>3.1.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock.core</artifactId>
- <version>3.0.3-SNAPSHOT</version>
+ <version>3.1.0</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index d4c21e6..6484a20 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>org.apache.sling.testing.sling-mock.parent</artifactId>
- <version>3.0.3-SNAPSHOT</version>
+ <version>3.1.0</version>
<packaging>pom</packaging>
<name>Apache Sling Testing Sling Mock Parent</name>
@@ -42,7 +42,7 @@
<servlet-helpers.version>1.4.2</servlet-helpers.version>
<resourcebuilder.version>1.0.4</resourcebuilder.version>
- <project.build.outputTimestamp>2021-08-24T00:00:00Z</project.build.outputTimestamp>
+ <project.build.outputTimestamp>2021-08-30T16:50:16Z</project.build.outputTimestamp>
</properties>
<dependencies>
@@ -304,7 +304,7 @@
</profiles>
<scm>
- <tag>HEAD</tag>
+ <tag>org.apache.sling.testing.sling-mock.reactor-3.1.0</tag>
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-testing-sling-mock.git</url>
diff --git a/pom.xml b/pom.xml
index ec6d26a..d007f46 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock.parent</artifactId>
- <version>3.0.3-SNAPSHOT</version>
+ <version>3.1.0</version>
<relativePath>parent/pom.xml</relativePath>
</parent>
@@ -36,7 +36,7 @@
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-testing-sling-mock.git</url>
- <tag>HEAD</tag>
+ <tag>org.apache.sling.testing.sling-mock.reactor-3.1.0</tag>
</scm>
<modules>
diff --git a/relocate/pom.xml b/relocate/pom.xml
index c3942a5..0c077e7 100644
--- a/relocate/pom.xml
+++ b/relocate/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock.parent</artifactId>
- <version>3.0.3-SNAPSHOT</version>
+ <version>3.1.0</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>