Skip to content

Commit b56e5ed

Browse files
author
Rob Winch
committed
SEC-2784: Fix build plugins
1 parent 5f5e7e7 commit b56e5ed

File tree

46 files changed

+909
-1326
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+909
-1326
lines changed

‎acl/pom.xml

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
43
<modelVersion>4.0.0</modelVersion>
54
<groupId>org.springframework.security</groupId>
65
<artifactId>spring-security-acl</artifactId>
@@ -31,17 +30,6 @@
3130
<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
3231
<url>https://github.com/spring-projects/spring-security</url>
3332
</scm>
34-
<build>
35-
<plugins>
36-
<plugin>
37-
<artifactId>maven-compiler-plugin</artifactId>
38-
<configuration>
39-
<source>1.7</source>
40-
<target>1.7</target>
41-
</configuration>
42-
</plugin>
43-
</plugins>
44-
</build>
4533
<repositories>
4634
<repository>
4735
<id>spring-snasphot</id>
@@ -64,19 +52,19 @@
6452
<dependency>
6553
<groupId>org.springframework</groupId>
6654
<artifactId>spring-aop</artifactId>
67-
<version>4.1.0.RC2</version>
55+
<version>4.1.1.BUILD-SNAPSHOT</version>
6856
<scope>compile</scope>
6957
</dependency>
7058
<dependency>
7159
<groupId>org.springframework</groupId>
7260
<artifactId>spring-context</artifactId>
73-
<version>4.1.0.RC2</version>
61+
<version>4.1.1.BUILD-SNAPSHOT</version>
7462
<scope>compile</scope>
7563
</dependency>
7664
<dependency>
7765
<groupId>org.springframework</groupId>
7866
<artifactId>spring-core</artifactId>
79-
<version>4.1.0.RC2</version>
67+
<version>4.1.1.BUILD-SNAPSHOT</version>
8068
<scope>compile</scope>
8169
<exclusions>
8270
<exclusion>
@@ -88,13 +76,13 @@
8876
<dependency>
8977
<groupId>org.springframework</groupId>
9078
<artifactId>spring-jdbc</artifactId>
91-
<version>4.1.0.RC2</version>
79+
<version>4.1.1.BUILD-SNAPSHOT</version>
9280
<scope>compile</scope>
9381
</dependency>
9482
<dependency>
9583
<groupId>org.springframework</groupId>
9684
<artifactId>spring-tx</artifactId>
97-
<version>4.1.0.RC2</version>
85+
<version>4.1.1.BUILD-SNAPSHOT</version>
9886
<scope>compile</scope>
9987
</dependency>
10088
<dependency>
@@ -106,7 +94,7 @@
10694
</dependency>
10795
<dependency>
10896
<groupId>net.sf.ehcache</groupId>
109-
<artifactId>ehcache-core</artifactId>
97+
<artifactId>ehcache</artifactId>
11098
<version>2.6.5</version>
11199
<scope>compile</scope>
112100
<optional>true</optional>
@@ -150,20 +138,31 @@
150138
<dependency>
151139
<groupId>org.springframework</groupId>
152140
<artifactId>spring-beans</artifactId>
153-
<version>4.1.0.RC2</version>
141+
<version>4.1.1.BUILD-SNAPSHOT</version>
154142
<scope>test</scope>
155143
</dependency>
156144
<dependency>
157145
<groupId>org.springframework</groupId>
158146
<artifactId>spring-context-support</artifactId>
159-
<version>4.1.0.RC2</version>
147+
<version>4.1.1.BUILD-SNAPSHOT</version>
160148
<scope>test</scope>
161149
</dependency>
162150
<dependency>
163151
<groupId>org.springframework</groupId>
164152
<artifactId>spring-test</artifactId>
165-
<version>4.1.0.RC2</version>
153+
<version>4.1.1.BUILD-SNAPSHOT</version>
166154
<scope>test</scope>
167155
</dependency>
168156
</dependencies>
157+
<build>
158+
<plugins>
159+
<plugin>
160+
<artifactId>maven-compiler-plugin</artifactId>
161+
<configuration>
162+
<source>1.7</source>
163+
<target>1.7</target>
164+
</configuration>
165+
</plugin>
166+
</plugins>
167+
</build>
169168
</project>

