Skip to content

Commit ccbb4ba

Browse files
committed
updating develop poms to master versions to avoid merge conflicts
1 parent ed1fb90 commit ccbb4ba

5 files changed

Lines changed: 5 additions & 5 deletions

File tree

json-serde-cdh4-shim/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>org.openx.data</groupId>
66
<artifactId>json-serde-parent</artifactId>
77
<relativePath>../pom.xml</relativePath>
8-
<version>1.3.7-SNAPSHOT</version>
8+
<version>1.3.6</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

json-serde-cdh5-shim/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>org.openx.data</groupId>
66
<artifactId>json-serde-parent</artifactId>
77
<relativePath>../pom.xml</relativePath>
8-
<version>1.3.7-SNAPSHOT</version>
8+
<version>1.3.6</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

json-serde/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>org.openx.data</groupId>
66
<artifactId>json-serde-parent</artifactId>
77
<relativePath>../pom.xml</relativePath>
8-
<version>1.3.7-SNAPSHOT</version>
8+
<version>1.3.6</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

json/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>org.openx.data</groupId>
66
<artifactId>json-serde-parent</artifactId>
77
<relativePath>../pom.xml</relativePath>
8-
<version>1.3.7-SNAPSHOT</version>
8+
<version>1.3.6</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<groupId>org.openx.data</groupId>
55
<artifactId>json-serde-parent</artifactId>
6-
<version>1.3.7-SNAPSHOT</version>
6+
<version>1.3.6</version>
77
<packaging>pom</packaging>
88

99
<name>openx-json-serde</name>

0 commit comments

Comments
 (0)