From 446bcb9b1d13dc602b73728e0070b66f0605524a Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Fri, 17 Apr 2009 04:56:59 +0000
Subject: [PATCH] SEC-1131: Correct portlet API version.

---
 samples/portlet/pom.xml | 174 ++++++++++++++++++++--------------------
 1 file changed, 87 insertions(+), 87 deletions(-)

diff --git a/samples/portlet/pom.xml b/samples/portlet/pom.xml
index fd7b8092aa..9ab572eb61 100644
--- a/samples/portlet/pom.xml
+++ b/samples/portlet/pom.xml
@@ -8,91 +8,91 @@
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-samples-portlet</artifactId>
     <name>Spring Security - Portlet Sample</name>
-	<packaging>war</packaging>
-	<dependencies>
-	    <dependency>
-	        <groupId>org.springframework.security</groupId>
-	        <artifactId>spring-security-core</artifactId>
-	        <version>${project.version}</version>
-	    </dependency>
-	    <dependency>
-	        <groupId>org.springframework.security</groupId>
-	        <artifactId>spring-security-portlet</artifactId>
-	        <version>${project.version}</version>
-	    </dependency>	    	    
-		<dependency>
-			<groupId>portlet-api</groupId>
-			<artifactId>portlet-api</artifactId>
-			<version>1.0</version>
-			<scope>provided</scope>
-		</dependency>	    
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.web.portlet</artifactId>
-			<version>${spring.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.test</artifactId>
-		</dependency>
-<!--	    
-		<dependency>
-			<groupId>org.apache.pluto</groupId>
-			<artifactId>pluto-util</artifactId>
-			<version>1.1.4</version>
-			<scope>provided</scope>
-		</dependency>
--->		
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>jstl</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>taglibs</groupId>
-			<artifactId>standard</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>1.3.2</version>
-		</dependency>
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.5</source>
-					<target>1.5</target>
-				</configuration>
-			</plugin>
+    <packaging>war</packaging>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-portlet</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>portlet-api</groupId>
+            <artifactId>portlet-api</artifactId>
+            <version>2.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>org.springframework.web.portlet</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>org.springframework.test</artifactId>
+        </dependency>
+<!--
+        <dependency>
+            <groupId>org.apache.pluto</groupId>
+            <artifactId>pluto-util</artifactId>
+            <version>1.1.4</version>
+            <scope>provided</scope>
+        </dependency>
+-->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>taglibs</groupId>
+            <artifactId>standard</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
 <!--			<plugin>
-				<groupId>org.apache.pluto</groupId>
-				<artifactId>maven-pluto-plugin</artifactId>
-				<version>1.1.4</version>
-				<executions>
-					<execution>
-						<phase>generate-resources</phase>
-						<goals>
-							<goal>assemble</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-war-plugin</artifactId>
-				<configuration>
-					<webXml>
-						${project.build.directory}/pluto-resources/web.xml
-					</webXml>
-				</configuration>
-			</plugin>
-			-->
-		</plugins>
-	</build>
-</project>
\ No newline at end of file
+                <groupId>org.apache.pluto</groupId>
+                <artifactId>maven-pluto-plugin</artifactId>
+                <version>1.1.4</version>
+                <executions>
+                    <execution>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>assemble</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <webXml>
+                        ${project.build.directory}/pluto-resources/web.xml
+                    </webXml>
+                </configuration>
+            </plugin>
+            -->
+        </plugins>
+    </build>
+</project>