diff --git a/CHANGELOG.md b/CHANGELOG.md index c8414db00d..4c5dcc64e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,11 +13,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com) ### Fixed - #2082 - ETag filter never sends 304 -- #2148 bugfix for displaying sizes (adresses #2132) +- #2148 - Bugfix for displaying sizes (adresses #2132) - #2146 - POI exception generating Excel file with too many references ### Changed - #2164 - Adding support for page create dialog to content model framework (aka dialog resource provider) +- #2133 - Update test library dependencies + ## [4.4.0] - 2019-12-17 diff --git a/bundle/pom.xml b/bundle/pom.xml index e3e74cc628..da82d4de24 100644 --- a/bundle/pom.xml +++ b/bundle/pom.xml @@ -374,6 +374,14 @@ org.slf4j slf4j-api + + org.hamcrest + hamcrest + + + org.hamcrest + hamcrest-library + junit junit @@ -599,7 +607,7 @@ org.apache.commons commons-csv - 1.6 + 1.7 test @@ -673,10 +681,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 @@ -695,20 +699,16 @@ org.skyscreamer jsonassert - - org.hamcrest - hamcrest-library - me.alexpanov free-port-finder - 1.0 + 1.1.1 test io.findify s3mock_2.11 - 0.2.3 + 0.2.5 test @@ -720,7 +720,7 @@ org.xmlunit xmlunit-matchers - 2.5.1 + 2.6.3 test 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..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 @@ -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; 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/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; 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()); diff --git a/pom.xml b/pom.xml index ee3db0d73d..c85bd031ed 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 @@ -376,31 +376,31 @@ 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 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 @@ -412,19 +412,13 @@ 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 io.wcm io.wcm.testing.aem-mock.junit4 - 2.3.2 + 2.7.2 test @@ -439,10 +433,16 @@ 1.5.0 test + + org.hamcrest + hamcrest + 2.2 + test + org.hamcrest hamcrest-library - 1.3 + 2.2 test