You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by pk...@apache.org on 2013/09/27 10:22:02 UTC
svn commit: r1526827 - in /uima/sandbox/ruta/branches/UIMA-3272/trunk:
example-projects/ruta-ep-example-extensions/ ruta-eclipse-feature/
ruta-eclipse-feature/src/main/resources/ ruta-eclipse-update-site/
ruta-eclipse-update-site/src/main/resources/ ru...
Author: pkluegl
Date: Fri Sep 27 08:22:02 2013
New Revision: 1526827
URL: http://svn.apache.org/r1526827
Log:
UIMA-3272
- experimental changes for plugins with timestamps
Added:
uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-eclipse-update-site/category.xml (with props)
Modified:
uima/sandbox/ruta/branches/UIMA-3272/trunk/example-projects/ruta-ep-example-extensions/pom.xml
uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-eclipse-feature/pom.xml
uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-eclipse-feature/src/main/resources/feature.xml
uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-eclipse-update-site/pom.xml
uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-eclipse-update-site/src/main/resources/category.xml
uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-ep-addons/pom.xml
uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-ep-caseditor/pom.xml
uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-ep-engine/pom.xml
uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-ep-ide-ui/pom.xml
uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-ep-ide/pom.xml
uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-ep-textruler/pom.xml
Modified: uima/sandbox/ruta/branches/UIMA-3272/trunk/example-projects/ruta-ep-example-extensions/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/branches/UIMA-3272/trunk/example-projects/ruta-ep-example-extensions/pom.xml?rev=1526827&r1=1526826&r2=1526827&view=diff
==============================================================================
--- uima/sandbox/ruta/branches/UIMA-3272/trunk/example-projects/ruta-ep-example-extensions/pom.xml (original)
+++ uima/sandbox/ruta/branches/UIMA-3272/trunk/example-projects/ruta-ep-example-extensions/pom.xml Fri Sep 27 08:22:02 2013
@@ -84,7 +84,7 @@
<build>
<!-- don't use artifactId as first part of finalName, follow instead the eclipse convention -->
- <finalName>org.apache.uima.ruta.example.extensions_${parsedVersion.osgiVersion}</finalName>
+ <finalName>org.apache.uima.ruta.example.extensions_${parsedVersion.osgiVersion}-${maven.build.timestamp}</finalName>
<pluginManagement>
<plugins>
<plugin>
@@ -137,6 +137,7 @@
<!-- <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy> -->
<Eclipse-BuddyPolicy>registered</Eclipse-BuddyPolicy>
<Eclipse-RegisterBuddy>org.apache.uima.runtime,org.apache.uima.ruta.engine</Eclipse-RegisterBuddy>
+ <_snapshot>SNAPSHOT-${maven.build.timestamp}</_snapshot>
</instructions>
</configuration>
</execution>
Modified: uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-eclipse-feature/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-eclipse-feature/pom.xml?rev=1526827&r1=1526826&r2=1526827&view=diff
==============================================================================
--- uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-eclipse-feature/pom.xml (original)
+++ uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-eclipse-feature/pom.xml Fri Sep 27 08:22:02 2013
@@ -62,7 +62,7 @@
<build>
<!-- parsedVersion set in parent-pom by builder-helper -->
- <finalName>${project.artifactId}_${parsedVersion.osgiVersion}</finalName>
+ <finalName>org.apache.uima.ruta.feature.${parsedVersion.osgiVersion}-${maven.build.timestamp}</finalName>
<!-- turn on filtering for these resources -->
<resources>
<resource>
Modified: uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-eclipse-feature/src/main/resources/feature.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-eclipse-feature/src/main/resources/feature.xml?rev=1526827&r1=1526826&r2=1526827&view=diff
==============================================================================
--- uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-eclipse-feature/src/main/resources/feature.xml (original)
+++ uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-eclipse-feature/src/main/resources/feature.xml Fri Sep 27 08:22:02 2013
@@ -20,7 +20,7 @@
<feature
id="org.apache.uima.ruta.feature"
label="UIMA Ruta Workbench"
- version="${parsedVersion.osgiVersion}"
+ version="${parsedVersion.osgiVersion}-130926_1852"
provider-name="Apache Software Foundation">
<description url="http://uima.apache.org">
@@ -49,42 +49,42 @@ and NOTICE files
id="org.apache.uima.ruta.addons"
download-size="0"
install-size="0"
- version="${parsedVersion.osgiVersion}"
+ version="${parsedVersion.osgiVersion}-130926_1852"
unpack="false"/>
<plugin
id="org.apache.uima.ruta.caseditor"
download-size="0"
install-size="0"
- version="${parsedVersion.osgiVersion}"
+ version="${parsedVersion.osgiVersion}-130926_1852"
unpack="false"/>
<plugin
id="org.apache.uima.ruta.engine"
download-size="0"
install-size="0"
- version="${parsedVersion.osgiVersion}"
+ version="${parsedVersion.osgiVersion}-130926_1852"
unpack="false"/>
<plugin
id="org.apache.uima.ruta.ide"
download-size="0"
install-size="0"
- version="${parsedVersion.osgiVersion}"
+ version="${parsedVersion.osgiVersion}-130926_1852"
unpack="false"/>
<plugin
id="org.apache.uima.ruta.ide.ui"
download-size="0"
install-size="0"
- version="${parsedVersion.osgiVersion}"
+ version="${parsedVersion.osgiVersion}-130926_1852"
unpack="false"/>
<plugin
id="org.apache.uima.ruta.textruler"
download-size="0"
install-size="0"
- version="${parsedVersion.osgiVersion}"
+ version="${parsedVersion.osgiVersion}-130926_1852"
unpack="false"/>
</feature>
Added: uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-eclipse-update-site/category.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-eclipse-update-site/category.xml?rev=1526827&view=auto
==============================================================================
--- uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-eclipse-update-site/category.xml (added)
+++ uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-eclipse-update-site/category.xml Fri Sep 27 08:22:02 2013
@@ -0,0 +1,31 @@
+<?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.
+ ***************************************************************
+ -->
+<site>
+ <feature url="features/org.apache.uima.ruta.feature_2.1.1.SNAPSHOT.jar" id="org.apache.uima.ruta.feature" version="2.1.1.SNAPSHOT-130926_1852">
+ <category name="apache-uima-ruta"/>
+ </feature>
+ <category-def name="apache-uima-ruta" label="Apache UIMA Ruta">
+ <description>
+ Apache UIMA Ruta
+ </description>
+ </category-def>
+</site>
Propchange: uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-eclipse-update-site/category.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-eclipse-update-site/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-eclipse-update-site/pom.xml?rev=1526827&r1=1526826&r2=1526827&view=diff
==============================================================================
--- uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-eclipse-update-site/pom.xml (original)
+++ uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-eclipse-update-site/pom.xml Fri Sep 27 08:22:02 2013
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>parent-pom</artifactId>
- <version>6</version>
+ <version>8-SNAPSHOT</version>
<relativePath />
</parent>
<artifactId>ruta-eclipse-update-site</artifactId>
<packaging>pom</packaging>
- <version>2.1.0</version>
+ <version>2.1.1-SNAPSHOT</version>
<name>Apache UIMA Ruta Eclipse: ${project.artifactId}</name>
<description>The UIMA Ruta Eclipse update site</description>
@@ -51,8 +51,12 @@
<uimaScmProject>${project.artifactId}</uimaScmProject>
<eclipseUpdateSiteComponent>ruta</eclipseUpdateSiteComponent>
<eclipseUpdateSubSite>${project.build.directory}/eclipse-update-site/${eclipseUpdateSiteComponent}</eclipseUpdateSubSite>
- <item-maven-release-version>2.1.0</item-maven-release-version>
- <item-eclipse-release-version>2.1.0</item-eclipse-release-version>
+ <item-maven-release-version>2.1.1-SNAPSHOT</item-maven-release-version>
+ <item-eclipse-release-version>2.1.1.SNAPSHOT-130926_1852</item-eclipse-release-version>
+ <!-- ${project.version}
+ <item-maven-release-version>${project.version}</item-maven-release-version>
+ <item-eclipse-release-version>${project.version}</item-eclipse-release-version>
+ -->
</properties>
<build>
<pluginManagement>
Modified: uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-eclipse-update-site/src/main/resources/category.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-eclipse-update-site/src/main/resources/category.xml?rev=1526827&r1=1526826&r2=1526827&view=diff
==============================================================================
--- uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-eclipse-update-site/src/main/resources/category.xml (original)
+++ uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-eclipse-update-site/src/main/resources/category.xml Fri Sep 27 08:22:02 2013
@@ -20,7 +20,7 @@
***************************************************************
-->
<site>
- <feature url="features/org.apache.uima.ruta.feature_${parsedVersion.osgiVersion}.jar" id="org.apache.uima.ruta.feature" version="${parsedVersion.osgiVersion}">
+ <feature url="features/org.apache.uima.ruta.feature_${parsedVersion.osgiVersion}.jar" id="org.apache.uima.ruta.feature" version="${parsedVersion.osgiVersion}-130926_1852">
<category name="apache-uima-ruta"/>
</feature>
<category-def name="apache-uima-ruta" label="Apache UIMA Ruta">
Modified: uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-ep-addons/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-ep-addons/pom.xml?rev=1526827&r1=1526826&r2=1526827&view=diff
==============================================================================
--- uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-ep-addons/pom.xml (original)
+++ uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-ep-addons/pom.xml Fri Sep 27 08:22:02 2013
@@ -173,7 +173,7 @@
</scm>
<build>
<!-- don't use artifactId as first part of finalName, follow instead the eclipse convention -->
- <finalName>org.apache.uima.ruta.addons_${parsedVersion.osgiVersion}</finalName>
+ <finalName>org.apache.uima.ruta.addons_${parsedVersion.osgiVersion}-${maven.build.timestamp}</finalName>
<resources>
<resource>
<directory>.</directory>
@@ -248,6 +248,7 @@
</Require-Bundle>
<Import-Package>
</Import-Package>
+ <_snapshot>SNAPSHOT-${maven.build.timestamp}</_snapshot>
</instructions>
</configuration>
</execution>
Modified: uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-ep-caseditor/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-ep-caseditor/pom.xml?rev=1526827&r1=1526826&r2=1526827&view=diff
==============================================================================
--- uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-ep-caseditor/pom.xml (original)
+++ uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-ep-caseditor/pom.xml Fri Sep 27 08:22:02 2013
@@ -113,7 +113,7 @@
<build>
<!-- don't use artifactId as first part of finalName, follow instead the eclipse convention -->
- <finalName>org.apache.uima.ruta.caseditor_${parsedVersion.osgiVersion}</finalName>
+ <finalName>org.apache.uima.ruta.caseditor_${parsedVersion.osgiVersion}-${maven.build.timestamp}</finalName>
<resources>
<resource>
<directory>.</directory>
@@ -194,6 +194,7 @@
!org.eclipse.core.runtime,
*
</Import-Package>
+ <_snapshot>SNAPSHOT-${maven.build.timestamp}</_snapshot>
</instructions>
</configuration>
</execution>
Modified: uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-ep-engine/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-ep-engine/pom.xml?rev=1526827&r1=1526826&r2=1526827&view=diff
==============================================================================
--- uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-ep-engine/pom.xml (original)
+++ uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-ep-engine/pom.xml Fri Sep 27 08:22:02 2013
@@ -166,7 +166,7 @@ licensed under the Common Public License
<build>
<!-- don't use artifactId as first part of finalName, follow instead
the eclipse convention -->
- <finalName>org.apache.uima.ruta.engine_${parsedVersion.osgiVersion}</finalName>
+ <finalName>org.apache.uima.ruta.engine_${parsedVersion.osgiVersion}-${maven.build.timestamp}</finalName>
<pluginManagement>
<plugins>
<plugin>
@@ -288,6 +288,7 @@ licensed under the Common Public License
<!-- <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy> -->
<Eclipse-BuddyPolicy>registered</Eclipse-BuddyPolicy>
<Eclipse-RegisterBuddy>org.apache.uima.runtime</Eclipse-RegisterBuddy>
+ <_snapshot>SNAPSHOT-${maven.build.timestamp}</_snapshot>
</instructions>
</configuration>
</execution>
Modified: uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-ep-ide-ui/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-ep-ide-ui/pom.xml?rev=1526827&r1=1526826&r2=1526827&view=diff
==============================================================================
--- uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-ep-ide-ui/pom.xml (original)
+++ uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-ep-ide-ui/pom.xml Fri Sep 27 08:22:02 2013
@@ -240,7 +240,7 @@
</scm>
<build>
<!-- don't use artifactId as first part of finalName, follow instead the eclipse convention -->
- <finalName>org.apache.uima.ruta.ide.ui_${parsedVersion.osgiVersion}</finalName>
+ <finalName>org.apache.uima.ruta.ide.ui_${parsedVersion.osgiVersion}-${maven.build.timestamp}</finalName>
<resources>
<resource>
<directory>.</directory>
@@ -333,6 +333,7 @@
<Import-Package>
</Import-Package>
<Bundle-Localization>plugin</Bundle-Localization>
+ <_snapshot>SNAPSHOT-${maven.build.timestamp}</_snapshot>
</instructions>
</configuration>
</execution>
Modified: uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-ep-ide/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-ep-ide/pom.xml?rev=1526827&r1=1526826&r2=1526827&view=diff
==============================================================================
--- uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-ep-ide/pom.xml (original)
+++ uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-ep-ide/pom.xml Fri Sep 27 08:22:02 2013
@@ -128,7 +128,7 @@
</scm>
<build>
<!-- don't use artifactId as first part of finalName, follow instead the eclipse convention -->
- <finalName>org.apache.uima.ruta.ide_${parsedVersion.osgiVersion}</finalName>
+ <finalName>org.apache.uima.ruta.ide_${parsedVersion.osgiVersion}-${maven.build.timestamp}</finalName>
<resources>
<resource>
<directory>.</directory>
@@ -240,6 +240,7 @@
<Import-Package>
</Import-Package>
<Bundle-Localization>plugin</Bundle-Localization>
+ <_snapshot>SNAPSHOT-${maven.build.timestamp}</_snapshot>
</instructions>
</configuration>
</execution>
Modified: uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-ep-textruler/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-ep-textruler/pom.xml?rev=1526827&r1=1526826&r2=1526827&view=diff
==============================================================================
--- uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-ep-textruler/pom.xml (original)
+++ uima/sandbox/ruta/branches/UIMA-3272/trunk/ruta-ep-textruler/pom.xml Fri Sep 27 08:22:02 2013
@@ -154,7 +154,7 @@
</scm>
<build>
<!-- don't use artifactId as first part of finalName, follow instead the eclipse convention -->
- <finalName>org.apache.uima.ruta.textruler_${parsedVersion.osgiVersion}</finalName>
+ <finalName>org.apache.uima.ruta.textruler_${parsedVersion.osgiVersion}-${maven.build.timestamp}</finalName>
<resources>
<resource>
<directory>.</directory>
@@ -226,6 +226,7 @@
</Require-Bundle>
<Import-Package>
</Import-Package>
+ <_snapshot>SNAPSHOT-${maven.build.timestamp}</_snapshot>
</instructions>
</configuration>
</execution>