You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2017/10/11 20:13:43 UTC

svn commit: r1811883 - /uima/uv3/uimaj-v3/trunk/uimaj-eclipse-update-site/pom.xml

Author: schor
Date: Wed Oct 11 20:13:43 2017
New Revision: 1811883

URL: http://svn.apache.org/viewvc?rev=1811883&view=rev
Log:
[UIMA-5613] cleanup pom to use relative paths instead of hard-coded ones

Modified:
    uima/uv3/uimaj-v3/trunk/uimaj-eclipse-update-site/pom.xml

Modified: uima/uv3/uimaj-v3/trunk/uimaj-eclipse-update-site/pom.xml
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-eclipse-update-site/pom.xml?rev=1811883&r1=1811882&r2=1811883&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-eclipse-update-site/pom.xml (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-eclipse-update-site/pom.xml Wed Oct 11 20:13:43 2017
@@ -114,7 +114,7 @@
                 <artifactItem><groupId>org.apache.uima</groupId><artifactId>uimaj-eclipse-feature-runtime</artifactId><version>${project.version}</version><destFileName>org.apache.uima.runtime_${parsedVersion.osgiVersion}.jar</destFileName></artifactItem>
                 <artifactItem><groupId>org.apache.uima</groupId><artifactId>uimaj-eclipse-feature-tools</artifactId>  <version>${project.version}</version><destFileName>org.apache.uima.tools_${parsedVersion.osgiVersion}.jar  </destFileName></artifactItem>
               </artifactItems>
-              <outputDirectory>${project.build.directory}/eus-work/features</outputDirectory>
+              <outputDirectory>${eusWork}/features</outputDirectory>
             </configuration>
           </execution>
         </executions>
@@ -289,15 +289,18 @@
             <configuration combine.self="override">
               <target>
                 <taskdef classname="net.sf.antcontrib.logic.IfTask" name="if" />
-                <condition property="eclipse.home" value="C:/p/eclipse/470oxy">
+                
+                <condition property="eclipse.home" value="${uima-maven-build-eclipse-home}">
                   <not>
-                    <equals arg2="$C:/p/eclipse/470oxy" arg1="C:/p/eclipse/470oxy" />
+                    <equals arg1="${uima-maven-build-eclipse-home}" arg2="$${uima-maven-build-eclipse-home}" />
                   </not>
                 </condition>
+
                 <property environment="envVar" />
                 <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" />
                 <!--  skip this for pre-production, only want latest there
@@ -306,11 +309,11 @@
                   <then>
                     
                     <echo>checking out eclipse update subsite uimaj-v3-pre-production from dist ...release...</echo>
-                    <delete quiet="true" dir="C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/eclipse-update-site/uimaj-v3-pre-production" />
+                    <delete quiet="true" dir="${eclipseUpdateSubSite}" />
                     <exec failonerror="true" executable="svn">
                       <arg value="checkout" />
                       <arg value="https://dist.apache.org/repos/dist/release/uima/eclipse-update-site/uimaj-v3-pre-production" />
-                      <arg value="C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/eclipse-update-site/uimaj-v3-pre-production" />
+                      <arg value="${eclipseUpdateSubSite}" />
                     </exec>
                     
                     <echo>Saving original content and artifacts for the site</echo>
@@ -321,19 +324,19 @@
                   </then>
                   <else>
                     <echo>skipping checkout of current svn dist release (because not apache-release)</echo>
-                    <delete quiet="true" dir="C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/eclipse-update-site/uimaj-v3-pre-production" />
+                    <delete quiet="true" dir="${eclipseUpdateSubSite}" />
                   </else>
                 </if>
                    -->
                     
                 <echo>Compress plugin Jars using pack200 - this may take a minute or 2</echo>
-                <java fork="true" maxmemory="256m" jar="C:/p/eclipse/470oxy/plugins/org.eclipse.equinox.p2.jarprocessor_1.0.500.v20160504-1450.jar" failonerror="true">
+                <java fork="true" maxmemory="256m" jar="${uima-eclipse-jar-processor}" failonerror="true">
                   <arg line="-processAll" />
                   <arg line="-repack" />
                   <arg line="-pack" />
                   <arg line="-verbose" />
-                  <arg line="-outputDir C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/eus-work/plugins" />
-                  <arg line="C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/toBePacked" />
+                  <arg line="-outputDir ${eusWork}/plugins" />
+                  <arg line="${toBePacked}" />
                 </java>
                 
                 <echo>Save conditioned Jars prior to signing, in case of redo</echo>
@@ -346,11 +349,11 @@
                 </copy>
                 
                 <echo>Generate the p2 metadata and publish new artifacts</echo>
-                <java fork="true" maxmemory="256m" jar="C:/p/eclipse/470oxy/plugins/org.eclipse.equinox.launcher_1.4.0.v20161219-1356.jar" failonerror="true">
+                <java fork="true" maxmemory="256m" jar="${eclipse-equinox-launcher}" failonerror="true">
                   <arg line="-application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher" />
-                  <arg line="-metadataRepository file:///C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/eclipse-update-site/uimaj-v3-pre-production" />
-                  <arg line="-artifactRepository file:///C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/eclipse-update-site/uimaj-v3-pre-production" />
-                  <arg line="-source C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/eus-work" />
+                  <arg line="-metadataRepository file:///${eclipseUpdateSubSite}" />
+                  <arg line="-artifactRepository file:///${eclipseUpdateSubSite}" />
+                  <arg line="-source ${eusWork}" />
                   <arg line="-configs ANY.ANY.ANY" />
                   <arg line="-publishArtifacts" />
                   <arg line="-reusePack200Files" />
@@ -358,10 +361,10 @@
                   <arg line="-append" />
                 </java>
                 <echo>Augment p2 metadata with category information</echo>
-                <java fork="true" maxmemory="256m" jar="C:/p/eclipse/470oxy/plugins/org.eclipse.equinox.launcher_1.4.0.v20161219-1356.jar" 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:///C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/eclipse-update-site/uimaj-v3-pre-production" />
-                  <arg line="-categoryDefinition file:///C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site/category.xml" />
+                  <arg line="-metadataRepository file:///${eclipseUpdateSubSite}" />
+                  <arg line="-categoryDefinition file:///${basedir}/category.xml" />
                   <arg line="-categoryQualifier apache-uima" />
                   <arg line="-compress" />
                 </java>
@@ -370,58 +373,58 @@
                   <then>
                     <echo message="Generating checksums for new features and plugins" />
                     <checksum format="MD5SUM" algorithm="sha1">
-                      <fileset dir="C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/eus-work">
+                      <fileset dir="${eusWork}">
                         <include name="**/*.gz" />
                         <include name="**/*.jar" />
                       </fileset>
                     </checksum>
                     <checksum format="MD5SUM" algorithm="md5">
-                      <fileset dir="C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/eus-work">
+                      <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="C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/eus-work" executable="gpg">
+                    <apply failonerror="true" dir="${eusWork}" executable="gpg">
                       <arg value="--detach-sign" />
                       <arg value="--armor" />
                       <arg value="--batch" />
-                      <fileset dir="C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/eus-work">
+                      <fileset dir="${eusWork}">
                         <include name="**/*.jar" />
                         <include name="**/*.jar.pack.gz" />
                       </fileset>
                     </apply>
                     <echo message="Copying the checksums and signatures to the update subsite" />
-                    <copy todir="C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/eclipse-update-site/uimaj-v3-pre-production" failonerror="true">
-                      <fileset dir="C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/eus-work">
+                    <copy todir="${eclipseUpdateSubSite}" failonerror="true">
+                      <fileset dir="${eusWork}">
                         <include name="**/*.asc" />
                         <include name="**/*.md5" />
                         <include name="**/*.sha1" />
                       </fileset>
                     </copy>
                     <echo message="Clearing previous checksums and signatures for update artifacts.jar and content.jar" />
-                    <delete dir="C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/eclipse-update-site/uimaj-v3-pre-production">
+                    <delete dir="${eclipseUpdateSubSite}">
                       <include name="*.sha1" />
                       <include name="*.md5" />
                       <include name="*.asc" />
                     </delete>
                     <echo message="Generating checksums for updated artifacts.jar and content.jar" />
                     <checksum format="MD5SUM" algorithm="sha1">
-                      <fileset dir="C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/eclipse-update-site/uimaj-v3-pre-production">
+                      <fileset dir="${eclipseUpdateSubSite}">
                         <include name="*.jar" />
                       </fileset>
                     </checksum>
                     <checksum format="MD5SUM" algorithm="md5">
-                      <fileset dir="C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/eclipse-update-site/uimaj-v3-pre-production">
+                      <fileset dir="${eclipseUpdateSubSite}">
                         <include name="*.jar" />
                       </fileset>
                     </checksum>
                     <echo message="Generating gpg signatures for artifacts.jar and content.jar" />
-                    <apply failonerror="true" dir="C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/eclipse-update-site/uimaj-v3-pre-production" executable="gpg">
+                    <apply failonerror="true" dir="${eclipseUpdateSubSite}" executable="gpg">
                       <arg value="--detach-sign" />
                       <arg value="--armor" />
                       <arg value="--batch" />
-                      <fileset dir="C:\au\svnCheckouts\uv3\trunk\uimaj-v3\uimaj-eclipse-update-site\target/eclipse-update-site/uimaj-v3-pre-production">
+                      <fileset dir="${eclipseUpdateSubSite}">
                         <include name="*.jar" />
                       </fileset>
                     </apply>