diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/pom.xml b/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/pom.xml index 1934338712..e4cf00b565 100644 --- a/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/pom.xml +++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/pom.xml @@ -220,5 +220,9 @@ + + + true + diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/test/java/org/wso2/carbon/apimgt/webapp/publisher/BaseAPIPublisherTest.java b/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/test/java/org/wso2/carbon/apimgt/webapp/publisher/BaseAPIPublisherTest.java index dd2d111c34..cc1c8e757a 100644 --- a/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/test/java/org/wso2/carbon/apimgt/webapp/publisher/BaseAPIPublisherTest.java +++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/test/java/org/wso2/carbon/apimgt/webapp/publisher/BaseAPIPublisherTest.java @@ -22,22 +22,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.mockito.Mockito; import org.testng.annotations.BeforeSuite; -import org.wso2.carbon.apimgt.integration.client.IntegrationClientServiceImpl; -import org.wso2.carbon.apimgt.integration.client.internal.APIIntegrationClientDataHolder; -import org.wso2.carbon.apimgt.integration.client.publisher.PublisherClient; -import org.wso2.carbon.apimgt.integration.client.service.IntegrationClientService; -import org.wso2.carbon.apimgt.integration.generated.client.publisher.api.APIIndividualApi; import org.wso2.carbon.apimgt.webapp.publisher.internal.APIPublisherDataHolder; import org.wso2.carbon.apimgt.webapp.publisher.utils.MockAPIIndividualApi; import org.wso2.carbon.base.MultitenantConstants; import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.context.internal.OSGiDataHolder; -import org.wso2.carbon.identity.jwt.client.extension.JWTClient; -import org.wso2.carbon.identity.jwt.client.extension.dto.AccessTokenInfo; -import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException; -import org.wso2.carbon.identity.jwt.client.extension.internal.JWTClientExtensionDataHolder; -import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService; -import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerServiceImpl; import org.wso2.carbon.registry.core.config.RegistryContext; import org.wso2.carbon.registry.core.exceptions.RegistryException; import org.wso2.carbon.registry.core.internal.RegistryDataHolder; @@ -45,6 +34,7 @@ import org.wso2.carbon.registry.core.jdbc.realm.InMemoryRealmService; import org.wso2.carbon.registry.core.service.RegistryService; import org.wso2.carbon.user.api.UserStoreException; import org.wso2.carbon.user.core.service.RealmService; +import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException; import java.io.File; import java.io.InputStream; diff --git a/components/application-mgt/io.entgra.application.mgt.core/pom.xml b/components/application-mgt/io.entgra.application.mgt.core/pom.xml index 05104b8b57..5ca9f9a655 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/pom.xml +++ b/components/application-mgt/io.entgra.application.mgt.core/pom.xml @@ -258,6 +258,12 @@ 5.1.34 test + + xerces.wso2 + xercesImpl + 2.8.1.wso2v2 + test + com.h2database.wso2 h2-database-engine diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/management/ApplicationManagementTest.java b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/management/ApplicationManagementTest.java index 2652cbf714..998e10e5b1 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/management/ApplicationManagementTest.java +++ b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/management/ApplicationManagementTest.java @@ -20,6 +20,7 @@ package io.entgra.application.mgt.core.management; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.cxf.jaxrs.ext.multipart.Attachment; +import org.testng.annotations.DataProvider; import org.testng.annotations.Test; import io.entgra.application.mgt.common.*; import io.entgra.application.mgt.common.dto.ApplicationDTO; @@ -40,6 +41,7 @@ import io.entgra.application.mgt.core.dto.ApplicationsDTO; import io.entgra.application.mgt.core.impl.ApplicationManagerImpl; import io.entgra.application.mgt.core.internal.DataHolder; import io.entgra.application.mgt.core.util.ConnectionManagerUtil; +import org.wso2.carbon.device.mgt.common.DeviceIdentifier; import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException; import org.wso2.carbon.device.mgt.core.dto.DeviceType; import org.wso2.carbon.device.mgt.core.dto.DeviceTypeVersion; @@ -68,7 +70,7 @@ public class ApplicationManagementTest extends BaseTestCase { ConnectionManagerUtil.closeDBConnection(); } - @Test(dependsOnMethods = ("addApplicationCategories")) + @Test(dependsOnMethods = "addApplicationCategories") public void createApplication() throws Exception { log.debug("Creating the first application ....!"); @@ -124,102 +126,117 @@ public class ApplicationManagementTest extends BaseTestCase { manager.createEntApp(applicationWrapper, applicationArtifact); } - @Test + @DataProvider(name = "applicationIdDataProvider") + public static Object[][] applicationId() { + return new Object[][] {{-1}}; + } + + @DataProvider(name = "updateApplicationDataProvider") + public static Object[][] updateApplicationDataProvider() { + return new Object[][] {{-1, new ApplicationUpdateWrapper()}}; + } + + @DataProvider(name = "uuidDataProvider") + public static Object[][] uuidDataProvider() { + return new Object[][] {{"TEST_APP_UUID"}}; + } + + @Test(enabled = false) public void updateApplication(int applicationId, ApplicationUpdateWrapper applicationUpdateWrapper) throws ApplicationManagementException { } - @Test + @Test(enabled = false) public void deleteApplication(int applicationId) throws ApplicationManagementException { } - @Test + @Test(enabled = false) public void retireApplication(int applicationId) throws ApplicationManagementException { } - @Test + @Test(enabled = false) public void deleteApplicationRelease(String releaseUuid) throws ApplicationManagementException { } - @Test + @Test(enabled = false) public ApplicationList getApplications(Filter filter) throws ApplicationManagementException { return null; } - @Test + @Test(enabled = false) public Application getApplicationById(int id, String state) throws ApplicationManagementException { return null; } - @Test + @Test(enabled = false) public ApplicationRelease getApplicationReleaseByUUID(String uuid) throws ApplicationManagementException { return null; } - @Test + @Test(enabled = false) public ApplicationDTO getApplicationByUuid(String uuid, String state) throws ApplicationManagementException { return null; } - @Test + @Test(enabled = false) public ApplicationDTO getApplicationByRelease(String appReleaseUUID) throws ApplicationManagementException { return null; } - @Test + @Test(enabled = false) public List getLifecycleStateChangeFlow(String releaseUuid) throws ApplicationManagementException { return null; } - @Test + @Test(enabled = false) public void changeLifecycleState(String releaseUuid, String stateName) throws ApplicationManagementException { } - @Test + @Test(enabled = false) public void updateApplicationImageArtifact(String uuid, ApplicationArtifact applicationArtifact) throws ApplicationManagementException { } - @Test + @Test(enabled = false) public void updateApplicationArtifact(String deviceType, String appType, String uuid, ApplicationArtifact applicationArtifact) throws ApplicationManagementException { } - @Test + @Test(enabled = false) public ApplicationRelease createRelease(int applicationId, EntAppReleaseWrapper entAppReleaseWrapper, ApplicationArtifact applicationArtifact) throws ApplicationManagementException { return null; } - @Test + @Test(enabled = false) public boolean updateRelease(String deviceType, String applicationType, String releaseUuid, EntAppReleaseWrapper entAppReleaseWrapper, ApplicationArtifact applicationArtifact) throws ApplicationManagementException { return false; } - @Test + @Test(enabled = false) public void validateAppCreatingRequest(ApplicationWrapper applicationWrapper) throws RequestValidatingException { } - @Test + @Test(enabled = false) public void validateReleaseCreatingRequest(EntAppReleaseWrapper entAppReleaseWrapper, String applicationType) throws RequestValidatingException { } - @Test + @Test(enabled = false) public void validateImageArtifacts(Attachment iconFile, Attachment bannerFile, List attachmentList) throws RequestValidatingException { } - @Test + @Test(enabled = false) public void validateBinaryArtifact(Attachment binaryFile, String applicationType) throws RequestValidatingException { } - @Test(dependsOnMethods = ("addDeviceVersions")) + @Test(dependsOnMethods = "addDeviceVersions") public void addApplicationCategories() throws ApplicationManagementException { List categories = new ArrayList<>(); categories.add("Test Category"); @@ -264,17 +281,17 @@ public class ApplicationManagementTest extends BaseTestCase { } } - @Test + @Test(enabled = false) public List getRegisteredTags() throws ApplicationManagementException { return null; } - @Test + @Test(enabled = false) public List getRegisteredCategories() throws ApplicationManagementException { return null; } - @Test + @Test(enabled = false) public void deleteTagMapping(int appId, String tagName) throws ApplicationManagementException { } diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml index b129c7affa..9f7a444da1 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml @@ -200,6 +200,12 @@ h2-database-engine test + + org.wso2.carbon + org.wso2.carbon.securevault + + test + org.powermock powermock-api-mockito diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml index d683786250..3c9272a596 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml @@ -145,11 +145,22 @@ + + org.testng + testng + test + org.springframework spring-web provided + + org.apache.cxf + cxf-bundle + 3.0.0-milestone2 + test + org.apache.cxf cxf-bundle-jaxrs @@ -190,11 +201,11 @@ org.wso2.carbon.device.mgt.common provided - - org.wso2.carbon.devicemgt - org.wso2.carbon.device.mgt.extensions - provided - + + org.wso2.carbon.devicemgt + org.wso2.carbon.device.mgt.extensions + provided + org.wso2.carbon.devicemgt org.wso2.carbon.device.mgt.core @@ -332,21 +343,21 @@ jsr311-api provided - - org.wso2.carbon.commons - org.wso2.carbon.application.mgt.stub - provided - + + org.wso2.carbon.commons + org.wso2.carbon.application.mgt.stub + provided + org.wso2.carbon.analytics org.wso2.carbon.analytics.api provided - - org.wso2.carbon.devicemgt - org.wso2.carbon.identity.jwt.client.extension - provided - + + org.wso2.carbon.devicemgt + org.wso2.carbon.identity.jwt.client.extension + provided + org.wso2.carbon org.wso2.carbon.registry.core @@ -363,31 +374,31 @@ ${carbon.identity.framework.version} provided - - - - - - - org.wso2.carbon.analytics-common - org.wso2.carbon.event.receiver.stub - provided - - - org.wso2.carbon.analytics-common - org.wso2.carbon.event.stream.stub - provided - - - org.wso2.carbon.analytics-common - org.wso2.carbon.event.publisher.stub - provided - - - org.wso2.carbon.analytics-common - org.wso2.carbon.event.stream.persistence.stub - provided - + + + + + + + org.wso2.carbon.analytics-common + org.wso2.carbon.event.receiver.stub + provided + + + org.wso2.carbon.analytics-common + org.wso2.carbon.event.stream.stub + provided + + + org.wso2.carbon.analytics-common + org.wso2.carbon.event.publisher.stub + provided + + + org.wso2.carbon.analytics-common + org.wso2.carbon.event.stream.persistence.stub + provided + org.powermock powermock-module-testng @@ -415,4 +426,4 @@ provided - + \ No newline at end of file diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/test/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceAgentServiceTest.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/test/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceAgentServiceTest.java index 729b1827cd..05415a9671 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/test/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceAgentServiceTest.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/test/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceAgentServiceTest.java @@ -34,9 +34,6 @@ import org.wso2.carbon.base.MultitenantConstants; import org.wso2.carbon.caching.impl.CacheImpl; import org.wso2.carbon.context.CarbonContext; import org.wso2.carbon.context.PrivilegedCarbonContext; -import org.wso2.carbon.device.mgt.analytics.data.publisher.exception.DataPublisherConfigurationException; -import org.wso2.carbon.device.mgt.analytics.data.publisher.service.EventsPublisherService; -import org.wso2.carbon.device.mgt.analytics.data.publisher.service.EventsPublisherServiceImpl; import org.wso2.carbon.device.mgt.common.Device; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; import org.wso2.carbon.device.mgt.common.EnrolmentInfo; @@ -482,125 +479,6 @@ public class DeviceAgentServiceTest { Mockito.reset(eventStreamAdminServiceStub); } - @Test(description = "Test the error scenario of Publishing Events with null event attributes.") - public void testEventPublishWithEventAttributesNULLAndPublishEventsFailure() throws - DeviceAccessAuthorizationException, RemoteException { - PowerMockito.stub(PowerMockito.method(PrivilegedCarbonContext.class, "getThreadLocalCarbonContext")) - .toReturn(this.privilegedCarbonContext); - PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, - "getDeviceAccessAuthorizationService")).toReturn(this.deviceAccessAuthorizationService); - Mockito.when(this.deviceAccessAuthorizationService.isUserAuthorized(Mockito.any(DeviceIdentifier.class))) - .thenReturn(true); - PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, "getEventStreamAdminServiceStub")) - .toReturn(this.eventStreamAdminServiceStub); - EventStreamAttributeDto eventStreamAttributeDto = Mockito.mock(EventStreamAttributeDto.class, - Mockito.RETURNS_MOCKS); - EventStreamDefinitionDto eventStreamDefinitionDto = Mockito.mock(EventStreamDefinitionDto.class, - Mockito.RETURNS_MOCKS); - Mockito.when(this.eventStreamAdminServiceStub.getStreamDefinitionDto(Mockito.anyString())) - .thenReturn(eventStreamDefinitionDto); - Mockito.when(eventStreamDefinitionDto.getPayloadData()).thenReturn(new EventStreamAttributeDto[]{}); - EventsPublisherService eventPublisherService = Mockito.mock(EventsPublisherServiceImpl.class, - Mockito.RETURNS_MOCKS); - PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, "getEventPublisherService")) - .toReturn(eventPublisherService); - Map payload = new HashMap<>(); - CacheImpl cache = Mockito.mock(CacheImpl.class); - PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, "getDynamicEventCache")) - .toReturn(cache); - Response response = this.deviceAgentService.publishEvents(payload, TEST_DEVICE_TYPE, TEST_DEVICE_IDENTIFIER); - Assert.assertNotNull(response, "Response should not be null"); - Assert.assertEquals(response.getStatus(), Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), - "The response status should be 500"); - List payloadList = new ArrayList<>(); - Response response2 = this.deviceAgentService.publishEvents(payloadList, TEST_DEVICE_TYPE, - TEST_DEVICE_IDENTIFIER); - Assert.assertNotNull(response2, "Response should not be null"); - Assert.assertEquals(response2.getStatus(), Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), - "The response status should be 500"); - } - - @Test(description = "Test Event publishing success scenario.") - public void testEventPublishWithEventAttributesNULLAndPublishEventsSuccess() - throws DeviceAccessAuthorizationException, RemoteException, DataPublisherConfigurationException { - PowerMockito.stub(PowerMockito.method(PrivilegedCarbonContext.class, "getThreadLocalCarbonContext")) - .toReturn(this.privilegedCarbonContext); - PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, - "getDeviceAccessAuthorizationService")).toReturn(this.deviceAccessAuthorizationService); - Mockito.when(this.deviceAccessAuthorizationService.isUserAuthorized(Mockito.any(DeviceIdentifier.class))) - .thenReturn(true); - PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, "getEventStreamAdminServiceStub")) - .toReturn(this.eventStreamAdminServiceStub); - EventStreamAttributeDto eventStreamAttributeDto = Mockito.mock(EventStreamAttributeDto.class, - Mockito.RETURNS_MOCKS); - EventStreamDefinitionDto eventStreamDefinitionDto = Mockito.mock(EventStreamDefinitionDto.class, - Mockito.RETURNS_MOCKS); - Mockito.when(this.eventStreamAdminServiceStub.getStreamDefinitionDto(Mockito.anyString())) - .thenReturn(eventStreamDefinitionDto); - Mockito.when(eventStreamDefinitionDto.getPayloadData()).thenReturn(new EventStreamAttributeDto[]{}); - EventsPublisherService eventPublisherService = Mockito.mock(EventsPublisherServiceImpl.class, - Mockito.RETURNS_MOCKS); - PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, "getEventPublisherService")) - .toReturn(eventPublisherService); - Mockito.when(eventPublisherService.publishEvent(Mockito.anyString(), Mockito.anyString(), Mockito.any(), - Mockito.any(), Mockito.any())).thenReturn(true); - Map payload = new HashMap<>(); - CacheImpl cache = Mockito.mock(CacheImpl.class); - PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, "getDynamicEventCache")) - .toReturn(cache); - Response response = this.deviceAgentService.publishEvents(payload, TEST_DEVICE_TYPE, TEST_DEVICE_IDENTIFIER); - Assert.assertNotNull(response, "Response should not be null"); - Assert.assertEquals(response.getStatus(), Response.Status.OK.getStatusCode(), - "The response status should be 200"); - List payloadList = new ArrayList<>(); - Response response2 = this.deviceAgentService.publishEvents(payloadList, - TEST_DEVICE_TYPE, TEST_DEVICE_IDENTIFIER); - Assert.assertNotNull(response2, "Response should not be null"); - Assert.assertEquals(response2.getStatus(), Response.Status.OK.getStatusCode(), - "The response status should be 200"); - } - - @Test(description = "Test event publishing when PublishEvents throws DataPublisherConfigurationException.") - public void testPublishEventsDataPublisherConfigurationException() throws DeviceAccessAuthorizationException, - RemoteException, DataPublisherConfigurationException { - PowerMockito.stub(PowerMockito.method(PrivilegedCarbonContext.class, "getThreadLocalCarbonContext")) - .toReturn(this.privilegedCarbonContext); - PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, - "getDeviceAccessAuthorizationService")).toReturn(this.deviceAccessAuthorizationService); - Mockito.when(this.deviceAccessAuthorizationService.isUserAuthorized(Mockito.any(DeviceIdentifier.class))) - .thenReturn(true); - PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, "getEventStreamAdminServiceStub")) - .toReturn(this.eventStreamAdminServiceStub); - EventStreamAttributeDto eventStreamAttributeDto = Mockito.mock(EventStreamAttributeDto.class, - Mockito.RETURNS_MOCKS); - EventStreamDefinitionDto eventStreamDefinitionDto = Mockito.mock(EventStreamDefinitionDto.class, - Mockito.RETURNS_MOCKS); - Mockito.when(this.eventStreamAdminServiceStub.getStreamDefinitionDto(Mockito.anyString())) - .thenReturn(eventStreamDefinitionDto); - Mockito.when(eventStreamDefinitionDto.getPayloadData()).thenReturn(new EventStreamAttributeDto[]{}); - EventsPublisherService eventPublisherService = Mockito.mock(EventsPublisherServiceImpl.class, - Mockito.RETURNS_MOCKS); - PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, "getEventPublisherService")) - .toReturn(eventPublisherService); - Mockito.when(eventPublisherService.publishEvent(Mockito.anyString(), Mockito.anyString(), Mockito.any(), - Mockito.any(), Mockito.any())).thenThrow( - new DataPublisherConfigurationException("meta data[0] should have the device Id field")); - Map payload = new HashMap<>(); - CacheImpl cache = Mockito.mock(CacheImpl.class); - PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, "getDynamicEventCache")) - .toReturn(cache); - Response response = this.deviceAgentService.publishEvents(payload, TEST_DEVICE_TYPE, TEST_DEVICE_IDENTIFIER); - Assert.assertNotNull(response, "Response should not be null"); - Assert.assertEquals(response.getStatus(), Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), - "The response status should be 500"); - List payloadList = new ArrayList<>(); - Response response2 = this.deviceAgentService.publishEvents(payloadList, TEST_DEVICE_TYPE, - TEST_DEVICE_IDENTIFIER); - Assert.assertNotNull(response2, "Response should not be null"); - Assert.assertEquals(response2.getStatus(), Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), - "The response status should be 500"); - } - @Test(description = "Test Publish events with Axis Fault.") public void testPublishEventsWithAxisFault() throws DeviceAccessAuthorizationException { PowerMockito.stub(PowerMockito.method(PrivilegedCarbonContext.class, "getThreadLocalCarbonContext")) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/authorization/DeviceAccessAuthorizationServiceTest.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/authorization/DeviceAccessAuthorizationServiceTest.java index eb8bf8ce0a..759bb1b48b 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/authorization/DeviceAccessAuthorizationServiceTest.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/authorization/DeviceAccessAuthorizationServiceTest.java @@ -157,7 +157,7 @@ public class DeviceAccessAuthorizationServiceTest { //Adding a non Admin User userStoreManager.addUser(NON_ADMIN_ALLOWED_USER, PASSWORD, null, defaultUserClaims, null); //Adding a normal user - userStoreManager.addUser(NORMAL_USER, PASSWORD, null, defaultUserClaims, null); + userStoreManager.addUser(NORMAL_USER, PASSWORD, null, buildDefaultUserClaims(FIRST_NAME, LAST_NAME, EMAIL), null); //Adding role with permission to Admin user userStoreManager.addRole(ADMIN_ROLE, new String[]{ADMIN_USER}, new Permission[]{adminPermission}); //Adding role with permission to non Admin user diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/permission/mgt/PermissionManagerServiceTest.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/permission/mgt/PermissionManagerServiceTest.java index 0bdcc6fb5c..12ebfa503a 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/permission/mgt/PermissionManagerServiceTest.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/permission/mgt/PermissionManagerServiceTest.java @@ -31,6 +31,8 @@ import org.wso2.carbon.device.mgt.common.permission.mgt.PermissionManagementExce import org.wso2.carbon.device.mgt.common.permission.mgt.PermissionManagerService; import org.wso2.carbon.registry.core.exceptions.RegistryException; +import java.util.ArrayList; +import java.util.List; import java.util.Properties; import static org.mockito.MockitoAnnotations.initMocks; @@ -46,11 +48,15 @@ public class PermissionManagerServiceTest { private static final String PERMISSION_PATH = "permission/admin/device-mgt/test/testPermission"; private static final String PERMISSION_METHOD = "ui.execute"; private static final String PERMISSION_NAME = "Test Permission"; + private static final String PERMISSION_CONTEXT = "permission/admin/device-mgt/test/testPermission"; + private static final String INVALID_PERMISSION_CONTEXT = "permission/INVALID"; + //For create properties to retrieve permission. private static final String HTTP_METHOD = "HTTP_METHOD"; private static final String URL = "URL"; private Permission permission; + private final List permissionList = new ArrayList<>(); private PermissionManagerService permissionManagerService; @ObjectFactory @@ -61,12 +67,13 @@ public class PermissionManagerServiceTest { @BeforeClass public void init() throws RegistryException { initMocks(this); - permissionManagerService = PermissionManagerServiceImpl.getInstance(); + this.permissionManagerService = PermissionManagerServiceImpl.getInstance(); this.permission = new Permission(); - permission.setName(PERMISSION_NAME); - permission.setPath(PERMISSION_PATH); - permission.setMethod(PERMISSION_METHOD); - permission.setUrl(PERMISSION_URL); + this.permission.setName(PERMISSION_NAME); + this.permission.setPath(PERMISSION_PATH); + this.permission.setMethod(PERMISSION_METHOD); + this.permission.setUrl(PERMISSION_URL); + this.permissionList.add(this.permission); } @Test (description = "Create a new permission in the permission tree.") @@ -74,7 +81,7 @@ public class PermissionManagerServiceTest { try { PowerMockito.mockStatic(PermissionUtils.class); PowerMockito.when(PermissionUtils.putPermission(permission)).thenReturn(true); - Assert.assertTrue(permissionManagerService.addPermission(permission)); + Assert.assertTrue(permissionManagerService.addPermission(PERMISSION_CONTEXT, this.permissionList)); } catch (PermissionManagementException e) { log.error("Error creating permission " + e.getErrorMessage()); } @@ -83,39 +90,18 @@ public class PermissionManagerServiceTest { @Test (dependsOnMethods = {"testCreatePermission"}, description = "Test for retrieving the created permission " + "from the permission tree.") public void testGetPermission() throws PermissionManagementException { - Permission permission = permissionManagerService.getPermission(createProperties()); - Assert.assertEquals(permission.getMethod(), PERMISSION_METHOD); - Assert.assertEquals(permission.getName(), PERMISSION_NAME); - Assert.assertEquals(permission.getPath(), PERMISSION_PATH); - Assert.assertEquals(permission.getUrl(), PERMISSION_URL); + List permissions = permissionManagerService.getPermission(PERMISSION_CONTEXT); + for (Permission permission : permissions) { + Assert.assertEquals(permission.getMethod(), PERMISSION_METHOD); + Assert.assertEquals(permission.getName(), PERMISSION_NAME); + Assert.assertEquals(permission.getPath(), PERMISSION_PATH); + Assert.assertEquals(permission.getUrl(), PERMISSION_URL); + } } - @Test (dependsOnMethods = {"testCreatePermission"}, - expectedExceptions = {PermissionManagementException.class}, - expectedExceptionsMessageRegExp = "Resource URI/HTTP method is empty") + @Test (dependsOnMethods = {"testCreatePermission"}) public void testGetPermissionError() throws PermissionManagementException { - Permission permission = permissionManagerService.getPermission(createErrorProperty()); - } - - /** - * Create a Property object which will be passed to getPermission method to retrieve a permission. - * @return : Property object which contains permission url and method. - * */ - private Properties createProperties() { - Properties properties = new Properties(); - properties.setProperty(URL, PERMISSION_URL); - properties.setProperty(HTTP_METHOD, PERMISSION_METHOD); - return properties; - } - - /** - * Creates property object with empty properties. - * @return : Properties object with empty set of properties. - * */ - private Properties createErrorProperty() { - Properties properties = new Properties(); - properties.setProperty(URL, ""); - properties.setProperty(HTTP_METHOD, ""); - return properties; + List permissions = permissionManagerService.getPermission(INVALID_PERMISSION_CONTEXT); + Assert.assertNull(permissions); } } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/service/GroupManagementProviderServiceTest.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/service/GroupManagementProviderServiceTest.java index b645eac9a0..3073b5ee3d 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/service/GroupManagementProviderServiceTest.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/service/GroupManagementProviderServiceTest.java @@ -37,6 +37,7 @@ package org.wso2.carbon.device.mgt.core.service; import org.testng.Assert; import org.testng.annotations.BeforeClass; +import org.testng.annotations.DataProvider; import org.testng.annotations.Test; import org.wso2.carbon.device.mgt.common.Device; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; @@ -101,91 +102,91 @@ public class GroupManagementProviderServiceTest extends BaseDeviceManagementTest groupManagementProviderService.createGroup(TestUtils.createDeviceGroup4(), DEFAULT_ADMIN_ROLE, DEFAULT_ADMIN_PERMISSIONS); } - @Test(dependsOnMethods = ("createGroup")) + @Test(dependsOnMethods = "createGroup") public void updateGroup() throws GroupManagementException, GroupNotExistException { DeviceGroup deviceGroup = groupManagementProviderService.getGroup(TestUtils.createDeviceGroup1().getName(), false); deviceGroup.setName(deviceGroup.getName() + "_UPDATED"); groupManagementProviderService.updateGroup(deviceGroup, deviceGroup.getGroupId()); } - @Test(dependsOnMethods = ("createGroup"), expectedExceptions = {GroupManagementException.class}) + @Test(dependsOnMethods = "createGroup", expectedExceptions = {GroupManagementException.class}) public void getGroupNull() throws GroupManagementException, GroupNotExistException { groupManagementProviderService.getGroup(null, false); } // Rename again to use in different place. - @Test(dependsOnMethods = ("updateGroup")) + @Test(dependsOnMethods = "updateGroup") public void updateGroupSecondTime() throws GroupManagementException, GroupNotExistException { DeviceGroup deviceGroup = groupManagementProviderService.getGroup(TestUtils.createDeviceGroup1().getName() + "_UPDATED", true); deviceGroup.setName(TestUtils.createDeviceGroup1().getName()); groupManagementProviderService.updateGroup(deviceGroup, deviceGroup.getGroupId()); } - @Test(dependsOnMethods = ("createGroup"), expectedExceptions = {GroupManagementException.class, GroupNotExistException.class}) + @Test(dependsOnMethods = "createGroup", expectedExceptions = {GroupManagementException.class, GroupNotExistException.class}) public void updateGroupError() throws GroupManagementException, GroupNotExistException { groupManagementProviderService.updateGroup(null, 1); } - @Test(dependsOnMethods = ("createGroup"), expectedExceptions = {GroupManagementException.class, GroupNotExistException.class}) + @Test(dependsOnMethods = "createGroup", expectedExceptions = {GroupManagementException.class, GroupNotExistException.class}) public void updateGroupErrorNotExist() throws GroupManagementException, GroupNotExistException { DeviceGroup deviceGroup = groupManagementProviderService.getGroup(TestUtils.createDeviceGroup2().getName(), false); deviceGroup.setName(deviceGroup.getName() + "_UPDATED"); groupManagementProviderService.updateGroup(deviceGroup, 6); } - @Test(dependsOnMethods = ("createGroup")) + @Test(dependsOnMethods = "createGroup") public void deleteGroup() throws GroupManagementException { DeviceGroup deviceGroup = groupManagementProviderService.getGroup(TestUtils.createDeviceGroup4().getName(), false); Assert.assertTrue(groupManagementProviderService.deleteGroup(deviceGroup.getGroupId(), false)); } - @Test(dependsOnMethods = ("createGroup")) + @Test(dependsOnMethods = "createGroup") public void deleteGroupNotExists() throws GroupManagementException { groupManagementProviderService.deleteGroup(8, false); } - @Test(dependsOnMethods = ("createGroup")) + @Test(dependsOnMethods = "createGroup") public void getGroup() throws GroupManagementException { DeviceGroup deviceGroup = groupManagementProviderService.getGroup(TestUtils.createDeviceGroup3().getName(), false); Assert.assertNotNull(groupManagementProviderService.getGroup(deviceGroup.getGroupId(), false)); } - @Test(dependsOnMethods = ("createGroup")) + @Test(dependsOnMethods = "createGroup") public void getGroupByName() throws GroupManagementException { Assert.assertNotNull(groupManagementProviderService.getGroup(TestUtils.createDeviceGroup3().getName(), false)); } - @Test(dependsOnMethods = ("createGroup")) + @Test(dependsOnMethods = "createGroup") public void getGroups() throws GroupManagementException { List deviceGroups = groupManagementProviderService.getGroups(true); Assert.assertNotNull(deviceGroups); } - @Test(dependsOnMethods = ("createGroup")) + @Test(dependsOnMethods = "createGroup") public void getGroupsByUsername() throws GroupManagementException { List deviceGroups = groupManagementProviderService.getGroups("admin", true); Assert.assertNotNull(deviceGroups); } - @Test(dependsOnMethods = ("createGroup"), expectedExceptions = {GroupManagementException.class}) + @Test(dependsOnMethods = "createGroup", expectedExceptions = {GroupManagementException.class}) public void getGroupsByUsernameError() throws GroupManagementException { groupManagementProviderService.getGroups((String) null, false); } - @Test(dependsOnMethods = ("createGroup")) + @Test(dependsOnMethods = "createGroup") public void getGroupsByPagination() throws GroupManagementException { PaginationResult result = groupManagementProviderService.getGroups(TestUtils.createPaginationRequest(), true); Assert.assertNotNull(result); } - @Test(dependsOnMethods = ("createGroup"), expectedExceptions = {GroupManagementException.class}) + @Test(dependsOnMethods = "createGroup", expectedExceptions = {GroupManagementException.class}) public void getGroupsByPaginationError() throws GroupManagementException { groupManagementProviderService.getGroups((GroupPaginationRequest) null, true); } - @Test(dependsOnMethods = ("createGroup")) + @Test(dependsOnMethods = "createGroup") public void getGroupsByUsernameAndPagination() throws GroupManagementException { PaginationResult result = groupManagementProviderService.getGroups("admin", TestUtils.createPaginationRequest(), false); @@ -193,25 +194,30 @@ public class GroupManagementProviderServiceTest extends BaseDeviceManagementTest } - @Test(dependsOnMethods = ("createGroup"), expectedExceptions = {GroupManagementException.class}) + @Test(dependsOnMethods = "createGroup", expectedExceptions = {GroupManagementException.class}) public void getGroupsByUsernameAndPaginationError() throws GroupManagementException { groupManagementProviderService.getGroups(null, TestUtils.createPaginationRequest(), true); } - @Test(dependsOnMethods = ("createGroup")) + @Test(dependsOnMethods = "createGroup") public void getGroupCount() throws GroupManagementException { int x = groupManagementProviderService.getGroupCount(); Assert.assertNotNull(x); } - @Test(dependsOnMethods = ("createGroup")) + @DataProvider(name = "getGroupCountByUsernameProvider") + public static Object[][] userName() { + return new Object[][] {{"admin"}}; + } + + @Test(dependsOnMethods = "createGroup", dataProvider = "getGroupCountByUsernameProvider") public void getGroupCountByUsername(String username) throws GroupManagementException { int x = groupManagementProviderService.getGroupCount(username, null); - Assert.assertNotNull(x); + Assert.assertNotEquals(x, 0); } - @Test(dependsOnMethods = ("updateGroupSecondTime")) + @Test(dependsOnMethods = "updateGroupSecondTime") public void manageGroupSharing() throws GroupManagementException, RoleDoesNotExistException, UserStoreException { groupManagementProviderService.manageGroupSharing(0, null); List newRoles = new ArrayList<>(); @@ -234,25 +240,25 @@ public class GroupManagementProviderServiceTest extends BaseDeviceManagementTest TestUtils.createDeviceGroup1().getName(), false).getGroupId(), newRoles); } - @Test(dependsOnMethods = ("createGroup")) + @Test(dependsOnMethods = "createGroup") public void getRoles() throws GroupManagementException { List roles = groupManagementProviderService.getRoles(1); Assert.assertNotNull(roles); } - @Test(dependsOnMethods = ("createGroup")) + @Test(dependsOnMethods = "createGroup") public void getDevices() throws GroupManagementException { List devices = groupManagementProviderService.getDevices(1, 1, 50, false); Assert.assertNotNull(devices); } - @Test(dependsOnMethods = ("createGroup")) + @Test(dependsOnMethods = "createGroup") public void getDeviceCount() throws GroupManagementException { int x = groupManagementProviderService.getDeviceCount(1); Assert.assertEquals(0, x); } - @Test(dependsOnMethods = ("createGroup")) + @Test(dependsOnMethods = "createGroup") public void addDevices() throws GroupManagementException, DeviceNotFoundException { DeviceCacheConfiguration configuration = new DeviceCacheConfiguration(); @@ -268,7 +274,7 @@ public class GroupManagementProviderServiceTest extends BaseDeviceManagementTest TestUtils.createDeviceGroup3().getName(), false).getGroupId(), list); } - @Test(dependsOnMethods = ("addDevices")) + @Test(dependsOnMethods = "addDevices") public void removeDevice() throws GroupManagementException, DeviceNotFoundException { List list = TestUtils.getDeviceIdentifiersList(); groupManagementProviderService.removeDevice(groupManagementProviderService.getGroup( @@ -277,13 +283,13 @@ public class GroupManagementProviderServiceTest extends BaseDeviceManagementTest TestUtils.createDeviceGroup3().getName(), false).getGroupId(), list); } - @Test(dependsOnMethods = ("createGroup")) + @Test(dependsOnMethods = "createGroup") public void getGroupsByUsernameAndPermissions() throws GroupManagementException { List groups = groupManagementProviderService.getGroups("admin", "/permission/device-mgt/admin/groups", true); Assert.assertNotNull(groups); } - @Test(dependsOnMethods = ("addDevices")) + @Test(dependsOnMethods = "addDevices") public void getGroupsByDeviceIdentifier() throws GroupManagementException { DeviceIdentifier identifier = new DeviceIdentifier(); identifier.setId("12345"); diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/java/org/wso2/carbon/policy/mgt/core/PolicyEvaluationTestCase.java b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/java/org/wso2/carbon/policy/mgt/core/PolicyEvaluationTestCase.java index bf7a5bb760..cebfef03c7 100644 --- a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/java/org/wso2/carbon/policy/mgt/core/PolicyEvaluationTestCase.java +++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/java/org/wso2/carbon/policy/mgt/core/PolicyEvaluationTestCase.java @@ -23,6 +23,7 @@ import junit.framework.Assert; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.testng.annotations.BeforeClass; +import org.testng.annotations.DataProvider; import org.testng.annotations.Test; import org.wso2.carbon.device.mgt.common.Device; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; @@ -90,7 +91,12 @@ public class PolicyEvaluationTestCase extends BasePolicyManagementDAOTest { //administratorPoint.publishChanges(); } - @Test(dependsOnMethods = ("activatePolicies")) + @DataProvider(name = "deviceIdentifierDataProvider") + public static Object[][] deviceIdentifierData() { + return new Object[][] {{new DeviceIdentifier()}}; + } + + @Test(dependsOnMethods = "activatePolicies", dataProvider = "deviceIdentifierDataProvider") public void getEffectivePolicy(DeviceIdentifier identifier) throws DeviceManagementException, PolicyEvaluationException { log.debug("Getting effective policy for device started .........."); diff --git a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml index 2a91d7682a..0b3c41e084 100644 --- a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml +++ b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml @@ -182,6 +182,10 @@ + + org.testng + testng + org.wso2.carbon.identity.framework org.wso2.carbon.identity.core @@ -195,16 +199,6 @@ org.wso2.carbon.identity.inbound.auth.oauth2 org.wso2.carbon.identity.oauth - - - org.wso2.orbit.com.nimbusds - nimbus-jose-jwt - - - com.nimbusds - nimbus-jose-jwt - - org.wso2.carbon @@ -284,7 +278,17 @@ org.apache.sling.testing.osgi-mock test + + org.wso2.carbon + javax.cache.wso2 + 4.6.3-m5 + test + + + + true + diff --git a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/test/java/org/wso2/carbon/webapp/authenticator/framework/BaseWebAppAuthenticatorFrameworkTest.java b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/test/java/org/wso2/carbon/webapp/authenticator/framework/BaseWebAppAuthenticatorFrameworkTest.java index fc437004a0..a956c5f3dc 100644 --- a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/test/java/org/wso2/carbon/webapp/authenticator/framework/BaseWebAppAuthenticatorFrameworkTest.java +++ b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/test/java/org/wso2/carbon/webapp/authenticator/framework/BaseWebAppAuthenticatorFrameworkTest.java @@ -18,6 +18,7 @@ package org.wso2.carbon.webapp.authenticator.framework; + import org.testng.annotations.BeforeSuite; import org.wso2.carbon.CarbonConstants; import org.wso2.carbon.context.PrivilegedCarbonContext; diff --git a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/test/java/org/wso2/carbon/webapp/authenticator/framework/WebappAuthenticationValveTest.java b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/test/java/org/wso2/carbon/webapp/authenticator/framework/WebappAuthenticationValveTest.java index 91dfad24ca..bd94dad56c 100644 --- a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/test/java/org/wso2/carbon/webapp/authenticator/framework/WebappAuthenticationValveTest.java +++ b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/test/java/org/wso2/carbon/webapp/authenticator/framework/WebappAuthenticationValveTest.java @@ -106,12 +106,9 @@ public class WebappAuthenticationValveTest { @Test(description = "This method tests the behaviour of the invoke method of WebAuthenticationValve when " + "secured endpoints are invoked.") - public void testInvokeSecuredEndpoints() throws NoSuchFieldException, IllegalAccessException { - String encodedString = new String(Base64.getEncoder().encode((ADMIN_USER + ":" + ADMIN_USER).getBytes())); + public void testInvokeSecuredEndpointsUnauthorized() throws NoSuchFieldException, IllegalAccessException { + String encodedString = new String(Base64.getEncoder().encode((ADMIN_USER + ":" + ADMIN_USER + "test").getBytes())); Request request = createRequest("basic " + encodedString); - webappAuthenticationValve.invoke(request, null, compositeValve); - encodedString = new String(Base64.getEncoder().encode((ADMIN_USER + ":" + ADMIN_USER + "test").getBytes())); - request = createRequest("basic " + encodedString); Response response = new Response(); org.apache.coyote.Response coyoteResponse = new org.apache.coyote.Response(); Connector connector = new Connector(); @@ -122,6 +119,21 @@ public class WebappAuthenticationValveTest { "Response of un-authorized request is not updated"); } + @Test(description = "This method tests the behaviour of the invoke method of WebAuthenticationValve when " + + "secured endpoints are invoked.") + public void testInvokeSecuredEndpointsAuthorized() throws NoSuchFieldException, IllegalAccessException { + String encodedString = new String(Base64.getEncoder().encode((ADMIN_USER + ":" + ADMIN_USER).getBytes())); + Request request = createRequest("basic " + encodedString); + Response response = new Response(); + org.apache.coyote.Response coyoteResponse = new org.apache.coyote.Response(); + Connector connector = new Connector(); + response.setConnector(connector); + response.setCoyoteResponse(coyoteResponse); + webappAuthenticationValve.invoke(request, response, compositeValve); + Assert.assertEquals(response.getStatus(), HttpServletResponse.SC_ACCEPTED, + "Response of un-authorized request is not updated"); + } + @Test(description = "This method tests the behaviour of invoke method when the request does not satisfy any " + "authenticator requirements") public void testInvokeWithoutProperAuthenticator() throws NoSuchFieldException, IllegalAccessException { diff --git a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/test/resources/carbon-home/repository/conf/registry.xml b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/test/resources/carbon-home/repository/conf/registry.xml index 0bb97a7dc9..a226ae80a8 100644 --- a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/test/resources/carbon-home/repository/conf/registry.xml +++ b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/test/resources/carbon-home/repository/conf/registry.xml @@ -1,50 +1,50 @@ - - - - - - - - wso2registry - false - true - / - - - jdbc:h2:./target/databasetest/CARBON_TEST - - org.h2.Driver - 80 - 60000 - 5 - - - false - - - - true - true - true - true - - + + + + + + + + wso2registry + false + true + / + + + jdbc:h2:./target/databasetest/CARBON_TEST + + org.h2.Driver + 80 + 60000 + 5 + + + false + + + + true + true + true + true + + diff --git a/pom.xml b/pom.xml index b8aacf28c3..83ceb160d4 100644 --- a/pom.xml +++ b/pom.xml @@ -1975,7 +1975,7 @@ 2.2.1 - 6.1.1 + 7.4.0 4.6.2 [4.5.0, 5.0.0) 5.1.2 @@ -2000,7 +2000,6 @@ 4.3.1 4.4.2 - 6.8 1.1.0 4.8.2 @@ -2186,7 +2185,7 @@ 0.7.8 0.7.5.201505241946 1.0b3 - 1.7.0 + 1.7.4 1.4.0.wso2v1 1.7.25 @@ -2208,8 +2207,6 @@ [1.6.0, 2.0.0) [1.2.0,1.3.0) - - true