Permalink
Browse files

update dependency versions to release/latest stable versions, resolve…

… version conflicts; replace tabs with spaces in UserBlogInf; remove empty class javadoc comments
  • Loading branch information...
1 parent 802c513 commit ea0acba8aab24d6eee7e2f5129a9ebecc121d164 @sdouglass committed Apr 15, 2012
Showing with 95 additions and 280 deletions.
  1. +42 −23 pom.xml
  2. +0 −4 src/main/java/org/springframework/social/tumblr/api/AvatarSize.java
  3. +0 −4 src/main/java/org/springframework/social/tumblr/api/BlogInfo.java
  4. +0 −4 src/main/java/org/springframework/social/tumblr/api/BlogOperations.java
  5. +0 −4 src/main/java/org/springframework/social/tumblr/api/BlogPostOperations.java
  6. +0 −4 src/main/java/org/springframework/social/tumblr/api/BlogPostsOperations.java
  7. +0 −4 src/main/java/org/springframework/social/tumblr/api/ChatMessage.java
  8. +0 −4 src/main/java/org/springframework/social/tumblr/api/Follower.java
  9. +0 −4 src/main/java/org/springframework/social/tumblr/api/Followers.java
  10. +0 −4 src/main/java/org/springframework/social/tumblr/api/Following.java
  11. +0 −4 src/main/java/org/springframework/social/tumblr/api/Likes.java
  12. +0 −4 src/main/java/org/springframework/social/tumblr/api/ModifyAudioPost.java
  13. +0 −4 src/main/java/org/springframework/social/tumblr/api/ModifyChatPost.java
  14. +0 −4 src/main/java/org/springframework/social/tumblr/api/ModifyLinkPost.java
  15. +0 −4 src/main/java/org/springframework/social/tumblr/api/ModifyPhotoPost.java
  16. +0 −4 src/main/java/org/springframework/social/tumblr/api/ModifyPost.java
  17. +0 −4 src/main/java/org/springframework/social/tumblr/api/ModifyQuotePost.java
  18. +0 −4 src/main/java/org/springframework/social/tumblr/api/ModifyTextPost.java
  19. +0 −4 src/main/java/org/springframework/social/tumblr/api/ModifyVideoPost.java
  20. +0 −4 src/main/java/org/springframework/social/tumblr/api/Photo.java
  21. +0 −4 src/main/java/org/springframework/social/tumblr/api/PhotoSize.java
  22. +0 −4 src/main/java/org/springframework/social/tumblr/api/Post.java
  23. +0 −4 src/main/java/org/springframework/social/tumblr/api/PostState.java
  24. +0 −4 src/main/java/org/springframework/social/tumblr/api/PostType.java
  25. +0 −4 src/main/java/org/springframework/social/tumblr/api/Posts.java
  26. +0 −4 src/main/java/org/springframework/social/tumblr/api/PostsQuery.java
  27. +0 −4 src/main/java/org/springframework/social/tumblr/api/ReblogPost.java
  28. +0 −4 src/main/java/org/springframework/social/tumblr/api/Tumblr.java
  29. +0 −4 src/main/java/org/springframework/social/tumblr/api/UserInfo.java
  30. +53 −57 src/main/java/org/springframework/social/tumblr/api/UserInfoBlog.java
  31. +0 −4 src/main/java/org/springframework/social/tumblr/api/UserOperations.java
  32. +0 −4 src/main/java/org/springframework/social/tumblr/api/VideoPostPlayer.java
  33. +0 −4 src/main/java/org/springframework/social/tumblr/api/impl/AbstractBlogOperations.java
  34. +0 −4 src/main/java/org/springframework/social/tumblr/api/impl/AbstractTumblrOperations.java
  35. +0 −4 src/main/java/org/springframework/social/tumblr/api/impl/BlogPostTemplate.java
  36. +0 −4 src/main/java/org/springframework/social/tumblr/api/impl/BlogPostsTemplate.java
  37. +0 −4 src/main/java/org/springframework/social/tumblr/api/impl/BlogTemplate.java
  38. +0 −4 src/main/java/org/springframework/social/tumblr/api/impl/TumblrHttpMessageConverter.java
  39. +0 −4 src/main/java/org/springframework/social/tumblr/api/impl/TumblrTemplate.java
  40. +0 −4 src/main/java/org/springframework/social/tumblr/api/impl/UserTemplate.java
  41. +0 −4 src/main/java/org/springframework/social/tumblr/api/impl/json/BlogInfoMixin.java
  42. +0 −4 src/main/java/org/springframework/social/tumblr/api/impl/json/BlogInfoResponse.java
  43. +0 −4 src/main/java/org/springframework/social/tumblr/api/impl/json/FollowersMixin.java
  44. +0 −4 src/main/java/org/springframework/social/tumblr/api/impl/json/FollowingMixin.java
  45. +0 −4 src/main/java/org/springframework/social/tumblr/api/impl/json/LikesMixin.java
  46. +0 −4 src/main/java/org/springframework/social/tumblr/api/impl/json/PostMixin.java
  47. +0 −4 src/main/java/org/springframework/social/tumblr/api/impl/json/PostsMixin.java
  48. +0 −4 src/main/java/org/springframework/social/tumblr/api/impl/json/TumblrModule.java
  49. +0 −4 src/main/java/org/springframework/social/tumblr/api/impl/json/TumblrResponse.java
  50. +0 −4 src/main/java/org/springframework/social/tumblr/api/impl/json/TumblrResponseMixin.java
  51. +0 −4 src/main/java/org/springframework/social/tumblr/api/impl/json/UserInfoMixin.java
  52. +0 −4 src/main/java/org/springframework/social/tumblr/api/impl/json/UserInfoResponse.java
