Update samples to Spring Social Facebook 2.0.0.RELEASE

spring-attic · Apr 15, 2015 · b359e97 · b359e97
1 parent 0e21350
commit b359e97
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 13 deletions.
diff --git a/spring-social-quickstart/build.gradle b/spring-social-quickstart/build.gradle
@@ -13,6 +13,9 @@ buildscript {
     }
 }
 
+sourceCompatibility=1.7
+targetCompatibility=1.7
+
 war {
   baseName = 'spring-social-quickstart'
 }

diff --git a/spring-social-quickstart/gradle.properties b/spring-social-quickstart/gradle.properties
@@ -9,7 +9,7 @@ servletApiVersion = 3.0.1
 slf4jVersion = 1.7.5
 springSecurityVersion = 3.2.3.RELEASE
 springSocialVersion = 1.1.0.RELEASE
-springSocialFacebookVersion = 1.1.0.RELEASE
+springSocialFacebookVersion = 2.0.0.RELEASE
 springVersion = 4.0.3.RELEASE
 thymeleafVersion = 2.1.2.RELEASE
 thymeleafLayoutVersion = 1.2.2

diff --git a/spring-social-showcase-boot/build.gradle b/spring-social-showcase-boot/build.gradle
@@ -33,7 +33,11 @@ repositories {
 
 dependencies {
   compile("org.springframework.boot:spring-boot-starter-social-facebook")
-  compile("org.springframework.social:spring-social-facebook:2.0.0.RC1")
+
+  // Override Spring Boot's choice of Spring Social Facebook version
+  compile("org.springframework.social:spring-social-facebook:2.0.0.RELEASE")
+  compile("org.springframework.social:spring-social-facebook-web:2.0.0.RELEASE")
+
   compile("org.springframework.boot:spring-boot-starter-social-twitter")
   compile("org.springframework.boot:spring-boot-starter-social-linkedin")
   compile("org.springframework.boot:spring-boot-starter-actuator")

diff --git a/spring-social-showcase-boot/src/main/resources/application.properties b/spring-social-showcase-boot/src/main/resources/application.properties
@@ -1,7 +1,7 @@
-facebook.appKey={{SEE README}}
-facebook.appSecret={{SEE README}}
+spring.social.facebook.app-id={{SEE README}}
+spring.social.facebook.app-secret={{SEE README}}
 facebook.appNamespace={{SEE README}}
-twitter.appKey={{SEE README}}
-twitter.appSecret={{SEE README}}
-linkedin.appKey={{SEE README}}
-linkedin.appSecret={{SEE README}}
+spring.social.twitter.app-id={{SEE README}}
+spring.social.twitter.app-secret={{SEE README}}
+spring.social.linkedin.app-id={{SEE README}}
+spring.social.linkedin.app-secret={{SEE README}}
diff --git a/spring-social-showcase-implicit/build.gradle b/spring-social-showcase-implicit/build.gradle
@@ -20,7 +20,7 @@ war {
 eclipse {
   jdt {
     sourceCompatibility = 1.7
-    targetCompatibility = 1.5
+    targetCompatibility = 1.7
   }
 }
 
@@ -32,6 +32,11 @@ repositories {
 
 dependencies {
   compile("org.springframework.boot:spring-boot-starter-social-facebook")
+
+  // Override Spring Boot's choice of Spring Social Facebook version
+  compile("org.springframework.social:spring-social-facebook:2.0.0.RELEASE")
+  compile("org.springframework.social:spring-social-facebook-web:2.0.0.RELEASE")
+
   compile("org.springframework.boot:spring-boot-starter-actuator")
   compile("org.springframework.boot:spring-boot-starter-security")
   compile("org.springframework.boot:spring-boot-starter-thymeleaf")

diff --git a/spring-social-showcase-implicit/src/main/resources/application.properties b/spring-social-showcase-implicit/src/main/resources/application.properties
@@ -1,3 +1,3 @@
-spring.social.facebook.appId={{SEE README}}
-spring.social.facebook.appSecret={{SEE README}}
+spring.social.facebook.app-id={{SEE README}}
+spring.social.facebook.app-secret={{SEE README}}
 facebook.appNamespace={{SEE README}}
diff --git a/spring-social-showcase-sec/build.gradle b/spring-social-showcase-sec/build.gradle
@@ -13,6 +13,9 @@ buildscript {
     }
 }
 
+sourceCompatibility=1.7
+targetCompatibility=1.7
+
 war {
   baseName = 'spring-social-showcase'
 }

diff --git a/spring-social-showcase-sec/gradle.properties b/spring-social-showcase-sec/gradle.properties
@@ -9,7 +9,7 @@ servletApiVersion = 3.0.1
 slf4jVersion = 1.7.5
 springSecurityVersion = 3.2.3.RELEASE
 springSocialVersion = 1.1.0.RELEASE
-springSocialFacebookVersion = 1.1.0.RELEASE
+springSocialFacebookVersion = 2.0.0.RELEASE
 springSocialTwitterVersion = 1.1.0.RELEASE
 springSocialLinkedInVersion = 1.0.0.RELEASE
 springVersion = 4.0.3.RELEASE

diff --git a/spring-social-showcase/gradle.properties b/spring-social-showcase/gradle.properties
@@ -9,7 +9,7 @@ servletApiVersion = 3.0.1
 slf4jVersion = 1.7.5
 springSecurityVersion = 3.2.3.RELEASE
 springSocialVersion = 1.1.0.RELEASE
-springSocialFacebookVersion = 2.0.0.RC1
+springSocialFacebookVersion = 2.0.0.RELEASE
 springSocialTwitterVersion = 1.1.0.RELEASE
 springSocialLinkedInVersion = 1.0.0.RELEASE
 springVersion = 4.0.3.RELEASE