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 16:50:06 UTC
svn commit: r943528 - in
/uima/sandbox/branches/mavenAlign/AlchemyAPIAnnotator: ./ DISCLAIMER
docbook/ docs/ pom.xml src/docbook/
src/docbook/AlchemyAPIAnnotatorUserGuide.xml
src/docbook/AlchemyAPIAnnotatorUserGuide/ src/docbook/images/
Author: schor
Date: Wed May 12 14:50:06 2010
New Revision: 943528
URL: http://svn.apache.org/viewvc?rev=943528&view=rev
Log:
[UIMA-1756 UIMA-1757] remove disclaimer, fixup docbook to new conventions, remove docs/
Added:
uima/sandbox/branches/mavenAlign/AlchemyAPIAnnotator/src/docbook/
- copied from r941967, uima/sandbox/branches/mavenAlign/AlchemyAPIAnnotator/docbook/
uima/sandbox/branches/mavenAlign/AlchemyAPIAnnotator/src/docbook/AlchemyAPIAnnotatorUserGuide.xml
- copied, changed from r941967, uima/sandbox/branches/mavenAlign/AlchemyAPIAnnotator/docbook/AlchemyAPIAnnotatorUserGuide/AlchemyAPIAnnotatorUserGuide.xml
uima/sandbox/branches/mavenAlign/AlchemyAPIAnnotator/src/docbook/images/
- copied from r941967, uima/sandbox/branches/mavenAlign/AlchemyAPIAnnotator/docbook/AlchemyAPIAnnotatorUserGuide/images/
Removed:
uima/sandbox/branches/mavenAlign/AlchemyAPIAnnotator/DISCLAIMER
uima/sandbox/branches/mavenAlign/AlchemyAPIAnnotator/docbook/
uima/sandbox/branches/mavenAlign/AlchemyAPIAnnotator/docs/
uima/sandbox/branches/mavenAlign/AlchemyAPIAnnotator/src/docbook/AlchemyAPIAnnotatorUserGuide/
Modified:
uima/sandbox/branches/mavenAlign/AlchemyAPIAnnotator/ (props changed)
uima/sandbox/branches/mavenAlign/AlchemyAPIAnnotator/pom.xml
Propchange: uima/sandbox/branches/mavenAlign/AlchemyAPIAnnotator/
------------------------------------------------------------------------------
svn:mergeinfo = /uima/sandbox/trunk/AlchemyAPIAnnotator:941967-942721
Modified: uima/sandbox/branches/mavenAlign/AlchemyAPIAnnotator/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/branches/mavenAlign/AlchemyAPIAnnotator/pom.xml?rev=943528&r1=943527&r2=943528&view=diff
==============================================================================
--- uima/sandbox/branches/mavenAlign/AlchemyAPIAnnotator/pom.xml (original)
+++ uima/sandbox/branches/mavenAlign/AlchemyAPIAnnotator/pom.xml Wed May 12 14:50:06 2010
@@ -1,4 +1,3 @@
-
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -16,80 +15,79 @@
-->
<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>
- <artifactId>SandboxDistr-pearBuilder</artifactId>
<groupId>org.apache.uima</groupId>
- <version>2.3.0-incubating</version>
- <relativePath>../SandboxDistr/pear-builder-pom</relativePath>
+ <artifactId>parent-pom-annotator</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.uima</groupId>
+
<artifactId>alchemy-annotator</artifactId>
- <name>AlchemyAPI Annotator</name>
- <version>2.3.0-incubating</version>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>UIMA Annotator: ${project.artifactId}</name>
<description>A UIMA set of AEs that wrap Alchemy API services from Orchestr8</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>
+ <uimaDependencyVersion>2.3.1-SNAPSHOT</uimaDependencyVersion>
+ <pearMainDescriptor>desc/TextAnnotatedEntityExtractionAEDescriptor.xml</pearMainDescriptor>
+ <bookNameRoot>AlchemyAPIAnnotatorUserGuide</bookNameRoot>
+ </properties>
+
<dependencies>
<dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-core</artifactId>
+ <version>${uimaDependencyVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-core</artifactId>
- <version>2.3.0-incubating</version>
- </dependency>
+
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.4</version>
</dependency>
-
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
<version>2.0</version>
- <scope>compile</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
- <!-- build pear plugin, most settings inherited from parent POM -->
- <plugin>
- <groupId>org.apache.uima</groupId>
- <artifactId>PearPackagingMavenPlugin</artifactId>
- <executions>
- <execution>
- <id>buildPear</id>
- <configuration>
- <mainComponentDesc>src/main/resources/TextEntityExtractionAEDescriptor.xml</mainComponentDesc>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <!-- 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>
-
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -123,21 +121,25 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
+ <version>2.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.4</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jdepend-maven-plugin</artifactId>
+ <version>2.0-beta-2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changelog-plugin</artifactId>
+ <version>2.1</version>
<configuration>
<type>range</type>
<range>60</range>
@@ -147,11 +149,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
+ <version>2.3</version>
<configuration>
<issueLinkTemplate>%URL%/detail?id=%ISSUE%</issueLinkTemplate>
</configuration>
@@ -167,7 +171,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>javancss-maven-plugin</artifactId>
- <version>2.0-beta-2</version>
+ <version>2.0</version>
</plugin>
</plugins>
</reporting>
Copied: uima/sandbox/branches/mavenAlign/AlchemyAPIAnnotator/src/docbook/AlchemyAPIAnnotatorUserGuide.xml (from r941967, uima/sandbox/branches/mavenAlign/AlchemyAPIAnnotator/docbook/AlchemyAPIAnnotatorUserGuide/AlchemyAPIAnnotatorUserGuide.xml)
URL: http://svn.apache.org/viewvc/uima/sandbox/branches/mavenAlign/AlchemyAPIAnnotator/src/docbook/AlchemyAPIAnnotatorUserGuide.xml?p2=uima/sandbox/branches/mavenAlign/AlchemyAPIAnnotator/src/docbook/AlchemyAPIAnnotatorUserGuide.xml&p1=uima/sandbox/branches/mavenAlign/AlchemyAPIAnnotator/docbook/AlchemyAPIAnnotatorUserGuide/AlchemyAPIAnnotatorUserGuide.xml&r1=941967&r2=943528&rev=943528&view=diff
==============================================================================
--- uima/sandbox/branches/mavenAlign/AlchemyAPIAnnotator/docbook/AlchemyAPIAnnotatorUserGuide/AlchemyAPIAnnotatorUserGuide.xml (original)
+++ uima/sandbox/branches/mavenAlign/AlchemyAPIAnnotator/src/docbook/AlchemyAPIAnnotatorUserGuide.xml Wed May 12 14:50:06 2010
@@ -16,12 +16,8 @@
limitations under the License.
-->
-<!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">
<book lang="en">
<title>
@@ -29,7 +25,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>Introduction</title>