Skip to content

Commit 31bad26

Browse files
committed
work
1 parent 6f1c071 commit 31bad26

File tree

1 file changed

+13
-18
lines changed

1 file changed

+13
-18
lines changed

pom.xml

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>org.woehlke</groupId>
66
<artifactId>simpleworklist</artifactId>
77
<version>2.3.40-SNAPSHOT</version>
8-
<packaging>jar</packaging>
8+
<packaging>war</packaging>
99

1010
<parent>
1111
<groupId>org.springframework.boot</groupId>
@@ -71,9 +71,16 @@
7171
<version.maven>3.6.3</version.maven>
7272
<pmdVersion>6.28.0</pmdVersion>
7373

74+
<maven.compiler.source>${java.version}</maven.compiler.source>
75+
<maven.compiler.target>${java.version}</maven.compiler.target>
76+
77+
<spring-boot.repackage.layout>WAR</spring-boot.repackage.layout>
78+
79+
<!-- Spring Boot and Spring Frameworks -->
80+
<spring-boot-maven-plugin.version>${project.parent.version}</spring-boot-maven-plugin.version>
81+
7482
<!-- SCM and Releasing with Maven -->
7583
<maven.scm.version>1.13.0</maven.scm.version>
76-
7784
<maven-release-plugin.version>3.0.0-M5</maven-release-plugin.version>
7885
<liquibase-maven-plugin.version>4.4.3</liquibase-maven-plugin.version>
7986

@@ -98,15 +105,6 @@
98105
<docker-compose-maven-plugin.ignorePullFailures>true</docker-compose-maven-plugin.ignorePullFailures>
99106
<docker-compose-maven-plugin.detachedMode>true</docker-compose-maven-plugin.detachedMode>
100107

101-
<!-- Webjars -->
102-
<!--
103-
<webjars.bootstrap.version>4.5.3</webjars.bootstrap.version>
104-
<webjars.jquery.version>3.5.1</webjars.jquery.version>
105-
<webjars.popper.js.version>1.16.1</webjars.popper.js.version>
106-
<webjars.font-awesome.version>5.15.1</webjars.font-awesome.version>
107-
<webjars.ckeditor.version>18.0.0</webjars.ckeditor.version>
108-
-->
109-
110108
<!-- Webjars -->
111109
<webjars.jquery.version>3.6.0</webjars.jquery.version>
112110
<webjars.popper.js.version>2.9.3</webjars.popper.js.version>
@@ -119,13 +117,10 @@
119117
<thymeleaf-spring-data-dialect.version>3.5.0</thymeleaf-spring-data-dialect.version>
120118
<thymeleaf-testing.version>3.1.0.M2</thymeleaf-testing.version>
121119
<!--
122-
<thymeleaf-extras-data-attribute.version>2.0.1</thymeleaf-extras-data-attribute.version>
123-
<thymeleaf-extras-java8time.version>3.0.4.RELEASE</thymeleaf-extras-java8time.version>
124-
<thymeleaf-layout-dialect.version>3.10</thymeleaf-layout-dialect.version>
125-
-->
126-
127-
<!-- Spring Boot and Spring Frameworks -->
128-
<spring-boot-maven-plugin.version>${project.parent.version}</spring-boot-maven-plugin.version>
120+
<thymeleaf-extras-data-attribute.version>2.0.1</thymeleaf-extras-data-attribute.version>
121+
<thymeleaf-extras-java8time.version>3.0.4.RELEASE</thymeleaf-extras-java8time.version>
122+
<thymeleaf-layout-dialect.version>3.10</thymeleaf-layout-dialect.version>
123+
-->
129124

130125
<!-- Unit and Integration Testing -->
131126
<skipTests>true</skipTests>

0 commit comments

Comments
 (0)