Author: schor
Date: Wed May 5 14:44:09 2010
New Revision: 941320
URL: http://svn.apache.org/viewvc?rev=941320&view=rev
Log:
[UIMA-1756] use parsedVersion.osgiVersion, change to 2.3.1.SNAPSHOT version,
change strategy for getting plugin and feature jars - to getting them from mvn
repo, cleanup POMs to conform to conventions
Modified:
uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-runtime/ (props
changed)
uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-runtime/feature.xml
uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-runtime/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-tools/ (props
changed)
uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-tools/feature.xml
uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-tools/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-eclipse-update-site/ (props changed)
uima/uimaj/branches/mavenAlign/uimaj-eclipse-update-site/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-eclipse-update-site/site.xml
Propchange: uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-runtime/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed May 5 14:44:09 2010
@@ -1,2 +1,5 @@
META-INF
target
+src
+.settings
+.classpath
Modified:
uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-runtime/feature.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-runtime/feature.xml?rev=941320&r1=941319&r2=941320&view=diff
==============================================================================
--- uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-runtime/feature.xml
(original)
+++ uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-runtime/feature.xml
Wed May 5 14:44:09 2010
@@ -20,7 +20,7 @@
<feature
id="org.apache.uima.runtime"
label="UIMA Runtime"
- version="2.3.0.incubating"
+ version="2.3.1.SNAPSHOT"
provider-name="Apache Software Foundation">
<description url="http://incubator.apache.org/uima";>
@@ -58,7 +58,7 @@ under the License.
id="org.apache.uima.runtime"
download-size="0"
install-size="0"
- version="2.3.0.incubating"
+ version="2.3.1.SNAPSHOT"
unpack="false"/>
</feature>
Modified: uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-runtime/pom.xml?rev=941320&r1=941319&r2=941320&view=diff
==============================================================================
--- uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-runtime/pom.xml
(original)
+++ uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-runtime/pom.xml Wed
May 5 14:44:09 2010
@@ -18,19 +18,51 @@
<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>
- <!-- groupId omitted - inherited from parent -->
- <artifactId>uimaj-eclipse-feature-runtime</artifactId>
- <packaging>jar</packaging>
- <!-- version omitted - inherited from parent-->
- <name>Apache UIMA Eclipse Feature: Runtime</name>
+
<parent>
<groupId>org.apache.uima</groupId>
- <artifactId>uimaj-eclipse-plugins</artifactId>
- <version>2.3.0.incubating</version> <!-- this comment is a flag for
changeVersion -->
+ <artifactId>parent-pom-top</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
</parent>
+ <artifactId>uimaj-eclipse-feature-runtime</artifactId>
+ <packaging>jar</packaging>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>UIMA Eclipse: ${project.artifactId}</name>
+ <description>UIMA Eclipse Plugin Feature that
+ has the base UIMA runtime, referred to by other plugins that
+ need UIMA framework code</description>
+ <url>${uimaWebsiteUrl}</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>uimaj</uimaScmRoot>
+ <uimaScmProject>${project.artifactId}</uimaScmProject>
+ </properties>
+
<build>
-
<finalName>org.apache.uima.runtime_${uimaj-release-eclipse-version}</finalName>
+ <!-- parsedVersion set in parent-pom-top by builder-helper -->
+ <finalName>org.apache.uima.runtime_${parsedVersion.osgiVersion}</finalName>
<resources>
<resource>
<directory>.</directory>
Propchange: uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-tools/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed May 5 14:44:09 2010
@@ -1,2 +1,4 @@
META-INF
target
+.settings
+.classpath
Modified: uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-tools/feature.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-tools/feature.xml?rev=941320&r1=941319&r2=941320&view=diff
==============================================================================
--- uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-tools/feature.xml
(original)
+++ uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-tools/feature.xml Wed
May 5 14:44:09 2010
@@ -20,7 +20,7 @@
<feature
id="org.apache.uima.tools"
label="UIMA tools (includes Runtime)"
- version="2.3.0.incubating"
+ version="2.3.0.SNAPSHOT"
provider-name="Apache Software Foundation">
<description url="http://incubator.apache.org/uima";>
@@ -59,7 +59,7 @@ under the License.
<includes
id="org.apache.uima.runtime"
- version="2.3.0.incubating"
+ version="2.3.1.SNAPSHOT"
name="UIMA Runtime plugin feature"/>
<requires>
@@ -90,35 +90,35 @@ under the License.
id="org.apache.uima.debug"
download-size="0"
install-size="0"
- version="2.3.0.incubating"
+ version="2.3.1.SNAPSHOT"
unpack="false"/>
<plugin
id="org.apache.uima.desceditor"
download-size="0"
install-size="0"
- version="2.3.0.incubating"
+ version="2.3.1.SNAPSHOT"
unpack="false"/>
<plugin
id="org.apache.uima.jcas.jcasgenp"
download-size="0"
install-size="0"
- version="2.3.0.incubating"
+ version="2.3.1.SNAPSHOT"
unpack="false"/>
<plugin
id="org.apache.uima.pear"
download-size="0"
install-size="0"
- version="2.3.0.incubating"
+ version="2.3.1.SNAPSHOT"
unpack="false"/>
<plugin
id="org.apache.uima.caseditor"
download-size="0"
install-size="0"
- version="2.3.0.incubating"
+ version="2.3.1.SNAPSHOT"
unpack="false"/>
</feature>
Modified: uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-tools/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-tools/pom.xml?rev=941320&r1=941319&r2=941320&view=diff
==============================================================================
--- uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-tools/pom.xml
(original)
+++ uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-tools/pom.xml Wed May
5 14:44:09 2010
@@ -18,19 +18,49 @@
<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>
- <!-- groupId omitted - inherited from parent -->
- <artifactId>uimaj-eclipse-feature-tools</artifactId>
- <packaging>jar</packaging>
- <!-- version omitted - inherited from parent-->
- <name>Apache UIMA Eclipse Feature: Tools</name>
+
<parent>
<groupId>org.apache.uima</groupId>
- <artifactId>uimaj-eclipse-plugins</artifactId>
- <version>2.3.0.incubating</version> <!-- this comment is a flag for
changeVersion -->
+ <artifactId>parent-pom-top</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
</parent>
-
+
+ <artifactId>uimaj-eclipse-feature-tools</artifactId>
+ <packaging>jar</packaging>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>UIMA Eclipse: ${project.artifactId}</name>
+ <description>UIMA Eclipse Plugin Feature for base uima tooling</description>
+ <url>${uimaWebsiteUrl}</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>uimaj</uimaScmRoot>
+ <uimaScmProject>${project.artifactId}</uimaScmProject>
+ </properties>
+
<build>
-
<finalName>org.apache.uima.tools_${uimaj-release-eclipse-version}</finalName>
+ <!-- parsedVersion set in parent-pom-top by builder-helper -->
+ <finalName>org.apache.uima.tools_${parsedVersion.osgiVersion}</finalName>
<resources>
<resource>
<directory>.</directory>
Propchange: uima/uimaj/branches/mavenAlign/uimaj-eclipse-update-site/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed May 5 14:44:09 2010
@@ -1,2 +1,3 @@
-target
-work
+target
+work
+.settings
Modified: uima/uimaj/branches/mavenAlign/uimaj-eclipse-update-site/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/uimaj-eclipse-update-site/pom.xml?rev=941320&r1=941319&r2=941320&view=diff
==============================================================================
--- uima/uimaj/branches/mavenAlign/uimaj-eclipse-update-site/pom.xml (original)
+++ uima/uimaj/branches/mavenAlign/uimaj-eclipse-update-site/pom.xml Wed May 5
14:44:09 2010
@@ -18,18 +18,52 @@
<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>
- <!-- groupId omitted - inherited from parent -->
+
+ <parent>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>parent-pom-top</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
+ </parent>
+
<artifactId>uimaj-eclipse-update-site</artifactId>
<packaging>pom</packaging>
- <!-- version omitted - inherited from parent-->
- <name>Apache UIMA Eclipse Update Site</name>
- <parent>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-eclipse-plugins</artifactId>
- <version>2.3.0.incubating</version> <!-- this comment is a flag
for changeVersion -->
- </parent>
-
- <!--dependencies>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>UIMA Eclipse: ${project.artifactId}</name>
+ <description>The UIMA Eclipse update site</description>
+ <url>${uimaWebsiteUrl}</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>uimaj</uimaScmRoot>
+ <uimaScmProject>${project.artifactId}</uimaScmProject>
+
<eclipseUpdateSite>${project.build.directory}/eclipse-update-site</eclipseUpdateSite>
+ </properties>
+
+ <!-- don't use dependency mechanism - use dependency:copy
+ because we need to get multiple versions for the
+ eclipese-feature-projects, and Maven
+ wants to resolve multiple versions into one.
+ <dependencies>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-ep-cas-editor</artifactId>
@@ -77,7 +111,7 @@
<artifactId>uimaj-ep-runtime-deployeditor</artifactId>
<version>${uimaj-release-eclipse-version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-eclipse-feature-deployeditor</artifactId>
@@ -119,36 +153,85 @@
</resources>
<plugins>
- <!--plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>copy-plugins</id>
+ <id>copy-plugins-being-released</id>
<goals>
- <goal>copy-dependencies</goal>
+ <goal>copy</goal>
</goals>
<configuration>
- <outputDirectory>plugins</outputDirectory>
-
<outputAbsoluteArtifactFilename>true</outputAbsoluteArtifactFilename>
- <excludeTransitive>true</excludeTransitive>
-
<excludeArtifactIds>uimaj-eclipse-feature-deployeditor,uimaj-eclipse-feature-runtime,uimaj-eclipse-feature-tools</excludeArtifactIds>
+ <!--
===================================================================
+ List here just the new versions of plugins that are being
released;
+ remove old versions from this list.
+
+ Include (hard-code) the specific versions you wish to use.
+
+ The build will include just those new plugins; these should
be
+ merged with other released plugins for previous versions
that the
+ feature(s) support, on the actual eclipse-update-site
+
======================================================================= -->
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-ep-cas-editor</artifactId>
+ <version>2.3.1-SNAPSHOT</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-ep-configurator</artifactId>
+ <version>2.3.1-SNAPSHOT</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-ep-debug</artifactId>
+ <version>2.3.1-SNAPSHOT</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-ep-jcasgen</artifactId>
+ <version>2.3.1-SNAPSHOT</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-ep-pear-packager</artifactId>
+ <version>2.3.1-SNAPSHOT</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-ep-runtime</artifactId>
+ <version>2.3.1-SNAPSHOT</version>
+ </artifactItem>
+ </artifactItems>
+
<outputDirectory>${project.build.directory}/work/plugins</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-features</id>
<goals>
- <goal>copy-dependencies</goal>
+ <goal>copy</goal>
</goals>
<configuration>
- <outputDirectory>features</outputDirectory>
-
<outputAbsoluteArtifactFilename>true</outputAbsoluteArtifactFilename>
- <excludeTransitive>true</excludeTransitive>
-
<includeArtifactIds>uimaj-eclipse-feature-deployeditor,uimaj-eclipse-feature-runtime,uimaj-eclipse-feature-tools</includeArtifactIds>
+ <!-- include here all of the features -->
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-eclipse-feature-runtime</artifactId>
+ <version>${project.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-eclipse-feature-tools</artifactId>
+ <version>${project.version}</version>
+ </artifactItem>
+ </artifactItems>
+
<outputDirectory>${project.build.directory}/eclipse-update-site/features</outputDirectory>
</configuration>
</execution>
</executions>
- </plugin-->
+ </plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
@@ -173,6 +256,7 @@
<fail unless="eclipse.home"
message="********** Please set up and use an ant property
eclipse.home set to an Eclipse installation at level 3.3 or later, e.g.
c:/eclipses/3.3/eclipse"/>
+ <!--
<copy todir="plugins" preservelastmodified="true"
file="../uimaj-ep-cas-editor/target/org.apache.uima.caseditor_${uimaj-release-eclipse-version}.jar"/>
<copy todir="plugins" preservelastmodified="true"
@@ -196,25 +280,26 @@
file="../uimaj-eclipse-feature-runtime/target/org.apache.uima.runtime_${uimaj-release-eclipse-version}.jar"/>
<copy todir="features" preservelastmodified="true"
file="../uimaj-eclipse-feature-tools/target/org.apache.uima.tools_${uimaj-release-eclipse-version}.jar"/>
+ -->
<java
jar="${eclipse.home}/plugins/org.eclipse.equinox.launcher.jar"
fork="true" failonerror="true" maxmemory="256m">
<arg line="-application
org.eclipse.update.core.siteOptimizer"/>
<arg line="-jarProcessor -verbose -processAll -pack"/>
- <arg line="-outputDir target/eclipse-update-site/plugins"/>
- <arg line="plugins"/>
+ <arg line="-outputDir ${eclipseUpdateSite}/plugins"/>
+ <arg line="${project.build.directory}/work/plugins"/>
</java>
- <copy todir="target/eclipse-update-site/web"
preservelastmodified="true">
+ <copy todir="${eclipseUpdateSite}/web"
preservelastmodified="true">
<fileset dir="web"/>
</copy>
- <copy todir="target/eclipse-update-site"
+ <copy todir="${eclipseUpdateSite}"
file="index.html" preservelastmodified="true"/>
- <copy todir="target/eclipse-update-site"
+ <copy todir="${eclipseUpdateSite}"
file="site.xml" preservelastmodified="true"/>
- <!-- copy all the features to the target -->
- <copy todir="target/eclipse-update-site/features"
preservelastmodified="true" >
+ <!-- copy all feature jars preserved in SVN in the features/
folder to the target -->
+ <copy todir="${eclipseUpdateSite}/features"
preservelastmodified="true" >
<fileset dir="features"/>
</copy>
@@ -245,7 +330,7 @@
<module>../uimaj-ep-pear-packager</module>
<module>../uimaj-ep-runtime</module>
<module>../uimaj-ep-runtime-deployeditor</module-->
- <module>../uimaj-eclipse-feature-deployeditor</module>
+ <!--module>../uimaj-eclipse-feature-deployeditor</module-->
<module>../uimaj-eclipse-feature-runtime</module>
<module>../uimaj-eclipse-feature-tools</module>
</modules>
Modified: uima/uimaj/branches/mavenAlign/uimaj-eclipse-update-site/site.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/uimaj-eclipse-update-site/site.xml?rev=941320&r1=941319&r2=941320&view=diff
==============================================================================
--- uima/uimaj/branches/mavenAlign/uimaj-eclipse-update-site/site.xml (original)
+++ uima/uimaj/branches/mavenAlign/uimaj-eclipse-update-site/site.xml Wed May
5 14:44:09 2010
@@ -25,6 +25,14 @@
</description>
<!-- keep old features listed here - to permit the update site to provide
the older features -->
+ <feature url="features/org.apache.uima.tools_2.3.1.SNAPSHOT.jar"
id="org.apache.uima.tools" version="2.3.1.SNAPSHOT">
+ <category name="uima-tooling-and-runtimes"/>
+ </feature>
+ <feature url="features/org.apache.uima.runtime_2.3.1.SNAPSHOT.jar"
id="org.apache.uima.runtime" version="2.3.1.SNAPSHOT">
+ <category name="uima-tooling-and-runtimes"/>
+ </feature>
+
+
<feature url="features/org.apache.uima.tools_2.3.0.incubating.jar"
id="org.apache.uima.tools" version="2.3.0.incubating">
<category name="uima-tooling-and-runtimes"/>
</feature>
