Migrate to Allure 2 (#749)

Add allure 2.7.0 dependency; change class references of Description, Features, Stories

Signed-off-by: Stefan Klotz <stefan.klotz@bosch-si.com>

CONTRIBUTING.md

@@ -44,12 +44,12 @@ Examples:
 
 ### Test documentation
 
-Please documented the test cases that you contribute by means of [Allure](http://allure.qatools.ru) annotations and proper test method naming.
+Please documented the test cases that you contribute by means of [Allure](https://docs.qameta.io/allure/) annotations and proper test method naming.
 
-All test classes are documented with [Allure's](https://github.com/allure-framework/allure-core/wiki/Features-and-Stories) **@Features** and **@Stories** annotations in the following format:
+All test classes are documented with [Allure's](https://docs.qameta.io/allure/#_behaviours_mapping) **@Feature** and **@Story** annotations in the following format:
 ```
-@Features("TEST_TYPE - HAWKBIT_COMPONENT")
+@Feature("TEST_TYPE - HAWKBIT_COMPONENT")
-@Stories("Test class description")
+@Story("Test class description")
 ```
 
 Test types are:
@@ -69,8 +69,8 @@ Examples for hawkBit components:
 * Security
 
 ```java
-@Features("Component Tests - Management API")
+@Feature("Component Tests - Management API")
-@Stories("Distribution Set Type Resource")
+@Story("Distribution Set Type Resource")
 ```
 
 In addition all test method's name describes in **camel case** what the test is all about and has in addition a long description in Allures **@Description** annotation.

hawkbit-artifact-repository-filesystem/pom.xml

@@ -46,8 +46,8 @@
          <scope>test</scope>
       </dependency>
       <dependency>
-         <groupId>ru.yandex.qatools.allure</groupId>
+         <groupId>io.qameta.allure</groupId>
-         <artifactId>allure-junit-adaptor</artifactId>
+         <artifactId>allure-junit4</artifactId>
          <scope>test</scope>
       </dependency>
    </dependencies>

hawkbit-artifact-repository-filesystem/src/test/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemRepositoryTest.java

@@ -19,12 +19,12 @@ import org.assertj.core.api.Assertions;
 import org.eclipse.hawkbit.artifact.repository.model.AbstractDbArtifact;
 import org.junit.Test;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Unit Tests - Artifact File System Repository")
+@Feature("Unit Tests - Artifact File System Repository")
-@Stories("Test storing artifact binaries in the file-system")
+@Story("Test storing artifact binaries in the file-system")
 public class ArtifactFilesystemRepositoryTest {
     private static final String TENANT = "test_tenant";
 

hawkbit-artifact-repository-filesystem/src/test/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemTest.java

@@ -19,12 +19,12 @@ import org.assertj.core.api.Assertions;
 import org.eclipse.hawkbit.artifact.repository.model.DbArtifactHash;
 import org.junit.Test;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Unit Tests - Artifact File System Repository")
+@Feature("Unit Tests - Artifact File System Repository")
-@Stories("Test storing artifact binaries in the file-system")
+@Story("Test storing artifact binaries in the file-system")
 public class ArtifactFilesystemTest {
 
     @Test

hawkbit-core/pom.xml

@@ -44,8 +44,8 @@
          <scope>test</scope>
       </dependency>
       <dependency>
-         <groupId>ru.yandex.qatools.allure</groupId>
+         <groupId>io.qameta.allure</groupId>
-         <artifactId>allure-junit-adaptor</artifactId>
+         <artifactId>allure-junit4</artifactId>
          <scope>test</scope>
       </dependency>
    </dependencies>

hawkbit-core/src/test/java/org/eclipse/hawkbit/api/Base62UtilTest.java

@@ -12,12 +12,12 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Unit Tests - Artifact URL Handler")
+@Feature("Unit Tests - Artifact URL Handler")
-@Stories("Base62 Utility tests")
+@Story("Base62 Utility tests")
 public class Base62UtilTest {
 
     @Test

hawkbit-core/src/test/java/org/eclipse/hawkbit/api/PropertyBasedArtifactUrlHandlerTest.java

@@ -22,15 +22,15 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 /**
  * Tests for creating urls to download artifacts.
  */
-@Features("Unit Tests - Artifact URL Handler")
+@Feature("Unit Tests - Artifact URL Handler")
-@Stories("Test to generate the artifact download URL")
+@Story("Test to generate the artifact download URL")
 @RunWith(MockitoJUnitRunner.class)
 public class PropertyBasedArtifactUrlHandlerTest {
 

hawkbit-core/src/test/java/org/eclipse/hawkbit/cache/DefaultDownloadIdCacheTest.java

@@ -23,12 +23,12 @@ import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.support.SimpleValueWrapper;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Unit Tests - Cache")
+@Feature("Unit Tests - Cache")
-@Stories("Download ID Cache")
+@Story("Download ID Cache")
 @RunWith(MockitoJUnitRunner.class)
 public class DefaultDownloadIdCacheTest {
 

hawkbit-dmf/hawkbit-dmf-amqp/pom.xml

@@ -79,8 +79,8 @@
          <scope>test</scope>
       </dependency>
       <dependency>
-         <groupId>ru.yandex.qatools.allure</groupId>
+         <groupId>io.qameta.allure</groupId>
-         <artifactId>allure-junit-adaptor</artifactId>
+         <artifactId>allure-junit4</artifactId>
          <scope>test</scope>
       </dependency>
       <dependency>

hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpControllerAuthenticationTest.java

@@ -63,16 +63,16 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationToken;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 /**
  *
  * Test Amqp controller authentication.
  */
-@Features("Component Tests - Device Management Federation API")
+@Feature("Component Tests - Device Management Federation API")
-@Stories("AmqpController Authentication Test")
+@Story("AmqpController Authentication Test")
 @RunWith(MockitoJUnitRunner.class)
 public class AmqpControllerAuthenticationTest {
 

hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageDispatcherServiceTest.java

@@ -62,13 +62,13 @@ import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
 import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.test.context.ActiveProfiles;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 @ActiveProfiles({ "test" })
-@Features("Component Tests - Device Management Federation API")
+@Feature("Component Tests - Device Management Federation API")
-@Stories("AmqpMessage Dispatcher Service Test")
+@Story("AmqpMessage Dispatcher Service Test")
 @SpringApplicationConfiguration(classes = { RepositoryApplicationConfiguration.class })
 public class AmqpMessageDispatcherServiceTest extends AbstractIntegrationTest {
 

hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerServiceTest.java

@@ -69,13 +69,13 @@ import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
 import org.springframework.amqp.support.converter.MessageConverter;
 import org.springframework.http.HttpStatus;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 @RunWith(MockitoJUnitRunner.class)
-@Features("Component Tests - Device Management Federation API")
+@Feature("Component Tests - Device Management Federation API")
-@Stories("AmqpMessage Handler Service Test")
+@Story("AmqpMessage Handler Service Test")
 public class AmqpMessageHandlerServiceTest {
 
     private static final String SHA1 = "12345";

hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/BaseAmqpServiceTest.java

@@ -28,13 +28,13 @@ import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
 import org.springframework.amqp.support.converter.MessageConversionException;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 @RunWith(MockitoJUnitRunner.class)
-@Features("Component Tests - Device Management Federation API")
+@Feature("Component Tests - Device Management Federation API")
-@Stories("Base Amqp Service Test")
+@Story("Base Amqp Service Test")
 public class BaseAmqpServiceTest {
 
     @Mock

hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpAuthenticationMessageHandlerIntegrationTest.java

@@ -39,12 +39,12 @@ import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.http.HttpStatus;
 import org.springframework.util.StringUtils;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Component Tests - Device Management Federation API")
+@Feature("Component Tests - Device Management Federation API")
-@Stories("Amqp Authentication Message Handler")
+@Story("Amqp Authentication Message Handler")
 @SpringApplicationConfiguration(classes = { RepositoryApplicationConfiguration.class, AmqpTestConfiguration.class,
         DmfApiConfiguration.class })
 public class AmqpAuthenticationMessageHandlerIntegrationTest extends AbstractAmqpIntegrationTest {

hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpMessageDispatcherServiceIntegrationTest.java

@@ -34,12 +34,12 @@ import org.eclipse.hawkbit.repository.test.matcher.ExpectEvents;
 import org.junit.Test;
 import org.springframework.amqp.core.Message;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Component Tests - Device Management Federation API")
+@Feature("Component Tests - Device Management Federation API")
-@Stories("Amqp Message Dispatcher Service")
+@Story("Amqp Message Dispatcher Service")
 public class AmqpMessageDispatcherServiceIntegrationTest extends AmqpServiceIntegrationTest {
     private static final String TARGET_PREFIX = "Dmf_disp_";
 

hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpMessageHandlerServiceIntegrationTest.java

@@ -51,13 +51,13 @@ import org.springframework.amqp.core.MessageProperties;
 import org.springframework.amqp.rabbit.core.RabbitAdmin;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Step;
+import io.qameta.allure.Step;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Component Tests - Device Management Federation API")
+@Feature("Component Tests - Device Management Federation API")
-@Stories("Amqp Message Handler Service")
+@Story("Amqp Message Handler Service")
 public class AmqpMessageHandlerServiceIntegrationTest extends AmqpServiceIntegrationTest {
     private static final String CORRELATION_ID = UUID.randomUUID().toString();
     private static final String TARGET_PREFIX = "Dmf_hand_";

hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpServiceIntegrationTest.java

@@ -51,7 +51,7 @@ import org.springframework.amqp.rabbit.test.RabbitListenerTestHarness;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.SpringApplicationConfiguration;
 
-import ru.yandex.qatools.allure.annotations.Step;
+import io.qameta.allure.Step;
 
 /**
  *

hawkbit-http-security/pom.xml

@@ -52,8 +52,8 @@
          <scope>test</scope>
       </dependency>
       <dependency>
-         <groupId>ru.yandex.qatools.allure</groupId>
+         <groupId>io.qameta.allure</groupId>
-         <artifactId>allure-junit-adaptor</artifactId>
+         <artifactId>allure-junit4</artifactId>
          <scope>test</scope>
       </dependency>
    </dependencies>

hawkbit-http-security/src/test/java/org/eclipse/hawkbit/security/PreAuthTokenSourceTrustAuthenticationProviderTest.java

@@ -23,12 +23,12 @@ import org.springframework.security.authentication.InsufficientAuthenticationExc
 import org.springframework.security.core.Authentication;
 import org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationToken;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Unit Tests - Security")
+@Feature("Unit Tests - Security")
-@Stories("PreAuthToken Source TrustAuthentication Provider Test")
+@Story("PreAuthToken Source TrustAuthentication Provider Test")
 @RunWith(MockitoJUnitRunner.class)
 // TODO: create description annotations
 public class PreAuthTokenSourceTrustAuthenticationProviderTest {

hawkbit-repository/hawkbit-repository-api/pom.xml

@@ -54,8 +54,8 @@
 
       <!-- TEST -->
       <dependency>
-         <groupId>ru.yandex.qatools.allure</groupId>
+         <groupId>io.qameta.allure</groupId>
-         <artifactId>allure-junit-adaptor</artifactId>
+         <artifactId>allure-junit4</artifactId>
          <scope>test</scope>
       </dependency>
       <dependency>

hawkbit-repository/hawkbit-repository-api/src/test/java/org/eclipse/hawkbit/repository/MaintenanceScheduleHelperTest.java

@@ -19,12 +19,12 @@ import org.junit.Test;
 
 import com.cronutils.model.Cron;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Unit Tests - Repository")
+@Feature("Unit Tests - Repository")
-@Stories("Maintenance Schedule Utility")
+@Story("Maintenance Schedule Utility")
 public class MaintenanceScheduleHelperTest {
 
     @Test

hawkbit-repository/hawkbit-repository-api/src/test/java/org/eclipse/hawkbit/repository/RepositoryManagementMethodPreAuthorizeAnnotatedTest.java

@@ -25,12 +25,12 @@ import org.springframework.security.access.prepost.PreAuthorize;
 
 import com.google.common.reflect.ClassPath;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Unit Tests - Repository")
+@Feature("Unit Tests - Repository")
-@Stories("Security Test")
+@Story("Security Test")
 public class RepositoryManagementMethodPreAuthorizeAnnotatedTest {
 
     private static final Set<Method> METHOD_SECURITY_EXCLUSION = new HashSet<>();

hawkbit-repository/hawkbit-repository-core/pom.xml

@@ -58,8 +58,8 @@
          <scope>test</scope>
       </dependency>
       <dependency>
-         <groupId>ru.yandex.qatools.allure</groupId>
+         <groupId>io.qameta.allure</groupId>
-         <artifactId>allure-junit-adaptor</artifactId>
+         <artifactId>allure-junit4</artifactId>
          <scope>test</scope>
       </dependency>
    </dependencies>

hawkbit-repository/hawkbit-repository-core/src/test/java/org/eclipse/hawkbit/event/BusProtoStuffMessageConverterTest.java

@@ -27,7 +27,7 @@ import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHeaders;
 import org.springframework.messaging.converter.MessageConversionException;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
 
 @RunWith(MockitoJUnitRunner.class)
 public class BusProtoStuffMessageConverterTest {

hawkbit-repository/hawkbit-repository-jpa/pom.xml

@@ -99,8 +99,8 @@
          <scope>test</scope>
       </dependency>
       <dependency>
-         <groupId>ru.yandex.qatools.allure</groupId>
+         <groupId>io.qameta.allure</groupId>
-         <artifactId>allure-junit-adaptor</artifactId>
+         <artifactId>allure-junit4</artifactId>
          <scope>test</scope>
       </dependency>
       <dependency>

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/RemoteIdEventTest.java

@@ -16,15 +16,15 @@ import java.util.Arrays;
 
 import org.junit.Test;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 /**
  * Test the remote entity events.
  */
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("Entity Id Events")
+@Story("Entity Id Events")
 public class RemoteIdEventTest extends AbstractRemoteEventTest {
 
     private static final long ENTITY_ID = 1L;

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/RemoteTenantAwareEventTest.java

@@ -22,12 +22,12 @@ import org.eclipse.hawkbit.repository.model.DistributionSet;
 import org.eclipse.hawkbit.repository.model.Target;
 import org.junit.Test;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("RemoteTenantAwareEvent Tests")
+@Story("RemoteTenantAwareEvent Tests")
 public class RemoteTenantAwareEventTest extends AbstractRemoteEventTest {
 
     @Test

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/AbstractRemoteEntityEventTest.java

@@ -15,14 +15,14 @@ import java.lang.reflect.Constructor;
 
 import org.eclipse.hawkbit.repository.event.remote.AbstractRemoteEventTest;
 
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 /**
  * Test the remote entity events.
  */
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("Entity Events")
+@Story("Entity Events")
 public abstract class AbstractRemoteEntityEventTest<E> extends AbstractRemoteEventTest {
 
     protected RemoteEntityEvent<?> assertAndCreateRemoteEvent(final Class<? extends RemoteEntityEvent<?>> eventType) {

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/ActionEventTest.java

@@ -21,15 +21,15 @@ import org.eclipse.hawkbit.repository.model.DistributionSet;
 import org.eclipse.hawkbit.repository.model.Target;
 import org.junit.Test;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 /**
  * Test the remote entity events.
  */
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("Test ActionCreatedEvent and ActionUpdatedEvent")
+@Story("Test ActionCreatedEvent and ActionUpdatedEvent")
 public class ActionEventTest extends AbstractRemoteEntityEventTest<Action> {
 
     @Test

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetCreatedEventTest.java

@@ -11,15 +11,15 @@ package org.eclipse.hawkbit.repository.event.remote.entity;
 import org.eclipse.hawkbit.repository.model.DistributionSet;
 import org.junit.Test;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 /**
  * Test the remote entity events.
  */
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("Test DistributionSetCreatedEvent")
+@Story("Test DistributionSetCreatedEvent")
 public class DistributionSetCreatedEventTest extends AbstractRemoteEntityEventTest<DistributionSet> {
 
     @Test

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetTagEventTest.java

@@ -11,15 +11,15 @@ package org.eclipse.hawkbit.repository.event.remote.entity;
 import org.eclipse.hawkbit.repository.model.DistributionSetTag;
 import org.junit.Test;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 /**
  * Test the remote entity events.
  */
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("Test DistributionSetTagCreatedEvent and DistributionSetTagUpdateEvent")
+@Story("Test DistributionSetTagCreatedEvent and DistributionSetTagUpdateEvent")
 public class DistributionSetTagEventTest extends AbstractRemoteEntityEventTest<DistributionSetTag> {
 
     @Test

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetUpdatedEventTest.java

@@ -11,15 +11,15 @@ package org.eclipse.hawkbit.repository.event.remote.entity;
 import org.eclipse.hawkbit.repository.model.DistributionSet;
 import org.junit.Test;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 /**
  * Test the remote entity events.
  */
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("Test DistributionSetUpdateEvent")
+@Story("Test DistributionSetUpdateEvent")
 public class DistributionSetUpdatedEventTest extends AbstractRemoteEntityEventTest<DistributionSet> {
 
     @Test

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/RolloutEventTest.java

@@ -14,15 +14,15 @@ import org.eclipse.hawkbit.repository.model.RolloutGroup.RolloutGroupSuccessCond
 import org.eclipse.hawkbit.repository.model.RolloutGroupConditionBuilder;
 import org.junit.Test;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 /**
  * Test the remote entity events.
  */
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("Test RolloutUpdatedEvent")
+@Story("Test RolloutUpdatedEvent")
 public class RolloutEventTest extends AbstractRemoteEntityEventTest<Rollout> {
 
     @Test

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/RolloutGroupEventTest.java

@@ -21,15 +21,15 @@ import org.eclipse.hawkbit.repository.model.RolloutGroup.RolloutGroupSuccessCond
 import org.eclipse.hawkbit.repository.model.RolloutGroupConditionBuilder;
 import org.junit.Test;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 /**
  * Test the remote entity events.
  */
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("Test RolloutGroupCreatedEvent and RolloutGroupUpdatedEvent")
+@Story("Test RolloutGroupCreatedEvent and RolloutGroupUpdatedEvent")
 public class RolloutGroupEventTest extends AbstractRemoteEntityEventTest<RolloutGroup> {
 
     @Test

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/SoftwareModuleEventTest.java

@@ -11,15 +11,15 @@ package org.eclipse.hawkbit.repository.event.remote.entity;
 import org.eclipse.hawkbit.repository.model.SoftwareModule;
 import org.junit.Test;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 /**
  * Test the remote entity events.
  */
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("Test SoftwareModuleCreatedEvent, SoftwareModuleUpdatedEvent")
+@Story("Test SoftwareModuleCreatedEvent, SoftwareModuleUpdatedEvent")
 public class SoftwareModuleEventTest extends AbstractRemoteEntityEventTest<SoftwareModule> {
 
     @Test

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetEventTest.java

@@ -13,15 +13,15 @@ import static org.assertj.core.api.Assertions.assertThat;
 import org.eclipse.hawkbit.repository.model.Target;
 import org.junit.Test;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 /**
  * Test the remote entity events.
  */
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("Test TargetCreatedEvent, TargetUpdatedEvent and CancelTargetAssignmentEvent")
+@Story("Test TargetCreatedEvent, TargetUpdatedEvent and CancelTargetAssignmentEvent")
 public class TargetEventTest extends AbstractRemoteEntityEventTest<Target> {
 
     @Test

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetTagEventTest.java

@@ -11,15 +11,15 @@ package org.eclipse.hawkbit.repository.event.remote.entity;
 import org.eclipse.hawkbit.repository.model.TargetTag;
 import org.junit.Test;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 /**
  * Test the remote entity events.
  */
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("Test TargetTagCreatedEvent and TargetTagUpdateEvent")
+@Story("Test TargetTagCreatedEvent and TargetTagUpdateEvent")
 public class TargetTagEventTest extends AbstractRemoteEntityEventTest<TargetTag> {
 
     @Test

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/ActionTest.java

@@ -14,12 +14,12 @@ import org.eclipse.hawkbit.repository.jpa.model.JpaAction;
 import org.eclipse.hawkbit.repository.model.Action.ActionType;
 import org.junit.Test;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Unit Tests - Repository")
+@Feature("Unit Tests - Repository")
-@Stories("Deployment Management")
+@Story("Deployment Management")
 public class ActionTest {
 
     @Test

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/ArtifactManagementTest.java

@@ -40,15 +40,15 @@ import org.junit.Test;
 
 import com.google.common.collect.Lists;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 /**
  * Test class for {@link ArtifactManagement}.
  */
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("Artifact Management")
+@Story("Artifact Management")
 public class ArtifactManagementTest extends AbstractJpaIntegrationTest {
 
     @Test

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/ControllerManagementTest.java

@@ -61,13 +61,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Step;
+import io.qameta.allure.Step;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("Controller Management")
+@Story("Controller Management")
 public class ControllerManagementTest extends AbstractJpaIntegrationTest {
 
     @Autowired

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DeploymentManagementTest.java

@@ -72,17 +72,17 @@ import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 /**
  * Test class testing the functionality of triggering a deployment of
  * {@link DistributionSet}s to {@link Target}s.
  *
  */
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("Deployment Management")
+@Story("Deployment Management")
 public class DeploymentManagementTest extends AbstractJpaIntegrationTest {
     private EventHandlerStub eventHandlerStub;
 

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DistributionSetManagementTest.java

@@ -56,17 +56,17 @@ import org.springframework.data.domain.PageRequest;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Step;
+import io.qameta.allure.Step;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 /**
  * {@link DistributionSetManagement} tests.
  *
  */
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("DistributionSet Management")
+@Story("DistributionSet Management")
 public class DistributionSetManagementTest extends AbstractJpaIntegrationTest {
 
     @Test

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DistributionSetTagManagementTest.java

@@ -32,16 +32,16 @@ import org.eclipse.hawkbit.repository.test.matcher.Expect;
 import org.eclipse.hawkbit.repository.test.matcher.ExpectEvents;
 import org.junit.Test;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 /**
  * {@link DistributionSetTagManagement} tests.
  *
  */
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("DistributionSet Tag Management")
+@Story("DistributionSet Tag Management")
 public class DistributionSetTagManagementTest extends AbstractJpaIntegrationTest {
 
     @Test

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DistributionSetTypeManagementTest.java

@@ -37,17 +37,17 @@ import org.junit.Test;
 
 import com.google.common.collect.Sets;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Step;
+import io.qameta.allure.Step;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 /**
  * {@link DistributionSetManagement} tests.
  *
  */
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("DistributionSet Management")
+@Story("DistributionSet Management")
 public class DistributionSetTypeManagementTest extends AbstractJpaIntegrationTest {
     @Test
     @Description("Verifies that management get access react as specfied on calls for non existing entities by means "

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/HawkBitEclipseLinkJpaDialectTest.java

@@ -21,16 +21,16 @@ import org.junit.Test;
 import org.springframework.dao.ConcurrencyFailureException;
 import org.springframework.dao.UncategorizedDataAccessException;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 /**
  * Mapping tests for {@link HawkBitEclipseLinkJpaDialect}.
  *
  */
-@Features("Unit Tests - Repository")
+@Feature("Unit Tests - Repository")
-@Stories("Exception handling")
+@Story("Exception handling")
 public class HawkBitEclipseLinkJpaDialectTest {
     private final HawkBitEclipseLinkJpaDialect hawkBitEclipseLinkJpaDialectUnderTest = new HawkBitEclipseLinkJpaDialect();
 

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/LazyControllerManagementTest.java

@@ -22,12 +22,12 @@ import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.TestPropertySource;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("Controller Management")
+@Story("Controller Management")
 @TestPropertySource(locations = "classpath:/jpa-test.properties", properties = {
         "hawkbit.server.repository.eagerPollPersistence=false",
         "hawkbit.server.repository.pollPersistenceFlushTime=1000" })

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/RolloutGroupManagementTest.java

@@ -22,12 +22,12 @@ import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("Rollout Management")
+@Story("Rollout Management")
 public class RolloutGroupManagementTest extends AbstractJpaIntegrationTest {
 
     @Test

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/RolloutManagementTest.java

@@ -76,20 +76,16 @@ import org.springframework.data.domain.Slice;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import io.qameta.allure.Description;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import io.qameta.allure.Feature;
-
+import io.qameta.allure.Step;
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Story;
-import ru.yandex.qatools.allure.annotations.Features;
-import ru.yandex.qatools.allure.annotations.Step;
-import ru.yandex.qatools.allure.annotations.Stories;
-import ru.yandex.qatools.allure.annotations.Title;
 
 /**
  * Junit tests for RolloutManagment.
  */
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("Rollout Management")
+@Story("Rollout Management")
 public class RolloutManagementTest extends AbstractJpaIntegrationTest {
 
     @Before
@@ -298,7 +294,7 @@ public class RolloutManagementTest extends AbstractJpaIntegrationTest {
     }
 
     @Test
-    @Title("Deleting targets of a rollout")
+    // @Title("Deleting targets of a rollout")
     @Description("Verfiying that next group is started when targets of the group have been deleted.")
     public void checkRunningRolloutsStartsNextGroupIfTargetsDeleted() {
 

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/SoftwareModuleManagementTest.java

@@ -48,12 +48,12 @@ import org.springframework.data.domain.PageRequest;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("Software Module Management")
+@Story("Software Module Management")
 public class SoftwareModuleManagementTest extends AbstractJpaIntegrationTest {
 
     @Test

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/SoftwareModuleTypeManagementTest.java

@@ -25,12 +25,12 @@ import org.eclipse.hawkbit.repository.test.matcher.Expect;
 import org.eclipse.hawkbit.repository.test.matcher.ExpectEvents;
 import org.junit.Test;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("Software Module Management")
+@Story("Software Module Management")
 public class SoftwareModuleTypeManagementTest extends AbstractJpaIntegrationTest {
 
     @Test

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/SystemManagementTest.java

@@ -22,12 +22,12 @@ import org.eclipse.hawkbit.repository.report.model.TenantUsage;
 import org.eclipse.hawkbit.repository.test.util.WithSpringAuthorityRule;
 import org.junit.Test;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("System Management")
+@Story("System Management")
 public class SystemManagementTest extends AbstractJpaIntegrationTest {
 
     @Test

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetFilterQueryManagementTest.java

@@ -37,16 +37,16 @@ import org.junit.Test;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 /**
  * Test class for {@link TargetFilterQueryManagement}.
  * 
  */
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("Target Filter Query Management")
+@Story("Target Filter Query Management")
 public class TargetFilterQueryManagementTest extends AbstractJpaIntegrationTest {
 
     @Test

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetManagementSearchTest.java

@@ -33,13 +33,13 @@ import org.springframework.data.domain.Slice;
 import com.google.common.collect.Lists;
 import com.google.common.primitives.Ints;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Step;
+import io.qameta.allure.Step;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("Target Management Searches")
+@Story("Target Management Searches")
 public class TargetManagementSearchTest extends AbstractJpaIntegrationTest {
 
     @Test

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetManagementTest.java

@@ -59,13 +59,13 @@ import org.springframework.data.domain.PageRequest;
 
 import com.google.common.collect.Iterables;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Step;
+import io.qameta.allure.Step;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("Target Management")
+@Story("Target Management")
 public class TargetManagementTest extends AbstractJpaIntegrationTest {
 
     private static final String WHITESPACE_ERROR = "target with whitespaces in controller id should not be created";

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetTagManagementTest.java

@@ -35,17 +35,17 @@ import org.eclipse.hawkbit.repository.test.matcher.Expect;
 import org.eclipse.hawkbit.repository.test.matcher.ExpectEvents;
 import org.junit.Test;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Step;
+import io.qameta.allure.Step;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 /**
  * Test class for {@link TargetTagManagement}.
  *
  */
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("Target Tag Management")
+@Story("Target Tag Management")
 public class TargetTagManagementTest extends AbstractJpaIntegrationTest {
 
     @Test

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TenantConfigurationManagementTest.java

@@ -26,12 +26,12 @@ import org.junit.Test;
 import org.springframework.context.EnvironmentAware;
 import org.springframework.core.env.Environment;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("Tenant Configuration Management")
+@Story("Tenant Configuration Management")
 public class TenantConfigurationManagementTest extends AbstractJpaIntegrationTest implements EnvironmentAware {
 
     private Environment environment = null;

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/autoassign/AutoAssignCheckerTest.java

@@ -27,17 +27,17 @@ import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Slice;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Step;
+import io.qameta.allure.Step;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 /**
  * Test class for {@link AutoAssignChecker}.
  *
  */
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("Auto assign checker")
+@Story("Auto assign checker")
 public class AutoAssignCheckerTest extends AbstractJpaIntegrationTest {
 
     @Autowired

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/autocleanup/AutoActionCleanupTest.java

@@ -26,16 +26,16 @@ import org.eclipse.hawkbit.repository.model.Target;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 /**
  * Test class for {@link AutoActionCleanup}.
  *
  */
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("Action cleanup handler")
+@Story("Action cleanup handler")
 public class AutoActionCleanupTest extends AbstractJpaIntegrationTest {
 
     @Autowired

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/autocleanup/AutoCleanupSchedulerTest.java

@@ -19,16 +19,16 @@ import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.integration.support.locks.LockRegistry;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 /**
  * Test class for {@link AutoCleanupScheduler}.
  *
  */
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("Auto cleanup scheduler")
+@Story("Auto cleanup scheduler")
 public class AutoCleanupSchedulerTest extends AbstractJpaIntegrationTest {
 
     private final AtomicInteger counter = new AtomicInteger();

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/event/RepositoryEntityEventTest.java

@@ -38,12 +38,12 @@ import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.event.EventListener;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("Entity Events")
+@Story("Entity Events")
 @SpringApplicationConfiguration(classes = RepositoryTestConfiguration.class)
 public class RepositoryEntityEventTest extends AbstractJpaIntegrationTest {
 

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/model/EntityInterceptorListenerTest.java

@@ -18,15 +18,15 @@ import org.eclipse.hawkbit.repository.model.Target;
 import org.junit.After;
 import org.junit.Test;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 /**
  * Test the entity listener interceptor.
  */
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("Entity Listener Interceptor")
+@Story("Entity Listener Interceptor")
 public class EntityInterceptorListenerTest extends AbstractJpaIntegrationTest {
 
     @After

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/model/ModelEqualsHashcodeTest.java

@@ -14,12 +14,12 @@ import org.eclipse.hawkbit.repository.jpa.AbstractJpaIntegrationTest;
 import org.eclipse.hawkbit.repository.model.SoftwareModuleType;
 import org.junit.Test;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Unit Tests - Repository")
+@Feature("Unit Tests - Repository")
-@Stories("Repository Model")
+@Story("Repository Model")
 public class ModelEqualsHashcodeTest extends AbstractJpaIntegrationTest {
 
     @Test

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLActionFieldsTest.java

@@ -25,12 +25,12 @@ import org.junit.Test;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Slice;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("RSQL filter actions")
+@Story("RSQL filter actions")
 public class RSQLActionFieldsTest extends AbstractJpaIntegrationTest {
 
     private JpaTarget target;

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLDistributionSetFieldTest.java

@@ -24,12 +24,12 @@ import org.junit.Test;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("RSQL filter distribution set")
+@Story("RSQL filter distribution set")
 public class RSQLDistributionSetFieldTest extends AbstractJpaIntegrationTest {
 
     @Before

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLDistributionSetMetadataFieldsTest.java

@@ -24,12 +24,12 @@ import org.junit.Test;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("RSQL filter distribution set metadata")
+@Story("RSQL filter distribution set metadata")
 public class RSQLDistributionSetMetadataFieldsTest extends AbstractJpaIntegrationTest {
 
     private Long distributionSetId;

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLRolloutGroupFields.java

@@ -22,12 +22,12 @@ import org.junit.Test;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("RSQL filter rollout group")
+@Story("RSQL filter rollout group")
 public class RSQLRolloutGroupFields extends AbstractJpaIntegrationTest {
 
     private Long rolloutGroupId;

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLSoftwareModuleFieldTest.java

@@ -21,12 +21,12 @@ import org.junit.Test;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("RSQL filter software module")
+@Story("RSQL filter software module")
 public class RSQLSoftwareModuleFieldTest extends AbstractJpaIntegrationTest {
 
     @Before

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLSoftwareModuleMetadataFieldsTest.java

@@ -25,12 +25,12 @@ import org.springframework.data.domain.PageRequest;
 
 import com.google.common.collect.Lists;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("RSQL filter software module metadata")
+@Story("RSQL filter software module metadata")
 public class RSQLSoftwareModuleMetadataFieldsTest extends AbstractJpaIntegrationTest {
 
     private Long softwareModuleId;

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLSoftwareModuleTypeFieldsTest.java

@@ -18,12 +18,12 @@ import org.junit.Test;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("RSQL filter software module test type")
+@Story("RSQL filter software module test type")
 public class RSQLSoftwareModuleTypeFieldsTest extends AbstractJpaIntegrationTest {
 
     @Test

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLTagFieldsTest.java

@@ -20,12 +20,12 @@ import org.junit.Test;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("RSQL filter target and distribution set tags")
+@Story("RSQL filter target and distribution set tags")
 public class RSQLTagFieldsTest extends AbstractJpaIntegrationTest {
 
     @Before

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLTargetFieldTest.java

@@ -26,12 +26,12 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.data.domain.Page;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("RSQL filter target")
+@Story("RSQL filter target")
 public class RSQLTargetFieldTest extends AbstractJpaIntegrationTest {
 
     private Target target;

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLUtilityTest.java

@@ -49,13 +49,13 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.springframework.orm.jpa.vendor.Database;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 @RunWith(PowerMockRunner.class)
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("RSQL search utility")
+@Story("RSQL search utility")
 @PrepareForTest(TimestampCalculator.class)
 // TODO: fully document tests -> @Description for long text and reasonable
 // method name as short text

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RsqlParserValidationOracleTest.java

@@ -21,12 +21,12 @@ import org.eclipse.hawkbit.repository.rsql.ValidationOracleContext;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("RSQL filter suggestion")
+@Story("RSQL filter suggestion")
 public class RsqlParserValidationOracleTest extends AbstractJpaIntegrationTest {
 
     @Autowired

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/VirtualPropertyResolverTest.java

@@ -28,12 +28,12 @@ import org.mockito.Spy;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Unit Tests - Repository")
+@Feature("Unit Tests - Repository")
-@Stories("Placeholder resolution for virtual properties")
+@Story("Placeholder resolution for virtual properties")
 @RunWith(PowerMockRunner.class)
 @PrepareForTest(TimestampCalculator.class)
 public class VirtualPropertyResolverTest {

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/specifications/SpecificationsBuilderTest.java

@@ -30,12 +30,12 @@ import org.junit.Test;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.domain.Specifications;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Unit Tests - Repository")
+@Feature("Unit Tests - Repository")
-@Stories("Specifications builder")
+@Story("Specifications builder")
 public class SpecificationsBuilderTest {
 
     @Test

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/tenancy/MultiTenancyEntityTest.java

@@ -24,9 +24,9 @@ import org.junit.Test;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Slice;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 /**
  * Multi-Tenancy tests which testing the CRUD operations of entities that all
@@ -34,8 +34,8 @@ import ru.yandex.qatools.allure.annotations.Stories;
  * belonging to the current tenant.
  *
  */
-@Features("Component Tests - Repository")
+@Feature("Component Tests - Repository")
-@Stories("Multi Tenancy")
+@Story("Multi Tenancy")
 public class MultiTenancyEntityTest extends AbstractJpaIntegrationTest {
 
     @Test

hawkbit-rest/hawkbit-ddi-resource/pom.xml

@@ -118,8 +118,8 @@
          <scope>test</scope>
       </dependency>
       <dependency>
-         <groupId>ru.yandex.qatools.allure</groupId>
+         <groupId>io.qameta.allure</groupId>
-         <artifactId>allure-junit-adaptor</artifactId>
+         <artifactId>allure-junit4</artifactId>
          <scope>test</scope>
       </dependency>
      <dependency>

hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiArtifactDownloadTest.java

@@ -48,15 +48,15 @@ import org.springframework.test.web.servlet.MvcResult;
 import com.google.common.base.Charsets;
 import com.google.common.net.HttpHeaders;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 /**
  * Test artifact downloads from the controller.
  */
-@Features("Component Tests - Direct Device Integration API")
+@Feature("Component Tests - Direct Device Integration API")
-@Stories("Artifact Download Resource")
+@Story("Artifact Download Resource")
 @SpringApplicationConfiguration(classes = DownloadTestConfiguration.class)
 public class DdiArtifactDownloadTest extends AbstractDDiApiIntegrationTest {
 

hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiCancelActionTest.java

@@ -33,15 +33,15 @@ import org.eclipse.hawkbit.rest.util.MockMvcResultPrinter;
 import org.junit.Test;
 import org.springframework.http.MediaType;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 /**
  * Test cancel action from the controller.
  */
-@Features("Component Tests - Direct Device Integration API")
+@Feature("Component Tests - Direct Device Integration API")
-@Stories("Cancel Action Resource")
+@Story("Cancel Action Resource")
 public class DdiCancelActionTest extends AbstractDDiApiIntegrationTest {
 
     @Test

hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiConfigDataTest.java

@@ -35,17 +35,17 @@ import org.springframework.test.context.ActiveProfiles;
 
 import com.google.common.collect.Maps;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Step;
+import io.qameta.allure.Step;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 /**
  * Test config data from the controller.
  */
 @ActiveProfiles({ "im", "test" })
-@Features("Component Tests - Direct Device Integration API")
+@Feature("Component Tests - Direct Device Integration API")
-@Stories("Config Data Resource")
+@Story("Config Data Resource")
 public class DdiConfigDataTest extends AbstractDDiApiIntegrationTest {
 
     private static final String KEY_TOO_LONG = "123456789012345678901234567890123";

hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiDeploymentBaseTest.java

@@ -56,15 +56,15 @@ import org.springframework.test.web.servlet.MvcResult;
 
 import com.jayway.jsonpath.JsonPath;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 /**
  * Test deployment base from the controller.
  */
-@Features("Component Tests - Direct Device Integration API")
+@Feature("Component Tests - Direct Device Integration API")
-@Stories("Deployment Action Resource")
+@Story("Deployment Action Resource")
 public class DdiDeploymentBaseTest extends AbstractDDiApiIntegrationTest {
 
     private static final String HTTP_LOCALHOST = "http://localhost:8080/";

hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiRootControllerTest.java

@@ -60,16 +60,16 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.ResultActions;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Step;
+import io.qameta.allure.Step;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 /**
  * Test the root controller resources.
  */
-@Features("Component Tests - Direct Device Integration API")
+@Feature("Component Tests - Direct Device Integration API")
-@Stories("Root Poll Resource")
+@Story("Root Poll Resource")
 public class DdiRootControllerTest extends AbstractDDiApiIntegrationTest {
 
     private static final String TARGET_COMPLETED_INSTALLATION_MSG = "Target completed installation.";

hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DosFilterTest.java

@@ -33,17 +33,17 @@ import org.springframework.web.context.WebApplicationContext;
 
 import com.google.common.net.HttpHeaders;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 /**
  * Test potential DOS attack scenarios and check if the filter prevents them.
  *
  */
 @ActiveProfiles({ "test" })
-@Features("Component Tests - REST Security")
+@Feature("Component Tests - REST Security")
-@Stories("Denial of Service protection filter")
+@Story("Denial of Service protection filter")
 public class DosFilterTest extends AbstractDDiApiIntegrationTest {
 
     @Override

hawkbit-rest/hawkbit-mgmt-api/pom.xml

@@ -40,8 +40,8 @@
          <scope>test</scope>
       </dependency>
       <dependency>
-         <groupId>ru.yandex.qatools.allure</groupId>
+         <groupId>io.qameta.allure</groupId>
-         <artifactId>allure-junit-adaptor</artifactId>
+         <artifactId>allure-junit4</artifactId>
          <scope>test</scope>
       </dependency>
    </dependencies>

hawkbit-rest/hawkbit-mgmt-api/src/test/java/org/eclipse/hawkbit/mgmt/json/model/PagedListTest.java

@@ -16,12 +16,12 @@ import java.util.List;
 
 import org.junit.Test;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Unit Tests - Management API")
+@Feature("Unit Tests - Management API")
-@Stories("Paged List Handling")
+@Story("Paged List Handling")
 public class PagedListTest {
 
     @Test

hawkbit-rest/hawkbit-mgmt-resource/pom.xml

@@ -121,8 +121,8 @@
          <scope>test</scope>
       </dependency>
       <dependency>
-         <groupId>ru.yandex.qatools.allure</groupId>
+         <groupId>io.qameta.allure</groupId>
-         <artifactId>allure-junit-adaptor</artifactId>
+         <artifactId>allure-junit4</artifactId>
          <scope>test</scope>
       </dependency>
       <dependency>

hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetResourceTest.java

@@ -55,13 +55,13 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import com.jayway.jsonpath.JsonPath;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Step;
+import io.qameta.allure.Step;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Component Tests - Management API")
+@Feature("Component Tests - Management API")
-@Stories("Distribution Set Resource")
+@Story("Distribution Set Resource")
 public class MgmtDistributionSetResourceTest extends AbstractManagementApiIntegrationTest {
 
     @Test

hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTagResourceTest.java

@@ -42,12 +42,12 @@ import org.junit.Test;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.ResultActions;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Component Tests - Management API")
+@Feature("Component Tests - Management API")
-@Stories("Distribution Set Tag Resource")
+@Story("Distribution Set Tag Resource")
 public class MgmtDistributionSetTagResourceTest extends AbstractManagementApiIntegrationTest {
 
     private static final String DISTRIBUTIONSETTAGS_ROOT = "http://localhost"

hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTypeResourceTest.java

@@ -44,17 +44,17 @@ import org.springframework.test.web.servlet.MvcResult;
 
 import com.jayway.jsonpath.JsonPath;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Step;
+import io.qameta.allure.Step;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 /**
  * Test for {@link MgmtDistributionSetTypeResource}.
  *
  */
-@Features("Component Tests - Management API")
+@Feature("Component Tests - Management API")
-@Stories("Distribution Set Type Resource")
+@Story("Distribution Set Type Resource")
 public class MgmtDistributionSetTypeResourceTest extends AbstractManagementApiIntegrationTest {
 
     @Test

hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDownloadResourceTest.java

@@ -23,12 +23,12 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Component Tests - Management API")
+@Feature("Component Tests - Management API")
-@Stories("Download Resource")
+@Story("Download Resource")
 public class MgmtDownloadResourceTest extends AbstractManagementApiIntegrationTest {
 
     @Autowired

hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRolloutResourceTest.java

@@ -49,16 +49,16 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.http.MediaType;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Step;
+import io.qameta.allure.Step;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 /**
  * Tests for covering the {@link MgmtRolloutResource}.
  */
-@Features("Component Tests - Management API")
+@Feature("Component Tests - Management API")
-@Stories("Rollout Resource")
+@Story("Rollout Resource")
 public class MgmtRolloutResourceTest extends AbstractManagementApiIntegrationTest {
 
     private static final String HREF_ROLLOUT_PREFIX = "http://localhost/rest/v1/rollouts/";

hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleResourceTest.java

@@ -59,16 +59,16 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.jayway.jsonpath.JsonPath;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 /**
  * Tests for {@link MgmtSoftwareModuleResource} {@link RestController}.
  *
  */
-@Features("Component Tests - Management API")
+@Feature("Component Tests - Management API")
-@Stories("Software Module Resource")
+@Story("Software Module Resource")
 @TestPropertySource(properties = { "hawkbit.server.security.dos.maxArtifactSize=100000",
         "hawkbit.server.security.dos.maxArtifactStorage=500000" })
 public class MgmtSoftwareModuleResourceTest extends AbstractManagementApiIntegrationTest {

hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleTypeResourceTest.java

@@ -38,16 +38,16 @@ import org.springframework.test.web.servlet.MvcResult;
 
 import com.jayway.jsonpath.JsonPath;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 /**
  * Test for {@link MgmtSoftwareModuleTypeResource}.
  *
  */
-@Features("Component Tests - Management API")
+@Feature("Component Tests - Management API")
-@Stories("Software Module Type Resource")
+@Story("Software Module Type Resource")
 public class MgmtSoftwareModuleTypeResourceTest extends AbstractManagementApiIntegrationTest {
 
     @Test

hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetFilterQueryResourceTest.java

@@ -32,16 +32,16 @@ import org.junit.Test;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MvcResult;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 /**
  * Spring MVC Tests against the MgmtTargetResource.
  *
  */
-@Features("Component Tests - Management API")
+@Feature("Component Tests - Management API")
-@Stories("Target Filter Query Resource")
+@Story("Target Filter Query Resource")
 public class MgmtTargetFilterQueryResourceTest extends AbstractManagementApiIntegrationTest {
 
     private static final String JSON_PATH_ROOT = "$";

hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetResourceTest.java

@@ -66,17 +66,17 @@ import org.springframework.test.web.servlet.MvcResult;
 
 import com.jayway.jsonpath.JsonPath;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Step;
+import io.qameta.allure.Step;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 /**
  * Spring MVC Tests against the MgmtTargetResource.
  *
  */
-@Features("Component Tests - Management API")
+@Feature("Component Tests - Management API")
-@Stories("Target Resource")
+@Story("Target Resource")
 public class MgmtTargetResourceTest extends AbstractManagementApiIntegrationTest {
 
     private static final String TARGET_DESCRIPTION_TEST = "created in test";

hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetTagResourceTest.java

@@ -40,16 +40,16 @@ import org.junit.Test;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.ResultActions;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 /**
  * Spring MVC Tests against the MgmtTargetTagResource.
  *
  */
-@Features("Component Tests - Management API")
+@Feature("Component Tests - Management API")
-@Stories("Target Tag Resource")
+@Story("Target Tag Resource")
 public class MgmtTargetTagResourceTest extends AbstractManagementApiIntegrationTest {
 
     private static final String TARGETTAGS_ROOT = "http://localhost" + MgmtRestConstants.TARGET_TAG_V1_REQUEST_MAPPING

hawkbit-rest/hawkbit-rest-core/pom.xml

@@ -75,8 +75,8 @@
          <scope>test</scope>
       </dependency>
       <dependency>
-         <groupId>ru.yandex.qatools.allure</groupId>
+         <groupId>io.qameta.allure</groupId>
-         <artifactId>allure-junit-adaptor</artifactId>
+         <artifactId>allure-junit4</artifactId>
          <scope>test</scope>
       </dependency>
       <dependency>

hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/filter/ExcludePathAwareShallowETagFilterTest.java

@@ -28,11 +28,11 @@ import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Unit Tests - Security")
+@Feature("Unit Tests - Security")
-@Stories("Exclude path aware shallow ETag filter")
+@Story("Exclude path aware shallow ETag filter")
 @RunWith(MockitoJUnitRunner.class)
 public class ExcludePathAwareShallowETagFilterTest {
 

hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/json/model/ExceptionInfoTest.java

@@ -15,12 +15,12 @@ import java.util.List;
 
 import org.junit.Test;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
-@Features("Unit Tests - Management API")
+@Feature("Unit Tests - Management API")
-@Stories("Error Handling")
+@Story("Error Handling")
 public class ExceptionInfoTest {
 
     @Test

hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/SortUtilityTest.java

@@ -20,15 +20,15 @@ import org.eclipse.hawkbit.rest.exception.SortParameterUnsupportedFieldException
 import org.junit.Test;
 import org.springframework.data.domain.Sort.Order;
 
-import ru.yandex.qatools.allure.annotations.Description;
+import io.qameta.allure.Description;
-import ru.yandex.qatools.allure.annotations.Features;
+import io.qameta.allure.Feature;
-import ru.yandex.qatools.allure.annotations.Stories;
+import io.qameta.allure.Story;
 
 /**
  *
  */
-@Features("Component Tests - Management API")
+@Feature("Component Tests - Management API")
-@Stories("Sorting parameter")
+@Story("Sorting parameter")
 public class SortUtilityTest {
     private static final String SORT_PARAM_1 = "NAME:ASC";
     private static final String SORT_PARAM_2 = "NAME:ASC, DESCRIPTION:DESC";