From dd2cf5c6bfb59ff17732475dbdbbd3bfa3e2b968 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Hoh?= Date: Sat, 7 Dec 2019 12:40:14 +0100 Subject: [PATCH 01/13] update AEM Mocks library to latest 2.7.2 --- .../adobe/acs/commons/filefetch/impl/FileFetchImplTest.java | 3 +++ pom.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/bundle/src/test/java/com/adobe/acs/commons/filefetch/impl/FileFetchImplTest.java b/bundle/src/test/java/com/adobe/acs/commons/filefetch/impl/FileFetchImplTest.java index be83cee213..b4980c2f1a 100644 --- a/bundle/src/test/java/com/adobe/acs/commons/filefetch/impl/FileFetchImplTest.java +++ b/bundle/src/test/java/com/adobe/acs/commons/filefetch/impl/FileFetchImplTest.java @@ -33,6 +33,7 @@ import org.apache.sling.api.resource.LoginException; import org.apache.sling.api.resource.ResourceResolverFactory; import org.junit.Before; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.mockito.Mockito; @@ -76,6 +77,8 @@ protected HttpURLConnection openConnection() throws IOException { } @Test + @Ignore + // Ignore until https://wcm-io.atlassian.net/browse/WTES-48 is resolved public void testFetch() throws IOException, ReplicationException { fileFetch.activate(new FileFetchConfiguration() { diff --git a/pom.xml b/pom.xml index 942c2d404e..a0834d9b47 100644 --- a/pom.xml +++ b/pom.xml @@ -423,7 +423,7 @@ io.wcm io.wcm.testing.aem-mock.junit4 - 2.3.2 + 2.7.0 test From 3f059c4737861cbdcac565c2bd874ef95687c5a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Hoh?= Date: Sat, 7 Dec 2019 13:23:06 +0100 Subject: [PATCH 02/13] update sling-testing mocks to their latest versions --- bundle/pom.xml | 4 ---- .../config/impl/HttpCacheConfigImplTest.java | 1 - pom.xml | 12 +++--------- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/bundle/pom.xml b/bundle/pom.xml index c36f0e9adc..7fae374ba6 100644 --- a/bundle/pom.xml +++ b/bundle/pom.xml @@ -687,10 +687,6 @@ org.apache.sling.testing.sling-mock-oak test - - org.apache.sling - org.apache.sling.testing.jcr-mock - io.wcm io.wcm.testing.aem-mock.junit4 diff --git a/bundle/src/test/java/com/adobe/acs/commons/httpcache/config/impl/HttpCacheConfigImplTest.java b/bundle/src/test/java/com/adobe/acs/commons/httpcache/config/impl/HttpCacheConfigImplTest.java index 3e589c9524..b56e20ab08 100644 --- a/bundle/src/test/java/com/adobe/acs/commons/httpcache/config/impl/HttpCacheConfigImplTest.java +++ b/bundle/src/test/java/com/adobe/acs/commons/httpcache/config/impl/HttpCacheConfigImplTest.java @@ -76,7 +76,6 @@ public void init() throws HttpCacheRepositoryAccessException { when(request.getResourceResolver()).thenReturn(resourceResolver); when(resourceResolver.getUserID()).thenReturn("anonymous"); - when(extension.accepts(request, systemUnderTest)).thenReturn(true); } private void activateWithDefaultValues(Map specifiedProps){ diff --git a/pom.xml b/pom.xml index a0834d9b47..8dc32b10b1 100644 --- a/pom.xml +++ b/pom.xml @@ -393,13 +393,13 @@ org.apache.sling org.apache.sling.testing.sling-mock.junit4 - 2.3.4 + 2.3.18 test org.apache.sling org.apache.sling.testing.sling-mock - 2.3.4 + 2.3.18 test @@ -411,13 +411,7 @@ org.apache.sling org.apache.sling.testing.sling-mock-oak - 2.1.2 - test - - - org.apache.sling - org.apache.sling.testing.jcr-mock - 1.4.0 + 2.1.8-1.16.0 test From 7e62875d11caac6e24385dd06a08f57d06726b43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Hoh?= Date: Sun, 15 Dec 2019 16:23:04 +0100 Subject: [PATCH 03/13] minor version bumps for testing libs --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 8dc32b10b1..161bbeb6e3 100644 --- a/pom.xml +++ b/pom.xml @@ -375,19 +375,19 @@ org.mockito mockito-core - 3.1.0 + 3.2.0 test org.powermock powermock-api-mockito2 - 2.0.2 + 2.0.4 test org.powermock powermock-module-junit4 - 2.0.2 + 2.0.4 test From f9962c0bde37069434f094ac6dcaf669ddec4ff5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Hoh?= Date: Sun, 15 Dec 2019 16:33:04 +0100 Subject: [PATCH 04/13] update hamcrest (see http://hamcrest.org/JavaHamcrest/distributables.html#upgrading-from-hamcrest-1.x) --- pom.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 161bbeb6e3..1f6b3796b9 100644 --- a/pom.xml +++ b/pom.xml @@ -432,10 +432,16 @@ 1.5.0 test + + org.hamcrest + hamcrest + 2.2 + test + org.hamcrest hamcrest-library - 1.3 + 2.2 test From 824cfae35e90ef33dbff9eb0f5869dc41ed74cb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Hoh?= Date: Sun, 15 Dec 2019 18:09:14 +0100 Subject: [PATCH 05/13] fix incorrect hamcrest dependencies --- bundle/pom.xml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/bundle/pom.xml b/bundle/pom.xml index 7fae374ba6..2d1bb3df2b 100644 --- a/bundle/pom.xml +++ b/bundle/pom.xml @@ -382,6 +382,14 @@ org.slf4j slf4j-api + + org.hamcrest + hamcrest + + + org.hamcrest + hamcrest-library + junit junit @@ -705,10 +713,6 @@ org.skyscreamer jsonassert - - org.hamcrest - hamcrest-library - me.alexpanov free-port-finder From 46d9d0362f4e8b2a7c52299ce4f225889eb8f364 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Hoh?= Date: Sun, 15 Dec 2019 18:14:00 +0100 Subject: [PATCH 06/13] update xmlunit dependency --- bundle/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle/pom.xml b/bundle/pom.xml index 2d1bb3df2b..cb61f15c65 100644 --- a/bundle/pom.xml +++ b/bundle/pom.xml @@ -734,7 +734,7 @@ org.xmlunit xmlunit-matchers - 2.5.1 + 2.6.3 test From 29c8210ddaa6ea240db22420cdaadcfa782664ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Hoh?= Date: Sun, 15 Dec 2019 19:53:33 +0100 Subject: [PATCH 07/13] enable 2 tests again --- .../commons/wcm/comparisons/impl/VersionServiceImplTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bundle/src/test/java/com/adobe/acs/commons/wcm/comparisons/impl/VersionServiceImplTest.java b/bundle/src/test/java/com/adobe/acs/commons/wcm/comparisons/impl/VersionServiceImplTest.java index 7a5336fdbd..8462351ce6 100644 --- a/bundle/src/test/java/com/adobe/acs/commons/wcm/comparisons/impl/VersionServiceImplTest.java +++ b/bundle/src/test/java/com/adobe/acs/commons/wcm/comparisons/impl/VersionServiceImplTest.java @@ -94,14 +94,14 @@ public void lastVersion_oneVersion_returnVersion() throws Exception { } @Test - @Ignore +// @Ignore public void lastVersion_noElement_returnNull() throws Exception { Version lastVersion = underTest.lastVersion(context.resourceResolver().getResource("/noVersion")); assertNull(lastVersion); } @Test - @Ignore +// @Ignore public void lastVersion_listOfVersion_returnLast() throws Exception { Version lastVersion = underTest.lastVersion(context.resourceResolver().getResource("/manyVersions")); assertEquals(lastVersion.getUUID(), manyVersionVersion.getUUID()); From 1783a4ff05c1a4dbbe1a87e86e58e937c78a76ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Hoh?= Date: Sun, 15 Dec 2019 19:54:01 +0100 Subject: [PATCH 08/13] update s3 mock library and joda time --- bundle/pom.xml | 4 ++-- .../commons/mcp/impl/processes/AssetFolderCreatorTest.java | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/bundle/pom.xml b/bundle/pom.xml index cb61f15c65..2bdaedfe62 100644 --- a/bundle/pom.xml +++ b/bundle/pom.xml @@ -439,7 +439,7 @@ joda-time joda-time - 1.5.2 + 2.9.1 provided @@ -722,7 +722,7 @@ io.findify s3mock_2.11 - 0.2.3 + 0.2.5 test diff --git a/bundle/src/test/java/com/adobe/acs/commons/mcp/impl/processes/AssetFolderCreatorTest.java b/bundle/src/test/java/com/adobe/acs/commons/mcp/impl/processes/AssetFolderCreatorTest.java index c7cd3b9731..8c88d044f2 100644 --- a/bundle/src/test/java/com/adobe/acs/commons/mcp/impl/processes/AssetFolderCreatorTest.java +++ b/bundle/src/test/java/com/adobe/acs/commons/mcp/impl/processes/AssetFolderCreatorTest.java @@ -32,7 +32,6 @@ import com.amazonaws.services.s3.S3ClientOptions; import com.day.cq.dam.api.AssetManager; import com.google.common.base.Function; -import io.findify.s3mock.S3Mock; import me.alexpanov.net.FreePortFinder; import org.apache.jackrabbit.JcrConstants; import org.apache.sling.api.resource.ModifiableValueMap; From 3d8c6ff12a4a06b04014e90e0d98f24250512cf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Hoh?= Date: Sun, 15 Dec 2019 20:32:22 +0100 Subject: [PATCH 09/13] update portfinder --- bundle/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle/pom.xml b/bundle/pom.xml index 2bdaedfe62..e74bed6c2d 100644 --- a/bundle/pom.xml +++ b/bundle/pom.xml @@ -716,7 +716,7 @@ me.alexpanov free-port-finder - 1.0 + 1.1.1 test From ab7bf3ca5f47bc6ac7286c11cc1c9ed74ad22074 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Hoh?= Date: Sun, 15 Dec 2019 21:02:01 +0100 Subject: [PATCH 10/13] update release plugins --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 1f6b3796b9..c55cb25603 100644 --- a/pom.xml +++ b/pom.xml @@ -137,12 +137,12 @@ org.apache.maven.shared maven-invoker - 2.2 + 3.0.1 org.apache.maven.release maven-release-oddeven-policy - 2.5.3 + 3.0-r1585899 From 921bbd3fa74cc2d5571aa07e94079f32d8196504 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Hoh?= Date: Sun, 15 Dec 2019 21:12:39 +0100 Subject: [PATCH 11/13] update commons-csv --- bundle/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle/pom.xml b/bundle/pom.xml index e74bed6c2d..6f00899b50 100644 --- a/bundle/pom.xml +++ b/bundle/pom.xml @@ -621,7 +621,7 @@ org.apache.commons commons-csv - 1.6 + 1.7 test From c34ee29e1904b3329f150c8c7309fd90b9ec74f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Hoh?= Date: Thu, 19 Dec 2019 20:54:16 +0100 Subject: [PATCH 12/13] update to latest ACS AEM Commons, reenable disabled testcase --- .../com/adobe/acs/commons/filefetch/impl/FileFetchImplTest.java | 2 -- pom.xml | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/bundle/src/test/java/com/adobe/acs/commons/filefetch/impl/FileFetchImplTest.java b/bundle/src/test/java/com/adobe/acs/commons/filefetch/impl/FileFetchImplTest.java index b4980c2f1a..07d90849db 100644 --- a/bundle/src/test/java/com/adobe/acs/commons/filefetch/impl/FileFetchImplTest.java +++ b/bundle/src/test/java/com/adobe/acs/commons/filefetch/impl/FileFetchImplTest.java @@ -77,8 +77,6 @@ protected HttpURLConnection openConnection() throws IOException { } @Test - @Ignore - // Ignore until https://wcm-io.atlassian.net/browse/WTES-48 is resolved public void testFetch() throws IOException, ReplicationException { fileFetch.activate(new FileFetchConfiguration() { diff --git a/pom.xml b/pom.xml index c55cb25603..0f3b6e244e 100644 --- a/pom.xml +++ b/pom.xml @@ -417,7 +417,7 @@ io.wcm io.wcm.testing.aem-mock.junit4 - 2.7.0 + 2.7.2 test From 8b38a36d3818c3c48f16eaef84674379a0395855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Hoh?= Date: Thu, 19 Dec 2019 21:42:30 +0100 Subject: [PATCH 13/13] updated Changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 586b6c05e9..5a9f7a2960 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com) [unreleased changes details]: https://github.com/Adobe-Consulting-Services/acs-aem-commons/compare/acs-aem-commons-4.3.2...HEAD +### Changed +- #2133 - Update test library dependencies + ## [4.4.0] - 2019-12-17 ### Added