Skip to content

Commit

Permalink
Merge branch 'master' into ksg
Browse files Browse the repository at this point in the history
  • Loading branch information
kingshy committed Oct 22, 2014
2 parents 3674efd + ff56dc3 commit 2a3f352
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 18 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<groupId>com.hello.suripu</groupId>
<artifactId>suripu-parent</artifactId>
<packaging>pom</packaging>
<version>0.1.92-SNAPSHOT</version>
<version>0.1.93-SNAPSHOT</version>

<properties>
<dropwizard.version>0.6.2</dropwizard.version>
Expand Down
4 changes: 2 additions & 2 deletions suripu-admin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>suripu-parent</artifactId>
<groupId>com.hello.suripu</groupId>
<version>0.1.92-SNAPSHOT</version>
<version>0.1.93-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -18,7 +18,7 @@
<dependency>
<groupId>com.hello.suripu</groupId>
<artifactId>suripu-core</artifactId>
<version>0.1.92-SNAPSHOT</version>
<version>0.1.93-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.hello.dropwizard</groupId>
Expand Down
2 changes: 1 addition & 1 deletion suripu-algorithm/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>suripu-parent</artifactId>
<groupId>com.hello.suripu</groupId>
<version>0.1.92-SNAPSHOT</version>
<version>0.1.93-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion suripu-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.hello.suripu</groupId>
<artifactId>suripu-parent</artifactId>
<version>0.1.92-SNAPSHOT</version>
<version>0.1.93-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
4 changes: 2 additions & 2 deletions suripu-app/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>suripu-parent</artifactId>
<groupId>com.hello.suripu</groupId>
<version>0.1.92-SNAPSHOT</version>
<version>0.1.93-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -13,7 +13,7 @@
<dependency>
<groupId>com.hello.suripu</groupId>
<artifactId>suripu-core</artifactId>
<version>0.1.92-SNAPSHOT</version>
<version>0.1.93-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
Expand Down
6 changes: 3 additions & 3 deletions suripu-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>suripu-parent</artifactId>
<groupId>com.hello.suripu</groupId>
<version>0.1.92-SNAPSHOT</version>
<version>0.1.93-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -19,7 +19,7 @@
<dependency>
<groupId>com.hello.suripu</groupId>
<artifactId>suripu-algorithm</artifactId>
<version>0.1.92-SNAPSHOT</version>
<version>0.1.93-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.yammer.dropwizard</groupId>
Expand All @@ -44,7 +44,7 @@
<dependency>
<groupId>com.hello.suripu</groupId>
<artifactId>suripu-api</artifactId>
<version>0.1.92-SNAPSHOT</version>
<version>0.1.93-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.xerial.snappy</groupId>
Expand Down
5 changes: 4 additions & 1 deletion suripu-core/src/main/java/com/hello/suripu/core/oauth/AccessToken.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.google.common.base.Joiner;
import com.google.common.base.Objects;
import org.joda.time.DateTime;
Expand All @@ -28,7 +30,8 @@ public class AccessToken {
@JsonIgnore
public final DateTime createdAt;

@JsonIgnore
@JsonProperty("account_id")
@JsonSerialize(using = ToStringSerializer.class)
public final Long accountId;

@JsonIgnore
Expand Down
4 changes: 2 additions & 2 deletions suripu-factory/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>suripu-parent</artifactId>
<groupId>com.hello.suripu</groupId>
<version>0.1.92-SNAPSHOT</version>
<version>0.1.93-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -13,7 +13,7 @@
<dependency>
<groupId>com.hello.suripu</groupId>
<artifactId>suripu-core</artifactId>
<version>0.1.92-SNAPSHOT</version>
<version>0.1.93-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
Expand Down
4 changes: 2 additions & 2 deletions suripu-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.hello.suripu</groupId>
<artifactId>suripu-parent</artifactId>
<version>0.1.92-SNAPSHOT</version>
<version>0.1.93-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -13,7 +13,7 @@
<dependency>
<groupId>com.hello.suripu</groupId>
<artifactId>suripu-core</artifactId>
<version>0.1.92-SNAPSHOT</version>
<version>0.1.93-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
Expand Down
6 changes: 3 additions & 3 deletions suripu-workers/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>suripu-parent</artifactId>
<groupId>com.hello.suripu</groupId>
<version>0.1.92-SNAPSHOT</version>
<version>0.1.93-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -18,12 +18,12 @@
<dependency>
<groupId>com.hello.suripu</groupId>
<artifactId>suripu-api</artifactId>
<version>0.1.92-SNAPSHOT</version>
<version>0.1.93-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.hello.suripu</groupId>
<artifactId>suripu-core</artifactId>
<version>0.1.92-SNAPSHOT</version>
<version>0.1.93-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
Expand Down

0 comments on commit 2a3f352

Please sign in to comment.