This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch refactoring/UIMA-6420-Remove-unnecessary-scm-tags-from-pom in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit 5dab527aa36838836153c88405a87eef0fc471db Author: Richard Eckart de Castilho <[email protected]> AuthorDate: Fri Feb 18 16:36:19 2022 +0100 [UIMA-6420] Remove unnecessary scm tags from pom - Removed redundant SCM declarations - Formatted POMs - Cleaned up some POMs a little --- PearPackagingMavenPlugin/pom.xml | 96 ++++------ aggregate-uimaj-docbooks/pom.xml | 54 ++---- aggregate-uimaj-eclipse-plugins/pom.xml | 25 --- aggregate-uimaj/pom.xml | 43 +---- jVinci/pom.xml | 46 ++--- jcasgen-maven-plugin/pom.xml | 233 +++++++++++------------- pom.xml | 22 --- uima-doc-v3-users-guide/pom.xml | 27 +-- uima-docbook-overview-and-setup/pom.xml | 24 +-- uima-docbook-references/pom.xml | 44 ++--- uima-docbook-tools/pom.xml | 44 ++--- uima-docbook-tutorials-and-users-guides/pom.xml | 44 ++--- uimaj-adapter-soap/pom.xml | 22 --- uimaj-adapter-vinci/pom.xml | 97 ++++------ uimaj-bootstrap/pom.xml | 33 +--- uimaj-component-test-util/pom.xml | 89 ++++----- uimaj-core/pom.xml | 39 +--- uimaj-cpe/pom.xml | 96 ++++------ uimaj-document-annotation/pom.xml | 84 ++++----- uimaj-eclipse-feature-runtime/pom.xml | 34 +--- uimaj-eclipse-feature-tools/pom.xml | 36 +--- uimaj-eclipse-update-site/pom.xml | 128 +++++++------ uimaj-ep-cas-editor-ide/pom.xml | 29 +-- uimaj-ep-cas-editor/pom.xml | 32 +--- uimaj-ep-configurator/pom.xml | 34 +--- uimaj-ep-debug/pom.xml | 29 +-- uimaj-ep-jcasgen/pom.xml | 32 ---- uimaj-ep-launcher/pom.xml | 29 +-- uimaj-ep-pear-packager/pom.xml | 46 +---- uimaj-ep-runtime/pom.xml | 225 +++++++++++------------ uimaj-examples/pom.xml | 44 ++--- uimaj-json/pom.xml | 65 +++---- uimaj-parent/pom.xml | 23 +-- uimaj-test-util/pom.xml | 68 +++---- uimaj-tools/pom.xml | 97 ++++------ uimaj-v3migration-jcas/pom.xml | 33 +--- 36 files changed, 694 insertions(+), 1452 deletions(-) diff --git a/PearPackagingMavenPlugin/pom.xml b/PearPackagingMavenPlugin/pom.xml index aec9bda..b5b3f8c 100644 --- a/PearPackagingMavenPlugin/pom.xml +++ b/PearPackagingMavenPlugin/pom.xml @@ -17,84 +17,62 @@ specific language governing permissions and limitations under the License. --> -<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> - +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.uima</groupId> <artifactId>uimaj-parent</artifactId> <version>3.3.0-SNAPSHOT</version> <relativePath>../uimaj-parent/pom.xml</relativePath> </parent> - - <artifactId>PearPackagingMavenPlugin</artifactId> - <packaging>maven-plugin</packaging> - <name>Apache UIMA Maven: ${project.artifactId}</name> + + <artifactId>PearPackagingMavenPlugin</artifactId> + <packaging>maven-plugin</packaging> + <name>Apache UIMA Maven: ${project.artifactId}</name> <description>This is a maven plugin that produces a pear artifact.</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:git:https://github.com/apache/uima-uimaj/ - </connection> - <developerConnection> - scm:git:https://github.com/apache/uima-uimaj/ - </developerConnection> - <url> - https://github.com/apache/uima-uimaj/ - </url> - <tag>uimaj-3.2.0</tag> - </scm> - <properties> - <uimaScmProject>${project.artifactId}</uimaScmProject> <bookNameRoot>PearPackagingMavenPluginUserGuide</bookNameRoot> </properties> - - <dependencies> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> + <dependencies> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> <version>3.1.0</version> - </dependency> - <dependency> + </dependency> + <dependency> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-annotations</artifactId> <version>3.2</version> <scope>provided</scope> </dependency> - - <dependency> - <groupId>org.apache.uima</groupId> - <artifactId>uimaj-core</artifactId> + + <dependency> + <groupId>org.apache.uima</groupId> + <artifactId>uimaj-core</artifactId> <version>${project.parent.version}</version> - </dependency> - - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>1.3.1</version> - </dependency> - - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - <version>2.0.4</version> - </dependency> + </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>1.3.1</version> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + <version>2.0.4</version> + </dependency> + + </dependencies> - </dependencies> - - <build> - <finalName>uima-pear-maven-plugin</finalName> - </build> + <build> + <finalName>uima-pear-maven-plugin</finalName> + </build> </project> diff --git a/aggregate-uimaj-docbooks/pom.xml b/aggregate-uimaj-docbooks/pom.xml index cb30d4f..2f10b1d 100644 --- a/aggregate-uimaj-docbooks/pom.xml +++ b/aggregate-uimaj-docbooks/pom.xml @@ -17,9 +17,11 @@ specific language governing permissions and limitations under the License. --> -<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> - +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.uima</groupId> <artifactId>uimaj-parent</artifactId> @@ -27,43 +29,20 @@ <relativePath>../uimaj-parent/pom.xml</relativePath> </parent> - <artifactId>aggregate-uimaj-docbooks</artifactId> - <packaging>pom</packaging> - <name>Apache UIMA Aggregate: ${project.artifactId}</name> + <artifactId>aggregate-uimaj-docbooks</artifactId> + <packaging>pom</packaging> + <name>Apache UIMA Aggregate: ${project.artifactId}</name> <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:git:https://github.com/apache/uima-uimaj/ - </connection> - <developerConnection> - scm:git:https://github.com/apache/uima-uimaj/ - </developerConnection> - <url> - https://github.com/apache/uima-uimaj/ - </url> - <tag>uimaj-3.2.0</tag> - </scm> - - <properties> - <uimaScmProject>${project.artifactId}</uimaScmProject> - </properties> - <build> <plugins> <plugin> <artifactId>maven-resources-plugin</artifactId> <executions> <execution> - <goals><goal>copy-resources</goal></goals> + <goals> + <goal>copy-resources</goal> + </goals> <phase>process-resources</phase> <configuration> <outputDirectory>${project.build.directory}</outputDirectory> @@ -71,8 +50,10 @@ <resource> <filtering>true</filtering> <directory>src/main/resources</directory> - <includes><include>**/*.*</include></includes> - </resource> + <includes> + <include>**/*.*</include> + </includes> + </resource> </resources> </configuration> </execution> @@ -80,7 +61,7 @@ </plugin> </plugins> </build> - + <modules> <!-- Legacy Docbook --> <module>../uima-docbook-overview-and-setup</module> @@ -89,6 +70,5 @@ <module>../uima-docbook-tutorials-and-users-guides</module> <!-- Converted to Asciidoc --> <module>../uima-doc-v3-users-guide</module> - <!--module>../../branches/mavenAlign/PearPackagingMavenPlugin</module> not used - is old version of doc --> - </modules> + </modules> </project> \ No newline at end of file diff --git a/aggregate-uimaj-eclipse-plugins/pom.xml b/aggregate-uimaj-eclipse-plugins/pom.xml index 775037f..ff41e6d 100644 --- a/aggregate-uimaj-eclipse-plugins/pom.xml +++ b/aggregate-uimaj-eclipse-plugins/pom.xml @@ -34,31 +34,6 @@ that are part of the base UIMA framework</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:git:https://github.com/apache/uima-uimaj/ - </connection> - <developerConnection> - scm:git:https://github.com/apache/uima-uimaj/ - </developerConnection> - <url> - https://github.com/apache/uima-uimaj/ - </url> - <tag>uimaj-3.2.0</tag> - </scm> - - <properties> - <uimaScmProject>${project.artifactId}</uimaScmProject> - </properties> - <modules> <module>../uimaj-ep-debug</module> <module>../uimaj-ep-jcasgen</module> diff --git a/aggregate-uimaj/pom.xml b/aggregate-uimaj/pom.xml index cb81a9b..ea58eb0 100644 --- a/aggregate-uimaj/pom.xml +++ b/aggregate-uimaj/pom.xml @@ -17,9 +17,11 @@ specific language governing permissions and limitations under the License. --> -<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> - +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.uima</groupId> <artifactId>uimaj-parent</artifactId> @@ -27,37 +29,12 @@ <relativePath>../uimaj-parent/pom.xml</relativePath> </parent> - <artifactId>aggregate-uimaj</artifactId> - <packaging>pom</packaging> - <name>Apache UIMA Aggregate: ${project.artifactId}</name> + <artifactId>aggregate-uimaj</artifactId> + <packaging>pom</packaging> + <name>Apache UIMA Aggregate: ${project.artifactId}</name> <description>The aggregate for the base UIMA framework build and release</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:git:https://github.com/apache/uima-uimaj/ - </connection> - <developerConnection> - scm:git:https://github.com/apache/uima-uimaj/ - </developerConnection> - <url> - https://github.com/apache/uima-uimaj/ - </url> - <tag>uimaj-3.2.0</tag> - </scm> - - <properties> - <uimaScmProject>${project.artifactId}</uimaScmProject> - </properties> - <modules> <module>../uimaj-core</module> <module>../uimaj-cpe</module> @@ -79,6 +56,6 @@ and can't be built automatically - to build it, cd to the project directory and do mvn install --> <!--module>../uimaj-internal-tools</module--> - <module>../uimaj-bootstrap</module> - </modules> + <module>../uimaj-bootstrap</module> + </modules> </project> \ No newline at end of file diff --git a/jVinci/pom.xml b/jVinci/pom.xml index 2e88bdd..ac9a9a4 100644 --- a/jVinci/pom.xml +++ b/jVinci/pom.xml @@ -17,52 +17,32 @@ specific language governing permissions and limitations under the License. --> -<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> - +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.uima</groupId> <artifactId>uimaj-parent</artifactId> - <version>3.3.0-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> <relativePath>../uimaj-parent/pom.xml</relativePath> </parent> - <artifactId>jVinci</artifactId> - <packaging>jar</packaging> - <name>Apache UIMA Base: ${project.artifactId}: Vinci Transport Library</name> + <artifactId>jVinci</artifactId> + <packaging>jar</packaging> + <name>Apache UIMA Base: ${project.artifactId}: Vinci Transport Library</name> <description>This is a non-standard protocol for higher efficiency than SOAP, used by the base UIMA Collection processing manager for supporting networked deployment. See UIMA-AS as a more modern alternative supporting more standard protocols.</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:git:https://github.com/apache/uima-uimaj/ - </connection> - <developerConnection> - scm:git:https://github.com/apache/uima-uimaj/ - </developerConnection> - <url> - https://github.com/apache/uima-uimaj/ - </url> - <tag>uimaj-3.2.0</tag> - </scm> - <properties> - <uimaScmProject>${project.artifactId}</uimaScmProject> <postNoticeText>${ibmNoticeText}</postNoticeText> </properties> - - <build> - <finalName>jVinci</finalName> - </build> + + <build> + <finalName>jVinci</finalName> + </build> </project> \ No newline at end of file diff --git a/jcasgen-maven-plugin/pom.xml b/jcasgen-maven-plugin/pom.xml index 4156048..6244629 100644 --- a/jcasgen-maven-plugin/pom.xml +++ b/jcasgen-maven-plugin/pom.xml @@ -16,73 +16,52 @@ specific language governing permissions and limitations under the License. --> -<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/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <!-- This artifact name follows the conventions described http://books.sonatype.com/mvnref-book/reference/writing-plugins-sect-custom-plugin.html - where patterns like xxx-maven-plugin and maven-xxx-plugin can be invoked just using xxx if the right settings are in place --> - <artifactId>jcasgen-maven-plugin</artifactId> - <packaging>maven-plugin</packaging> - <name>Apache UIMA Maven: ${project.artifactId}</name> - <description>A Maven Plugin for using JCasGen to generate Java classes from XML type system descriptions</description> - <prerequisites> - <maven>3.0</maven> - </prerequisites> - <parent> - <groupId>org.apache.uima</groupId> - <artifactId>uimaj-parent</artifactId> - <version>3.3.0-SNAPSHOT</version> - <relativePath>../uimaj-parent/pom.xml</relativePath> - </parent> +<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/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.uima</groupId> + <artifactId>uimaj-parent</artifactId> + <version>3.3.0-SNAPSHOT</version> + <relativePath>../uimaj-parent/pom.xml</relativePath> + </parent> - <!-- 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. + <!-- This artifact name follows the conventions described http://books.sonatype.com/mvnref-book/reference/writing-plugins-sect-custom-plugin.html + where patterns like xxx-maven-plugin and maven-xxx-plugin can be invoked just using xxx if the right settings are in place --> + <artifactId>jcasgen-maven-plugin</artifactId> + <packaging>maven-plugin</packaging> - Keeping this a bit factored allows cutting/pasting the <scm> - element, and just changing the following two properties --> - <scm> - <connection> - scm:git:https://github.com/apache/uima-uimaj/ - </connection> - <developerConnection> - scm:git:https://github.com/apache/uima-uimaj/ - </developerConnection> - <url> - https://github.com/apache/uima-uimaj/ - </url> - <tag>uimaj-3.2.0</tag> - </scm> + <name>Apache UIMA Maven: ${project.artifactId}</name> + <description>A Maven Plugin for using JCasGen to generate Java classes from XML type system descriptions</description> - <properties> - <uimaScmProject>${project.artifactId}</uimaScmProject> - </properties> - - <dependencies> - <!-- Dependencies on the Maven Plugin API and friends --> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - <version>3.0.3</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-core</artifactId> - <version>3.0.3</version> - </dependency> - <dependency> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-annotations</artifactId> - <version>3.2</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.uima</groupId> - <artifactId>uimaj-tools</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> + <prerequisites> + <maven>3.0</maven> + </prerequisites> + + <dependencies> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + <version>3.0.3</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + <version>3.0.3</version> + </dependency> + <dependency> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-annotations</artifactId> + <version>3.2</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.uima</groupId> + <artifactId>uimaj-tools</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>org.apache.uima</groupId> <artifactId>uimaj-core</artifactId> <version>${project.version}</version> @@ -104,39 +83,38 @@ </dependency> <dependency> - <groupId>org.sonatype.plexus</groupId> - <artifactId>plexus-build-api</artifactId> - <version>0.0.7</version> - </dependency> + <groupId>org.sonatype.plexus</groupId> + <artifactId>plexus-build-api</artifactId> + <version>0.0.7</version> + </dependency> - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-engine</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.junit.vintage</groupId> - <artifactId>junit-vintage-engine</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.maven.plugin-testing</groupId> - <artifactId>maven-plugin-testing-harness</artifactId> - <version>2.0</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jdk14</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <pluginManagement> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.maven.plugin-testing</groupId> + <artifactId>maven-plugin-testing-harness</artifactId> + <version>2.0</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + <build> + <pluginManagement> <plugins> <plugin> <artifactId>maven-javadoc-plugin</artifactId> -<!-- <version>2.8.1</version> --> <configuration> <!-- avoiding javadoc warnings caused by Mojo annotations --> <tagletArtifacts> @@ -150,39 +128,38 @@ </plugin> </plugins> </pluginManagement> - - <plugins> - <plugin> - <artifactId>maven-invoker-plugin</artifactId> - <!-- <version>1.7</version> 1.8 from superpom --> - <configuration> - <projectsDirectory>src/it</projectsDirectory> - <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo> - <pomIncludes> - <pomInclude>*/pom.xml</pomInclude> - </pomIncludes> - <settingsFile>src/it/settings.xml</settingsFile> - <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath> - <postBuildHookScript>verify.bsh</postBuildHookScript> - <goals> - <goal>clean</goal> - <goal>package</goal> - <goal>integration-test</goal> - </goals> - <!-- change this next line by toggling the "!" character to include / exclude the long-running m2e test - It is normally excluded --> - <invokerTest>classpath,multimodule,simple,!m2e</invokerTest> - </configuration> - <executions> - <execution> - <id>integration-test</id> - <goals> - <goal>install</goal> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + + <plugins> + <plugin> + <artifactId>maven-invoker-plugin</artifactId> + <configuration> + <projectsDirectory>src/it</projectsDirectory> + <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo> + <pomIncludes> + <pomInclude>*/pom.xml</pomInclude> + </pomIncludes> + <settingsFile>src/it/settings.xml</settingsFile> + <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath> + <postBuildHookScript>verify.bsh</postBuildHookScript> + <goals> + <goal>clean</goal> + <goal>package</goal> + <goal>integration-test</goal> + </goals> + <!-- change this next line by toggling the "!" character to include / exclude the long-running m2e test + It is normally excluded --> + <invokerTest>classpath,multimodule,simple,!m2e</invokerTest> + </configuration> + <executions> + <execution> + <id>integration-test</id> + <goals> + <goal>install</goal> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> diff --git a/pom.xml b/pom.xml index 18a3871..e53c4a9 100644 --- a/pom.xml +++ b/pom.xml @@ -39,29 +39,7 @@ <description>The top project for the UIMA Java SDK</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:git:https://github.com/apache/uima-uimaj/ - </connection> - <developerConnection> - scm:git:https://github.com/apache/uima-uimaj/ - </developerConnection> - <url> - https://github.com/apache/uima-uimaj/ - </url> - <tag>uimaj-3.2.0</tag> - </scm> - <properties> - <uimaScmProject>${project.artifactId}</uimaScmProject> <jiraVersion>3.2.0SDK</jiraVersion> <assemblyFinalName>uimaj-${project.version}</assemblyFinalName> <assemblyBinDescriptor>src/main/assembly/bin-without-jackson.xml</assemblyBinDescriptor> diff --git a/uima-doc-v3-users-guide/pom.xml b/uima-doc-v3-users-guide/pom.xml index 78c657d..8e98f04 100644 --- a/uima-doc-v3-users-guide/pom.xml +++ b/uima-doc-v3-users-guide/pom.xml @@ -17,7 +17,9 @@ specific language governing permissions and limitations under the License. --> -<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";> +<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> @@ -32,30 +34,7 @@ <name>Apache UIMA SDK Documentation - Version 3 user's guide</name> <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:git:https://github.com/apache/uima-uimaj/ - </connection> - <developerConnection> - scm:git:https://github.com/apache/uima-uimaj/ - </developerConnection> - <url> - https://github.com/apache/uima-uimaj/ - </url> - <tag>uimaj-3.2.0</tag> - </scm> - <properties> - <uimaScmProject>${project.artifactId}</uimaScmProject> - <asciidoctor.plugin.version>2.1.0</asciidoctor.plugin.version> <asciidoctor.version>2.4.2</asciidoctor.version> <asciidoctor.pdf.version>1.5.4</asciidoctor.pdf.version> diff --git a/uima-docbook-overview-and-setup/pom.xml b/uima-docbook-overview-and-setup/pom.xml index 3e02049..24f99d5 100644 --- a/uima-docbook-overview-and-setup/pom.xml +++ b/uima-docbook-overview-and-setup/pom.xml @@ -31,30 +31,8 @@ <packaging>pom</packaging> <name>Apache UIMA SDK Documentation - overview and setup</name> <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:git:https://github.com/apache/uima-uimaj/ - </connection> - <developerConnection> - scm:git:https://github.com/apache/uima-uimaj/ - </developerConnection> - <url> - https://github.com/apache/uima-uimaj/ - </url> - <tag>uimaj-3.2.0</tag> - </scm> - + <properties> - <uimaScmProject>${project.artifactId}</uimaScmProject> <!-- next property is the name of the top file under src/docbook without trailing .xml --> <bookNameRoot>overview_and_setup</bookNameRoot> </properties> diff --git a/uima-docbook-references/pom.xml b/uima-docbook-references/pom.xml index 5ec4f05..a2bd9cc 100644 --- a/uima-docbook-references/pom.xml +++ b/uima-docbook-references/pom.xml @@ -17,48 +17,28 @@ specific language governing permissions and limitations under the License. --> -<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> - +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.uima</groupId> <artifactId>uimaj-parent</artifactId> <version>3.3.0-SNAPSHOT</version> <relativePath>../uimaj-parent/pom.xml</relativePath> </parent> - - <artifactId>uima-docbook-references</artifactId> - <packaging>pom</packaging> - <name>Apache UIMA SDK Documentation - references</name> + + <artifactId>uima-docbook-references</artifactId> + <packaging>pom</packaging> + <name>Apache UIMA SDK Documentation - references</name> <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:git:https://github.com/apache/uima-uimaj/ - </connection> - <developerConnection> - scm:git:https://github.com/apache/uima-uimaj/ - </developerConnection> - <url> - https://github.com/apache/uima-uimaj/ - </url> - <tag>uimaj-3.2.0</tag> - </scm> - + <properties> - <uimaScmProject>${project.artifactId}</uimaScmProject> <!-- next property is the name of the top file under src/docbook without trailing .xml --> <bookNameRoot>references</bookNameRoot> </properties> - + <repositories> <repository> <id>apache.snapshots</id> @@ -68,5 +48,5 @@ <enabled>false</enabled> </releases> </repository> - </repositories> + </repositories> </project> \ No newline at end of file diff --git a/uima-docbook-tools/pom.xml b/uima-docbook-tools/pom.xml index 05459cb..c83dd4c 100644 --- a/uima-docbook-tools/pom.xml +++ b/uima-docbook-tools/pom.xml @@ -17,48 +17,28 @@ specific language governing permissions and limitations under the License. --> -<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> - +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.uima</groupId> <artifactId>uimaj-parent</artifactId> <version>3.3.0-SNAPSHOT</version> <relativePath>../uimaj-parent/pom.xml</relativePath> </parent> - - <artifactId>uima-docbook-tools</artifactId> - <packaging>pom</packaging> - <name>Apache UIMA SDK Documentation - tools</name> + + <artifactId>uima-docbook-tools</artifactId> + <packaging>pom</packaging> + <name>Apache UIMA SDK Documentation - tools</name> <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:git:https://github.com/apache/uima-uimaj/ - </connection> - <developerConnection> - scm:git:https://github.com/apache/uima-uimaj/ - </developerConnection> - <url> - https://github.com/apache/uima-uimaj/ - </url> - <tag>uimaj-3.2.0</tag> - </scm> - + <properties> - <uimaScmProject>${project.artifactId}</uimaScmProject> <!-- next property is the name of the top file under src/docbook without trailing .xml --> <bookNameRoot>tools</bookNameRoot> </properties> - + <repositories> <repository> <id>apache.snapshots</id> @@ -68,5 +48,5 @@ <enabled>false</enabled> </releases> </repository> - </repositories> + </repositories> </project> \ No newline at end of file diff --git a/uima-docbook-tutorials-and-users-guides/pom.xml b/uima-docbook-tutorials-and-users-guides/pom.xml index 35276c3..6f9741c 100644 --- a/uima-docbook-tutorials-and-users-guides/pom.xml +++ b/uima-docbook-tutorials-and-users-guides/pom.xml @@ -17,48 +17,28 @@ specific language governing permissions and limitations under the License. --> -<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> - +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.uima</groupId> <artifactId>uimaj-parent</artifactId> <version>3.3.0-SNAPSHOT</version> <relativePath>../uimaj-parent/pom.xml</relativePath> </parent> - - <artifactId>uima-docbook-tutorials-and-users-guides</artifactId> - <packaging>pom</packaging> - <name>Apache UIMA SDK Documentation - tutorials and user's guides</name> + + <artifactId>uima-docbook-tutorials-and-users-guides</artifactId> + <packaging>pom</packaging> + <name>Apache UIMA SDK Documentation - tutorials and user's guides</name> <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:git:https://github.com/apache/uima-uimaj/ - </connection> - <developerConnection> - scm:git:https://github.com/apache/uima-uimaj/ - </developerConnection> - <url> - https://github.com/apache/uima-uimaj/ - </url> - <tag>uimaj-3.2.0</tag> - </scm> - + <properties> - <uimaScmProject>${project.artifactId}</uimaScmProject> <!-- next property is the name of the top file under src/docbook without trailing .xml --> <bookNameRoot>tutorials_and_users_guides</bookNameRoot> </properties> - + <repositories> <repository> <id>apache.snapshots</id> @@ -68,5 +48,5 @@ <enabled>false</enabled> </releases> </repository> - </repositories> + </repositories> </project> \ No newline at end of file diff --git a/uimaj-adapter-soap/pom.xml b/uimaj-adapter-soap/pom.xml index 9e1467b..4fe22c9 100644 --- a/uimaj-adapter-soap/pom.xml +++ b/uimaj-adapter-soap/pom.xml @@ -34,29 +34,7 @@ component, using the SOAP protocol</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:git:https://github.com/apache/uima-uimaj/ - </connection> - <developerConnection> - scm:git:https://github.com/apache/uima-uimaj/ - </developerConnection> - <url> - https://github.com/apache/uima-uimaj/ - </url> - <tag>uimaj-3.2.0</tag> - </scm> - <properties> - <uimaScmProject>${project.artifactId}</uimaScmProject> <postNoticeText>${ibmNoticeText}</postNoticeText> </properties> diff --git a/uimaj-adapter-vinci/pom.xml b/uimaj-adapter-vinci/pom.xml index 604b8cd..a2e5a6c 100644 --- a/uimaj-adapter-vinci/pom.xml +++ b/uimaj-adapter-vinci/pom.xml @@ -17,80 +17,61 @@ specific language governing permissions and limitations under the License. --> -<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> - +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.uima</groupId> <artifactId>uimaj-parent</artifactId> <version>3.3.0-SNAPSHOT</version> <relativePath>../uimaj-parent/pom.xml</relativePath> </parent> - - <artifactId>uimaj-adapter-vinci</artifactId> - <packaging>jar</packaging> - <name>Apache UIMA Base: ${project.artifactId}: Vinci Adapter</name> + + <artifactId>uimaj-adapter-vinci</artifactId> + <packaging>jar</packaging> + <name>Apache UIMA Base: ${project.artifactId}: Vinci Adapter</name> <description>Provides the capability to connect to a remote analysis engine, using the Vinci protocol</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:git:https://github.com/apache/uima-uimaj/ - </connection> - <developerConnection> - scm:git:https://github.com/apache/uima-uimaj/ - </developerConnection> - <url> - https://github.com/apache/uima-uimaj/ - </url> - <tag>uimaj-3.2.0</tag> - </scm> - + <properties> - <uimaScmProject>${project.artifactId}</uimaScmProject> - <postNoticeText>${ibmNoticeText}</postNoticeText> + <postNoticeText>${ibmNoticeText}</postNoticeText> </properties> - - <dependencies> - <dependency> - <groupId>org.apache.uima</groupId> - <artifactId>uimaj-core</artifactId> - <version>${project.parent.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.uima</groupId> - <artifactId>jVinci</artifactId> - <version>${project.parent.version}</version> - <scope>compile</scope> - </dependency> - + + <dependencies> <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-engine</artifactId> + <groupId>org.apache.uima</groupId> + <artifactId>uimaj-core</artifactId> + <version>${project.parent.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.uima</groupId> + <artifactId>jVinci</artifactId> + <version>${project.parent.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.assertj</groupId> - <artifactId>assertj-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> + <dependency> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-jdk14</artifactId> <scope>test</scope> </dependency> - </dependencies> - <build> - <finalName>uima-adapter-vinci</finalName> - </build> + </dependencies> + + <build> + <finalName>uima-adapter-vinci</finalName> + </build> </project> \ No newline at end of file diff --git a/uimaj-bootstrap/pom.xml b/uimaj-bootstrap/pom.xml index 0bf9c1a..32c1261 100644 --- a/uimaj-bootstrap/pom.xml +++ b/uimaj-bootstrap/pom.xml @@ -17,9 +17,11 @@ specific language governing permissions and limitations under the License. --> -<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> - +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.uima</groupId> <artifactId>uimaj-parent</artifactId> @@ -27,30 +29,13 @@ <relativePath>../uimaj-parent/pom.xml</relativePath> </parent> - <artifactId>uimaj-bootstrap</artifactId> - <packaging>jar</packaging> - <name>Apache UIMA Base: ${project.artifactId}</name> + <artifactId>uimaj-bootstrap</artifactId> + <packaging>jar</packaging> + <name>Apache UIMA Base: ${project.artifactId}</name> <description>Configures a classpath from directories, and runs a Java application using that</description> <url>${uimaWebsiteUrl}</url> - - <scm> - <connection> - scm:git:https://github.com/apache/uima-uimaj/ - </connection> - <developerConnection> - scm:git:https://github.com/apache/uima-uimaj/ - </developerConnection> - <url> - https://github.com/apache/uima-uimaj/ - </url> - <tag>uimaj-3.2.0</tag> - </scm> - - <properties> - <uimaScmProject>uimaj-bootstrap</uimaScmProject> - </properties> - + <build> <plugins> <plugin> diff --git a/uimaj-component-test-util/pom.xml b/uimaj-component-test-util/pom.xml index 1b76539..904c967 100644 --- a/uimaj-component-test-util/pom.xml +++ b/uimaj-component-test-util/pom.xml @@ -17,69 +17,46 @@ specific language governing permissions and limitations under the License. --> -<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> - +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.uima</groupId> <artifactId>uimaj-parent</artifactId> <version>3.3.0-SNAPSHOT</version> <relativePath>../uimaj-parent/pom.xml</relativePath> </parent> - - <artifactId>uimaj-component-test-util</artifactId> - <packaging>jar</packaging> - <name>Apache UIMA Base: ${project.artifactId}: for JUnit</name> + + <artifactId>uimaj-component-test-util</artifactId> + <packaging>jar</packaging> + <name>Apache UIMA Base: ${project.artifactId}: for JUnit</name> <description>Supporting utilities used in various JUnit tests</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:git:https://github.com/apache/uima-uimaj/ - </connection> - <developerConnection> - scm:git:https://github.com/apache/uima-uimaj/ - </developerConnection> - <url> - https://github.com/apache/uima-uimaj/ - </url> - <tag>uimaj-3.2.0</tag> - </scm> - - <properties> - <uimaScmProject>${project.artifactId}</uimaScmProject> - </properties> - - <dependencies> - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-engine</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.junit.vintage</groupId> - <artifactId>junit-vintage-engine</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.uima</groupId> - <artifactId>uimaj-core</artifactId> - <version>${project.parent.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.uima</groupId> - <artifactId>uimaj-test-util</artifactId> - <version>${project.parent.version}</version> - <scope>compile</scope> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.uima</groupId> + <artifactId>uimaj-core</artifactId> + <version>${project.parent.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.uima</groupId> + <artifactId>uimaj-test-util</artifactId> + <version>${project.parent.version}</version> + <scope>compile</scope> + </dependency> + </dependencies> </project> \ No newline at end of file diff --git a/uimaj-core/pom.xml b/uimaj-core/pom.xml index 5948517..bcf80bd 100644 --- a/uimaj-core/pom.xml +++ b/uimaj-core/pom.xml @@ -35,29 +35,7 @@ <description>The core implementation of the UIMA Java Framework</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:git:https://github.com/apache/uima-uimaj/ - </connection> - <developerConnection> - scm:git:https://github.com/apache/uima-uimaj/ - </developerConnection> - <url> - https://github.com/apache/uima-uimaj/ - </url> - <tag>uimaj-3.2.0</tag> - </scm> - <properties> - <uimaScmProject>${project.artifactId}</uimaScmProject> <postNoticeText>${ibmNoticeText}</postNoticeText> <maven.surefire.heap>650M</maven.surefire.heap> </properties> @@ -286,7 +264,7 @@ <exclude>src/test/resources/CASTests/english.txt</exclude> <exclude>src/test/resources/XmiFileDataSuite/README.md</exclude> <exclude>src/test/resources/XmiFileDataSuite/**/*.xmi</exclude> - <exclude>src/test/resources/XmiFileDataSuite/**/typesystem.xml</exclude> + <exclude>src/test/resources/XmiFileDataSuite/**/typesystem.xml</exclude> <exclude>src/test/resources/ProgrammaticallyCreatedCasDataSuite/**/*</exclude> <exclude>src/test/resources/CasSerializationDeserialization_*_Test/**/cas.*</exclude> <exclude>src/test/resources/CasSerializationDeserialization_*_Test/**/data.*</exclude> @@ -294,14 +272,14 @@ <exclude>src/test/resources/CasSerializationDeserialization_*_Test/**/debug.xmi</exclude> <exclude>src/test/resources/CasSerializationDeserialization_*_Test/**/debug-typesystem.xml</exclude> <exclude>src/test/resources/data/moby.txt</exclude> - <exclude>src/test/resources/org/apache/uima/resource/impl/ResourceInClasspath.txt</exclude> - <exclude>src/test/resources/pearTests/*.pear</exclude> - <exclude>src/test/resources/pearTests/encodingTests/*</exclude> - <exclude>src/test/resources/SequencerTest/*.txt</exclude> + <exclude>src/test/resources/org/apache/uima/resource/impl/ResourceInClasspath.txt</exclude> + <exclude>src/test/resources/pearTests/*.pear</exclude> + <exclude>src/test/resources/pearTests/encodingTests/*</exclude> + <exclude>src/test/resources/SequencerTest/*.txt</exclude> <exclude>src/test/resources/SerDes*/SavedInts.binary</exclude> <!-- jcas classes generated --> - <exclude>src/test/java/aa/*.java</exclude> - <exclude>src/test/java/org/apache/uima/cas/test/*.java</exclude> + <exclude>src/test/java/aa/*.java</exclude> + <exclude>src/test/java/org/apache/uima/cas/test/*.java</exclude> <exclude>src/test/java/org/apache/lang/LanguagePair.java</exclude> <exclude>src/test/java/sofa/test/CrossAnnotation.java</exclude> <exclude>src/test/java/x/y/z/*.java</exclude> @@ -397,7 +375,8 @@ <!-- exclude log4j slf bridge for testing <classpathDependencyExcludes> <classpathDependencyExclude>org.apache.logging.log4j:log4j-slf4j-impl</classpathDependencyExclude> - </classpathDependencyExcludes> --> + </classpathDependencyExcludes> + --> </configuration> </plugin> </plugins> diff --git a/uimaj-cpe/pom.xml b/uimaj-cpe/pom.xml index 5d663f6..a077d35 100644 --- a/uimaj-cpe/pom.xml +++ b/uimaj-cpe/pom.xml @@ -17,82 +17,62 @@ specific language governing permissions and limitations under the License. --> -<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> - +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.uima</groupId> <artifactId>uimaj-parent</artifactId> <version>3.3.0-SNAPSHOT</version> <relativePath>../uimaj-parent/pom.xml</relativePath> </parent> - - <artifactId>uimaj-cpe</artifactId> - <name>Apache UIMA Base: ${project.artifactId}: Collection Processing Engine</name> + + <artifactId>uimaj-cpe</artifactId> + <name>Apache UIMA Base: ${project.artifactId}: Collection Processing Engine</name> <description>The implementation of a simple scaleout capability, called the Collection Processing Engine. New implementations may find UIMA-AS a better scaleout mechanism.</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:git:https://github.com/apache/uima-uimaj/ - </connection> - <developerConnection> - scm:git:https://github.com/apache/uima-uimaj/ - </developerConnection> - <url> - https://github.com/apache/uima-uimaj/ - </url> - <tag>uimaj-3.2.0</tag> - </scm> - <properties> - <uimaScmProject>${project.artifactId}</uimaScmProject> <postNoticeText>${ibmNoticeText}</postNoticeText> </properties> - <dependencies> - <dependency> - <groupId>org.apache.uima</groupId> - <artifactId>uimaj-core</artifactId> - <version>${project.parent.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.uima</groupId> - <artifactId>uimaj-adapter-vinci</artifactId> - <version>${project.parent.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.uima</groupId> - <artifactId>jVinci</artifactId> - <version>${project.parent.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.uima</groupId> - <artifactId>uimaj-test-util</artifactId> - <version>${project.parent.version}</version> - <scope>test</scope> - </dependency> + <dependencies> + <dependency> + <groupId>org.apache.uima</groupId> + <artifactId>uimaj-core</artifactId> + <version>${project.parent.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.uima</groupId> + <artifactId>uimaj-adapter-vinci</artifactId> + <version>${project.parent.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.uima</groupId> + <artifactId>jVinci</artifactId> + <version>${project.parent.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.uima</groupId> + <artifactId>uimaj-test-util</artifactId> + <version>${project.parent.version}</version> + <scope>test</scope> + </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-jdk14</artifactId> <scope>test</scope> </dependency> - </dependencies> - <build> - <finalName>uima-cpe</finalName> + </dependencies> + <build> + <finalName>uima-cpe</finalName> <pluginManagement> <!-- remove this once test case cleans up after itself --> <plugins> @@ -111,8 +91,8 @@ </configuration> </execution> </executions> - </plugin> + </plugin> </plugins> </pluginManagement> - </build> + </build> </project> \ No newline at end of file diff --git a/uimaj-document-annotation/pom.xml b/uimaj-document-annotation/pom.xml index 5a0b6c5..c1686b5 100644 --- a/uimaj-document-annotation/pom.xml +++ b/uimaj-document-annotation/pom.xml @@ -17,69 +17,49 @@ specific language governing permissions and limitations under the License. --> -<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> - +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.uima</groupId> <artifactId>uimaj-parent</artifactId> <version>3.3.0-SNAPSHOT</version> <relativePath>../uimaj-parent/pom.xml</relativePath> </parent> - - <artifactId>uimaj-document-annotation</artifactId> - <packaging>jar</packaging> - <name>Apache UIMA Base: ${project.artifactId}</name> + + <artifactId>uimaj-document-annotation</artifactId> + <packaging>jar</packaging> + <name>Apache UIMA Base: ${project.artifactId}</name> <description>A common, but not built-in, type in the type system, specifying the language of a document</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:git:https://github.com/apache/uima-uimaj/ - </connection> - <developerConnection> - scm:git:https://github.com/apache/uima-uimaj/ - </developerConnection> - <url> - https://github.com/apache/uima-uimaj/ - </url> - <tag>uimaj-3.2.0</tag> - </scm> - + <properties> - <uimaScmProject>${project.artifactId}</uimaScmProject> <postNoticeText>${ibmNoticeText}</postNoticeText> </properties> - <dependencies> - <dependency> - <groupId>org.apache.uima</groupId> - <artifactId>uimaj-core</artifactId> - <version>${project.parent.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.uima</groupId> - <artifactId>uimaj-test-util</artifactId> - <version>${project.parent.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jdk14</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <finalName>uima-document-annotation</finalName> - </build> + <dependencies> + <dependency> + <groupId>org.apache.uima</groupId> + <artifactId>uimaj-core</artifactId> + <version>${project.parent.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.uima</groupId> + <artifactId>uimaj-test-util</artifactId> + <version>${project.parent.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + <build> + <finalName>uima-document-annotation</finalName> + </build> </project> \ No newline at end of file diff --git a/uimaj-eclipse-feature-runtime/pom.xml b/uimaj-eclipse-feature-runtime/pom.xml index d4ac6ce..ffa2312 100644 --- a/uimaj-eclipse-feature-runtime/pom.xml +++ b/uimaj-eclipse-feature-runtime/pom.xml @@ -17,7 +17,9 @@ specific language governing permissions and limitations under the License. --> -<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";> +<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> @@ -26,38 +28,12 @@ <version>3.3.0-SNAPSHOT</version> <relativePath>../uimaj-parent/pom.xml</relativePath> </parent> - + <artifactId>uimaj-eclipse-feature-runtime</artifactId> - + <name>Apache 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:git:https://github.com/apache/uima-uimaj/ - </connection> - <developerConnection> - scm:git:https://github.com/apache/uima-uimaj/ - </developerConnection> - <url> - https://github.com/apache/uima-uimaj/ - </url> - <tag>uimaj-3.2.0</tag> - </scm> - - <properties> - <uimaScmProject>${project.artifactId}</uimaScmProject> - </properties> - </project> \ No newline at end of file diff --git a/uimaj-eclipse-feature-tools/pom.xml b/uimaj-eclipse-feature-tools/pom.xml index d037b1a..3582f3b 100644 --- a/uimaj-eclipse-feature-tools/pom.xml +++ b/uimaj-eclipse-feature-tools/pom.xml @@ -17,45 +17,21 @@ specific language governing permissions and limitations under the License. --> -<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";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> - + <parent> <groupId>org.apache.uima</groupId> <artifactId>uimaj-parent</artifactId> <version>3.3.0-SNAPSHOT</version> <relativePath>../uimaj-parent/pom.xml</relativePath> </parent> - + <artifactId>uimaj-eclipse-feature-tools</artifactId> <packaging>jar</packaging> <name>Apache UIMA Eclipse: ${project.artifactId}</name> - <description>UIMA Eclipse Plugin Feature for base uima tooling</description> + <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:git:https://github.com/apache/uima-uimaj/ - </connection> - <developerConnection> - scm:git:https://github.com/apache/uima-uimaj/ - </developerConnection> - <url> - https://github.com/apache/uima-uimaj/ - </url> - <tag>uimaj-3.2.0</tag> - </scm> - - <properties> - <uimaScmProject>${project.artifactId}</uimaScmProject> - </properties> - </project> \ No newline at end of file diff --git a/uimaj-eclipse-update-site/pom.xml b/uimaj-eclipse-update-site/pom.xml index 3adf2eb..9bcdf7b 100644 --- a/uimaj-eclipse-update-site/pom.xml +++ b/uimaj-eclipse-update-site/pom.xml @@ -17,7 +17,9 @@ specific language governing permissions and limitations under the License. --> -<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 https://maven.apache.org/xsd/maven-4.0.0.xsd";> +<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 https://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> @@ -35,33 +37,13 @@ <description>The UIMA Java SDK Eclipse update site</description> <url>${uimaWebsiteUrl}</url> - <scm> - <connection> - scm:git:https://github.com/apache/uima-uimaj/uimaj-eclipse-update-site - </connection> - <developerConnection> - scm:git:https://github.com/apache/uima-uimaj/ - </developerConnection> - <url> - https://github.com/apache/uima-uimaj/tree/master/uimaj-eclipse-update-site - </url> - <tag>uimaj-eclipse-update-site-3.2.0</tag> - </scm> - <properties> - <uimaScmRoot>uimaj</uimaScmRoot> - <uimaScmProject>${project.artifactId}</uimaScmProject> - <eclipseUpdateSiteComponent>uimaj</eclipseUpdateSiteComponent> - <eclipseUpdateSubSite>${project.build.directory}/eclipse-update-site-v3/${eclipseUpdateSiteComponent}</eclipseUpdateSubSite> - <dropPrevVersions>false</dropPrevVersions> - </properties> <build> - <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -69,7 +51,9 @@ <executions> <execution> <id>copy-new-plugins</id> - <goals><goal>copy</goal></goals> + <goals> + <goal>copy</goal> + </goals> <configuration> <!-- =================================================================== the PLUGINS @@ -174,7 +158,7 @@ <!-- is not here, it was --> <!-- moved to uima-wide parent pom 10/2018 --> <!-- ==================================================== --> - + <execution> <id>BuildUpdateSite-pack-svnget-buildMetadata-commit-to-dev</id> <phase>package</phase> @@ -184,10 +168,12 @@ <configuration combine.self="override"> <target> <taskdef classname="net.sf.antcontrib.logic.IfTask" name="if" /> - - <condition property="eclipse.home" value="${uima-maven-build-eclipse-home}"> + + <condition property="eclipse.home" + value="${uima-maven-build-eclipse-home}"> <not> - <equals arg1="${uima-maven-build-eclipse-home}" arg2="$${uima-maven-build-eclipse-home}" /> + <equals arg1="${uima-maven-build-eclipse-home}" + arg2="$${uima-maven-build-eclipse-home}" /> </not> </condition> @@ -195,53 +181,60 @@ <condition property="eclipse.home" value="${envVar.ECLIPSE_HOME}"> <isset property="envVar.ECLIPSE_HOME" /> </condition> - - <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" /> - <fail unless="uima-eclipse-jar-processor" message="********** Please add to your settings.xml file the property uima-eclipse-jar-processor, point to this within an Eclipse installation at level 4.2 or later, e.g. \$\{uima-maven-build-eclipse-home\}/plugins/org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110808-1657.jar" /> + + <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" /> + <fail unless="uima-eclipse-jar-processor" + message="********** Please add to your settings.xml file the property uima-eclipse-jar-processor, point to this within an Eclipse installation at level 4.2 or later, e.g. \$\{uima-maven-build-eclipse-home\}/plugins/org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110808-1657.jar" /> <!-- skip this when dropping previous versions --> - <if> - <equals arg1="${dropPrevVersions}" arg2="false" /> + <if> + <equals arg1="${dropPrevVersions}" arg2="false" /> <then> - <if> - <equals arg1="${isApacheRelease}" arg2="true" /> - <then> - - <echo>checking out eclipse update subsite ${eclipseUpdateSiteComponent} from dist ...release...</echo> - <delete dir="${eclipseUpdateSubSite}" quiet="true" /> - <exec executable="svn" failonerror="true"> - <arg value="checkout" /> - <arg value="${distsvnroot}repos/dist/release/uima/eclipse-update-site-v3/${eclipseUpdateSiteComponent}" /> - <arg value="${eclipseUpdateSubSite}" /> - </exec> - + <if> + <equals arg1="${isApacheRelease}" arg2="true" /> + <then> + + <echo>checking out eclipse update subsite ${eclipseUpdateSiteComponent} from + dist ...release...</echo> + <delete dir="${eclipseUpdateSubSite}" quiet="true" /> + <exec executable="svn" failonerror="true"> + <arg value="checkout" /> + <arg + value="${distsvnroot}repos/dist/release/uima/eclipse-update-site-v3/${eclipseUpdateSiteComponent}" /> + <arg value="${eclipseUpdateSubSite}" /> + </exec> + <echo>Saving original content and artifacts for the site</echo> <copy todir="${project.build.directory}/saved" failonerror="true"> <fileset dir="${eclipseUpdateSubSite}" includes="content.jar,artifacts.jar" /> </copy> - - </then> - <else> - <echo>skipping checkout of current svn dist release (because not apache-release)</echo> + + </then> + <else> + <echo>skipping checkout of current svn dist release (because not + apache-release)</echo> <!-- https://issues.apache.org/jira/browse/UIMA-3501 --> - <delete dir="${eclipseUpdateSubSite}" quiet="true" /> - </else> - </if> - </then> + <delete dir="${eclipseUpdateSubSite}" quiet="true" /> + </else> + </if> + </then> </if> - + <echo>Save conditioned Jars prior to signing, in case of redo</echo> - <echo>-------------------------------------------------------</echo> + <echo>-------------------------------------------------------</echo> <copy todir="${project.build.directory}/saved/features" failonerror="true"> - <fileset dir="${eusWork}/features" includes="*.jar" /> + <fileset dir="${eusWork}/features" includes="*.jar" /> </copy> <copy todir="${project.build.directory}/saved/plugins" failonerror="true"> - <fileset dir="${eusWork}/plugins" includes="*.jar" /> + <fileset dir="${eusWork}/plugins" includes="*.jar" /> </copy> - + <echo>Generate the p2 metadata and publish new artifacts</echo> - <java fork="true" maxmemory="256m" jar="${eclipse-equinox-launcher}" failonerror="true"> - <arg line="-application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher" /> + <java fork="true" maxmemory="256m" jar="${eclipse-equinox-launcher}" + failonerror="true"> + <arg + line="-application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher" /> <arg line="-metadataRepository file:///${eclipseUpdateSubSite}" /> <arg line="-artifactRepository file:///${eclipseUpdateSubSite}" /> <arg line="-source ${eusWork}" /> @@ -251,7 +244,8 @@ <arg line="-append" /> </java> <echo>Augment p2 metadata with category information</echo> - <java fork="true" maxmemory="256m" jar="${eclipse-equinox-launcher}" failonerror="true"> + <java fork="true" maxmemory="256m" jar="${eclipse-equinox-launcher}" + failonerror="true"> <arg line="-application org.eclipse.equinox.p2.publisher.CategoryPublisher" /> <arg line="-metadataRepository file:///${eclipseUpdateSubSite}" /> <arg line="-categoryDefinition file:///${basedir}/category.xml" /> @@ -262,13 +256,14 @@ <equals arg2="true" arg1="${isApacheRelease}" /> <then> <echo message="Generating checksums for new features and plugins" /> - <checksum algorithm="SHA-512" fileext=".sha512" format="MD5SUM" forceoverwrite="yes"> + <checksum algorithm="SHA-512" fileext=".sha512" format="MD5SUM" + forceoverwrite="yes"> <fileset dir="${eusWork}"> <include name="**/*.gz" /> <include name="**/*.jar" /> </fileset> </checksum> - + <echo message="Generating gpg signatures for new features and plugins" /> <apply failonerror="true" dir="${eusWork}" executable="gpg"> <arg value="--detach-sign" /> @@ -285,13 +280,16 @@ <include name="**/*.sha512" /> </fileset> </copy> - <echo message="Clearing previous checksums and signatures for update artifacts.jar and content.jar" /> + <echo + message="Clearing previous checksums and signatures for update artifacts.jar and content.jar" /> <delete dir="${eclipseUpdateSubSite}"> <include name="*.sha512" /> <include name="*.asc" /> </delete> - <echo message="Generating checksums for updated artifacts.jar and content.jar" /> - <checksum algorithm="SHA-512" fileext=".sha512" format="MD5SUM" forceoverwrite="yes"> + <echo + message="Generating checksums for updated artifacts.jar and content.jar" /> + <checksum algorithm="SHA-512" fileext=".sha512" format="MD5SUM" + forceoverwrite="yes"> <fileset dir="${eclipseUpdateSubSite}"> <include name="*.jar" /> </fileset> @@ -313,7 +311,7 @@ </executions> </plugin> - </plugins> + </plugins> </build> </project> diff --git a/uimaj-ep-cas-editor-ide/pom.xml b/uimaj-ep-cas-editor-ide/pom.xml index b5cb07b..c01ae40 100644 --- a/uimaj-ep-cas-editor-ide/pom.xml +++ b/uimaj-ep-cas-editor-ide/pom.xml @@ -17,7 +17,9 @@ specific language governing permissions and limitations under the License. --> -<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";> +<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> @@ -33,31 +35,6 @@ <description>Allows editing the contents of a saved CAS</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:git:https://github.com/apache/uima-uimaj/ - </connection> - <developerConnection> - scm:git:https://github.com/apache/uima-uimaj/ - </developerConnection> - <url> - https://github.com/apache/uima-uimaj/ - </url> - <tag>uimaj-3.2.0</tag> - </scm> - - <properties> - <uimaScmProject>${project.artifactId}</uimaScmProject> - </properties> - <dependencies> <!-- UIMA dependencies --> <!-- diff --git a/uimaj-ep-cas-editor/pom.xml b/uimaj-ep-cas-editor/pom.xml index 95d82f2..726bd4b 100644 --- a/uimaj-ep-cas-editor/pom.xml +++ b/uimaj-ep-cas-editor/pom.xml @@ -17,7 +17,9 @@ specific language governing permissions and limitations under the License. --> -<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";> +<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> @@ -33,31 +35,6 @@ <description>Allows editing the contents of a saved CAS</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:git:https://github.com/apache/uima-uimaj/ - </connection> - <developerConnection> - scm:git:https://github.com/apache/uima-uimaj/ - </developerConnection> - <url> - https://github.com/apache/uima-uimaj/ - </url> - <tag>uimaj-3.2.0</tag> - </scm> - - <properties> - <uimaScmProject>${project.artifactId}</uimaScmProject> - </properties> - <dependencies> <dependency> <groupId>org.junit.jupiter</groupId> @@ -68,7 +45,8 @@ <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> <scope>test</scope> - </dependency><!-- UIMA dependencies --> + </dependency> + <!-- UIMA dependencies --> <!-- don't depend on the runtime plugin, instead, depend on the parts needed diff --git a/uimaj-ep-configurator/pom.xml b/uimaj-ep-configurator/pom.xml index 9d092b7..5094a0b 100644 --- a/uimaj-ep-configurator/pom.xml +++ b/uimaj-ep-configurator/pom.xml @@ -17,7 +17,9 @@ specific language governing permissions and limitations under the License. --> -<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";> +<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> @@ -28,38 +30,16 @@ </parent> <artifactId>uimaj-ep-configurator</artifactId> - <packaging>jar</packaging> + <packaging>jar</packaging> <name>Apache 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:git:https://github.com/apache/uima-uimaj/ - </connection> - <developerConnection> - scm:git:https://github.com/apache/uima-uimaj/ - </developerConnection> - <url> - https://github.com/apache/uima-uimaj/ - </url> - <tag>uimaj-3.2.0</tag> - </scm> - <properties> - <uimaScmProject>${project.artifactId}</uimaScmProject> <postNoticeText>${ibmNoticeText}</postNoticeText> </properties> - + <dependencies> <!-- UIMA dependencies --> <dependency> @@ -125,7 +105,7 @@ </dependencies> <build> - <!-- don't use artifactId as first part of finalName, follow instead the eclipse convention --> + <!-- don't use artifactId as first part of finalName, follow instead the eclipse convention --> <finalName>org.apache.uima.desceditor_${parsedVersion.osgiVersion}</finalName> <plugins> <plugin> @@ -156,7 +136,7 @@ org.eclipse.ui.ide, org.eclipse.ui, org.eclipse.core.runtime - </Require-Bundle> + </Require-Bundle> <Import-Package> !org.eclipse.jface.text, <!-- the ! means to exclude this --> !org.eclipse.jface.text.source, diff --git a/uimaj-ep-debug/pom.xml b/uimaj-ep-debug/pom.xml index 72a6fb7..c85cb0b 100644 --- a/uimaj-ep-debug/pom.xml +++ b/uimaj-ep-debug/pom.xml @@ -17,7 +17,9 @@ specific language governing permissions and limitations under the License. --> -<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";> +<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> @@ -35,31 +37,6 @@ 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> - <connection> - scm:git:https://github.com/apache/uima-uimaj/ - </connection> - <developerConnection> - scm:git:https://github.com/apache/uima-uimaj/ - </developerConnection> - <url> - https://github.com/apache/uima-uimaj/ - </url> - <tag>uimaj-3.2.0</tag> - </scm> - - <properties> - <uimaScmProject>${project.artifactId}</uimaScmProject> - </properties> - <dependencies> <dependency> <groupId>org.apache.uima</groupId> diff --git a/uimaj-ep-jcasgen/pom.xml b/uimaj-ep-jcasgen/pom.xml index c25f2d7..0302e42 100644 --- a/uimaj-ep-jcasgen/pom.xml +++ b/uimaj-ep-jcasgen/pom.xml @@ -34,43 +34,12 @@ 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> - <connection> - scm:git:https://github.com/apache/uima-uimaj/ - </connection> - <developerConnection> - scm:git:https://github.com/apache/uima-uimaj/ - </developerConnection> - <url> - https://github.com/apache/uima-uimaj/ - </url> - <tag>uimaj-3.2.0</tag> - </scm> - <properties> - <uimaScmProject>${project.artifactId}</uimaScmProject> <postNoticeText>${ibmNoticeText}</postNoticeText> </properties> <dependencies> <!-- UIMA dependencies --> - <!-- don't depend on the runtime plugin, instead, - depend on the parts needed --> - <!--dependency> - <groupId>org.apache.uima</groupId> - <artifactId>uimaj-ep-runtime</artifactId> - <version>${uimaj-release-eclipse-version}</version> - <scope>compile</scope> - </dependency --> - <dependency> <groupId>org.apache.uima</groupId> <artifactId>uimaj-core</artifactId> @@ -126,7 +95,6 @@ </dependencies> <build> - <!-- don't use artifactId as first part of finalName, follow instead the eclipse convention --> <finalName>org.apache.uima.jcas.jcasgenp_${parsedVersion.osgiVersion}</finalName> diff --git a/uimaj-ep-launcher/pom.xml b/uimaj-ep-launcher/pom.xml index 0640688..a9f2b7f 100644 --- a/uimaj-ep-launcher/pom.xml +++ b/uimaj-ep-launcher/pom.xml @@ -17,7 +17,9 @@ specific language governing permissions and limitations under the License. --> -<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";> +<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> @@ -34,31 +36,6 @@ <description>Adds launch support for Analysis Engines </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:git:https://github.com/apache/uima-uimaj/ - </connection> - <developerConnection> - scm:git:https://github.com/apache/uima-uimaj/ - </developerConnection> - <url> - https://github.com/apache/uima-uimaj/ - </url> - <tag>uimaj-3.2.0</tag> - </scm> - - <properties> - <uimaScmProject>${project.artifactId}</uimaScmProject> - </properties> - <dependencies> <dependency> <groupId>org.apache.uima</groupId> diff --git a/uimaj-ep-pear-packager/pom.xml b/uimaj-ep-pear-packager/pom.xml index da2e80c..a38bedc 100644 --- a/uimaj-ep-pear-packager/pom.xml +++ b/uimaj-ep-pear-packager/pom.xml @@ -17,7 +17,9 @@ specific language governing permissions and limitations under the License. --> -<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";> +<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> @@ -34,47 +36,7 @@ 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> - <connection> - scm:git:https://github.com/apache/uima-uimaj/ - </connection> - <developerConnection> - scm:git:https://github.com/apache/uima-uimaj/ - </developerConnection> - <url> - https://github.com/apache/uima-uimaj/ - </url> - <tag>uimaj-3.2.0</tag> - </scm> - - <properties> - <uimaScmProject>${project.artifactId}</uimaScmProject> - </properties> - <dependencies> - <!-- UIMA dependencies --> - <!-- depending on the ep-runtime doesn't work without manual intervention because - eclipse:eclipse on the ep-runtime doesn't mark the embedded things as "exported". - It doesn't matter which scope - compile or provided - is used, both fail - - Other posts indicate that plugins should have explicit dependencies, anyway. - And, it lets these plugins work when the library plugin is "open" in the same workspace. - --> - <!--dependency> - <groupId>org.apache.uima</groupId> - <artifactId>uimaj-ep-runtime</artifactId> - <version>${uimaj-release-eclipse-version}</version> - <scope>compile</scope> - </dependency --> - <dependency> <groupId>org.apache.uima</groupId> <artifactId>uimaj-core</artifactId> @@ -124,7 +86,7 @@ <scope>provided</scope> </dependency> </dependencies> - + <build> <!-- don't use artifactId as first part of finalName, follow instead the eclipse convention --> <finalName>org.apache.uima.pear_${parsedVersion.osgiVersion}</finalName> diff --git a/uimaj-ep-runtime/pom.xml b/uimaj-ep-runtime/pom.xml index 4b9da4d..e0c08fc 100644 --- a/uimaj-ep-runtime/pom.xml +++ b/uimaj-ep-runtime/pom.xml @@ -17,16 +17,18 @@ specific language governing permissions and limitations under the License. --> -<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";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> - + <parent> <groupId>org.apache.uima</groupId> <artifactId>uimaj-parent</artifactId> <version>3.3.0-SNAPSHOT</version> <relativePath>../uimaj-parent/pom.xml</relativePath> </parent> - + <artifactId>uimaj-ep-runtime</artifactId> <packaging>jar</packaging> <!-- can't be bundle because it doesn't handle property substitution --> <name>Apache UIMA Eclipse: ${project.artifactId}</name> @@ -34,31 +36,6 @@ 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:git:https://github.com/apache/uima-uimaj/ - </connection> - <developerConnection> - scm:git:https://github.com/apache/uima-uimaj/ - </developerConnection> - <url> - https://github.com/apache/uima-uimaj/ - </url> - <tag>uimaj-3.2.0</tag> - </scm> - - <properties> - <uimaScmProject>${project.artifactId}</uimaScmProject> - </properties> - <!-- These dependencies should just be all the jars that need to be included in the library plugin --> <dependencies> @@ -81,7 +58,7 @@ <exclusion> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> - </exclusion> + </exclusion> </exclusions> </dependency> @@ -126,11 +103,11 @@ <version>${project.parent.version}</version> <scope>compile</scope> </dependency> - + </dependencies> <build> - <!-- don't use artifactId as first part of finalName, follow instead the eclipse convention --> + <!-- don't use artifactId as first part of finalName, follow instead the eclipse convention --> <finalName>org.apache.uima.runtime_${parsedVersion.osgiVersion}</finalName> <plugins> <plugin> @@ -148,89 +125,89 @@ 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.function, - 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.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 + 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.function, + 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.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: @@ -238,13 +215,13 @@ org.apache.uima.adapter.soap.axis11, --> <Import-Package>org.slf4j*, - !com.strobel.assembler, - !com.strobel.assembler.metadata, - !com.strobel.decompiler, - !javax.annotation.meta, - !org.apache.logging.slf4j*, - !org.apache.logging.log4j*, - * + !com.strobel.assembler, + !com.strobel.assembler.metadata, + !com.strobel.decompiler, + !javax.annotation.meta, + !org.apache.logging.slf4j*, + !org.apache.logging.log4j*, + * </Import-Package> <!-- causes the other Jars from the maven dependencies, at the proper version, to be @@ -258,7 +235,7 @@ <Eclipse-ExtensibleAPI>true</Eclipse-ExtensibleAPI> <Eclipse-BuddyPolicy>registered</Eclipse-BuddyPolicy> </instructions> - </configuration> + </configuration> </execution> </executions> </plugin> @@ -268,7 +245,9 @@ <executions> <execution> <id>copyDependentJars</id> - <goals><goal>copy-dependencies</goal></goals> + <goals> + <goal>copy-dependencies</goal> + </goals> <configuration> <outputDirectory>${project.build.outputDirectory}</outputDirectory> </configuration> diff --git a/uimaj-examples/pom.xml b/uimaj-examples/pom.xml index e260376..342e8e5 100644 --- a/uimaj-examples/pom.xml +++ b/uimaj-examples/pom.xml @@ -17,45 +17,25 @@ specific language governing permissions and limitations under the License. --> -<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> - +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.uima</groupId> <artifactId>uimaj-parent</artifactId> <version>3.3.0-SNAPSHOT</version> <relativePath>../uimaj-parent/pom.xml</relativePath> </parent> - - <artifactId>uimaj-examples</artifactId> - <packaging>jar</packaging> - <name>Apache UIMA Base: ${project.artifactId}: SDK Examples</name> + + <artifactId>uimaj-examples</artifactId> + <packaging>jar</packaging> + <name>Apache 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> - <connection> - scm:git:https://github.com/apache/uima-uimaj/ - </connection> - <developerConnection> - scm:git:https://github.com/apache/uima-uimaj/ - </developerConnection> - <url> - https://github.com/apache/uima-uimaj/ - </url> - <tag>uimaj-3.2.0</tag> - </scm> - <properties> - <uimaScmProject>${project.artifactId}</uimaScmProject> <postNoticeText>${ibmNoticeText}</postNoticeText> <maven.javadoc.skip>true</maven.javadoc.skip> </properties> @@ -126,10 +106,10 @@ <!-- Eclipse launch configurations --> <exclude>src/main/run_configuration/*.launch</exclude> <!-- sample data --> - <exclude>src/main/data/*.txt</exclude> + <exclude>src/main/data/*.txt</exclude> <exclude>src/main/resources/org/apache/uima/tutorial/ex6/*.txt</exclude> <!-- readme --> - <exclude>src/main/eclipseProject/*readme.txt</exclude> + <exclude>src/main/eclipseProject/*readme.txt</exclude> </excludes> </configuration> </execution> @@ -137,5 +117,5 @@ </plugin> </plugins> </pluginManagement> - </build> + </build> </project> \ No newline at end of file diff --git a/uimaj-json/pom.xml b/uimaj-json/pom.xml index 3c1ba99..c1ba166 100644 --- a/uimaj-json/pom.xml +++ b/uimaj-json/pom.xml @@ -17,7 +17,9 @@ specific language governing permissions and limitations under the License. --> -<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/xsd/maven-4.0.0.xsd";> +<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/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.uima</groupId> @@ -28,31 +30,20 @@ <artifactId>uimaj-json</artifactId> <name>Apache UIMA Base: ${project.artifactId}: JSON</name> <description>JSON support for UIMA SDK</description> - - <scm> - <connection>scm:git:https://github.com/apache/uima-uimaj/</connection> - <developerConnection>scm:git:https://github.com/apache/uima-uimaj/</developerConnection> - <url>https://github.com/apache/uima-uimaj/</url> - <tag>uimaj-3.2.0</tag> - </scm> - - <properties> - <uimaScmProject>${project.artifactId}</uimaScmProject> - </properties> - + <dependencies> <dependency> <groupId>org.apache.uima</groupId> <artifactId>uimaj-core</artifactId> <version>${project.parent.version}</version> </dependency> - + <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> <version>${jackson-version}</version> </dependency> - + <dependency> <groupId>org.apache.uima</groupId> <artifactId>uimaj-test-util</artifactId> @@ -66,32 +57,28 @@ <scope>test</scope> </dependency> </dependencies> - + <build> <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <executions> - <execution> - <id>default-cli</id> - <configuration> - <excludes combine.children="append"> - <exclude>src/test/resources/CasSerialization/expected/json/*.txt</exclude> - <exclude>src/test/resources/CasSerialization/expected/xmi/*.xml</exclude> - <exclude>src/test/resources/CASTests/json/expected/*.json</exclude> - <exclude>src/test/java/org/apache/uima/test/*.java</exclude> - </excludes> - </configuration> - </execution> - </executions> - </plugin> - </plugins> + <plugins> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <executions> + <execution> + <id>default-cli</id> + <configuration> + <excludes combine.children="append"> + <exclude>src/test/resources/CasSerialization/expected/json/*.txt</exclude> + <exclude>src/test/resources/CasSerialization/expected/xmi/*.xml</exclude> + <exclude>src/test/resources/CASTests/json/expected/*.json</exclude> + <exclude>src/test/java/org/apache/uima/test/*.java</exclude> + </excludes> + </configuration> + </execution> + </executions> + </plugin> + </plugins> </pluginManagement> - - <plugins> - </plugins> </build> - </project> \ No newline at end of file diff --git a/uimaj-parent/pom.xml b/uimaj-parent/pom.xml index ba05eb5..8ffe042 100644 --- a/uimaj-parent/pom.xml +++ b/uimaj-parent/pom.xml @@ -44,24 +44,10 @@ <description>The common parent pom for the UIMA Java SDK</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:git:https://github.com/apache/uima-uimaj/ - </connection> - <developerConnection> - scm:git:https://github.com/apache/uima-uimaj/ - </developerConnection> - <url> - https://github.com/apache/uima-uimaj/ - </url> + <connection>scm:git:https://github.com/apache/uima-uimaj/</connection> + <developerConnection>scm:git:https://github.com/apache/uima-uimaj/</developerConnection> + <url>https://github.com/apache/uima-uimaj/</url> <tag>uimaj-3.2.0</tag> </scm> @@ -145,9 +131,6 @@ </pluginRepositories> <properties> - <uimaScmRoot>uimaj</uimaScmRoot> - <uimaScmProject>${project.artifactId}</uimaScmProject> - <!-- Configuring settings is best done through default properties that multiple plugins. Local configurations within plugins should be avoided. Where plugins do not pick up default diff --git a/uimaj-test-util/pom.xml b/uimaj-test-util/pom.xml index bbedc5a..14bcb5e 100644 --- a/uimaj-test-util/pom.xml +++ b/uimaj-test-util/pom.xml @@ -17,64 +17,42 @@ specific language governing permissions and limitations under the License. --> -<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> - +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.uima</groupId> <artifactId>uimaj-parent</artifactId> <version>3.3.0-SNAPSHOT</version> <relativePath>../uimaj-parent/pom.xml</relativePath> </parent> - - <groupId>org.apache.uima</groupId> - <artifactId>uimaj-test-util</artifactId> - <packaging>jar</packaging> - <name>Apache UIMA Base: ${project.artifactId}: JUnit utilities</name> + + <artifactId>uimaj-test-util</artifactId> + <packaging>jar</packaging> + <name>Apache 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> - <connection> - scm:git:https://github.com/apache/uima-uimaj/ - </connection> - <developerConnection> - scm:git:https://github.com/apache/uima-uimaj/ - </developerConnection> - <url> - https://github.com/apache/uima-uimaj/ - </url> - <tag>uimaj-3.2.0</tag> - </scm> - <properties> - <uimaScmProject>jvinci</uimaScmProject> <postNoticeText>${ibmNoticeText}</postNoticeText> </properties> - - <dependencies> - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-engine</artifactId> - <scope>compile</scope> <!-- is normally test scope, so need to be explicit --> - </dependency> - <dependency> - <groupId>org.junit.vintage</groupId> - <artifactId>junit-vintage-engine</artifactId> - <scope>compile</scope> <!-- is normally test scope, so need to be explicit --> - </dependency> - <dependency> + + <dependencies> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> + <scope>compile</scope> <!-- is normally test scope, so need to be explicit --> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <scope>compile</scope> <!-- is normally test scope, so need to be explicit --> + </dependency> + <dependency> <groupId>xmlunit</groupId> <artifactId>xmlunit</artifactId> - <version>1.6</version> </dependency> - </dependencies> + </dependencies> </project> \ No newline at end of file diff --git a/uimaj-tools/pom.xml b/uimaj-tools/pom.xml index 49154e9..6f62974 100644 --- a/uimaj-tools/pom.xml +++ b/uimaj-tools/pom.xml @@ -17,80 +17,60 @@ specific language governing permissions and limitations under the License. --> -<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> - +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.uima</groupId> <artifactId>uimaj-parent</artifactId> <version>3.3.0-SNAPSHOT</version> <relativePath>../uimaj-parent/pom.xml</relativePath> </parent> - - <artifactId>uimaj-tools</artifactId> - <packaging>jar</packaging> - <name>Apache UIMA Base: ${project.artifactId}: Tools</name> + + <artifactId>uimaj-tools</artifactId> + <packaging>jar</packaging> + <name>Apache 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> - <connection> - scm:git:https://github.com/apache/uima-uimaj/ - </connection> - <developerConnection> - scm:git:https://github.com/apache/uima-uimaj/ - </developerConnection> - <url> - https://github.com/apache/uima-uimaj/ - </url> - <tag>uimaj-3.2.0</tag> - </scm> - + <properties> - <uimaScmProject>${project.artifactId}</uimaScmProject> <postNoticeText>${ibmNoticeText}</postNoticeText> </properties> - - <dependencies> - <dependency> - <groupId>org.apache.uima</groupId> - <artifactId>uimaj-core</artifactId> - <version>${project.parent.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.uima</groupId> - <artifactId>uimaj-cpe</artifactId> - <version>${project.parent.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.uima</groupId> - <artifactId>uimaj-test-util</artifactId> - <version>${project.parent.version}</version> - <scope>test</scope> - </dependency> + + <dependencies> + <dependency> + <groupId>org.apache.uima</groupId> + <artifactId>uimaj-core</artifactId> + <version>${project.parent.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.uima</groupId> + <artifactId>uimaj-cpe</artifactId> + <version>${project.parent.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.uima</groupId> + <artifactId>uimaj-test-util</artifactId> + <version>${project.parent.version}</version> + <scope>test</scope> + </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-jdk14</artifactId> <scope>test</scope> </dependency> - - </dependencies> - <build> - <finalName>uima-tools</finalName> + + </dependencies> + <build> + <finalName>uima-tools</finalName> <resources> <resource> <directory>src/main/resources</directory> - <filtering>true</filtering> + <filtering>true</filtering> </resource> </resources> <pluginManagement> @@ -107,13 +87,12 @@ <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> + </excludes> </configuration> </execution> </executions> - </plugin> + </plugin> </plugins> </pluginManagement> - - </build> + </build> </project> \ No newline at end of file diff --git a/uimaj-v3migration-jcas/pom.xml b/uimaj-v3migration-jcas/pom.xml index 962424b..ceb275b 100644 --- a/uimaj-v3migration-jcas/pom.xml +++ b/uimaj-v3migration-jcas/pom.xml @@ -17,9 +17,11 @@ specific language governing permissions and limitations under the License. --> -<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> - +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.uima</groupId> <artifactId>uimaj-parent</artifactId> @@ -27,28 +29,11 @@ <relativePath>../uimaj-parent/pom.xml</relativePath> </parent> - <artifactId>uimaj-v3migration-jcas</artifactId> - <packaging>jar</packaging> - <name>Apache UIMA Base: ${project.artifactId}</name> + <artifactId>uimaj-v3migration-jcas</artifactId> + <packaging>jar</packaging> + <name>Apache UIMA Base: ${project.artifactId}</name> <description>Tools for migrating to V3 for JCas</description> <url>${uimaWebsiteUrl}</url> - - <scm> - <connection> - scm:git:https://github.com/apache/uima-uimaj/ - </connection> - <developerConnection> - scm:git:https://github.com/apache/uima-uimaj/ - </developerConnection> - <url> - https://github.com/apache/uima-uimaj/ - </url> - <tag>uimaj-3.2.0</tag> - </scm> - - <properties> - <uimaScmProject>uimaj-v3migration-jcas</uimaScmProject> - </properties> <dependencies> <dependency> @@ -90,7 +75,7 @@ </dependency> --> </dependencies> - + <build> <finalName>uimaj-v3migration-jcas</finalName> </build>