‎aspects/pom.xml

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
43
<modelVersion>4.0.0</modelVersion>
54
<groupId>org.springframework.security</groupId>
65
<artifactId>spring-security-aspects</artifactId>
@@ -31,17 +30,6 @@
3130
<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
3231
<url>https://github.com/spring-projects/spring-security</url>
3332
</scm>
34-
<build>
35-
<plugins>
36-
<plugin>
37-
<artifactId>maven-compiler-plugin</artifactId>
38-
<configuration>
39-
<source>1.7</source>
40-
<target>1.7</target>
41-
</configuration>
42-
</plugin>
43-
</plugins>
44-
</build>
4533
<repositories>
4634
<repository>
4735
<id>spring-snasphot</id>
@@ -58,19 +46,19 @@
5846
<dependency>
5947
<groupId>org.springframework</groupId>
6048
<artifactId>spring-beans</artifactId>
61-
<version>4.1.0.RC2</version>
49+
<version>4.1.1.BUILD-SNAPSHOT</version>
6250
<scope>compile</scope>
6351
</dependency>
6452
<dependency>
6553
<groupId>org.springframework</groupId>
6654
<artifactId>spring-context</artifactId>
67-
<version>4.1.0.RC2</version>
55+
<version>4.1.1.BUILD-SNAPSHOT</version>
6856
<scope>compile</scope>
6957
</dependency>
7058
<dependency>
7159
<groupId>org.springframework</groupId>
7260
<artifactId>spring-core</artifactId>
73-
<version>4.1.0.RC2</version>
61+
<version>4.1.1.BUILD-SNAPSHOT</version>
7462
<scope>compile</scope>
7563
<exclusions>
7664
<exclusion>
@@ -132,14 +120,25 @@
132120
<dependency>
133121
<groupId>org.springframework</groupId>
134122
<artifactId>spring-aop</artifactId>
135-
<version>4.1.0.RC2</version>
123+
<version>4.1.1.BUILD-SNAPSHOT</version>
136124
<scope>test</scope>
137125
</dependency>
138126
<dependency>
139127
<groupId>org.springframework</groupId>
140128
<artifactId>spring-test</artifactId>
141-
<version>4.1.0.RC2</version>
129+
<version>4.1.1.BUILD-SNAPSHOT</version>
142130
<scope>test</scope>
143131
</dependency>
144132
</dependencies>
133+
<build>
134+
<plugins>
135+
<plugin>
136+
<artifactId>maven-compiler-plugin</artifactId>
137+
<configuration>
138+
<source>1.7</source>
139+
<target>1.7</target>
140+
</configuration>
141+
</plugin>
142+
</plugins>
143+
</build>
145144
</project>

‎cas/pom.xml

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
43
<modelVersion>4.0.0</modelVersion>
54
<groupId>org.springframework.security</groupId>
65
<artifactId>spring-security-cas</artifactId>
@@ -31,17 +30,6 @@
3130
<developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
3231
<url>https://github.com/spring-projects/spring-security</url>
3332
</scm>
34-
<build>
35-
<plugins>
36-
<plugin>
37-
<artifactId>maven-compiler-plugin</artifactId>
38-
<configuration>
39-
<source>1.7</source>
40-
<target>1.7</target>
41-
</configuration>
42-
</plugin>
43-
</plugins>
44-
</build>
4533
<repositories>
4634
<repository>
4735
<id>spring-snasphot</id>
@@ -70,19 +58,19 @@
7058
<dependency>
7159
<groupId>org.springframework</groupId>
7260
<artifactId>spring-beans</artifactId>
73-
<version>4.1.0.RC2</version>
61+
<version>4.1.1.BUILD-SNAPSHOT</version>
7462
<scope>compile</scope>
7563
</dependency>
7664
<dependency>
7765
<groupId>org.springframework</groupId>
7866
<artifactId>spring-context</artifactId>
79-
<version>4.1.0.RC2</version>
67+
<version>4.1.1.BUILD-SNAPSHOT</version>
8068
<scope>compile</scope>
8169
</dependency>
8270
<dependency>
8371
<groupId>org.springframework</groupId>
8472
<artifactId>spring-core</artifactId>
85-
<version>4.1.0.RC2</version>
73+
<version>4.1.1.BUILD-SNAPSHOT</version>
8674
<scope>compile</scope>
8775
<exclusions>
8876
<exclusion>
@@ -94,7 +82,7 @@
9482
<dependency>
9583
<groupId>org.springframework</groupId>
9684
<artifactId>spring-web</artifactId>
97-
<version>4.1.0.RC2</version>
85+
<version>4.1.1.BUILD-SNAPSHOT</version>
9886
<scope>compile</scope>
9987
</dependency>
10088
<dependency>
@@ -106,7 +94,7 @@
10694
</dependency>
10795
<dependency>
10896
<groupId>net.sf.ehcache</groupId>
109-
<artifactId>ehcache-core</artifactId>
97+
<artifactId>ehcache</artifactId>
11098
<version>2.6.5</version>
11199
<scope>compile</scope>
112100
<optional>true</optional>
@@ -150,8 +138,19 @@
150138
<dependency>
151139
<groupId>org.springframework</groupId>
152140
<artifactId>spring-test</artifactId>
153-
<version>4.1.0.RC2</version>
141+
<version>4.1.1.BUILD-SNAPSHOT</version>
154142
<scope>test</scope>
155143
</dependency>
156144
</dependencies>
145+
<build>
146+
<plugins>
147+
<plugin>
148+
<artifactId>maven-compiler-plugin</artifactId>
149+
<configuration>
150+
<source>1.7</source>
151+
<target>1.7</target>
152+
</configuration>
153+
</plugin>
154+
</plugins>
155+
</build>
157156
</project>

0 commit comments

Comments
 (0)