Skip to content
This repository was archived by the owner on Dec 15, 2021. It is now read-only.

Commit 27648b3

Browse files
author
Dave Syer
committed
Replaced pom with original from template project
1 parent b1eb47e commit 27648b3

File tree

3 files changed

+175
-146
lines changed

3 files changed

+175
-146
lines changed

‎SPR-9498/pom.xml

Lines changed: 175 additions & 138 deletions
Original file line numberDiff line numberDiff line change
@@ -1,189 +1,226 @@
1-
<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/maven-v4_0_0.xsd">
2-
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
33
<modelVersion>4.0.0</modelVersion>
4-
5-
<parent>
6-
<groupId>org.springframework.security.oauth</groupId>
7-
<artifactId>spring-security-oauth-parent</artifactId>
8-
<version>1.0.0.BUILD-SNAPSHOT</version>
9-
</parent>
10-
4+
<groupId>org.springframework.issues</groupId>
115
<artifactId>SPR-9498</artifactId>
6+
<version>1.0-SNAPSHOT</version>
7+
<name>Spring MVC Issue Reproduction Project</name>
128
<packaging>war</packaging>
13-
<name>OAuth for Spring Security - Tonr2 (OAuth 2 Client Example)</name>
14-
15-
<profiles>
16-
<profile>
17-
<id>integration</id>
18-
<build>
19-
<plugins>
20-
<plugin>
21-
<groupId>org.apache.maven.plugins</groupId>
22-
<artifactId>maven-surefire-plugin</artifactId>
23-
<version>2.7.1</version>
24-
<executions>
25-
<execution>
26-
<id>surefire-it</id>
27-
<phase>integration-test</phase>
28-
<goals>
29-
<goal>test</goal>
30-
</goals>
31-
<configuration>
32-
<skip>${skipTests}</skip>
33-
<testFailureIgnore>true</testFailureIgnore>
34-
</configuration>
35-
</execution>
36-
</executions>
37-
</plugin>
38-
<plugin>
39-
<groupId>org.codehaus.mojo</groupId>
40-
<artifactId>tomcat-maven-plugin</artifactId>
41-
<version>1.1</version>
42-
<executions>
43-
<execution>
44-
<id>start-tomcat</id>
45-
<phase>pre-integration-test</phase>
46-
<goals>
47-
<goal>run</goal>
48-
</goals>
49-
<configuration>
50-
<fork>true</fork>
51-
</configuration>
52-
</execution>
53-
</executions>
54-
</plugin>
55-
</plugins>
56-
</build>
57-
</profile>
58-
</profiles>
59-
60-
<build>
61-
<plugins>
62-
<plugin>
63-
<!--skip deploy (this is just a test module) -->
64-
<artifactId>maven-deploy-plugin</artifactId>
65-
<version>2.6</version>
66-
<configuration>
67-
<skip>true</skip>
68-
</configuration>
69-
</plugin>
70-
</plugins>
71-
<pluginManagement>
72-
<plugins>
73-
<plugin>
74-
<groupId>org.codehaus.mojo</groupId>
75-
<artifactId>tomcat-maven-plugin</artifactId>
76-
<configuration>
77-
<addContextWarDependencies>true</addContextWarDependencies>
78-
</configuration>
79-
</plugin>
80-
</plugins>
81-
</pluginManagement>
82-
</build>
839

84-
<repositories>
85-
<repository>
86-
<id>spring-milestone</id>
87-
<name>Spring Framework Milestone Repository</name>
88-
<url>http://maven.springframework.org/milestone</url>
89-
</repository>
90-
<repository>
91-
<id>spring-release</id>
92-
<name>Spring Framework Release Repository</name>
93-
<url>http://maven.springframework.org/release</url>
94-
</repository>
95-
</repositories>
10+
<properties>
11+
<java-version>1.6</java-version>
12+
<org.springframework-version>3.2.0.BUILD-SNAPSHOT</org.springframework-version>
13+
<org.slf4j-version>1.6.1</org.slf4j-version>
14+
</properties>
9615

