Skip to content

Commit 2c13dd0

Browse files
thomaswoehlkethomaswoehlke
authored
Merge pull request #341 from Spring-Framework-Java-Apps/master
deploy latest version
2 parents 4a4a03d + c878594 commit 2c13dd0

File tree

272 files changed

+294692
-569
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

272 files changed

+294692
-569
lines changed

‎.idea/dataSources.local.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.mvn/jvm.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
-Xmx2048m

‎.mvn/maven.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
-Dorg.slf4j.simpleLogger.showThreadName=true -Djava.awt.headless=true -DdownloadSources=true -e

‎etc/build.sh renamed to ‎build.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ function composeDown() {
1111
./mvnw docker-compose:down
1212
}
1313

14+
function showSettings() {
15+
echo $JAVA_HOME
16+
}
17+
1418
function firstSetup() {
1519
export JAVA_OPTS=$JAVA_OPTS_RUN_DEFAULT
1620
showSettings
@@ -56,9 +60,9 @@ function boot_run() {
5660

5761
function main() {
5862
# firstSetup
59-
#setupTravis
63+
setupTravis
6064
#buildJar
61-
boot_run
65+
#boot_run
6266
}
6367

6468
main

‎pom.xml

Lines changed: 130 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
<groupId>org.woehlke</groupId>
66
<artifactId>simpleworklist</artifactId>
7-
<version>2.3.49-SNAPSHOT</version>
7+
<version>2.3.54-SNAPSHOT</version>
88
<packaging>jar</packaging>
99

1010
<parent>
1111
<groupId>org.springframework.boot</groupId>
1212
<artifactId>spring-boot-starter-parent</artifactId>
13-
<version>2.7.2</version>
13+
<version>2.7.3</version>
1414
</parent>
1515

1616
<scm>
@@ -73,23 +73,19 @@
7373
<properties>
7474
<java.version>11</java.version>
7575
<version.maven>3.6.3</version.maven>
76-
<pmdVersion>6.46.0</pmdVersion>
77-
7876
<maven.compiler.source>${java.version}</maven.compiler.source>
7977
<maven.compiler.target>${java.version}</maven.compiler.target>
80-
8178
<spring-boot.repackage.layout>JAR</spring-boot.repackage.layout>
79+
<version.spring-boot-maven-plugin>${project.parent.version}</version.spring-boot-maven-plugin>
80+
<version.thymeleaf-testing>3.1.0.M2</version.thymeleaf-testing>
81+
<version.thymeleaf-spring-data-dialect>3.5.0</version.thymeleaf-spring-data-dialect>
8282

83-
<spring-boot-maven-plugin.version>${project.parent.version}</spring-boot-maven-plugin.version>
84-
85-
<thymeleaf-testing.version>3.1.0.M2</thymeleaf-testing.version>
86-
<thymeleaf-spring-data-dialect.version>3.5.0</thymeleaf-spring-data-dialect.version>
8783

8884
<!-- Webjars -->
8985
<webjars.jquery.version>3.6.0</webjars.jquery.version>
9086
<webjars.popper.js.version>2.9.3</webjars.popper.js.version>
91-
<webjars.bootstrap.version>5.1.3</webjars.bootstrap.version>
92-
<webjars.font-awesome.version>6.1.1</webjars.font-awesome.version>
87+
<webjars.bootstrap.version>5.2.0</webjars.bootstrap.version>
88+
<webjars.font-awesome.version>6.1.2</webjars.font-awesome.version>
9389
<webjars.ckeditor.version>31.0.0</webjars.ckeditor.version>
9490
<opencsv.version>5.3</opencsv.version>
9591

@@ -100,6 +96,7 @@
10096
<groovy-all.version>2.4.21</groovy-all.version>
10197
<hamcrest.version>2.2</hamcrest.version>
10298
<jsoup.version>1.14.2</jsoup.version>
99+
<pmdVersion>6.46.0</pmdVersion>
103100

104101
<!-- SCM and Releasing -->
105102
<version.org.apache.maven.scm>1.13.0</version.org.apache.maven.scm>
@@ -112,19 +109,24 @@
112109
<docker-compose-maven-plugin.ignorePullFailures>true</docker-compose-maven-plugin.ignorePullFailures>
113110
<docker-compose-maven-plugin.detachedMode>true</docker-compose-maven-plugin.detachedMode>
114111

112+
<!-- Maven Plugins -->
113+
114+
115115
<maven-release-plugin.version>3.0.0-M6</maven-release-plugin.version>
116116

117117
<!-- Maven Reports for Site -->
118-
<maven-site-plugin.version>3.12.0</maven-site-plugin.version>
119-
<maven-project-info-reports-plugin.version>3.3.0</maven-project-info-reports-plugin.version>
120-
<maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
121-
<maven-jxr-plugin.version>3.2.0</maven-jxr-plugin.version>
118+
<version.maven-site-plugin>3.12.0</version.maven-site-plugin>
119+
<version.maven-project-info-reports-plugin>3.3.0</version.maven-project-info-reports-plugin>
120+
<version.maven-checkstyle-plugin>3.1.2</version.maven-checkstyle-plugin>
121+
<version.maven-jxr-plugin>3.2.0</version.maven-jxr-plugin>
122122
<maven-pmd-plugin.version>3.17.0</maven-pmd-plugin.version>
123-
<spotbugs-maven-plugin.version>4.7.0.0</spotbugs-maven-plugin.version>
124-
<maven-surefire-report-plugin.version>3.0.0-M7</maven-surefire-report-plugin.version>
125-
<asciidoctor-maven-plugin.version>2.2.2</asciidoctor-maven-plugin.version>
126-
<doxia-module-markdown.version>1.11.1</doxia-module-markdown.version>
127-
<maven-enforcer-plugin.version>3.1.0</maven-enforcer-plugin.version>
123+
<version.spotbugs-maven-plugin>4.7.0.0</version.spotbugs-maven-plugin>
124+
<version.maven-surefire-report-plugin>3.0.0-M7</version.maven-surefire-report-plugin>
125+
<version.asciidoctor-maven-plugin>2.2.2</version.asciidoctor-maven-plugin>
126+
<version.doxia-module-markdown>1.11.1</version.doxia-module-markdown>
127+
<version.maven-enforcer-plugin>3.1.0</version.maven-enforcer-plugin>
128+
<version.plantuml-maven-plugin>1.5.2</version.plantuml-maven-plugin>
129+
<version.net.sourceforge.plantuml>1.2022.6</version.net.sourceforge.plantuml>
128130
</properties>
129131

130132
<repositories>
@@ -362,13 +364,13 @@
362364
<dependency>
363365
<groupId>org.thymeleaf</groupId>
364366
<artifactId>thymeleaf-testing</artifactId>
365-
<version>${thymeleaf-testing.version}</version>
367+
<version>${version.thymeleaf-testing}</version>
366368
<scope>test</scope>
367369
</dependency>
368370
<dependency>
369371
<groupId>io.github.jpenren</groupId>
370372
<artifactId>thymeleaf-spring-data-dialect</artifactId>
371-
<version>${thymeleaf-spring-data-dialect.version}</version>
373+
<version>${version.thymeleaf-spring-data-dialect}</version>
372374
</dependency>
373375

374376
<!-- compile -->
@@ -451,7 +453,7 @@
451453
<dependency>
452454
<groupId>org.apache.maven.plugins</groupId>
453455
<artifactId>maven-enforcer-plugin</artifactId>
454-
<version>${maven-enforcer-plugin.version}</version>
456+
<version>${version.maven-enforcer-plugin}</version>
455457
<type>maven-plugin</type>
456458
<scope>provided</scope>
457459
</dependency>
@@ -511,35 +513,35 @@
511513
<dependency>
512514
<groupId>org.springframework.boot</groupId>
513515
<artifactId>spring-boot-maven-plugin</artifactId>
514-
<version>${spring-boot-maven-plugin.version}</version>
516+
<version>${version.spring-boot-maven-plugin}</version>
515517
<type>maven-plugin</type>
516518
<scope>provided</scope>
517519
</dependency>
518520
<dependency>
519521
<groupId>org.apache.maven.plugins</groupId>
520522
<artifactId>maven-site-plugin</artifactId>
521-
<version>${maven-site-plugin.version}</version>
523+
<version>${version.maven-site-plugin}</version>
522524
<type>maven-plugin</type>
523525
<scope>provided</scope>
524526
</dependency>
525527
<dependency>
526528
<groupId>org.apache.maven.plugins</groupId>
527529
<artifactId>maven-project-info-reports-plugin</artifactId>
528-
<version>${maven-project-info-reports-plugin.version}</version>
530+
<version>${version.maven-project-info-reports-plugin}</version>
529531
<type>maven-plugin</type>
530532
<scope>provided</scope>
531533
</dependency>
532534
<dependency>
533535
<groupId>org.apache.maven.plugins</groupId>
534536
<artifactId>maven-jxr-plugin</artifactId>
535-
<version>${maven-jxr-plugin.version}</version>
537+
<version>${version.maven-jxr-plugin}</version>
536538
<type>maven-plugin</type>
537539
<scope>provided</scope>
538540
</dependency>
539541
<dependency>
540542
<groupId>org.apache.maven.plugins</groupId>
541543
<artifactId>maven-checkstyle-plugin</artifactId>
542-
<version>${maven-checkstyle-plugin.version}</version>
544+
<version>${version.maven-checkstyle-plugin}</version>
543545
<type>maven-plugin</type>
544546
<scope>provided</scope>
545547
<exclusions>
@@ -552,7 +554,7 @@
552554
<dependency>
553555
<groupId>com.github.spotbugs</groupId>
554556
<artifactId>spotbugs-maven-plugin</artifactId>
555-
<version>${spotbugs-maven-plugin.version}</version>
557+
<version>${version.spotbugs-maven-plugin}</version>
556558
<type>maven-plugin</type>
557559
<scope>provided</scope>
558560
</dependency>
@@ -579,14 +581,14 @@
579581
<dependency>
580582
<groupId>org.apache.maven.plugins</groupId>
581583
<artifactId>maven-surefire-report-plugin</artifactId>
582-
<version>${maven-surefire-report-plugin.version}</version>
584+
<version>${version.maven-surefire-report-plugin}</version>
583585
<type>maven-plugin</type>
584586
<scope>provided</scope>
585587
</dependency>
586588
<dependency>
587589
<groupId>org.asciidoctor</groupId>
588590
<artifactId>asciidoctor-maven-plugin</artifactId>
589-
<version>${asciidoctor-maven-plugin.version}</version>
591+
<version>${version.asciidoctor-maven-plugin}</version>
590592
<type>maven-plugin</type>
591593
<scope>provided</scope>
592594
</dependency>
@@ -635,7 +637,7 @@
635637
<dependency>
636638
<groupId>org.apache.maven.doxia</groupId>
637639
<artifactId>doxia-module-markdown</artifactId>
638-
<version>${doxia-module-markdown.version}</version>
640+
<version>${version.doxia-module-markdown}</version>
639641
<scope>provided</scope>
640642
</dependency>
641643

@@ -1115,7 +1117,7 @@
11151117
<plugin>
11161118
<groupId>org.apache.maven.plugins</groupId>
11171119
<artifactId>maven-enforcer-plugin</artifactId>
1118-
<version>${maven-enforcer-plugin.version}</version>
1120+
<version>${version.maven-enforcer-plugin}</version>
11191121
</plugin>
11201122
<plugin>
11211123
<groupId>org.apache.maven.plugins</groupId>
@@ -1145,7 +1147,7 @@
11451147
<plugin>
11461148
<groupId>org.springframework.boot</groupId>
11471149
<artifactId>spring-boot-maven-plugin</artifactId>
1148-
<version>${spring-boot-maven-plugin.version}</version>
1150+
<version>${version.spring-boot-maven-plugin}</version>
11491151
</plugin>
11501152
<plugin>
11511153
<groupId>org.apache.maven.plugins</groupId>
@@ -1155,22 +1157,22 @@
11551157
<plugin>
11561158
<groupId>org.apache.maven.plugins</groupId>
11571159
<artifactId>maven-project-info-reports-plugin</artifactId>
1158-
<version>${maven-project-info-reports-plugin.version}</version>
1160+
<version>${version.maven-project-info-reports-plugin}</version>
11591161
</plugin>
11601162
<plugin>
11611163
<groupId>org.apache.maven.plugins</groupId>
11621164
<artifactId>maven-jxr-plugin</artifactId>
1163-
<version>${maven-jxr-plugin.version}</version>
1165+
<version>${version.maven-jxr-plugin}</version>
11641166
</plugin>
11651167
<plugin>
11661168
<groupId>org.apache.maven.plugins</groupId>
11671169
<artifactId>maven-checkstyle-plugin</artifactId>
1168-
<version>${maven-checkstyle-plugin.version}</version>
1170+
<version>${version.maven-checkstyle-plugin}</version>
11691171
</plugin>
11701172
<plugin>
11711173
<groupId>com.github.spotbugs</groupId>
11721174
<artifactId>spotbugs-maven-plugin</artifactId>
1173-
<version>${spotbugs-maven-plugin.version}</version>
1175+
<version>${version.spotbugs-maven-plugin}</version>
11741176
</plugin>
11751177
<plugin>
11761178
<groupId>org.apache.maven.plugins</groupId>
@@ -1180,7 +1182,7 @@
11801182
<plugin>
11811183
<groupId>org.apache.maven.plugins</groupId>
11821184
<artifactId>maven-surefire-report-plugin</artifactId>
1183-
<version>${maven-surefire-report-plugin.version}</version>
1185+
<version>${version.maven-surefire-report-plugin}</version>
11841186
</plugin>
11851187
<plugin>
11861188
<groupId>org.apache.maven.plugins</groupId>
@@ -1190,7 +1192,7 @@
11901192
<plugin>
11911193
<groupId>org.asciidoctor</groupId>
11921194
<artifactId>asciidoctor-maven-plugin</artifactId>
1193-
<version>${asciidoctor-maven-plugin.version}</version>
1195+
<version>${version.asciidoctor-maven-plugin}</version>
11941196
</plugin>
11951197
<plugin>
11961198
<groupId>org.apache.maven.plugins</groupId>
@@ -1236,7 +1238,7 @@
12361238
<plugin>
12371239
<groupId>org.apache.maven.plugins</groupId>
12381240
<artifactId>maven-site-plugin</artifactId>
1239-
<version>${maven-site-plugin.version}</version>
1241+
<version>${version.maven-site-plugin}</version>
12401242
<!--
12411243
<dependencies>
12421244
<dependency>
@@ -1348,7 +1350,7 @@
13481350
<file>${project.basedir}/src/site/markdown/REQUIREMENTS_NONFUNCTIONAL.md</file>
13491351
<file>${project.basedir}/src/site/markdown/TODO.md</file>
13501352
<file>${project.basedir}/src/site/site.xml</file>
1351-
<file>${project.basedir}/etc/build.sh</file>
1353+
<file>${project.basedir}/build.sh</file>
13521354
<file>${project.basedir}/etc/run.sh</file>
13531355
<file>${project.basedir}/src/main/bash/psql.sh</file>
13541356
<file>${project.basedir}/etc/docker-start.sh</file>
@@ -1877,4 +1879,90 @@
18771879
</plugins>
18781880
</reporting>
18791881

1882+
1883+
<profiles>
1884+
1885+
<profile>
1886+
<id>war</id>
1887+
<properties>
1888+
<skip.unit.tests>false</skip.unit.tests>
1889+
<skip.integration.tests>true</skip.integration.tests>
1890+
</properties>
1891+
<build>
1892+
<finalName>petclinic</finalName>
1893+
<defaultGoal>clean install</defaultGoal>
1894+
</build>
1895+
</profile>
1896+
1897+
<profile>
1898+
<id>uml</id>
1899+
<properties>
1900+
<skip.unit.tests>true</skip.unit.tests>
1901+
<skip.integration.tests>true</skip.integration.tests>
1902+
</properties>
1903+
<dependencyManagement>
1904+
<dependencies>
1905+
<dependency>
1906+
<groupId>com.github.funthomas424242</groupId>
1907+
<artifactId>plantuml-maven-plugin</artifactId>
1908+
<version>${version.plantuml-maven-plugin}</version>
1909+
<type>maven-plugin</type>
1910+
<exclusions>
1911+
<exclusion>
1912+
<groupId>javax.enterprise</groupId>
1913+
<artifactId>cdi-api</artifactId>
1914+
</exclusion>
1915+
</exclusions>
1916+
</dependency>
1917+
<dependency>
1918+
<groupId>net.sourceforge.plantuml</groupId>
1919+
<artifactId>plantuml</artifactId>
1920+
<version>${version.net.sourceforge.plantuml}</version>
1921+
<scope>runtime</scope>
1922+
</dependency>
1923+
</dependencies>
1924+
</dependencyManagement>
1925+
<dependencies>
1926+
<dependency>
1927+
<groupId>com.github.funthomas424242</groupId>
1928+
<artifactId>plantuml-maven-plugin</artifactId>
1929+
<type>maven-plugin</type>
1930+
</dependency>
1931+
<dependency>
1932+
<groupId>net.sourceforge.plantuml</groupId>
1933+
<artifactId>plantuml</artifactId>
1934+
<scope>runtime</scope>
1935+
</dependency>
1936+
</dependencies>
1937+
<build>
1938+
<defaultGoal>clean com.github.funthomas424242:plantuml-maven-plugin:generate</defaultGoal>
1939+
<plugins>
1940+
<plugin>
1941+
<groupId>com.github.funthomas424242</groupId>
1942+
<artifactId>plantuml-maven-plugin</artifactId>
1943+
<version>${version.plantuml-maven-plugin}</version>
1944+
<configuration>
1945+
<truncatePattern>src/main/*</truncatePattern>
1946+
<sourceFiles>
1947+
<directory>${basedir}</directory>
1948+
<includes>
1949+
<include>src/main/plantuml/**/*.puml</include>
1950+
</includes>
1951+
</sourceFiles>
1952+
</configuration>
1953+
<dependencies>
1954+
<dependency>
1955+
<groupId>net.sourceforge.plantuml</groupId>
1956+
<artifactId>plantuml</artifactId>
1957+
<version>${version.net.sourceforge.plantuml}</version>
1958+
<scope>runtime</scope>
1959+
</dependency>
1960+
</dependencies>
1961+
</plugin>
1962+
</plugins>
1963+
</build>
1964+
</profile>
1965+
1966+
</profiles>
1967+
18801968
</project>

0 commit comments

Comments
 (0)