[hibernate-commits] Hibernate SVN: r19507 - in annotations/branches/v3_4_0_GA_CP: src/main and 1 other directories.

[hibernate-commits at lists.jboss.org]

Author: stliu
Date: 2010-05-14 02:37:59 -0400 (Fri, 14 May 2010)
New Revision: 19507

Removed:
   annotations/branches/v3_4_0_GA_CP/src/main/docbook/
Modified:
   annotations/branches/v3_4_0_GA_CP/pom.xml
   annotations/branches/v3_4_0_GA_CP/src/main/assembly/dist.xml
Log:
JBPAPP-4297 remove document source from hibernate cp branch

Modified: annotations/branches/v3_4_0_GA_CP/pom.xml
===================================================================
--- annotations/branches/v3_4_0_GA_CP/pom.xml	2010-05-14 02:27:27 UTC (rev 19506)
+++ annotations/branches/v3_4_0_GA_CP/pom.xml	2010-05-14 06:37:59 UTC (rev 19507)
@@ -126,34 +126,40 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-<version>2.5</version>
+				<version>2.5</version>
 				<configuration>
 					<redirectTestOutputToFile>true</redirectTestOutputToFile>
 				</configuration>
 			</plugin>
 			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
 	            <artifactId>maven-assembly-plugin</artifactId>
+				<version>2.2-beta-2</version>
 	        	<configuration>
 	        		<descriptors>
 	         			<descriptor>src/main/assembly/dist.xml</descriptor>
 	          		</descriptors>
 				</configuration>
+				<executions>
+					<execution>
+						<id>make-assembly</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
 			</plugin>
 		</plugins>
 	</build>
 	<reporting>
 		<plugins>
-		<plugin>
-			<groupId>org.apache.maven.plugins</groupId>
-			<artifactId>maven-javadoc-plugin</artifactId>
-			<configuration>
-				<links>
-					<link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
-					<link>http://java.sun.com/javaee/5/docs/api/</link>
-					<link>http://docs.jboss.org/hibernate/stable/core/api</link>
-				</links>
-				<stylesheetfile>${basedir}/src/main/javadoc/jdstyle.css</stylesheetfile>
-			</configuration>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<configuration>
+					<stylesheetfile>${basedir}/src/main/javadoc/jdstyle.css</stylesheetfile>
+				</configuration>
 			</plugin>
 		</plugins>
 	</reporting>

Modified: annotations/branches/v3_4_0_GA_CP/src/main/assembly/dist.xml
===================================================================
--- annotations/branches/v3_4_0_GA_CP/src/main/assembly/dist.xml	2010-05-14 02:27:27 UTC (rev 19506)
+++ annotations/branches/v3_4_0_GA_CP/src/main/assembly/dist.xml	2010-05-14 06:37:59 UTC (rev 19507)
@@ -28,10 +28,6 @@
             <outputDirectory>docs/api</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>target/docbook/publish/en</directory>
-            <outputDirectory>docs/manual/en</outputDirectory>
-        </fileSet>
-        <fileSet>
             <directory>.</directory>
             <outputDirectory></outputDirectory>
             <useDefaultExcludes>true</useDefaultExcludes>