merge pom

This commit is contained in:
东皇大叔 2020-07-02 19:11:11 +08:00
commit a083f35625

View File

@ -65,7 +65,6 @@
<dependency> <dependency>
<groupId>com.github.inspektr</groupId> <groupId>com.github.inspektr</groupId>
<artifactId>inspektr-support-spring</artifactId> <artifactId>inspektr-support-spring</artifactId>
<scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.security</groupId> <groupId>org.springframework.security</groupId>
@ -78,12 +77,10 @@
<dependency> <dependency>
<groupId>org.springframework.security</groupId> <groupId>org.springframework.security</groupId>
<artifactId>spring-security-cas</artifactId> <artifactId>spring-security-cas</artifactId>
<scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.security</groupId> <groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId> <artifactId>spring-security-config</artifactId>
<scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
@ -118,7 +115,6 @@
<groupId>net.sf.spring-json</groupId> <groupId>net.sf.spring-json</groupId>
<artifactId>spring-json</artifactId> <artifactId>spring-json</artifactId>
<version>1.3.1</version> <version>1.3.1</version>
<scope>runtime</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>net.sf.sojo</groupId> <groupId>net.sf.sojo</groupId>
@ -146,7 +142,6 @@
<groupId>cglib</groupId> <groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId> <artifactId>cglib-nodep</artifactId>
<version>2.2.2</version> <version>2.2.2</version>
<scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.sf.sojo</groupId> <groupId>net.sf.sojo</groupId>
@ -177,7 +172,6 @@
<groupId>ognl</groupId> <groupId>ognl</groupId>
<artifactId>ognl</artifactId> <artifactId>ognl</artifactId>
<version>2.7.3</version> <version>2.7.3</version>
<scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
@ -198,7 +192,7 @@
</packagingExcludes> </packagingExcludes>
<webResources> <webResources>
<resource> <resource>
<directory>${basedir}/src/main/webapp/WEB-INF</directory> <directory>${project.basedir}/src/main/webapp/WEB-INF</directory>
<filtering>true</filtering> <filtering>true</filtering>
<targetPath>WEB-INF</targetPath> <targetPath>WEB-INF</targetPath>
<includes> <includes>