Skip to content

Commit 086af49

Browse files
thomaswoehlkethomaswoehlke
committed
bugfixing
1 parent 7b8dd29 commit 086af49

File tree

2 files changed

+160
-13
lines changed

2 files changed

+160
-13
lines changed

‎pom.xml‎

Lines changed: 159 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,22 +50,62 @@
5050
<java.version>1.8</java.version>
5151
<version.maven>3.6.3</version.maven>
5252
<spring-boot-admin.version>2.2.1</spring-boot-admin.version>
53+
<spring-boot-maven-plugin.version>${project.parent.version}</spring-boot-maven-plugin.version>
5354
<!-- SCM and Releasing -->
5455
<maven.scm.version>1.11.2</maven.scm.version>
5556
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
5657
<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
5758
<!-- Maven plugins -->
59+
<maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
60+
<maven-assembly-plugin.version>3.1.1</maven-assembly-plugin.version>
61+
<maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
62+
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
63+
<maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
64+
<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
5865
<maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version>
66+
<maven-failsafe-plugin.version>2.22.2</maven-failsafe-plugin.version>
67+
<maven-help-plugin.version>3.2.0</maven-help-plugin.version>
68+
<maven-install-plugin.version>2.5.2</maven-install-plugin.version>
69+
<maven-invoker-plugin.version>3.2.1</maven-invoker-plugin.version>
70+
<maven-jar-plugin.version>3.1.2</maven-jar-plugin.version>
71+
<maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
72+
<maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
73+
<maven-shade-plugin.version>3.2.2</maven-shade-plugin.version>
74+
<maven-site-plugin.version>3.8.2</maven-site-plugin.version>
75+
<maven-source-plugin.version>3.1.0</maven-source-plugin.version>
76+
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
77+
<maven-war-plugin.version>3.2.3</maven-war-plugin.version>
78+
<versions-maven-plugin.version>2.7</versions-maven-plugin.version>
79+
<xml-maven-plugin.version>1.0.2</xml-maven-plugin.version>
80+
<dependency-management-plugin.version>1.0.9.RELEASE</dependency-management-plugin.version>
81+
<git-commit-id-plugin.version>3.0.1</git-commit-id-plugin.version>
82+
83+
<thymeleaf.version>3.0.11.RELEASE</thymeleaf.version>
84+
<thymeleaf-extras-data-attribute.version>2.0.1</thymeleaf-extras-data-attribute.version>
85+
<thymeleaf-extras-java8time.version>3.0.4.RELEASE</thymeleaf-extras-java8time.version>
86+
<thymeleaf-extras-springsecurity.version>3.0.4.RELEASE</thymeleaf-extras-springsecurity.version>
87+
<thymeleaf-layout-dialect.version>2.4.1</thymeleaf-layout-dialect.version>
88+
89+
<spring-data-releasetrain.version>Moore-SR6</spring-data-releasetrain.version>
90+
<spring-framework.version>5.2.5.RELEASE</spring-framework.version>
91+
<spring-security.version>5.2.2.RELEASE</spring-security.version>
92+
<spring-session-bom.version>Corn-SR2</spring-session-bom.version>
93+
94+
<junit-jupiter.version>5.5.2</junit-jupiter.version>
95+
<xmlunit2.version>2.6.4</xmlunit2.version>
96+
<htmlunit.version>2.36.0</htmlunit.version>
97+
<hamcrest.version>2.1</hamcrest.version>
98+
<lombok.version>1.18.12</lombok.version>
99+
59100
<!-- Maven Reports and Site -->
60101
<maven-project-info-reports-plugin.version>3.0.0</maven-project-info-reports-plugin.version>
61-
<maven-javadoc-plugin.version>3.1.0</maven-javadoc-plugin.version>
62102
<maven-checkstyle-plugin.version>3.1.1</maven-checkstyle-plugin.version>
63103
<maven-jxr-plugin.version>3.0.0</maven-jxr-plugin.version>
64104
<maven-pmd-plugin.version>3.11.0</maven-pmd-plugin.version>
65105
<spotbugs-maven-plugin.version>4.0.0</spotbugs-maven-plugin.version>
66106
<maven-pmd-plugin.version>3.13.0</maven-pmd-plugin.version>
67-
<!-- Testing -->
68107
<maven-surefire-report-plugin.version>3.0.0-M4</maven-surefire-report-plugin.version>
108+
69109
<!-- Docker -->
70110
<version.docker-compose-maven-plugin>4.0.0</version.docker-compose-maven-plugin>
71111
<docker-compose-maven-plugin.verbose>true</docker-compose-maven-plugin.verbose>
@@ -75,6 +115,42 @@
75115

