incubator-odf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From devin...@apache.org
Subject svn commit: r1214061 - in /incubator/odf/trunk: assemble/bin.xml assemble/doc.xml assemble/src.xml pom.xml
Date Wed, 14 Dec 2011 05:51:17 GMT
Author: devinhan
Date: Wed Dec 14 05:51:17 2011
New Revision: 1214061

URL: http://svn.apache.org/viewvc?rev=1214061&view=rev
Log:
update pom.xml to generate md5 and sha for all of the artifacts.

Modified:
    incubator/odf/trunk/assemble/bin.xml
    incubator/odf/trunk/assemble/doc.xml
    incubator/odf/trunk/assemble/src.xml
    incubator/odf/trunk/pom.xml

Modified: incubator/odf/trunk/assemble/bin.xml
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/assemble/bin.xml?rev=1214061&r1=1214060&r2=1214061&view=diff
==============================================================================
--- incubator/odf/trunk/assemble/bin.xml (original)
+++ incubator/odf/trunk/assemble/bin.xml Wed Dec 14 05:51:17 2011
@@ -28,10 +28,6 @@
     <fileSet>
       <directory>${project.basedir}/target/${project.version}-bin/</directory>
       <outputDirectory>/</outputDirectory>
-      <excludes>
-        <exclude>*.md5</exclude>
-        <exclude>*.sha</exclude>
-      </excludes>
     </fileSet>
   </fileSets>
 </assembly>
\ No newline at end of file

Modified: incubator/odf/trunk/assemble/doc.xml
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/assemble/doc.xml?rev=1214061&r1=1214060&r2=1214061&view=diff
==============================================================================
--- incubator/odf/trunk/assemble/doc.xml (original)
+++ incubator/odf/trunk/assemble/doc.xml Wed Dec 14 05:51:17 2011
@@ -29,10 +29,6 @@
       <directory>${project.basedir}/target/${project.version}-docs</directory>
       <outputDirectory>/</outputDirectory>
       <useDefaultExcludes>true</useDefaultExcludes>
-      <excludes>
-        <exclude>*.md5</exclude>
-        <exclude>*.sha</exclude>
-      </excludes>
     </fileSet>
   </fileSets>
 </assembly>
\ No newline at end of file

Modified: incubator/odf/trunk/assemble/src.xml
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/assemble/src.xml?rev=1214061&r1=1214060&r2=1214061&view=diff
==============================================================================
--- incubator/odf/trunk/assemble/src.xml (original)
+++ incubator/odf/trunk/assemble/src.xml Wed Dec 14 05:51:17 2011
@@ -27,19 +27,6 @@
   <fileSets>
     <fileSet>
       <directory>${project.basedir}</directory>
-      <includes>
-        <include>README*</include>
-        <include>LICENSE*</include>
-        <include>NOTICE*</include>
-        <include>CHANGES*</include>
-        <include>KEYS*</include>
-        <include>pom.xml</include>
-      </includes>
-      <useDefaultExcludes>true</useDefaultExcludes>
-    </fileSet>
-    <fileSet>
-      <!-- TODO: use expresssions instead: ${project.build.sourceDirectory}, etc -->
-      <directory>${project.basedir}</directory>
       <outputDirectory>/</outputDirectory>
       <excludes>
         <exclude>**/target/**</exclude>

Modified: incubator/odf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/pom.xml?rev=1214061&r1=1214060&r2=1214061&view=diff
==============================================================================
--- incubator/odf/trunk/pom.xml (original)
+++ incubator/odf/trunk/pom.xml Wed Dec 14 05:51:17 2011
@@ -83,7 +83,7 @@
 		<module>validator</module>
 		<module>simple</module>
 	</modules>
-	
+	 
 	<profiles>
 		<profile>
 			<id>pedantic</id>
@@ -107,7 +107,7 @@
 		<profile>
 			<id>apache-release</id>
 			<properties>
-				<username>devinhan</username>
+				<username>${user.name}</username>
 			</properties>
 			<build>
 				<plugins>
@@ -131,7 +131,7 @@
 								<goals>
 									<goal>single</goal>
 								</goals>
-								<phase>install</phase>
+								<phase>package</phase>
 								<configuration>
 									<descriptors>
 										<descriptor>assemble/doc.xml</descriptor>
@@ -143,7 +143,7 @@
 								<goals>
 									<goal>single</goal>
 								</goals>
-								<phase>install</phase>
+								<phase>package</phase>
 								<configuration>
 									<descriptors>
 										<descriptor>assemble/bin.xml</descriptor>
@@ -156,10 +156,11 @@
 						<artifactId>maven-antrun-plugin</artifactId>
 						<executions>
 							<execution>
+								<id>package</id>
 								<goals>
 									<goal>run</goal>
 								</goals>
-								<phase>package</phase>
+								<phase>prepare-package</phase>
                 				<configuration>
                 					<tasks>
                     					<mkdir dir="${basedir}/target/${project.version}-bin" />
@@ -184,23 +185,30 @@
         										<include name="KEYS" />               					
                         						<include name="**/target/*-javadoc.jar" />
         									</fileset>
-                    					</copy>                    					
+                    					</copy>
+                    					</tasks>                 				
+								</configuration>
+							</execution>
+							<execution>
+								<id>checksum</id>
+								<goals>
+									<goal>run</goal>
+								</goals>
+								<phase>install</phase>
+                				<configuration>
+                					<tasks>                   					
                     					<checksum algorithm="MD5" fileext=".md5">
-                      						<fileset dir="${basedir}/target/${project.version}-bin">
+                      						<fileset dir="${basedir}/target">
                         						<include name="*.zip" />
-                        						<include name="*.?ar" />
-                      						</fileset>
-                      						<fileset dir="${basedir}/target/${project.version}-docs">
-                        						<include name="*.jar" />
+                        						<include name="*.tar.gz" />
+                        						<include name="*.tar.bz2" />
                       						</fileset>
                     					</checksum>
                     					<checksum algorithm="SHA1" fileext=".sha">
-                      						<fileset dir="${basedir}/target/${project.version}-bin">
+                      						<fileset dir="${basedir}/target">
                         						<include name="*.zip" />
-                        						<include name="*.?ar" />
-                      						</fileset>
-                      						<fileset dir="${basedir}/target/${project.version}-docs">
-                        						<include name="*.jar" />
+                        						<include name="*.tar.gz" />
+                        						<include name="*.tar.bz2" />
                       						</fileset>
                     					</checksum>
                     					<checksum file="target/odftoolkit-${project.version}-src.zip"
algorithm="SHA1" property="checksum" />								



Mime
View raw message