Author: pkluegl
Date: Tue Jul 10 16:54:03 2012
New Revision: 1359779
URL: http://svn.apache.org/viewvc?rev=1359779&view=rev
Log:
UIMA-2424
- prepared update site for local snapshot releases
- fixed description in textruler project
- removed textruler plugin temporarily from feature and update site
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-textruler/pom.xml
uima/sandbox/trunk/TextMarker/uimaj-textmarker-eclipse-feature/feature.xml
uima/sandbox/trunk/TextMarker/uimaj-textmarker-eclipse-feature/src/main/resources/feature.xml
uima/sandbox/trunk/TextMarker/uimaj-textmarker-eclipse-update-site/pom.xml
uima/sandbox/trunk/TextMarker/uimaj-textmarker-eclipse-update-site/site.xml
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-textruler/pom.xml
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-textruler/pom.xml?rev=1359779&r1=1359778&r2=1359779&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-textruler/pom.xml
(original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-textruler/pom.xml Tue Jul
10 16:54:03 2012
@@ -14,18 +14,14 @@
</properties>
<name>Apache UIMA Eclipse: ${project.artifactId}</name>
<url>${uimaWebsiteUrl}</url>
- <description>Provides additional views for the CAS Editor</description>
- <scm>
-
<url>http://svn.apache.org/viewvc/uima/sandbox/trunk/uimaj-ep-textmarker-textruler</url>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/uima/sandbox/trunk/uimaj-ep-textmarker-textruler</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/uima/sandbox/trunk/uimaj-ep-textmarker-textruler</developerConnection>
- </scm>
+ <description>Provides the TextRuler framework with implementations of
rule learners</description>
<dependencies>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-ep-textmarker-engine</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-textmarker</artifactId>
+ <version>${project.parent.version}</version>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-ep-textmarker-ide</artifactId>
@@ -59,13 +55,13 @@
<dependency>
<groupId>org.eclipse.dltk</groupId>
<artifactId>core</artifactId>
- <version>[3.0.0,4.0.0)</version>
+ <version>[3.0.1,4.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.dltk</groupId>
<artifactId>ui</artifactId>
- <version>[3.0.0,4.0.0)</version>
+ <version>[3.0.1,4.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -101,7 +97,7 @@
<dependency>
<groupId>org.eclipse.dltk</groupId>
<artifactId>debug</artifactId>
- <version>[3.0.0,4.0.0)</version>
+ <version>[3.0.1,4.0.0)</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -129,6 +125,11 @@
<scope>provided</scope>
</dependency>
</dependencies>
+ <scm>
+
<url>http://svn.apache.org/viewvc/uima/sandbox/trunk/uimaj-ep-textmarker-textruler</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/uima/sandbox/trunk/uimaj-ep-textmarker-textruler</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/uima/sandbox/trunk/uimaj-ep-textmarker-textruler</developerConnection>
+ </scm>
<build>
<!-- don't use artifactId as first part of finalName, follow
instead the
eclipse convention -->
@@ -156,7 +157,6 @@
<configuration>
<excludes>
<exclude>release.properties</exclude> <!-- release generated artifact -->
-
<exclude>src/test/resources/ManualTests/*</exclude> <!-- test data -->
<exclude>marker-file-identifying-*</exclude>
</excludes>
</configuration>
Modified:
uima/sandbox/trunk/TextMarker/uimaj-textmarker-eclipse-feature/feature.xml
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker-eclipse-feature/feature.xml?rev=1359779&r1=1359778&r2=1359779&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-textmarker-eclipse-feature/feature.xml
(original)
+++ uima/sandbox/trunk/TextMarker/uimaj-textmarker-eclipse-feature/feature.xml
Tue Jul 10 16:54:03 2012
@@ -87,11 +87,6 @@ under the License.
version="2.4.1.SNAPSHOT"
unpack="false"/>
- <plugin
- id="org.apache.uima.textmarker.textruler"
- download-size="0"
- install-size="0"
- version="2.4.1.SNAPSHOT"
- unpack="false"/>
+
</feature>
Modified:
uima/sandbox/trunk/TextMarker/uimaj-textmarker-eclipse-feature/src/main/resources/feature.xml
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker-eclipse-feature/src/main/resources/feature.xml?rev=1359779&r1=1359778&r2=1359779&view=diff
==============================================================================
---
uima/sandbox/trunk/TextMarker/uimaj-textmarker-eclipse-feature/src/main/resources/feature.xml
(original)
+++
uima/sandbox/trunk/TextMarker/uimaj-textmarker-eclipse-feature/src/main/resources/feature.xml
Tue Jul 10 16:54:03 2012
@@ -87,11 +87,6 @@ under the License.
version="${parsedVersion.osgiVersion}"
unpack="false"/>
- <plugin
- id="org.apache.uima.textmarker.textruler"
- download-size="0"
- install-size="0"
- version="${parsedVersion.osgiVersion}"
- unpack="false"/>
+
</feature>
Modified:
uima/sandbox/trunk/TextMarker/uimaj-textmarker-eclipse-update-site/pom.xml
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker-eclipse-update-site/pom.xml?rev=1359779&r1=1359778&r2=1359779&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-textmarker-eclipse-update-site/pom.xml
(original)
+++ uima/sandbox/trunk/TextMarker/uimaj-textmarker-eclipse-update-site/pom.xml
Tue Jul 10 16:54:03 2012
@@ -31,7 +31,7 @@
<packaging>pom</packaging>
<version>4</version>
- <name>Apache UIMAhe UIMA Eclipse: ${project.artifactId}</name>
+ <name>Apache UIMA Eclipse: ${project.artifactId}</name>
<description>The UIMA TextMarker Eclipse update site</description>
<url>${uimaWebsiteUrl}</url>
@@ -59,7 +59,7 @@
<uimaScmRoot>uimaj</uimaScmRoot>
<uimaScmProject>${project.artifactId}</uimaScmProject>
<eclipseUpdateSite>${project.build.directory}/eclipse-update-site</eclipseUpdateSite>
- <item-maven-release-version>2.4.1.SNAPSHOT</item-maven-release-version>
+ <item-maven-release-version>2.4.1-SNAPSHOT</item-maven-release-version>
<item-eclipse-release-version>2.4.1.SNAPSHOT</item-eclipse-release-version>
</properties>
@@ -134,12 +134,6 @@
<version>${item-maven-release-version}</version>
<destFileName>org.apache.uima.textmarker.ide_${item-eclipse-release-version}.jar</destFileName>
</artifactItem>
- <artifactItem>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-ep-textmarker-textruler</artifactId>
- <version>${item-maven-release-version}</version>
-
<destFileName>org.apache.uima.textmarker.textruler_${item-eclipse-release-version}.jar</destFileName>
- </artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/work/plugins</outputDirectory>
</configuration>
Modified:
uima/sandbox/trunk/TextMarker/uimaj-textmarker-eclipse-update-site/site.xml
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker-eclipse-update-site/site.xml?rev=1359779&r1=1359778&r2=1359779&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-textmarker-eclipse-update-site/site.xml
(original)
+++ uima/sandbox/trunk/TextMarker/uimaj-textmarker-eclipse-update-site/site.xml
Tue Jul 10 16:54:03 2012
@@ -5,9 +5,8 @@
<description url="http://www.apache.org/dist/uima/eclipse-update-site";>
Eclipse update site for Apache UIMA TextMarker.
</description>
- <feature url="features/org.apache.uima.textmarker_2.4.1.SNAPSHOT.jar"
id="org.apache.uima.textmarker.feature" version="2.4.1.SNAPSHOT">
+ <feature
url="features/org.apache.uima.textmarker.feature_2.4.1.SNAPSHOT.jar"
id="org.apache.uima.textmarker.feature" version="2.4.1.SNAPSHOT">
<category name="uima-textmarker"/>
</feature>
-
<category-def name="uima-textmarker" label="Apache UIMA TextMarker Eclipse
tooling and runtime support"/>
</site>