76116
<dependencyManagement>
77117
<dependencies>
118+
<dependency>
119+
<groupId>org.junit</groupId>
120+
<artifactId>junit-bom</artifactId>
121+
<version>${junit-jupiter.version}</version>
122+
<type>pom</type>
123+
<scope>import</scope>
124+
</dependency>
125+
<dependency>
126+
<groupId>org.springframework</groupId>
127+
<artifactId>spring-framework-bom</artifactId>
128+
<version>${spring-framework.version}</version>
129+
<type>pom</type>
130+
<scope>import</scope>
131+
</dependency>
132+
<dependency>
133+
<groupId>org.springframework.data</groupId>
134+
<artifactId>spring-data-releasetrain</artifactId>
135+
<version>${spring-data-releasetrain.version}</version>
136+
<type>pom</type>
137+
<scope>import</scope>
138+
</dependency>
139+
<dependency>
140+
<groupId>org.springframework.security</groupId>
141+
<artifactId>spring-security-bom</artifactId>
142+
<version>${spring-security.version}</version>
143+
<type>pom</type>
144+
<scope>import</scope>
145+
</dependency>
146+
<dependency>
147+
<groupId>org.springframework.session</groupId>
148+
<artifactId>spring-session-bom</artifactId>
149+
<version>${spring-session-bom.version}</version>
150+
<type>pom</type>
151+
<scope>import</scope>
152+
</dependency>
153+
78154
<dependency>
79155
<groupId>org.webjars</groupId>
80156
<artifactId>font-awesome</artifactId>
@@ -100,36 +176,77 @@
100176
<artifactId>ckeditor</artifactId>
101177
<version>4.11.3</version>
102178
</dependency>
179+
180+
<dependency>
181+
<groupId>org.thymeleaf</groupId>
182+
<artifactId>thymeleaf</artifactId>
183+
<version>${thymeleaf.version}</version>
184+
</dependency>
185+
<dependency>
186+
<groupId>org.thymeleaf</groupId>
187+
<artifactId>thymeleaf-spring5</artifactId>
188+
<version>${thymeleaf.version}</version>
189+
</dependency>
190+
<dependency>
191+
<groupId>org.thymeleaf.extras</groupId>
192+
<artifactId>thymeleaf-extras-java8time</artifactId>
193+
<version>${thymeleaf-extras-java8time.version}</version>
194+
</dependency>
195+
<dependency>
196+
<groupId>org.thymeleaf.extras</groupId>
197+
<artifactId>thymeleaf-extras-springsecurity5</artifactId>
198+
<version>${thymeleaf-extras-springsecurity.version}</version>
199+
</dependency>
103200
<dependency>
104201
<groupId>io.github.jpenren</groupId>
105202
<artifactId>thymeleaf-spring-data-dialect</artifactId>
106203
<version>3.4.0</version>
107204
</dependency>
205+
206+
<dependency>
207+
<groupId>org.projectlombok</groupId>
208+
<artifactId>lombok</artifactId>
209+
<version>${lombok.version}</version>
210+
<optional>false</optional>
211+
</dependency>
212+
108213
<dependency>
109214
<groupId>org.jsoup</groupId>
110215
<artifactId>jsoup</artifactId>
111216
<version>1.8.3</version>
112217
</dependency>
218+
219+
<dependency>
220+
<groupId>org.hamcrest</groupId>
221+
<artifactId>hamcrest</artifactId>
222+
<version>${hamcrest.version}</version>
223+
<scope>test</scope>
224+
</dependency>
113225
<dependency>
114-
<groupId>org.junit.jupiter</groupId>
115-
<artifactId>junit-jupiter-engine</artifactId>
116-
<version>5.4.0</version>
226+
<groupId>org.hamcrest</groupId>
227+
<artifactId>hamcrest-core</artifactId>
228+
<version>${hamcrest.version}</version>
117229
<scope>test</scope>
118230
</dependency>
119231
<dependency>
120-
<groupId>org.junit.jupiter</groupId>
121-
<artifactId>junit-jupiter-api</artifactId>
122-
<version>5.4.0</version>
232+
<groupId>org.hamcrest</groupId>
233+
<artifactId>hamcrest-library</artifactId>
234+
<version>${hamcrest.version}</version>
123235
<scope>test</scope>
124236
</dependency>
125237

