Update dependencies

spring-attic · Jul 5, 2013 · 1782e55 · 1782e55
1 parent 9132c33
commit 1782e55
Show file tree

Hide file tree

Showing 13 changed files with 56 additions and 43 deletions.
diff --git a/spring-social-canvas/README.md b/spring-social-canvas/README.md
@@ -2,9 +2,10 @@ Spring Social Canvas
 ====================
 This sample app demonstrates how to use Spring Social within a Facebook Canvas application.
 
-To run, import the project into your IDE and deploy to a Servlet 2.5 or > container such as Tomcat 6 or 7. The container should also be able to serve the application over HTTPS.
+IMPORTANT: Note that the steps for running the sample differ slightly from the other Spring Social samples:
 
-Access the application via Facebook at http://apps.facebook.com/springsocialcanvas. This is the canvas page configured in Facebook for the Spring Social Canvas sample.
+ 1. Deploy and start the application on a Servlet 2.5 or > container such as Tomcat 6 or 7 *and* ensure that HTTPS support is enabled. For convenience, you should be able to run the application using Maven with `mvn tomcat:run`.
+ 2. Navigate to http://apps.facebook.com/springsocialcanvas in your browser. This is the canvas page configured in Facebook for the Spring Social Canvas sample.
 
 The pertinent details of the application's Facebook configuration is as follows:
  - __Display Name__: Spring Social Canvas

diff --git a/spring-social-canvas/pom.xml b/spring-social-canvas/pom.xml
@@ -11,8 +11,8 @@
 		<java-version>1.6</java-version>
 		<org.springframework.social-version>1.1.0.BUILD-SNAPSHOT</org.springframework.social-version>
 		<org.springframework.social.facebook-version>1.1.0.BUILD-SNAPSHOT</org.springframework.social.facebook-version>
-		<org.springframework-version>3.2.1.RELEASE</org.springframework-version>
-		<org.springframework.security.crypto-version>3.1.3.RELEASE</org.springframework.security.crypto-version>
+		<org.springframework-version>3.2.3.RELEASE</org.springframework-version>
+		<org.springframework.security.crypto-version>3.1.4.RELEASE</org.springframework.security.crypto-version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -136,6 +136,9 @@
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>tomcat-maven-plugin</artifactId>
 				<version>1.1</version>
+				<configuration>
+					<httpsPort>8443</httpsPort>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>

diff --git a/spring-social-movies/pom.xml b/spring-social-movies/pom.xml
@@ -11,7 +11,7 @@
 		<java-version>1.6</java-version>
 		<org.springframework.social-version>1.1.0.BUILD-SNAPSHOT</org.springframework.social-version>
 		<org.springframework-version>3.2.3.RELEASE</org.springframework-version>
-		<org.springframework.security-version>3.1.3.RELEASE</org.springframework.security-version>
+		<org.springframework.security-version>3.1.4.RELEASE</org.springframework.security-version>
 		<org.slf4j-version>1.7.5</org.slf4j-version>
 	</properties>
 	<dependencies>

diff --git a/spring-social-popup/pom.xml b/spring-social-popup/pom.xml
@@ -13,7 +13,7 @@
 		<org.springframework.social.facebook-version>1.1.0.BUILD-SNAPSHOT</org.springframework.social.facebook-version>
 		<org.springframework.social.twitter-version>1.1.0.BUILD-SNAPSHOT</org.springframework.social.twitter-version>
 		<org.springframework-version>3.2.3.RELEASE</org.springframework-version>
-		<org.springframework.security-version>3.1.3.RELEASE</org.springframework.security-version>
+		<org.springframework.security-version>3.1.4.RELEASE</org.springframework.security-version>
 		<org.slf4j-version>1.7.5</org.slf4j-version>
 	</properties>
 	<dependencies>

diff --git a/spring-social-quickstart-3.0.x/pom.xml b/spring-social-quickstart-3.0.x/pom.xml
@@ -12,7 +12,7 @@
 		<org.springframework.social-version>1.0.3.RELEASE</org.springframework.social-version>
 		<org.springframework.social.facebook-version>1.0.3.RELEASE</org.springframework.social.facebook-version>
 		<org.springframework-version>3.0.7.RELEASE</org.springframework-version>
