You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by cw...@apache.org on 2013/10/01 21:04:57 UTC

svn commit: r1528182 - in /uima/uima-as/trunk: uima-as-eclipse-update-site/ uimaj-eclipse-feature-deployeditor/src/main/resources/ uimaj-ep-runtime-deployeditor/

Author: cwiklik
Date: Tue Oct  1 19:04:56 2013
New Revision: 1528182

URL: http://svn.apache.org/r1528182
Log:
UIMA-3257 prepare for 2.4.2 release

Added:
    uima/uima-as/trunk/uima-as-eclipse-update-site/marker-file-identifying-eclipse-update-site
Modified:
    uima/uima-as/trunk/uima-as-eclipse-update-site/pom.xml
    uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/src/main/resources/feature.xml
    uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/pom.xml

Added: uima/uima-as/trunk/uima-as-eclipse-update-site/marker-file-identifying-eclipse-update-site
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uima-as-eclipse-update-site/marker-file-identifying-eclipse-update-site?rev=1528182&view=auto
==============================================================================
    (empty)

Modified: uima/uima-as/trunk/uima-as-eclipse-update-site/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uima-as-eclipse-update-site/pom.xml?rev=1528182&r1=1528181&r2=1528182&view=diff
==============================================================================
--- uima/uima-as/trunk/uima-as-eclipse-update-site/pom.xml (original)
+++ uima/uima-as/trunk/uima-as-eclipse-update-site/pom.xml Tue Oct  1 19:04:56 2013
@@ -21,13 +21,13 @@
   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>
+<parent>
     <groupId>org.apache.uima</groupId>
-    <artifactId>parent-pom</artifactId>
-    <version>7</version>
-    <relativePath />
+    <artifactId>uima-as-parent</artifactId>
+    <version>2.4.2-SNAPSHOT</version>
+    <relativePath>../uima-as-parent/pom.xml</relativePath>
   </parent>
-
+  
   <artifactId>uima-as-eclipse-update-site</artifactId>
   <packaging>pom</packaging>
   <version>2.4.2-SNAPSHOT</version>
@@ -51,9 +51,13 @@
   <properties>
     <uimaScmRoot>uima-as</uimaScmRoot>
     <uimaScmProject>${project.artifactId}</uimaScmProject>
-    <eclipseUpdateSite>${project.build.directory}/eclipse-update-site</eclipseUpdateSite>
+    <!-- eclipseUpdateSite>${project.build.directory}/ </eclipseUpdateSite-->
+
+   <eclipseUpdateSiteComponent>uima-as</eclipseUpdateSiteComponent>
+   <eclipseUpdateSubSite>${project.build.directory}/eclipse-update-site/${eclipseUpdateSiteComponent}</eclipseUpdateSubSite>
   </properties>
 
+
   <!-- don't use dependency mechanism - use dependency:copy because we need to get multiple versions 
     for the eclipse-feature-projects, and Maven wants to resolve multiple versions into one. -->
 
@@ -93,17 +97,47 @@
                 List here all the plugins, with all versions - needed by P2 build 
                 ======================================================================= -->
               <artifactItems>
