From 0221ff996de5b07e89c9081a964ddaf7922c20fc Mon Sep 17 00:00:00 2001
From: Mark Struberg <struberg@apache.org>
Date: Sun, 19 Apr 2015 10:39:39 +0000
Subject: [PATCH] another workaround attempt to fix the release

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@1674601 13f79535-47bb-0310-9956-ffa450edef68
---
 openjpa-examples/openbooks/pom.xml | 10 ----------
 pom.xml                            |  9 +++++++++
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/openjpa-examples/openbooks/pom.xml b/openjpa-examples/openbooks/pom.xml
index a683098d5..e7d4994f3 100644
--- a/openjpa-examples/openbooks/pom.xml
+++ b/openjpa-examples/openbooks/pom.xml
@@ -232,16 +232,6 @@
             </build>
         </profile>
 
-
-        <!--
-            Profile to openbooks to be built during a release (because it creates a build loop).
-            Activating this profile will simply disable the default profile
-         -->
-        <profile>
-            <id>apache-release</id>
-        </profile>
-
-
     </profiles>
 </project>
 
diff --git a/pom.xml b/pom.xml
index 07880207a..2b0f7ec75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -770,6 +770,15 @@
                     <version>2.4.2</version>
                     <configuration>
                         <useReleaseProfile>false</useReleaseProfile>
+
+                        <!--
+                            The openbooks example contains a build.xml which tries to add ~/.m2/repository/../openjpa-all-nnn.jar
+                            to the classpath. But since the maven-release-plugin by default only prepares with 'clean verify'
+                            the jar doesn't end in the local m2 repo. It will only be in the opanjpa-all/target folder.
+                            For now I forced an 'install', but we should ultimately just fix the openbooks example.
+                        -->
+                        <preparationGoals>clean install</preparationGoals>
+
                         <goals>deploy</goals>
                         <arguments>-Papache-release,docbook-profile,test-derby,bval</arguments>
                         <autoVersionSubmodules>true</autoVersionSubmodules>