-		<org.springframework.security.crypto-version>3.1.3.RELEASE</org.springframework.security.crypto-version>
+		<org.springframework.security.crypto-version>3.1.4.RELEASE</org.springframework.security.crypto-version>
 	</properties>
 	<dependencies>
 		<dependency>

diff --git a/spring-social-quickstart/pom.xml b/spring-social-quickstart/pom.xml
@@ -12,7 +12,7 @@
 		<org.springframework.social-version>1.1.0.BUILD-SNAPSHOT</org.springframework.social-version>
 		<org.springframework.social.facebook-version>1.1.0.BUILD-SNAPSHOT</org.springframework.social.facebook-version>
 		<org.springframework-version>3.2.3.RELEASE</org.springframework-version>
-		<org.springframework.security.crypto-version>3.1.3.RELEASE</org.springframework.security.crypto-version>
+		<org.springframework.security.crypto-version>3.1.4.RELEASE</org.springframework.security.crypto-version>
 	</properties>
 	<dependencies>
 		<dependency>

diff --git a/spring-social-showcase-sec-xml/pom.xml b/spring-social-showcase-sec-xml/pom.xml
@@ -13,9 +13,9 @@
 		<org.springframework.social.facebook-version>1.1.0.BUILD-SNAPSHOT</org.springframework.social.facebook-version>
 		<org.springframework.social.twitter-version>1.1.0.BUILD-SNAPSHOT</org.springframework.social.twitter-version>
 		<org.springframework.social.linkedin-version>1.0.0.BUILD-SNAPSHOT</org.springframework.social.linkedin-version>
-		<org.springframework-version>3.2.1.RELEASE</org.springframework-version>
-		<org.springframework.security-version>3.1.3.RELEASE</org.springframework.security-version>
-		<org.slf4j-version>1.7.2</org.slf4j-version>
+		<org.springframework-version>3.2.3.RELEASE</org.springframework-version>
+		<org.springframework.security-version>3.1.4.RELEASE</org.springframework.security-version>
+		<org.slf4j-version>1.7.5</org.slf4j-version>
 	</properties>
 	<dependencies>
 		<!-- Spring -->
@@ -103,19 +103,19 @@
 	    </dependency>
 
 	    <!-- Apache Http Client -->
-<!-- 	    <dependency>
+ 	    <dependency>
 	    	<groupId>org.apache.httpcomponents</groupId>
 	    	<artifactId>httpclient</artifactId>
-	    	<version>4.1.2</version>
+	    	<version>4.2.5</version>
 			<exclusions>
-				Exclude Commons Logging in favor of SLF4j
+				<!-- Exclude Commons Logging in favor of SLF4j -->
 				<exclusion>
 					<groupId>commons-logging</groupId>
 					<artifactId>commons-logging</artifactId>
 				</exclusion>
 			</exclusions>	    	
 	    </dependency>
- -->	    
+
 		<!-- JSR 303 with Hibernate Validator -->
 		<dependency>
 			<groupId>javax.validation</groupId>
@@ -267,6 +267,9 @@
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>tomcat-maven-plugin</artifactId>
 				<version>1.1</version>
+				<configuration>
+					<path>/spring-social-showcase</path>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>

diff --git a/spring-social-showcase-sec/pom.xml b/spring-social-showcase-sec/pom.xml
@@ -13,9 +13,9 @@
 		<org.springframework.social.facebook-version>1.1.0.BUILD-SNAPSHOT</org.springframework.social.facebook-version>
 		<org.springframework.social.twitter-version>1.1.0.BUILD-SNAPSHOT</org.springframework.social.twitter-version>
 		<org.springframework.social.linkedin-version>1.0.0.BUILD-SNAPSHOT</org.springframework.social.linkedin-version>
