Skip to content

Commit 6fd5e11

Browse files
committed
work
1 parent 2149fbc commit 6fd5e11

File tree

2 files changed

+32
-20
lines changed

2 files changed

+32
-20
lines changed

pom.xml

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,13 @@
419419
<type>maven-plugin</type>
420420
<scope>compile</scope>
421421
</dependency>
422-
422+
<dependency>
423+
<groupId>org.apache.maven.plugins</groupId>
424+
<artifactId>maven-install-plugin</artifactId>
425+
<version>${maven-install-plugin.version}</version>
426+
<type>maven-plugin</type>
427+
<scope>compile</scope>
428+
</dependency>
423429
<dependency>
424430
<groupId>org.apache.maven.plugins</groupId>
425431
<artifactId>maven-site-plugin</artifactId>
@@ -665,6 +671,13 @@
665671
</dependency>
666672

667673
<!--
674+
<dependency>
675+
<groupId>org.apache.maven.doxia</groupId>
676+
<artifactId>doxia-module-markdown</artifactId>
677+
<scope>compile</scope>
678+
</dependency>
679+
-->
680+
668681
<dependency>
669682
<groupId>org.apache.maven.plugins</groupId>
670683
<artifactId>maven-enforcer-plugin</artifactId>
@@ -678,20 +691,20 @@
678691
<scope>compile</scope>
679692
</dependency>
680693
<dependency>
681-
<groupId>com.dkanejs.maven.plugins</groupId>
682-
<artifactId>docker-compose-maven-plugin</artifactId>
694+
<groupId>org.apache.maven.plugins</groupId>
695+
<artifactId>maven-dependency-plugin</artifactId>
683696
<type>maven-plugin</type>
684697
<scope>compile</scope>
685698
</dependency>
686699
<dependency>
687-
<groupId>org.apache.maven.plugins</groupId>
688-
<artifactId>maven-clean-plugin</artifactId>
700+
<groupId>com.dkanejs.maven.plugins</groupId>
701+
<artifactId>docker-compose-maven-plugin</artifactId>
689702
<type>maven-plugin</type>
690703
<scope>compile</scope>
691704
</dependency>
692705
<dependency>
693706
<groupId>org.apache.maven.plugins</groupId>
694-
<artifactId>maven-dependency-plugin</artifactId>
707+
<artifactId>maven-clean-plugin</artifactId>
695708
<type>maven-plugin</type>
696709
<scope>compile</scope>
697710
</dependency>
@@ -707,7 +720,6 @@
707720
<type>maven-plugin</type>
708721
<scope>compile</scope>
709722
</dependency>
710-
711723
<dependency>
712724
<groupId>org.apache.maven.plugins</groupId>
713725
<artifactId>maven-site-plugin</artifactId>
@@ -716,19 +728,19 @@
716728
</dependency>
717729
<dependency>
718730
<groupId>org.apache.maven.plugins</groupId>
719-
<artifactId>maven-project-info-reports-plugin</artifactId>
731+
<artifactId>maven-checkstyle-plugin</artifactId>
720732
<type>maven-plugin</type>
721733
<scope>compile</scope>
722734
</dependency>
723735
<dependency>
724736
<groupId>org.apache.maven.plugins</groupId>
725-
<artifactId>maven-jxr-plugin</artifactId>
737+
<artifactId>maven-project-info-reports-plugin</artifactId>
726738
<type>maven-plugin</type>
727739
<scope>compile</scope>
728740
</dependency>
729741
<dependency>
730742
<groupId>org.apache.maven.plugins</groupId>
731-
<artifactId>maven-checkstyle-plugin</artifactId>
743+
<artifactId>maven-jxr-plugin</artifactId>
732744
<type>maven-plugin</type>
733745
<scope>compile</scope>
734746
</dependency>
@@ -763,11 +775,11 @@
763775
<scope>compile</scope>
764776
</dependency>
765777
<dependency>
766-
<groupId>org.apache.maven.doxia</groupId>
767-
<artifactId>doxia-module-markdown</artifactId>
778+
<groupId>org.apache.maven.plugins</groupId>
779+
<artifactId>maven-install-plugin</artifactId>
780+
<type>maven-plugin</type>
768781
<scope>compile</scope>
769782
</dependency>
770-
-->
771783
</dependencies>
772784

773785
<build>

src/main/docker/docker-compose.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: '3.3'
33

44
services:
55
simpleworklist_dbmaster:
6-
image: postgres:12.4
6+
image: postgres:13.3
77
restart: always
88
networks:
99
- net
@@ -13,27 +13,27 @@ services:
1313
POSTGRES_PASSWORD: simpleworklistpwd
1414
POSTGRES_USER: simpleworklist
1515
POSTGRES_DB: simpleworklist
16-
CHARSET: UTF8
16+
CHARSET: de_DE.UTF-8
1717
PGPORT: 5432
1818
simpleworklist_dbref:
19-
image: postgres:12.4
19+
image: postgres:13.3
2020
restart: always
2121
networks:
2222
- net
2323
ports:
24-
- 5464:5432
24+
- 5464:5464
2525
environment:
2626
POSTGRES_PASSWORD: simpleworklistrefpwd
2727
POSTGRES_USER: simpleworklistref
2828
POSTGRES_DB: simpleworklistref
29-
CHARSET: UTF8
30-
PGPORT: 5432
29+
CHARSET: de_DE.UTF-8
30+
PGPORT: 5464
3131
simpleworklist_adminer:
3232
image: adminer:4.7.4
3333
restart: always
3434
networks:
3535
- net
3636
ports:
37-
- 4000:8080
37+
- 4000:40003
3838
networks:
3939
net:

0 commit comments

Comments
 (0)