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/05/12 17:05:05 UTC
svn commit: r943540 - in
/uima/sandbox/branches/mavenAlign/PearPackagingAntTask: ./ docbook/ docs/
src/docbook/ src/docbook/PearPackagingAntTaskUserGuide/ src/docbook/images/
Author: schor
Date: Wed May 12 15:05:05 2010
New Revision: 943540
URL: http://svn.apache.org/viewvc?rev=943540&view=rev
Log:
[UIMA-1756] package as Single Project,remove disclaimer, reformat POM to conventions, fixup docbook, remove docs/
Added:
uima/sandbox/branches/mavenAlign/PearPackagingAntTask/src/docbook/
- copied from r941967, uima/sandbox/branches/mavenAlign/PearPackagingAntTask/docbook/
uima/sandbox/branches/mavenAlign/PearPackagingAntTask/src/docbook/PearPackagingAntTaskUserGuide.xml
- copied, changed from r941967, uima/sandbox/branches/mavenAlign/PearPackagingAntTask/docbook/PearPackagingAntTaskUserGuide/PearPackagingAntTaskUserGuide.xml
uima/sandbox/branches/mavenAlign/PearPackagingAntTask/src/docbook/images/
- copied from r941967, uima/sandbox/branches/mavenAlign/PearPackagingAntTask/docbook/PearPackagingAntTaskUserGuide/images/
Removed:
uima/sandbox/branches/mavenAlign/PearPackagingAntTask/DISCLAIMER
uima/sandbox/branches/mavenAlign/PearPackagingAntTask/build_documentation.xml
uima/sandbox/branches/mavenAlign/PearPackagingAntTask/docbook/
uima/sandbox/branches/mavenAlign/PearPackagingAntTask/docs/
uima/sandbox/branches/mavenAlign/PearPackagingAntTask/src/docbook/PearPackagingAntTaskUserGuide/
Modified:
uima/sandbox/branches/mavenAlign/PearPackagingAntTask/pom.xml
Modified: uima/sandbox/branches/mavenAlign/PearPackagingAntTask/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/branches/mavenAlign/PearPackagingAntTask/pom.xml?rev=943540&r1=943539&r2=943540&view=diff
==============================================================================
--- uima/sandbox/branches/mavenAlign/PearPackagingAntTask/pom.xml (original)
+++ uima/sandbox/branches/mavenAlign/PearPackagingAntTask/pom.xml Wed May 12 15:05:05 2010
@@ -17,54 +17,67 @@
specific language governing permissions and limitations
under the License.
-->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.uima</groupId>
- <artifactId>PearPackagingAntTask</artifactId>
- <name>Apache UIMA PEAR packaging ANT task</name>
- <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
-
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.uima</groupId>
- <artifactId>SandboxDistr</artifactId>
- <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
- <relativePath>../uimaj</relativePath>
+ <artifactId>parent-pom-single-project</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
</parent>
+
+ <artifactId>PearPackagingAntTask</artifactId>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>UIMA Addon: ${project.artifactId}</name>
+ <description>Provides an Ant Task: packagePear, which runs the UIMA PEAR packaging utility</description>
+ <url>http://incubator.apache.org/uima</url>
+
+ <!-- Special inheritance note
+ even though the <scm> element that follows is exactly the
+ same as those in super poms, it cannot be inherited because
+ there is some special code that computes the connection elements
+ from the chain of parent poms, if this is omitted.
+
+ Keeping this a bit factored allows cutting/pasting the <scm>
+ element, and just changing the following two properties -->
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+ </developerConnection>
+ <url>
+ http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+ </url>
+ </scm>
+ <properties>
+ <uimaScmRoot>sandbox</uimaScmRoot>
+ <uimaScmProject>${project.artifactId}</uimaScmProject>
+ <bookNameRoot>PearPackagingAntTaskUserGuide</bookNameRoot>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.uima</groupId>
- <artifactId>uimaj-core</artifactId>
+ <artifactId>uimaj-core</artifactId>
+ <version>2.3.1-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.7.0</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
<build>
- <finalName>uima-pear-ant-task</finalName>
-
- <plugins>
-
- <!-- Release Audit Tool checks -->
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <executions>
- <execution>
- <id>default-cli</id>
- <configuration>
- <excludes>
- <exclude>docs/html/images/*.svg</exclude> <!-- generated image files for docbook -->
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
+ <finalName>uima-pear-ant-task</finalName>
</build>
</project>
\ No newline at end of file
Copied: uima/sandbox/branches/mavenAlign/PearPackagingAntTask/src/docbook/PearPackagingAntTaskUserGuide.xml (from r941967, uima/sandbox/branches/mavenAlign/PearPackagingAntTask/docbook/PearPackagingAntTaskUserGuide/PearPackagingAntTaskUserGuide.xml)
URL: http://svn.apache.org/viewvc/uima/sandbox/branches/mavenAlign/PearPackagingAntTask/src/docbook/PearPackagingAntTaskUserGuide.xml?p2=uima/sandbox/branches/mavenAlign/PearPackagingAntTask/src/docbook/PearPackagingAntTaskUserGuide.xml&p1=uima/sandbox/branches/mavenAlign/PearPackagingAntTask/docbook/PearPackagingAntTaskUserGuide/PearPackagingAntTaskUserGuide.xml&r1=941967&r2=943540&rev=943540&view=diff
==============================================================================
--- uima/sandbox/branches/mavenAlign/PearPackagingAntTask/docbook/PearPackagingAntTaskUserGuide/PearPackagingAntTaskUserGuide.xml (original)
+++ uima/sandbox/branches/mavenAlign/PearPackagingAntTask/src/docbook/PearPackagingAntTaskUserGuide.xml Wed May 12 15:05:05 2010
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY imgroot "./images/" >
-<!ENTITY % xinclude SYSTEM "../../../uima-docbook-tool/xinclude.mod">
- %xinclude;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY imgroot "images/" >
]>
<!--
Licensed to the Apache Software Foundation (ASF) under one
@@ -31,7 +29,7 @@
</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../../../SandboxDocs/src/docbook/book_info.xml" />
+ href="../../target/docbook-shared/common_book_info.xml" />
<preface>
<title>Overview</title>