[hibernate-commits] Hibernate SVN: r19378 - in core/branches/Branch_3_3_2_GA_CP: distribution and 1 other directory.

[hibernate-commits at lists.jboss.org]

Author: stliu
Date: 2010-05-06 03:59:34 -0400 (Thu, 06 May 2010)
New Revision: 19378

Modified:
   core/branches/Branch_3_3_2_GA_CP/distribution/pom.xml
   core/branches/Branch_3_3_2_GA_CP/pom.xml
Log:
JBPAPP-4228 update pom to add source plugin and disable unnecessary sub-modules

Modified: core/branches/Branch_3_3_2_GA_CP/distribution/pom.xml
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/distribution/pom.xml	2010-05-06 03:36:44 UTC (rev 19377)
+++ core/branches/Branch_3_3_2_GA_CP/distribution/pom.xml	2010-05-06 07:59:34 UTC (rev 19378)
@@ -44,21 +44,27 @@
     <description>Builds the complete Hibernate distribution bundles</description>
 
     <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-assembly-plugin</artifactId>
-                    <version>2.2-beta-2</version>
-                    <configuration>
+		<plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.2-beta-2</version>
+                <executions>
+                    <execution>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+				 <configuration>
                         <descriptors>
                             <descriptor>src/assembly/hibernate-all.xml</descriptor>
                             <descriptor>src/assembly/dist.xml</descriptor>
                         </descriptors>
                     </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
+            </plugin>
+        </plugins>
     </build>
 
     <!--
@@ -126,38 +132,6 @@
         </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>
-            <activation>
-                <property>
-                    <name>performRelease</name>
-                    <value>true</value>
-                </property>
-            </activation>
-            <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>single</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 
+
 </project>

Modified: core/branches/Branch_3_3_2_GA_CP/pom.xml
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/pom.xml	2010-05-06 03:36:44 UTC (rev 19377)
+++ core/branches/Branch_3_3_2_GA_CP/pom.xml	2010-05-06 07:59:34 UTC (rev 19378)
@@ -47,28 +47,20 @@
         <module>parent</module>
         <module>core</module>
         <module>cache-ehcache</module>
-       <!-- <module>cache-jbosscache</module> -->
         <module>cache-jbosscache2</module>
         <module>cache-oscache</module>
         <module>cache-swarmcache</module>
         <module>connection-c3p0</module>
         <module>connection-proxool</module>
+		<module>jdbc4-testing</module>
+		<module>jdbc3-testing</module>
         <module>jmx</module>
         <module>testing</module>
         <module>testsuite</module>
         <module>tutorials</module>
-     <!--    <module>hibernate-maven-plugin</module>
-       
-    Need to scope bytecode providers first...
-        <module>bytecode-cglib</module>
-        <module>bytecode-javassist</module>
--->
+		<module>distribution</module>
     </modules>
 
-    <!--
-        Need to manually override this here as otherwise the release-plugin barfs trying to tag
-        from Branch_3_3/hibernate (the artifactId of this aggregator module).
-    -->
     <scm>
         <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.2.GA_CP01</connection>
         <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.2.GA_CP01</developerConnection>
@@ -87,20 +79,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>docs</id>
-            <activation>
-                <property>
-                    <name>disableDistribution</name>
-                    <value>!true</value>
-                </property>
-            </activation>
-            <modules>
-                <module>documentation</module>
-                <module>distribution</module>
-            </modules>
-        </profile>
-    </profiles>
 </project>
\ No newline at end of file