Skip to content

Commit

Permalink
updating develop poms to master versions to avoid merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
rcongiu committed Jan 31, 2016
1 parent 6d28082 commit a725332
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion json-serde-cdh4-shim/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<groupId>org.openx.data</groupId>
<artifactId>json-serde-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.3.8-SNAPSHOT</version>
<version>1.3.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion json-serde-cdh5-shim/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<groupId>org.openx.data</groupId>
<artifactId>json-serde-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.3.8-SNAPSHOT</version>
<version>1.3.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion json-serde/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>org.openx.data</groupId>
<artifactId>json-serde-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.3.8-SNAPSHOT</version>
<version>1.3.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion json-udf/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<groupId>org.openx.data</groupId>
<artifactId>json-serde-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.3.8-SNAPSHOT</version>
<version>1.3.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion json/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<groupId>org.openx.data</groupId>
<artifactId>json-serde-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.3.8-SNAPSHOT</version>
<version>1.3.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<groupId>org.openx.data</groupId>
<artifactId>json-serde-parent</artifactId>
<version>1.3.8-SNAPSHOT</version>
<version>1.3.7</version>
<packaging>pom</packaging>

<name>openx-json-serde</name>
Expand Down

0 comments on commit a725332

Please sign in to comment.