126-
127238
<dependency>
128239
<groupId>org.apache.maven.plugins</groupId>
129240
<artifactId>maven-enforcer-plugin</artifactId>
130241
<version>${maven-enforcer-plugin.version}</version>
131242
<type>maven-plugin</type>
132243
</dependency>
244+
<dependency>
245+
<groupId>org.apache.maven.plugins</groupId>
246+
<artifactId>maven-invoker-plugin</artifactId>
247+
<version>${maven-invoker-plugin.version}</version>
248+
<type>maven-plugin</type>
249+
</dependency>
133250
<dependency>
134251
<groupId>com.dkanejs.maven.plugins</groupId>
135252
<artifactId>docker-compose-maven-plugin</artifactId>
@@ -139,7 +256,25 @@
139256
<dependency>
140257
<groupId>org.apache.maven.plugins</groupId>
141258
<artifactId>maven-clean-plugin</artifactId>
142-
<version>3.1.0</version>
259+
<version>${maven-clean-plugin.version}</version>
260+
<type>maven-plugin</type>
261+
</dependency>
262+
<dependency>
263+
<groupId>org.apache.maven.plugins</groupId>
264+
<artifactId>maven-dependency-plugin</artifactId>
265+
<version>${maven-dependency-plugin.version}</version>
266+
<type>maven-plugin</type>
267+
</dependency>
268+
<dependency>
269+
<groupId>org.apache.maven.plugins</groupId>
270+
<artifactId>maven-compiler-plugin</artifactId>
271+
<version>${maven-compiler-plugin.version}</version>
272+
<type>maven-plugin</type>
273+
</dependency>
274+
<dependency>
275+
<groupId>org.springframework.boot</groupId>
276+
<artifactId>spring-boot-maven-plugin</artifactId>
277+
<version>${spring-boot-maven-plugin.version}</version>
143278
<type>maven-plugin</type>
144279
</dependency>
145280

@@ -179,6 +314,12 @@
179314
<version>${maven-pmd-plugin.version}</version>
180315
<type>maven-plugin</type>
181316
</dependency>
317+
<dependency>
318+
<groupId>org.apache.maven.plugins</groupId>
319+
<artifactId>maven-surefire-plugin</artifactId>
320+
<version>${maven-surefire-plugin.version}</version>
321+
<type>maven-plugin</type>
322+
</dependency>
182323
<dependency>
183324
<groupId>org.apache.maven.plugins</groupId>
184325
<artifactId>maven-surefire-report-plugin</artifactId>
@@ -269,22 +410,28 @@
269410
<groupId>com.github.mxab.thymeleaf.extras</groupId>
270411
<artifactId>thymeleaf-extras-data-attribute</artifactId>
271412
</dependency>
413+
414+
<dependency>
415+
<groupId>org.thymeleaf</groupId>
416+
<artifactId>thymeleaf</artifactId>
417+
</dependency>
272418
<dependency>
273419
<groupId>org.thymeleaf</groupId>
274420
<artifactId>thymeleaf-spring5</artifactId>
275421
</dependency>
276422
<dependency>
277423
<groupId>org.thymeleaf.extras</groupId>
278-
<artifactId>thymeleaf-extras-springsecurity5</artifactId>
424+
<artifactId>thymeleaf-extras-java8time</artifactId>
279425
</dependency>
280426
<dependency>
281427
<groupId>org.thymeleaf.extras</groupId>
282-
<artifactId>thymeleaf-extras-java8time</artifactId>
428+
<artifactId>thymeleaf-extras-springsecurity5</artifactId>
283429
</dependency>
284430
<dependency>
285431
<groupId>io.github.jpenren</groupId>
286432
<artifactId>thymeleaf-spring-data-dialect</artifactId>
287433
</dependency>
434+
288435
<dependency>
289436
<groupId>org.jsoup</groupId>
290437
<artifactId>jsoup</artifactId>

‎run.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
source setenv.sh
3+
source etc/setenv.sh
44

55
function runDev() {
66
./mvnw

0 commit comments

Comments
 (0)