Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
borud committed Apr 23, 2012
2 parents d37683e + a5cf1b8 commit 44f7769
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion a3/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.cloudname</groupId>
<artifactId>cloudname-parent</artifactId>
<version>2.7-SNAPSHOT</version>
<version>2.8-SNAPSHOT</version>
</parent>

<artifactId>a3</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion cn/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.cloudname</groupId>
<artifactId>cloudname-parent</artifactId>
<version>2.7-SNAPSHOT</version>
<version>2.8-SNAPSHOT</version>
</parent>

<artifactId>cn</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion codelabs/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.cloudname</groupId>
<artifactId>cloudname-parent</artifactId>
<version>2.7-SNAPSHOT</version>
<version>2.8-SNAPSHOT</version>
</parent>

<artifactId>codelabs</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion flags/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.cloudname</groupId>
<artifactId>cloudname-parent</artifactId>
<version>2.7-SNAPSHOT</version>
<version>2.8-SNAPSHOT</version>
</parent>

<artifactId>flags</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion idgen/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.cloudname</groupId>
<artifactId>cloudname-parent</artifactId>
<version>2.7-SNAPSHOT</version>
<version>2.8-SNAPSHOT</version>
</parent>

<artifactId>idgen</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion log/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.cloudname</groupId>
<artifactId>cloudname-parent</artifactId>
<version>2.7-SNAPSHOT</version>
<version>2.8-SNAPSHOT</version>
</parent>

<artifactId>log</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Expand Up @@ -4,7 +4,7 @@

<groupId>org.cloudname</groupId>
<artifactId>cloudname-parent</artifactId>
<version>2.7-SNAPSHOT</version>
<version>2.8-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Cloudname Parent</name>
Expand Down Expand Up @@ -42,7 +42,7 @@
<cn.joda-time.version>2.0</cn.joda-time.version>

<!-- Internal dependency versions -->
<cn.version>2.7-SNAPSHOT</cn.version>
<cn.version>2.8-SNAPSHOT</cn.version>
</properties>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion testtools/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.cloudname</groupId>
<artifactId>cloudname-parent</artifactId>
<version>2.7-SNAPSHOT</version>
<version>2.8-SNAPSHOT</version>
</parent>

<artifactId>testtools</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion timber/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.cloudname</groupId>
<artifactId>cloudname-parent</artifactId>
<version>2.7-SNAPSHOT</version>
<version>2.8-SNAPSHOT</version>
</parent>

<artifactId>timber</artifactId>
Expand Down

0 comments on commit 44f7769

Please sign in to comment.