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 2019/05/24 09:34:21 UTC
[sling-org-apache-sling-testing-sling-mock-oak] branch master
updated (0ddf461 -> 6d37527)
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-oak.git.
from 0ddf461 [maven-release-plugin] prepare for next development iteration
add 8bae3ea add linkedfile and mixin support
add 6c2ad04 SLING-8428 apply additional patch provided by Dominique Jäggi
new 118c304 SLING-8428 cleanup unused imports
new 6d37527 Merge branch 'feature/SLING-8428-mixin-linkedfile'
The 2 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:
pom.xml | 2 +-
.../oak/contentimport/ContentLoaderJsonTest.java | 41 ++++++++++++++++++++++
2 files changed, 42 insertions(+), 1 deletion(-)
[sling-org-apache-sling-testing-sling-mock-oak] 01/02: SLING-8428
cleanup unused imports
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-oak.git
commit 118c304e7dae2a7be93c4ab1d3a9e5613b488c27
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Fri May 24 11:28:52 2019 +0200
SLING-8428 cleanup unused imports
---
.../mock/sling/oak/contentimport/ContentLoaderJsonTest.java | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/src/test/java/org/apache/sling/testing/mock/sling/oak/contentimport/ContentLoaderJsonTest.java b/src/test/java/org/apache/sling/testing/mock/sling/oak/contentimport/ContentLoaderJsonTest.java
index ada741f..0838f97 100644
--- a/src/test/java/org/apache/sling/testing/mock/sling/oak/contentimport/ContentLoaderJsonTest.java
+++ b/src/test/java/org/apache/sling/testing/mock/sling/oak/contentimport/ContentLoaderJsonTest.java
@@ -18,19 +18,14 @@
*/
package org.apache.sling.testing.mock.sling.oak.contentimport;
-import javax.jcr.Node;
-import javax.jcr.RepositoryException;
-import javax.jcr.nodetype.NodeType;
-import java.util.ArrayList;
-import java.util.Arrays;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.Predicate;
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+
import org.apache.jackrabbit.JcrConstants;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceUtil;
@@ -39,8 +34,6 @@ import org.apache.sling.testing.mock.sling.ResourceResolverType;
import org.apache.sling.testing.mock.sling.loader.AbstractContentLoaderJsonTest;
import org.junit.Test;
-import com.google.common.collect.Lists;
-
@SuppressWarnings("null")
public class ContentLoaderJsonTest extends AbstractContentLoaderJsonTest {
[sling-org-apache-sling-testing-sling-mock-oak] 02/02: Merge branch
'feature/SLING-8428-mixin-linkedfile'
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-oak.git
commit 6d375271733c061d7bd9304ed1d4434a0e6b4380
Merge: 0ddf461 118c304
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Fri May 24 11:33:24 2019 +0200
Merge branch 'feature/SLING-8428-mixin-linkedfile'
pom.xml | 2 +-
.../oak/contentimport/ContentLoaderJsonTest.java | 41 ++++++++++++++++++++++
2 files changed, 42 insertions(+), 1 deletion(-)