Skip to content

Commit 0c1c659

Browse files
thomaswoehlkethomaswoehlke
committed
work in progres
1 parent 296c330 commit 0c1c659

File tree

1 file changed

+66
-54
lines changed

1 file changed

+66
-54
lines changed

‎pom.xml‎

Lines changed: 66 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
4+
45
<groupId>org.woehlke</groupId>
56
<artifactId>simpleworklist</artifactId>
67
<version>2.3.16-SNAPSHOT</version>
@@ -125,27 +126,29 @@
125126
<type>pom</type>
126127
<scope>import</scope>
127128
</dependency>
128-
<dependency>
129-
<groupId>org.springframework</groupId>
130-
<artifactId>spring-framework-bom</artifactId>
131-
<version>${spring-framework.version}</version>
132-
<type>pom</type>
133-
<scope>import</scope>
134-
</dependency>
135-
<dependency>
136-
<groupId>org.springframework.data</groupId>
137-
<artifactId>spring-data-releasetrain</artifactId>
138-
<version>${spring-data-releasetrain.version}</version>
139-
<type>pom</type>
140-
<scope>import</scope>
141-
</dependency>
142-
<dependency>
143-
<groupId>org.springframework.security</groupId>
144-
<artifactId>spring-security-bom</artifactId>
145-
<version>${spring-security.version}</version>
146-
<type>pom</type>
147-
<scope>import</scope>
148-
</dependency>
129+
<!--
130+
<dependency>
131+
<groupId>org.springframework</groupId>
132+
<artifactId>spring-framework-bom</artifactId>
133+
<version>${spring-framework.version}</version>
134+
<type>pom</type>
135+
<scope>import</scope>
136+
</dependency>
137+
<dependency>
138+
<groupId>org.springframework.data</groupId>
139+
<artifactId>spring-data-releasetrain</artifactId>
140+
<version>${spring-data-releasetrain.version}</version>
141+
<type>pom</type>
142+
<scope>import</scope>
143+
</dependency>
144+
<dependency>
145+
<groupId>org.springframework.security</groupId>
146+
<artifactId>spring-security-bom</artifactId>
147+
<version>${spring-security.version}</version>
148+
<type>pom</type>
149+
<scope>import</scope>
150+
</dependency>
151+
-->
149152
<dependency>
150153
<groupId>org.springframework.session</groupId>
151154
<artifactId>spring-session-bom</artifactId>
@@ -174,33 +177,36 @@
174177
<artifactId>ckeditor</artifactId>
175178
<version>4.14.0</version>
176179
</dependency>
177-
180+
<!--
178181
<dependency>
179182
<groupId>org.thymeleaf</groupId>
180183
<artifactId>thymeleaf</artifactId>
181184
<version>${thymeleaf.version}</version>
182185
</dependency>
186+
-->
183187
<dependency>
184188
<groupId>org.thymeleaf</groupId>
185189
<artifactId>thymeleaf-testing</artifactId>
186190
<version>3.0.4.RELEASE</version>
187191
<scope>test</scope>
188192
</dependency>
189-
<dependency>
190-
<groupId>org.thymeleaf</groupId>
191-
<artifactId>thymeleaf-spring5</artifactId>
192-
<version>${thymeleaf.version}</version>
193-
</dependency>
194-
<dependency>
195-
<groupId>org.thymeleaf.extras</groupId>
196-
<artifactId>thymeleaf-extras-java8time</artifactId>
197-
<version>${thymeleaf-extras-java8time.version}</version>
198-
</dependency>
199-
<dependency>
200-
<groupId>org.thymeleaf.extras</groupId>
201-
<artifactId>thymeleaf-extras-springsecurity5</artifactId>
202-
<version>${thymeleaf-extras-springsecurity.version}</version>
203-
</dependency>
193+
<!--
194+
<dependency>
195+
<groupId>org.thymeleaf</groupId>
196+
<artifactId>thymeleaf-spring5</artifactId>
197+
<version>${thymeleaf.version}</version>
198+
</dependency>
199+
<dependency>
200+
<groupId>org.thymeleaf.extras</groupId>
201+
<artifactId>thymeleaf-extras-java8time</artifactId>
202+
<version>${thymeleaf-extras-java8time.version}</version>
203+
</dependency>
204+
<dependency>
205+
<groupId>org.thymeleaf.extras</groupId>
206+
<artifactId>thymeleaf-extras-springsecurity5</artifactId>
207+
<version>${thymeleaf-extras-springsecurity.version}</version>
208+
</dependency>
209+
-->
204210
<dependency>
205211
<groupId>io.github.jpenren</groupId>
206212
<artifactId>thymeleaf-spring-data-dialect</artifactId>
@@ -365,10 +371,6 @@
365371
<groupId>org.springframework.boot</groupId>
366372
<artifactId>spring-boot-starter-validation</artifactId>
367373
</dependency>
368-
<dependency>
369-
<groupId>org.springframework.boot</groupId>
370-
<artifactId>spring-boot-starter-security</artifactId>
371-
</dependency>
372374
<dependency>
373375
<groupId>org.springframework.boot</groupId>
374376
<artifactId>spring-boot-devtools</artifactId>
@@ -395,22 +397,31 @@
395397
<artifactId>spring-security-test</artifactId>
396398
<scope>test</scope>
397399
</dependency>
400+
<dependency>
401+
<groupId>org.springframework.boot</groupId>
402+
<artifactId>spring-boot-starter-security</artifactId>
403+
</dependency>
398404
<dependency>
399405
<groupId>org.springframework.security</groupId>
400406
<artifactId>spring-security-core</artifactId>
401407
</dependency>
402408
<dependency>
403409
<groupId>org.springframework.security</groupId>
404-
<artifactId>spring-security-web</artifactId>
410+
<artifactId>spring-security-config</artifactId>
405411
</dependency>
406412
<dependency>
407413
<groupId>org.springframework.security</groupId>
408-
<artifactId>spring-security-data</artifactId>
414+
<artifactId>spring-security-remoting</artifactId>
409415
</dependency>
410416
<dependency>
411417
<groupId>org.springframework.security</groupId>
412-
<artifactId>spring-security-config</artifactId>
418+
<artifactId>spring-security-web</artifactId>
413419
</dependency>
420+
<dependency>
421+
<groupId>org.springframework.security</groupId>
422+
<artifactId>spring-security-data</artifactId>
423+
</dependency>
424+
414425
<dependency>
415426
<groupId>org.postgresql</groupId>
416427
<artifactId>postgresql</artifactId>
@@ -450,20 +461,10 @@
450461
<groupId>org.springframework.session</groupId>
451462
<artifactId>spring-session-jdbc</artifactId>
452463
</dependency>
453-
<dependency>
454-
<groupId>com.github.mxab.thymeleaf.extras</groupId>
455-
<artifactId>thymeleaf-extras-data-attribute</artifactId>
456-
</dependency>
457-
458464
<dependency>
459465
<groupId>org.thymeleaf</groupId>
460466
<artifactId>thymeleaf</artifactId>
461467
</dependency>
462-
<dependency>
463-
<groupId>org.thymeleaf</groupId>
464-
<artifactId>thymeleaf-testing</artifactId>
465-
<scope>test</scope>
466-
</dependency>
467468
<dependency>
468469
<groupId>org.thymeleaf</groupId>
469470
<artifactId>thymeleaf-spring5</artifactId>
@@ -476,10 +477,19 @@
476477
<groupId>org.thymeleaf.extras</groupId>
477478
<artifactId>thymeleaf-extras-springsecurity5</artifactId>
478479
</dependency>
480+
<dependency>
481+
<groupId>com.github.mxab.thymeleaf.extras</groupId>
482+
<artifactId>thymeleaf-extras-data-attribute</artifactId>
483+
</dependency>
479484
<dependency>
480485
<groupId>io.github.jpenren</groupId>
481486
<artifactId>thymeleaf-spring-data-dialect</artifactId>
482487
</dependency>
488+
<dependency>
489+
<groupId>org.thymeleaf</groupId>
490+
<artifactId>thymeleaf-testing</artifactId>
491+
<scope>test</scope>
492+
</dependency>
483493

484494
<dependency>
485495
<groupId>org.jsoup</groupId>
@@ -656,6 +666,7 @@
656666
<requireJavaVersion>
657667
<version>${java.version}</version>
658668
</requireJavaVersion>
669+
<!--
659670
<requireOS>
660671
<family>unix</family>
661672
</requireOS>
@@ -665,6 +676,7 @@
665676
<file>${project.basedir}/etc/setenv.sh</file>
666677
</files>
667678
</requireFilesExist>
679+
-->
668680
</rules>
669681
</configuration>
670682
</execution>

0 commit comments

Comments
 (0)