Spring-Framework-Java-Apps · thomaswoehlke · Aug 21, 2022 · Jul 30, 2022 · Jul 31, 2022 · Jul 31, 2022
diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
diff --git a/.mvn/jvm.config b/.mvn/jvm.config
@@ -0,0 +1 @@
+ -Xmx2048m
diff --git a/.mvn/maven.config b/.mvn/maven.config
@@ -0,0 +1 @@
+-Dorg.slf4j.simpleLogger.showThreadName=true -Djava.awt.headless=true -DdownloadSources=true -e
diff --git a/etc/build.sh → build.sh b/etc/build.sh → build.sh
@@ -11,6 +11,10 @@ function composeDown() {
     ./mvnw docker-compose:down
 }
 
+function showSettings() {
+    echo $JAVA_HOME
+}
+
 function firstSetup() {
     export JAVA_OPTS=$JAVA_OPTS_RUN_DEFAULT
     showSettings
@@ -56,9 +60,9 @@ function boot_run() {
 
 function main() {
     # firstSetup
-    #setupTravis
+    setupTravis
     #buildJar
-    boot_run
+    #boot_run
 }
 
 main
diff --git a/pom.xml b/pom.xml
@@ -4,13 +4,13 @@
 
   <groupId>org.woehlke</groupId>
   <artifactId>simpleworklist</artifactId>
-  <version>2.3.49-SNAPSHOT</version>
+  <version>2.3.54-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.7.2</version>
+    <version>2.7.3</version>
   </parent>
 
   <scm>
@@ -73,23 +73,19 @@
   <properties>
     <java.version>11</java.version>
     <version.maven>3.6.3</version.maven>
-    <pmdVersion>6.46.0</pmdVersion>
-
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
-
     <spring-boot.repackage.layout>JAR</spring-boot.repackage.layout>
+    <version.spring-boot-maven-plugin>${project.parent.version}</version.spring-boot-maven-plugin>
+    <version.thymeleaf-testing>3.1.0.M2</version.thymeleaf-testing>
+    <version.thymeleaf-spring-data-dialect>3.5.0</version.thymeleaf-spring-data-dialect>
 
-    <spring-boot-maven-plugin.version>${project.parent.version}</spring-boot-maven-plugin.version>
-
-    <thymeleaf-testing.version>3.1.0.M2</thymeleaf-testing.version>
-    <thymeleaf-spring-data-dialect.version>3.5.0</thymeleaf-spring-data-dialect.version>
 
     <!-- Webjars -->
     <webjars.jquery.version>3.6.0</webjars.jquery.version>
     <webjars.popper.js.version>2.9.3</webjars.popper.js.version>
-    <webjars.bootstrap.version>5.1.3</webjars.bootstrap.version>
-    <webjars.font-awesome.version>6.1.1</webjars.font-awesome.version>
+    <webjars.bootstrap.version>5.2.0</webjars.bootstrap.version>
+    <webjars.font-awesome.version>6.1.2</webjars.font-awesome.version>
     <webjars.ckeditor.version>31.0.0</webjars.ckeditor.version>
     <opencsv.version>5.3</opencsv.version>
 
@@ -100,6 +96,7 @@
     <groovy-all.version>2.4.21</groovy-all.version>
     <hamcrest.version>2.2</hamcrest.version>
     <jsoup.version>1.14.2</jsoup.version>
+    <pmdVersion>6.46.0</pmdVersion>
 
     <!-- SCM and Releasing -->
     <version.org.apache.maven.scm>1.13.0</version.org.apache.maven.scm>
@@ -112,19 +109,24 @@
     <docker-compose-maven-plugin.ignorePullFailures>true</docker-compose-maven-plugin.ignorePullFailures>
     <docker-compose-maven-plugin.detachedMode>true</docker-compose-maven-plugin.detachedMode>
 
+    <!-- Maven Plugins -->
+
+
     <maven-release-plugin.version>3.0.0-M6</maven-release-plugin.version>
 
     <!-- Maven Reports for Site -->
-    <maven-site-plugin.version>3.12.0</maven-site-plugin.version>
-    <maven-project-info-reports-plugin.version>3.3.0</maven-project-info-reports-plugin.version>
-    <maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
-    <maven-jxr-plugin.version>3.2.0</maven-jxr-plugin.version>
+    <version.maven-site-plugin>3.12.0</version.maven-site-plugin>
+    <version.maven-project-info-reports-plugin>3.3.0</version.maven-project-info-reports-plugin>
+    <version.maven-checkstyle-plugin>3.1.2</version.maven-checkstyle-plugin>
+    <version.maven-jxr-plugin>3.2.0</version.maven-jxr-plugin>
     <maven-pmd-plugin.version>3.17.0</maven-pmd-plugin.version>
-    <spotbugs-maven-plugin.version>4.7.0.0</spotbugs-maven-plugin.version>
-    <maven-surefire-report-plugin.version>3.0.0-M7</maven-surefire-report-plugin.version>
-    <asciidoctor-maven-plugin.version>2.2.2</asciidoctor-maven-plugin.version>
-    <doxia-module-markdown.version>1.11.1</doxia-module-markdown.version>
-    <maven-enforcer-plugin.version>3.1.0</maven-enforcer-plugin.version>
+    <version.spotbugs-maven-plugin>4.7.0.0</version.spotbugs-maven-plugin>
+    <version.maven-surefire-report-plugin>3.0.0-M7</version.maven-surefire-report-plugin>
+    <version.asciidoctor-maven-plugin>2.2.2</version.asciidoctor-maven-plugin>
+    <version.doxia-module-markdown>1.11.1</version.doxia-module-markdown>
+    <version.maven-enforcer-plugin>3.1.0</version.maven-enforcer-plugin>
+    <version.plantuml-maven-plugin>1.5.2</version.plantuml-maven-plugin>
+    <version.net.sourceforge.plantuml>1.2022.6</version.net.sourceforge.plantuml>
   </properties>
 
   <repositories>
@@ -362,13 +364,13 @@
       <dependency>
         <groupId>org.thymeleaf</groupId>
         <artifactId>thymeleaf-testing</artifactId>
-        <version>${thymeleaf-testing.version}</version>
+        <version>${version.thymeleaf-testing}</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>io.github.jpenren</groupId>
         <artifactId>thymeleaf-spring-data-dialect</artifactId>
-        <version>${thymeleaf-spring-data-dialect.version}</version>
+        <version>${version.thymeleaf-spring-data-dialect}</version>
       </dependency>
 
       <!-- compile -->
@@ -451,7 +453,7 @@
       <dependency>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>${maven-enforcer-plugin.version}</version>
+        <version>${version.maven-enforcer-plugin}</version>
         <type>maven-plugin</type>
         <scope>provided</scope>
       </dependency>
@@ -511,35 +513,35 @@
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
-        <version>${spring-boot-maven-plugin.version}</version>
+        <version>${version.spring-boot-maven-plugin}</version>
         <type>maven-plugin</type>
         <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>${maven-site-plugin.version}</version>
+        <version>${version.maven-site-plugin}</version>
         <type>maven-plugin</type>
         <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>${maven-project-info-reports-plugin.version}</version>
+        <version>${version.maven-project-info-reports-plugin}</version>
         <type>maven-plugin</type>
         <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jxr-plugin</artifactId>
-        <version>${maven-jxr-plugin.version}</version>
+        <version>${version.maven-jxr-plugin}</version>
         <type>maven-plugin</type>
         <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>${maven-checkstyle-plugin.version}</version>
+        <version>${version.maven-checkstyle-plugin}</version>
         <type>maven-plugin</type>
         <scope>provided</scope>
         <exclusions>
@@ -552,7 +554,7 @@
       <dependency>
         <groupId>com.github.spotbugs</groupId>
         <artifactId>spotbugs-maven-plugin</artifactId>
-        <version>${spotbugs-maven-plugin.version}</version>
+        <version>${version.spotbugs-maven-plugin}</version>
         <type>maven-plugin</type>
         <scope>provided</scope>
       </dependency>
@@ -579,14 +581,14 @@
       <dependency>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>${maven-surefire-report-plugin.version}</version>
+        <version>${version.maven-surefire-report-plugin}</version>
         <type>maven-plugin</type>
         <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.asciidoctor</groupId>
         <artifactId>asciidoctor-maven-plugin</artifactId>
-        <version>${asciidoctor-maven-plugin.version}</version>
+        <version>${version.asciidoctor-maven-plugin}</version>
         <type>maven-plugin</type>
         <scope>provided</scope>
       </dependency>
@@ -635,7 +637,7 @@
       <dependency>
         <groupId>org.apache.maven.doxia</groupId>
         <artifactId>doxia-module-markdown</artifactId>
-        <version>${doxia-module-markdown.version}</version>
+        <version>${version.doxia-module-markdown}</version>
         <scope>provided</scope>
       </dependency>
 
@@ -1115,7 +1117,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-enforcer-plugin</artifactId>
-          <version>${maven-enforcer-plugin.version}</version>
+          <version>${version.maven-enforcer-plugin}</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -1145,7 +1147,7 @@
         <plugin>
           <groupId>org.springframework.boot</groupId>
           <artifactId>spring-boot-maven-plugin</artifactId>
-          <version>${spring-boot-maven-plugin.version}</version>
+          <version>${version.spring-boot-maven-plugin}</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -1155,22 +1157,22 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-project-info-reports-plugin</artifactId>
-          <version>${maven-project-info-reports-plugin.version}</version>
+          <version>${version.maven-project-info-reports-plugin}</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jxr-plugin</artifactId>
-          <version>${maven-jxr-plugin.version}</version>
+          <version>${version.maven-jxr-plugin}</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-checkstyle-plugin</artifactId>
-          <version>${maven-checkstyle-plugin.version}</version>
+          <version>${version.maven-checkstyle-plugin}</version>
         </plugin>
         <plugin>
           <groupId>com.github.spotbugs</groupId>
           <artifactId>spotbugs-maven-plugin</artifactId>
-          <version>${spotbugs-maven-plugin.version}</version>
+          <version>${version.spotbugs-maven-plugin}</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -1180,7 +1182,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-report-plugin</artifactId>
-          <version>${maven-surefire-report-plugin.version}</version>
+          <version>${version.maven-surefire-report-plugin}</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -1190,7 +1192,7 @@
         <plugin>
           <groupId>org.asciidoctor</groupId>
           <artifactId>asciidoctor-maven-plugin</artifactId>
-          <version>${asciidoctor-maven-plugin.version}</version>
+          <version>${version.asciidoctor-maven-plugin}</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -1236,7 +1238,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
-          <version>${maven-site-plugin.version}</version>
+          <version>${version.maven-site-plugin}</version>
           <!--
           <dependencies>
               <dependency>
@@ -1348,7 +1350,7 @@
                     <file>${project.basedir}/src/site/markdown/REQUIREMENTS_NONFUNCTIONAL.md</file>
                     <file>${project.basedir}/src/site/markdown/TODO.md</file>
                     <file>${project.basedir}/src/site/site.xml</file>
-                    <file>${project.basedir}/etc/build.sh</file>
+                    <file>${project.basedir}/build.sh</file>
                     <file>${project.basedir}/etc/run.sh</file>
                     <file>${project.basedir}/src/main/bash/psql.sh</file>
                     <file>${project.basedir}/etc/docker-start.sh</file>
@@ -1877,4 +1879,90 @@
     </plugins>
   </reporting>
 
+
+  <profiles>
+
+      <profile>
+      <id>war</id>
+      <properties>
+        <skip.unit.tests>false</skip.unit.tests>
+        <skip.integration.tests>true</skip.integration.tests>
+      </properties>
+      <build>
+        <finalName>petclinic</finalName>
+        <defaultGoal>clean install</defaultGoal>
+      </build>
+    </profile>
+
+    <profile>
+      <id>uml</id>
+      <properties>
+        <skip.unit.tests>true</skip.unit.tests>
+        <skip.integration.tests>true</skip.integration.tests>
+      </properties>
+      <dependencyManagement>
+        <dependencies>
+          <dependency>
+            <groupId>com.github.funthomas424242</groupId>
+            <artifactId>plantuml-maven-plugin</artifactId>
+            <version>${version.plantuml-maven-plugin}</version>
+            <type>maven-plugin</type>
+            <exclusions>
+              <exclusion>
+                <groupId>javax.enterprise</groupId>
+                <artifactId>cdi-api</artifactId>
+              </exclusion>
+            </exclusions>
+          </dependency>
+          <dependency>
+            <groupId>net.sourceforge.plantuml</groupId>
+            <artifactId>plantuml</artifactId>
+            <version>${version.net.sourceforge.plantuml}</version>
+            <scope>runtime</scope>
+          </dependency>
+        </dependencies>
+      </dependencyManagement>
+      <dependencies>
+        <dependency>
+          <groupId>com.github.funthomas424242</groupId>
+          <artifactId>plantuml-maven-plugin</artifactId>
+          <type>maven-plugin</type>
+        </dependency>
+        <dependency>
+          <groupId>net.sourceforge.plantuml</groupId>
+          <artifactId>plantuml</artifactId>
+          <scope>runtime</scope>
+        </dependency>
+      </dependencies>
+      <build>
+        <defaultGoal>clean com.github.funthomas424242:plantuml-maven-plugin:generate</defaultGoal>
+        <plugins>
+          <plugin>
+            <groupId>com.github.funthomas424242</groupId>
+            <artifactId>plantuml-maven-plugin</artifactId>
+            <version>${version.plantuml-maven-plugin}</version>
+            <configuration>
+              <truncatePattern>src/main/*</truncatePattern>
+              <sourceFiles>
+                <directory>${basedir}</directory>
+                <includes>
+                  <include>src/main/plantuml/**/*.puml</include>
+                </includes>
+              </sourceFiles>
+            </configuration>
+            <dependencies>
+              <dependency>
+                <groupId>net.sourceforge.plantuml</groupId>
+                <artifactId>plantuml</artifactId>
+                <version>${version.net.sourceforge.plantuml}</version>
+                <scope>runtime</scope>
+              </dependency>
+            </dependencies>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+  </profiles>
+
 </project>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		-Dorg.slf4j.simpleLogger.showThreadName=true -Djava.awt.headless=true -DdownloadSources=true -e