From f6dec69c8c37f394ea97c712a99ff19473d90668 Mon Sep 17 00:00:00 2001
From: Steve Ebersole <steve@hibernate.org>
Date: Fri, 30 Dec 2011 12:15:23 -0600
Subject: [PATCH] HHH-6909 - "Getting Started Guide" example code cannot be run
 successfully

---
 build.gradle                                        |  7 +++++--
 documentation/documentation.gradle                  |  9 +++++----
 .../quickstart/tutorials/annotations/pom.xml        |  2 +-
 .../main/docbook/quickstart/tutorials/basic/pom.xml |  2 +-
 .../quickstart/tutorials/entitymanager/pom.xml      |  5 +++--
 .../docbook/quickstart/tutorials/envers/pom.xml     |  7 ++++---
 .../src/main/docbook/quickstart/tutorials/pom.xml   | 13 ++++++-------
 7 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/build.gradle b/build.gradle
index a6f0a88d33..b03453d910 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,6 +46,9 @@ ideaModule {
 // build a map of the dependency artifacts to use.  Allows centralized definition of the version of artifacts to
 // use.  In that respect it serves a role similar to <dependencyManagement> in Maven
 slf4jVersion = '1.6.1'
+junitVersion = '4.8.2'
+h2Version = '1.2.145'
+
 libraries = [
         // Ant
         ant:            'org.apache.ant:ant:1.8.2',
@@ -92,12 +95,12 @@ libraries = [
         jcl:            'commons-logging:commons-logging:99.0-does-not-exist',
 
 
-        junit:          'junit:junit:4.8.2',
+        junit:          'junit:junit:' + junitVersion,
         jpa_modelgen:   'org.hibernate:hibernate-jpamodelgen:1.1.1.Final',
         shrinkwrap_api: 'org.jboss.shrinkwrap:shrinkwrap-api:1.0.0-beta-6',
         shrinkwrap:     'org.jboss.shrinkwrap:shrinkwrap-impl-base:1.0.0-beta-6',
         validator:      'org.hibernate:hibernate-validator:4.2.0.Final',
-        h2:             'com.h2database:h2:1.2.145',
+        h2:             'com.h2database:h2:' + h2Version,
 ]
 
 
diff --git a/documentation/documentation.gradle b/documentation/documentation.gradle
index f109bae06f..28053057aa 100644
--- a/documentation/documentation.gradle
+++ b/documentation/documentation.gradle
@@ -49,10 +49,11 @@ task buildTutorialZip(type: Zip) {
     destinationDir = file( "target/work/tutorials" )
     archiveName = 'hibernate-tutorials.zip'
     from 'src/main/docbook/quickstart/tutorials'
-    // todo : this part does not work.  Asked on mailing list
-    filter(
-            org.apache.tools.ant.filters.ReplaceTokens,
-            tokens: [VERSION: project.version]
+    expand(
+            version: project.version,
+            slf4j: parent.slf4jVersion,
+            junit: parent.junitVersion,
+            h2: parent.h2Version
     )
 }
 
diff --git a/documentation/src/main/docbook/quickstart/tutorials/annotations/pom.xml b/documentation/src/main/docbook/quickstart/tutorials/annotations/pom.xml
index 91ffcaa96c..db625869a3 100644
--- a/documentation/src/main/docbook/quickstart/tutorials/annotations/pom.xml
+++ b/documentation/src/main/docbook/quickstart/tutorials/annotations/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.hibernate.tutorials</groupId>
         <artifactId>hibernate-tutorials</artifactId>
-        <version>@VERSION@</version>
+        <version>$version</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/documentation/src/main/docbook/quickstart/tutorials/basic/pom.xml b/documentation/src/main/docbook/quickstart/tutorials/basic/pom.xml
index 0c4558fc47..ea35fa32c4 100644
--- a/documentation/src/main/docbook/quickstart/tutorials/basic/pom.xml
+++ b/documentation/src/main/docbook/quickstart/tutorials/basic/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.hibernate.tutorials</groupId>
         <artifactId>hibernate-tutorials</artifactId>
-        <version>@VERSION@</version>
+        <version>$version</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/documentation/src/main/docbook/quickstart/tutorials/entitymanager/pom.xml b/documentation/src/main/docbook/quickstart/tutorials/entitymanager/pom.xml
index 39cdbb8c34..6d4775548a 100644
--- a/documentation/src/main/docbook/quickstart/tutorials/entitymanager/pom.xml
+++ b/documentation/src/main/docbook/quickstart/tutorials/entitymanager/pom.xml
@@ -29,7 +29,8 @@
     <parent>
         <groupId>org.hibernate.tutorials</groupId>
         <artifactId>hibernate-tutorials</artifactId>
-        <version>@VERSION@</version>
+        <version>$version</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>hibernate-tutorial-entitymanager</artifactId>
@@ -45,7 +46,7 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
-            <version>@VERSION@</version>
+            <version>$version</version>
         </dependency>
     </dependencies>
 
diff --git a/documentation/src/main/docbook/quickstart/tutorials/envers/pom.xml b/documentation/src/main/docbook/quickstart/tutorials/envers/pom.xml
index 5428ce6f46..e3ec34b13e 100644
--- a/documentation/src/main/docbook/quickstart/tutorials/envers/pom.xml
+++ b/documentation/src/main/docbook/quickstart/tutorials/envers/pom.xml
@@ -29,7 +29,8 @@
     <parent>
         <groupId>org.hibernate.tutorials</groupId>
         <artifactId>hibernate-tutorials</artifactId>
-        <version>@VERSION@</version>
+        <version>$version</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>hibernate-tutorial-envers</artifactId>
@@ -45,12 +46,12 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-envers</artifactId>
-            <version>@VERSION@</version>
+            <version>$version</version>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
-            <version>@VERSION@</version>
+            <version>$version</version>
         </dependency>
     </dependencies>
 
diff --git a/documentation/src/main/docbook/quickstart/tutorials/pom.xml b/documentation/src/main/docbook/quickstart/tutorials/pom.xml
index fd40e132cc..dd3adecac3 100644
--- a/documentation/src/main/docbook/quickstart/tutorials/pom.xml
+++ b/documentation/src/main/docbook/quickstart/tutorials/pom.xml
@@ -28,7 +28,7 @@
 
     <groupId>org.hibernate.tutorials</groupId>
     <artifactId>hibernate-tutorials</artifactId>
-    <version>@VERSION@</version>
+    <version>$version</version>
     <packaging>pom</packaging>
 
     <name>Hibernate Getting Started Guide Tutorials</name>
@@ -50,28 +50,28 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-core</artifactId>
-            <version>@VERSION@</version>
+            <version>$version</version>
         </dependency>
 
         <!-- Hibernate uses jboss-logging for logging, for the tutorials we will use the sl4fj-simple backend -->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>1.6.1</version>
+            <version>$slf4j</version>
         </dependency>
 
         <!-- The tutorials use JUnit test cases to illustrate usage -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.8.1</version>
+            <version>$junit</version>
         </dependency>
 
         <!-- The tutorials use the H2 in-memory database -->
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.2.140</version>
+            <version>$h2</version>
         </dependency>
     </dependencies>
 
@@ -79,13 +79,12 @@
         <testResources>
             <testResource>
                 <filtering>false</filtering>
-                <directory>src/main/java</directory>
+                <directory>src/test/java</directory>
                 <includes>
                     <include>**/*.xml</include>
                 </includes>
             </testResource>
             <testResource>
-                <filtering>true</filtering>
                 <directory>src/test/resources</directory>
             </testResource>
         </testResources>