9716
<dependencies>
98-
17+
<!-- Spring Framework -->
9918
<dependency>
100-
<groupId>${pom.groupId}</groupId>
101-
<artifactId>sparklr2</artifactId>
102-
<version>${pom.version}</version>
103-
<type>war</type>
104-
<scope>tomcat</scope>
19+
<groupId>org.springframework</groupId>
20+
<artifactId>spring-context</artifactId>
21+
<version>${org.springframework-version}</version>
22+
<exclusions>
23+
<!-- Exclude Commons Logging in favor of SLF4j -->
24+
<exclusion>
25+
<groupId>commons-logging</groupId>
26+
<artifactId>commons-logging</artifactId>
27+
</exclusion>
28+
</exclusions>
10529
</dependency>
106-
10730
<dependency>
108-
<groupId>${project.groupId}</groupId>
109-
<artifactId>spring-security-oauth2</artifactId>
110-
<version>${project.version}</version>
31+
<groupId>org.springframework</groupId>
32+
<artifactId>spring-webmvc</artifactId>
33+
<version>${org.springframework-version}</version>
11134
</dependency>
11235

11336
<dependency>
114-
<groupId>org.springframework.security</groupId>
115-
<artifactId>spring-security-taglibs</artifactId>
116-
<version>${spring.security.version}</version>
37+
<groupId>aopalliance</groupId>
38+
<artifactId>aopalliance</artifactId>
39+
<version>1.0</version>
11740
</dependency>
11841

42+
<!-- Logging -->
11943
<dependency>
120-
<groupId>org.springframework</groupId>
121-
<artifactId>spring-webmvc</artifactId>
122-
<version>${spring.version}</version>
44+
<groupId>org.slf4j</groupId>
45+
<artifactId>slf4j-api</artifactId>
46+
<version>${org.slf4j-version}</version>
12347
</dependency>
124-
12548
<dependency>
126-
<groupId>org.springframework</groupId>
127-
<artifactId>spring-web</artifactId>
128-
<version>${spring.version}</version>
49+
<groupId>org.slf4j</groupId>
50+
<artifactId>jcl-over-slf4j</artifactId>
51+
<version>${org.slf4j-version}</version>
52+
<scope>runtime</scope>
53+
</dependency>
54+
<dependency>
55+
<groupId>org.slf4j</groupId>
56+
<artifactId>slf4j-log4j12</artifactId>
57+
<version>${org.slf4j-version}</version>
58+
<scope>runtime</scope>
59+
</dependency>
60+
<dependency>
61+
<groupId>log4j</groupId>
62+
<artifactId>log4j</artifactId>
63+
<version>1.2.16</version>
64+
<scope>runtime</scope>
12965
</dependency>
13066

67+
<!-- Servlet API -->
13168
<dependency>
132-
<groupId>org.springframework</groupId>
133-
<artifactId>spring-jdbc</artifactId>
134-
<version>${spring.version}</version>
69+
<groupId>javax.servlet</groupId>
70+
<artifactId>javax.servlet-api</artifactId>
71+
<version>3.0.1</version>
72+
<scope>provided</scope>
13573
</dependency>
13674

75+
<!-- JSP API and JSTL
13776
<dependency>
138-
<groupId>org.springframework</groupId>
139-
<artifactId>spring-context</artifactId>
140-
<version>${spring.version}</version>
77+
<groupId>javax.servlet.jsp</groupId>
78+
<artifactId>jsp-api</artifactId>
79+
<version>2.1</version>
80+
<scope>provided</scope>
81+
</dependency>
82+
<dependency>
83+
<groupId>javax.servlet</groupId>
84+
<artifactId>jstl</artifactId>
85+
<version>1.2</version>
14186
</dependency>
87+
-->
14288

89+
<!-- Apache Tiles
14390
<dependency>
144-
<groupId>org.springframework</groupId>
145-
<artifactId>spring-aop</artifactId>
146-
<version>${spring.version}</version>
91+
<groupId>org.apache.tiles</groupId>
92+
<artifactId>tiles-jsp</artifactId>
93+
<version>2.1.3</version>
94+
<exclusions>
95+
<exclusion>
96+
<groupId>commons-logging</groupId>
97+
<artifactId>commons-logging-api</artifactId>
98+
</exclusion>
99+
</exclusions>
147100
</dependency>
101+
-->
148102

103+
<!-- JSR 303 with Hibernate Validator
149104
<dependency>
150-
<groupId>org.springframework</groupId>
151-
<artifactId>spring-expression</artifactId>
152-
<version>${spring.version}</version>
105+
<groupId>javax.validation</groupId>
106+
<artifactId>validation-api</artifactId>
107+
<version>1.0.0.GA</version>
108+
</dependency>
109+
<dependency>
110+
<groupId>org.hibernate</groupId>
111+
<artifactId>hibernate-validator</artifactId>
112+
<version>4.1.0.Final</version>
153113
</dependency>
114+
-->
154115

