openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1674601 - in /openjpa/trunk: openjpa-examples/openbooks/pom.xml pom.xml
Date Sun, 19 Apr 2015 10:39:39 GMT
Author: struberg
Date: Sun Apr 19 10:39:39 2015
New Revision: 1674601

URL: http://svn.apache.org/r1674601
Log:
another workaround attempt to fix the release

Modified:
    openjpa/trunk/openjpa-examples/openbooks/pom.xml
    openjpa/trunk/pom.xml

Modified: openjpa/trunk/openjpa-examples/openbooks/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/openbooks/pom.xml?rev=1674601&r1=1674600&r2=1674601&view=diff
==============================================================================
--- openjpa/trunk/openjpa-examples/openbooks/pom.xml (original)
+++ openjpa/trunk/openjpa-examples/openbooks/pom.xml Sun Apr 19 10:39:39 2015
@@ -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>
 

Modified: openjpa/trunk/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/pom.xml?rev=1674601&r1=1674600&r2=1674601&view=diff
==============================================================================
--- openjpa/trunk/pom.xml (original)
+++ openjpa/trunk/pom.xml Sun Apr 19 10:39:39 2015
@@ -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>



Mime
View raw message