Skip to content

Commit 18c5251

Browse files
thomaswoehlkethomaswoehlke
committed
Fixed #79, Fixed #80 
1 parent 18c14a0 commit 18c5251

File tree

5 files changed

+134
-32
lines changed

5 files changed

+134
-32
lines changed

‎.gitignore‎

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,32 @@
1-
/target
2-
/simpleworklist.iml
3-
/.classpath
4-
/.project
5-
/.idea
6-
/.settings
7-
/SimpleWorklist.mdzip.bak
8-
/mvn.log
9-
/org.woehlke.simpleworklist.entities.Project
10-
/org.woehlke.simpleworklist.entities.Task
11-
/simpleworklist
12-
/simpleworklistsearch
13-
/simpleworklistsearch2
14-
/pom.xml.releaseBackup
15-
/release.properties
16-
/etc/mavenlog.txt
17-
/etc/mavenlog1.txt
18-
/etc/mavenlog2.txt
19-
/etc/mavenlog3.txt
20-
target/
21-
.env
22-
.idea/
23-
*.iml
24-
.classpath
25-
.project
26-
.settings/
27-
docs/tmp/
28-
docs/java-getting-started/
29-
docs/deploying-spring-boot-apps/
30-
setenv.sh
31-
1+
/target
2+
/simpleworklist.iml
3+
/.classpath
4+
/.project
5+
/.idea
6+
/.settings
7+
/SimpleWorklist.mdzip.bak
8+
/mvn.log
9+
/org.woehlke.simpleworklist.entities.Project
10+
/org.woehlke.simpleworklist.entities.Task
11+
/simpleworklist
12+
/simpleworklistsearch
13+
/simpleworklistsearch2
14+
/pom.xml.releaseBackup
15+
/release.properties
16+
/etc/mavenlog.txt
17+
/etc/mavenlog1.txt
18+
/etc/mavenlog2.txt
19+
/etc/mavenlog3.txt
20+
target/
21+
.env
22+
.idea/
23+
*.iml
24+
.classpath
25+
.project
26+
.settings/
27+
docs/tmp/
28+
docs/java-getting-started/
29+
docs/deploying-spring-boot-apps/
30+
setenv.sh
31+
32+
/etc/pom.xml

‎docker-compose.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Use postgres/example user/password credentials
2+
version: '3.3'
3+
4+
services:
5+
6+
db:
7+
image: postgres:11.6
8+
restart: always
9+
ports:
10+
- 5433:5432
11+
environment:
12+
POSTGRES_USER: simpleworklist
13+
POSTGRES_PASSWORD: simpleworklistpwd
14+
POSTGRES_DB: simpleworklist
15+
CHARSET: UTF8
16+
PGPORT: 5433
17+
18+
adminer:
19+
image: adminer:4.7.4
20+
restart: always
21+
ports:
22+
- 4000:8080

‎docker-start.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/usr/bin/env bash
2+
3+
./mvnw docker-compose:up
4+

‎docker-stop.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/usr/bin/env bash
2+
3+
./mvnw docker-compose:down
4+

‎pom.xml‎

Lines changed: 72 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@
4747

4848

4949
<properties>
50-
<java.version>1.8</java.version>
50+
<java.version>13</java.version>
51+
<version.maven>3.6.3</version.maven>
5152
<spring-boot-admin.version>2.2.1</spring-boot-admin.version>
5253
<maven.scm.version>1.11.2</maven.scm.version>
5354
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
@@ -59,6 +60,7 @@
5960
<maven-surefire-report-plugin.version>3.0.0-M4</maven-surefire-report-plugin.version>
6061
<versions-maven-plugin.version>2.7</versions-maven-plugin.version>
6162
<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
63+
<version.docker-compose-maven-plugin>3.0.0</version.docker-compose-maven-plugin>
6264
</properties>
6365

6466
<dependencyManagement>
@@ -239,6 +241,15 @@
239241

240242
<build>
241243
<finalName>${project.artifactId}</finalName>
244+
<pluginManagement>
245+
<plugins>
246+
<plugin>
247+
<groupId>com.dkanejs.maven.plugins</groupId>
248+
<artifactId>docker-compose-maven-plugin</artifactId>
249+
<version>${version.docker-compose-maven-plugin}</version>
250+
</plugin>
251+
</plugins>
252+
</pluginManagement>
242253
<plugins>
243254
<plugin>
244255
<groupId>org.apache.maven.plugins</groupId>
@@ -254,6 +265,66 @@
254265
<showDeprecation>true</showDeprecation>
255266
</configuration>
256267
</plugin>
268+
<plugin>
269+
<groupId>org.apache.maven.plugins</groupId>
270+
<artifactId>maven-enforcer-plugin</artifactId>
271+
<executions>
272+
<execution>
273+
<id>enforce-versions</id>
274+
<goals>
275+
<goal>enforce</goal>
276+
</goals>
277+
<configuration>
278+
<rules>
279+
<bannedPlugins>
280+
<level>ERROR</level>
281+
<excludes>
282+
<exclude>org.apache.maven.plugins:maven-verifier-plugin</exclude>
283+
</excludes>
284+
<message>Please consider using the maven-invoker-plugin (http://maven.apache.org/plugins/maven-invoker-plugin/)!</message>
285+
</bannedPlugins>
286+
<requireMavenVersion>
287+
<version>${version.maven}</version>
288+
</requireMavenVersion>
289+
<requireJavaVersion>
290+
<version>${java.version}</version>
291+
</requireJavaVersion>
292+
</rules>
293+
</configuration>
294+
</execution>
295+
</executions>
296+
</plugin>
297+
<plugin>
298+
<groupId>org.apache.maven.plugins</groupId>
299+
<artifactId>maven-invoker-plugin</artifactId>
300+
<executions>
301+
<execution>
302+
<id>integration-test</id>
303+
<goals>
304+
<goal>install</goal>
305+
<goal>run</goal>
306+
</goals>
307+
<configuration>
308+
<settingsFile>src/it/settings.xml</settingsFile>
309+
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
310+
<localRepositoryPath>${project.build.directory}/it-repo</localRepositoryPath>
311+
<postBuildHookScript>verify</postBuildHookScript> <!-- no extension required -->
312+
</configuration>
313+
</execution>
314+
</executions>
315+
</plugin>
316+
<plugin>
317+
<groupId>com.dkanejs.maven.plugins</groupId>
318+
<artifactId>docker-compose-maven-plugin</artifactId>
319+
<configuration>
320+
<composeFile>${project.basedir}/docker-compose.yml</composeFile>
321+
<verbose>true</verbose>
322+
<removeImages>true</removeImages>
323+
<removeVolumes>true</removeVolumes>
324+
<ignorePullFailures>true</ignorePullFailures>
325+
<detachedMode>true</detachedMode>
326+
</configuration>
327+
</plugin>
257328
</plugins>
258329
</build>
259330

0 commit comments

Comments
 (0)