Skip to content

Commit 36039ad

Browse files
hennes-maertinsjulian-eggers
hennes-maertins
authored and
julian-eggers
committed
LIBS-612 - Rename to springtainer-mongodb (#14)
1 parent 7c1207f commit 36039ad

File tree

11 files changed

+48
-48
lines changed

11 files changed

+48
-48
lines changed

‎.github/workflows/release.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,18 @@ jobs:
3939
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
4040
restore-keys: ${{ runner.os }}-maven-
4141

42+
- name: deploy
43+
env:
44+
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
45+
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
46+
run: mvn clean verify deploy
47+
4248
- name: sonar-analyse
4349
run: |
4450
export SONAR_ORGANIZATION=$(echo ${GITHUB_REPOSITORY} | cut -d / -f 1)
45-
mvn clean verify sonar:sonar \
51+
mvn sonar:sonar \
4652
-Dsonar.host.url=https://sonarcloud.io/ \
4753
-Dsonar.login=${{ secrets.SONAR_TOKEN }} \
4854
-Dsonar.organization=${SONAR_ORGANIZATION} \
4955
-Dsonar.projectKey=${GITHUB_REPOSITORY//\//_} \
5056
-Dsonar.java.binaries=./target/classes
51-
52-
- name: deploy
53-
env:
54-
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
55-
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
56-
run: mvn deploy

‎.github/workflows/review.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ jobs:
4545
-Dsonar.organization=${SONAR_ORGANIZATION} \
4646
-Dsonar.projectKey=${GITHUB_REPOSITORY//\//_} \
4747
-Dsonar.pullrequest.key=${GITHUB_PULL_REQUEST} \
48+
-Dsonar.pullrequest.branch=${GITHUB_REF} \
4849
-Dsonar.java.binaries=./target/classes
4950
5051
- name: pom-analyse

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2018 springboot-testcontainer
3+
Copyright (c) 2018 springtainer
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎README.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
# springboot-testcontainer-mongodb
1+
# springtainer-mongodb
22

3-
[![Maven Central](https://img.shields.io/maven-metadata/v/http/central.maven.org/maven2/com/avides/springboot/testcontainer/springboot-testcontainer-mongodb/maven-metadata.xml.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.avides.springboot.testcontainer%22%20AND%20a%3A%22springboot-testcontainer-mongodb%22)
4-
[![Build](https://github.com/springboot-testcontainer/springboot-testcontainer-mongodb/workflows/release/badge.svg)](https://github.com/springboot-testcontainer/springboot-testcontainer-mongodb/actions)
5-
[![Nightly build](https://github.com/springboot-testcontainer/springboot-testcontainer-mongodb/workflows/nightly/badge.svg)](https://github.com/springboot-testcontainer/springboot-testcontainer-mongodb/actions)
6-
[![Coverage report](https://sonarcloud.io/api/project_badges/measure?project=springboot-testcontainer_springboot-testcontainer-mongodb&metric=coverage)](https://sonarcloud.io/dashboard?id=springboot-testcontainer_springboot-testcontainer-mongodb)
7-
[![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=springboot-testcontainer_springboot-testcontainer-mongodb&metric=alert_status)](https://sonarcloud.io/dashboard?id=springboot-testcontainer_springboot-testcontainer-mongodb)
8-
[![Technical dept](https://sonarcloud.io/api/project_badges/measure?project=springboot-testcontainer_springboot-testcontainer-mongodb&metric=sqale_index)](https://sonarcloud.io/dashboard?id=springboot-testcontainer_springboot-testcontainer-mongodb)
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)
4+
[![Build](https://github.com/springtainer/springtainer-mongodb/workflows/release/badge.svg)](https://github.com/springtainer/springtainer-mongodb/actions)
5+
[![Nightly build](https://github.com/springtainer/springtainer-mongodb/workflows/nightly/badge.svg)](https://github.com/springtainer/springtainer-mongodb/actions)
6+
[![Coverage report](https://sonarcloud.io/api/project_badges/measure?project=springtainer_springtainer-mongodb&metric=coverage)](https://sonarcloud.io/dashboard?id=springtainer_springtainer-mongodb)
7+
[![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=springtainer_springtainer-mongodb&metric=alert_status)](https://sonarcloud.io/dashboard?id=springtainer_springtainer-mongodb)
8+
[![Technical dept](https://sonarcloud.io/api/project_badges/measure?project=springtainer_springtainer-mongodb&metric=sqale_index)](https://sonarcloud.io/dashboard?id=springtainer_springtainer-mongodb)
99

1010
### Dependency
1111
```xml
1212
<dependency>
13-
<groupId>com.avides.springboot.testcontainer</groupId>
14-
<artifactId>springboot-testcontainer-mongodb</artifactId>
15-
<version>1.0.0-RC2</version>
13+
<groupId>com.avides.springboot.springtainer</groupId>
14+
<artifactId>springtainer-mongodb</artifactId>
15+
<version>1.0.0</version>
1616
<scope>test</scope>
1717
</dependency>
1818
```
@@ -36,14 +36,14 @@ spring.data.mongodb.uri=mongodb://${embedded.container.mongodb.host}:${embedded.
3636
## Logging
3737
To reduce logging insert this into the logback-configuration:
3838
```xml
39-
<!-- Testcontainers -->
39+
<!-- Springtainer -->
4040
<logger name="com.github.dockerjava.jaxrs" level="WARN" />
4141
<logger name="com.github.dockerjava.core.command" level="WARN" />
4242
<logger name="org.apache.http" level="WARN" />
4343
```
4444

4545
## Labels
46-
The container exports multiple labels to analyze running testcontainers:
47-
- `TESTCONTAINER_SERVICE=mongodb`
48-
- `TESTCONTAINER_IMAGE=${embedded.container.mongodb.docker-image}`
49-
- `TESTCONTAINER_STARTED=$currentTimestamp`
46+
The container exports multiple labels to analyze running springtainers:
47+
- `SPRINGTAINER_SERVICE=mongodb`
48+
- `SPRINGTAINER_IMAGE=${embedded.container.mongodb.docker-image}`
49+
- `SPRINGTAINER_STARTED=$currentTimestamp`

‎pom.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
22
<modelVersion>4.0.0</modelVersion>
33

4-
<groupId>com.avides.springboot.testcontainer</groupId>
5-
<artifactId>springboot-testcontainer-mongodb</artifactId>
6-
<version>1.0.0-RC2</version>
4+
<groupId>com.avides.springboot.springtainer</groupId>
5+
<artifactId>springtainer-mongodb</artifactId>
6+
<version>1.0.0</version>
77

8-
<name>springboot-testcontainer-mongodb</name>
8+
<name>springtainer-mongodb</name>
99
<description>MongoDB test-container</description>
10-
<url>https://github.com/springboot-testcontainer/springboot-testcontainer-mongodb</url>
10+
<url>https://github.com/springtainer/springtainer-mongodb</url>
1111
<organization>
1212
<name>AVIDES Media AG</name>
1313
<url>http://www.avides.com</url>
@@ -27,9 +27,9 @@
2727
</developers>
2828

2929
<scm>
30-
<url>https://github.com/springboot-testcontainer/springboot-testcontainer-mongodb</url>
31-
<connection>scm:git:https://github.com/springboot-testcontainer/springboot-testcontainer-mongodb.git</connection>
32-
<developerConnection>scm:git:https://github.com/springboot-testcontainer/springboot-testcontainer-mongodb.git</developerConnection>
30+
<url>https://github.com/springtainer/springtainer-mongodb</url>
31+
<connection>scm:git:https://github.com/springtainer/springtainer-mongodb.git</connection>
32+
<developerConnection>scm:git:https://github.com/springtainer/springtainer-mongodb.git</developerConnection>
3333
</scm>
3434

3535
<properties>
@@ -59,7 +59,7 @@
5959
<spring.version>5.2.1.RELEASE</spring.version>
6060
<spring-boot.version>2.2.1.RELEASE</spring-boot.version>
6161
<!-- Other -->
62-
<springboot-testcontainer-common.version>1.0.0-RC2</springboot-testcontainer-common.version>
62+
<springtainer-common.version>1.0.0</springtainer-common.version>
6363
</properties>
6464

6565
<dependencies>
@@ -71,9 +71,9 @@
7171
<scope>provided</scope>
7272
</dependency>
7373
<dependency>
74-
<groupId>com.avides.springboot.testcontainer</groupId>
75-
<artifactId>springboot-testcontainer-common</artifactId>
76-
<version>${springboot-testcontainer-common.version}</version>
74+
<groupId>com.avides.springboot.springtainer</groupId>
75+
<artifactId>springtainer-common</artifactId>
76+
<version>${springtainer-common.version}</version>
7777
</dependency>
7878
<dependency>
7979
<groupId>org.springframework.boot</groupId>

‎src/main/java/com/avides/springboot/testcontainer/mongodb/EmbeddedMongodbContainerAutoConfiguration.java renamed to ‎src/main/java/com/avides/springboot/springtainer/mongodb/EmbeddedMongodbContainerAutoConfiguration.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.avides.springboot.testcontainer.mongodb;
1+
package com.avides.springboot.springtainer.mongodb;
22

3-
import static com.avides.springboot.testcontainer.mongodb.MongodbProperties.BEAN_NAME;
3+
import static com.avides.springboot.springtainer.mongodb.MongodbProperties.BEAN_NAME;
44

55
import java.util.HashMap;
66
import java.util.Map;
@@ -14,8 +14,8 @@
1414
import org.springframework.core.Ordered;
1515
import org.springframework.core.env.ConfigurableEnvironment;
1616

17-
import com.avides.springboot.testcontainer.common.container.AbstractBuildingEmbeddedContainer;
18-
import com.avides.springboot.testcontainer.common.container.EmbeddedContainer;
17+
import com.avides.springboot.springtainer.common.container.AbstractBuildingEmbeddedContainer;
18+
import com.avides.springboot.springtainer.common.container.EmbeddedContainer;
1919
import com.mongodb.MongoClient;
2020
import com.mongodb.ServerAddress;
2121

‎src/main/java/com/avides/springboot/testcontainer/mongodb/MongodbProperties.java renamed to ‎src/main/java/com/avides/springboot/springtainer/mongodb/MongodbProperties.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.avides.springboot.testcontainer.mongodb;
1+
package com.avides.springboot.springtainer.mongodb;
22

33
import org.springframework.boot.context.properties.ConfigurationProperties;
44

5-
import com.avides.springboot.testcontainer.common.container.AbstractEmbeddedContainerProperties;
5+
import com.avides.springboot.springtainer.common.container.AbstractEmbeddedContainerProperties;
66

77
import lombok.Getter;
88
import lombok.Setter;

‎src/main/resources/META-INF/spring.factories

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
org.springframework.cloud.bootstrap.BootstrapConfiguration=\
2-
com.avides.springboot.testcontainer.mongodb.EmbeddedMongodbContainerAutoConfiguration
2+
com.avides.springboot.springtainer.mongodb.EmbeddedMongodbContainerAutoConfiguration

‎src/test/java/com/avides/springboot/testcontainer/mongodb/AbstractIT.java renamed to ‎src/test/java/com/avides/springboot/springtainer/mongodb/AbstractIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.avides.springboot.testcontainer.mongodb;
1+
package com.avides.springboot.springtainer.mongodb;
22

33
import org.junit.runner.RunWith;
44
import org.springframework.beans.factory.annotation.Autowired;

‎src/test/java/com/avides/springboot/testcontainer/mongodb/EmbeddedMongodbContainerAutoConfigurationIT.java renamed to ‎src/test/java/com/avides/springboot/springtainer/mongodb/EmbeddedMongodbContainerAutoConfigurationIT.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
package com.avides.springboot.testcontainer.mongodb;
1+
package com.avides.springboot.springtainer.mongodb;
22

33
import static org.assertj.core.api.Assertions.assertThat;
4+
import static org.junit.Assert.assertEquals;
5+
import static org.junit.Assert.assertNull;
46

57
import org.junit.Test;
68
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
79
import org.springframework.context.annotation.Configuration;
810
import org.springframework.data.annotation.Id;
911

10-
import static org.junit.Assert.assertEquals;
11-
import static org.junit.Assert.assertNull;
12-
1312
import lombok.AllArgsConstructor;
1413
import lombok.Getter;
1514
import lombok.Setter;

‎src/test/java/com/avides/springboot/testcontainer/mongodb/MongodbPropertiesTest.java renamed to ‎src/test/java/com/avides/springboot/springtainer/mongodb/MongodbPropertiesTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.avides.springboot.testcontainer.mongodb;
1+
package com.avides.springboot.springtainer.mongodb;
22

33
import static org.junit.Assert.assertEquals;
44
import static org.junit.Assert.assertTrue;

0 commit comments

Comments
 (0)