Skip to content

Commit de2cfa2

Browse files
authored
LIBS-1229 - updated dependencies/image (compatibility to apple-chips) (#19)
1 parent 41b14b6 commit de2cfa2

File tree

5 files changed

+25
-34
lines changed

5 files changed

+25
-34
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<dependency>
1515
<groupId>com.avides.springboot.springtainer</groupId>
1616
<artifactId>springtainer-mongodb</artifactId>
17-
<version>1.3.0</version>
17+
<version>1.4.0</version>
1818
<scope>test</scope>
1919
</dependency>
2020
```
@@ -25,7 +25,7 @@ Properties consumed (in `bootstrap.properties`):
2525

2626
- `embedded.container.mongodb.enabled` (default is `true`)
2727
- `embedded.container.mongodb.startup-timeout` (default is `30`)
28-
- `embedded.container.mongodb.docker-image` (default is `mongo:4.0.28`)
28+
- `embedded.container.mongodb.docker-image` (default is `mongo:4.2.24`)
2929
- `embedded.container.mongodb.port` (default is `27017`)
3030

3131
Properties provided (in `application-it.properties`):

pom.xml

Lines changed: 19 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<groupId>com.avides.springboot.springtainer</groupId>
55
<artifactId>springtainer-mongodb</artifactId>
6-
<version>1.3.0</version>
6+
<version>1.4.0</version>
77

88
<name>springtainer-mongodb</name>
99
<description>MongoDB test-container</description>
@@ -24,6 +24,10 @@
2424
<name>Julian Eggers</name>
2525
<email>[email protected]</email>
2626
</developer>
27+
<developer>
28+
<name>Martin Schumacher</name>
29+
<email>[email protected]</email>
30+
</developer>
2731
</developers>
2832

2933
<scm>
@@ -47,24 +51,23 @@
4751
<maven-failsafe-plugin.version>3.0.0-M5</maven-failsafe-plugin.version>
4852
<maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version>
4953
<maven-release-plugin.version>3.0.0-M5</maven-release-plugin.version>
50-
<maven-scm-provider-gitexe.version>1.11.2</maven-scm-provider-gitexe.version>
54+
<maven-scm-provider-gitexe.version>1.11.3</maven-scm-provider-gitexe.version>
5155
<exists-maven-plugin.version>0.6.0</exists-maven-plugin.version>
5256
<github-release-plugin.version>1.4.0</github-release-plugin.version>
5357
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
5458
<!-- Spring -->
55-
<spring.version>5.3.15</spring.version>
56-
<spring-boot.version>2.6.3</spring-boot.version>
59+
<spring.version>5.3.24</spring.version>
60+
<spring-boot.version>2.6.14</spring-boot.version>
5761
<!-- Other -->
58-
<springtainer-common.version>1.3.1</springtainer-common.version>
59-
<lombok.version>1.18.22</lombok.version>
60-
<spring-data-mongodb.version>3.3.1</spring-data-mongodb.version>
61-
<mongodb-driver-sync.version>4.4.1</mongodb-driver-sync.version>
62+
<springtainer-common.version>1.4.0</springtainer-common.version>
63+
<lombok.version>1.18.26</lombok.version>
64+
<spring-data-mongodb.version>3.3.10</spring-data-mongodb.version>
65+
<mongodb-driver-sync.version>4.4.2</mongodb-driver-sync.version>
6266
<!-- Testing -->
63-
<jacoco.version>0.8.7</jacoco.version>
64-
<powermock.version>2.0.9</powermock.version>
65-
<easymock.version>4.3</easymock.version>
66-
<assertj-core.version>3.22.0</assertj-core.version>
67-
<logback-classic.version>1.2.10</logback-classic.version>
67+
<jacoco.version>0.8.8</jacoco.version>
68+
<junit.version>4.13.2</junit.version>
69+
<assertj-core.version>3.24.2</assertj-core.version>
70+
<logback-classic.version>1.2.11</logback-classic.version>
6871
</properties>
6972

7073
<dependencies>
@@ -107,21 +110,9 @@
107110
<scope>test</scope>
108111
</dependency>
109112
<dependency>
110-
<groupId>org.easymock</groupId>
111-
<artifactId>easymock</artifactId>
112-
<version>${easymock.version}</version>
113-
<scope>test</scope>
114-
</dependency>
115-
<dependency>
116-
<groupId>org.powermock</groupId>
117-
<artifactId>powermock-module-junit4</artifactId>
118-
<version>${powermock.version}</version>
119-
<scope>test</scope>
120-
</dependency>
121-
<dependency>
122-
<groupId>org.powermock</groupId>
123-
<artifactId>powermock-api-easymock</artifactId>
124-
<version>${powermock.version}</version>
113+
<groupId>junit</groupId>
114+
<artifactId>junit</artifactId>
115+
<version>${junit.version}</version>
125116
<scope>test</scope>
126117
</dependency>
127118
<dependency>

src/main/java/com/avides/springboot/springtainer/mongodb/MongodbProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ public class MongodbProperties extends AbstractEmbeddedContainerProperties
2020

2121
public MongodbProperties()
2222
{
23-
setDockerImage("mongo:4.0.28");
23+
setDockerImage("mongo:4.2.24");
2424
}
2525
}

src/main/resources/META-INF/additional-spring-configuration-metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"name": "embedded.container.mongodb.docker-image",
1818
"type": "java.lang.String",
1919
"description": "Docker-image",
20-
"defaultValue": "mongo:4.0.28"
20+
"defaultValue": "mongo:4.2.24"
2121
},
2222
{
2323
"name": "embedded.container.mongodb.port",

src/test/java/com/avides/springboot/springtainer/mongodb/MongodbPropertiesTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ public class MongodbPropertiesTest
1010
@Test
1111
public void testDefaults()
1212
{
13-
MongodbProperties properties = new MongodbProperties();
13+
var properties = new MongodbProperties();
1414
assertTrue(properties.isEnabled());
1515
assertEquals(30, properties.getStartupTimeout());
16-
assertEquals("mongo:4.0.28", properties.getDockerImage());
16+
assertEquals("mongo:4.2.24", properties.getDockerImage());
1717

1818
assertEquals(27017, properties.getPort());
1919
}

0 commit comments

Comments
 (0)