incubator-sanselan-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cmc...@apache.org
Subject svn commit: r735476 - in /incubator/sanselan/trunk: pom.xml src/assemble/bin.xml
Date Sun, 18 Jan 2009 15:58:05 GMT
Author: cmchen
Date: Sun Jan 18 07:58:05 2009
New Revision: 735476

URL: http://svn.apache.org/viewvc?rev=735476&view=rev
Log:
Apply "Build Improvements" patch from Niall Pemberton:

"""
I took a look at the propsed 0.96 relelase and have some suggestions to improve the build:
 * Add standard manifest entries to jar
 * Lock down version numbers for maven compiler, surefire and javadoc plugins
 * generate sources jar for the release
 * include the RELEASE-NOTES in the binary distribution
 * include NOTICE/LICENSE files in the javadoc jar
"""

https://issues.apache.org/jira/browse/SANSELAN-15?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel

Modified:
    incubator/sanselan/trunk/pom.xml
    incubator/sanselan/trunk/src/assemble/bin.xml

Modified: incubator/sanselan/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/pom.xml?rev=735476&r1=735475&r2=735476&view=diff
==============================================================================
--- incubator/sanselan/trunk/pom.xml (original)
+++ incubator/sanselan/trunk/pom.xml Sun Jan 18 07:58:05 2009
@@ -85,12 +85,44 @@
           <instructions>
             <Bundle-SymbolicName>${pom.groupId}.${pom.artifactId}</Bundle-SymbolicName>
             <Export-Package>org.apache.sanselan.*</Export-Package>
+            <Specification-Title>${project.name}</Specification-Title>
+            <Specification-Version>${project.version}</Specification-Version>
+            <Specification-Vendor>${project.organization.name}</Specification-Vendor>
+            <Implementation-Title>${project.name}</Implementation-Title>
+            <Implementation-Version>${project.version}</Implementation-Version>
+            <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+            <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
           </instructions>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-release-plugin</artifactId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.0.2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.4.3</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>2.5</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-source-plugin</artifactId>
+          <version>2.0.4</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-antrun-plugin</artifactId>
+          <version>1.3</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-release-plugin</artifactId>
         <configuration>
           <tagBase>https://svn.apache.org/repos/asf/incubator/sanselan/tags</tagBase>
           <useReleaseProfile>false</useReleaseProfile>
@@ -141,6 +173,7 @@
         <includes>
           <include>LICENSE</include>
           <include>NOTICE</include>
+          <include>README.txt</include>
         </includes>
       </resource>
     </resources>
@@ -181,6 +214,47 @@
             </executions>
 	      </plugin>
 
+          <plugin>
+            <!--
+              - Copy LICENSE.txt and NOTICE.txt so that they are included
+              - in the -javadoc jar file for the component.
+              -->
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>javadoc.resources</id>
+                <phase>generate-sources</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <tasks>
+                    <copy todir="${project.build.directory}/apidocs/META-INF">
+                      <fileset dir="${basedir}">
+                        <include name="LICENSE" />
+                        <include name="NOTICE" />
+                      </fileset>
+                    </copy>
+                  </tasks>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>create-source-jar</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          
           <!-- The release artifacts -->
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>

Modified: incubator/sanselan/trunk/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/assemble/bin.xml?rev=735476&r1=735475&r2=735476&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/assemble/bin.xml (original)
+++ incubator/sanselan/trunk/src/assemble/bin.xml Sun Jan 18 07:58:05 2009
@@ -31,6 +31,7 @@
         <include>LICENSE*</include>
         <include>KEYS*</include>
         <include>NOTICE*</include>
+        <include>RELEASE_NOTES*</include>
       </includes>
     </fileSet>
     <fileSet>



Mime
View raw message