-                <artifactItem><groupId>org.apache.uima</groupId><artifactId>uimaj-ep-deployeditor</artifactId><version>2.4.2</version><destFileName>org.apache.uima.deployeditor_2.4.2.jar</destFileName></artifactItem>
-                <artifactItem><groupId>org.apache.uima</groupId><artifactId>uimaj-ep-deployeditor</artifactId><version>2.4.0</version><destFileName>org.apache.uima.deployeditor_2.4.0.jar</destFileName></artifactItem>
-                <artifactItem><groupId>org.apache.uima</groupId><artifactId>uimaj-ep-deployeditor</artifactId><version>2.3.1</version><destFileName>org.apache.uima.deployeditor_2.3.1.jar</destFileName></artifactItem>
+                <artifactItem>
+                   <groupId>org.apache.uima</groupId>
+                   <artifactId>uimaj-ep-deployeditor</artifactId>
+                   <version>${project.version}</version>
+                   <destFileName>org.apache.uima.deployeditor_${parsedVersion.osgiVersion}.jar</destFileName>
+                </artifactItem>
+                <artifactItem>
+                   <groupId>org.apache.uima</groupId>
+                   <artifactId>uimaj-ep-deployeditor</artifactId>
+                   <version>2.4.0</version>
+                   <destFileName>org.apache.uima.deployeditor_2.4.0.jar</destFileName>
+                </artifactItem>
+                <artifactItem>
+                   <groupId>org.apache.uima</groupId>
+                   <artifactId>uimaj-ep-deployeditor</artifactId>
+                   <version>2.3.1</version>
+                   <destFileName>org.apache.uima.deployeditor_2.3.1.jar</destFileName>
+                </artifactItem>
 
                 
-                <artifactItem><groupId>org.apache.uima</groupId><artifactId>uimaj-ep-runtime-deployeditor</artifactId><version>2.4.2</version><destFileName>org.apache.uima.runtime.fragments.deployeditor_2.4.2.jar</destFileName></artifactItem>
-                <artifactItem><groupId>org.apache.uima</groupId><artifactId>uimaj-ep-runtime-deployeditor</artifactId><version>2.4.0</version><destFileName>org.apache.uima.runtime.fragments.deployeditor_2.4.0.jar</destFileName></artifactItem>
-                <artifactItem><groupId>org.apache.uima</groupId><artifactId>uimaj-ep-runtime-deployeditor</artifactId><version>2.3.1</version><destFileName>org.apache.uima.runtime.fragments.deployeditor_2.3.1.jar</destFileName></artifactItem>
+                <artifactItem>
+                   <groupId>org.apache.uima</groupId>
+                   <artifactId>uimaj-ep-runtime-deployeditor</artifactId>
+                   <version>${project.version}</version>
+                   <destFileName>org.apache.uima.runtime.fragments.deployeditor_${parsedVersion.osgiVersion}.jar</destFileName>
+                </artifactItem>
+                <artifactItem>
+                   <groupId>org.apache.uima</groupId>
+                   <artifactId>uimaj-ep-runtime-deployeditor</artifactId>
+                   <version>2.4.0</version>
+                   <destFileName>org.apache.uima.runtime.fragments.deployeditor_2.4.0.jar</destFileName>
+                </artifactItem>
+                <artifactItem>
+                   <groupId>org.apache.uima</groupId>
+                   <artifactId>uimaj-ep-runtime-deployeditor</artifactId>
+                   <version>2.3.1</version>
+                   <destFileName>org.apache.uima.runtime.fragments.deployeditor_2.3.1.jar</destFileName>
+                </artifactItem>
 
               </artifactItems>            
-              <outputDirectory>${eclipseUpdateSite}/plugins</outputDirectory>              
+              <outputDirectory>${toBePacked}/plugins</outputDirectory>              
               <!-- outputDirectory>${project.build.directory}/work/plugins</outputDirectory-->
             </configuration>
           </execution>
@@ -115,88 +149,33 @@
             <configuration>
               <!-- include here all of the features and all versions for this update site -->
               <artifactItems>
-                <artifactItem><groupId>org.apache.uima</groupId><artifactId>uimaj-eclipse-feature-deployeditor</artifactId><version>2.4.2</version><destFileName>org.apache.uima.deployeditor_2.4.2.jar</destFileName></artifactItem>
-                <artifactItem><groupId>org.apache.uima</groupId><artifactId>uimaj-eclipse-feature-deployeditor</artifactId><version>2.4.0</version><destFileName>org.apache.uima.deployeditor_2.4.0.jar</destFileName></artifactItem>
-                <artifactItem><groupId>org.apache.uima</groupId><artifactId>uimaj-eclipse-feature-deployeditor</artifactId><version>2.3.1</version><destFileName>org.apache.uima.deployeditor_2.3.1.jar</destFileName></artifactItem>                
+                <artifactItem>
+                   <groupId>org.apache.uima</groupId>
+                   <artifactId>uimaj-eclipse-feature-deployeditor</artifactId>
+                   <version>${project.version}</version>
+                   <destFileName>org.apache.uima.deployeditor_${parsedVersion.osgiVersion}.jar</destFileName>
+                </artifactItem>
+                <artifactItem>
+                   <groupId>org.apache.uima</groupId>
+                   <artifactId>uimaj-eclipse-feature-deployeditor</artifactId>
+                   <version>2.4.0</version>
+                   <destFileName>org.apache.uima.deployeditor_2.4.0.jar</destFileName>
+                </artifactItem>
+                <artifactItem>
+                   <groupId>org.apache.uima</groupId>
+                   <artifactId>uimaj-eclipse-feature-deployeditor</artifactId>
+                   <version>2.3.1</version>
+                   <destFileName>org.apache.uima.deployeditor_2.3.1.jar</destFileName>
+                </artifactItem>                
               </artifactItems>
