Skip to content
This repository was archived by the owner on Feb 26, 2021. It is now read-only.

Feature/it #25

Merged
merged 2 commits into from
Aug 2, 2020
Merged

Feature/it #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b3032c
Pom, refactor jacoco version to property, fix issue related to it tes…
Remeic Aug 2, 2020
68d24e1
Fix, upgrade Redis version from 3.0.2 to 6.0.6
Remeic Aug 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 4 additions & 13 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<codehaus.version>3.0.0</codehaus.version>
<fabric.version>0.27.2</fabric.version>
<jacoco.version>0.8.3</jacoco.version>
<jedis.version>3.1.0</jedis.version>
<!-- For SonarQube -->
<sonar.coverage.jacoco.xmlReportPaths>
${project.reporting.outputDirectory}/jacoco/jacoco.xml
Expand Down Expand Up @@ -105,7 +106,7 @@
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
<version>3.1.0</version>
<version>${jedis.version}</version>
<type>jar</type>
<scope>compile</scope>
<exclusions>
Expand Down Expand Up @@ -227,19 +228,9 @@
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
<execution>
<id>e2e-tests</id>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
<configuration>
<excludes>
<exclude>**/*IT.java</exclude>
</excludes>
<includes>
<include>**/*E2E.java</include>
<include>**/*IT.java</include>
</includes>
</configuration>
</execution>
Expand Down Expand Up @@ -378,7 +369,7 @@
<dockerHost>unix:///var/run/docker.sock</dockerHost>
<images>
<image>
<name>redis:3.0.2</name>
<name>redis:6.0.6</name>
<run>
<ports>
<port>6379:6379</port>
Expand Down
2 changes: 1 addition & 1 deletion src/e2e/java/dev/justgiulio/passwordmanager/view/swing/AccountSwingAppE2E.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public class AccountSwingAppE2E extends AssertJSwingJUnitTestCase {

@SuppressWarnings("rawtypes")
@ClassRule
public static final GenericContainer redis = new GenericContainer("redis:3.0.2").withExposedPorts(6379);
public static final GenericContainer redis = new GenericContainer("redis:6.0.6").withExposedPorts(6379);

private FrameFixture window;
private Jedis redisClient;
Expand Down
2 changes: 1 addition & 1 deletion src/it/java/dev/justgiulio/passwordmanager/controller/AccountControllerIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public class AccountControllerIT {

@SuppressWarnings("rawtypes")
@ClassRule
public static final GenericContainer redis = new GenericContainer("redis:3.0.2").withExposedPorts(6379);
public static final GenericContainer redis = new GenericContainer("redis:6.0.6").withExposedPorts(6379);

public Jedis jedis;
public AccountRedisRepository accountRedisRepository;
Expand Down