View
@@ -8,8 +8,10 @@
<name>Spring Social Tumblr</name>
<url>http://maven.apache.org</url>
<properties>
+ <spring-core.version>3.1.0.RELEASE</spring-core.version>
+ <spring-security-crypto.version>3.1.0.RELEASE</spring-security-crypto.version>
<spring-social.version>1.0.2.RELEASE</spring-social.version>
- <jackson.version>1.8.5</jackson.version>
+ <jackson.version>1.9.3</jackson.version>
</properties>
<dependencies>
<dependency>
@@ -23,26 +25,26 @@
<artifactId>log4j</artifactId>
<version>1.2.14</version>
</dependency>
- <!-- Spring Social -->
- <dependency>
- <groupId>org.springframework.social</groupId>
- <artifactId>spring-social-core</artifactId>
- <version>${spring-social.version}</version>
- </dependency>
<dependency>
- <groupId>org.springframework.social</groupId>
- <artifactId>spring-social-twitter</artifactId>
- <version>${spring-social.version}</version>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${spring-core.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-crypto</artifactId>
- <version>3.1.0.RC3</version>
+ <version>${spring-security-crypto.version}</version>
</dependency>
+ <!-- Spring Social -->
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>3.1.0.M2</version>
+ <groupId>org.springframework.social</groupId>
+ <artifactId>spring-social-core</artifactId>
+ <version>${spring-social.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.social</groupId>
+ <artifactId>spring-social-twitter</artifactId>
+ <version>${spring-social.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
@@ -56,17 +58,34 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
- <repositories>
- <repository>
- <id>org.springframework.maven.milestone</id>
- <name>Spring Maven Milestone Repository</name>
- <url>http://maven.springframework.org/milestone</url>
- </repository>
- </repositories>
</project>
@@ -1,9 +1,5 @@
package org.springframework.social.tumblr.api;
-/**
- * @author sam
- * @version $Id$
- */
public enum AvatarSize {
/**
@@ -1,9 +1,5 @@
package org.springframework.social.tumblr.api;
-/**
- * @author sam
- * @version $Id$
- */
public class BlogInfo {
private String name;
@@ -1,9 +1,5 @@
package org.springframework.social.tumblr.api;
-/**
- * @author sam
- * @version $Id$
- */
public interface BlogOperations {
BlogInfo info();
@@ -1,9 +1,5 @@
package org.springframework.social.tumblr.api;
-/**
- * @author sam
- * @version $Id$
- */
public interface BlogPostOperations {
public void create(ModifyPost modifyPost);
@@ -1,9 +1,5 @@
package org.springframework.social.tumblr.api;
-/**
- * @author sam
- * @version $Id$
- */
public interface BlogPostsOperations {
Posts search(PostsQuery query);
@@ -1,9 +1,5 @@
package org.springframework.social.tumblr.api;
-/**
- * @author sam
- * @version $Id$
- */
public class ChatMessage {
private String label;
@@ -1,9 +1,5 @@
package org.springframework.social.tumblr.api;
-/**
- * @author sam
- * @version $Id$
- */
public class Follower {
private String name;
@@ -3,10 +3,6 @@
import java.util.ArrayList;
import java.util.List;
-/**
- * @author sam
- * @version $Id$
- */
public class Followers {
private int totalFollowers;
@@ -2,10 +2,6 @@
import java.util.List;
-/**
- * @author sam
- * @version $Id$
- */
public class Following {
private int totalBlogs;
@@ -2,10 +2,6 @@
import java.util.List;
-/**
- * @author sam
- * @version $Id$
- */
public class Likes {
private int totalLikes;
@@ -3,10 +3,6 @@
import org.springframework.core.io.Resource;
import org.springframework.util.MultiValueMap;
-/**
- * @author sam
- * @version $Id$
- */
public class ModifyAudioPost extends ModifyPost {
private String externalUrl;
@@ -2,10 +2,6 @@
import org.springframework.util.MultiValueMap;
-/**
- * @author sam
- * @version $Id$
- */
public class ModifyChatPost extends ModifyPost {
private String conversation;
@@ -2,10 +2,6 @@
import org.springframework.util.MultiValueMap;
-/**
- * @author sam
- * @version $Id$
- */
public class ModifyLinkPost extends ModifyPost {
private String url;
@@ -9,10 +9,6 @@
import java.net.URLEncoder;
import java.util.List;
-/**
- * @author sam
- * @version $Id$
- */
public class ModifyPhotoPost extends ModifyPost {
private String source;
@@ -7,10 +7,6 @@
import java.io.*;
import java.util.*;
-/**
- * @author sam
- * @version $Id$
- */
@SuppressWarnings("unused")
public abstract class ModifyPost {
@@ -2,10 +2,6 @@
import org.springframework.util.MultiValueMap;
-/**
- * @author sam
- * @version $Id$
- */
public class ModifyQuotePost extends ModifyPost {
private String quote;
@@ -2,10 +2,6 @@
import org.springframework.util.MultiValueMap;
-/**
- * @author sam
- * @version $Id$
- */
public class ModifyTextPost extends ModifyPost {
private String title;
@@ -3,10 +3,6 @@
import org.springframework.core.io.Resource;
import org.springframework.util.MultiValueMap;
-/**
- * @author sam
- * @version $Id$
- */
public class ModifyVideoPost extends ModifyPost {
private String embed;
@@ -2,10 +2,6 @@
import java.util.List;
-/**
- * @author sam
- * @version $Id$
- */
public class Photo {
private String caption;
@@ -1,9 +1,5 @@
package org.springframework.social.tumblr.api;
-/**
- * @author sam
- * @version $Id$
- */
public class PhotoSize {
private int width;
@@ -2,10 +2,6 @@
import java.util.List;
-/**
- * @author sam
- * @version $Id$
- */
public class Post {
private long id;
@@ -1,9 +1,5 @@
package org.springframework.social.tumblr.api;
-/**
- * @author sam
- * @version $Id$
- */
public enum PostState {
PUBLISHED("published"),
DRAFT("draft"),
@@ -1,9 +1,5 @@
package org.springframework.social.tumblr.api;
-/**
- * @author sam
- * @version $Id$
- */
public enum PostType {
TEXT("text"),
PHOTO("photo"),
@@ -2,10 +2,6 @@
import java.util.List;
-/**
- * @author sam
- * @version $Id$
- */
public class Posts {
private BlogInfo blogInfo;
@@ -3,10 +3,6 @@
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
-/**
- * @author sam
- * @version $Id$
- */
public class PostsQuery {
public static enum PostFormat {
@@ -2,10 +2,6 @@
import org.springframework.util.MultiValueMap;
-/**
- * @author sam
- * @version $Id$
- */
public class ReblogPost extends ModifyPost {
private String reblogKey;
@@ -1,9 +1,5 @@
package org.springframework.social.tumblr.api;
-/**
- * @author sam
- * @version $Id$
- */
public interface Tumblr {
BlogOperations blogOperations(String blogHostname);
@@ -2,10 +2,6 @@
import java.util.List;
-/**
- * @author sam
- * @version $Id$
- */
public class UserInfo {
private int following;
Oops, something went wrong.

0 comments on commit ea0acba

Please sign in to comment.