Merge branch 'master' into production

tobrien · Aug 18, 2010 · f8ba594 · f8ba594
2 parents 929719b + e515a8f
commit f8ba594
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 16 deletions.
diff --git a/cjcook-content/pom.xml b/cjcook-content/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.discursive.cjcook</groupId>
     <artifactId>cjcook-parent</artifactId>
-    <version>0.25</version>
+    <version>0.26-SNAPSHOT</version>
   </parent>
   <artifactId>cjcook-content</artifactId>
   <packaging>jar</packaging>

diff --git a/cjcook-content/src/main/resources/book-cjcook.xml b/cjcook-content/src/main/resources/book-cjcook.xml
@@ -9,18 +9,16 @@
 
     <edition>Second</edition>
 
-    <authorgroup>
-      <author>
+    <author>
         <firstname>Timothy M.</firstname>
-
+        
         <surname>O'Brien</surname>
-
+        
         <authorblurb role="web">
-          <para><ulink
-          url="http://www.oreillynet.com/cs/catalog/view/au/1738?x-t=book.view"></ulink></para>
+            <para><ulink
+                       url="http://www.oreillynet.com/cs/catalog/view/au/1738?x-t=book.view"></ulink></para>
         </authorblurb>
-      </author>
-    </authorgroup>
+    </author>
 
     <publisher>
       <publishername>${organization.name}</publishername>

diff --git a/cjcook-epub/pom.xml b/cjcook-epub/pom.xml
@@ -3,7 +3,7 @@
   <parent>
       <groupId>com.discursive.cjcook</groupId>
       <artifactId>cjcook-parent</artifactId>
-      <version>0.25</version>
+      <version>0.26-SNAPSHOT</version>
   </parent>
   <artifactId>cjcook-epub</artifactId>
   <packaging>jar</packaging>

diff --git a/cjcook-examples/pom.xml b/cjcook-examples/pom.xml
@@ -3,7 +3,7 @@
   <parent>
   	<artifactId>cjcook-parent</artifactId>
   	<groupId>com.discursive.cjcook</groupId>
-  	<version>0.25</version>
+  	<version>0.26-SNAPSHOT</version>
   </parent>
   <artifactId>cjcook-examples</artifactId>
   <packaging>jar</packaging>

diff --git a/cjcook-html/pom.xml b/cjcook-html/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.discursive.cjcook</groupId>
 		<artifactId>cjcook-parent</artifactId>
-		<version>0.25</version>
+		<version>0.26-SNAPSHOT</version>
 	</parent>
 	<artifactId>cjcook-html</artifactId>
 	<packaging>jar</packaging>

diff --git a/cjcook-pdf/pom.xml b/cjcook-pdf/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.discursive.cjcook</groupId>
         <artifactId>cjcook-parent</artifactId>
-        <version>0.25</version>
+        <version>0.26-SNAPSHOT</version>
     </parent>
     <artifactId>cjcook-pdf</artifactId>
     <packaging>jar</packaging>

diff --git a/cjcook-single-html/pom.xml b/cjcook-single-html/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.discursive.cjcook</groupId>
 		<artifactId>cjcook-parent</artifactId>
-		<version>0.25</version>
+		<version>0.26-SNAPSHOT</version>
 	</parent>
 	<artifactId>cjcook-single-html</artifactId>
 	<packaging>jar</packaging>

diff --git a/cjcook-site/pom.xml b/cjcook-site/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.discursive.cjcook</groupId>
     <artifactId>cjcook-parent</artifactId>
-    <version>0.25</version>
+    <version>0.26-SNAPSHOT</version>
   </parent>
   <artifactId>cjcook-site</artifactId>
   <packaging>jar</packaging>

diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.discursive.cjcook</groupId>
   <artifactId>cjcook-parent</artifactId>
-  <version>0.25</version>
+  <version>0.26-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Common Java Cookbook</name>
   <description>A Common Cookbook for Java</description>