[hibernate-commits] Hibernate SVN: r14576 - in core/trunk: distribution and 1 other directories.

[hibernate-commits at lists.jboss.org]

Author: steve.ebersole at jboss.com
Date: 2008-04-21 16:18:11 -0400 (Mon, 21 Apr 2008)
New Revision: 14576

Modified:
   core/trunk/distribution/pom.xml
   core/trunk/distribution/src/assembly/dist.xml
   core/trunk/pom.xml
Log:
get rid of attempts to use site at all :(

Modified: core/trunk/distribution/pom.xml
===================================================================
--- core/trunk/distribution/pom.xml	2008-04-21 19:53:25 UTC (rev 14575)
+++ core/trunk/distribution/pom.xml	2008-04-21 20:18:11 UTC (rev 14576)
@@ -45,28 +45,22 @@
     <description>Builds the complete Hibernate distribution bundles</description>
 
     <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.2-beta-2</version>
-                <configuration>
-                    <finalName>hibernate-core-${project.version}</finalName>
-                    <descriptors>
-                        <descriptor>src/assembly/hibernate-all.xml</descriptor>
-                        <descriptor>src/assembly/dist.xml</descriptor>
-                    </descriptors>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>attached</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <version>2.2-beta-2</version>
+                    <configuration>
+                        <finalName>hibernate-core-${project.version}</finalName>
+                        <descriptors>
+                            <descriptor>src/assembly/hibernate-all.xml</descriptor>
+                            <descriptor>src/assembly/dist.xml</descriptor>
+                        </descriptors>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
     </build>
 
     <!--
@@ -121,4 +115,33 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
+
+    <profiles>
+        <profile>
+            <!--
+                A profile used implicitly by the release plugin.  Here we use
+                it to implicitly execute assembly building when deploy is executed
+                as part of release ( I think/hope :p )
+            -->
+            <id>release-profile</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <version>2.2-beta-2</version>
+                        <executions>
+                            <execution>
+                                <phase>deploy</phase>
+                                <goals>
+                                    <goal>attached</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
 </project>
\ No newline at end of file

Modified: core/trunk/distribution/src/assembly/dist.xml
===================================================================
--- core/trunk/distribution/src/assembly/dist.xml	2008-04-21 19:53:25 UTC (rev 14575)
+++ core/trunk/distribution/src/assembly/dist.xml	2008-04-21 20:18:11 UTC (rev 14576)
@@ -39,8 +39,9 @@
     </formats>
 
     <includeBaseDirectory>true</includeBaseDirectory>
+<!--
     <includeSiteDirectory>true</includeSiteDirectory>
-
+-->
     <files>
         <file>
             <source>../lgpl.txt</source>

Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml	2008-04-21 19:53:25 UTC (rev 14575)
+++ core/trunk/pom.xml	2008-04-21 20:18:11 UTC (rev 14576)
@@ -80,8 +80,8 @@
     <profiles>
         <profile>
             <!--
-                A profile used implicitly by the release plugin.  Here we use it to enable documentation building
-                as well as execution of the assembly plugin (to build the SourceForge dist).
+                A profile used implicitly by the release plugin.  Here we use
+                it to enable documentation building.
             -->
             <id>release-profile</id>
             <modules>