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 2019/11/01 20:53:18 UTC
[uima-uimaj] branch master updated (dd69063 -> dac0176)
This is an automated email from the ASF dual-hosted git repository.
schor pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git.
from dd69063 [maven-release-plugin] prepare for next development iteration
new 9961f66 move combine.children back to configuration, target doesn't like it
new ed071b3 [maven-release-plugin] prepare release uimaj-eclipse-update-site-3.1.1
new dac0176 Revert "no jira, rmv redundant el, fix misspelling"
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
uimaj-eclipse-update-site/pom.xml | 35 ++++++++++++++++++-----------------
uimaj-parent/pom.xml | 1 +
uimaj-v3migration-jcas/pom.xml | 6 +++---
3 files changed, 22 insertions(+), 20 deletions(-)
[uima-uimaj] 02/03: [maven-release-plugin] prepare release
uimaj-eclipse-update-site-3.1.1
Posted by sc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
schor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit ed071b35c88919e597c88399b2f158a912ed6aea
Author: Marshall Schor <ms...@schor.com>
AuthorDate: Fri Nov 1 15:45:50 2019 -0400
[maven-release-plugin] prepare release uimaj-eclipse-update-site-3.1.1
---
uimaj-eclipse-update-site/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/uimaj-eclipse-update-site/pom.xml b/uimaj-eclipse-update-site/pom.xml
index 56734e0..9fd2632 100644
--- a/uimaj-eclipse-update-site/pom.xml
+++ b/uimaj-eclipse-update-site/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>uimaj-eclipse-update-site</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.1.1</version>
<packaging>pom</packaging>
<name>Apache UIMA Eclipse: ${project.artifactId}</name>
@@ -132,7 +132,7 @@
<goals>
<goal>run</goal>
</goals>
- <configuration combine.self="override">
+ <configuration combine.self="override">
<target>
<taskdef classname="net.sf.antcontrib.logic.IfTask" name="if" />
[uima-uimaj] 01/03: move combine.children back to configuration,
target doesn't like it
Posted by sc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
schor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit 9961f660b4da45b7b227b532102726783d7dceb0
Author: Marshall Schor <ms...@schor.com>
AuthorDate: Fri Nov 1 15:42:35 2019 -0400
move combine.children back to configuration, target doesn't like it
---
uimaj-eclipse-update-site/pom.xml | 33 +++++++++++++++++----------------
1 file changed, 17 insertions(+), 16 deletions(-)
diff --git a/uimaj-eclipse-update-site/pom.xml b/uimaj-eclipse-update-site/pom.xml
index b6b673a..56734e0 100644
--- a/uimaj-eclipse-update-site/pom.xml
+++ b/uimaj-eclipse-update-site/pom.xml
@@ -45,6 +45,7 @@
<url>
https://github.com/apache/uima-uimaj/tree/master/uimaj-eclipse-update-site
</url>
+ <tag>uimaj-eclipse-update-site-3.1.1</tag>
</scm>
<properties>
@@ -60,7 +61,7 @@
</properties>
<build>
-
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -124,17 +125,17 @@
<!-- 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>
<goals>
<goal>run</goal>
</goals>
- <configuration>
- <target combine.self="override">
+ <configuration combine.self="override">
+ <target>
<taskdef classname="net.sf.antcontrib.logic.IfTask" name="if" />
-
+
<condition property="eclipse.home" value="${uima-maven-build-eclipse-home}">
<not>
<equals arg1="${uima-maven-build-eclipse-home}" arg2="$${uima-maven-build-eclipse-home}" />
@@ -145,7 +146,7 @@
<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 when dropping previous versions -->
@@ -155,7 +156,7 @@
<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">
@@ -163,12 +164,12 @@
<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">
+ <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>
@@ -178,7 +179,7 @@
</if>
</then>
</if>
-
+
<echo>Compress plugin Jars using pack200 - this may take a minute or 2</echo>
<java fork="true" maxmemory="256m" jar="${uima-eclipse-jar-processor}" failonerror="true">
<arg line="-processAll" />
@@ -188,16 +189,16 @@
<arg line="-outputDir ${eusWork}/plugins" />
<arg line="${toBePacked}" />
</java>
-
+
<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" />
[uima-uimaj] 03/03: Revert "no jira, rmv redundant el,
fix misspelling"
Posted by sc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
schor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit dac01761712babb1aec21713f5f66158d5558bb9
Author: Marshall Schor <ms...@schor.com>
AuthorDate: Fri Nov 1 16:35:11 2019 -0400
Revert "no jira, rmv redundant el, fix misspelling"
This reverts commit 54b9266a1ff9f5b8fcf0e8c3de0e8b2494805b01.
---
uimaj-parent/pom.xml | 1 +
uimaj-v3migration-jcas/pom.xml | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/uimaj-parent/pom.xml b/uimaj-parent/pom.xml
index c60f473..9b2ace4 100644
--- a/uimaj-parent/pom.xml
+++ b/uimaj-parent/pom.xml
@@ -35,6 +35,7 @@
<version>13</version>
</parent>
+ <groupId>org.apache.uima</groupId>
<artifactId>uimaj-parent</artifactId>
<packaging>pom</packaging>
<version>3.1.2-SNAPSHOT</version>
diff --git a/uimaj-v3migration-jcas/pom.xml b/uimaj-v3migration-jcas/pom.xml
index 9c7e55c..25d6c59 100644
--- a/uimaj-v3migration-jcas/pom.xml
+++ b/uimaj-v3migration-jcas/pom.xml
@@ -35,13 +35,13 @@
<scm>
<connection>
- scm:git:https://github.com/apache/uima-uimaj/uimaj-v3migration-jcas
+ scm:git:https://github.com/apache/uima-uimaj/uimaj-jcas
</connection>
<developerConnection>
- scm:git:https://github.com/apache/uima-uimaj/uimaj-v3migration-jcas
+ scm:git:https://github.com/apache/uima-uimaj/uimaj-jcas
</developerConnection>
<url>
- https://github.com/apache/uima-uimaj/tree/master/uimaj-v3migration-jcas
+ https://github.com/apache/uima-uimaj/tree/master/uimaj-jcas
</url>
<tag>HEAD</tag>
</scm>