Skip to content

Commit ac942ec

Browse files
author
Henrik Adamski
authored
LIBS-730 - Update dependencies (#15)
1 parent 36039ad commit ac942ec

File tree

9 files changed

+95
-62
lines changed

9 files changed

+95
-62
lines changed

.github/workflows/nightly.yml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@ name: nightly
22

33
on:
44
schedule:
5-
- cron: 0 0 * * *
5+
- cron: 0 0 * * 1
66

77
jobs:
8-
build:
8+
nightly:
9+
timeout-minutes: 30
10+
911
runs-on: ubuntu-latest
1012

1113
steps:
@@ -14,10 +16,11 @@ jobs:
1416
with:
1517
java-version: 11
1618

17-
- uses: actions/checkout@v1
19+
- name: checkout
20+
uses: actions/checkout@v2
1821

1922
- name: caching
20-
uses: actions/cache@v1
23+
uses: actions/cache@v2
2124
with:
2225
path: ~/.m2/repository
2326
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -34,12 +37,13 @@ jobs:
3437

3538
- name: sonar-analyse
3639
env:
37-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
40+
SONAR_HOST: ${{ secrets.OS_SONAR_HOST_URL }}
41+
SONAR_TOKEN: ${{ secrets.OS_SONAR_TOKEN }}
3842
run: |
3943
export SONAR_ORGANIZATION=$(echo ${GITHUB_REPOSITORY} | cut -d / -f 1)
4044
mvn sonar:sonar \
41-
-Dsonar.host.url=https://sonarcloud.io/ \
42-
-Dsonar.login=${{ secrets.SONAR_TOKEN }} \
45+
-Dsonar.host.url=${SONAR_HOST} \
46+
-Dsonar.login=${SONAR_TOKEN} \
4347
-Dsonar.organization=${SONAR_ORGANIZATION} \
4448
-Dsonar.projectKey=${GITHUB_REPOSITORY//\//_} \
4549
-Dsonar.java.binaries=./target/classes

.github/workflows/release.yml

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,50 +7,56 @@ on:
77

88
jobs:
99
release:
10+
timeout-minutes: 30
11+
1012
env:
11-
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
1213
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
14+
1315
runs-on: ubuntu-latest
16+
1417
steps:
1518
- name: setup-java
1619
uses: actions/setup-java@v1
1720
with:
1821
java-version: 11
22+
server-id: ossrh
23+
server-username: OSSRH_USERNAME
24+
server-password: OSSRH_PASSWORD
25+
26+
- name: setup-github-release
27+
run: sed -i -e 's/<\/servers>/<server><id>github<\/id><username>x-access-token<\/username><password>${GITHUB_TOKEN}<\/password><\/server><\/servers>/g' /home/runner/.m2/settings.xml
1928

2029
- name: setup-gpg
2130
env:
22-
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
23-
run: echo ${GPG_PRIVATE_KEY} | base64 --decode | gpg --batch --import
24-
25-
- name: setup-maven-settings
26-
uses: s4u/maven-settings-action@v1
27-
with:
28-
servers: '[{"id": "ossrh", "username": "${OSSRH_USERNAME}", "password": "${OSSRH_PASSWORD}"}, {"id": "github", "username": "x-access-token", "password": "${GITHUB_TOKEN}"}]'
29-
properties: '[{"gpg.executable": "gpg"}, {"gpg.passphrase": "${GPG_PASSPHRASE}"}]'
30-
sonatypeSnapshots: true
31+
GPG_PRIVATE_KEY: ${{ secrets.OS_GPG_PRIVATE_KEY }}
32+
run: cat <(echo -e "${GPG_PRIVATE_KEY}") | gpg --batch --import
3133

3234
- name: checkout
33-
uses: actions/checkout@v1
35+
uses: actions/checkout@v2
3436

3537
- name: caching
36-
uses: actions/cache@v1
38+
uses: actions/cache@v2
3739
with:
3840
path: ~/.m2/repository
3941
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
4042
restore-keys: ${{ runner.os }}-maven-
4143

4244
- name: deploy
4345
env:
44-
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
45-
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
46-
run: mvn clean verify deploy
46+
OSSRH_USERNAME: ${{ secrets.OS_OSSRH_USERNAME }}
47+
OSSRH_PASSWORD: ${{ secrets.OS_OSSRH_PASSWORD }}
48+
GPG_PASSPHRASE: ${{ secrets.OS_GPG_PASSPHRASE }}
49+
run: mvn deploy -Dmaven.wagon.http.pool=false -Dgpg.executable=gpg -Dgpg.passphrase=${GPG_PASSPHRASE}
4750

4851
- name: sonar-analyse
52+
env:
53+
SONAR_HOST: ${{ secrets.OS_SONAR_HOST_URL }}
54+
SONAR_TOKEN: ${{ secrets.OS_SONAR_TOKEN }}
4955
run: |
5056
export SONAR_ORGANIZATION=$(echo ${GITHUB_REPOSITORY} | cut -d / -f 1)
5157
mvn sonar:sonar \
52-
-Dsonar.host.url=https://sonarcloud.io/ \
53-
-Dsonar.login=${{ secrets.SONAR_TOKEN }} \
58+
-Dsonar.host.url=${SONAR_HOST} \
59+
-Dsonar.login=${SONAR_TOKEN} \
5460
-Dsonar.organization=${SONAR_ORGANIZATION} \
5561
-Dsonar.projectKey=${GITHUB_REPOSITORY//\//_} \
5662
-Dsonar.java.binaries=./target/classes

.github/workflows/review.yml

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ on:
55
types: [opened, synchronize]
66

77
jobs:
8-
build:
8+
review:
9+
timeout-minutes: 30
10+
911
runs-on: ubuntu-latest
1012

1113
steps:
@@ -15,10 +17,17 @@ jobs:
1517
java-version: 11
1618

1719
- name: checkout
18-
uses: actions/checkout@v1
20+
uses: actions/checkout@v2
21+
22+
- name: project-version-check
23+
uses: avides/actions-project-version-check@v1
24+
with:
25+
token: ${{ secrets.GITHUB_TOKEN }}
26+
file-to-check: pom.xml
27+
additional-files-to-check: README.md
1928

2029
- name: caching
21-
uses: actions/cache@v1
30+
uses: actions/cache@v2
2231
with:
2332
path: ~/.m2/repository
2433
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -35,17 +44,19 @@ jobs:
3544

3645
- name: sonar-analyse
3746
env:
47+
SONAR_HOST: ${{ secrets.OS_SONAR_HOST_URL }}
48+
SONAR_TOKEN: ${{ secrets.OS_SONAR_TOKEN }}
3849
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3950
run: |
40-
export GITHUB_PULL_REQUEST=$(cut -d / -f 3 <(echo ${GITHUB_REF}))
4151
export SONAR_ORGANIZATION=$(echo ${GITHUB_REPOSITORY} | cut -d / -f 1)
4252
mvn sonar:sonar \
43-
-Dsonar.host.url=https://sonarcloud.io/ \
44-
-Dsonar.login=${{ secrets.SONAR_TOKEN }} \
53+
-Dsonar.host.url=${SONAR_HOST} \
54+
-Dsonar.login=${SONAR_TOKEN} \
4555
-Dsonar.organization=${SONAR_ORGANIZATION} \
4656
-Dsonar.projectKey=${GITHUB_REPOSITORY//\//_} \
47-
-Dsonar.pullrequest.key=${GITHUB_PULL_REQUEST} \
48-
-Dsonar.pullrequest.branch=${GITHUB_REF} \
57+
-Dsonar.pullrequest.key=${{ github.event.number }} \
58+
-Dsonar.pullrequest.branch=${{ github.event.pull_request.head.ref }} \
59+
-Dsonar.scm.revision=${{ github.event.pull_request.head.sha }} \
4960
-Dsonar.java.binaries=./target/classes
5061
5162
- name: pom-analyse

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# springtainer-mongodb
22

3-
[![Maven Central](https://img.shields.io/maven-metadata/v/http/central.maven.org/maven2/com/avides/springboot/springtainer/springtainer-mongodb/maven-metadata.xml.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.avides.springboot.springtainer%22%20AND%20a%3A%22springtainer-mongodb%22)
3+
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.avides.springboot.springtainer/springtainer-mongodb/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.avides.springboot.springtainer/springtainer-mongodb)
44
[![Build](https://github.com/springtainer/springtainer-mongodb/workflows/release/badge.svg)](https://github.com/springtainer/springtainer-mongodb/actions)
55
[![Nightly build](https://github.com/springtainer/springtainer-mongodb/workflows/nightly/badge.svg)](https://github.com/springtainer/springtainer-mongodb/actions)
66
[![Coverage report](https://sonarcloud.io/api/project_badges/measure?project=springtainer_springtainer-mongodb&metric=coverage)](https://sonarcloud.io/dashboard?id=springtainer_springtainer-mongodb)
@@ -12,7 +12,7 @@
1212
<dependency>
1313
<groupId>com.avides.springboot.springtainer</groupId>
1414
<artifactId>springtainer-mongodb</artifactId>
15-
<version>1.0.0</version>
15+
<version>1.1.0</version>
1616
<scope>test</scope>
1717
</dependency>
1818
```
@@ -21,7 +21,7 @@
2121
Properties consumed (in `bootstrap.properties`):
2222
- `embedded.container.mongodb.enabled` (default is `true`)
2323
- `embedded.container.mongodb.startup-timeout` (default is `30`)
24-
- `embedded.container.mongodb.docker-image` (default is `mongo:4.0.13`)
24+
- `embedded.container.mongodb.docker-image` (default is `mongo:4.0.18`)
2525
- `embedded.container.mongodb.port` (default is `27017`)
2626

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

pom.xml

Lines changed: 32 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33

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

88
<name>springtainer-mongodb</name>
99
<description>MongoDB test-container</description>
1010
<url>https://github.com/springtainer/springtainer-mongodb</url>
1111
<organization>
1212
<name>AVIDES Media AG</name>
13-
<url>http://www.avides.com</url>
13+
<url>https://www.avides.com</url>
1414
</organization>
1515
<licenses>
1616
<license>
@@ -38,36 +38,42 @@
3838
<maven.build.timestamp.format>dd.MM.yyyy HH:mm</maven.build.timestamp.format>
3939
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4040
<java.version>11</java.version>
41-
<!-- Testing -->
42-
<jacoco.version>0.8.5</jacoco.version>
43-
<powermock.version>2.0.4</powermock.version>
44-
<easymock.version>4.1</easymock.version>
4541
<!-- Build -->
4642
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
47-
<maven-source-plugin.version>3.2.0</maven-source-plugin.version>
48-
<maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
43+
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
44+
<maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
4945
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
50-
<maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
51-
<maven-failsafe-plugin.version>2.22.1</maven-failsafe-plugin.version>
52-
<maven-enforcer-plugin.version>3.0.0-M2</maven-enforcer-plugin.version>
53-
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
46+
<maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
47+
<maven-failsafe-plugin.version>3.0.0-M4</maven-failsafe-plugin.version>
48+
<maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version>
49+
<maven-release-plugin.version>3.0.0-M1</maven-release-plugin.version>
5450
<maven-scm-provider-gitexe.version>1.11.2</maven-scm-provider-gitexe.version>
55-
<exists-maven-plugin.version>0.0.6</exists-maven-plugin.version>
51+
<exists-maven-plugin.version>0.3.0</exists-maven-plugin.version>
5652
<github-release-plugin.version>1.4.0</github-release-plugin.version>
5753
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
5854
<!-- Spring -->
59-
<spring.version>5.2.1.RELEASE</spring.version>
60-
<spring-boot.version>2.2.1.RELEASE</spring-boot.version>
55+
<spring.version>5.2.7.RELEASE</spring.version>
56+
<spring-boot.version>2.3.1.RELEASE</spring-boot.version>
6157
<!-- Other -->
62-
<springtainer-common.version>1.0.0</springtainer-common.version>
58+
<springtainer-common.version>1.1.2</springtainer-common.version>
59+
<lombok.version>1.18.12</lombok.version>
60+
<spring-data-mongodb.version>3.0.1.RELEASE</spring-data-mongodb.version>
61+
<mongo-java-driver.version>3.12.5</mongo-java-driver.version>
62+
<!-- Testing -->
63+
<jacoco.version>0.8.5</jacoco.version>
64+
<powermock.version>2.0.7</powermock.version>
65+
<easymock.version>4.2</easymock.version>
66+
<assertj-core.version>3.16.1</assertj-core.version>
67+
<logback-classic.version>1.2.3</logback-classic.version>
68+
<mongodb-driver-sync.version>4.0.4</mongodb-driver-sync.version>
6369
</properties>
6470

6571
<dependencies>
6672
<!-- Common -->
6773
<dependency>
6874
<groupId>org.projectlombok</groupId>
6975
<artifactId>lombok</artifactId>
70-
<version>1.18.10</version>
76+
<version>${lombok.version}</version>
7177
<scope>provided</scope>
7278
</dependency>
7379
<dependency>
@@ -84,15 +90,21 @@
8490
<dependency>
8591
<groupId>org.springframework.data</groupId>
8692
<artifactId>spring-data-mongodb</artifactId>
87-
<version>2.2.2.RELEASE</version>
93+
<version>${spring-data-mongodb.version}</version>
94+
<scope>provided</scope>
95+
</dependency>
96+
<dependency>
97+
<groupId>org.mongodb</groupId>
98+
<artifactId>mongodb-driver-sync</artifactId>
99+
<version>${mongodb-driver-sync.version}</version>
88100
<scope>provided</scope>
89101
</dependency>
90102

91103
<!-- Testing -->
92104
<dependency>
93105
<groupId>org.assertj</groupId>
94106
<artifactId>assertj-core</artifactId>
95-
<version>3.14.0</version>
107+
<version>${assertj-core.version}</version>
96108
<scope>test</scope>
97109
</dependency>
98110
<dependency>
@@ -135,7 +147,7 @@
135147
<dependency>
136148
<groupId>ch.qos.logback</groupId>
137149
<artifactId>logback-classic</artifactId>
138-
<version>1.2.3</version>
150+
<version>${logback-classic.version}</version>
139151
<scope>test</scope>
140152
</dependency>
141153
</dependencies>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
import com.avides.springboot.springtainer.common.container.AbstractBuildingEmbeddedContainer;
1818
import com.avides.springboot.springtainer.common.container.EmbeddedContainer;
19-
import com.mongodb.MongoClient;
20-
import com.mongodb.ServerAddress;
19+
import com.mongodb.client.MongoClient;
20+
import com.mongodb.client.MongoClients;
2121

2222
@Configuration
2323
@ConditionalOnProperty(name = "embedded.container.mongodb.enabled", matchIfMissing = true)
@@ -32,7 +32,7 @@ public EmbeddedContainer mongodbContainer(ConfigurableEnvironment environment, M
3232
return new MongodbContainer("mongodb", environment, properties);
3333
}
3434

35-
public class MongodbContainer extends AbstractBuildingEmbeddedContainer<MongodbProperties>
35+
public static class MongodbContainer extends AbstractBuildingEmbeddedContainer<MongodbProperties>
3636
{
3737
public MongodbContainer(String service, ConfigurableEnvironment environment, MongodbProperties properties)
3838
{
@@ -51,7 +51,7 @@ protected Map<String, Object> providedProperties()
5151
@Override
5252
protected boolean isContainerReady(MongodbProperties properties)
5353
{
54-
try (MongoClient mongoClient = new MongoClient(new ServerAddress(getContainerHost(), getContainerPort(properties.getPort()))))
54+
try (MongoClient mongoClient = MongoClients.create("mongodb://" + getContainerHost() + ":" + getContainerPort(properties.getPort())))
5555
{
5656
return mongoClient.getDatabase("admin") != null;
5757
}

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.13");
23+
setDockerImage("mongo:4.0.18");
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.13"
20+
"defaultValue": "mongo:4.0.18"
2121
},
2222
{
2323
"name": "embedded.container.mongodb.port",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public void testDefaults()
1313
MongodbProperties properties = new MongodbProperties();
1414
assertTrue(properties.isEnabled());
1515
assertEquals(30, properties.getStartupTimeout());
16-
assertEquals("mongo:4.0.13", properties.getDockerImage());
16+
assertEquals("mongo:4.0.18", properties.getDockerImage());
1717

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

0 commit comments

Comments
 (0)