Author: schor Date: Thu Jun 17 20:39:02 2010 New Revision: 955732 URL: http://svn.apache.org/viewvc?rev=955732&view=rev Log: [maven-release-plugin] rollback the release of aggregate-parent-poms-1
Modified: uima/build/trunk/aggregate-parent-poms/pom.xml uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml uima/build/trunk/parent-poms/parent-pom-distr/pom.xml uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml uima/build/trunk/parent-poms/parent-pom-eclipse-plugins-ibm-notice/pom.xml uima/build/trunk/parent-poms/parent-pom-eclipse-plugins/pom.xml uima/build/trunk/parent-poms/parent-pom-ibm-notice/pom.xml uima/build/trunk/parent-poms/parent-pom-single-project/pom.xml uima/build/trunk/uima-assembly-single-project/pom.xml uima/build/trunk/uima-build-helper-maven-plugin/pom.xml uima/build/trunk/uima-docbook-resource-bundle/pom.xml uima/build/trunk/uima-jar-resource-bundle/pom.xml Modified: uima/build/trunk/aggregate-parent-poms/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/aggregate-parent-poms/pom.xml?rev=955732&r1=955731&r2=955732&view=diff ============================================================================== --- uima/build/trunk/aggregate-parent-poms/pom.xml (original) +++ uima/build/trunk/aggregate-parent-poms/pom.xml Thu Jun 17 20:39:02 2010 @@ -18,19 +18,21 @@ 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>parent-pom-top</artifactId> <version>1</version> - <relativePath /> + <relativePath/> </parent> <artifactId>aggregate-parent-poms</artifactId> <packaging>pom</packaging> - <version>2-SNAPSHOT</version> + <version>1-SNAPSHOT</version> <name>UIMA Aggregate: ${project.artifactId}</name> <description>This aggregates all the parent poms for convenience</description> <url>${uimaWebsiteUrl}</url> @@ -45,13 +47,13 @@ element, and just changing the following two properties --> <scm> <connection> - scm:svn:http://svn.apache.org/repos/asf/uima/build/trunk/aggregate-parent-poms + scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject} </connection> <developerConnection> - scm:svn:https://svn.apache.org/repos/asf/uima/build/trunk/aggregate-parent-poms + scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject} </developerConnection> <url> - http://svn.apache.org/viewvc/uima/build/trunk/aggregate-parent-poms + http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject} </url> </scm> Modified: uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml?rev=955732&r1=955731&r2=955732&view=diff ============================================================================== --- uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml (original) +++ uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml Thu Jun 17 20:39:02 2010 @@ -30,18 +30,20 @@ Specified as scope compile or runtime causes these to be included in Pear lib dir --> -<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>parent-pom-docbook</artifactId> - <version>2-SNAPSHOT</version> + <version>1-SNAPSHOT</version> <relativePath>../parent-pom-docbook</relativePath> </parent> <artifactId>parent-pom-annotator</artifactId> - <version>2-SNAPSHOT</version> + <version>1-SNAPSHOT</version> <packaging>pom</packaging> <name>UIMA ${project.artifactId}</name> <description>Holds common, factored out settings for annotators</description> @@ -57,13 +59,13 @@ element, and just changing the following two properties --> <scm> <connection> - scm:svn:http://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-annotator + scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject} </connection> <developerConnection> - scm:svn:https://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-annotator + scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject} </developerConnection> <url> - http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-annotator + http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject} </url> </scm> Modified: uima/build/trunk/parent-poms/parent-pom-distr/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-distr/pom.xml?rev=955732&r1=955731&r2=955732&view=diff ============================================================================== --- uima/build/trunk/parent-poms/parent-pom-distr/pom.xml (original) +++ uima/build/trunk/parent-poms/parent-pom-distr/pom.xml Thu Jun 17 20:39:02 2010 @@ -21,19 +21,21 @@ <!-- this parent has common configuration for building official release distributions --> -<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>parent-pom-top</artifactId> <version>1</version> - <relativePath /> + <relativePath/> </parent> <artifactId>parent-pom-distr</artifactId> <packaging>pom</packaging> - <version>2-SNAPSHOT</version> + <version>1-SNAPSHOT</version> <name>UIMA ${project.artifactId}</name> <description>UIMA Parent Pom for Release distributions</description> @@ -49,13 +51,13 @@ element, and just changing the following two properties --> <scm> <connection> - scm:svn:http://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-distr + scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject} </connection> <developerConnection> - scm:svn:https://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-distr + scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject} </developerConnection> <url> - http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-distr + http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject} </url> </scm> Modified: uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml?rev=955732&r1=955731&r2=955732&view=diff ============================================================================== --- uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml (original) +++ uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml Thu Jun 17 20:39:02 2010 @@ -22,19 +22,21 @@ for docbook processing (if the leaf POM has src/docbook) --> -<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>parent-pom-top</artifactId> <version>1</version> - <relativePath /> + <relativePath/> </parent> <artifactId>parent-pom-docbook</artifactId> <packaging>pom</packaging> - <version>2-SNAPSHOT</version> + <version>1-SNAPSHOT</version> <name>UIMA ${project.artifactId}</name> <description>UIMA Parent Pom for Docbook documentation.</description> @@ -50,13 +52,13 @@ element, and just changing the following two properties --> <scm> <connection> - scm:svn:http://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-docbook + scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject} </connection> <developerConnection> - scm:svn:https://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-docbook + scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject} </developerConnection> <url> - http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-docbook + http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject} </url> </scm> @@ -244,7 +246,9 @@ <phase>prepare-package</phase> <configuration> <tasks> - <unzip src="${dolRepo}/${dolZip}" dest="${dolRepo}/docbook-olink" overwrite="false" /> + <unzip src="${dolRepo}/${dolZip}" + dest="${dolRepo}/docbook-olink" + overwrite="false"/> </tasks> </configuration> </execution> @@ -307,7 +311,7 @@ Arial-normal-normal font </fo:inline> for the font triplet specified by: - <font-triplet name="Arial" style="normal" weight="bold" /> + <font-triplet name="Arial" style="normal" weight="bold"/> If you do not want to embed the font in the pdf document then do not include the "embed-url" attribute. @@ -322,12 +326,12 @@ <!-- <font metrics-url="arial.xml" kerning="yes" embed-url="arial.ttf"> - <font-triplet name="Arial" style="normal" weight="normal" /> - <font-triplet name="ArialMT" style="normal" weight="normal" /> + <font-triplet name="Arial" style="normal" weight="normal"/> + <font-triplet name="ArialMT" style="normal" weight="normal"/> </font> <font metrics-url="arialb.xml" kerning="yes" embed-url="arialb.ttf"> - <font-triplet name="Arial" style="normal" weight="bold" /> - <font-triplet name="ArialMT" style="normal" weight="bold" /> + <font-triplet name="Arial" style="normal" weight="bold"/> + <font-triplet name="ArialMT" style="normal" weight="bold"/> </font> --> Modified: uima/build/trunk/parent-poms/parent-pom-eclipse-plugins-ibm-notice/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-eclipse-plugins-ibm-notice/pom.xml?rev=955732&r1=955731&r2=955732&view=diff ============================================================================== --- uima/build/trunk/parent-poms/parent-pom-eclipse-plugins-ibm-notice/pom.xml (original) +++ uima/build/trunk/parent-poms/parent-pom-eclipse-plugins-ibm-notice/pom.xml Thu Jun 17 20:39:02 2010 @@ -20,19 +20,21 @@ <!-- this is the common parent pom for the uima java sdk --> -<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>parent-pom-eclipse-plugins</artifactId> - <version>2-SNAPSHOT</version> + <version>1-SNAPSHOT</version> <relativePath>../parent-pom-eclipse-plugins</relativePath> </parent> <artifactId>parent-pom-eclipse-plugins-ibm-notice</artifactId> <packaging>pom</packaging> - <version>2-SNAPSHOT</version> + <version>1-SNAPSHOT</version> <name>UIMA ${project.artifactId}</name> <description>Adds the IBM Copyright to the Notice file for selected source files</description> <url>${uimaWebsiteUrl}</url> @@ -47,13 +49,13 @@ element, and just changing the following two properties --> <scm> <connection> - scm:svn:http://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-eclipse-plugins-ibm-notice + scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject} </connection> <developerConnection> - scm:svn:https://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-eclipse-plugins-ibm-notice + scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject} </developerConnection> <url> - http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-eclipse-plugins-ibm-notice + http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject} </url> </scm> Modified: uima/build/trunk/parent-poms/parent-pom-eclipse-plugins/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-eclipse-plugins/pom.xml?rev=955732&r1=955731&r2=955732&view=diff ============================================================================== --- uima/build/trunk/parent-poms/parent-pom-eclipse-plugins/pom.xml (original) +++ uima/build/trunk/parent-poms/parent-pom-eclipse-plugins/pom.xml Thu Jun 17 20:39:02 2010 @@ -23,18 +23,20 @@ This POM refers to the parent-pom-docbook as its 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/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>parent-pom-docbook</artifactId> - <version>2-SNAPSHOT</version> + <version>1-SNAPSHOT</version> <relativePath>../parent-pom-docbook</relativePath> </parent> <artifactId>parent-pom-eclipse-plugins</artifactId> - <version>2-SNAPSHOT</version> + <version>1-SNAPSHOT</version> <packaging>pom</packaging> <name>UIMA ${project.artifactId}</name> <description>Holds common, factored out settings for eclipse plugins</description> @@ -50,13 +52,13 @@ element, and just changing the following two properties --> <scm> <connection> - scm:svn:http://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-eclipse-plugins + scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject} </connection> <developerConnection> - scm:svn:https://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-eclipse-plugins + scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject} </developerConnection> <url> - http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-eclipse-plugins + http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject} </url> </scm> @@ -114,15 +116,15 @@ <!-- turn off unneeded executions --> <execution> <id>default-deploy</id> - <phase /> + <phase/> </execution> <execution> <id>default-install</id> - <phase /> + <phase/> </execution> <execution> <id>default-bundle</id> - <phase /> + <phase/> </execution> </executions> </plugin> Modified: uima/build/trunk/parent-poms/parent-pom-ibm-notice/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-ibm-notice/pom.xml?rev=955732&r1=955731&r2=955732&view=diff ============================================================================== --- uima/build/trunk/parent-poms/parent-pom-ibm-notice/pom.xml (original) +++ uima/build/trunk/parent-poms/parent-pom-ibm-notice/pom.xml Thu Jun 17 20:39:02 2010 @@ -20,19 +20,21 @@ <!-- this is the common parent pom for the uima java sdk --> -<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>parent-pom-docbook</artifactId> - <version>2-SNAPSHOT</version> + <version>1-SNAPSHOT</version> <relativePath>../parent-pom-docbook</relativePath> </parent> <artifactId>parent-pom-ibm-notice</artifactId> <packaging>pom</packaging> - <version>2-SNAPSHOT</version> + <version>1-SNAPSHOT</version> <name>UIMA ${project.artifactId}</name> <description>Adds the IBM Copyright to the Notice file for selected source files</description> @@ -48,13 +50,13 @@ element, and just changing the following two properties --> <scm> <connection> - scm:svn:http://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-ibm-notice + scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject} </connection> <developerConnection> - scm:svn:https://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-ibm-notice + scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject} </developerConnection> <url> - http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-ibm-notice + http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject} </url> </scm> Modified: uima/build/trunk/parent-poms/parent-pom-single-project/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-single-project/pom.xml?rev=955732&r1=955731&r2=955732&view=diff ============================================================================== --- uima/build/trunk/parent-poms/parent-pom-single-project/pom.xml (original) +++ uima/build/trunk/parent-poms/parent-pom-single-project/pom.xml Thu Jun 17 20:39:02 2010 @@ -45,18 +45,20 @@ bin - sets execution flags --> -<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>parent-pom-docbook</artifactId> - <version>2-SNAPSHOT</version> + <version>1-SNAPSHOT</version> <relativePath>../parent-pom-docbook</relativePath> </parent> <artifactId>parent-pom-single-project</artifactId> - <version>2-SNAPSHOT</version> + <version>1-SNAPSHOT</version> <packaging>pom</packaging> <name>UIMA ${project.artifactId}</name> <description>Holds common, factored out settings for projects built as single projects</description> @@ -72,13 +74,13 @@ element, and just changing the following two properties --> <scm> <connection> - scm:svn:http://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-single-project + scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject} </connection> <developerConnection> - scm:svn:https://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-single-project + scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject} </developerConnection> <url> - http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-single-project + http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject} </url> </scm> Modified: uima/build/trunk/uima-assembly-single-project/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/uima-assembly-single-project/pom.xml?rev=955732&r1=955731&r2=955732&view=diff ============================================================================== --- uima/build/trunk/uima-assembly-single-project/pom.xml (original) +++ uima/build/trunk/uima-assembly-single-project/pom.xml Thu Jun 17 20:39:02 2010 @@ -46,18 +46,20 @@ bin - sets execution flags --> -<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>parent-pom-top</artifactId> <version>1</version> - <relativePath /> + <relativePath/> </parent> <artifactId>uima-assembly-single-project</artifactId> - <version>2-SNAPSHOT</version> + <version>1-SNAPSHOT</version> <name>UIMA ${project.artifactId}</name> <description>assembly descriptor for single-project</description> <url>${uimaWebsiteUrl}</url> @@ -72,13 +74,13 @@ element, and just changing the following two properties --> <scm> <connection> - scm:svn:http://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/uima-assembly-single-project + scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject} </connection> <developerConnection> - scm:svn:https://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/uima-assembly-single-project + scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject} </developerConnection> <url> - http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/uima-assembly-single-project + http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject} </url> </scm> Modified: uima/build/trunk/uima-build-helper-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/uima-build-helper-maven-plugin/pom.xml?rev=955732&r1=955731&r2=955732&view=diff ============================================================================== --- uima/build/trunk/uima-build-helper-maven-plugin/pom.xml (original) +++ uima/build/trunk/uima-build-helper-maven-plugin/pom.xml Thu Jun 17 20:39:02 2010 @@ -1,111 +1,112 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - 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> - - <parent> - <artifactId>parent-pom-top</artifactId> - <groupId>org.apache.uima</groupId> - <version>1</version> - </parent> - - <artifactId>uima-build-helper-maven-plugin</artifactId> - <version>2-SNAPSHOT</version> - <packaging>maven-plugin</packaging> - - <inceptionYear>2010</inceptionYear> - <name>UIMA ${project.artifactId}</name> - <description>UIMA build helper maven plugin</description> - - <url>${uimaWebsiteUrl}</url> - - <!-- Special inheritance note - even though the <scm> element that follows is exactly the - same as those in super poms, it cannot be inherited because - there is some special code that computes the connection elements - from the chain of parent poms, if this is omitted. - - Keeping this a bit factored allows cutting/pasting the <scm> - element, and just changing the following two properties --> - <scm> - <connection> - scm:svn:http://svn.apache.org/repos/asf/uima/build/trunk/uima-build-helper-maven-plugin - </connection> - <developerConnection> - scm:svn:https://svn.apache.org/repos/asf/uima/build/trunk/uima-build-helper-maven-plugin - </developerConnection> - <url> - http://svn.apache.org/viewvc/uima/build/trunk/uima-build-helper-maven-plugin - </url> - </scm> - - <properties> - <uimaScmRoot>build</uimaScmRoot> - <uimaScmProject>${project.artifactId}</uimaScmProject> - </properties> - - <dependencies> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - <version>2.0</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-model</artifactId> - <version>2.0.9</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - <version>2.0.9</version> - </dependency> - - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-plugin-plugin</artifactId> - <version>2.5.1</version> - <configuration> - <!-- drop maven-plugin per maven conventions --> - <goalPrefix>uima-build-helper</goalPrefix> - </configuration> - <executions> - <execution> - <id>generated-helpmojo</id> - <goals> - <goal>helpmojo</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + 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> + + <parent> + <artifactId>parent-pom-top</artifactId> + <groupId>org.apache.uima</groupId> + <version>1</version> + </parent> + + <artifactId>uima-build-helper-maven-plugin</artifactId> + <version>1-SNAPSHOT</version> + <packaging>maven-plugin</packaging> + + <inceptionYear>2010</inceptionYear> + <name>UIMA ${project.artifactId}</name> + <description>UIMA build helper maven plugin</description> + + <url>${uimaWebsiteUrl}</url> + + <!-- Special inheritance note + even though the <scm> element that follows is exactly the + same as those in super poms, it cannot be inherited because + there is some special code that computes the connection elements + from the chain of parent poms, if this is omitted. + + Keeping this a bit factored allows cutting/pasting the <scm> + element, and just changing the following two properties --> + <scm> + <connection> + scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject} + </connection> + <developerConnection> + scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject} + </developerConnection> + <url> + http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject} + </url> + </scm> + + <properties> + <uimaScmRoot>build</uimaScmRoot> + <uimaScmProject>${project.artifactId}</uimaScmProject> + </properties> + + <dependencies> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + <version>2.0</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + <version>2.0.9</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + <version>2.0.9</version> + </dependency> + + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> + <version>2.5.1</version> + <configuration> + <!-- drop maven-plugin per maven conventions --> + <goalPrefix>uima-build-helper</goalPrefix> + </configuration> + <executions> + <execution> + <id>generated-helpmojo</id> + <goals> + <goal>helpmojo</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> Modified: uima/build/trunk/uima-docbook-resource-bundle/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/uima-docbook-resource-bundle/pom.xml?rev=955732&r1=955731&r2=955732&view=diff ============================================================================== --- uima/build/trunk/uima-docbook-resource-bundle/pom.xml (original) +++ uima/build/trunk/uima-docbook-resource-bundle/pom.xml Thu Jun 17 20:39:02 2010 @@ -23,11 +23,11 @@ <artifactId>parent-pom-top</artifactId> <groupId>org.apache.uima</groupId> <version>1</version> - <relativePath /> + <relativePath/> </parent> <artifactId>uima-docbook-resource-bundle</artifactId> - <version>2-SNAPSHOT</version> + <version>1-SNAPSHOT</version> <name>UIMA Docbooks shared resources</name> <description>An archive which contains various shared resources used by docbook processing</description> @@ -43,13 +43,13 @@ element, and just changing the following two properties --> <scm> <connection> - scm:svn:http://svn.apache.org/repos/asf/uima/build/trunk/uima-docbook-resource-bundle + scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject} </connection> <developerConnection> - scm:svn:https://svn.apache.org/repos/asf/uima/build/trunk/uima-docbook-resource-bundle + scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject} </developerConnection> <url> - http://svn.apache.org/viewvc/uima/build/trunk/uima-docbook-resource-bundle + http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject} </url> </scm> @@ -136,8 +136,8 @@ <configuration> <tasks> <copy todir="src/main/resources/docbook-shared/titlepage"> - <fileset dir="${project.build.directory}/generated-resources/xml/xslt" /> - <globmapper from="*.xml" to="*.xsl" /> + <fileset dir="${project.build.directory}/generated-resources/xml/xslt"/> + <globmapper from="*.xml" to="*.xsl"/> </copy> </tasks> </configuration> Modified: uima/build/trunk/uima-jar-resource-bundle/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/uima-jar-resource-bundle/pom.xml?rev=955732&r1=955731&r2=955732&view=diff ============================================================================== --- uima/build/trunk/uima-jar-resource-bundle/pom.xml (original) +++ uima/build/trunk/uima-jar-resource-bundle/pom.xml Thu Jun 17 20:39:02 2010 @@ -23,11 +23,11 @@ <artifactId>parent-pom-top</artifactId> <groupId>org.apache.uima</groupId> <version>1</version> - <relativePath /> + <relativePath/> </parent> <artifactId>uima-jar-resource-bundle</artifactId> - <version>2-SNAPSHOT</version> + <version>1-SNAPSHOT</version> <name>UIMA Jar shared resources</name> <description>An archive which contains templates for generating the necessary license files and notices for all Apache releases. @@ -45,13 +45,13 @@ element, and just changing the following two properties --> <scm> <connection> - scm:svn:http://svn.apache.org/repos/asf/uima/build/trunk/uima-jar-resource-bundle + scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject} </connection> <developerConnection> - scm:svn:https://svn.apache.org/repos/asf/uima/build/trunk/uima-jar-resource-bundle + scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject} </developerConnection> <url> - http://svn.apache.org/viewvc/uima/build/trunk/uima-jar-resource-bundle + http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject} </url> </scm>