Author: schor
Date: Mon Nov 25 15:21:44 2019
New Revision: 1870384
URL: http://svn.apache.org/viewvc?rev=1870384&view=rev
Log:
[UIMA-6156] update for uima v3
Modified:
uima/build/trunk/uima-eclipse-composite-update-site/buildCompositeRepository.xml
uima/build/trunk/uima-eclipse-composite-update-site/pom.xml
uima/build/trunk/uima-eclipse-composite-update-site/readme.txt
uima/build/trunk/uima-eclipse-composite-update-site/signEclipseUpdateSite.sh
uima/build/trunk/uima-eclipse-composite-update-site/verifySigsEclipseUpdateSite.sh
Modified:
uima/build/trunk/uima-eclipse-composite-update-site/buildCompositeRepository.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/uima-eclipse-composite-update-site/buildCompositeRepository.xml?rev=1870384&r1=1870383&r2=1870384&view=diff
==============================================================================
---
uima/build/trunk/uima-eclipse-composite-update-site/buildCompositeRepository.xml
(original)
+++
uima/build/trunk/uima-eclipse-composite-update-site/buildCompositeRepository.xml
Mon Nov 25 15:21:44 2019
@@ -20,19 +20,23 @@
<project name="buildCompositeRepository" basedir="."
default="buildCompositeRepository">
<target name="buildCompositeRepository">
<echo>starting ${basedir}</echo>
- <p2.composite.repository>
- <repository location="target/eclipse-update-site"
name="UIMA Composite Repository" />
+ <p2.composite.repository>
+
+ <!-- change the next line to repo loc to create -->
+
+ <repository location="target/eclipse-update-site-v3"
name="UIMA Composite Repository V3" />
+
+ <!-- change the next lines to do the action wanted -->
+
<add>
- <repository location="uimaj"/>
- <repository location="uima-as"/>
- <!-- repository location="ruta-2.0.1"/-->
- <repository location="ruta"/>
- <repository location="uimaj-v3-pre-production"/>
+ <repository location="uimaj"/>
+ <!-- repository location="uima-as"/-->
+ <!-- repository location="ruta"/-->
</add>
- <remove>
+ <!-- remove>
<repository location="textmarker-2.0.0"/>
- <repository location="ruta-2.0.1"/>
- </remove>
+ <repository location="ruta-2.0.1"/>
+ </remove -->
</p2.composite.repository>
<echo>done</echo>
</target>
Modified: uima/build/trunk/uima-eclipse-composite-update-site/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/uima-eclipse-composite-update-site/pom.xml?rev=1870384&r1=1870383&r2=1870384&view=diff
==============================================================================
--- uima/build/trunk/uima-eclipse-composite-update-site/pom.xml (original)
+++ uima/build/trunk/uima-eclipse-composite-update-site/pom.xml Mon Nov 25
15:21:44 2019
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>parent-pom</artifactId>
- <version>10</version>
+ <version>11</version>
<relativePath>../parent-pom</relativePath>
</parent>
@@ -50,7 +50,7 @@
<properties>
<uimaScmRoot>uimaj</uimaScmRoot>
<uimaScmProject>${project.artifactId}</uimaScmProject>
-
<eclipseUpdateSite>${project.build.directory}/eclipse-update-site</eclipseUpdateSite>
+
<eclipseUpdateSite>${project.build.directory}/eclipse-update-site-v3</eclipseUpdateSite>
<distsvnroot>https://dist.apache.org/</distsvnroot>
<!-- <distsvnroot>file:///svn/t/</distsvnroot> -->
@@ -83,19 +83,22 @@
<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" />
- !<!-- The only reason to check out from SVN these 2 files and
their signatures is to set things up
+ <!-- The only reason to check out from SVN these 2 files and
their signatures is to set things up
so the release can be done via a svn swtich (from dev to
release) and then a commit
Because Jars are being released, it's unlikely there is
any diff encoding that SVN can do -->
+
+ <!-- Changed to no longer check out the previous version,
because the entire generation is redone -->
<!-- =================================== -->
+ <!-- S K I P P E D -->
<!-- SVN remote copy from release to dev -->
<!-- and checkout -->
<!-- =================================== -->
- <echo>copying svn dist release to dev for eclipse composite
update site version ${project.version}</echo>
+ <!-- echo>copying svn dist release to dev for eclipse
composite update site version ${project.version}</echo>
<exec executable="svn">
<arg value="delete" />
<arg
value="${distsvnroot}repos/dist/dev/uima//eclipse-update-site/composite-update-site/${project.version}"
/>
- <arg value="--force" />
+ <arg value="- -force" />
<arg value="-m" />
<arg value="prepare for building eclipse composite update
site ${project.version}" />
</exec>
@@ -104,7 +107,7 @@
<arg value="copy" />
<arg
value="${distsvnroot}repos/dist/release/uima/eclipse-update-site/" />
<arg
value="${distsvnroot}repos/dist/dev/uima/eclipse-update-site/composite-update-site/${project.version}"
/>
- <arg value="--parents" />
+ <arg value="- -parents" />
<arg value="-m" />
<arg value="prepare for building eclipse composite update
site ${project.version}" />
</exec>
@@ -113,12 +116,12 @@
<delete dir="${eclipseUpdateSite}" />
<exec executable="svn">
<arg value="checkout" />
- <arg value="--quiet" />
- <arg value="--depth" />
+ <arg value="- -quiet" />
+ <arg value="- -depth" />
<arg value="immediates" />
<arg
value="${distsvnroot}repos/dist/dev/uima/eclipse-update-site/composite-update-site/${project.version}"
/>
<arg value="${eclipseUpdateSite}" />
- </exec>
+ </exec-->
<!-- We run an internal Ant this way in order to have the Ant
impl have the special
defined tasks for p2 -->
Modified: uima/build/trunk/uima-eclipse-composite-update-site/readme.txt
URL:
http://svn.apache.org/viewvc/uima/build/trunk/uima-eclipse-composite-update-site/readme.txt?rev=1870384&r1=1870383&r2=1870384&view=diff
==============================================================================
--- uima/build/trunk/uima-eclipse-composite-update-site/readme.txt (original)
+++ uima/build/trunk/uima-eclipse-composite-update-site/readme.txt Mon Nov 25
15:21:44 2019
@@ -6,4 +6,16 @@ The Eclipse update site is a composite u
- uima-as
The composite update site only needs maintenance if the number of subsites
changes. Normally this is not the case.
-See the uima-eclipse-composite-update-site project's
"buildCompositeRepository.xml" for details.
\ No newline at end of file
+See the uima-eclipse-composite-update-site project's
"buildCompositeRepository.xml" for details.
+
+As of UIMA V3, there are two composite update sites, supporting the pre-v3 and
post-v3 compatible plugins.
+
+The POM can be set up to regenerate the composite update site only, or check
out an existing one and do modifications (adds/removes).
+
+
+To execute,
+ 1) update the pom and buildCompositeResource.xml for what you want to do
+ *** MAKE SURE TO CHANGE THE target update site - eclipse-update-site or
eclipse-update-site-v3
+ 2) cd to this project and run "mvn package -Papache-release"
+
+ Result will appear in the target directory; if OK upload to the release svn
Modified:
uima/build/trunk/uima-eclipse-composite-update-site/signEclipseUpdateSite.sh
URL:
http://svn.apache.org/viewvc/uima/build/trunk/uima-eclipse-composite-update-site/signEclipseUpdateSite.sh?rev=1870384&r1=1870383&r2=1870384&view=diff
==============================================================================
---
uima/build/trunk/uima-eclipse-composite-update-site/signEclipseUpdateSite.sh
(original)
+++
uima/build/trunk/uima-eclipse-composite-update-site/signEclipseUpdateSite.sh
Mon Nov 25 15:21:44 2019
@@ -34,7 +34,7 @@ for i in $(find ./target/eclipse-update-
do
rm -f $i.asc
gpg --output $i.asc --detach-sig --armor $i
- md5sum --binary $i > $i.md5
+ # md5sum --binary $i > $i.md5 // skip due to apache policy change 3/2018
sha1sum --binary $i > $i.sha1
done
@@ -43,6 +43,6 @@ for i in $(find ./target/eclipse-update-
do
rm -f $i.asc
gpg --output $i.asc --detach-sig --armor $i
- md5sum --binary $i > $i.md5
+ # md5sum --binary $i > $i.md5 // skip due to apache policy change 3/2018
sha1sum --binary $i > $i.sha1
done
\ No newline at end of file
Modified:
uima/build/trunk/uima-eclipse-composite-update-site/verifySigsEclipseUpdateSite.sh
URL:
http://svn.apache.org/viewvc/uima/build/trunk/uima-eclipse-composite-update-site/verifySigsEclipseUpdateSite.sh?rev=1870384&r1=1870383&r2=1870384&view=diff
==============================================================================
---
uima/build/trunk/uima-eclipse-composite-update-site/verifySigsEclipseUpdateSite.sh
(original)
+++
uima/build/trunk/uima-eclipse-composite-update-site/verifySigsEclipseUpdateSite.sh
Mon Nov 25 15:21:44 2019
@@ -34,7 +34,7 @@ fi
for i in $(find ./target/eclipse-update-site -name '*.jar')
do
gpg --verify $i.asc
- md5sum --check $i.md5
+ # md5sum --check $i.md5 // skip due to apache policy change 3/2018
sha1sum --check $i.sha1
done
@@ -42,6 +42,6 @@ for i in $(find ./target/eclipse-update-
for i in $(find ./target/eclipse-update-site -name '*.gz')
do
gpg --verify $i.asc
- md5sum --check $i.md5
+ # md5sum --check $i.md5 // skip due to apache policy change 3/2018
sha1sum --check $i.sha1
done
\ No newline at end of file
