diff --git a/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetResourceTest.java b/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetResourceTest.java index a528438bb..3cb9222aa 100644 --- a/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetResourceTest.java +++ b/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetResourceTest.java @@ -139,10 +139,10 @@ public class MgmtTargetResourceTest extends AbstractRestIntegrationTest { public void securityTokenIsNotInResponseIfMissingPermission() throws Exception { final String knownControllerId = "knownControllerId"; - targetManagement.createTarget(entityFactory.generateTarget(knownControllerId)); + final Target createTarget = targetManagement.createTarget(entityFactory.generateTarget(knownControllerId)); mvc.perform(get(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}", knownControllerId)) .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(jsonPath("securityToken").doesNotExist()); + .andExpect(jsonPath("securityToken", equalTo(null))); } @Test diff --git a/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/configuration/RestConfiguration.java b/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/configuration/RestConfiguration.java index e2c4ec2a1..73f7eed76 100644 --- a/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/configuration/RestConfiguration.java +++ b/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/configuration/RestConfiguration.java @@ -17,12 +17,15 @@ import org.springframework.beans.factory.FactoryBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Scope; +import org.springframework.hateoas.config.EnableHypermediaSupport; +import org.springframework.hateoas.config.EnableHypermediaSupport.HypermediaType; import org.springframework.web.context.WebApplicationContext; /** * Configuration for Rest api. */ @Configuration +@EnableHypermediaSupport(type = { HypermediaType.HAL }) public class RestConfiguration { /** diff --git a/pom.xml b/pom.xml index e6ae80162..3db7372df 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ 1.2.0.RELEASE 1.6.0.RELEASE 3.6.2 - 4.1.0.RELEASE + 4.1.1.RELEASE 3.2.2 @@ -102,7 +102,6 @@ 19.0 1.4.3 1.50.5 - 1.18.1 2.2.4 1.1.7 1.1 @@ -591,12 +590,6 @@ ${allure.version} test - - com.sun.jersey - jersey-client - ${jersey-client.version} - test - pl.pragmatists JUnitParams