116+
<!-- Joda Time Library
155117
<dependency>
156-
<groupId>org.springframework</groupId>
157-
<artifactId>spring-tx</artifactId>
158-
<version>${spring.version}</version>
118+
<groupId>joda-time</groupId>
119+
<artifactId>joda-time</artifactId>
120+
<version>1.6.2</version>
159121
</dependency>
122+
<dependency>
123+
<groupId>joda-time</groupId>
124+
<artifactId>joda-time-jsptags</artifactId>
125+
<version>1.0.2</version>
126+
<scope>runtime</scope>
127+
</dependency>
128+
-->
160129

130+
<!-- Apache Commons File Upload
161131
<dependency>
162-
<groupId>org.codehaus.jackson</groupId>
163-
<artifactId>jackson-mapper-asl</artifactId>
164-
<version>1.5.5</version>
132+
<groupId>commons-fileupload</groupId>
133+
<artifactId>commons-fileupload</artifactId>
134+
<version>1.2.2</version>
135+
</dependency>
136+
<dependency>
137+
<groupId>commons-io</groupId>
138+
<artifactId>commons-io</artifactId>
139+
<version>2.0.1</version>
165140
</dependency>
141+
-->
166142

143+
<!-- Jackson JSON Processor
167144
<dependency>
168-
<groupId>javax.servlet</groupId>
169-
<artifactId>servlet-api</artifactId>
170-
<version>2.3</version>
171-
<scope>provided</scope>
145+
<groupId>org.codehaus.jackson</groupId>
146+
<artifactId>jackson-mapper-asl</artifactId>
147+
<version>1.8.1</version>
172148
</dependency>
149+
-->
173150

151+
<!-- Rome Atom+RSS
174152
<dependency>
175-
<groupId>javax.servlet</groupId>
176-
<artifactId>jstl</artifactId>
177-
<version>1.2</version>
153+
<groupId>rome</groupId>
154+
<artifactId>rome</artifactId>
155+
<version>1.0</version>
178156
</dependency>
157+
-->
179158

159+
<!-- Test -->
180160
<dependency>
181161
<groupId>junit</groupId>
182162
<artifactId>junit</artifactId>
183-
<version>4.8.2</version>
163+
<version>4.8</version>
184164
<scope>test</scope>
185165
</dependency>
186-
187166
</dependencies>
188167

168+
<repositories>
169+
<repository>
170+
<id>spring-maven-snapshot</id>
171+
<name>Springframework Maven Snapshot Repository</name>
172+
<url>http://repo.springsource.org/snapshot</url>
173+
<snapshots>
174+
<enabled>true</enabled>
175+
</snapshots>
176+
</repository>
177+
</repositories>
178+
179+
<build>
180+
<plugins>
181+
<plugin>
182+
<artifactId>maven-compiler-plugin</artifactId>
183+
<configuration>
184+
<source>${java-version}</source>
185+
<target>${java-version}</target>
186+
</configuration>
187+
</plugin>
188+
<plugin>
189+
<groupId>org.apache.maven.plugins</groupId>
190+
<artifactId>maven-dependency-plugin</artifactId>
191+
<executions>
192+
<execution>
193+
<id>install</id>
194+
<phase>install</phase>
195+
<goals>
196+
<goal>sources</goal>
197+
</goals>
198+
</execution>
199+
</executions>
200+
</plugin>
201+
<plugin>
202+
<groupId>org.apache.maven.plugins</groupId>
203+
<artifactId>maven-eclipse-plugin</artifactId>
204+
<version>2.8</version>
205+
<configuration>
206+
<downloadSources>true</downloadSources>
207+
<downloadJavadocs>false</downloadJavadocs>
208+
<wtpversion>2.0</wtpversion>
209+
</configuration>
210+
</plugin>
211+
<plugin>
212+
<artifactId>maven-surefire-plugin</artifactId>
213+
<configuration>
214+
<includes>
215+
<include>**/*Tests.java</include>
216+
</includes>
217+
<excludes>
218+
<exclude>**/*Abstract*.java</exclude>
219+
</excludes>
220+
</configuration>
221+
</plugin>
222+
</plugins>
223+
</build>
224+
189225
</project>
226+

‎SPR-9498/src/main/resources/commons-logging.properties

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎SPR-9498/src/main/resources/simplelog.properties

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)