-		<org.springframework-version>3.2.1.RELEASE</org.springframework-version>
-		<org.springframework.security-version>3.1.3.RELEASE</org.springframework.security-version>
-		<org.slf4j-version>1.7.2</org.slf4j-version>
+		<org.springframework-version>3.2.3.RELEASE</org.springframework-version>
+		<org.springframework.security-version>3.1.4.RELEASE</org.springframework.security-version>
+		<org.slf4j-version>1.7.5</org.slf4j-version>
 	</properties>
 	<dependencies>
 		<!-- Spring -->
@@ -103,19 +103,19 @@
 	    </dependency>
 
 	    <!-- Apache Http Client -->
-<!-- 	    <dependency>
+		<dependency>
 	    	<groupId>org.apache.httpcomponents</groupId>
 	    	<artifactId>httpclient</artifactId>
-	    	<version>4.1.2</version>
+	    	<version>4.2.5</version>
 			<exclusions>
-				Exclude Commons Logging in favor of SLF4j
+				<!-- Exclude Commons Logging in favor of SLF4j -->
 				<exclusion>
 					<groupId>commons-logging</groupId>
 					<artifactId>commons-logging</artifactId>
 				</exclusion>
 			</exclusions>	    	
 	    </dependency>
- -->	    
+
 		<!-- JSR 303 with Hibernate Validator -->
 		<dependency>
 			<groupId>javax.validation</groupId>
@@ -267,6 +267,9 @@
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>tomcat-maven-plugin</artifactId>
 				<version>1.1</version>
+				<configuration>
+					<path>/spring-social-showcase</path>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>

diff --git a/...wcase-sec/src/main/java/org/springframework/social/showcase/config/application.properties b/...wcase-sec/src/main/java/org/springframework/social/showcase/config/application.properties
@@ -1,4 +1,4 @@
-facebook.clientId=0b754d95f9c9899b0d6c4454b6f2dde7
+facebook.clientId=162886103757745
 facebook.clientSecret=fa8a9825f555a7a8949ec48fb93bda58
 facebook.appNamespace=socialshowcase
 twitter.consumerKey=YR571S2JiVBOFyJS5MEg

diff --git a/spring-social-showcase-xml/pom.xml b/spring-social-showcase-xml/pom.xml
@@ -12,10 +12,10 @@
 		<org.springframework.social-version>1.1.0.BUILD-SNAPSHOT</org.springframework.social-version>
 		<org.springframework.social.facebook-version>1.1.0.BUILD-SNAPSHOT</org.springframework.social.facebook-version>
 		<org.springframework.social.twitter-version>1.1.0.BUILD-SNAPSHOT</org.springframework.social.twitter-version>
-		<org.springframework.social.linkedin-version>1.0.0.M2</org.springframework.social.linkedin-version>
-		<org.springframework-version>3.2.1.RELEASE</org.springframework-version>
-		<org.springframework.security-version>3.1.3.RELEASE</org.springframework.security-version>
-		<org.slf4j-version>1.6.1</org.slf4j-version>
+		<org.springframework.social.linkedin-version>1.0.0.BUILD-SNAPSHOT</org.springframework.social.linkedin-version>
+		<org.springframework-version>3.2.3.RELEASE</org.springframework-version>
+		<org.springframework.security-version>3.1.4.RELEASE</org.springframework.security-version>
+		<org.slf4j-version>1.7.5</org.slf4j-version>
 	</properties>
 	<dependencies>
 		<!-- Spring -->
@@ -103,19 +103,19 @@
 	    </dependency>
 
 	    <!-- Apache Http Client -->
-<!-- 	    <dependency>
+ 	    <dependency>
 	    	<groupId>org.apache.httpcomponents</groupId>
 	    	<artifactId>httpclient</artifactId>
-	    	<version>4.1.2</version>
+	    	<version>4.2.5</version>
 			<exclusions>
-				Exclude Commons Logging in favor of SLF4j
+				<!-- Exclude Commons Logging in favor of SLF4j -->
 				<exclusion>
 					<groupId>commons-logging</groupId>
 					<artifactId>commons-logging</artifactId>
 				</exclusion>
 			</exclusions>	    	
 	    </dependency>
- -->	    
+
 		<!-- JSR 303 with Hibernate Validator -->
 		<dependency>
 			<groupId>javax.validation</groupId>