-              <outputDirectory>${eclipseUpdateSite}/features</outputDirectory>              
+              <outputDirectory>${toBePacked}</outputDirectory>
+              <!-- outputDirectory>${eclipseUpdateSite}/features</outputDirectory -->              
             </configuration>
           </execution>
         </executions>
       </plugin>
 
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>BuildUpdateSite</id>
-            <phase>package</phase>
-            <configuration>
-              <target>
-                <!-- if the property uima-maven-build-eclipse-home is set, use it, otherwise don't -->
-                <condition property="eclipse.home" value="${uima-maven-build-eclipse-home}">
-                  <not>
-                    <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" />
-                  
-                <echo>Compress plugin Jars using pack200 - this may take a minute or 2</echo>
-                <java jar="${uima-eclipse-jar-processor}" fork="true" failonerror="true" maxmemory="256m">
-                  <arg line="-processAll"/>
-                  <arg line="-repack"/>
-                  <arg line="-pack"/>
-                  <!-- arg line="-verbose"/-->
-                  <!--  only pack the plugins.  The publisher won't copy packed "features", 
-                        they are tiny anyways -->
-                  <arg line="-outputDir ${eclipseUpdateSite}/plugins"/>
-                  <arg line="${eclipseUpdateSite}/plugins"/>
-                                
-                </java>
-                
-                <echo>Generate p2 metadata</echo>
-                <!-- Generate p2 metadata -->
-                
-                <java jar="${eclipse-equinox-launcher}" fork="true" failonerror="true"
-                  maxmemory="256m">
-                  <arg line="-application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher" />
-                  <arg line="-metadataRepository file://${eclipseUpdateSite}" />
-                  <arg line="-artifactRepository file://${eclipseUpdateSite}" />
-                  <arg line="-source ${eclipseUpdateSite}" />
-                  <arg line="-configs ANY.ANY.ANY" />
-                  <arg line="-publishArtifacts" />
-                  <arg line="-reusePack200Files"/>
-                  <arg line="-compress"/>
-                </java>
-                
-                <echo>Generate category information</echo>
-                <java jar="${eclipse-equinox-launcher}" fork="true" failonerror="true"
-                  maxmemory="256m">
-                  <arg line="-application org.eclipse.equinox.p2.publisher.CategoryPublisher" />
-                  <arg line="-metadataRepository file://${eclipseUpdateSite}" />
-                  <arg line="-categoryDefinition file://${basedir}/category.xml" />
-                  <arg line="-categoryQualifier apache-uima" />
-                  <arg line="-compress"/>
-                </java>
-                
-              </target>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
+
       
     </plugins>
   </build>

Modified: uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/src/main/resources/feature.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/src/main/resources/feature.xml?rev=1528182&r1=1528181&r2=1528182&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/src/main/resources/feature.xml (original)
+++ uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/src/main/resources/feature.xml Tue Oct  1 19:04:56 2013
@@ -58,8 +58,8 @@ under the License.
 
    <requires>
       <!-- Make sure the pre-req uima plugins are installed -->
-      <import plugin="org.apache.uima.runtime" version="2.4.2" match="greaterOrEqual"/>
-      <import plugin="org.apache.uima.desceditor" version="2.4.2" match="greaterOrEqual"/>
+      <import plugin="org.apache.uima.runtime" version="${uimajDependencyVersion}" match="greaterOrEqual"/>
+      <import plugin="org.apache.uima.desceditor" version="${uimajDependencyVersion}" match="greaterOrEqual"/>
    </requires>
 
    <plugin

Modified: uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/pom.xml?rev=1528182&r1=1528181&r2=1528182&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/pom.xml Tue Oct  1 19:04:56 2013
@@ -97,13 +97,9 @@
               org.apache.uima.aae.deployment.impl,
               org.apache.uima.tools.debug.util
             </Export-Package>
-
             <Bundle-SymbolicName>org.apache.uima.runtime.fragments.deployeditor;singleton:=true</Bundle-SymbolicName>
-            
-            <!-- Uncomment Line below for the actual release -->
-            <Fragment-Host>org.apache.uima.runtime;bundle-version="${parsedVersion.osgiVersion}"</Fragment-Host>
-            <!-- Remove below line for the actual release -->
-            <!-- Fragment-Host>org.apache.uima.runtime;bundle-version="2.4.2"</Fragment-Host-->
+           
+            <Fragment-Host>org.apache.uima.runtime;bundle-version="${uimajDependencyVersion}"</Fragment-Host>
           </instructions>
         </configuration>
       </plugin>