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/14 21:58:31 UTC
svn commit: r944430 [3/3] - in /uima/uimaj/trunk: PearPackagingMavenPlugin/
PearPackagingMavenPlugin/docbook/ PearPackagingMavenPlugin/src/docbook/
jVinci/ uimaj-adapter-soap/ uimaj-adapter-vinci/ uimaj-bootstrap/
uimaj-component-test-util/ uimaj-core/...
Modified: uima/uimaj/trunk/uimaj-ep-configurator/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-configurator/pom.xml?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-configurator/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-ep-configurator/pom.xml Fri May 14 19:58:28 2010
@@ -21,28 +21,48 @@
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-ep-configurator</artifactId>
- <packaging>bundle</packaging>
- <!-- version omitted - inherited from parent-->
- <name>Apache UIMA Configurator Eclipse Plugin</name>
- <url>http://incubator.apache.org/uima</url>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <scm>
- <url>http://svn.apache.org/viewvc/incubator/uima</url>
- </scm>
+
<parent>
<groupId>org.apache.uima</groupId>
- <artifactId>uimaj-eclipse-plugins</artifactId>
- <version>2.3.0.incubating</version> <!-- this comment is a flag for changeVersion -->
- <relativePath>../uimaj/eclipse-plugin-superPom</relativePath>
+ <artifactId>parent-pom-eclipse-plugins-ibm-notice</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
</parent>
+
+ <artifactId>uimaj-ep-configurator</artifactId>
+ <version>2.3.1-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>UIMA Eclipse: ${project.artifactId}: Descriptor Editor</name>
+ <description>A frame-based editor for most of the UIMA XML
+ descriptors</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 incorrectly 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>
+ <uimaDependenciesVersion>${project.version}</uimaDependenciesVersion>
+ </properties>
+
<dependencies>
<!-- UIMA dependencies -->
<!-- depending on the ep-runtime doesn't work without manual intervention because
@@ -62,14 +82,14 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${uimaDependenciesVersion}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-tools</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${uimaDependenciesVersion}</version>
<!-- must be provided to get pax:eclipse to work, but
must be compile to get eclipse:eclipse to include
them as Referenced Libraries -->
@@ -79,7 +99,7 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-ep-jcasgen</artifactId>
- <version>${uimaj-release-eclipse-version}</version>
+ <version>${uimaDependenciesVersion}</version>
<scope>provided</scope>
</dependency>
@@ -203,122 +223,123 @@
<build>
- <finalName>org.apache.uima.desceditor_${uimaj-release-eclipse-version}</finalName>
-
+ <!-- don't use artifactId as first part of finalName, follow instead the eclipse convention -->
+ <finalName>org.apache.uima.desceditor_${parsedVersion.osgiVersion}</finalName>
<plugins>
-
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <!-- version 1.4.0 to support _nouses instruction -->
- <version>1.4.0</version>
- <extensions>true</extensions>
- <configuration>
- <manifestLocation>META-INF</manifestLocation>
- <instructions>
- <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
- <_nouses>true</_nouses>
- <Export-Package>
- org.apache.uima.taeconfigurator,
- org.apache.uima.taeconfigurator.editors,
- org.apache.uima.taeconfigurator.editors.point,
- org.apache.uima.taeconfigurator.editors.ui,
- org.apache.uima.taeconfigurator.editors.ui.dialogs,
- org.apache.uima.taeconfigurator.editors.xml,
- org.apache.uima.taeconfigurator.files,
- org.apache.uima.taeconfigurator.model,
- org.apache.uima.taeconfigurator.wizards
- </Export-Package>
- <Bundle-Activator>org.eclipse.core.internal.compatibility.PluginActivator</Bundle-Activator>
- <Bundle-SymbolicName>org.apache.uima.desceditor;singleton:=true</Bundle-SymbolicName>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
-
- <!-- handle split packages in Eclipse.
- We do this by using Require-Bundle, and excluding from the Import-Package those
- split packages covered by those bundles - this is required by OSGi.
-
- There are 4 packages in org.eclipse.jface.* that are "split" between bundles
- org.eclipse.jface.text and org.eclipse.text.
- Packages:
- org.eclipse.jface.text
- org.eclipse.jface.text.link
- org.eclipse.jface.text.source
- org.eclipse.jface.text.templates
- org.eclipse.ui.texteditor is split between
- org.eclipse.ui.editors and org.eclipse.ui.workbench.texteditor.
- Packages:
- org.eclipse.ui.texteditor
- There are 5 packages in org.eclipse.ui.* that are split between
- org.eclipse.ui.ide and org.eclipse.ui.workbench.
- The Notes say not to require org.eclipse.ui.workbench, but instead just require
- org.eclipse.ui (which imports and reexports org.eclipse.ui.workbench packages).
- Packages:
- org.eclipse.ui
- org.eclipse.ui.actions
- org.eclipse.ui.dialogs
- org.eclipse.ui.model
- org.eclipse.ui.part
- org.eclipse.core.runtime has combined apis (that were split in later
- point releases of 3.x)
- -->
- <Require-Bundle>
- org.eclipse.jface.text,
- org.eclipse.text,
- org.eclipse.ui.editors,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.ide,
- org.eclipse.ui,
- org.eclipse.core.runtime
- </Require-Bundle>
- <Import-Package>
- !org.eclipse.jface.text,
- !org.eclipse.jface.text,
- !org.eclipse.jface.text.link,
- !org.eclipse.jface.text.source,
- !org.eclipse.jface.text.templates,
- !org.eclipse.ui.texteditor,
- !org.eclipse.ui,
- !org.eclipse.ui.actions,
- !org.eclipse.ui.dialogs,
- !org.eclipse.ui.model,
- !org.eclipse.ui.part,
- *,
- org.apache.uima.jcas.jcasgenp,
- org.eclipse.jdt.ui
- </Import-Package>
-
-
- <!-- these determined to be needed empiracally, due to a flaw in the bundle resolver -
- it works from the .class files, so references to things like org.eclipse.swt.SWT.ABORT
- are not visible - this is a static final constant that gets compiled into a number
-
- Also, we stick a minimum version of 3.1.0 to insure we have that at least
-
- First import specifies bundle, since package exists in more than 1 bundle
- -->
- <!--Import-Package>org.eclipse.jface.text.source;bundle-symbolic-name=org.eclipse.jface.text,
- org.eclipse.jface.text;bundle-symbolic-name=org.eclipse.jface.text,
- *,
- org.eclipse.core.commands.common,
- org.eclipse.core.runtime.jobs,
- org.eclipse.core.runtime.content,
- org.eclipse.swt,
- org.eclipse.jface.window,
- org.apache.uima.jcas.jcasgenp,
- org.eclipse.jdt.launching,
- org.eclipse.jdt.ui
- </Import-Package-->
-
- <!--Import-Package>
- *,
- org.eclipse.jdt.launching,
- org.apache.uima.jcas.jcasgenp</Import-Package-->
-
- <Eclipse-AutoStart>true</Eclipse-AutoStart>
- <Plugin-Class>org.apache.uima.taeconfigurator.TAEConfiguratorPlugin</Plugin-Class>
- <Eclipse-ExtensibleAPI>true</Eclipse-ExtensibleAPI>
- </instructions>
- </configuration>
+ <executions>
+ <execution>
+ <id>uima-bundle</id>
+ <configuration>
+ <manifestLocation>META-INF</manifestLocation>
+ <instructions>
+ <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
+ <_nouses>true</_nouses>
+ <Export-Package>
+ org.apache.uima.taeconfigurator,
+ org.apache.uima.taeconfigurator.editors,
+ org.apache.uima.taeconfigurator.editors.point,
+ org.apache.uima.taeconfigurator.editors.ui,
+ org.apache.uima.taeconfigurator.editors.ui.dialogs,
+ org.apache.uima.taeconfigurator.editors.xml,
+ org.apache.uima.taeconfigurator.files,
+ org.apache.uima.taeconfigurator.model,
+ org.apache.uima.taeconfigurator.wizards
+ </Export-Package>
+ <Bundle-Activator>org.eclipse.core.internal.compatibility.PluginActivator</Bundle-Activator>
+ <Bundle-SymbolicName>org.apache.uima.desceditor;singleton:=true</Bundle-SymbolicName>
+ <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
+
+ <!-- handle split packages in Eclipse.
+ We do this by using Require-Bundle, and excluding from the Import-Package those
+ split packages covered by those bundles - this is required by OSGi.
+
+ There are 4 packages in org.eclipse.jface.* that are "split" between bundles
+ org.eclipse.jface.text and org.eclipse.text.
+ Packages:
+ org.eclipse.jface.text
+ org.eclipse.jface.text.link
+ org.eclipse.jface.text.source
+ org.eclipse.jface.text.templates
+ org.eclipse.ui.texteditor is split between
+ org.eclipse.ui.editors and org.eclipse.ui.workbench.texteditor.
+ Packages:
+ org.eclipse.ui.texteditor
+ There are 5 packages in org.eclipse.ui.* that are split between
+ org.eclipse.ui.ide and org.eclipse.ui.workbench.
+ The Notes say not to require org.eclipse.ui.workbench, but instead just require
+ org.eclipse.ui (which imports and reexports org.eclipse.ui.workbench packages).
+ Packages:
+ org.eclipse.ui
+ org.eclipse.ui.actions
+ org.eclipse.ui.dialogs
+ org.eclipse.ui.model
+ org.eclipse.ui.part
+ org.eclipse.core.runtime has combined apis (that were split in later
+ point releases of 3.x)
+ -->
+ <Require-Bundle>
+ org.eclipse.jface.text,
+ org.eclipse.text,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.ui.ide,
+ org.eclipse.ui,
+ org.eclipse.core.runtime
+ </Require-Bundle>
+ <Import-Package>
+ !org.eclipse.jface.text,
+ !org.eclipse.jface.text,
+ !org.eclipse.jface.text.link,
+ !org.eclipse.jface.text.source,
+ !org.eclipse.jface.text.templates,
+ !org.eclipse.ui.texteditor,
+ !org.eclipse.ui,
+ !org.eclipse.ui.actions,
+ !org.eclipse.ui.dialogs,
+ !org.eclipse.ui.model,
+ !org.eclipse.ui.part,
+ *,
+ org.apache.uima.jcas.jcasgenp,
+ org.eclipse.jdt.ui
+ </Import-Package>
+
+
+ <!-- these determined to be needed empiracally, due to a flaw in the bundle resolver -
+ it works from the .class files, so references to things like org.eclipse.swt.SWT.ABORT
+ are not visible - this is a static final constant that gets compiled into a number
+
+ Also, we stick a minimum version of 3.1.0 to insure we have that at least
+
+ First import specifies bundle, since package exists in more than 1 bundle
+ -->
+ <!--Import-Package>org.eclipse.jface.text.source;bundle-symbolic-name=org.eclipse.jface.text,
+ org.eclipse.jface.text;bundle-symbolic-name=org.eclipse.jface.text,
+ *,
+ org.eclipse.core.commands.common,
+ org.eclipse.core.runtime.jobs,
+ org.eclipse.core.runtime.content,
+ org.eclipse.swt,
+ org.eclipse.jface.window,
+ org.apache.uima.jcas.jcasgenp,
+ org.eclipse.jdt.launching,
+ org.eclipse.jdt.ui
+ </Import-Package-->
+
+ <!--Import-Package>
+ *,
+ org.eclipse.jdt.launching,
+ org.apache.uima.jcas.jcasgenp</Import-Package-->
+
+ <Eclipse-AutoStart>true</Eclipse-AutoStart>
+ <Plugin-Class>org.apache.uima.taeconfigurator.TAEConfiguratorPlugin</Plugin-Class>
+ <Eclipse-ExtensibleAPI>true</Eclipse-ExtensibleAPI>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Propchange: uima/uimaj/trunk/uimaj-ep-debug/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 19:58:28 2010
@@ -0,0 +1,2 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-ep-debug:932400-933272
+/uima/uimaj/branches/mavenAlign/uimaj-ep-debug:933273-944402
Modified: uima/uimaj/trunk/uimaj-ep-debug/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-debug/pom.xml?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-debug/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-ep-debug/pom.xml Fri May 14 19:58:28 2010
@@ -21,34 +21,47 @@
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-eclipse-plugins</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
+ </parent>
+
<artifactId>uimaj-ep-debug</artifactId>
- <packaging>bundle</packaging>
- <!-- version omitted - inherited from parent-->
- <name>Apache UIMA Debug Eclipse Plugin</name>
- <url>http://incubator.apache.org/uima</url>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
+ <version>2.3.1-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>UIMA Eclipse: ${project.artifactId}</name>
+ <description>Adds structure knowledge for common
+ UIMA data structures to the Eclipse Debug displays</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 incorrectly 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>
- <url>http://svn.apache.org/viewvc/incubator/uima</url>
- </scm>
- <parent>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-eclipse-plugins</artifactId>
- <version>2.3.0.incubating</version> <!-- this comment is a flag for changeVersion -->
- <!-- this relative path is used the first time mvn is run on the uimaj pom
- to find the uimaj/eclipse-plugin-superPom
- If at some point, a different child pom other than this one becomes the
- first child in the eclipse-plugin-superPom, this relative link needs to
- be put there. Once it is resolved, it is cached, apparently.
- -->
- <relativePath>../uimaj/eclipse-plugin-superPom</relativePath>
- </parent>
+ <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>
+ <uimaDependenciesVersion>${project.version}</uimaDependenciesVersion>
+ </properties>
<dependencies>
<!-- depending on the ep-runtime doesn't work without manual intervention because
@@ -68,7 +81,7 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${uimaDependenciesVersion}</version>
<scope>compile</scope>
</dependency>
@@ -89,41 +102,38 @@
</dependency>
</dependencies>
- <build>
-
- <finalName>org.apache.uima.debug_${uimaj-release-eclipse-version}</finalName>
-
+ <build>
+ <!-- don't use artifactId as first part of finalName, follow instead the eclipse convention -->
+ <finalName>org.apache.uima.debug_${parsedVersion.osgiVersion}</finalName>
<plugins>
-
-
-
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <!-- version 1.4.0 to support _nouses instruction -->
- <version>1.4.0</version>
- <extensions>true</extensions>
- <configuration>
- <manifestLocation>META-INF</manifestLocation>
- <instructions>
- <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
- <_nouses>true</_nouses>
- <Export-Package>
- org.apache.uima.ep_debug
- </Export-Package>
-
- <Import-Package>*,
- org.eclipse.ui.plugin
- </Import-Package>
-
- <Bundle-Activator>org.apache.uima.ep_debug.DebugPlugin</Bundle-Activator>
- <Bundle-SymbolicName>org.apache.uima.debug;singleton:=true</Bundle-SymbolicName>
+ <executions>
+ <execution>
+ <id>uima-bundle</id>
+ <configuration>
+ <instructions>
+ <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
+ <_nouses>true</_nouses>
+ <Export-Package>
+ org.apache.uima.ep_debug
+ </Export-Package>
+
+ <Import-Package>*,
+ org.eclipse.ui.plugin
+ </Import-Package>
+
+ <Bundle-Activator>org.apache.uima.ep_debug.DebugPlugin</Bundle-Activator>
+ <Bundle-SymbolicName>org.apache.uima.debug;singleton:=true</Bundle-SymbolicName>
+
+ <Eclipse-AutoStart>true</Eclipse-AutoStart>
+ </instructions>
+ </configuration>
- <Eclipse-AutoStart>true</Eclipse-AutoStart>
- </instructions>
- </configuration>
- </plugin>
-
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
Propchange: uima/uimaj/trunk/uimaj-ep-jcasgen/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 19:58:28 2010
@@ -0,0 +1,2 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-ep-jcasgen:932400-933272
+/uima/uimaj/branches/mavenAlign/uimaj-ep-jcasgen:933273-944403
Modified: uima/uimaj/trunk/uimaj-ep-jcasgen/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-jcasgen/pom.xml?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-jcasgen/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-ep-jcasgen/pom.xml Fri May 14 19:58:28 2010
@@ -21,28 +21,48 @@
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-ibm-notice</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
+ </parent>
+
<artifactId>uimaj-ep-jcasgen</artifactId>
- <packaging>bundle</packaging>
- <!-- version omitted - inherited from parent-->
- <name>Apache UIMA JCasGen Eclipse Plugin</name>
- <url>http://incubator.apache.org/uima</url>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
+ <packaging>jar</packaging>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>UIMA Eclipse: ${project.artifactId}</name>
+ <description>Provides a connection to the JCasGen tooling, for
+ the Component Descriptor Editor</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>
- <url>http://svn.apache.org/viewvc/incubator/uima</url>
- </scm>
- <parent>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-eclipse-plugins</artifactId>
- <version>2.3.0.incubating</version> <!-- this comment is a flag for changeVersion -->
- <relativePath>../uimaj/eclipse-plugin-superPom</relativePath>
- </parent>
+ <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>
+ <uimaDependencyVersion>${project.version}</uimaDependencyVersion>
+ </properties>
+
<dependencies>
<!-- UIMA dependencies -->
<!-- don't depend on the runtime plugin, instead,
@@ -57,14 +77,14 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${uimaDependencyVersion}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-tools</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${uimaDependencyVersion}</version>
<scope>compile</scope>
</dependency>
@@ -97,36 +117,38 @@
<build>
- <finalName>org.apache.uima.jcas.jcasgenp_${uimaj-release-eclipse-version}</finalName>
+ <!-- don't use artifactId as first part of finalName, follow instead the eclipse convention -->
+ <finalName>org.apache.uima.jcas.jcasgenp_${parsedVersion.osgiVersion}</finalName>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <!-- version 1.4.0 to support _nouses instruction -->
- <version>1.4.0</version>
- <extensions>true</extensions>
- <configuration>
- <manifestLocation>META-INF</manifestLocation>
- <instructions>
- <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
- <_nouses>true</_nouses>
- <Export-Package>
- org.apache.uima.jcas.jcasgenp
- </Export-Package>
- <Bundle-Activator>org.eclipse.core.internal.compatibility.PluginActivator</Bundle-Activator>
- <!-- these next imports are needed by Eclipse to get things to compile, but
- not needed by maven -->
- <Import-Package>*,
- org.eclipse.core.runtime.jobs,
- org.osgi.framework,
- org.eclipse.jdt.core.jdom
- </Import-Package>
- <Bundle-SymbolicName>org.apache.uima.jcas.jcasgenp;singleton:=true</Bundle-SymbolicName>
- <Eclipse-AutoStart>true</Eclipse-AutoStart>
- <Plugin-Class>org.apache.uima.jcas.jcasgenp.JgPlugin</Plugin-Class>
- </instructions>
- </configuration>
+ <executions>
+ <execution>
+ <id>uima-bundle</id>
+ <configuration>
+ <instructions>
+ <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
+ <_nouses>true</_nouses>
+ <Export-Package>
+ org.apache.uima.jcas.jcasgenp
+ </Export-Package>
+ <Bundle-Activator>org.eclipse.core.internal.compatibility.PluginActivator</Bundle-Activator>
+ <!-- these next imports are needed by Eclipse to get things to compile, but
+ not needed by maven -->
+ <Import-Package>*,
+ org.eclipse.core.runtime.jobs,
+ org.osgi.framework,
+ org.eclipse.jdt.core.jdom
+ </Import-Package>
+ <Bundle-SymbolicName>org.apache.uima.jcas.jcasgenp;singleton:=true</Bundle-SymbolicName>
+ <Eclipse-AutoStart>true</Eclipse-AutoStart>
+ <Plugin-Class>org.apache.uima.jcas.jcasgenp.JgPlugin</Plugin-Class>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Propchange: uima/uimaj/trunk/uimaj-ep-pear-packager/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 19:58:28 2010
@@ -0,0 +1,2 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-ep-pear-packager:932400-933272
+/uima/uimaj/branches/mavenAlign/uimaj-ep-pear-packager:933273-944403
Modified: uima/uimaj/trunk/uimaj-ep-pear-packager/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-pear-packager/pom.xml?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-pear-packager/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-ep-pear-packager/pom.xml Fri May 14 19:58:28 2010
@@ -20,29 +20,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 -->
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>parent-pom-eclipse-plugins</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
+ </parent>
+
<artifactId>uimaj-ep-pear-packager</artifactId>
- <packaging>bundle</packaging>
- <!-- version omitted - inherited from parent-->
- <name>Apache UIMA PEAR Packager Eclipse Plugin</name>
- <url>http://incubator.apache.org/uima</url>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
+ <version>2.3.1-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>UIMA Eclipse: ${project.artifactId}</name>
+ <description>Provides an Eclipse Wizard to construct
+ a PEAR package</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>
- <url>http://svn.apache.org/viewvc/incubator/uima</url>
- </scm>
- <parent>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-eclipse-plugins</artifactId>
- <version>2.3.0.incubating</version> <!-- this comment is a flag for changeVersion -->
- <relativePath>../uimaj/eclipse-plugin-superPom</relativePath>
- </parent>
+ <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>
+ <uimaDependencyVersion>${project.version}</uimaDependencyVersion>
+ </properties>
+
<dependencies>
<!-- UIMA dependencies -->
<!-- depending on the ep-runtime doesn't work without manual intervention because
@@ -62,7 +82,7 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${uimaDependencyVersion}</version>
<scope>compile</scope>
</dependency>
@@ -112,94 +132,96 @@
</dependencies>
<build>
- <finalName>org.apache.uima.pear_${uimaj-release-eclipse-version}</finalName>
+ <!-- don't use artifactId as first part of finalName, follow instead the eclipse convention -->
+ <finalName>org.apache.uima.pear_${parsedVersion.osgiVersion}</finalName>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <!-- version 1.4.0 to support _nouses instruction -->
- <version>1.4.0</version>
- <extensions>true</extensions>
- <configuration>
- <manifestLocation>META-INF</manifestLocation>
- <instructions>
- <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
- <_nouses>true</_nouses>
- <Export-Package>
- org.apache.uima.pear,
- org.apache.uima.pear.actions,
- org.apache.uima.pear.generate,
- org.apache.uima.pear.insd.edit,
- org.apache.uima.pear.insd.edit.vars,
- org.apache.uima.pear.nature
- </Export-Package>
-
- <!-- handle split packages in Eclipse.
- We do this by using Require-Bundle, and excluding from the Import-Package those
- split packages covered by those bundles - this is required by OSGi.
-
- There are 4 packages in org.eclipse.jface.* that are "split" between bundles
- org.eclipse.jface.text and org.eclipse.text.
- Packages:
- org.eclipse.jface.text
- org.eclipse.jface.text.link
- org.eclipse.jface.text.source
- org.eclipse.jface.text.templates
- org.eclipse.ui.texteditor is split between
- org.eclipse.ui.editors and org.eclipse.ui.workbench.texteditor.
- Packages:
- org.eclipse.ui.texteditor
- There are 5 packages in org.eclipse.ui.* that are split between
- org.eclipse.ui.ide and org.eclipse.ui.workbench.
- The Notes say not to require org.eclipse.ui.workbench, but instead just require
- org.eclipse.ui (which imports and reexports org.eclipse.ui.workbench packages).
- Packages:
- org.eclipse.ui
- org.eclipse.ui.actions
- org.eclipse.ui.dialogs
- org.eclipse.ui.model
- org.eclipse.ui.part
- org.eclipse.core.runtime has combined apis (that were split in later
- point releases of 3.x)
- -->
- <Require-Bundle>
- org.eclipse.jface.text,
- org.eclipse.text,
- org.eclipse.ui.editors,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.ide,
- org.eclipse.ui,
- org.eclipse.ui.workbench,
- org.eclipse.core.runtime
- </Require-Bundle>
- <Import-Package>
- !org.eclipse.jface.text,
- !org.eclipse.jface.text,
- !org.eclipse.jface.text.link,
- !org.eclipse.jface.text.source,
- !org.eclipse.jface.text.templates,
- !org.eclipse.ui.texteditor,
- !org.eclipse.ui,
- !org.eclipse.ui.actions,
- !org.eclipse.ui.dialogs,
- !org.eclipse.ui.model,
- !org.eclipse.ui.part,
- *
- </Import-Package>
- <!--Import-Package>*,
- org.eclipse.core.runtime.jobs,
- org.eclipse.core.commands.common,
- org.eclipse.swt,
- org.eclipse.jface.window
- </Import-Package-->
-
- <Bundle-Activator>org.apache.uima.pear.PearPlugin</Bundle-Activator>
- <Bundle-SymbolicName>org.apache.uima.pear;singleton:=true</Bundle-SymbolicName>
-
- <Eclipse-AutoStart>true</Eclipse-AutoStart>
- </instructions>
- </configuration>
+ <executions>
+ <execution>
+ <id>uima-bundle</id>
+ <configuration>
+ <instructions>
+ <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
+ <_nouses>true</_nouses>
+ <Export-Package>
+ org.apache.uima.pear,
+ org.apache.uima.pear.actions,
+ org.apache.uima.pear.generate,
+ org.apache.uima.pear.insd.edit,
+ org.apache.uima.pear.insd.edit.vars,
+ org.apache.uima.pear.nature
+ </Export-Package>
+
+ <!-- handle split packages in Eclipse.
+ We do this by using Require-Bundle, and excluding from the Import-Package those
+ split packages covered by those bundles - this is required by OSGi.
+
+ There are 4 packages in org.eclipse.jface.* that are "split" between bundles
+ org.eclipse.jface.text and org.eclipse.text.
+ Packages:
+ org.eclipse.jface.text
+ org.eclipse.jface.text.link
+ org.eclipse.jface.text.source
+ org.eclipse.jface.text.templates
+ org.eclipse.ui.texteditor is split between
+ org.eclipse.ui.editors and org.eclipse.ui.workbench.texteditor.
+ Packages:
+ org.eclipse.ui.texteditor
+ There are 5 packages in org.eclipse.ui.* that are split between
+ org.eclipse.ui.ide and org.eclipse.ui.workbench.
+ The Notes say not to require org.eclipse.ui.workbench, but instead just require
+ org.eclipse.ui (which imports and reexports org.eclipse.ui.workbench packages).
+ Packages:
+ org.eclipse.ui
+ org.eclipse.ui.actions
+ org.eclipse.ui.dialogs
+ org.eclipse.ui.model
+ org.eclipse.ui.part
+ org.eclipse.core.runtime has combined apis (that were split in later
+ point releases of 3.x)
+ -->
+ <Require-Bundle>
+ org.eclipse.jface.text,
+ org.eclipse.text,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.ui.ide,
+ org.eclipse.ui,
+ org.eclipse.ui.workbench,
+ org.eclipse.core.runtime
+ </Require-Bundle>
+ <Import-Package>
+ !org.eclipse.jface.text,
+ !org.eclipse.jface.text,
+ !org.eclipse.jface.text.link,
+ !org.eclipse.jface.text.source,
+ !org.eclipse.jface.text.templates,
+ !org.eclipse.ui.texteditor,
+ !org.eclipse.ui,
+ !org.eclipse.ui.actions,
+ !org.eclipse.ui.dialogs,
+ !org.eclipse.ui.model,
+ !org.eclipse.ui.part,
+ *
+ </Import-Package>
+ <!--Import-Package>*,
+ org.eclipse.core.runtime.jobs,
+ org.eclipse.core.commands.common,
+ org.eclipse.swt,
+ org.eclipse.jface.window
+ </Import-Package-->
+
+ <Bundle-Activator>org.apache.uima.pear.PearPlugin</Bundle-Activator>
+ <Bundle-SymbolicName>org.apache.uima.pear;singleton:=true</Bundle-SymbolicName>
+
+ <Eclipse-AutoStart>true</Eclipse-AutoStart>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Propchange: uima/uimaj/trunk/uimaj-ep-runtime/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 19:58:28 2010
@@ -0,0 +1,2 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-ep-runtime:932400-933272
+/uima/uimaj/branches/mavenAlign/uimaj-ep-runtime:933273-944403
Modified: uima/uimaj/trunk/uimaj-ep-runtime/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-runtime/pom.xml?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-runtime/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-ep-runtime/pom.xml Fri May 14 19:58:28 2010
@@ -21,29 +21,48 @@
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-ep-runtime</artifactId>
- <packaging>bundle</packaging>
- <!-- version omitted - inherited from parent-->
- <name>Apache UIMA Runtime Plugin</name>
- <url>http://incubator.apache.org/uima</url>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <scm>
- <url>http://svn.apache.org/viewvc/incubator/uima</url>
- </scm>
+
<parent>
<groupId>org.apache.uima</groupId>
- <artifactId>uimaj-eclipse-plugins</artifactId>
- <version>2.3.0.incubating</version> <!-- this comment is a flag for changeVersion -->
- <relativePath>../uimaj/eclipse-plugin-superPom</relativePath>
+ <artifactId>parent-pom-eclipse-plugins</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
</parent>
-
+
+ <artifactId>uimaj-ep-runtime</artifactId>
+ <version>2.3.1-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>UIMA Eclipse: ${project.artifactId}</name>
+ <description>Provides the core UIMA Framework to other Eclipse
+ plugins for their use</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 incorrectly 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>
+ <uimaDependenciesVersion>${project.version}</uimaDependenciesVersion>
+ </properties>
+
<!-- These dependencies should just be all the jars that
need to be included in the library plugin -->
<dependencies>
@@ -51,28 +70,28 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${uimaDependenciesVersion}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-cpe</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${uimaDependenciesVersion}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-tools</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${uimaDependenciesVersion}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-adapter-vinci</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${uimaDependenciesVersion}</version>
<scope>compile</scope>
</dependency>
@@ -93,138 +112,136 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>jVinci</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${uimaDependenciesVersion}</version>
<scope>compile</scope>
</dependency>
</dependencies>
-
<build>
-
- <finalName>org.apache.uima.runtime_${uimaj-release-eclipse-version}</finalName>
-
+ <!-- don't use artifactId as first part of finalName, follow instead the eclipse convention -->
+ <finalName>org.apache.uima.runtime_${parsedVersion.osgiVersion}</finalName>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <!-- version 1.4.0 to support _nouses instruction -->
- <version>1.4.0</version>
- <extensions>true</extensions>
- <configuration>
- <manifestLocation>META-INF</manifestLocation>
- <instructions>
- <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
- <_nouses>true</_nouses>
- <!-- export contents because we don't want the actual
- java code included (although we could... as an
- alternative to the jars - but might have a
- versioning / control issue -->
- <_exportcontents>
- org.apache.uima,
- org.apache.uima.adapter.vinci,
- org.apache.uima.adapter.vinci.util,
- org.apache.uima.analysis_component,
- org.apache.uima.analysis_engine,
- org.apache.uima.analysis_engine.annotator,
- org.apache.uima.analysis_engine.asb,
- org.apache.uima.analysis_engine.asb.impl,
- org.apache.uima.analysis_engine.impl,
- org.apache.uima.analysis_engine.impl.compatibility,
- org.apache.uima.analysis_engine.metadata,
- org.apache.uima.analysis_engine.metadata.impl,
- org.apache.uima.analysis_engine.service.impl,
- org.apache.uima.cas,
- org.apache.uima.cas.admin,
- org.apache.uima.cas.impl,
- org.apache.uima.cas.text,
- org.apache.uima.cas_data,
- org.apache.uima.cas_data.impl,
- org.apache.uima.cas_data.impl.vinci,
- org.apache.uima.collection,
- org.apache.uima.collection.base_cpm,
- org.apache.uima.collection.impl,
- org.apache.uima.collection.impl.base_cpm.container,
- org.apache.uima.collection.impl.base_cpm.container.deployer,
- org.apache.uima.collection.impl.cpm,
- org.apache.uima.collection.impl.cpm.container,
- org.apache.uima.collection.impl.cpm.container.deployer,
- org.apache.uima.collection.impl.cpm.container.deployer.socket,
- org.apache.uima.collection.impl.cpm.container.deployer.vinci,
- org.apache.uima.collection.impl.cpm.container.deployer.vns,
- org.apache.uima.collection.impl.cpm.engine,
- org.apache.uima.collection.impl.cpm.utils,
- org.apache.uima.collection.impl.cpm.vinci,
- org.apache.uima.collection.impl.cpm.vinci.cas_data,
- org.apache.uima.collection.impl.metadata,
- org.apache.uima.collection.impl.metadata.cpe,
- org.apache.uima.collection.metadata,
- org.apache.uima.flow,
- org.apache.uima.flow.impl,
- org.apache.uima.impl,
- org.apache.uima.internal.util,
- org.apache.uima.internal.util.rb_trees,
- org.apache.uima.internal.util.text,
- org.apache.uima.jcas,
- org.apache.uima.jcas.cas,
- org.apache.uima.jcas.impl,
- org.apache.uima.jcas.tcas,
- org.apache.uima.pear.tools,
- org.apache.uima.pear.util,
- org.apache.uima.resource,
- org.apache.uima.resource.impl,
- org.apache.uima.resource.metadata,
- org.apache.uima.resource.metadata.impl,
- org.apache.uima.resource.service.impl,
- org.apache.uima.search,
- org.apache.uima.search.impl,
- org.apache.uima.tools,
- org.apache.uima.tools.annot_view,
- org.apache.uima.tools.cpm,
- org.apache.uima.tools.cvd,
- org.apache.uima.tools.cvd.control,
- org.apache.uima.tools.cvd.tsview,
- org.apache.uima.tools.docanalyzer,
- org.apache.uima.tools.images,
- org.apache.uima.tools.jcasgen,
- org.apache.uima.tools.pear.install,
- org.apache.uima.tools.pear.merger,
- org.apache.uima.tools.stylemap,
- org.apache.uima.tools.util.gui,
- org.apache.uima.tools.util.htmlview,
- org.apache.uima.tools.viewer,
- org.apache.uima.uimacpp,
- org.apache.uima.util,
- org.apache.uima.util.impl,
- org.apache.vinci.debug,
- org.apache.vinci.transport,
- org.apache.vinci.transport.context,
- org.apache.vinci.transport.document,
- org.apache.vinci.transport.util,
- org.apache.vinci.transport.vns,
- org.apache.vinci.transport.vns.client,
- org.apache.vinci.transport.vns.service
- </_exportcontents>
-
- <!-- excluded packages:
- org.apache.uima.adapter.soap,
- org.apache.uima.adapter.soap.axis11,
- -->
- <Import-Package>org.apache.log4j;resolution:=optional,*
- </Import-Package>
- <!-- causes the other Jars from the maven
- dependencies, at the proper version, to be
- included in this, and also sets up the bundle
- classpath to include them -->
- <Embed-Dependency>*;scope=compile;inline=true</Embed-Dependency>
-
- <!-- These just get made into the corresponding manifest entries -->
- <Bundle-SymbolicName>org.apache.uima.runtime;singleton:=true</Bundle-SymbolicName>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
- <Eclipse-ExtensibleAPI>true</Eclipse-ExtensibleAPI>
- <Eclipse-BuddyPolicy>registered</Eclipse-BuddyPolicy>
- </instructions>
- </configuration>
+ <executions>
+ <execution>
+ <configuration>
+ <instructions>
+ <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
+ <_nouses>true</_nouses>
+ <!-- export contents because we don't want the actual
+ java code included (although we could... as an
+ alternative to the jars - but might have a
+ versioning / control issue -->
+ <_exportcontents>
+ org.apache.uima,
+ org.apache.uima.adapter.vinci,
+ org.apache.uima.adapter.vinci.util,
+ org.apache.uima.analysis_component,
+ org.apache.uima.analysis_engine,
+ org.apache.uima.analysis_engine.annotator,
+ org.apache.uima.analysis_engine.asb,
+ org.apache.uima.analysis_engine.asb.impl,
+ org.apache.uima.analysis_engine.impl,
+ org.apache.uima.analysis_engine.impl.compatibility,
+ org.apache.uima.analysis_engine.metadata,
+ org.apache.uima.analysis_engine.metadata.impl,
+ org.apache.uima.analysis_engine.service.impl,
+ org.apache.uima.cas,
+ org.apache.uima.cas.admin,
+ org.apache.uima.cas.impl,
+ org.apache.uima.cas.text,
+ org.apache.uima.cas_data,
+ org.apache.uima.cas_data.impl,
+ org.apache.uima.cas_data.impl.vinci,
+ org.apache.uima.collection,
+ org.apache.uima.collection.base_cpm,
+ org.apache.uima.collection.impl,
+ org.apache.uima.collection.impl.base_cpm.container,
+ org.apache.uima.collection.impl.base_cpm.container.deployer,
+ org.apache.uima.collection.impl.cpm,
+ org.apache.uima.collection.impl.cpm.container,
+ org.apache.uima.collection.impl.cpm.container.deployer,
+ org.apache.uima.collection.impl.cpm.container.deployer.socket,
+ org.apache.uima.collection.impl.cpm.container.deployer.vinci,
+ org.apache.uima.collection.impl.cpm.container.deployer.vns,
+ org.apache.uima.collection.impl.cpm.engine,
+ org.apache.uima.collection.impl.cpm.utils,
+ org.apache.uima.collection.impl.cpm.vinci,
+ org.apache.uima.collection.impl.cpm.vinci.cas_data,
+ org.apache.uima.collection.impl.metadata,
+ org.apache.uima.collection.impl.metadata.cpe,
+ org.apache.uima.collection.metadata,
+ org.apache.uima.flow,
+ org.apache.uima.flow.impl,
+ org.apache.uima.impl,
+ org.apache.uima.internal.util,
+ org.apache.uima.internal.util.rb_trees,
+ org.apache.uima.internal.util.text,
+ org.apache.uima.jcas,
+ org.apache.uima.jcas.cas,
+ org.apache.uima.jcas.impl,
+ org.apache.uima.jcas.tcas,
+ org.apache.uima.pear.tools,
+ org.apache.uima.pear.util,
+ org.apache.uima.resource,
+ org.apache.uima.resource.impl,
+ org.apache.uima.resource.metadata,
+ org.apache.uima.resource.metadata.impl,
+ org.apache.uima.resource.service.impl,
+ org.apache.uima.search,
+ org.apache.uima.search.impl,
+ org.apache.uima.tools,
+ org.apache.uima.tools.annot_view,
+ org.apache.uima.tools.cpm,
+ org.apache.uima.tools.cvd,
+ org.apache.uima.tools.cvd.control,
+ org.apache.uima.tools.cvd.tsview,
+ org.apache.uima.tools.docanalyzer,
+ org.apache.uima.tools.images,
+ org.apache.uima.tools.jcasgen,
+ org.apache.uima.tools.pear.install,
+ org.apache.uima.tools.pear.merger,
+ org.apache.uima.tools.stylemap,
+ org.apache.uima.tools.util.gui,
+ org.apache.uima.tools.util.htmlview,
+ org.apache.uima.tools.viewer,
+ org.apache.uima.uimacpp,
+ org.apache.uima.util,
+ org.apache.uima.util.impl,
+ org.apache.vinci.debug,
+ org.apache.vinci.transport,
+ org.apache.vinci.transport.context,
+ org.apache.vinci.transport.document,
+ org.apache.vinci.transport.util,
+ org.apache.vinci.transport.vns,
+ org.apache.vinci.transport.vns.client,
+ org.apache.vinci.transport.vns.service
+ </_exportcontents>
+
+ <!-- excluded packages:
+ org.apache.uima.adapter.soap,
+ org.apache.uima.adapter.soap.axis11,
+ -->
+ <Import-Package>org.apache.log4j;resolution:=optional,*
+ </Import-Package>
+ <!-- causes the other Jars from the maven
+ dependencies, at the proper version, to be
+ included in this, and also sets up the bundle
+ classpath to include them -->
+ <Embed-Dependency>*;scope=compile;inline=true</Embed-Dependency>
+
+ <!-- These just get made into the corresponding manifest entries -->
+ <Bundle-SymbolicName>org.apache.uima.runtime;singleton:=true</Bundle-SymbolicName>
+ <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
+ <Eclipse-ExtensibleAPI>true</Eclipse-ExtensibleAPI>
+ <Eclipse-BuddyPolicy>registered</Eclipse-BuddyPolicy>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Propchange: uima/uimaj/trunk/uimaj-examples/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 19:58:28 2010
@@ -0,0 +1,2 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-examples:932400-933272
+/uima/uimaj/branches/mavenAlign/uimaj-examples:933273-944403
Modified: uima/uimaj/trunk/uimaj-examples/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-examples/pom.xml?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-examples/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-examples/pom.xml Fri May 14 19:58:28 2010
@@ -21,51 +21,70 @@
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>org.apache.uima</groupId>
+
+ <parent>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>parent-pom-ibm-notice</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
+ </parent>
+
<artifactId>uimaj-examples</artifactId>
<packaging>jar</packaging>
- <version>${uimaj-release-version}</version>
- <name>Apache UIMA Java SDK Examples</name>
- <url>http://incubator.apache.org/uima</url>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>UIMA Base: ${project.artifactId}: SDK Examples</name>
+ <description>Examples and sample 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>
- <url>http://svn.apache.org/viewvc/incubator/uima</url>
- </scm>
- <parent>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj</artifactId>
- <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
- <relativePath>../uimaj</relativePath>
- </parent>
+ <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>
+ <uimaDependencyVersion>2.3.1-SNAPSHOT</uimaDependencyVersion>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${uimaDependencyVersion}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-cpe</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${uimaDependencyVersion}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-document-annotation</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${uimaDependencyVersion}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-tools</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${uimaDependencyVersion}</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -89,5 +108,25 @@
</dependencies>
<build>
<finalName>uima-examples</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-cli</id>
+ <configuration>
+ <excludes>
+ <exclude>src/main/data/*.txt</exclude> <!-- sample data -->
+ <exclude>src/main/run_configuration/*.launch</exclude> <!-- generated Eclipse launch files -->
+ <exclude>src/main/eclipseProject/*readme.txt</exclude> <!-- readme -->
+ <exclude>src/main/resources/org/apache/uima/tutorial/ex6/*.txt</exclude> <!-- sample data -->
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
</build>
</project>
\ No newline at end of file
Propchange: uima/uimaj/trunk/uimaj-internal-tools/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 19:58:28 2010
@@ -0,0 +1,2 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-internal-tools:932400-933272
+/uima/uimaj/branches/mavenAlign/uimaj-internal-tools:933273-944403
Modified: uima/uimaj/trunk/uimaj-internal-tools/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-internal-tools/pom.xml?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-internal-tools/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-internal-tools/pom.xml Fri May 14 19:58:28 2010
@@ -21,21 +21,48 @@
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>org.apache.uima</groupId>
+
+ <parent>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>parent-pom-top</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
+ </parent>
+
<artifactId>uimaj-internal-tools</artifactId>
<packaging>jar</packaging>
- <version>${uimaj-release-version}</version>
- <name>Apache UIMA internal Tools</name>
- <url>http://incubator.apache.org/uima</url>
- <parent>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj</artifactId>
- <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
- <relativePath>../uimaj</relativePath>
- </parent>
- <dependencies>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>UIMA Base: ${project.artifactId}: internal Tools</name>
+ <description>Internal tooling for developing UIMA,
+ not a part of normal distributions.</description>
+ <url>${uimaWebsiteUrl}</url>
- </dependencies>
+ <!-- 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>
+ <uimaDependencyVersion>2.3.1-SNAPSHOT</uimaDependencyVersion>
+ </properties>
+
<build>
<finalName>uima-internal-tools</finalName>
</build>
Propchange: uima/uimaj/trunk/uimaj-test-util/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 19:58:28 2010
@@ -0,0 +1,2 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-test-util:932400-933272
+/uima/uimaj/branches/mavenAlign/uimaj-test-util:933273-944404
Modified: uima/uimaj/trunk/uimaj-test-util/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-test-util/pom.xml?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-test-util/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-test-util/pom.xml Fri May 14 19:58:28 2010
@@ -21,28 +21,47 @@
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>parent-pom-ibm-notice</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
+ </parent>
+
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-test-util</artifactId>
<packaging>jar</packaging>
- <version>${uimaj-release-version}</version>
- <name>Apache UIMA Utility Classes For JUnit Tests</name>
- <url>http://incubator.apache.org/uima</url>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>UIMA Base: ${project.artifactId}: JUnit utilities</name>
+ <description>Utilities for testing UIMA</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>
- <url>http://svn.apache.org/viewvc/incubator/uima</url>
- </scm>
- <parent>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj</artifactId>
- <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
- <relativePath>../uimaj</relativePath>
- </parent>
+ <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>jvinci</uimaScmProject>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
Propchange: uima/uimaj/trunk/uimaj-tools/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 19:58:28 2010
@@ -0,0 +1,2 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-tools:932400-933272
+/uima/uimaj/branches/mavenAlign/uimaj-tools:933273-944404
Modified: uima/uimaj/trunk/uimaj-tools/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-tools/pom.xml?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-tools/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-tools/pom.xml Fri May 14 19:58:28 2010
@@ -21,55 +21,99 @@
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>org.apache.uima</groupId>
+
+ <parent>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>parent-pom-ibm-notice</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
+ </parent>
+
<artifactId>uimaj-tools</artifactId>
<packaging>jar</packaging>
- <version>${uimaj-release-version}</version>
- <name>Apache UIMA Java SDK Tools</name>
- <url>http://incubator.apache.org/uima</url>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>UIMA Base: ${project.artifactId}: Tools</name>
+ <description>Tooling supporting UIMA use</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>
- <url>http://svn.apache.org/viewvc/incubator/uima</url>
- </scm>
- <parent>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj</artifactId>
- <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
- <relativePath>../uimaj</relativePath>
- </parent>
+ <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>
+ <uimaDependencyVersion>2.3.1-SNAPSHOT</uimaDependencyVersion>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${uimaDependencyVersion}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-cpe</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${uimaDependencyVersion}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-document-annotation</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${uimaDependencyVersion}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-test-util</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${uimaDependencyVersion}</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<finalName>uima-tools</finalName>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-cli</id>
+ <configuration>
+ <excludes>
+ <exclude>src/main/resources/org/apache/uima/tools/migration/*</exclude> <!-- data for migration code -->
+ <exclude>src/main/resources/org/apache/uima/tools/util/gui/about.txt</exclude>
+ <exclude>src/test/resources/pearTests/pearMergerTests/*.pear</exclude> <!-- test data -->
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+
</build>
</project>
\ No newline at end of file