Skip to content

Commit 7208d1c

Browse files
committed
Merge branch 'master' into branch-2.3-MVC_2
# Conflicts: # .github/workflows/codacy-analysis.yml # .github/workflows/codeql-analysis.yml # .github/workflows/label.yml # .github/workflows/stale.yml # .idea/jarRepositories.xml # README.md # pom.xml # run.sh # system.properties
1 parent 67c514c commit 7208d1c

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed

pom.xml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868

6969
<properties>
7070
<java.version>15</java.version>
71-
<version.maven>3.6.3</version.maven>
71+
<version.maven>3.6.2</version.maven>
7272
<pmdVersion>6.28.0</pmdVersion>
7373

7474
<!-- SCM and Releasing with Maven -->
@@ -538,12 +538,6 @@
538538
<groupId>org.springframework.security</groupId>
539539
<artifactId>spring-security-config</artifactId>
540540
</dependency>
541-
<!--
542-
<dependency>
543-
<groupId>org.springframework.security</groupId>
544-
<artifactId>spring-security-remoting</artifactId>
545-
</dependency>
546-
-->
547541
<dependency>
548542
<groupId>org.springframework.security</groupId>
549543
<artifactId>spring-security-web</artifactId>
@@ -552,10 +546,6 @@
552546
<groupId>org.springframework.security</groupId>
553547
<artifactId>spring-security-data</artifactId>
554548
</dependency>
555-
<dependency>
556-
<groupId>org.joinfaces</groupId>
557-
<artifactId>security-spring-boot-starter</artifactId>
558-
</dependency>
559549
<dependency>
560550
<groupId>org.postgresql</groupId>
561551
<artifactId>postgresql</artifactId>

0 commit comments

Comments
 (0)