You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2010/10/31 19:21:31 UTC
svn commit: r1029446 - in /uima/uimaj/trunk/uimaj-distr: RELEASE_NOTES.html
pom.xml src/main/assembly/bin.xml
Author: schor
Date: Sun Oct 31 18:21:30 2010
New Revision: 1029446
URL: http://svn.apache.org/viewvc?rev=1029446&view=rev
Log:
[UIMA-1920] fix a fileset syntax error, and where the docs are obtained from in the build.
Modified:
uima/uimaj/trunk/uimaj-distr/RELEASE_NOTES.html
uima/uimaj/trunk/uimaj-distr/pom.xml
uima/uimaj/trunk/uimaj-distr/src/main/assembly/bin.xml
Modified: uima/uimaj/trunk/uimaj-distr/RELEASE_NOTES.html
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-distr/RELEASE_NOTES.html?rev=1029446&r1=1029445&r2=1029446&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-distr/RELEASE_NOTES.html (original)
+++ uima/uimaj/trunk/uimaj-distr/RELEASE_NOTES.html Sun Oct 31 18:21:30 2010
@@ -31,7 +31,7 @@
<a href="#major.changes">Major Changes in this Release</a><br/>
<a href="#get.involved">How to Get Involved</a><br/>
<a href="#report.issues">How to Report Issues</a><br/>
-<a href="#list.issues">List of JIRA Issues Fixed in this Release</a>
+<a href="#list.issues">List of JIRA Issues Fixed in this Release</a><br/>
<a href="#migrating">Migrating from IBM UIMA to Apache UIMA</a><br/>
</p>
Modified: uima/uimaj/trunk/uimaj-distr/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-distr/pom.xml?rev=1029446&r1=1029445&r2=1029446&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-distr/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-distr/pom.xml Sun Oct 31 18:21:30 2010
@@ -62,6 +62,7 @@
<uimaScmRoot>uimaj</uimaScmRoot>
<uimaScmProject>${project.artifactId}</uimaScmProject>
<assemblyFinalName>uimaj-${project.version}</assemblyFinalName>
+ <jiraVersion>12315344</jiraVersion>
</properties>
<!-- dependencies that go into the various builds via dependency-sets -->
@@ -150,7 +151,7 @@
<executions>
<execution>
<id>javadocs-distr</id> <!-- name should match one in parent-pom -->
- <phase>package</phase>
+ <phase>prepare-package</phase> <!-- must come before package which uses the results -->
<!--phase>deploy</phase--> <!-- comment above and uncomment to disable javadocs, for testing/experimentation, with assembly:assembly-->
<goals>
<goal>javadoc</goal>
Modified: uima/uimaj/trunk/uimaj-distr/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-distr/src/main/assembly/bin.xml?rev=1029446&r1=1029445&r2=1029446&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-distr/src/main/assembly/bin.xml (original)
+++ uima/uimaj/trunk/uimaj-distr/src/main/assembly/bin.xml Sun Oct 31 18:21:30 2010
@@ -189,10 +189,11 @@ under the License.
<directory>src/main/readme</directory>
<outputDirectory></outputDirectory>
<fileMode>644</fileMode>
- <directoryMode>755</directoryMode>
-
- <!-- copy standard top level files -->
+ <directoryMode>755</directoryMode>
</fileSet>
+
+ <!-- copy standard top level files -->
+ <fileSet>
<directory>.</directory>
<outputDirectory></outputDirectory>
<fileMode>644</fileMode>
@@ -204,11 +205,11 @@ under the License.
<include>Release-Notes*</include>
<include>issuesFixed/**</include>
</includes>
- <fileSet>
</fileSet>
+
<fileSet>
<directory>target/site/apidocs</directory>
- <outputDirectory>docs/api</outputDirectory>
+ <outputDirectory>docs/d/api</outputDirectory>
<excludes>
<exclude>options</exclude>
<exclude>packages</exclude>
@@ -221,26 +222,28 @@ under the License.
<!-- docbooks -->
<fileSet>
- <directory>../uima-docbook-overview-and-setup/target/docbkx</directory>
+ <directory>../uima-docbook-overview-and-setup/target/site/</directory>
<outputDirectory>docs</outputDirectory>
<excludes><exclude>pdf/*.fo</exclude></excludes>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
<fileSet>
- <directory>../uima-docbook-references/target/docbkx</directory>
+ <directory>../uima-docbook-references/target/site</directory>
<outputDirectory>docs</outputDirectory>
<excludes><exclude>pdf/*.fo</exclude></excludes>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
- </fileSet> <fileSet>
- <directory>../uima-docbook-tools/target/docbkx</directory>
+ </fileSet>
+ <fileSet>
+ <directory>../uima-docbook-tools/target/site</directory>
<outputDirectory>docs</outputDirectory>
<excludes><exclude>pdf/*.fo</exclude></excludes>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
- </fileSet> <fileSet>
- <directory>../uima-docbook-tutorial-and-users-guides/target/docbkx</directory>
+ </fileSet>
+ <fileSet>
+ <directory>../uima-docbook-tutorial-and-users-guides/target/site</directory>
<outputDirectory>docs</outputDirectory>
<excludes><exclude>pdf/*.fo</exclude></excludes>
<fileMode>644</fileMode>