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 <m...@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" />