@@ -267,6 +267,9 @@
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>tomcat-maven-plugin</artifactId>
 				<version>1.1</version>
+				<configuration>
+					<path>/spring-social-showcase</path>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>

diff --git a/spring-social-showcase/pom.xml b/spring-social-showcase/pom.xml
@@ -13,9 +13,9 @@
 		<org.springframework.social.facebook-version>1.1.0.BUILD-SNAPSHOT</org.springframework.social.facebook-version>
 		<org.springframework.social.twitter-version>1.1.0.BUILD-SNAPSHOT</org.springframework.social.twitter-version>
 		<org.springframework.social.linkedin-version>1.0.0.BUILD-SNAPSHOT</org.springframework.social.linkedin-version>
-		<org.springframework-version>3.2.2.RELEASE</org.springframework-version>
-		<org.springframework.security-version>3.1.3.RELEASE</org.springframework.security-version>
-		<org.slf4j-version>1.7.2</org.slf4j-version>
+		<org.springframework-version>3.2.3.RELEASE</org.springframework-version>
+		<org.springframework.security-version>3.1.4.RELEASE</org.springframework.security-version>
+		<org.slf4j-version>1.7.5</org.slf4j-version>
 	</properties>
 	<dependencies>
 		<!-- Spring -->
@@ -103,19 +103,19 @@
 	    </dependency>
 
 	    <!-- Apache Http Client -->
-<!-- 	    <dependency>
+ 	    <dependency>
 	    	<groupId>org.apache.httpcomponents</groupId>
 	    	<artifactId>httpclient</artifactId>
-	    	<version>4.1.2</version>
+	    	<version>4.2.5</version>
 			<exclusions>
-				Exclude Commons Logging in favor of SLF4j
+				<!-- Exclude Commons Logging in favor of SLF4j -->
 				<exclusion>
 					<groupId>commons-logging</groupId>
 					<artifactId>commons-logging</artifactId>
 				</exclusion>
 			</exclusions>	    	
 	    </dependency>
- -->	    
+
 		<!-- JSR 303 with Hibernate Validator -->
 		<dependency>
 			<groupId>javax.validation</groupId>

diff --git a/spring-social-twitter4j/pom.xml b/spring-social-twitter4j/pom.xml
@@ -10,9 +10,9 @@
 	<properties>
 		<java-version>1.6</java-version>
 		<org.springframework.social-version>1.1.0.BUILD-SNAPSHOT</org.springframework.social-version>
-		<org.springframework-version>3.2.1.RELEASE</org.springframework-version>
-		<org.springframework.security-version>3.1.3.RELEASE</org.springframework.security-version>
-		<org.slf4j-version>1.7.2</org.slf4j-version>
+		<org.springframework-version>3.2.3.RELEASE</org.springframework-version>
+		<org.springframework.security-version>3.1.4.RELEASE</org.springframework.security-version>
+		<org.slf4j-version>1.7.5</org.slf4j-version>
 	</properties>
 	<dependencies>
 		<!-- Spring -->
@@ -73,7 +73,7 @@
 	    <dependency>
 	        <groupId>org.twitter4j</groupId>
 	        <artifactId>twitter4j-core</artifactId>
-	        <version>2.2.3</version>
+	        <version>3.0.3</version>
         </dependency>
 
 		<!-- JSR 303 with Hibernate Validator -->

diff --git a/.../src/main/java/org/springframework/social/showcase/twitter/connect/TwitterApiAdapter.java b/.../src/main/java/org/springframework/social/showcase/twitter/connect/TwitterApiAdapter.java
@@ -47,7 +47,7 @@ public void setConnectionValues(Twitter api, ConnectionValues values) {
 			values.setProviderUserId(Long.toString(user.getId()));
 			values.setDisplayName("@" + user.getScreenName());
 			values.setProfileUrl("http://twitter.com/" + user.getScreenName());
-			values.setImageUrl(user.getProfileImageURL().toExternalForm());
+			values.setImageUrl(user.getProfileImageURL());
 		} catch (TwitterException e) {
 		}		
 	}