[uima-uimaj] branch UIMA-6159_selectFS_allow_AnnotationFS_in_addition_to_TOP created (now 9d1ad83)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch UIMA-6159_selectFS_allow_AnnotationFS_in_addition_to_TOP in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. at 9d1ad83 [UIMA-6159] add method signatures for FeatureStructure This branch includes the following new commits: new 17f6dfd add testcase temp file to .gitignore new 9d1ad83 [UIMA-6159] add method signatures for FeatureStructure The 2 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.
[uima-uimaj] 01/02: add testcase temp file to .gitignore
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch UIMA-6159_selectFS_allow_AnnotationFS_in_addition_to_TOP in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git commit 17f6dfd7521388a5bbe8c90b10b9019ff453dba8 Author: Marshall Schor AuthorDate: Mon Jan 6 15:54:36 2020 -0500 add testcase temp file to .gitignore --- uimaj-cpe/.gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/uimaj-cpe/.gitignore b/uimaj-cpe/.gitignore new file mode 100644 index 000..ae9fd6e --- /dev/null +++ b/uimaj-cpe/.gitignore @@ -0,0 +1,3 @@ +checkpoint.dat.prev +checkpoint_synchPoint.xml +checkpoint_synchPoint.xml.prev \ No newline at end of file
[uima-uimaj] branch robin-hood-hash updated: turn off slow perf test of hashset
This is an automated email from the ASF dual-hosted git repository.
schor pushed a commit to branch robin-hood-hash
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
The following commit(s) were added to refs/heads/robin-hood-hash by this push:
new 851fee2 turn off slow perf test of hashset
851fee2 is described below
commit 851fee28430677829defba8f71f549b5b7819de6
Author: Marshall Schor
AuthorDate: Mon Jan 6 15:44:48 2020 -0500
turn off slow perf test of hashset
---
.../test/java/org/apache/uima/internal/util/IntHashSetPerfTestRh.java | 2 +-
.../src/test/java/org/apache/uima/internal/util/ObjHashSetPerfTest.java | 2 +-
.../test/java/org/apache/uima/internal/util/ObjHashSetPerfTestRh.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/uimaj-core/src/test/java/org/apache/uima/internal/util/IntHashSetPerfTestRh.java
b/uimaj-core/src/test/java/org/apache/uima/internal/util/IntHashSetPerfTestRh.java
index 5bb5286..008da8f 100644
---
a/uimaj-core/src/test/java/org/apache/uima/internal/util/IntHashSetPerfTestRh.java
+++
b/uimaj-core/src/test/java/org/apache/uima/internal/util/IntHashSetPerfTestRh.java
@@ -31,7 +31,7 @@ public class IntHashSetPerfTestRh extends TestCase {
*
* Tests both IntHashSet and IntBitSet
*/
- final boolean SKIP = false;
+ final boolean SKIP = true;
static int cacheLoadSize;
diff --git
a/uimaj-core/src/test/java/org/apache/uima/internal/util/ObjHashSetPerfTest.java
b/uimaj-core/src/test/java/org/apache/uima/internal/util/ObjHashSetPerfTest.java
index aab13fb..3e5e934 100644
---
a/uimaj-core/src/test/java/org/apache/uima/internal/util/ObjHashSetPerfTest.java
+++
b/uimaj-core/src/test/java/org/apache/uima/internal/util/ObjHashSetPerfTest.java
@@ -29,7 +29,7 @@ public class ObjHashSetPerfTest extends TestCase {
*
* Tests both IntHashSet and IntBitSet
*/
- final boolean SKIP = false;
+ final boolean SKIP = true;
static int cacheLoadSize;
diff --git
a/uimaj-core/src/test/java/org/apache/uima/internal/util/ObjHashSetPerfTestRh.java
b/uimaj-core/src/test/java/org/apache/uima/internal/util/ObjHashSetPerfTestRh.java
index 24ec769..22ef907 100644
---
a/uimaj-core/src/test/java/org/apache/uima/internal/util/ObjHashSetPerfTestRh.java
+++
b/uimaj-core/src/test/java/org/apache/uima/internal/util/ObjHashSetPerfTestRh.java
@@ -31,7 +31,7 @@ public class ObjHashSetPerfTestRh extends TestCase {
*
* Tests both IntHashSet and IntBitSet
*/
- final boolean SKIP = false;
+ final boolean SKIP = true;
static int cacheLoadSize;
[uima-uimaj] branch robin-hood-hash updated: experiment: robin hood hash with obj hash - is slower by 1/3 to 1/2
This is an automated email from the ASF dual-hosted git repository.
schor pushed a commit to branch robin-hood-hash
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
The following commit(s) were added to refs/heads/robin-hood-hash by this push:
new 1613bd0 experiment: robin hood hash with obj hash - is slower by 1/3
to 1/2
1613bd0 is described below
commit 1613bd0b50a5ccb68dc3e07873ef84c1eabf1edf
Author: Marshall Schor
AuthorDate: Thu Dec 19 15:37:11 2019 -0500
experiment: robin hood hash with obj hash - is slower by 1/3 to 1/2
---
.../apache/uima/internal/util/ObjHashSetRh.java| 4 +-
.../uima/internal/util/ObjHashSetPerfTest.java | 192
.../uima/internal/util/ObjHashSetPerfTestRh.java | 194 +
3 files changed, 388 insertions(+), 2 deletions(-)
diff --git
a/uimaj-core/src/main/java/org/apache/uima/internal/util/ObjHashSetRh.java
b/uimaj-core/src/main/java/org/apache/uima/internal/util/ObjHashSetRh.java
index d70c7d3..b1a6e17 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/ObjHashSetRh.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/ObjHashSetRh.java
@@ -117,8 +117,8 @@ public class ObjHashSetRh extends Common_hash_support_rh
implements Set {
// key hash
Misc.hashInt(key.hashCode()),
-// is_eq
-i -> keys[i].equals(key));
+// is_eq_or_not_present
+i -> keys[i] == null || keys[i].equals(key)); // keys[i] can be null
}
diff --git
a/uimaj-core/src/test/java/org/apache/uima/internal/util/ObjHashSetPerfTest.java
b/uimaj-core/src/test/java/org/apache/uima/internal/util/ObjHashSetPerfTest.java
new file mode 100644
index 000..aab13fb
--- /dev/null
+++
b/uimaj-core/src/test/java/org/apache/uima/internal/util/ObjHashSetPerfTest.java
@@ -0,0 +1,192 @@
+/*
+ * 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.
+ */
+
+package org.apache.uima.internal.util;
+
+import java.util.Random;
+
+import junit.framework.TestCase;
+
+public class ObjHashSetPerfTest extends TestCase {
+ /**
+ * Set to false to run the performance test
+ *
+ * Tests both IntHashSet and IntBitSet
+ */
+ final boolean SKIP = false;
+
+ static int cacheLoadSize;
+
+ static long seed = 3737463135938899369L;
+// new Random().nextLong();
+ static {
+System.out.println("Random seed for IntHashSetPerfTest: " + seed);
+ }
+ Random r = new Random(seed);
+
+// Set keys = new HashSet(1000);
+
+ int dmv = 0;
+
+ ObjHashSet m1;
+
+ final int[] keys1 = new int[51];
+ int k10ki = 0;
+
+
+ public void testPerf() {
+if (SKIP) return;
+m1 = new ObjHashSet<>(16, Integer.class, Integer.MIN_VALUE);
+
+for (int i = 0; i < keys1.length; i++) {
+ int k = r.nextInt(50);
+
+ keys1[i] = k + 1;
+}
+
+System.out.format("%n%n W A R M U P %n%n");
+cacheLoadSize = 0;
+warmup(m1);
+
+System.out.format("%n%n Time 100 %n%n");
+timelp(100);
+System.out.format("%n%n Time 1000 %n%n");
+timelp(1000);
+System.out.format("%n%n Time 1 %n%n");
+timelp(1);
+System.out.format("%n%n Time 10 %n%n");
+timelp(10);
+cacheLoadSize = 0; // 1 * 256 * 1;
+System.out.format("%n%n Time 10 %n%n");
+timelp(10);
+
+System.out.format("%n%n Time 50 %n%n");
+timelp(50);
+
+System.out.format("%n%n For Yourkit: Time 50 %n%n");
+timelp(50);
+//System.out.format("%n%n For Yourkit: Time 50 %n%n");
+//timelp(50);
+//System.out.format("%n%n For Yourkit: Time 50 %n%n");
+//timelp(50);
+
+
+System.out.println(dmv);
+ }
+
+ private void time2(int n) {
+float f1 = time(m1, n);
+ }
+
+ private void timelp(int n) {
+time2(n);
+time2(n);
+time2(n);
+ }
+
+ private void warmup(ObjHashSet m) {
+for (int i = 0; i < 500; i++) {
+ inner(m,true, 1000) ; // warm up
+}
+ }
+
+ private float time(ObjHashSet m, int ss) {
+long start
[uima-uimaj] branch master updated: [UIMA-6162] document some CAS serialization are synchronized
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 The following commit(s) were added to refs/heads/master by this push: new 382b096 [UIMA-6162] document some CAS serialization are synchronized 382b096 is described below commit 382b096ae3967af6fa6fd6758fd36ae427372c6a Author: Marshall Schor AuthorDate: Thu Dec 19 14:47:41 2019 -0500 [UIMA-6162] document some CAS serialization are synchronized for operations that make use of data structures for building serialized forms that are part of the CAS's svd. --- .../src/docbook/tug.application.xml | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/uima-docbook-tutorials-and-users-guides/src/docbook/tug.application.xml b/uima-docbook-tutorials-and-users-guides/src/docbook/tug.application.xml index 072aa11..42a12ed 100644 --- a/uima-docbook-tutorials-and-users-guides/src/docbook/tug.application.xml +++ b/uima-docbook-tutorials-and-users-guides/src/docbook/tug.application.xml @@ -728,7 +728,11 @@ ae.destroy(); See the Javadocs for that class for details. Several of the APIs use or return instances of SerialFormat, which is an enum specifying the various - forms of serialization. + forms of serialization. + + Serialization often makes use of temporary extra data structures, anchored from the CAS being serialized. +These are read/write, and because of this, most serializations are synchronized to prevent multiple +serializations of the same CAS from happening in parallel.
[uima-uimaj] branch master updated: [UIMA-6162] synchronize some CAS serialization
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
The following commit(s) were added to refs/heads/master by this push:
new 18cdb21 [UIMA-6162] synchronize some CAS serialization
18cdb21 is described below
commit 18cdb210a0fc436bdb56830853949fd85618b9ff
Author: Marshall Schor
AuthorDate: Wed Dec 18 11:47:17 2019 -0500
[UIMA-6162] synchronize some CAS serialization
for operations that make use of data structures for building serialized
forms that are part of the CAS's svd.
---
.../org/apache/uima/cas/impl/BinaryCasSerDes4.java | 283 +-
.../org/apache/uima/cas/impl/BinaryCasSerDes6.java | 277 -
.../org/apache/uima/cas/impl/CASSerializer.java| 628 +++--
3 files changed, 599 insertions(+), 589 deletions(-)
diff --git
a/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes4.java
b/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes4.java
index fb67c72..91ffbea 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes4.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes4.java
@@ -445,151 +445,154 @@ public class BinaryCasSerDes4 implements
SlotKindsConstants {
* @throws IOException
*/
private void serialize() throws IOException {
-
- // if (doMeasurement) {
-//System.out.println(printCasInfo(baseCas));
-//sm.origAuxBytes = baseCas.getByteHeap().getSize();
-//sm.origAuxShorts = baseCas.getShortHeap().getSize() * 2;
-//sm.origAuxLongs = baseCas.getLongHeap().getSize() * 8;
-//sm.totalTime = System.currentTimeMillis();
-// }
-
-
- /
- * Write standard header
- /
- CommonSerDes.createHeader()
-.v3()
-.seqVer(2)// 0 - original, 1 - UIMA-4743, 2 - v3
-.form4()
-.delta(isDelta)
-.typeSystemIndexDefIncluded(isTsi)
-.write(serializedOut);
-
- if (isTsi) {
-CasIOUtils.writeTypeSystem(baseCas, serializedOut, true);
- }
- if (TRACE_SER) System.out.println("Form4Ser start, delta: " + (isDelta ?
"true" : "false"));
-
/***
- * Setup tables that map to v2 "addresses" - needed for backwards
compatibility
- * fs2addr - feature structure to address
- * addr2fs - address to feature structure
- * sortedFSs - sorted by addr (sorted by id)
-
***/
- final int origHeapEnd = csds.getHeapEnd(); // csds guaranteed non-null
by constructor
- if (isDelta) {
-csds.setup(mark, origHeapEnd); // add additional above the line items
to csds
- } // otherwise was initialized when initially set up
-
- /**
- * prepare fs < -- > seq maps
- * done for entire cas (in the case of a mark)
- */
- fs2seq.clear();
-// seq2fs.clear();
- int seq = 1; // origin 1
-
- final List localSortedFSs = csds.getSortedFSs();
- for (TOP fs : localSortedFSs) {
-fs2seq.put(fs, seq++);
-//seq2fs.put(seq++, fs);
-if (fs instanceof UimaSerializable) {
- ((UimaSerializable)fs)._save_to_cas_data();
+ synchronized(baseCas.svd) {
+
+ // if (doMeasurement) {
+ //System.out.println(printCasInfo(baseCas));
+ //sm.origAuxBytes = baseCas.getByteHeap().getSize();
+ //sm.origAuxShorts = baseCas.getShortHeap().getSize() * 2;
+ //sm.origAuxLongs = baseCas.getLongHeap().getSize() * 8;
+ //sm.totalTime = System.currentTimeMillis();
+ // }
+
+
+/
+ * Write standard header
+ /
+CommonSerDes.createHeader()
+ .v3()
+ .seqVer(2)// 0 - original, 1 - UIMA-4743, 2 - v3
+ .form4()
+ .delta(isDelta)
+ .typeSystemIndexDefIncluded(isTsi)
+ .write(serializedOut);
+
+if (isTsi) {
+ CasIOUtils.writeTypeSystem(baseCas, serializedOut, true);
}
- }
-
- // the sort order is on the id (e.g. creation order)
- List newSortedFSs = CASImpl.filterAboveMark(csds.getSortedFSs(),
mark); // returns all if mark not set
-
- /**
- * Strings
- * For delta, to determine "new" strings that should be serialized,
- * use the same method as used in Binary (plain) serialization.
- **/
- for (TOP fs : newSortedFSs) {
-extractStrings(fs);
- }
[uima-uimaj] 01/01: no jira, experiment, robin hood hashing.
This is an automated email from the ASF dual-hosted git repository.
schor pushed a commit to branch robin-hood-hash
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit 9a426895dfaa761ff74dd1de3d43ed47c79a834d
Author: Marshall Schor
AuthorDate: Wed Dec 18 09:04:09 2019 -0500
no jira, experiment, robin hood hashing.
Initial results: worse performance for IntHashSet, might be OK for Obj
HashSet
---
.../uima/internal/util/Common_hash_support_rh.java | 561 +++
.../apache/uima/internal/util/IntHashSetRh.java| 794 +
.../apache/uima/internal/util/ObjHashSetRh.java| 520 ++
.../uima/internal/util/IntHashSetPerfTestRh.java | 219 ++
.../uima/internal/util/IntHashSetTestRh.java | 250 +++
.../uima/internal/util/ObjHashSetTestRh.java | 185 +
6 files changed, 2529 insertions(+)
diff --git
a/uimaj-core/src/main/java/org/apache/uima/internal/util/Common_hash_support_rh.java
b/uimaj-core/src/main/java/org/apache/uima/internal/util/Common_hash_support_rh.java
new file mode 100644
index 000..01c0edd
--- /dev/null
+++
b/uimaj-core/src/main/java/org/apache/uima/internal/util/Common_hash_support_rh.java
@@ -0,0 +1,561 @@
+/*
+ * 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.
+ */
+package org.apache.uima.internal.util;
+
+import java.util.Arrays;
+import java.util.function.IntPredicate;
+
+/**
+ * A common superclass for hash maps and hash sets
+ * Uses robin hood with backward shift for deletion
+ *
http://codecapsule.com/2013/11/17/robin-hood-hashing-backward-shift-deletion/
+ *
+ * uses linear probing (no delta expansion)
+ *
+ * extra table (1 byte per slot) holds lower 7 bits of hash
+ * and therefore also serves to indicate distance from initial probe =
+ * probe spot % 128 - lower 7 bits of hash (if negative, add 128, unless
wrap around?)
+ *
+ * 8th bit , if 1 , is flag showing empty; no tombstones, because using
backward-shift technique for removes
+ *
+ * find: stop early, if # probe-spot > distance from initial probe. (mod
wrap-around)
+ *
+ */
+public abstract class Common_hash_support_rh {
+
+ // set to true to collect statistics for tuning
+ // you have to also put a call to showHistogram() at the end of the run
+ protected static final boolean TUNE = false;
+
+ protected static final int MIN_SIZE = 10; // 10 / .66 =15.15
+ protected static final int MIN_CAPACITY = 16;
+ protected static final int MIN_CAPACITY_SHRINK = 64; // don't shrink below
this - thrashing
+
+ private static final byte LHB_EMPTY = (byte) 0x80;
+ private static final int LHB_HASH_MASK = 0x7f;
+
+ protected final float loadFactor;
+
+ protected final int initialCapacity;
+
+ protected int histogram [];
+ protected int maxProbe = 0;
+
+ protected int sizeWhichTriggersExpansion;
+ private int size = 0; // number of elements in the table
+
+ protected boolean secondTimeShrinkable = false;
+
+ protected abstract boolean is_valid_key(int pos);
+ protected abstract int keys_length();
+ protected abstract void newKeysAndValues(int capacity);
+ protected abstract void clearKeysAndValues();
+
+ protected int bitMask; // = key size -1
+ /**
+ * 7 bits of lower hash map, serves as distance from initial bucket probe
+ * initialize to "empty" = 0x80
+ * If not "empty", the value is
+ * - often the same as the lower 7 bits of the index
+ * - if not that, it's because there's a collision, and some slot with a
higher index will have the lower 7 bits of the index
+ * - so, the distance from the initial probe is the probe addr with the
matching value - initial probe addr.
+ * - which, is the same as the
+ * ((probe addr with the matching value) & LBH_HASH_MASK)
+ * - matching value
+ */
+ private byte[] lower_hash_bits;
+ protected int initial_probe;
+ protected byte initial_probe_lhb;
+ private int smaller_of_mask;
+
+ private static Common_hash_support_rh tune_instance;
+
+ protected abstract void shift(int prev, int pos);
+ protected abstract void setEmpty(int pos);
+
+ protected abstract void expand_tabl
[uima-uimaj] branch robin-hood-hash created (now 9a42689)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch robin-hood-hash in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. at 9a42689 no jira, experiment, robin hood hashing. This branch includes the following new commits: new 9a42689 no jira, experiment, robin hood hashing. The 1 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.
[uima-uimaj] branch master updated: no jira - enable suport for tuning hash map
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
The following commit(s) were added to refs/heads/master by this push:
new 1fb3393 no jira - enable suport for tuning hash map
1fb3393 is described below
commit 1fb339310e7a11cae5398f0cb8a2ec2eb636905e
Author: Marshall Schor
AuthorDate: Wed Dec 18 08:42:53 2019 -0500
no jira - enable suport for tuning hash map
---
.../uima/internal/util/Common_hash_support.java| 23 --
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git
a/uimaj-core/src/main/java/org/apache/uima/internal/util/Common_hash_support.java
b/uimaj-core/src/main/java/org/apache/uima/internal/util/Common_hash_support.java
index 38ddd75..e81b0c0 100644
---
a/uimaj-core/src/main/java/org/apache/uima/internal/util/Common_hash_support.java
+++
b/uimaj-core/src/main/java/org/apache/uima/internal/util/Common_hash_support.java
@@ -21,7 +21,6 @@ package org.apache.uima.internal.util;
import java.util.Arrays;
import java.util.function.IntConsumer;
import java.util.function.IntPredicate;
-import java.util.function.IntSupplier;
/**
* A common superclass for hash maps and hash sets
@@ -32,6 +31,9 @@ public abstract class Common_hash_support {
// set to true to collect statistics for tuning
// you have to also put a call to showHistogram() at the end of the run
protected static final boolean TUNE = false;
+ private static Common_hash_support tune_instance;
+
+
protected static final int MIN_SIZE = 10; // 10 / .66 =15.15
protected static final int MIN_CAPACITY = 16;
@@ -65,6 +67,7 @@ public abstract class Common_hash_support {
this.loadFactor = factor;
this.initialCapacity = tableSpace(initialSizeBeforeExpanding, factor);
if (TUNE) {
+ tune_instance = this;
histogram = new int[200];
Arrays.fill(histogram, 0);
maxProbe = 0;
@@ -418,11 +421,11 @@ public abstract class Common_hash_support {
protected abstract void copy_to_new_table(int new_capacity, int
old_capacity, CommonCopyOld2New r);
protected void resetHistogram() {
-if (TUNE) {
- histogram = new int[200];
- Arrays.fill(histogram, 0);
- maxProbe = 0;
-}
+//if (TUNE) {
+// histogram = new int[200];
+// Arrays.fill(histogram, 0);
+// maxProbe = 0;
+//}
}
private void updateHistogram(int nbrProbes) {
@@ -457,6 +460,14 @@ public abstract class Common_hash_support {
}
}
+ static {
+if (TUNE) {
+ Runtime.getRuntime().addShutdownHook(new Thread(null, () -> {
+tune_instance.showHistogram();
+ }));
+}
+ }
+
// test case use
int getCapacity() {
return keys_length();
svn commit: r1871286 - in /uima/site/trunk/uima-website: BOARD_REPORT_HOW_TO.txt docs/board-reports/2019-12.txt
Author: schor Date: Thu Dec 12 20:00:46 2019 New Revision: 1871286 URL: http://svn.apache.org/viewvc?rev=1871286=rev Log: no jira - add dec 2019 board report Added: uima/site/trunk/uima-website/BOARD_REPORT_HOW_TO.txt uima/site/trunk/uima-website/docs/board-reports/2019-12.txt Added: uima/site/trunk/uima-website/BOARD_REPORT_HOW_TO.txt URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/BOARD_REPORT_HOW_TO.txt?rev=1871286=auto == --- uima/site/trunk/uima-website/BOARD_REPORT_HOW_TO.txt (added) +++ uima/site/trunk/uima-website/BOARD_REPORT_HOW_TO.txt Thu Dec 12 20:00:46 2019 @@ -0,0 +1 @@ +Collect data using https://reporter.apache.org/wizard/ \ No newline at end of file Added: uima/site/trunk/uima-website/docs/board-reports/2019-12.txt URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/board-reports/2019-12.txt?rev=1871286=auto == --- uima/site/trunk/uima-website/docs/board-reports/2019-12.txt (added) +++ uima/site/trunk/uima-website/docs/board-reports/2019-12.txt Thu Dec 12 20:00:46 2019 @@ -0,0 +1,40 @@ +Board report for Apache UIMA, for December 2019. + +## Description: +Apache UIMA's mission: the creation and maintenance of open-source software +related to the analysis of unstructured data, guided by the UIMA Oasis +Standard. The software provides frameworks, tools and annotators, +facilitating the analysis of unstructured content such as text, audio and +video. + +## Membership Data: +Apache UIMA was founded 2010-03-16 (10 years ago) +There are currently 25 committers and 17 PMC members in this project. +The Committer-to-PMC ratio is roughly 7:5. + +Community changes, past quarter: +- Viorel Morari was added to the PMC on 2019-11-18 +- No new committers. Last addition was Viorel Morari on 2018-09-20. + +## Releases: + +3 releases in last quarter +uimaj-3.1.1 was released on 2019-11-08. +UIMA Ruta 2.8.0 was released on 2019-11-28. +UIMA Ruta 3.0.0 was released on 2019-12-09. + +## Activity: +The uimaj-3.1.1 was the first release of uimaj after +migrating that project from SVN to GIT. + +The Ruta 3.0.0 is the first release of Ruta that +depends on the newer release stream of core uima version 3. + +The uima-cpp subproject was (after many years of +dormancy) upgraded to current levels of C++ compiler tool +chains and associated dependencies; we hope a release will +be forthcoming after some more testing, soon. + +## Community Health: The community continues to be moderately active. + +## Issues: No Board level issues at this time. \ No newline at end of file
[uima-uimaj] branch master updated: [UIMA-6153] improve docs for specifying generic types in select framework, fix some typos too
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 The following commit(s) were added to refs/heads/master by this push: new a9cec9c [UIMA-6153] improve docs for specifying generic types in select framework, fix some typos too a9cec9c is described below commit a9cec9c82819fab09aba43d57a3845ee2dac4f15 Author: Marshall Schor AuthorDate: Wed Dec 4 11:34:20 2019 -0500 [UIMA-6153] improve docs for specifying generic types in select framework, fix some typos too --- .../src/docbook/uv3.select.xml | 63 -- 1 file changed, 46 insertions(+), 17 deletions(-) diff --git a/uima-docbook-v3-users-guide/src/docbook/uv3.select.xml b/uima-docbook-v3-users-guide/src/docbook/uv3.select.xml index 7ab05dd..8d5cb47 100644 --- a/uima-docbook-v3-users-guide/src/docbook/uv3.select.xml +++ b/uima-docbook-v3-users-guide/src/docbook/uv3.select.xml @@ -220,33 +220,62 @@ under the License. There is also a static version of the select method which takes a generically typed index as an argument. + +The best practice is to pass the JCas class representing the type you want, to the select statement. + This enables the generic typing mechanism to be set to that type. In the example below, we use + Token as the type, and fsIterator() just as an example of some terminal form action. + + -// this works +// Best practice, when possible // the generic type for Token is passed as an argument to select FSIteratorToken token_it = cas.select(Token.class).fsIterator(); + + + +A compile-time generic type can be specified after the select, if the class argument form of select +is not used. In these two examples, the generic type is being specified at compile time, explicitly: + +// ... myCas.select(myType).TokenfsIterator() ... +// ... myIndexOversomeType.select().Tokenfurther-operators-of-select-etc + + + +Java 8's type inference doesn't take the generic type past the first object in a build chain, so you can +use these techniques to overcome that. In these examples, tkn_idx is a generically typed variable: + + +FSIndexToken tkn_idx = ... ; // generically typed variable + + -FSIndexToken token_index = ... ; // generically typed +We show a straight-forward syntax that doesn't work, followed by 3 alternatives that do work. + +// this next fails because the Token generic type from the +// index variable being assigned doesn't get passed to the select(). -// this next fails because the -// Token generic type from the index variable being assigned -// doesn't get passed to the select(). -FSIteratorToken token_iterator = token_index.select().fsIterator(); +FSIteratorToken token_iterator = tkn_idx.select().fsIterator(); + + + + You can overcome this in three ways: + + +// pass in the type as an argument to select using the JCas cover type. -// You can overcome this in two ways: -// pass in the type as an argument to select -// using the JCas cover type. FSIteratorToken token_iterator = -token_index.select(Token.class).fsIterator(); +tkn_idx.select(Token.class).fsIterator(); + +// Or use the static form of select (avoids repeating the type info) -// You can also use the static form of select -// to avoid repeating the type information FSIteratorToken token_iterator = -SelectFSs.select(token_index).fsIterator(); +SelectFSs.select(tkn_idx).fsIterator(); + +// Or you can also explicitly set the generic type +// that select() should use, like this: -// Finally, you can also explicitly set the generic type -// that select() should use, like a special kind of type cast, like this: FSIteratorToken token_iterator = -token_index.Tokenselect().fsIterator(); +tkn_idx.Tokenselect().fsIterator(); @@ -255,7 +284,7 @@ FSIteratorToken token_iterator = Any specification of an index may be further restricted to just a subType (including that subtypes subtypes, if any) of that indexs type. - For example, an AnnotationIndex may be specialized to just Sentences (and their subtypes): + For example, an AnnotationIndex may be specialized to just Tokens (and their subtypes): FSIteratorToken token_iterator = annotation_index.select(Token.class).fsIterator();
[uima-uimaj] branch master updated: [UIMA-5536] document in code the Jira this update did
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
The following commit(s) were added to refs/heads/master by this push:
new b196f27 [UIMA-5536] document in code the Jira this update did
b196f27 is described below
commit b196f27b3e2dbaa140261bd7c967847111954d76
Author: Marshall Schor
AuthorDate: Wed Dec 4 10:50:24 2019 -0500
[UIMA-5536] document in code the Jira this update did
---
.../src/main/java/org/apache/uima/cas/impl/SelectFSs_impl.java | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git
a/uimaj-core/src/main/java/org/apache/uima/cas/impl/SelectFSs_impl.java
b/uimaj-core/src/main/java/org/apache/uima/cas/impl/SelectFSs_impl.java
index 690577a..f5a580c 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/SelectFSs_impl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/SelectFSs_impl.java
@@ -112,7 +112,7 @@ public class SelectFSs_impl
implements SelectFSs
private FSList sourceFSList = null; // alternate source
private boolean isTypePriority = false;
-// private boolean isPositionUsesType = false;
+// private boolean isPositionUsesType = false; // REMOVED see
https://issues.apache.org/jira/browse/UIMA-5536
private boolean isSkipSameBeginEndType = false; // for boundsUse only
private boolean isNonOverlapping = IS_UNAMBIGUOUS;
private boolean isIncludeAnnotBeyondBounds = false;
@@ -229,6 +229,7 @@ public class SelectFSs_impl
implements SelectFSs
* boolean operations
*/
+ // REMOVED see https://issues.apache.org/jira/browse/UIMA-5536
// /* (non-Javadoc)
// * @see org.apache.uima.cas.SelectFSs#positionUsesType()
// */
@@ -493,7 +494,7 @@ public class SelectFSs_impl
implements SelectFSs
final boolean isUseAnnotationIndex =
((index != null) && (index instanceof AnnotationIndex)) ||
isNonOverlapping ||
-//isPositionUsesType ||
+//isPositionUsesType || REMOVED see
https://issues.apache.org/jira/browse/UIMA-5536
isTypePriority ||
isIncludeAnnotBeyondBounds ||
boundsUse != BoundsUse.notBounded ||
@@ -502,7 +503,7 @@ public class SelectFSs_impl
implements SelectFSs
if (isUseAnnotationIndex) {
forceAnnotationIndex(); // throws if non-null index not an annotation
index
}
-
+// REMOVED see https://issues.apache.org/jira/browse/UIMA-5536
//if (isTypePriority) {
// isPositionUsesType = true;
//}
@@ -1157,7 +1158,7 @@ public class SelectFSs_impl
implements SelectFSs
* special processing for AnnotationIndex (only):
* - typePriority - use or ignore
* -- ignored: after moveTo(fs), moveToPrevious while begin and end ==
- * --- and if isPositionUsesType types are ==
+ * // REMOVED see https://issues.apache.org/jira/browse/UIMA-5536 ---
and if isPositionUsesType types are ==
* @param it iterator to position
* @return it positioned if needed
*/
[uima-uimaj] branch master updated: [UIMA-6153] add test case for setting in select
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
The following commit(s) were added to refs/heads/master by this push:
new da6e065 [UIMA-6153] add test case for setting in select
da6e065 is described below
commit da6e065e2999be4167233fe87d9a0ebe4343e679
Author: Marshall Schor
AuthorDate: Wed Dec 4 10:28:42 2019 -0500
[UIMA-6153] add test case for setting in select
---
.../apache/uima/cas/impl/SelectFsTestNoJCas.java | 66 ++
.../testTypeSystem_token_sentence_no_jcas.xml | 34 +++
2 files changed, 100 insertions(+)
diff --git
a/uimaj-core/src/test/java/org/apache/uima/cas/impl/SelectFsTestNoJCas.java
b/uimaj-core/src/test/java/org/apache/uima/cas/impl/SelectFsTestNoJCas.java
new file mode 100644
index 000..6c4f765
--- /dev/null
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/impl/SelectFsTestNoJCas.java
@@ -0,0 +1,66 @@
+/*
+ * 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.
+ */
+
+package org.apache.uima.cas.impl;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+
+import org.apache.uima.UIMAFramework;
+import org.apache.uima.cas.FeatureStructure;
+import org.apache.uima.cas.Type;
+import org.apache.uima.jcas.tcas.Annotation;
+import org.apache.uima.resource.metadata.TypeSystemDescription;
+import org.apache.uima.resource.metadata.impl.TypePriorities_impl;
+import org.apache.uima.test.junit_extension.JUnitExtension;
+import org.apache.uima.util.CasCreationUtils;
+import org.apache.uima.util.XMLInputSource;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+// tests without initializing JCas
+public class SelectFsTestNoJCas {
+
+ private static TypeSystemDescription typeSystemDescription;
+
+ static private CASImpl cas;
+
+ static File typeSystemFile1 =
JUnitExtension.getFile("ExampleCas/testTypeSystem_token_sentence_no_jcas.xml");
+
+ @BeforeClass
+ public static void setUpClass() throws Exception {
+typeSystemDescription =
UIMAFramework.getXMLParser().parseTypeSystemDescription(
+new XMLInputSource(typeSystemFile1));
+cas = (CASImpl) CasCreationUtils.createCas(typeSystemDescription, new
TypePriorities_impl(), null);
+ }
+
+
+ @Test
+ public void testOpsNeedingAnnotation() {
+Type type = cas.getTypeSystem().getType("x.y.z.SentenceNoJCas");
+FeatureStructure s = cas.createAnnotation(type, 0, 4);
+cas.indexRepository.addFS(s);
+
+boolean b = cas.select(type).covering(1, 2).map(f
->f.getBegin()).findFirst().isPresent();
+
+assertTrue(b);
+ }
+
+}
diff --git
a/uimaj-core/src/test/resources/ExampleCas/testTypeSystem_token_sentence_no_jcas.xml
b/uimaj-core/src/test/resources/ExampleCas/testTypeSystem_token_sentence_no_jcas.xml
new file mode 100644
index 000..d040203
--- /dev/null
+++
b/uimaj-core/src/test/resources/ExampleCas/testTypeSystem_token_sentence_no_jcas.xml
@@ -0,0 +1,34 @@
+
+
+http://uima.apache.org/resourceSpecifier;>
+
+
+ x.y.z.TokenNoJCas
+
+ uima.tcas.Annotation
+
+
+ x.y.z.SentenceNoJCas
+
+ uima.tcas.Annotation
+
+
+
+
svn commit: r1870516 - in /uima/site/trunk/uima-website: docs/doc-uimaj-cookbook.html docs/index.html xdocs/dev-eclipse-plugin-archiving.xml xdocs/doc-uimaj-cookbook.xml xdocs/index.xml
Author: schor
Date: Wed Nov 27 17:06:18 2019
New Revision: 1870516
URL: http://svn.apache.org/viewvc?rev=1870516=rev
Log:
no jira - replace some http: with https:
Modified:
uima/site/trunk/uima-website/docs/doc-uimaj-cookbook.html
uima/site/trunk/uima-website/docs/index.html
uima/site/trunk/uima-website/xdocs/dev-eclipse-plugin-archiving.xml
uima/site/trunk/uima-website/xdocs/doc-uimaj-cookbook.xml
uima/site/trunk/uima-website/xdocs/index.xml
Modified: uima/site/trunk/uima-website/docs/doc-uimaj-cookbook.html
URL:
http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/doc-uimaj-cookbook.html?rev=1870516=1870515=1870516=diff
==
--- uima/site/trunk/uima-website/docs/doc-uimaj-cookbook.html (original)
+++ uima/site/trunk/uima-website/docs/doc-uimaj-cookbook.html Wed Nov 27
17:06:18 2019
@@ -306,14 +306,14 @@
covering type, then you can stop iterating as soon as the start
position you reach, + the largest span, is less than
the start of the annotation you're trying to cover.
This is used internally in version 3's
- http://uima.apache.org/d/uimaj-current/version_3_users_guide.html#uv3.select.annot.subselect;>select
framework
+ https://uima.apache.org/d/uimaj-current/version_3_users_guide.html#uv3.select.annot.subselect;>select
framework
to speed up
the covering kind of iteration.
There are many other
examples, but the principle is the same: start the iteration "close to" the
right spot,
perhaps moving backwards instead of forwards, and end the iteration
as soon as you can logically say that
no more suitable feature structures would be found.
Use UIMA Version 3's
select framework
-The http://uima.apache.org/d/uimaj-current/version_3_users_guide.html#uv3.select;>select
framework
+The https://uima.apache.org/d/uimaj-current/version_3_users_guide.html#uv3.select;>select
framework
incorporates many of the popular use cases for doing iterations
that we've seen, into a Java friendly approach that
automatically uses optimized iterators and can produce Java
Streams, as well.
@@ -399,11 +399,11 @@
other way around.
To make this work, you need
to specify the type priorities. This is a global setting for your application.
See
-http://uima.apache.org/d/uimaj-current/references.html#ugr.ref.xml.component_descriptor.aes.primitive;>
+https://uima.apache.org/d/uimaj-current/references.html#ugr.ref.xml.component_descriptor.aes.primitive;>
type priorities (scroll down to find it) for
how to specify this.
Avoiding type
priorities
Often, the use of type
priorities gets in the way. With UIMA Version 3, the
-http://uima.apache.org/d/uimaj-current/version_3_users_guide.html#uv3.select;>select
framework
+https://uima.apache.org/d/uimaj-current/version_3_users_guide.html#uv3.select;>select
framework
by default ignores type priorites when doing its operations; but
this can be overridden as needed.
@@ -535,7 +535,7 @@ my_cas.protectIndexes(() - {
The first copying can be
omitted, by moving the logic of what to include into the first iteration, and
producing the second
list directly.
-In UIMA Version 3, you can
make use of the http://uima.apache.org/d/uimaj-current/version_3_users_guide.html#uv3.select;>select
framework.
+In UIMA Version 3, you can
make use of the https://uima.apache.org/d/uimaj-current/version_3_users_guide.html#uv3.select;>select
framework.
It already has many of the use-cases where you
might want to start or exit an iteration, accounted for.
You can also use its ability to produce streams,
and combine that with Java's takeWhile method, to exit a stream early.
Modified: uima/site/trunk/uima-website/docs/index.html
URL:
http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/index.html?rev=1870516=1870515=1870516=diff
svn commit: r1870515 - in /uima/site/trunk/uima-website: docs/index.html xdocs/index.xml
Author: schor Date: Wed Nov 27 15:36:11 2019 New Revision: 1870515 URL: http://svn.apache.org/viewvc?rev=1870515=rev Log: no jira, tweak Modified: uima/site/trunk/uima-website/docs/index.html uima/site/trunk/uima-website/xdocs/index.xml Modified: uima/site/trunk/uima-website/docs/index.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/index.html?rev=1870515=1870514=1870515=diff == --- uima/site/trunk/uima-website/docs/index.html (original) +++ uima/site/trunk/uima-website/docs/index.html Wed Nov 27 15:36:11 2019 @@ -332,8 +332,8 @@ the UIMA Java SDK core. An extensive rule-based scripting language -(RUTA), an associated analysis engine built on top of UIMA, and an Eclipse-based tooling (Workbench) for interactively -developing the rules, is part of this project. +(RUTA), an associated analysis engine built on top of UIMA, and an Eclipse-based tooling workbench for interactively +developing and testing the rules, is part of this project. Additional infrastructure support components include a simple Modified: uima/site/trunk/uima-website/xdocs/index.xml URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/index.xml?rev=1870515=1870514=1870515=diff == --- uima/site/trunk/uima-website/xdocs/index.xml (original) +++ uima/site/trunk/uima-website/xdocs/index.xml Wed Nov 27 15:36:11 2019 @@ -140,8 +140,8 @@ An extensive rule-based scripting language -(RUTA), an associated analysis engine built on top of UIMA, and an Eclipse-based tooling (Workbench) for interactively -developing the rules, is part of this project. +(RUTA), an associated analysis engine built on top of UIMA, and an Eclipse-based tooling workbench for interactively +developing and testing the rules, is part of this project. Additional infrastructure support components include a simple
svn commit: r1870514 - in /uima/site/trunk/uima-website: docs/index.html xdocs/index.xml
Author: schor Date: Wed Nov 27 15:34:00 2019 New Revision: 1870514 URL: http://svn.apache.org/viewvc?rev=1870514=rev Log: no jira, add ref to RUTA at top level description Modified: uima/site/trunk/uima-website/docs/index.html uima/site/trunk/uima-website/xdocs/index.xml Modified: uima/site/trunk/uima-website/docs/index.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/index.html?rev=1870514=1870513=1870514=diff == --- uima/site/trunk/uima-website/docs/index.html (original) +++ uima/site/trunk/uima-website/docs/index.html Wed Nov 27 15:34:00 2019 @@ -331,6 +331,10 @@ https://github.com/apache/uima-uimaj/network/dependents?package_id=UGFja2FnZS0xNzk4MzkxNTI%3D;>900 repositories that have dependencies on the UIMA Java SDK core. +An extensive rule-based scripting language +(RUTA), an associated analysis engine built on top of UIMA, and an Eclipse-based tooling (Workbench) for interactively +developing the rules, is part of this project. + Additional infrastructure support components include a simple server that can receive REST requests and return annotation results, Modified: uima/site/trunk/uima-website/xdocs/index.xml URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/index.xml?rev=1870514=1870513=1870514=diff == --- uima/site/trunk/uima-website/xdocs/index.xml (original) +++ uima/site/trunk/uima-website/xdocs/index.xml Wed Nov 27 15:34:00 2019 @@ -138,7 +138,11 @@ href="https://github.com/apache/uima-uimaj/network/dependents?package_id=UGFja2FnZS0xNzk4MzkxNTI%3D;>900 repositories that have dependencies on the UIMA Java SDK core. - + + An extensive rule-based scripting language +(RUTA), an associated analysis engine built on top of UIMA, and an Eclipse-based tooling (Workbench) for interactively +developing the rules, is part of this project. + Additional infrastructure support components include a simple server that can receive REST requests and return annotation results,
svn commit: r1870513 - in /uima/site/trunk/uima-website: docs/index.html xdocs/index.xml
Author: schor Date: Wed Nov 27 15:17:01 2019 New Revision: 1870513 URL: http://svn.apache.org/viewvc?rev=1870513=rev Log: no jira, for uima home page, remove out-of-date news copy, replace with link to News, add link to > 900 github.com repos depending on uimaj-core. Modified: uima/site/trunk/uima-website/docs/index.html uima/site/trunk/uima-website/xdocs/index.xml Modified: uima/site/trunk/uima-website/docs/index.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/index.html?rev=1870513=1870512=1870513=diff == --- uima/site/trunk/uima-website/docs/index.html (original) +++ uima/site/trunk/uima-website/docs/index.html Wed Nov 27 15:17:01 2019 @@ -327,6 +327,9 @@ their own annotators, or configure and use pre-existing annotators. Some annotators are available as part of this project; others are contained in various repositories on the internet. +GitHub.com lists over +https://github.com/apache/uima-uimaj/network/dependents?package_id=UGFja2FnZS0xNzk4MzkxNTI%3D;>900 repositories that have dependencies on + the UIMA Java SDK core. Additional infrastructure support components include a simple @@ -347,224 +350,7 @@ - - - -26 Apr 2019: Apache UIMA-DUCC 3.0.0 released - - -16 Apr 2019: Apache uimaFIT 3.0.0 released - - -10 Apr 2019: Apache UIMA Java SDK 3.0.2 released - - -24 Feb 2019: Apache UIMA Ruta 2.7.0 released - - - -17 Apr 2018: Apache UIMA-AS 2.10.3 released - - - - -19 Mar 2018: Apache UIMA-DUCC 2.2.2 released - - - -07 Feb 2018: Apache UIMA-AS 2.10.2 released - - - -14 Nov 2017: Apache uimaFIT 2.4.0 released - - -30 Aug 2017: Apache UIMA-DUCC 2.2.1 released - - -24 July 2017: Apache UIMA Ruta 2.6.1 released - - -4 April 2017: Apache UIMA Java SDK 2.10.0 released - - -29 Mar 2017: Apache uimaFIT 2.3.0 released - - -10 Mar 2017: Apache UIMA Ruta 2.6.0 released - - -23 Feb 2017: Apache UIMA-DUCC 2.2.0 released - - -15 Dec 2016: Apache UIMA-AS 2.9.0 released - - -28 Sep 2016: Apache UIMA Ruta 2.5.0 released - - -11 August 2015: Apache UIMA Java SDK 2.9.0 released - - -08 Aug 2016: Apache UIMA-DUCC 2.1.0 released - - -20 May 2016: Apache UIMA-AS 2.8.1 released - - -06 April 2016: Apache uimaFIT 2.2.0 released - - -15 February 2016: Apache UIMA Ruta 2.4.0 released - - -26 October 2015: Apache UIMA DUCC 2.0.1 released - - -25 August 2015: Apache UIMA Ruta 2.3.1 released - - -11 August 2015: Apache UIMA DUCC 2.0.0 released - - -11 August 2015: Apache UIMA Java SDK 2.8.1 released - - -22 July 2015: Apache UIMA Java SDK 2.8.0 released - - -08 June 2015: Apache UIMA Ruta 2.3.0 released - - -06 March 2015: Apache UIMA SDK 2.7.0 released - - -23 October 2014: Apache UIMA DUCC 1.1.0 released - - -23 September 2014: Apache UIMA Ruta 2.2.1 released - - -16 June 2014: Apache UIMA-AS 2.6.0 released - - -12 June 2014: Apache uimaFIT 2.1.0 released - - -12 May 2014: Apache UIMA SDK 2.6.0 released - - -15 April 2014: Apache UIMA Ruta 2.2.0 released - - - -10 April 2014: Upcoming UIMA Workshop at COLING 2014 - - - -30 January 2014: Apache UIMA DUCC 1.0.0 released - - - -14 January 2014: Apache UIMA SDK 2.5.0 released - - -20 September 2013: Apache UIMA Ruta 2.1.0 released - - -31 August 2013: Apache uimaFIT 2.0.0 re
svn commit: r1870390 - in /uima/build/trunk/uima-eclipse-update-site-removing: pom.xml readme.txt saved-pom-parts.xml subsiteMaintenance.xml subsiteSlicing.xml
Author: schor
Date: Mon Nov 25 15:43:11 2019
New Revision: 1870390
URL: http://svn.apache.org/viewvc?rev=1870390=rev
Log:
[UIMA-6157] add utility for removing things from eclipse update sites
Added:
uima/build/trunk/uima-eclipse-update-site-removing/pom.xml
uima/build/trunk/uima-eclipse-update-site-removing/readme.txt
uima/build/trunk/uima-eclipse-update-site-removing/saved-pom-parts.xml
uima/build/trunk/uima-eclipse-update-site-removing/subsiteMaintenance.xml
uima/build/trunk/uima-eclipse-update-site-removing/subsiteSlicing.xml
Added: uima/build/trunk/uima-eclipse-update-site-removing/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/uima-eclipse-update-site-removing/pom.xml?rev=1870390=auto
==
--- uima/build/trunk/uima-eclipse-update-site-removing/pom.xml (added)
+++ uima/build/trunk/uima-eclipse-update-site-removing/pom.xml Mon Nov 25
15:43:11 2019
@@ -0,0 +1,162 @@
+
+
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;>
+ 4.0.0
+
+
+org.apache.uima
+parent-pom
+10
+../parent-pom
+
+
+ uima-eclipse-update-site-maintenance
+ pom
+ 1-SNAPSHOT
+
+ Apache UIMA Eclipse: ${project.artifactId}
+ UIMA Eclipse update site maintenance
+ ${uimaWebsiteUrl}
+
+
+
+
scm:svn:http://svn.apache.org/repos/asf/uima/build/trunk/uima-eclipse-update-site-maintenance
+
+
+
scm:svn:https://svn.apache.org/repos/asf/uima/build/trunk/uima-eclipse-update-site-maintenance
+
+
+
http://svn.apache.org/viewvc/uima/build/trunk/uima-eclipse-update-site-maintenance
+
+
+
+
+uimaj
+${project.artifactId}
+https://dist.apache.org/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+slice
+
+
${project.build.directory}/eclipse-update-site
+ ${eclipseUpdateSite}/${subsite}
+
+
+
+
+
+ maven-antrun-plugin
+
+
+ SliceSubsite
+ test
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ run
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Added: uima/build/trunk/uima-eclipse-update-site-removing/readme.txt
URL:
http://svn.apache.org/viewvc/uima/build/trunk/uima-eclipse-update-site-removing/readme.txt?rev=1870390=auto
==
--- uima/build/trunk/uima-eclipse-update-site-removing/readme.txt (added)
+++ uima/build/trunk/uima-eclipse-update-site-removing/readme.txt Mon Nov 25
15:43:11 2019
@@ -0,0 +1,32 @@
+How to maintain the UIMA Eclipse update site
+
+The Eclipse update site is a composite update site. The top level has
subsites for
+
svn commit: r1870384 - in /uima/build/trunk/uima-eclipse-composite-update-site: buildCompositeRepository.xml pom.xml readme.txt signEclipseUpdateSite.sh verifySigsEclipseUpdateSite.sh
Author: schor
Date: Mon Nov 25 15:21:44 2019
New Revision: 1870384
URL: http://svn.apache.org/viewvc?rev=1870384=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=1870383=1870384=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 @@
starting ${basedir}
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
-
+
done
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=1870383=1870384=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 @@
org.apache.uima
parent-pom
-10
+11
../parent-pom
@@ -50,7 +50,7 @@
uimaj
${project.artifactId}
-
${project.build.directory}/eclipse-update-site
+
${project.build.directory}/eclipse-update-site-v3
https://dist.apache.org/
@@ -83,19 +83,22 @@
-!
+
+
+
-copying svn dist release to dev for eclipse composite
update site version ${project.version}
+
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=1870383=1870384=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=1870383=1870384=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
r
svn commit: r1870197 - in /uima/site/trunk/uima-website: docs/doc-uimaj-cookbook.html xdocs/doc-uimaj-cookbook.xml
Author: schor
Date: Fri Nov 22 22:36:04 2019
New Revision: 1870197
URL: http://svn.apache.org/viewvc?rev=1870197=rev
Log:
no jira add alternative overlap impl allowing abutting
Modified:
uima/site/trunk/uima-website/docs/doc-uimaj-cookbook.html
uima/site/trunk/uima-website/xdocs/doc-uimaj-cookbook.xml
Modified: uima/site/trunk/uima-website/docs/doc-uimaj-cookbook.html
URL:
http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/doc-uimaj-cookbook.html?rev=1870197=1870196=1870197=diff
==
--- uima/site/trunk/uima-website/docs/doc-uimaj-cookbook.html (original)
+++ uima/site/trunk/uima-website/docs/doc-uimaj-cookbook.html Fri Nov 22
22:36:04 2019
@@ -425,7 +425,7 @@
a != null b !=
null// null check
a.getBegin() = b.getBegin() // a starts before (or equal to) b
a.getEnd() = b.getEnd()// a ends after (or equal to) b
-a and b overlap (have at
least one char in common)
+a and b overlap (have at
least one char position in common)
// ((omitted) check for non-null)
if (a.getBegin() = b.getBegin()) { // if a starts before (or equal to) b
@@ -433,6 +433,16 @@ if (a.getBegin() = b.getBegin()) { /
} else {// otherwise, b's begin is before a's begin
return b.getEnd() a.getBegin(); // so it overlaps if b's end is after
a's begin.
+
+ An alternative, where overlap includes the edge case when the
annotations just touch each other, but have no char position in common:
+
+
+ // ((omitted) check for non-null)
+if (a.getBegin() = b.getBegin()) { // if a starts before (or equal to) b
+ return a.getEnd() = b.getBegin(); // then it overlaps or abuts if a's
end is after or equal to b's begin
+} else { // otherwise, b's begin is before a's
begin
+ return b.getEnd() = a.getBegin(); // so it overlaps or abuts if b's end
is after or equal to a's begin.
+
Modified: uima/site/trunk/uima-website/xdocs/doc-uimaj-cookbook.xml
URL:
http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/doc-uimaj-cookbook.xml?rev=1870197=1870196=1870197=diff
==
--- uima/site/trunk/uima-website/xdocs/doc-uimaj-cookbook.xml (original)
+++ uima/site/trunk/uima-website/xdocs/doc-uimaj-cookbook.xml Fri Nov 22
22:36:04 2019
@@ -169,14 +169,24 @@
a.getBegin() = b.getBegin() // a starts before (or equal to) b
a.getEnd() = b.getEnd()// a ends after (or equal to) b
-a and b overlap (have at least one char in common)
+a and b overlap (have at least one char position in common)
// ((omitted) check for non-null)
if (a.getBegin() = b.getBegin()) { // if a starts before (or equal to) b
return a.getEnd() b.getBegin(); // then it overlaps if a's end is after
b's begin
} else {// otherwise, b's begin is before a's begin
return b.getEnd() a.getBegin(); // so it overlaps if b's end is after
a's begin.
-
+
+
+ An alternative, where overlap includes the edge case when the
annotations just touch each other, but have no char position in common:
+
+
+ // ((omitted) check for non-null)
+if (a.getBegin() = b.getBegin()) { // if a starts before (or equal to) b
+ return a.getEnd() = b.getBegin(); // then it overlaps or abuts if a's
end is after or equal to b's begin
+} else { // otherwise, b's begin is before a's
begin
+ return b.getEnd() = a.getBegin(); // so it overlaps or abuts if b's end
is after or equal to a's begin.
+
svn commit: r1870196 - in /uima/site/trunk/uima-website: docs/doc-uimaj-cookbook.html xdocs/doc-uimaj-cookbook.xml
Author: schor Date: Fri Nov 22 21:26:51 2019 New Revision: 1870196 URL: http://svn.apache.org/viewvc?rev=1870196=rev Log: no jira - reformat slightly Modified: uima/site/trunk/uima-website/docs/doc-uimaj-cookbook.html uima/site/trunk/uima-website/xdocs/doc-uimaj-cookbook.xml Modified: uima/site/trunk/uima-website/docs/doc-uimaj-cookbook.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/doc-uimaj-cookbook.html?rev=1870196=1870195=1870196=diff == --- uima/site/trunk/uima-website/docs/doc-uimaj-cookbook.html (original) +++ uima/site/trunk/uima-website/docs/doc-uimaj-cookbook.html Fri Nov 22 21:26:51 2019 @@ -357,15 +357,23 @@ Annotations may not be the appropriate supertype for your types, because they're designed for things having a linear begin / end meaningful demarcations. You can have your feature structures inherit from TOP, or from some other appropriate supertype, other -than Annotation. E.g. if you want to define a new kind of annotation (e.g. a rectangular - region if your subject of analysis is an image), inherit from AnnotationBase. Types which - inherit from AnnotationBase are bound to a particular subject of analysis (aka view). - If you have any information which is not directly related to a subject of analysis +than Annotation. + + For example, if you want to define a new kind of annotation (e.g. a rectangular + region if your subject of analysis is an image), + you should write a new type which inherits from AnnotationBase. Types which + inherit from AnnotationBase are bound to a particular subject of analysis (aka view). + + On the other hand, if you have information which is not directly related to a subject of analysis (e.g. a Date type with day/month/year fields which would be used as a value rather - than as an annotation) then consider inheriting from TOP instead. Mind that it is also - not necessary to add all feature structures/annotations to the indexes. E.g. if the + than as an annotation) then consider inheriting from TOP instead. + + It is also + not necessary to add all feature structures or annotations to the indexes. For example, if the Date type just described is used as a feature value, it may well be sufficient to be - able to reach it through the feature. + able to reach it through the feature. + + Making use of the built-in Annotation index Annotations are special in UIMA in that there is a "built-in" index, the AnnotationIndex, which can be used to rapidly access these in a sorted order. The ordering is by begin (ascending), then by Modified: uima/site/trunk/uima-website/xdocs/doc-uimaj-cookbook.xml URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/doc-uimaj-cookbook.xml?rev=1870196=1870195=1870196=diff == --- uima/site/trunk/uima-website/xdocs/doc-uimaj-cookbook.xml (original) +++ uima/site/trunk/uima-website/xdocs/doc-uimaj-cookbook.xml Fri Nov 22 21:26:51 2019 @@ -116,15 +116,24 @@ Annotations may not be the appropriate supertype for your types, because they're designed for things having a linear begin / end meaningful demarcations. You can have your feature structures inherit from TOP, or from some other appropriate supertype, other -than Annotation. E.g. if you want to define a new kind of annotation (e.g. a rectangular - region if your subject of analysis is an image), inherit from AnnotationBase. Types which - inherit from AnnotationBase are bound to a particular subject of analysis (aka view). - If you have any information which is not directly related to a subject of analysis +than Annotation. + + For example, if you want to define a new kind of annotation (e.g. a rectangular + region if your subject of analysis is an image), + you should write a new type which inherits from AnnotationBase. Types which + inherit from AnnotationBase are bound to a particular subject of analysis
svn commit: r1870169 - in /uima/site/trunk/uima-website: docs/doc-uimaj-cookbook.html xdocs/doc-uimaj-cookbook.xml
Author: schor Date: Fri Nov 22 15:41:46 2019 New Revision: 1870169 URL: http://svn.apache.org/viewvc?rev=1870169=rev Log: no jira add subsection toc to first part Modified: uima/site/trunk/uima-website/docs/doc-uimaj-cookbook.html uima/site/trunk/uima-website/xdocs/doc-uimaj-cookbook.xml Modified: uima/site/trunk/uima-website/docs/doc-uimaj-cookbook.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/doc-uimaj-cookbook.html?rev=1870169=1870168=1870169=diff == --- uima/site/trunk/uima-website/docs/doc-uimaj-cookbook.html (original) +++ uima/site/trunk/uima-website/docs/doc-uimaj-cookbook.html Fri Nov 22 15:41:46 2019 @@ -232,7 +232,17 @@ -These work with all kinds of Feature Structures, Annotations and non-Annotations, both. + + + Remove all Feature Structures of a particular type + + + + General suggestions: working with iterators + + + + These work with all kinds of Feature Structures, Annotations and non-Annotations, both. Modified: uima/site/trunk/uima-website/xdocs/doc-uimaj-cookbook.xml URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/doc-uimaj-cookbook.xml?rev=1870169=1870168=1870169=diff == --- uima/site/trunk/uima-website/xdocs/doc-uimaj-cookbook.xml (original) +++ uima/site/trunk/uima-website/xdocs/doc-uimaj-cookbook.xml Fri Nov 22 15:41:46 2019 @@ -31,6 +31,9 @@ + + + These work with all kinds of Feature Structures, Annotations and non-Annotations, both.
svn commit: r1870168 - in /uima/site/trunk/uima-website: docs/doc-uimaj-cookbook.html xdocs/doc-uimaj-cookbook.xml
Author: schor Date: Fri Nov 22 15:35:42 2019 New Revision: 1870168 URL: http://svn.apache.org/viewvc?rev=1870168=rev Log: no jira, clarify one item Modified: uima/site/trunk/uima-website/docs/doc-uimaj-cookbook.html uima/site/trunk/uima-website/xdocs/doc-uimaj-cookbook.xml Modified: uima/site/trunk/uima-website/docs/doc-uimaj-cookbook.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/doc-uimaj-cookbook.html?rev=1870168=1870167=1870168=diff == --- uima/site/trunk/uima-website/docs/doc-uimaj-cookbook.html (original) +++ uima/site/trunk/uima-website/docs/doc-uimaj-cookbook.html Fri Nov 22 15:35:42 2019 @@ -354,7 +354,7 @@ end (descending), and then by type-priorities. This is really a set of indexes, one for each subtype of Annotation. Although the index has type-priorities, in UIMA v3, the select-framework - by default ignores these; this behavior can be overridden. + by default ignores these; this behavior can be overridden on an as-needed basis. Modified: uima/site/trunk/uima-website/xdocs/doc-uimaj-cookbook.xml URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/doc-uimaj-cookbook.xml?rev=1870168=1870167=1870168=diff == --- uima/site/trunk/uima-website/xdocs/doc-uimaj-cookbook.xml (original) +++ uima/site/trunk/uima-website/xdocs/doc-uimaj-cookbook.xml Fri Nov 22 15:35:42 2019 @@ -121,7 +121,7 @@ end (descending), and then by type-priorities. This is really a set of indexes, one for each subtype of Annotation. Although the index has type-priorities, in UIMA v3, the select-framework - by default ignores these; this behavior can be overridden. + by default ignores these; this behavior can be overridden on an as-needed basis. When 2 annotations have the same start and end, but different types, then one comes before the other,
svn commit: r1870167 - in /uima/site/trunk/uima-website: docs/documentation.html xdocs/documentation.xml
Author: schor Date: Fri Nov 22 15:34:03 2019 New Revision: 1870167 URL: http://svn.apache.org/viewvc?rev=1870167=rev Log: no jira, fix broken link Modified: uima/site/trunk/uima-website/docs/documentation.html uima/site/trunk/uima-website/xdocs/documentation.xml Modified: uima/site/trunk/uima-website/docs/documentation.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/documentation.html?rev=1870167=1870166=1870167=diff == --- uima/site/trunk/uima-website/docs/documentation.html (original) +++ uima/site/trunk/uima-website/docs/documentation.html Fri Nov 22 15:34:03 2019 @@ -424,7 +424,7 @@ For UIMA beginners that want to develop their first UIMA analysis component using eclipse. - Getting Started: A UIMA Java cookbook + Getting Started: A UIMA Java cookbook Here's a cookbook of some tips and useful things, for writing UIMA annotators in Java. Modified: uima/site/trunk/uima-website/xdocs/documentation.xml URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/documentation.xml?rev=1870167=1870166=1870167=diff == --- uima/site/trunk/uima-website/xdocs/documentation.xml (original) +++ uima/site/trunk/uima-website/xdocs/documentation.xml Fri Nov 22 15:34:03 2019 @@ -161,7 +161,7 @@ For UIMA beginners that want to develop their first UIMA analysis component using eclipse. - Getting Started: A UIMA Java cookbook + Getting Started: A UIMA Java cookbook Here's a cookbook of some tips and useful things, for writing UIMA annotators in Java.
svn commit: r1870166 - in /uima/site/trunk/uima-website: docs/documentation.html xdocs/documentation.xml
Author: schor Date: Fri Nov 22 15:32:55 2019 New Revision: 1870166 URL: http://svn.apache.org/viewvc?rev=1870166=rev Log: no jira, link in cookbook to uima docs Modified: uima/site/trunk/uima-website/docs/documentation.html uima/site/trunk/uima-website/xdocs/documentation.xml Modified: uima/site/trunk/uima-website/docs/documentation.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/documentation.html?rev=1870166=1870165=1870166=diff == --- uima/site/trunk/uima-website/docs/documentation.html (original) +++ uima/site/trunk/uima-website/docs/documentation.html Fri Nov 22 15:32:55 2019 @@ -424,6 +424,10 @@ For UIMA beginners that want to develop their first UIMA analysis component using eclipse. + Getting Started: A UIMA Java cookbook +Here's a cookbook of some tips and useful things, for writing UIMA annotators in Java. + + Getting Started: Working With PEARs For UIMA users who want to know what a UIMA PEAR package is, how to generate them and how to use them within UIMA applications. Modified: uima/site/trunk/uima-website/xdocs/documentation.xml URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/documentation.xml?rev=1870166=1870165=1870166=diff == --- uima/site/trunk/uima-website/xdocs/documentation.xml (original) +++ uima/site/trunk/uima-website/xdocs/documentation.xml Fri Nov 22 15:32:55 2019 @@ -161,6 +161,10 @@ For UIMA beginners that want to develop their first UIMA analysis component using eclipse. + Getting Started: A UIMA Java cookbook +Here's a cookbook of some tips and useful things, for writing UIMA annotators in Java. + + Getting Started: Working With PEARs For UIMA users who want to know what a UIMA PEAR package is, how to generate them and how to use them within UIMA applications.
svn propchange: r1870165 - svn:log
Author: schor Revision: 1870165 Modified property: svn:log Modified: svn:log at Fri Nov 22 15:30:06 2019 -- --- svn:log (original) +++ svn:log Fri Nov 22 15:30:06 2019 @@ -1 +1 @@ -no Jira, add a +no Jira, add a new doc on uima java "cookbook" items
svn commit: r1870165 - in /uima/site/trunk/uima-website: docs/doc-uimaj-cookbook.html xdocs/doc-uimaj-cookbook.xml
Author: schor Date: Fri Nov 22 15:29:22 2019 New Revision: 1870165 URL: http://svn.apache.org/viewvc?rev=1870165=rev Log: no Jira, add a Added: uima/site/trunk/uima-website/docs/doc-uimaj-cookbook.html uima/site/trunk/uima-website/xdocs/doc-uimaj-cookbook.xml Added: uima/site/trunk/uima-website/docs/doc-uimaj-cookbook.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/doc-uimaj-cookbook.html?rev=1870165=auto == --- uima/site/trunk/uima-website/docs/doc-uimaj-cookbook.html (added) +++ uima/site/trunk/uima-website/docs/doc-uimaj-cookbook.html Fri Nov 22 15:29:22 2019 @@ -0,0 +1,536 @@ +https://www.w3.org/TR/html4/loose.dtd;> + + + + + + + + +@import "stylesheets/base.css"; + + + + + +Apache UIMA - Cookbook: addressing some typical use-cases + + + + + + + + + + + + + + + + + + + + + + + + Cookbook: addressing some typical use-cases + + + https://www.apache.org;> + + + + + + + + + + + https://www.google.com/search;> +Search the site + +https://uima.apache.org/; /> + + + + + + + + + + + + + + + + General + + +Home + +Downloads + +Documentation + +News + +Publications + + +https://issues.apache.org/jira/browse/uima; target="_blank" rel="noopener">Issue tracker + +https://cwiki.apache.org/confluence/display/UIMA/; target="_blank" rel="noopener">Wiki + + +https://cwiki.apache.org/confluence/display/UIMA/Powered+by+Apache+UIMA; target="_blank" rel="noopener">Powered By UIMA + + + + Community + + +Get Involved + +Mailing Lists + +Contribution Policies + +FAQ + +Project Guidelines + + + + Scaleout Frameworks + + +UIMA-AS + +UIMA-DUCC + +..Demo Page + +http://uima-ducc-demo.apache.org:42133; target="_blank" rel="noopener">..Demo Live + + + + Components & Tools + + +Annotators + +Tools & Servers + +Addons and Sandbox + +UIMA Ruta + +uimaFIT + +External Resources + + + + Development + + +Quick Start: building + +Building from Source + +One-time setups + +Source Code + +Creating a Distribution + +Doing a UIMA release + +
svn commit: r1869854 - in /uima/site/trunk/uima-website: docs/git-conventions.html docs/news.html xdocs/git-conventions.xml xdocs/news.xml
Author: schor Date: Fri Nov 15 14:44:17 2019 New Revision: 1869854 URL: http://svn.apache.org/viewvc?rev=1869854=rev Log: no Jira, update the news for the 3.1.1 release (oops should have done this sooner), and clarify some GIT conventions for releasing Modified: uima/site/trunk/uima-website/docs/git-conventions.html uima/site/trunk/uima-website/docs/news.html uima/site/trunk/uima-website/xdocs/git-conventions.xml uima/site/trunk/uima-website/xdocs/news.xml Modified: uima/site/trunk/uima-website/docs/git-conventions.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/git-conventions.html?rev=1869854=1869853=1869854=diff == --- uima/site/trunk/uima-website/docs/git-conventions.html (original) +++ uima/site/trunk/uima-website/docs/git-conventions.html Fri Nov 15 14:44:17 2019 @@ -252,7 +252,15 @@ After merging into master, the branch is typically deleted. Branches for releasing - These are typically named rc/uimaX-x.y.z. + When you are about to make a release, you typically will create a branch for the release; this branch + will be checked out and the maven release prepare / perform will run on it, and in the process create + commits to the branch updating the various "versions", first by removing the -SNAPSHOT, and then by updating them + to the next SNAPSHOT version. + +The maven release prepare/perform operations include "pushing" to the remote. + + + The branches used for the release work are typically named rc/uimaX-x.y.z. (rc stands for Release Candidate). See git-release-notes.hmtl. Modified: uima/site/trunk/uima-website/docs/news.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/news.html?rev=1869854=1869853=1869854=diff == --- uima/site/trunk/uima-website/docs/news.html (original) +++ uima/site/trunk/uima-website/docs/news.html Fri Nov 15 14:44:17 2019 @@ -234,6 +234,13 @@ + 08 Nov 2019 + + Apache UIMA Java SDK 3.1.1 released + + + + 15 Aug 2019 Apache UIMA Java SDK 3.1.0 released @@ -784,6 +791,33 @@ + + +08 Nov 2019 + Apache UIMA Java SDK 3.1.1 released + + + + + +UIMA Java SDK 3.1.1 is in the 3.x.x series of core Java UIMA SDK; see the news for 3.0.0 for important + information about migrating from 2.x.x versions of UIMA. + +Changes include: + Build updates to build from the GIT repositories, after the uimaj project's SCM was moved +from SVN to GitHub. +Fixed a performance issue when running with 100's of CASes using the same type system. + + +Please see the + the complete list of issues fixed for more details of the changes. + + + + + + + 15 Aug 2019 Modified: uima/site/trunk/uima-website/xdocs/git-conventions.xml URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/git-conventions.xml?rev=1869854=1869853=1869854=diff == --- uima/site/trunk/uima-website/xdocs/git-conventions.xml (original) +++ uima/site/trunk/uima-website/xdocs/git-conventions.xml Fri Nov 15 14:44:17 2019 @@ -58,7 +58,15 @@ under the License. Branches for releasing - These are typically named rc/uimaX-x.y.z. + When you are about to make a release, you typically will create a branch for the release; this branch + will be checked out and the maven release prepare / perform will run on it, and in the process create + commits to the branch updating the various "versions", first by removing the -SNAPSHOT, and then by updating them + to the next SNAPSHOT version. + + The maven release prepare/perform operations include "pushing" to the remote. + + + The branches used for the release work are typically named rc/uimaX-x.y.z. (rc stands for Release Candidate). See git-release-notes.hmtl. Modified: uima/site/trun
[uima-uimaj] annotated tag rel/uimaj-3.1.1 updated (35ae2c8 -> 119ef71)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to annotated tag rel/uimaj-3.1.1 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. *** WARNING: tag rel/uimaj-3.1.1 was modified! *** from 35ae2c8 (commit) to 119ef71 (tag) tagging 35ae2c876783d4a94b0e059300dc4a47af334b71 (commit) by Marshall Schor on Fri Nov 8 10:38:34 2019 -0500 - Log - uimaj-3.1.1 rc2 released --- No new revisions were added by this update. Summary of changes:
svn commit: r1869573 - in /uima/site/trunk/uima-website: docs/downloads.html xdocs/downloads.xml xdocs/stylesheets/project.xml
Author: schor Date: Fri Nov 8 15:29:12 2019 New Revision: 1869573 URL: http://svn.apache.org/viewvc?rev=1869573=rev Log: update downloads for uimaj 3.1.1 Modified: uima/site/trunk/uima-website/docs/downloads.html uima/site/trunk/uima-website/xdocs/downloads.xml uima/site/trunk/uima-website/xdocs/stylesheets/project.xml Modified: uima/site/trunk/uima-website/docs/downloads.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/downloads.html?rev=1869573=1869572=1869573=diff == --- uima/site/trunk/uima-website/docs/downloads.html (original) +++ uima/site/trunk/uima-website/docs/downloads.html Fri Nov 8 15:29:12 2019 @@ -360,8 +360,8 @@ Other mirrors: - -Apache UIMA Version 3.1.0 + +Apache UIMA Version 3.1.1 @@ -373,11 +373,11 @@ Other mirrors: The JCas implementation changed, and JCas classes (if used) will need to be migrated. The V3 users guide describes a migration tool to aid in this process. There are many new features, described in - https://uima.apache.org/d/uimaj-3.1.0/version_3_users_guide.html#uv3.overview.new;> + https://uima.apache.org/d/uimaj-3.1.1/version_3_users_guide.html#uv3.overview.new;> this overview. For more details, please see the documentation for version 3, which can be found - https://uima.apache.org/d/uimaj-3.1.0/version_3_users_guide.html;>here. + https://uima.apache.org/d/uimaj-3.1.1/version_3_users_guide.html;>here. Changes since the beta version are listed in the - Release Notes. + Release Notes. Version 3 also has updated Eclipse plugin tooling, available at https://www.apache.org/dist/uima/eclipse-update-site-v3;> @@ -409,43 +409,43 @@ Other mirrors: - + UIMA Java framework & SDK -html +html - zip - [asc] + zip + [asc] - [sha512] + [sha512] - tar.gz - [asc] + tar.gz + [asc] - [sha512] + [sha512] - zip - [asc] + zip + [asc] - [sha512] + [sha512] - 15-Aug-2019 + 08-Nov-2019 @@ -477,6 +477,7 @@ Other mirrors: + @@ -574,6 +575,7 @@ Other mirrors: + @@ -680,6 +682,7 @@ Other mirrors: + @@ -688,8 +691,8 @@ Other mirrors: - -Apache UIMA Version 3.0.2 + +Apache UIMA uimaFIT @@ -704,60 +707,6 @@ Other mirrors: - - - Artifact - Release Notes - Binary - Source - Release Date - - - - - - - - UIMA Java framework & SDK - - -html - - - - - zip - [asc] - - - [sha512] - - - tar.gz - [asc] - - - [sha512] - - - - - - - zip - [asc] - - - [sha512] - - - - - 10-Apr-2019 - - - - @@ -782,28 +731,6 @@ Other mirrors: - - - - - - - - - - - -Apache UIMA DUCC Version 2.2.2 - - - - - - - - - - Artifact @@ -817,146 +744,86 @@ Other mirrors: - - UIMA DUCC + +
svn commit: r1869571 - in /uima/site/trunk/uima-website/docs/d/uimaj-current: ./ apidocs/ apidocs/org/ apidocs/org/apache/ apidocs/org/apache/uima/ apidocs/org/apache/uima/analysis_component/ apidocs/
Author: schor Date: Fri Nov 8 15:07:28 2019 New Revision: 1869571 URL: http://svn.apache.org/viewvc?rev=1869571=rev Log: uimaj-3.1.1 docs -current release [This commit notification would consist of 269 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
svn commit: r1869570 - in /uima/site/trunk/uima-website: docs/ docs/d/uimaj-3.1.1/ docs/d/uimaj-3.1.1/apidocs/ docs/d/uimaj-3.1.1/apidocs/org/ docs/d/uimaj-3.1.1/apidocs/org/apache/ docs/d/uimaj-3.1.1
Author: schor Date: Fri Nov 8 15:03:23 2019 New Revision: 1869570 URL: http://svn.apache.org/viewvc?rev=1869570=rev Log: uimaj-3.1.1 docs [This commit notification would consist of 268 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
svn commit: r36678 - in /release/uima/eclipse-update-site-v3/uimaj: ./ features/ plugins/
Author: schor Date: Fri Nov 8 14:27:14 2019 New Revision: 36678 Log: update eclipse v3 site for release 3.1.1 after vote passes Added: release/uima/eclipse-update-site-v3/uimaj/features/org.apache.uima.runtime_3.1.1.jar (with props) release/uima/eclipse-update-site-v3/uimaj/features/org.apache.uima.runtime_3.1.1.jar.asc release/uima/eclipse-update-site-v3/uimaj/features/org.apache.uima.runtime_3.1.1.jar.sha512 release/uima/eclipse-update-site-v3/uimaj/features/org.apache.uima.tools_3.1.1.jar (with props) release/uima/eclipse-update-site-v3/uimaj/features/org.apache.uima.tools_3.1.1.jar.asc release/uima/eclipse-update-site-v3/uimaj/features/org.apache.uima.tools_3.1.1.jar.sha512 release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.caseditor.ide_3.1.1.jar (with props) release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.caseditor.ide_3.1.1.jar.asc release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.caseditor.ide_3.1.1.jar.pack.gz (with props) release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.caseditor.ide_3.1.1.jar.pack.gz.asc release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.caseditor.ide_3.1.1.jar.pack.gz.sha512 release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.caseditor.ide_3.1.1.jar.sha512 release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.caseditor_3.1.1.jar (with props) release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.caseditor_3.1.1.jar.asc release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.caseditor_3.1.1.jar.pack.gz (with props) release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.caseditor_3.1.1.jar.pack.gz.asc release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.caseditor_3.1.1.jar.pack.gz.sha512 release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.caseditor_3.1.1.jar.sha512 release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.debug_3.1.1.jar (with props) release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.debug_3.1.1.jar.asc release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.debug_3.1.1.jar.pack.gz (with props) release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.debug_3.1.1.jar.pack.gz.asc release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.debug_3.1.1.jar.pack.gz.sha512 release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.debug_3.1.1.jar.sha512 release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.desceditor_3.1.1.jar (with props) release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.desceditor_3.1.1.jar.asc release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.desceditor_3.1.1.jar.pack.gz (with props) release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.desceditor_3.1.1.jar.pack.gz.asc release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.desceditor_3.1.1.jar.pack.gz.sha512 release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.desceditor_3.1.1.jar.sha512 release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.jcas.jcasgenp_3.1.1.jar (with props) release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.jcas.jcasgenp_3.1.1.jar.asc release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.jcas.jcasgenp_3.1.1.jar.pack.gz (with props) release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.jcas.jcasgenp_3.1.1.jar.pack.gz.asc release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.jcas.jcasgenp_3.1.1.jar.pack.gz.sha512 release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.jcas.jcasgenp_3.1.1.jar.sha512 release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.launcher_3.1.1.jar (with props) release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.launcher_3.1.1.jar.asc release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.launcher_3.1.1.jar.pack.gz (with props) release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.launcher_3.1.1.jar.pack.gz.asc release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.launcher_3.1.1.jar.pack.gz.sha512 release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.launcher_3.1.1.jar.sha512 release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.pear_3.1.1.jar (with props) release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.pear_3.1.1.jar.asc release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.pear_3.1.1.jar.pack.gz (with props) release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.pear_3.1.1.jar.pack.gz.asc release/uima/eclipse-update-site-v3/uimaj/plugins/org.apache.uima.pear_3.1.1.jar.pack.gz.sha512
svn commit: r36677 - /release/uima/uimaj-3.1.1/
Author: schor Date: Fri Nov 8 14:24:08 2019 New Revision: 36677 Log: release uimaj-3.1.1 Added: release/uima/uimaj-3.1.1/ - copied from r36676, dev/uima/uimaj/3.1.1-rc2/artifacts/
svn commit: r1869523 - in /uima/site/trunk/uima-website: docs/git-notes.html xdocs/git-notes.xml
Author: schor Date: Thu Nov 7 22:18:59 2019 New Revision: 1869523 URL: http://svn.apache.org/viewvc?rev=1869523=rev Log: no jira add ref to git repo config yaml file Modified: uima/site/trunk/uima-website/docs/git-notes.html uima/site/trunk/uima-website/xdocs/git-notes.xml Modified: uima/site/trunk/uima-website/docs/git-notes.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/git-notes.html?rev=1869523=1869522=1869523=diff == --- uima/site/trunk/uima-website/docs/git-notes.html (original) +++ uima/site/trunk/uima-website/docs/git-notes.html Thu Nov 7 22:18:59 2019 @@ -226,6 +226,22 @@ +Configuring some aspects of Git Repo + + + +You may create a special file in a branch, at the top level, named + .asf.yaml which controls some automation at Apache. +For some settings, this file must be in the "master" branch. +See https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories;>this page +for details. + + + + + + + Frequently used git actions Modified: uima/site/trunk/uima-website/xdocs/git-notes.xml URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/git-notes.xml?rev=1869523=1869522=1869523=diff == --- uima/site/trunk/uima-website/xdocs/git-notes.xml (original) +++ uima/site/trunk/uima-website/xdocs/git-notes.xml Thu Nov 7 22:18:59 2019 @@ -25,6 +25,19 @@ under the License. + + + + You may create a special file in a branch, at the top level, named + .asf.yaml which controls some automation at Apache. + + For some settings, this file must be in the "master" branch. + + See https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories;>this page +for details. + + Working with two branches in one repo
[uima-uimaj] branch master-v2 updated: [UIMA-6146] remove from package.html, java 13 javadoc complains
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch master-v2 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git The following commit(s) were added to refs/heads/master-v2 by this push: new 7eaaa25 [UIMA-6146] remove from package.html, java 13 javadoc complains 7eaaa25 is described below commit 7eaaa25714a24c52a52ab6039b28461a798c5c9a Author: Marshall Schor AuthorDate: Wed Nov 6 13:21:54 2019 -0500 [UIMA-6146] remove from package.html, java 13 javadoc complains --- uimaj-core/src/main/java/org/apache/uima/cas/impl/package.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/package.html b/uimaj-core/src/main/java/org/apache/uima/cas/impl/package.html index 50e73f0..d5ce62d 100644 --- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/package.html +++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/package.html @@ -31,7 +31,7 @@ Implementation and Low-Level API for the CAS Interfaces. Internal APIs. Use these APIs at your own risk. APIs in this package are subject to change without notice, even in minor releases. Use of this package is not supported. If you think you have found a bug in this package, please try to reproduce it with the officially supported APIs before reporting it. -Internals documentation +Internals documentation NOTE: This documentation is plain HTML, generated from a WYSIWIG editor "tinymce". The way to work on this: after setting up a small web page with the tinymce (running from a local file), use the Tools - source code to cut/paste between this file's source and that editor. Java Cover Objects It is possible to run UIMA without creating Java cover objects for FSs. However, for convenience, many of the APIs return Java objects that provide, in turn, various APIs for accessing features, updating in indexes, etc.
[uima-uimaj] branch master updated: [UIMA-6146] remove from package.html, java 13 javadoc complains
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 The following commit(s) were added to refs/heads/master by this push: new 4e80a5f [UIMA-6146] remove from package.html, java 13 javadoc complains 4e80a5f is described below commit 4e80a5f1dc941cf6c6a0225a9a174b990890bfc4 Author: Marshall Schor AuthorDate: Wed Nov 6 10:57:42 2019 -0500 [UIMA-6146] remove from package.html, java 13 javadoc complains --- .../src/main/java/org/apache/uima/cas/impl/package.html | 10 +- uimaj-core/src/main/java/org/apache/uima/cas/package.html | 10 +- .../src/main/java/org/apache/uima/impl/package.html | 2 +- uimaj-core/src/main/java/org/apache/uima/package.html | 2 +- .../main/java/org/apache/uima/tools/jcasgen/package.html | 15 ++- 5 files changed, 18 insertions(+), 21 deletions(-) diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/package.html b/uimaj-core/src/main/java/org/apache/uima/cas/impl/package.html index 1ebff3a..acbb8fa 100644 --- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/package.html +++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/package.html @@ -28,12 +28,12 @@ -Implementation and Low-Level API for the CAS Interfaces. +Implementation and Low-Level API for the CAS Interfaces. These are Internal APIs. Use these APIs at your own risk. APIs in this package are subject to change without notice, even in minor releases. Use of this package is not supported. If you think you have found a bug in this package, please try to reproduce it with the officially supported APIs before reporting it. -Internals documentation +Internals documentation NOTE: This documentation is plain HTML, generated from a WYSIWIG editor "tinymce". The way to work on this: after setting up a small web page with the tinymce (running from a local file), use the Tools - source code to cut/paste between this file's source and that editor. -Java Cover Objects for version 3 +Java Cover Objects for version 3 The Java Cover Objects are no longer cover objects; instead, these objects are the Feature Structures. The Java classes for these objects are in a hierarchy that corresponds to the UIMA type hierarchy. JCasGen continues to serve to generate (for user, not for built-in types) particular Java Classes for particular UIMA Types. And, as before, JCasGen'd classes are optional. If there was not a JCasGen'd class for "MyType" (assume a subtype of "Annotation"), [...] There is one definition of these objects per UIMA Type System. Support for PEARs having different "customizations" of the same JCas classname is not supported in v3. @@ -42,7 +42,7 @@ The PEAR can still define customizations for types only it defines (that is, not used by the outer pipeline). Much of the infrastructure is kept as-is in version 3 to support backwards compatibility. -Format of a JCas class version 3 +Format of a JCas class version 3 The _Type is not used. May revisit this if users are using the low-level access made possible by _Type. There is one definition of the class per type system. Type systems are often shared among multiple CASes. Each definition is loaded under a specific loader for that type system. (Not implemented) The loader is set up to delegate to the parent for all classes except the JCas types, and for those, it generates them using ASM byte code generation from the fully merged TypeSystem information and existing "customizations". @@ -64,7 +64,7 @@ -UIMA Indexes +UIMA Indexes Indexes are defined for a pipeline, and are kept as part of the general CAS definition. Each CAS View has its own instantiation of the defined indexes (there's one definition for all views), and as a result, a particular FS may be added-to-indexes and indexed in some views, and not in others. There are 3 kinds of indexes: Sorted, Set, and Bag. The basic object type for an index is FsIndex_singleType. This has 3 subtypes, one for each of the index types: diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/package.html b/uimaj-core/src/main/java/org/apache/uima/cas/package.html index 0dcd29d..f967b07 100644 --- a/uimaj-core/src/main/java/org/apache/uima/cas/package.html +++ b/uimaj-core/src/main/java/org/apache/uima/cas/package.html @@ -22,7 +22,7 @@ Common Analysis System(CAS) Interfaces -Common Analysis System (CAS) Interfaces +Common Analysis System (CAS) Interfaces The CAS provides a set of methods for creating Feature Structures and setting / getting their Feature values, based on parameters referencing Types and Features. @@ -39,7 +39,7 @@ -Type System +Type System The Type System is a collection of types and features of each type, where the types are in a single type hierarchy. The type/feature information is collected fro
[uima-uimaj] annotated tag uimaj-eclipse-update-site-3.1.1 updated (7bd43d3 -> fea82d3)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to annotated tag uimaj-eclipse-update-site-3.1.1 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. *** WARNING: tag uimaj-eclipse-update-site-3.1.1 was modified! *** from 7bd43d3 (commit) to fea82d3 (tag) tagging 7bd43d3d8a0e17e7c514f689eb2b3f2bbaed1e62 (commit) replaces uimaj-3.1.1 by Marshall Schor on Mon Nov 4 14:02:00 2019 -0500 - Log - [maven-release-plugin] copy for tag uimaj-eclipse-update-site-3.1.1 --- No new revisions were added by this update. Summary of changes:
[uima-uimaj] branch rc/uimaj-3.1.1 updated: [maven-release-plugin] prepare release uimaj-eclipse-update-site-3.1.1
This is an automated email from the ASF dual-hosted git repository.
schor pushed a commit to branch rc/uimaj-3.1.1
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
The following commit(s) were added to refs/heads/rc/uimaj-3.1.1 by this push:
new 7bd43d3 [maven-release-plugin] prepare release
uimaj-eclipse-update-site-3.1.1
7bd43d3 is described below
commit 7bd43d3d8a0e17e7c514f689eb2b3f2bbaed1e62
Author: Marshall Schor
AuthorDate: Mon Nov 4 14:01:47 2019 -0500
[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 0b3349f..f217eb9 100644
--- a/uimaj-eclipse-update-site/pom.xml
+++ b/uimaj-eclipse-update-site/pom.xml
@@ -28,7 +28,7 @@
uimaj-eclipse-update-site
- 3.1.1-SNAPSHOT
+ 3.1.1
pom
Apache UIMA Eclipse: ${project.artifactId}
@@ -132,7 +132,7 @@
run
-
+
[uima-uimaj] branch rc/uimaj-3.1.1 updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository.
schor pushed a commit to branch rc/uimaj-3.1.1
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
The following commit(s) were added to refs/heads/rc/uimaj-3.1.1 by this push:
new e0e68cf [maven-release-plugin] prepare for next development iteration
e0e68cf is described below
commit e0e68cf734f7b0f1a4c08ce613d3a5691a371ea8
Author: Marshall Schor
AuthorDate: Mon Nov 4 14:02:04 2019 -0500
[maven-release-plugin] prepare for next development iteration
---
uimaj-eclipse-update-site/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/uimaj-eclipse-update-site/pom.xml
b/uimaj-eclipse-update-site/pom.xml
index f217eb9..4748450 100644
--- a/uimaj-eclipse-update-site/pom.xml
+++ b/uimaj-eclipse-update-site/pom.xml
@@ -28,7 +28,7 @@
uimaj-eclipse-update-site
- 3.1.1
+ 3.1.2-SNAPSHOT
pom
Apache UIMA Eclipse: ${project.artifactId}
[uima-uimaj] branch rc/uimaj-3.1.1 updated: [maven-release-plugin] rollback the release of uimaj-eclipse-update-site-3.1.1
This is an automated email from the ASF dual-hosted git repository.
schor pushed a commit to branch rc/uimaj-3.1.1
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
The following commit(s) were added to refs/heads/rc/uimaj-3.1.1 by this push:
new 94a2201 [maven-release-plugin] rollback the release of
uimaj-eclipse-update-site-3.1.1
94a2201 is described below
commit 94a22010375ed20c4dfea7d150db863c4a977b4c
Author: Marshall Schor
AuthorDate: Mon Nov 4 13:50:05 2019 -0500
[maven-release-plugin] rollback the release of
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 f217eb9..0b3349f 100644
--- a/uimaj-eclipse-update-site/pom.xml
+++ b/uimaj-eclipse-update-site/pom.xml
@@ -28,7 +28,7 @@
uimaj-eclipse-update-site
- 3.1.1
+ 3.1.1-SNAPSHOT
pom
Apache UIMA Eclipse: ${project.artifactId}
@@ -132,7 +132,7 @@
run
-
+
[uima-uimaj] branch master-v2 updated: [UIMA-6141] add combine.self="override" back to element
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch master-v2 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git The following commit(s) were added to refs/heads/master-v2 by this push: new 219cb69 [UIMA-6141] add combine.self="override" back to element 219cb69 is described below commit 219cb69d4d989725087d5257956bb417a7a4f7fb Author: Marshall Schor AuthorDate: Mon Nov 4 13:46:50 2019 -0500 [UIMA-6141] add combine.self="override" back to element --- uimaj-eclipse-update-site/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uimaj-eclipse-update-site/pom.xml b/uimaj-eclipse-update-site/pom.xml index 599b8cf..a9ddf28 100644 --- a/uimaj-eclipse-update-site/pom.xml +++ b/uimaj-eclipse-update-site/pom.xml @@ -131,7 +131,7 @@ run - +
[uima-uimaj] branch master updated: [UIMA-6141] add combine.self="override" back to element
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 The following commit(s) were added to refs/heads/master by this push: new 7343e23 [UIMA-6141] add combine.self="override" back to element 7343e23 is described below commit 7343e231438f5c250ad5dce17b15cfbc78b0f5c3 Author: Marshall Schor AuthorDate: Mon Nov 4 13:45:14 2019 -0500 [UIMA-6141] add combine.self="override" back to element --- uimaj-eclipse-update-site/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uimaj-eclipse-update-site/pom.xml b/uimaj-eclipse-update-site/pom.xml index 455b9ca..b6ee972 100644 --- a/uimaj-eclipse-update-site/pom.xml +++ b/uimaj-eclipse-update-site/pom.xml @@ -132,7 +132,7 @@ run - +
[uima-uimaj] 02/03: move combine.self=override to config element
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch rc/uimaj-3.1.1 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git commit 0920a820a11051163835c3dee8ffc13eea26f7eb Author: Marshall Schor AuthorDate: Mon Nov 4 13:31:14 2019 -0500 move combine.self=override to config element --- 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 6852f55..0b3349f 100644 --- a/uimaj-eclipse-update-site/pom.xml +++ b/uimaj-eclipse-update-site/pom.xml @@ -132,8 +132,8 @@ run - - + +
[uima-uimaj] 01/03: put combine.self on target for test
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch rc/uimaj-3.1.1 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git commit 20dced7db33b8ae9a879dbf70c038df679a6587e Author: Marshall Schor AuthorDate: Mon Nov 4 13:24:40 2019 -0500 put combine.self on target for test --- uimaj-eclipse-update-site/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uimaj-eclipse-update-site/pom.xml b/uimaj-eclipse-update-site/pom.xml index 455b9ca..6852f55 100644 --- a/uimaj-eclipse-update-site/pom.xml +++ b/uimaj-eclipse-update-site/pom.xml @@ -133,7 +133,7 @@ run - +
[uima-uimaj] branch rc/uimaj-3.1.1 updated (1596339 -> f9ad933)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch rc/uimaj-3.1.1 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. from 1596339 [maven-release-plugin] rollback the release of uimaj-eclipse-update-site-3.1.1 new 20dced7 put combine.self on target for test new 0920a82 move combine.self=override to config element new f9ad933 [maven-release-plugin] prepare release uimaj-eclipse-update-site-3.1.1 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[uima-uimaj] branch rc/uimaj-3.1.1 updated: [maven-release-plugin] rollback the release of uimaj-eclipse-update-site-3.1.1
This is an automated email from the ASF dual-hosted git repository.
schor pushed a commit to branch rc/uimaj-3.1.1
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
The following commit(s) were added to refs/heads/rc/uimaj-3.1.1 by this push:
new 1596339 [maven-release-plugin] rollback the release of
uimaj-eclipse-update-site-3.1.1
1596339 is described below
commit 1596339915c643325948fd61f5282a9e43c52df4
Author: Marshall Schor
AuthorDate: Mon Nov 4 13:11:50 2019 -0500
[maven-release-plugin] rollback the release of
uimaj-eclipse-update-site-3.1.1
---
uimaj-eclipse-update-site/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/uimaj-eclipse-update-site/pom.xml
b/uimaj-eclipse-update-site/pom.xml
index 1d21456..455b9ca 100644
--- a/uimaj-eclipse-update-site/pom.xml
+++ b/uimaj-eclipse-update-site/pom.xml
@@ -28,7 +28,7 @@
uimaj-eclipse-update-site
- 3.1.2-SNAPSHOT
+ 3.1.1-SNAPSHOT
pom
Apache UIMA Eclipse: ${project.artifactId}
[uima-uimaj] branch rc/uimaj-3.1.1 updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository.
schor pushed a commit to branch rc/uimaj-3.1.1
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
The following commit(s) were added to refs/heads/rc/uimaj-3.1.1 by this push:
new 287618c [maven-release-plugin] prepare for next development iteration
287618c is described below
commit 287618c3fff77761c916f79bfdd68fe0b6b6d1c9
Author: Marshall Schor
AuthorDate: Mon Nov 4 10:17:57 2019 -0500
[maven-release-plugin] prepare for next development iteration
---
uimaj-eclipse-update-site/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/uimaj-eclipse-update-site/pom.xml
b/uimaj-eclipse-update-site/pom.xml
index 6b003c7..1d21456 100644
--- a/uimaj-eclipse-update-site/pom.xml
+++ b/uimaj-eclipse-update-site/pom.xml
@@ -28,7 +28,7 @@
uimaj-eclipse-update-site
- 3.1.1
+ 3.1.2-SNAPSHOT
pom
Apache UIMA Eclipse: ${project.artifactId}
[uima-uimaj] annotated tag uimaj-eclipse-update-site-3.1.1 updated (8a34550 -> bef7ec8)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to annotated tag uimaj-eclipse-update-site-3.1.1 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. *** WARNING: tag uimaj-eclipse-update-site-3.1.1 was modified! *** from 8a34550 (commit) to bef7ec8 (tag) tagging 8a34550e56ffd9f27c3e9b7a1d5bcdcb8fc675f7 (commit) replaces uimaj-3.1.1 by Marshall Schor on Mon Nov 4 10:17:53 2019 -0500 - Log - [maven-release-plugin] copy for tag uimaj-eclipse-update-site-3.1.1 --- No new revisions were added by this update. Summary of changes:
[uima-uimaj] branch rc/uimaj-3.1.1 updated: [maven-release-plugin] prepare release uimaj-eclipse-update-site-3.1.1
This is an automated email from the ASF dual-hosted git repository.
schor pushed a commit to branch rc/uimaj-3.1.1
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
The following commit(s) were added to refs/heads/rc/uimaj-3.1.1 by this push:
new 8a34550 [maven-release-plugin] prepare release
uimaj-eclipse-update-site-3.1.1
8a34550 is described below
commit 8a34550e56ffd9f27c3e9b7a1d5bcdcb8fc675f7
Author: Marshall Schor
AuthorDate: Mon Nov 4 10:17:39 2019 -0500
[maven-release-plugin] prepare release uimaj-eclipse-update-site-3.1.1
---
uimaj-eclipse-update-site/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/uimaj-eclipse-update-site/pom.xml
b/uimaj-eclipse-update-site/pom.xml
index 455b9ca..6b003c7 100644
--- a/uimaj-eclipse-update-site/pom.xml
+++ b/uimaj-eclipse-update-site/pom.xml
@@ -28,7 +28,7 @@
uimaj-eclipse-update-site
- 3.1.1-SNAPSHOT
+ 3.1.1
pom
Apache UIMA Eclipse: ${project.artifactId}
[uima-uimaj] branch rc/uimaj-3.1.1 updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch rc/uimaj-3.1.1 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git The following commit(s) were added to refs/heads/rc/uimaj-3.1.1 by this push: new ed9cbc9 [maven-release-plugin] prepare for next development iteration ed9cbc9 is described below commit ed9cbc9cf35652e0cff3077af7574875bd26508d Author: Marshall Schor AuthorDate: Mon Nov 4 10:04:39 2019 -0500 [maven-release-plugin] prepare for next development iteration --- PearPackagingMavenPlugin/pom.xml| 4 ++-- aggregate-uimaj-docbooks/pom.xml| 4 ++-- aggregate-uimaj-eclipse-plugins/pom.xml | 4 ++-- aggregate-uimaj/pom.xml | 4 ++-- jVinci/pom.xml | 4 ++-- jcasgen-maven-plugin/pom.xml| 4 ++-- pom.xml | 4 ++-- uima-docbook-overview-and-setup/pom.xml | 4 ++-- uima-docbook-references/pom.xml | 4 ++-- uima-docbook-tools/pom.xml | 4 ++-- uima-docbook-tutorials-and-users-guides/pom.xml | 4 ++-- uima-docbook-v3-users-guide/pom.xml | 4 ++-- uimaj-adapter-soap/pom.xml | 4 ++-- uimaj-adapter-vinci/pom.xml | 4 ++-- uimaj-bootstrap/pom.xml | 4 ++-- uimaj-component-test-util/pom.xml | 4 ++-- uimaj-core/pom.xml | 4 ++-- uimaj-cpe/pom.xml | 4 ++-- uimaj-document-annotation/pom.xml | 4 ++-- uimaj-eclipse-feature-runtime/pom.xml | 4 ++-- uimaj-eclipse-feature-tools/pom.xml | 4 ++-- uimaj-ep-cas-editor-ide/pom.xml | 4 ++-- uimaj-ep-cas-editor/pom.xml | 4 ++-- uimaj-ep-configurator/pom.xml | 4 ++-- uimaj-ep-debug/pom.xml | 4 ++-- uimaj-ep-jcasgen/pom.xml| 4 ++-- uimaj-ep-launcher/pom.xml | 4 ++-- uimaj-ep-pear-packager/pom.xml | 4 ++-- uimaj-ep-runtime/pom.xml| 4 ++-- uimaj-examples/pom.xml | 4 ++-- uimaj-json/pom.xml | 4 ++-- uimaj-parent/pom.xml| 4 ++-- uimaj-test-util/pom.xml | 4 ++-- uimaj-tools/pom.xml | 4 ++-- uimaj-v3migration-jcas/pom.xml | 4 ++-- 35 files changed, 70 insertions(+), 70 deletions(-) diff --git a/PearPackagingMavenPlugin/pom.xml b/PearPackagingMavenPlugin/pom.xml index 2b0c810..fd72046 100644 --- a/PearPackagingMavenPlugin/pom.xml +++ b/PearPackagingMavenPlugin/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.1 +3.1.2-SNAPSHOT ../uimaj-parent/pom.xml @@ -52,7 +52,7 @@ https://github.com/apache/uima-uimaj/tree/master/PearPackagingMavenPlugin -uimaj-3.1.1 +HEAD diff --git a/aggregate-uimaj-docbooks/pom.xml b/aggregate-uimaj-docbooks/pom.xml index ea0f661..bee2619 100644 --- a/aggregate-uimaj-docbooks/pom.xml +++ b/aggregate-uimaj-docbooks/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.1 +3.1.2-SNAPSHOT ../uimaj-parent/pom.xml @@ -50,7 +50,7 @@ https://github.com/apache/uima-uimaj/tree/master/aggregate-uimaj-docbooks -uimaj-3.1.1 +HEAD diff --git a/aggregate-uimaj-eclipse-plugins/pom.xml b/aggregate-uimaj-eclipse-plugins/pom.xml index af86063..917a5fd 100644 --- a/aggregate-uimaj-eclipse-plugins/pom.xml +++ b/aggregate-uimaj-eclipse-plugins/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.1 +3.1.2-SNAPSHOT ../uimaj-parent/pom.xml @@ -52,7 +52,7 @@ https://github.com/apache/uima-uimaj/tree/master/aggregate-uimaj-eclipse-plugins -uimaj-3.1.1 +HEAD diff --git a/aggregate-uimaj/pom.xml b/aggregate-uimaj/pom.xml index b80a4b3..f591db9 100644 --- a/aggregate-uimaj/pom.xml +++ b/aggregate-uimaj/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.1 +3.1.2-SNAPSHOT ../uimaj-parent/pom.xml @@ -51,7 +51,7 @@ https://github.com/apache/uima-uimaj/tree/master/aggregate-uimaj -uimaj-3.1.1 +HEAD diff --git a/jVinci/pom.xml b/jVinci/pom.xml index 5230b5c..37f2f8a 100644 --- a/jVinci/pom.xml +++ b/jVinci/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.1 +3.1.2-SNAPSHOT ../uimaj-parent/pom.xml @@ -54,7 +54,7 @@ https://github.com/apache/uima-uimaj/tree/master/jVinci -uimaj-3.1.1 +HEAD diff --git a/jcasgen-maven-plugin/pom.xml b/jcasgen-maven-plugin/pom.xml index 48cbc85..98ebd8e 100644 --- a/jcasgen-maven
[uima-uimaj] annotated tag uimaj-3.1.1 updated (35ae2c8 -> aaf3611)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to annotated tag uimaj-3.1.1 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. *** WARNING: tag uimaj-3.1.1 was modified! *** from 35ae2c8 (commit) to aaf3611 (tag) tagging 35ae2c876783d4a94b0e059300dc4a47af334b71 (commit) by Marshall Schor on Mon Nov 4 10:04:34 2019 -0500 - Log - [maven-release-plugin] copy for tag uimaj-3.1.1 --- No new revisions were added by this update. Summary of changes:
[uima-uimaj] branch rc/uimaj-3.1.1 updated: [maven-release-plugin] prepare release uimaj-3.1.1
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch rc/uimaj-3.1.1 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git The following commit(s) were added to refs/heads/rc/uimaj-3.1.1 by this push: new 35ae2c8 [maven-release-plugin] prepare release uimaj-3.1.1 35ae2c8 is described below commit 35ae2c876783d4a94b0e059300dc4a47af334b71 Author: Marshall Schor AuthorDate: Mon Nov 4 10:04:20 2019 -0500 [maven-release-plugin] prepare release uimaj-3.1.1 --- PearPackagingMavenPlugin/pom.xml| 4 ++-- aggregate-uimaj-docbooks/pom.xml| 4 ++-- aggregate-uimaj-eclipse-plugins/pom.xml | 4 ++-- aggregate-uimaj/pom.xml | 4 ++-- jVinci/pom.xml | 4 ++-- jcasgen-maven-plugin/pom.xml| 4 ++-- pom.xml | 4 ++-- uima-docbook-overview-and-setup/pom.xml | 4 ++-- uima-docbook-references/pom.xml | 4 ++-- uima-docbook-tools/pom.xml | 4 ++-- uima-docbook-tutorials-and-users-guides/pom.xml | 4 ++-- uima-docbook-v3-users-guide/pom.xml | 4 ++-- uimaj-adapter-soap/pom.xml | 4 ++-- uimaj-adapter-vinci/pom.xml | 4 ++-- uimaj-bootstrap/pom.xml | 4 ++-- uimaj-component-test-util/pom.xml | 4 ++-- uimaj-core/pom.xml | 4 ++-- uimaj-cpe/pom.xml | 4 ++-- uimaj-document-annotation/pom.xml | 4 ++-- uimaj-eclipse-feature-runtime/pom.xml | 4 ++-- uimaj-eclipse-feature-tools/pom.xml | 4 ++-- uimaj-ep-cas-editor-ide/pom.xml | 4 ++-- uimaj-ep-cas-editor/pom.xml | 4 ++-- uimaj-ep-configurator/pom.xml | 4 ++-- uimaj-ep-debug/pom.xml | 4 ++-- uimaj-ep-jcasgen/pom.xml| 4 ++-- uimaj-ep-launcher/pom.xml | 4 ++-- uimaj-ep-pear-packager/pom.xml | 4 ++-- uimaj-ep-runtime/pom.xml| 4 ++-- uimaj-examples/pom.xml | 4 ++-- uimaj-json/pom.xml | 4 ++-- uimaj-parent/pom.xml| 4 ++-- uimaj-test-util/pom.xml | 4 ++-- uimaj-tools/pom.xml | 4 ++-- uimaj-v3migration-jcas/pom.xml | 4 ++-- 35 files changed, 70 insertions(+), 70 deletions(-) diff --git a/PearPackagingMavenPlugin/pom.xml b/PearPackagingMavenPlugin/pom.xml index 146c7a8..2b0c810 100644 --- a/PearPackagingMavenPlugin/pom.xml +++ b/PearPackagingMavenPlugin/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.1-SNAPSHOT +3.1.1 ../uimaj-parent/pom.xml @@ -52,7 +52,7 @@ https://github.com/apache/uima-uimaj/tree/master/PearPackagingMavenPlugin -HEAD +uimaj-3.1.1 diff --git a/aggregate-uimaj-docbooks/pom.xml b/aggregate-uimaj-docbooks/pom.xml index f065ed8..ea0f661 100644 --- a/aggregate-uimaj-docbooks/pom.xml +++ b/aggregate-uimaj-docbooks/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.1-SNAPSHOT +3.1.1 ../uimaj-parent/pom.xml @@ -50,7 +50,7 @@ https://github.com/apache/uima-uimaj/tree/master/aggregate-uimaj-docbooks -HEAD +uimaj-3.1.1 diff --git a/aggregate-uimaj-eclipse-plugins/pom.xml b/aggregate-uimaj-eclipse-plugins/pom.xml index 32fde98..af86063 100644 --- a/aggregate-uimaj-eclipse-plugins/pom.xml +++ b/aggregate-uimaj-eclipse-plugins/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.1-SNAPSHOT +3.1.1 ../uimaj-parent/pom.xml @@ -52,7 +52,7 @@ https://github.com/apache/uima-uimaj/tree/master/aggregate-uimaj-eclipse-plugins -HEAD +uimaj-3.1.1 diff --git a/aggregate-uimaj/pom.xml b/aggregate-uimaj/pom.xml index 16b7bf8..b80a4b3 100644 --- a/aggregate-uimaj/pom.xml +++ b/aggregate-uimaj/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.1-SNAPSHOT +3.1.1 ../uimaj-parent/pom.xml @@ -51,7 +51,7 @@ https://github.com/apache/uima-uimaj/tree/master/aggregate-uimaj -HEAD +uimaj-3.1.1 diff --git a/jVinci/pom.xml b/jVinci/pom.xml index 1aa6509..5230b5c 100644 --- a/jVinci/pom.xml +++ b/jVinci/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.1-SNAPSHOT +3.1.1 ../uimaj-parent/pom.xml @@ -54,7 +54,7 @@ https://github.com/apache/uima-uimaj/tree/master/jVinci -HEAD +uimaj-3.1.1 diff --git a/jcasgen-maven-plugin/pom.xml b/jcasgen-maven-plugin/pom.xml index 2476142..48cbc85 100644 --- a/jcasgen-maven-plugin/pom.xml +++ b
[uima-uimaj] branch rc/uimaj-3.1.1 created (now ae159ec)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch rc/uimaj-3.1.1 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. at ae159ec [UIMA-6143] point scm dev connection to git repo top level No new revisions were added by this update.
[uima-uimaj] branch master-v2 updated: [UIMA-6141] delete combine.self after close reading of the docs
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch master-v2 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git The following commit(s) were added to refs/heads/master-v2 by this push: new 2a4d663 [UIMA-6141] delete combine.self after close reading of the docs 2a4d663 is described below commit 2a4d663fba720a0bc6e0a961e803c92385154971 Author: Marshall Schor AuthorDate: Mon Nov 4 09:40:47 2019 -0500 [UIMA-6141] delete combine.self after close reading of the docs --- uimaj-eclipse-update-site/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uimaj-eclipse-update-site/pom.xml b/uimaj-eclipse-update-site/pom.xml index f023366..599b8cf 100644 --- a/uimaj-eclipse-update-site/pom.xml +++ b/uimaj-eclipse-update-site/pom.xml @@ -132,7 +132,7 @@ run - +
[uima-uimaj] branch master-v2 updated: [UIMA-6143] point scm dev connection to git repo top level
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch master-v2 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git The following commit(s) were added to refs/heads/master-v2 by this push: new 3edaf4c [UIMA-6143] point scm dev connection to git repo top level 3edaf4c is described below commit 3edaf4c39d8ddabbeec6caf69539cc1b43fde807 Author: Marshall Schor AuthorDate: Mon Nov 4 09:39:32 2019 -0500 [UIMA-6143] point scm dev connection to git repo top level --- uimaj-eclipse-update-site/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uimaj-eclipse-update-site/pom.xml b/uimaj-eclipse-update-site/pom.xml index f3f1707..f023366 100644 --- a/uimaj-eclipse-update-site/pom.xml +++ b/uimaj-eclipse-update-site/pom.xml @@ -40,7 +40,7 @@ scm:git:https://github.com/apache/uima-uimaj/tree/master-v2/uimaj-eclipse-update-site - scm:git:https://github.com/apache/uima-uimaj/tree/master-v2/uimaj-eclipse-update-site + scm:git:https://github.com/apache/uima-uimaj/ https://github.com/apache/uima-uimaj/tree/master-v2/uimaj-eclipse-update-site
[uima-uimaj] branch master updated: [UIMA-6143] point scm dev connection to git repo top level
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 The following commit(s) were added to refs/heads/master by this push: new ae159ec [UIMA-6143] point scm dev connection to git repo top level ae159ec is described below commit ae159ecd0abda45422214c8e2343f1d3a35100d5 Author: Marshall Schor AuthorDate: Mon Nov 4 09:27:16 2019 -0500 [UIMA-6143] point scm dev connection to git repo top level --- uimaj-eclipse-update-site/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uimaj-eclipse-update-site/pom.xml b/uimaj-eclipse-update-site/pom.xml index be1efe1..455b9ca 100644 --- a/uimaj-eclipse-update-site/pom.xml +++ b/uimaj-eclipse-update-site/pom.xml @@ -40,7 +40,7 @@ scm:git:https://github.com/apache/uima-uimaj/uimaj-eclipse-update-site - scm:git:https://github.com/apache/uima-uimaj/uimaj-eclipse-update-site + scm:git:https://github.com/apache/uima-uimaj/ https://github.com/apache/uima-uimaj/tree/master/uimaj-eclipse-update-site
[uima-uimaj] branch master updated: no jira - roll back pom version to 3.1.1-SNAPSHOT
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 The following commit(s) were added to refs/heads/master by this push: new 92013e0 no jira - roll back pom version to 3.1.1-SNAPSHOT 92013e0 is described below commit 92013e0a90211c4e06ad482aaa4e0431358c7cc3 Author: Marshall Schor AuthorDate: Sat Nov 2 11:48:27 2019 -0400 no jira - roll back pom version to 3.1.1-SNAPSHOT --- PearPackagingMavenPlugin/pom.xml| 2 +- aggregate-uimaj-docbooks/pom.xml| 2 +- aggregate-uimaj-eclipse-plugins/pom.xml | 2 +- aggregate-uimaj/pom.xml | 2 +- jVinci/pom.xml | 2 +- jcasgen-maven-plugin/pom.xml| 2 +- pom.xml | 2 +- uima-docbook-overview-and-setup/pom.xml | 2 +- uima-docbook-references/pom.xml | 2 +- uima-docbook-tools/pom.xml | 2 +- uima-docbook-tutorials-and-users-guides/pom.xml | 2 +- uima-docbook-v3-users-guide/pom.xml | 2 +- uimaj-adapter-soap/pom.xml | 2 +- uimaj-adapter-vinci/pom.xml | 2 +- uimaj-bootstrap/pom.xml | 2 +- uimaj-component-test-util/pom.xml | 2 +- uimaj-core/pom.xml | 2 +- uimaj-cpe/pom.xml | 2 +- uimaj-document-annotation/pom.xml | 2 +- uimaj-eclipse-feature-runtime/pom.xml | 2 +- uimaj-eclipse-feature-tools/pom.xml | 2 +- uimaj-eclipse-update-site/pom.xml | 2 +- uimaj-ep-cas-editor-ide/pom.xml | 2 +- uimaj-ep-cas-editor/pom.xml | 2 +- uimaj-ep-configurator/pom.xml | 2 +- uimaj-ep-debug/pom.xml | 2 +- uimaj-ep-jcasgen/pom.xml| 2 +- uimaj-ep-launcher/pom.xml | 2 +- uimaj-ep-pear-packager/pom.xml | 2 +- uimaj-ep-runtime/pom.xml| 2 +- uimaj-examples/pom.xml | 2 +- uimaj-json/pom.xml | 2 +- uimaj-parent/pom.xml| 2 +- uimaj-test-util/pom.xml | 2 +- uimaj-tools/pom.xml | 2 +- uimaj-v3migration-jcas/pom.xml | 2 +- 36 files changed, 36 insertions(+), 36 deletions(-) diff --git a/PearPackagingMavenPlugin/pom.xml b/PearPackagingMavenPlugin/pom.xml index fd72046..146c7a8 100644 --- a/PearPackagingMavenPlugin/pom.xml +++ b/PearPackagingMavenPlugin/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.2-SNAPSHOT +3.1.1-SNAPSHOT ../uimaj-parent/pom.xml diff --git a/aggregate-uimaj-docbooks/pom.xml b/aggregate-uimaj-docbooks/pom.xml index bee2619..f065ed8 100644 --- a/aggregate-uimaj-docbooks/pom.xml +++ b/aggregate-uimaj-docbooks/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.2-SNAPSHOT +3.1.1-SNAPSHOT ../uimaj-parent/pom.xml diff --git a/aggregate-uimaj-eclipse-plugins/pom.xml b/aggregate-uimaj-eclipse-plugins/pom.xml index 917a5fd..32fde98 100644 --- a/aggregate-uimaj-eclipse-plugins/pom.xml +++ b/aggregate-uimaj-eclipse-plugins/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.2-SNAPSHOT +3.1.1-SNAPSHOT ../uimaj-parent/pom.xml diff --git a/aggregate-uimaj/pom.xml b/aggregate-uimaj/pom.xml index f591db9..16b7bf8 100644 --- a/aggregate-uimaj/pom.xml +++ b/aggregate-uimaj/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.2-SNAPSHOT +3.1.1-SNAPSHOT ../uimaj-parent/pom.xml diff --git a/jVinci/pom.xml b/jVinci/pom.xml index 37f2f8a..1aa6509 100644 --- a/jVinci/pom.xml +++ b/jVinci/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.2-SNAPSHOT +3.1.1-SNAPSHOT ../uimaj-parent/pom.xml diff --git a/jcasgen-maven-plugin/pom.xml b/jcasgen-maven-plugin/pom.xml index 98ebd8e..2476142 100644 --- a/jcasgen-maven-plugin/pom.xml +++ b/jcasgen-maven-plugin/pom.xml @@ -30,7 +30,7 @@ org.apache.uima uimaj-parent - 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT ../uimaj-parent/pom.xml diff --git a/pom.xml b/pom.xml index d5ee420..14977dc 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.uima uimaj-parent -3.1.2-SNAPSHOT +3.1.1-SNAPSHOT uimaj-parent/pom.xml diff --git a/uima-docbook-overview-and-setup/pom.xml b/uima-docbook-overview-and-setup/pom.xml index c2d33e6..a1a1d41 100644 --- a/uima-docbook-overview-and-setup/pom.xml +++ b/uima-docbook-overview-and-setup/pom.xml @@ -23,7 +23,7 @@ org.apache.uima
[uima-uimaj] 02/02: Merge branch 'master' of https://github.com/apache/uima-uimaj
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 f572adabf61523b9a0ffd1a8fd91d858af643eca
Merge: 25f0f2c dac0176
Author: Marshall Schor
AuthorDate: Sat Nov 2 11:37:42 2019 -0400
Merge branch 'master' of https://github.com/apache/uima-uimaj
# Conflicts:
# uimaj-eclipse-update-site/pom.xml resolved
PearPackagingMavenPlugin/pom.xml| 3 +-
aggregate-uimaj-docbooks/pom.xml| 3 +-
aggregate-uimaj-eclipse-plugins/pom.xml | 3 +-
aggregate-uimaj/pom.xml | 3 +-
jVinci/pom.xml | 3 +-
jcasgen-maven-plugin/pom.xml| 3 +-
pom.xml | 3 +-
uima-docbook-overview-and-setup/pom.xml | 3 +-
uima-docbook-references/pom.xml | 3 +-
uima-docbook-tools/pom.xml | 3 +-
uima-docbook-tutorials-and-users-guides/pom.xml | 3 +-
uima-docbook-v3-users-guide/pom.xml | 3 +-
uimaj-adapter-soap/pom.xml | 3 +-
uimaj-adapter-vinci/pom.xml | 3 +-
uimaj-bootstrap/pom.xml | 3 +-
uimaj-component-test-util/pom.xml | 3 +-
uimaj-core/pom.xml | 3 +-
uimaj-cpe/pom.xml | 3 +-
uimaj-document-annotation/pom.xml | 3 +-
uimaj-eclipse-feature-runtime/pom.xml | 3 +-
uimaj-eclipse-feature-tools/pom.xml | 3 +-
uimaj-eclipse-update-site/pom.xml | 559
uimaj-ep-cas-editor-ide/pom.xml | 3 +-
uimaj-ep-cas-editor/pom.xml | 3 +-
uimaj-ep-configurator/pom.xml | 3 +-
uimaj-ep-debug/pom.xml | 3 +-
uimaj-ep-jcasgen/pom.xml| 3 +-
uimaj-ep-launcher/pom.xml | 3 +-
uimaj-ep-pear-packager/pom.xml | 3 +-
uimaj-ep-runtime/pom.xml| 3 +-
uimaj-examples/pom.xml | 3 +-
uimaj-json/pom.xml | 3 +-
uimaj-parent/pom.xml| 4 +-
uimaj-test-util/pom.xml | 3 +-
uimaj-tools/pom.xml | 3 +-
uimaj-v3migration-jcas/pom.xml | 9 +-
36 files changed, 354 insertions(+), 317 deletions(-)
diff --cc uimaj-eclipse-update-site/pom.xml
index b8079b7,9fd2632..685f89e
--- a/uimaj-eclipse-update-site/pom.xml
+++ b/uimaj-eclipse-update-site/pom.xml
@@@ -1,279 -1,280 +1,280 @@@
--
--
--http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/xsd/maven-4.0.0.xsd;>
-- 4.0.0
--
--
--org.apache.uima
--uimaj-parent
--3.0.1
--
--
--
-- uimaj-eclipse-update-site
- 3.1.1-SNAPSHOT
- 3.1.1
-- pom
--
-- Apache UIMA Eclipse: ${project.artifactId}
-- The UIMA Java SDK Eclipse update site
-- ${uimaWebsiteUrl}
--
--
--
-- scm:git:https://github.com/apache/uima-uimaj/uimaj-eclipse-update-site
--
--
-- scm:git:https://github.com/apache/uima-uimaj/uimaj-eclipse-update-site
--
--
--
https://github.com/apache/uima-uimaj/tree/master/uimaj-eclipse-update-site
--
-uimaj-eclipse-update-site-3.1.1
--
--
--
--uimaj
--${project.artifactId}
--
--uimaj
--
--
${project.build.directory}/eclipse-update-site-v3/${eclipseUpdateSiteComponent}
--
--false
--
--
--
--
-
-
--
--
--org.apache.maven.plugins
--maven-dependency-plugin
--
--
--copy-new-plugins
--copy
--
--
--
--
org.apache.uimauimaj-ep-cas-editor
${project.version}org.apache.uima.caseditor_${parsedVersion.osgiVersion}.jar
--
org.apache.uimauimaj-ep-cas-editor-ide${project.version}org.apache.uima.caseditor.ide_${parsedVersion.osgiVersion}.jar
--
org.apache.uimauimaj-ep-configurator
${project.version}org.apache.uima.desceditor_${parsedVersion.osgiVersion}.jar
--
org.apache.uimauimaj-ep-debug
${project.version}org.apache.uima.debug_${parsedVersion.osgiVersion}.jar
--
org.apache.uimauimaj-ep-jcasgen
${project.version}org.apache.uima.jcas.jcasgenp_${parsedVersion.osgiVersion}.jar
--
org.apache.uimauimaj-ep-pear-packager
${project.version}org.apache.uima.pear_${parsedVersion.osgiVersion}.jar
--
org.apache.uimauimaj-ep-runtime
${project.version}org.apache.uima.runtime_${parsedVersion.osg
[uima-uimaj] 01/02: [UIMA-6141] delete combine.self after close reading of the docs
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 25f0f2cece1bac8cb200595a3a62f003db7d1a33 Author: Marshall Schor AuthorDate: Sat Nov 2 11:12:47 2019 -0400 [UIMA-6141] delete combine.self after close reading of the docs --- uimaj-eclipse-update-site/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uimaj-eclipse-update-site/pom.xml b/uimaj-eclipse-update-site/pom.xml index b6b673a..b8079b7 100644 --- a/uimaj-eclipse-update-site/pom.xml +++ b/uimaj-eclipse-update-site/pom.xml @@ -132,7 +132,7 @@ run - +
[uima-uimaj] branch master updated (dac0176 -> f572ada)
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 dac0176 Revert "no jira, rmv redundant el, fix misspelling" new 25f0f2c [UIMA-6141] delete combine.self after close reading of the docs new f572ada Merge branch 'master' of https://github.com/apache/uima-uimaj The 2 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 | 560 +++--- 1 file changed, 280 insertions(+), 280 deletions(-)
svn commit: r1869295 - in /uima/site/trunk/uima-website: docs/git-release-notes.html xdocs/git-release-notes.xml
Author: schor Date: Sat Nov 2 15:09:25 2019 New Revision: 1869295 URL: http://svn.apache.org/viewvc?rev=1869295=rev Log: no jira, recommend doing release in a temporary release branch Modified: uima/site/trunk/uima-website/docs/git-release-notes.html uima/site/trunk/uima-website/xdocs/git-release-notes.xml Modified: uima/site/trunk/uima-website/docs/git-release-notes.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/git-release-notes.html?rev=1869295=1869294=1869295=diff == --- uima/site/trunk/uima-website/docs/git-release-notes.html (original) +++ uima/site/trunk/uima-website/docs/git-release-notes.html Sat Nov 2 15:09:25 2019 @@ -234,7 +234,7 @@ the Jira release pointer for ISSUES Fixed, API compatibility: previous version. See checklist-release - (optional) If others might be continuing to update master, make a release branch, and do all the work + (optional, but recommended) Make a release branch, and do all the work on that branch. Once the release is out, merge the branch back into the master (should have very little change, other than new pom SNAPSHOT version levels). @@ -304,8 +304,7 @@ release:perform This does a build using the "tag" checkout, and uploads the artifacts to the maven staging repository. The tag is cloned into the target/checkout directory -A build is done from the target/checkout spot, with maven artifacts uploaded to repository.apache.com staging area, - just like before. +A build is done from the target/checkout spot, with maven artifacts uploaded to repository.apache.com staging area. @@ -319,14 +318,16 @@ (Optional) Reset the branch to last commit before release:prepare If you don't do this, when you do the release:prepare again, it will increment the SNAPSHOT and release numbers, -and you'll need to override those. +and you'll need to override those. It's fine to work this way, as long as you remember to override the release +and SNAPSHOT numbers. The idea is to reset the branch being used to build, back to the commit just before the maven release:prepare commit, which is identified with the message [maven-release-plugin] prepare for next development iteration. -Do this by working in a checkout of the branch being used to build, typing git log and finding the hash +Do this by working in a checkout of the branch being used to build, typing git log ... and finding the hash for the commit right before the prepare commit. Don't do this next step unless you know no one has fetched the previously pushed maven release changes. -This is typically true, because only you are working on the release. +This is typically true, because only you are working on the release, and you typically will be working in +a branch made just for this, which others are unlikely to access. git log -5 --oneline # shows the last 5 commits. Find the last commit before the maven prepare one. git reset --hard hash-of-commit where hash-of-commit is from the log git push -f origin branch-name # force needed because removing history Modified: uima/site/trunk/uima-website/xdocs/git-release-notes.xml URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/git-release-notes.xml?rev=1869295=1869294=1869295=diff == --- uima/site/trunk/uima-website/xdocs/git-release-notes.xml (original) +++ uima/site/trunk/uima-website/xdocs/git-release-notes.xml Sat Nov 2 15:09:25 2019 @@ -32,7 +32,7 @@ under the License. See checklist-release - (optional) If others might be continuing to update master, make a release branch, and do all the work + (optional, but recommended) Make a release branch, and do all the work on that branch. Once the release is out, merge the branch back into the master (should have very little change, other than new pom SNAPSHOT version levels). @@ -96,25 +96,26 @@ under the License.
svn commit: r1869277 - /uima/site/trunk/uima-website/docs/git-notes.html
Author: schor Date: Fri Nov 1 21:31:09 2019 New Revision: 1869277 URL: http://svn.apache.org/viewvc?rev=1869277=rev Log: add git-notes.html Added: uima/site/trunk/uima-website/docs/git-notes.html Added: uima/site/trunk/uima-website/docs/git-notes.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/git-notes.html?rev=1869277=auto == --- uima/site/trunk/uima-website/docs/git-notes.html (added) +++ uima/site/trunk/uima-website/docs/git-notes.html Fri Nov 1 21:31:09 2019 @@ -0,0 +1,332 @@ +https://www.w3.org/TR/html4/loose.dtd;> + + + + + + + + +@import "stylesheets/base.css"; + + + + + +Apache UIMA - Git notes + + + + + + + + + + + + + + + + + + + + + + + + Git notes + + + https://www.apache.org;> + + + + + + + + + + + https://www.google.com/search;> +Search the site + +https://uima.apache.org/; /> + + + + + + + + + + + + + + + + General + + +Home + +Downloads + +Documentation + +News + +Publications + + +https://issues.apache.org/jira/browse/uima; target="_blank" rel="noopener">Issue tracker + +https://cwiki.apache.org/confluence/display/UIMA/; target="_blank" rel="noopener">Wiki + + +https://cwiki.apache.org/confluence/display/UIMA/Powered+by+Apache+UIMA; target="_blank" rel="noopener">Powered By UIMA + + + + Community + + +Get Involved + +Mailing Lists + +Contribution Policies + +FAQ + +Project Guidelines + + + + Scaleout Frameworks + + +UIMA-AS + +UIMA-DUCC + +..Demo Page + +http://uima-ducc-demo.apache.org:42133; target="_blank" rel="noopener">..Demo Live + + + + Components & Tools + + +Annotators + +Tools & Servers + +Addons and Sandbox + +UIMA Ruta + +uimaFIT + +External Resources + + + + Development + + +Quick Start: building + +Building from Source + +One-time setups + +Source Code + +Creating a Distribution + +Doing a UIMA release + +https://www.apache.org/security/committers.html; target="_blank" rel="noopener">Doing a CVE (Apache) + +
svn commit: r1869276 - in /uima/site/trunk/uima-website: docs/git-conventions.html docs/git-release-notes.html docs/git.html xdocs/git-conventions.xml xdocs/git-notes.xml xdocs/git-release-notes.xml x
Author: schor Date: Fri Nov 1 21:30:24 2019 New Revision: 1869276 URL: http://svn.apache.org/viewvc?rev=1869276=rev Log: no Jira, more git updates Added: uima/site/trunk/uima-website/xdocs/git-notes.xml Modified: uima/site/trunk/uima-website/docs/git-conventions.html uima/site/trunk/uima-website/docs/git-release-notes.html uima/site/trunk/uima-website/docs/git.html uima/site/trunk/uima-website/xdocs/git-conventions.xml uima/site/trunk/uima-website/xdocs/git-release-notes.xml uima/site/trunk/uima-website/xdocs/git.xml Modified: uima/site/trunk/uima-website/docs/git-conventions.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/git-conventions.html?rev=1869276=1869275=1869276=diff == --- uima/site/trunk/uima-website/docs/git-conventions.html (original) +++ uima/site/trunk/uima-website/docs/git-conventions.html Fri Nov 1 21:30:24 2019 @@ -240,12 +240,22 @@ but rather, a change must be pulled from a branch via a pull request. Branches for working are typically named using the Jira issue (if there is one) associated with the work, followed by a very-short-description - enough to remind you what that jira number is about. -In addition, the name can be prefixed with the kind of work it is, e.g. feature/ or bugfix. +In addition, the name can be prefixed with the kind of work it is, e.g. +feature/ or bugfix or refactor. This can be useful in enabling you to more rapidly locate the right branch. After merging into master, the branch is typically deleted. +Commit messages +Example: [UIMA-1234] Add missing foo to bar +Git has a two-section commit message. The first line should be a one-line id and summary. + Following that is an optional section of multiple lines that are details about the commit. +The first line should start with the jira issue number including UIMA- prefix. Automatic scanners + use this to connect this to the Jira issue. You may put multiple issues if applicable. The issues may + be written with surrounding square brackets, e.g. [UIMA-1234]. +Following that should be short title of the issue, since looking back at it a reader probably won't remember + what the issue was all about. Following that can be a summary of what this particular commit does. Git merge styles Different projects may use different merge styles. -See these links for references to common work patterns. +See these links for references to common work patterns. TBD Modified: uima/site/trunk/uima-website/docs/git-release-notes.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/git-release-notes.html?rev=1869276=1869275=1869276=diff == --- uima/site/trunk/uima-website/docs/git-release-notes.html (original) +++ uima/site/trunk/uima-website/docs/git-release-notes.html Fri Nov 1 21:30:24 2019 @@ -303,8 +303,7 @@ release:perform This does a build using the "tag" checkout, and uploads the artifacts to the maven staging repository. -(needs confirmation) the tag is checked out into a new branch, and the new branch is copied into - the branch being built from, in the target/checkout directory. Then the new branch is deleted. +The tag is cloned into the target/checkout directory A build is done from the target/checkout spot, with maven artifacts uploaded to repository.apache.com staging area, just like before. @@ -318,20 +317,27 @@ -The idea is to reset the branch being used to build, back to the commit just before the maven release:prepare +(Optional) Reset the branch to last commit before release:prepare +If you don't do this, when you do the release:prepare again, it will increment the SNAPSHOT and release numbers, +and you'll need to over
[uima-uimaj] 03/03: Revert "no jira, rmv redundant el, fix misspelling"
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 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 @@ 13 + org.apache.uima uimaj-parent pom 3.1.2-SNAPSHOT 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:git:https://github.com/apache/uima-uimaj/uimaj-v3migration-jcas + scm:git:https://github.com/apache/uima-uimaj/uimaj-jcas - scm:git:https://github.com/apache/uima-uimaj/uimaj-v3migration-jcas + scm:git:https://github.com/apache/uima-uimaj/uimaj-jcas - https://github.com/apache/uima-uimaj/tree/master/uimaj-v3migration-jcas + https://github.com/apache/uima-uimaj/tree/master/uimaj-jcas HEAD
[uima-uimaj] 02/03: [maven-release-plugin] prepare release uimaj-eclipse-update-site-3.1.1
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
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 @@
uimaj-eclipse-update-site
- 3.1.1-SNAPSHOT
+ 3.1.1
pom
Apache UIMA Eclipse: ${project.artifactId}
@@ -132,7 +132,7 @@
run
-
+
[uima-uimaj] 01/03: move combine.children back to configuration, target doesn't like it
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
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 @@
https://github.com/apache/uima-uimaj/tree/master/uimaj-eclipse-update-site
+uimaj-eclipse-update-site-3.1.1
@@ -60,7 +61,7 @@
-
+
org.apache.maven.plugins
@@ -124,17 +125,17 @@
-
+
BuildUpdateSite-pack-svnget-buildMetadata-commit-to-dev
package
run
-
-
+
+
-
+
@@ -145,7 +146,7 @@
-
+
@@ -155,7 +156,7 @@
-
+
checking out eclipse update subsite
${eclipseUpdateSiteComponent} from dist ...release...
@@ -163,12 +164,12 @@
-
+
Saving original content and artifacts for the
site
-
+
-
+
skipping checkout of current svn dist release
(because not apache-release)
@@ -178,7 +179,7 @@
-
+
Compress plugin Jars using pack200 - this may take a
minute or 2
@@ -188,16 +189,16 @@
-
+
Save conditioned Jars prior to signing, in case of
redo
-
---
+
---
-
+
-
+
-
+
Generate the p2 metadata and publish new artifacts
[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] branch master updated: [maven-release-plugin] prepare for next development iteration
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 The following commit(s) were added to refs/heads/master by this push: new dd69063 [maven-release-plugin] prepare for next development iteration dd69063 is described below commit dd69063934a7c1ba4d3b5aa88efc66ed77964b14 Author: Marshall Schor AuthorDate: Fri Nov 1 14:34:29 2019 -0400 [maven-release-plugin] prepare for next development iteration --- PearPackagingMavenPlugin/pom.xml| 4 ++-- aggregate-uimaj-docbooks/pom.xml| 4 ++-- aggregate-uimaj-eclipse-plugins/pom.xml | 4 ++-- aggregate-uimaj/pom.xml | 4 ++-- jVinci/pom.xml | 4 ++-- jcasgen-maven-plugin/pom.xml| 4 ++-- pom.xml | 4 ++-- uima-docbook-overview-and-setup/pom.xml | 4 ++-- uima-docbook-references/pom.xml | 4 ++-- uima-docbook-tools/pom.xml | 4 ++-- uima-docbook-tutorials-and-users-guides/pom.xml | 4 ++-- uima-docbook-v3-users-guide/pom.xml | 4 ++-- uimaj-adapter-soap/pom.xml | 4 ++-- uimaj-adapter-vinci/pom.xml | 4 ++-- uimaj-bootstrap/pom.xml | 4 ++-- uimaj-component-test-util/pom.xml | 4 ++-- uimaj-core/pom.xml | 4 ++-- uimaj-cpe/pom.xml | 4 ++-- uimaj-document-annotation/pom.xml | 4 ++-- uimaj-eclipse-feature-runtime/pom.xml | 4 ++-- uimaj-eclipse-feature-tools/pom.xml | 4 ++-- uimaj-ep-cas-editor-ide/pom.xml | 4 ++-- uimaj-ep-cas-editor/pom.xml | 4 ++-- uimaj-ep-configurator/pom.xml | 4 ++-- uimaj-ep-debug/pom.xml | 4 ++-- uimaj-ep-jcasgen/pom.xml| 4 ++-- uimaj-ep-launcher/pom.xml | 4 ++-- uimaj-ep-pear-packager/pom.xml | 4 ++-- uimaj-ep-runtime/pom.xml| 4 ++-- uimaj-examples/pom.xml | 4 ++-- uimaj-json/pom.xml | 4 ++-- uimaj-parent/pom.xml| 4 ++-- uimaj-test-util/pom.xml | 4 ++-- uimaj-tools/pom.xml | 4 ++-- uimaj-v3migration-jcas/pom.xml | 4 ++-- 35 files changed, 70 insertions(+), 70 deletions(-) diff --git a/PearPackagingMavenPlugin/pom.xml b/PearPackagingMavenPlugin/pom.xml index 2b0c810..fd72046 100644 --- a/PearPackagingMavenPlugin/pom.xml +++ b/PearPackagingMavenPlugin/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.1 +3.1.2-SNAPSHOT ../uimaj-parent/pom.xml @@ -52,7 +52,7 @@ https://github.com/apache/uima-uimaj/tree/master/PearPackagingMavenPlugin -uimaj-3.1.1 +HEAD diff --git a/aggregate-uimaj-docbooks/pom.xml b/aggregate-uimaj-docbooks/pom.xml index ea0f661..bee2619 100644 --- a/aggregate-uimaj-docbooks/pom.xml +++ b/aggregate-uimaj-docbooks/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.1 +3.1.2-SNAPSHOT ../uimaj-parent/pom.xml @@ -50,7 +50,7 @@ https://github.com/apache/uima-uimaj/tree/master/aggregate-uimaj-docbooks -uimaj-3.1.1 +HEAD diff --git a/aggregate-uimaj-eclipse-plugins/pom.xml b/aggregate-uimaj-eclipse-plugins/pom.xml index af86063..917a5fd 100644 --- a/aggregate-uimaj-eclipse-plugins/pom.xml +++ b/aggregate-uimaj-eclipse-plugins/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.1 +3.1.2-SNAPSHOT ../uimaj-parent/pom.xml @@ -52,7 +52,7 @@ https://github.com/apache/uima-uimaj/tree/master/aggregate-uimaj-eclipse-plugins -uimaj-3.1.1 +HEAD diff --git a/aggregate-uimaj/pom.xml b/aggregate-uimaj/pom.xml index b80a4b3..f591db9 100644 --- a/aggregate-uimaj/pom.xml +++ b/aggregate-uimaj/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.1 +3.1.2-SNAPSHOT ../uimaj-parent/pom.xml @@ -51,7 +51,7 @@ https://github.com/apache/uima-uimaj/tree/master/aggregate-uimaj -uimaj-3.1.1 +HEAD diff --git a/jVinci/pom.xml b/jVinci/pom.xml index 5230b5c..37f2f8a 100644 --- a/jVinci/pom.xml +++ b/jVinci/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.1 +3.1.2-SNAPSHOT ../uimaj-parent/pom.xml @@ -54,7 +54,7 @@ https://github.com/apache/uima-uimaj/tree/master/jVinci -uimaj-3.1.1 +HEAD diff --git a/jcasgen-maven-plugin/pom.xml b/jcasgen-maven-plugin/pom.xml index 48cbc85..98ebd8e 100644 --- a/jcasgen-maven-plugin/pom.xml
[uima-uimaj] annotated tag uimaj-3.1.1 updated (cedce22 -> cb9cfd2)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to annotated tag uimaj-3.1.1 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. *** WARNING: tag uimaj-3.1.1 was modified! *** from cedce22 (commit) to cb9cfd2 (tag) tagging cedce2227c8a65405cdef8a4f430d5ee8d69a098 (commit) by Marshall Schor on Fri Nov 1 14:34:24 2019 -0400 - Log - [maven-release-plugin] copy for tag uimaj-3.1.1 --- No new revisions were added by this update. Summary of changes:
[uima-uimaj] branch master updated: [maven-release-plugin] prepare release uimaj-3.1.1
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 The following commit(s) were added to refs/heads/master by this push: new cedce22 [maven-release-plugin] prepare release uimaj-3.1.1 cedce22 is described below commit cedce2227c8a65405cdef8a4f430d5ee8d69a098 Author: Marshall Schor AuthorDate: Fri Nov 1 14:34:09 2019 -0400 [maven-release-plugin] prepare release uimaj-3.1.1 --- PearPackagingMavenPlugin/pom.xml| 3 ++- aggregate-uimaj-docbooks/pom.xml| 3 ++- aggregate-uimaj-eclipse-plugins/pom.xml | 3 ++- aggregate-uimaj/pom.xml | 3 ++- jVinci/pom.xml | 3 ++- jcasgen-maven-plugin/pom.xml| 3 ++- pom.xml | 3 ++- uima-docbook-overview-and-setup/pom.xml | 3 ++- uima-docbook-references/pom.xml | 3 ++- uima-docbook-tools/pom.xml | 3 ++- uima-docbook-tutorials-and-users-guides/pom.xml | 3 ++- uima-docbook-v3-users-guide/pom.xml | 3 ++- uimaj-adapter-soap/pom.xml | 3 ++- uimaj-adapter-vinci/pom.xml | 3 ++- uimaj-bootstrap/pom.xml | 3 ++- uimaj-component-test-util/pom.xml | 3 ++- uimaj-core/pom.xml | 3 ++- uimaj-cpe/pom.xml | 3 ++- uimaj-document-annotation/pom.xml | 3 ++- uimaj-eclipse-feature-runtime/pom.xml | 3 ++- uimaj-eclipse-feature-tools/pom.xml | 3 ++- uimaj-ep-cas-editor-ide/pom.xml | 3 ++- uimaj-ep-cas-editor/pom.xml | 3 ++- uimaj-ep-configurator/pom.xml | 3 ++- uimaj-ep-debug/pom.xml | 3 ++- uimaj-ep-jcasgen/pom.xml| 3 ++- uimaj-ep-launcher/pom.xml | 3 ++- uimaj-ep-pear-packager/pom.xml | 3 ++- uimaj-ep-runtime/pom.xml| 3 ++- uimaj-examples/pom.xml | 3 ++- uimaj-json/pom.xml | 3 ++- uimaj-parent/pom.xml| 3 ++- uimaj-test-util/pom.xml | 3 ++- uimaj-tools/pom.xml | 3 ++- uimaj-v3migration-jcas/pom.xml | 3 ++- 35 files changed, 70 insertions(+), 35 deletions(-) diff --git a/PearPackagingMavenPlugin/pom.xml b/PearPackagingMavenPlugin/pom.xml index 0a51e9a..2b0c810 100644 --- a/PearPackagingMavenPlugin/pom.xml +++ b/PearPackagingMavenPlugin/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.1-SNAPSHOT +3.1.1 ../uimaj-parent/pom.xml @@ -52,6 +52,7 @@ https://github.com/apache/uima-uimaj/tree/master/PearPackagingMavenPlugin +uimaj-3.1.1 diff --git a/aggregate-uimaj-docbooks/pom.xml b/aggregate-uimaj-docbooks/pom.xml index bf52ef0..ea0f661 100644 --- a/aggregate-uimaj-docbooks/pom.xml +++ b/aggregate-uimaj-docbooks/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.1-SNAPSHOT +3.1.1 ../uimaj-parent/pom.xml @@ -50,6 +50,7 @@ https://github.com/apache/uima-uimaj/tree/master/aggregate-uimaj-docbooks +uimaj-3.1.1 diff --git a/aggregate-uimaj-eclipse-plugins/pom.xml b/aggregate-uimaj-eclipse-plugins/pom.xml index bfacbc9..af86063 100644 --- a/aggregate-uimaj-eclipse-plugins/pom.xml +++ b/aggregate-uimaj-eclipse-plugins/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.1-SNAPSHOT +3.1.1 ../uimaj-parent/pom.xml @@ -52,6 +52,7 @@ https://github.com/apache/uima-uimaj/tree/master/aggregate-uimaj-eclipse-plugins +uimaj-3.1.1 diff --git a/aggregate-uimaj/pom.xml b/aggregate-uimaj/pom.xml index 6a5e344..b80a4b3 100644 --- a/aggregate-uimaj/pom.xml +++ b/aggregate-uimaj/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.1-SNAPSHOT +3.1.1 ../uimaj-parent/pom.xml @@ -51,6 +51,7 @@ https://github.com/apache/uima-uimaj/tree/master/aggregate-uimaj +uimaj-3.1.1 diff --git a/jVinci/pom.xml b/jVinci/pom.xml index ef1e4db..5230b5c 100644 --- a/jVinci/pom.xml +++ b/jVinci/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.1-SNAPSHOT +3.1.1 ../uimaj-parent/pom.xml @@ -54,6 +54,7 @@ https://github.com/apache/uima-uimaj/tree/master/jVinci +uimaj-3.1.1 diff --git a/jcasgen-maven-plugin/pom.xml b/jcasgen-maven-plugin/pom.xml index abb1d12..48cbc85 100644 --- a/jcasgen-maven-plugin/pom.xml +++ b/jcasgen-maven-plugin/pom.xml @@ -30,7 +30,7 @@ org.apache.uima
[uima-uimaj] branch master updated: no jira, rmv redundant el, fix misspelling
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 The following commit(s) were added to refs/heads/master by this push: new 54b9266 no jira, rmv redundant el, fix misspelling 54b9266 is described below commit 54b9266a1ff9f5b8fcf0e8c3de0e8b2494805b01 Author: Marshall Schor AuthorDate: Fri Nov 1 13:49:36 2019 -0400 no jira, rmv redundant el, fix misspelling --- uimaj-parent/pom.xml | 1 - uimaj-v3migration-jcas/pom.xml | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/uimaj-parent/pom.xml b/uimaj-parent/pom.xml index ab1346d..41a1f14 100644 --- a/uimaj-parent/pom.xml +++ b/uimaj-parent/pom.xml @@ -35,7 +35,6 @@ 13 - org.apache.uima uimaj-parent pom 3.1.1-SNAPSHOT diff --git a/uimaj-v3migration-jcas/pom.xml b/uimaj-v3migration-jcas/pom.xml index d764b4e..2ecdb8b 100644 --- a/uimaj-v3migration-jcas/pom.xml +++ b/uimaj-v3migration-jcas/pom.xml @@ -35,13 +35,13 @@ - scm:git:https://github.com/apache/uima-uimaj/uimaj-jcas + scm:git:https://github.com/apache/uima-uimaj/uimaj-v3migration-jcas - scm:git:https://github.com/apache/uima-uimaj/uimaj-jcas + scm:git:https://github.com/apache/uima-uimaj/uimaj-v3migration-jcas - https://github.com/apache/uima-uimaj/tree/master/uimaj-jcas + https://github.com/apache/uima-uimaj/tree/master/uimaj-v3migration-jcas
[uima-uimaj] branch master-v2 updated (ca2703c -> 409a346)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch master-v2 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. from ca2703c [UIMA-6126] add gitattributes, and gitignore for 2 eclipse feature proj add 30ad3e3 [UIMA-6138] change scm in pom for git add 50f2079 [UIMA-6141] move combine.self to proper element new 409a346 Merge pull request #15 from apache/UIMA-6138-v2 The 1 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: PearPackagingMavenPlugin/pom.xml| 6 +++--- aggregate-uimaj-docbooks/pom.xml| 6 +++--- aggregate-uimaj-eclipse-plugins/pom.xml | 6 +++--- aggregate-uimaj/pom.xml | 6 +++--- jVinci/pom.xml | 6 +++--- jcasgen-maven-plugin/pom.xml| 6 +++--- pom.xml | 6 +++--- uima-docbook-overview-and-setup/pom.xml | 6 +++--- uima-docbook-references/pom.xml | 6 +++--- uima-docbook-tools/pom.xml | 6 +++--- uima-docbook-tutorials-and-users-guides/pom.xml | 6 +++--- uimaj-adapter-soap/pom.xml | 6 +++--- uimaj-adapter-vinci/pom.xml | 6 +++--- uimaj-bootstrap/pom.xml | 6 +++--- uimaj-component-test-util/pom.xml | 6 +++--- uimaj-core/pom.xml | 6 +++--- uimaj-cpe/pom.xml | 6 +++--- uimaj-document-annotation/pom.xml | 6 +++--- uimaj-eclipse-feature-runtime/pom.xml | 6 +++--- uimaj-eclipse-feature-tools/pom.xml | 6 +++--- uimaj-eclipse-update-site/pom.xml | 10 +- uimaj-ep-cas-editor-ide/pom.xml | 6 +++--- uimaj-ep-cas-editor/pom.xml | 6 +++--- uimaj-ep-configurator/pom.xml | 6 +++--- uimaj-ep-debug/pom.xml | 6 +++--- uimaj-ep-jcasgen/pom.xml| 6 +++--- uimaj-ep-launcher/pom.xml | 6 +++--- uimaj-ep-pear-packager/pom.xml | 6 +++--- uimaj-ep-runtime/pom.xml| 6 +++--- uimaj-examples/pom.xml | 6 +++--- uimaj-json/pom.xml | 6 +++--- uimaj-parent/pom.xml| 6 +++--- uimaj-test-util/pom.xml | 6 +++--- uimaj-tools/pom.xml | 6 +++--- 34 files changed, 104 insertions(+), 104 deletions(-)
[uima-uimaj] 01/01: Merge pull request #15 from apache/UIMA-6138-v2
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch master-v2 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git commit 409a346ba3a0b9c6e029fd3d0ad53e6fb3c15ec3 Merge: ca2703c 50f2079 Author: mischor AuthorDate: Thu Oct 31 17:18:59 2019 -0400 Merge pull request #15 from apache/UIMA-6138-v2 Uima 6138 v2 PearPackagingMavenPlugin/pom.xml| 6 +++--- aggregate-uimaj-docbooks/pom.xml| 6 +++--- aggregate-uimaj-eclipse-plugins/pom.xml | 6 +++--- aggregate-uimaj/pom.xml | 6 +++--- jVinci/pom.xml | 6 +++--- jcasgen-maven-plugin/pom.xml| 6 +++--- pom.xml | 6 +++--- uima-docbook-overview-and-setup/pom.xml | 6 +++--- uima-docbook-references/pom.xml | 6 +++--- uima-docbook-tools/pom.xml | 6 +++--- uima-docbook-tutorials-and-users-guides/pom.xml | 6 +++--- uimaj-adapter-soap/pom.xml | 6 +++--- uimaj-adapter-vinci/pom.xml | 6 +++--- uimaj-bootstrap/pom.xml | 6 +++--- uimaj-component-test-util/pom.xml | 6 +++--- uimaj-core/pom.xml | 6 +++--- uimaj-cpe/pom.xml | 6 +++--- uimaj-document-annotation/pom.xml | 6 +++--- uimaj-eclipse-feature-runtime/pom.xml | 6 +++--- uimaj-eclipse-feature-tools/pom.xml | 6 +++--- uimaj-eclipse-update-site/pom.xml | 10 +- uimaj-ep-cas-editor-ide/pom.xml | 6 +++--- uimaj-ep-cas-editor/pom.xml | 6 +++--- uimaj-ep-configurator/pom.xml | 6 +++--- uimaj-ep-debug/pom.xml | 6 +++--- uimaj-ep-jcasgen/pom.xml| 6 +++--- uimaj-ep-launcher/pom.xml | 6 +++--- uimaj-ep-pear-packager/pom.xml | 6 +++--- uimaj-ep-runtime/pom.xml| 6 +++--- uimaj-examples/pom.xml | 6 +++--- uimaj-json/pom.xml | 6 +++--- uimaj-parent/pom.xml| 6 +++--- uimaj-test-util/pom.xml | 6 +++--- uimaj-tools/pom.xml | 6 +++--- 34 files changed, 104 insertions(+), 104 deletions(-)
[uima-uimaj] branch master updated: no jira - update pom Jira release pointer, api prev ref, and release notes
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
The following commit(s) were added to refs/heads/master by this push:
new 7509f4a no jira - update pom Jira release pointer, api prev ref, and
release notes
7509f4a is described below
commit 7509f4adb1cfb35de4d3f214fc2b9a5a5e50f3f1
Author: Marshall Schor
AuthorDate: Thu Oct 31 16:31:00 2019 -0400
no jira - update pom Jira release pointer, api prev ref, and release
notes
---
RELEASE_NOTES.html | 45 +
pom.xml | 2 +-
uimaj-parent/pom.xml | 2 +-
3 files changed, 7 insertions(+), 42 deletions(-)
diff --git a/RELEASE_NOTES.html b/RELEASE_NOTES.html
index ae88597..7595c28 100644
--- a/RELEASE_NOTES.html
+++ b/RELEASE_NOTES.html
@@ -81,53 +81,18 @@
Major Changes in this Release
-Version 3.1.0 is a minor update to 3.0.2, mainly bug fixes.
-The major version was updated because the generated JCas classes
-now include for FSArrays, the generic type of the component, if known.
-
-When migrating from v2, if non-built-in JCas cover classes are being used,
-a one-time regeneration or migration step is required for these.
-Please read the Version 3 users guide located in the docs directory
-for information on these changes and the migration tool which can
-aid in migrating existing JCas class definitions.
+Version 3.1.1 is a minor update to 3.1.0.
-A very brief summary of version 3 vs version 2:
-Feature Structures become Java Objects,
-subject to Garbage Collection, just like any other objects,
-when no longer reachable.
-Iterating over indexes no longer throws
-ConcurrentModificationException.
-Support for arbitrary Java Objects in the CAS,
-using special custom implementations of JCas cover classes for those.
-Using the above new capability, new semi-built-ins for three new types:
ArrayList style
-lists of Feature Structures and ints, and an FSHashSet
-New "select" framework for flexible
-access to Feature Structures, that can ignore typeOrdering keys in
indexes.
-Integration with Java 8 facilities such as Streams
-Logging framework upgraded, supporting embedding UIMA in other frameworks
using
-popular logging APIs
-There are many performance improvements
-
-
-
-Please read the Version 3 users guide for more details.
-
-Specific changes in release 3.1.0 versus 3.0.2 include
+Specific changes in release 3.1.1 versus 3.1.0 include
- Fixed a problem preventing the Component Descriptor editor from running
with the lastest Eclipse 2019-6
- Fixed a bug on deserialization of typed arrays edge case
- Better support for control of class loader switching when running
sub-pipelines, including PEARs
- better support for shared 0-length typed FSArrays
- Fixed a bug in Internationalized Messaging in PEARs and other contexts,
edge case.
- JCasGen now generates FSArray values with generic types, if the
component type is specified.
+ Migrated to Git from SVN, updated poms to reflect this
+ Fixed a performance bug when working with 100's of CASs with the same
type system
API changes
- There is an API compatibility report covering the non-internal APIs;
- see change report for the list of API
changes
- since version 3.0.2.
+ None this release.
Full list of JIRA Issues affecting this
Release
diff --git a/pom.xml b/pom.xml
index ce49d5e..9d1447f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
${project.artifactId}
-3.1.0SDK
+3.1.1SDK
uimaj-${project.version}
src/main/assembly/bin-without-jackson.xml
${ibmNoticeText}
diff --git a/uimaj-parent/pom.xml b/uimaj-parent/pom.xml
index b91fae8..ab1346d 100644
--- a/uimaj-parent/pom.xml
+++ b/uimaj-parent/pom.xml
@@ -156,7 +156,7 @@
-3.0.2
+3.1.0
[uima-uimaj] branch master updated: [UIMA-6141] move combine.self to child element of
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 The following commit(s) were added to refs/heads/master by this push: new cf7fa1f [UIMA-6141] move combine.self to child element of cf7fa1f is described below commit cf7fa1f22375bad1dcfceef88efc98bc3933f346 Author: Marshall Schor AuthorDate: Thu Oct 31 15:49:18 2019 -0400 [UIMA-6141] move combine.self to child element of --- 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 fdcd42a..b6b673a 100644 --- a/uimaj-eclipse-update-site/pom.xml +++ b/uimaj-eclipse-update-site/pom.xml @@ -131,8 +131,8 @@ run - - + +
[uima-uimaj] branch master updated (2b87fc8 -> 534b4b2)
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 2b87fc8 [UIMA-6136] fix hashcode and equals for FsIndexComparatorImpl (#13) add ed95d23 [UIMA-6138] initial work on scm mods and release plugin add 2380a12 UIMA-6138 update scm elements on all poms to git equivalents new 534b4b2 Merge pull request #14 from apache/UIMA-6138 The 1 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: PearPackagingMavenPlugin/pom.xml| 6 +++--- aggregate-uimaj-docbooks/pom.xml| 6 +++--- aggregate-uimaj-eclipse-plugins/pom.xml | 6 +++--- aggregate-uimaj/pom.xml | 6 +++--- jVinci/pom.xml | 6 +++--- jcasgen-maven-plugin/pom.xml| 6 +++--- pom.xml | 6 +++--- uima-docbook-overview-and-setup/pom.xml | 6 +++--- uima-docbook-references/pom.xml | 6 +++--- uima-docbook-tools/pom.xml | 6 +++--- uima-docbook-tutorials-and-users-guides/pom.xml | 6 +++--- uima-docbook-v3-users-guide/pom.xml | 6 +++--- uimaj-adapter-soap/pom.xml | 6 +++--- uimaj-adapter-vinci/pom.xml | 6 +++--- uimaj-bootstrap/pom.xml | 6 +++--- uimaj-component-test-util/pom.xml | 6 +++--- uimaj-core/pom.xml | 6 +++--- uimaj-cpe/pom.xml | 6 +++--- uimaj-document-annotation/pom.xml | 6 +++--- uimaj-eclipse-feature-runtime/pom.xml | 6 +++--- uimaj-eclipse-feature-tools/pom.xml | 6 +++--- uimaj-eclipse-update-site/pom.xml | 6 +++--- uimaj-ep-cas-editor-ide/pom.xml | 6 +++--- uimaj-ep-cas-editor/pom.xml | 6 +++--- uimaj-ep-configurator/pom.xml | 6 +++--- uimaj-ep-debug/pom.xml | 6 +++--- uimaj-ep-jcasgen/pom.xml| 6 +++--- uimaj-ep-launcher/pom.xml | 6 +++--- uimaj-ep-pear-packager/pom.xml | 6 +++--- uimaj-ep-runtime/pom.xml| 6 +++--- uimaj-examples/pom.xml | 6 +++--- uimaj-json/pom.xml | 6 +++--- uimaj-parent/pom.xml| 6 +++--- uimaj-test-util/pom.xml | 6 +++--- uimaj-tools/pom.xml | 6 +++--- uimaj-v3migration-jcas/pom.xml | 6 +++--- 36 files changed, 108 insertions(+), 108 deletions(-)
[uima-uimaj] 01/01: Merge pull request #14 from apache/UIMA-6138
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 534b4b24a3cc8e92d82e2cfbb0411a7a6a88a657 Merge: 2b87fc8 2380a12 Author: mischor AuthorDate: Thu Oct 31 15:40:02 2019 -0400 Merge pull request #14 from apache/UIMA-6138 Uima 6138 PearPackagingMavenPlugin/pom.xml| 6 +++--- aggregate-uimaj-docbooks/pom.xml| 6 +++--- aggregate-uimaj-eclipse-plugins/pom.xml | 6 +++--- aggregate-uimaj/pom.xml | 6 +++--- jVinci/pom.xml | 6 +++--- jcasgen-maven-plugin/pom.xml| 6 +++--- pom.xml | 6 +++--- uima-docbook-overview-and-setup/pom.xml | 6 +++--- uima-docbook-references/pom.xml | 6 +++--- uima-docbook-tools/pom.xml | 6 +++--- uima-docbook-tutorials-and-users-guides/pom.xml | 6 +++--- uima-docbook-v3-users-guide/pom.xml | 6 +++--- uimaj-adapter-soap/pom.xml | 6 +++--- uimaj-adapter-vinci/pom.xml | 6 +++--- uimaj-bootstrap/pom.xml | 6 +++--- uimaj-component-test-util/pom.xml | 6 +++--- uimaj-core/pom.xml | 6 +++--- uimaj-cpe/pom.xml | 6 +++--- uimaj-document-annotation/pom.xml | 6 +++--- uimaj-eclipse-feature-runtime/pom.xml | 6 +++--- uimaj-eclipse-feature-tools/pom.xml | 6 +++--- uimaj-eclipse-update-site/pom.xml | 6 +++--- uimaj-ep-cas-editor-ide/pom.xml | 6 +++--- uimaj-ep-cas-editor/pom.xml | 6 +++--- uimaj-ep-configurator/pom.xml | 6 +++--- uimaj-ep-debug/pom.xml | 6 +++--- uimaj-ep-jcasgen/pom.xml| 6 +++--- uimaj-ep-launcher/pom.xml | 6 +++--- uimaj-ep-pear-packager/pom.xml | 6 +++--- uimaj-ep-runtime/pom.xml| 6 +++--- uimaj-examples/pom.xml | 6 +++--- uimaj-json/pom.xml | 6 +++--- uimaj-parent/pom.xml| 6 +++--- uimaj-test-util/pom.xml | 6 +++--- uimaj-tools/pom.xml | 6 +++--- uimaj-v3migration-jcas/pom.xml | 6 +++--- 36 files changed, 108 insertions(+), 108 deletions(-)
[uima-uimaj] branch UIMA-6138-v2 updated: [UIMA-6141] move combine.self to proper element
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch UIMA-6138-v2 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git The following commit(s) were added to refs/heads/UIMA-6138-v2 by this push: new 50f2079 [UIMA-6141] move combine.self to proper element 50f2079 is described below commit 50f2079ffe513b49d25abf2b8a4bd19bda4e5259 Author: Marshall Schor AuthorDate: Thu Oct 31 13:56:06 2019 -0400 [UIMA-6141] move combine.self to proper element --- 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 edc8d3c..f3f1707 100644 --- a/uimaj-eclipse-update-site/pom.xml +++ b/uimaj-eclipse-update-site/pom.xml @@ -131,8 +131,8 @@ run - - + +
[uima-uimaj] branch UIMA-6138-v2 updated: [UIMA-6138] change scm in pom for git
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch UIMA-6138-v2 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git The following commit(s) were added to refs/heads/UIMA-6138-v2 by this push: new 30ad3e3 [UIMA-6138] change scm in pom for git 30ad3e3 is described below commit 30ad3e3d91bcba8e4fe8c2a7d40baab3a9b68793 Author: Marshall Schor AuthorDate: Thu Oct 31 13:46:16 2019 -0400 [UIMA-6138] change scm in pom for git --- PearPackagingMavenPlugin/pom.xml| 6 +++--- aggregate-uimaj-docbooks/pom.xml| 6 +++--- aggregate-uimaj-eclipse-plugins/pom.xml | 6 +++--- aggregate-uimaj/pom.xml | 6 +++--- jVinci/pom.xml | 6 +++--- jcasgen-maven-plugin/pom.xml| 6 +++--- pom.xml | 6 +++--- uima-docbook-overview-and-setup/pom.xml | 6 +++--- uima-docbook-references/pom.xml | 6 +++--- uima-docbook-tools/pom.xml | 6 +++--- uima-docbook-tutorials-and-users-guides/pom.xml | 6 +++--- uimaj-adapter-soap/pom.xml | 6 +++--- uimaj-adapter-vinci/pom.xml | 6 +++--- uimaj-bootstrap/pom.xml | 6 +++--- uimaj-component-test-util/pom.xml | 6 +++--- uimaj-core/pom.xml | 6 +++--- uimaj-cpe/pom.xml | 6 +++--- uimaj-document-annotation/pom.xml | 6 +++--- uimaj-eclipse-feature-runtime/pom.xml | 6 +++--- uimaj-eclipse-feature-tools/pom.xml | 6 +++--- uimaj-eclipse-update-site/pom.xml | 6 +++--- uimaj-ep-cas-editor-ide/pom.xml | 6 +++--- uimaj-ep-cas-editor/pom.xml | 6 +++--- uimaj-ep-configurator/pom.xml | 6 +++--- uimaj-ep-debug/pom.xml | 6 +++--- uimaj-ep-jcasgen/pom.xml| 6 +++--- uimaj-ep-launcher/pom.xml | 6 +++--- uimaj-ep-pear-packager/pom.xml | 6 +++--- uimaj-ep-runtime/pom.xml| 6 +++--- uimaj-examples/pom.xml | 6 +++--- uimaj-json/pom.xml | 6 +++--- uimaj-parent/pom.xml| 6 +++--- uimaj-test-util/pom.xml | 6 +++--- uimaj-tools/pom.xml | 6 +++--- 34 files changed, 102 insertions(+), 102 deletions(-) diff --git a/PearPackagingMavenPlugin/pom.xml b/PearPackagingMavenPlugin/pom.xml index 5b37385..e226131 100644 --- a/PearPackagingMavenPlugin/pom.xml +++ b/PearPackagingMavenPlugin/pom.xml @@ -44,13 +44,13 @@ element, and just changing the following two properties --> - scm:svn:https://svn.apache.org/repos/asf/uima/uimaj/trunk/PearPackagingMavenPlugin + scm:git:https://github.com/apache/uima-uimaj/tree/master-v2/PearPackagingMavenPlugin - scm:svn:https://svn.apache.org/repos/asf/uima/uimaj/trunk/PearPackagingMavenPlugin + scm:git:https://github.com/apache/uima-uimaj/tree/master-v2/PearPackagingMavenPlugin - https://svn.apache.org/viewvc/uima/uimaj/trunk/PearPackagingMavenPlugin + https://github.com/apache/uima-uimaj/tree/master-v2/PearPackagingMavenPlugin diff --git a/aggregate-uimaj-docbooks/pom.xml b/aggregate-uimaj-docbooks/pom.xml index 41023fc..d758609 100644 --- a/aggregate-uimaj-docbooks/pom.xml +++ b/aggregate-uimaj-docbooks/pom.xml @@ -42,13 +42,13 @@ element, and just changing the following two properties --> - scm:svn:https://svn.apache.org/repos/asf/uima/uimaj/trunk/aggregate-uimaj-docbooks + scm:git:https://github.com/apache/uima-uimaj/tree/master-v2/aggregate-uimaj-docbooks - scm:svn:https://svn.apache.org/repos/asf/uima/uimaj/trunk/aggregate-uimaj-docbooks + scm:git:https://github.com/apache/uima-uimaj/tree/master-v2/aggregate-uimaj-docbooks - https://svn.apache.org/viewvc/uima/uimaj/trunk/aggregate-uimaj-docbooks + https://github.com/apache/uima-uimaj/tree/master-v2/aggregate-uimaj-docbooks diff --git a/aggregate-uimaj-eclipse-plugins/pom.xml b/aggregate-uimaj-eclipse-plugins/pom.xml index 212312f..8782e94 100644 --- a/aggregate-uimaj-eclipse-plugins/pom.xml +++ b/aggregate-uimaj-eclipse-plugins/pom.xml @@ -44,13 +44,13 @@ element, and just changing the following two properties --> - scm:svn:https://svn.apache.org/repos/asf/uima/uimaj/trunk/aggregate-uimaj-eclipse-plugins + scm:git:https://github.com/apache/uima-uimaj/tree/master-v2/aggregate-uimaj-eclipse-plugins - scm:svn:https://svn.apache.org/repos/asf/uima/uimaj/trunk/aggregate-uimaj-eclipse-plugins + scm:git:https://github.com/apache/uima-u
[uima-uimaj] branch UIMA-6138-v2 created (now ca2703c)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch UIMA-6138-v2 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. at ca2703c [UIMA-6126] add gitattributes, and gitignore for 2 eclipse feature proj No new revisions were added by this update.
svn commit: r1869214 - in /uima/site/trunk/uima-website: docs/git-release-notes.html docs/stylesheets/base.css xdocs/git-release-notes.xml
Author: schor
Date: Thu Oct 31 14:04:14 2019
New Revision: 1869214
URL: http://svn.apache.org/viewvc?rev=1869214=rev
Log:
no jira update git things, change the font size for tag to be only
slightly larger than normal (was too large)
Modified:
uima/site/trunk/uima-website/docs/git-release-notes.html
uima/site/trunk/uima-website/docs/stylesheets/base.css
uima/site/trunk/uima-website/xdocs/git-release-notes.xml
Modified: uima/site/trunk/uima-website/docs/git-release-notes.html
URL:
http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/git-release-notes.html?rev=1869214=1869213=1869214=diff
==
--- uima/site/trunk/uima-website/docs/git-release-notes.html (original)
+++ uima/site/trunk/uima-website/docs/git-release-notes.html Thu Oct 31
14:04:14 2019
@@ -226,6 +226,29 @@
+Suggested basic release
flow
+
+
+
+Update the master in
preparation for the release, including things like the Readme, release-notes,
+ the Jira release pointer for ISSUES Fixed, API compatibility:
previous version.
+ See checklist-release
+
+ (optional) If others might be continuing to update master,
make a release branch, and do all the work
+ on that branch. Once the release is out, merge the branch
back into the master (should have
+ very little change, other than new pom SNAPSHOT version
levels).
+
+ Checkout the release branch, and run the normal maven release
prepare / perform cycles.
+ Once the vote passes, retag the last rc with the rel/tag-name
(see below).
+ If branched, merge the release branch back into the master
(updating the pom SNAPSHOT version numbers).
+
+
+
+
+
+
+
+
Tags
Modified: uima/site/trunk/uima-website/docs/stylesheets/base.css
URL:
http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/stylesheets/base.css?rev=1869214=1869213=1869214=diff
==
--- uima/site/trunk/uima-website/docs/stylesheets/base.css (original)
+++ uima/site/trunk/uima-website/docs/stylesheets/base.css Thu Oct 31 14:04:14
2019
@@ -110,13 +110,13 @@ dl dd {
margin-left: 6em;
}
pre, code {
- font-size: 115%;
+ font-size: 108%;
*font-size: 100%;
font-family: Courier, "Courier New";
}
pre code {
- font-size: 100%
+ font-size: 108%
}
pre {
Modified: uima/site/trunk/uima-website/xdocs/git-release-notes.xml
URL:
http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/git-release-notes.xml?rev=1869214=1869213=1869214=diff
==
--- uima/site/trunk/uima-website/xdocs/git-release-notes.xml (original)
+++ uima/site/trunk/uima-website/xdocs/git-release-notes.xml Thu Oct 31
14:04:14 2019
@@ -26,6 +26,24 @@ under the License.
+
+ Update the master in preparation for the release, including
things like the Readme, release-notes,
+ the Jira release pointer for ISSUES Fixed, API compatibility:
previous version.
+ See checklist-release
+
+ (optional) If others might be continuing to update master,
make a release branch, and do all the work
+ on that branch. Once the release is out, merge the branch
back into the master (should have
+ very little change, other than new pom SNAPSHOT version
levels).
+
+ Checkout the release branch, and run the normal maven release
prepare / perform cycles.
+ Once the vote passes, retag the last rc with the rel/tag-name
(see below).
+ If branched, merge the release branch back into the master
(updating the pom SNAPSHOT version numbers).
+
+
+
+
+
Tags are stored in the .git folder in the subfolder
/refs/tags.
svn commit: r1869178 - in /uima/site/trunk/uima-website: docs/ xdocs/
Author: schor Date: Wed Oct 30 14:58:01 2019 New Revision: 1869178 URL: http://svn.apache.org/viewvc?rev=1869178=rev Log: no jira - update git processes including how to release Modified: uima/site/trunk/uima-website/docs/convert-to-git.html uima/site/trunk/uima-website/docs/git-release-notes.html uima/site/trunk/uima-website/docs/git-svn-notes.html uima/site/trunk/uima-website/docs/git-work-process.html uima/site/trunk/uima-website/xdocs/convert-to-git.xml uima/site/trunk/uima-website/xdocs/git-release-notes.xml uima/site/trunk/uima-website/xdocs/git-svn-notes.xml uima/site/trunk/uima-website/xdocs/git-work-process.xml Modified: uima/site/trunk/uima-website/docs/convert-to-git.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/convert-to-git.html?rev=1869178=1869177=1869178=diff == --- uima/site/trunk/uima-website/docs/convert-to-git.html (original) +++ uima/site/trunk/uima-website/docs/convert-to-git.html Wed Oct 30 14:58:01 2019 @@ -231,9 +231,16 @@ This describes the various steps needed in converting a project from SVN to GIT. -Setup Read-only mirror, if not already done File INFRA Jira ticket to convert read-only mirror to r/w +Tell the dev list this is happening, so people should not make any changes until the conversion is done. + This may take 2-3 weeks, depending on INFRA workload. +Prior to doing the ticket, if you want the top level named "master" instead of "trunk", do that change + in SVN, and let it propogate to the read-only mirror (if one exists). This will save time after the + migration, because renames involve help from INFRA. File INFRA Jira tickets for additional setup or fixups +If a rename is needed at this point for master/trunk, you'll need to ask INFRA to protect master + after the rename, and to set it as the default (removing trunk as the default). Once INFRA does this, + you can delete the old trunk. Renaming Branches In SVN, the main work goes into a spot under the name "trunk". The convention in git is to name this the "master". @@ -254,6 +261,17 @@ https://help.github.com/en/articles/about-protected-branches. Individual projects within UIMA may request additional branch protection settings be set, via INFRA Jira issues. +Updating POMs for GIT +POMs have an scm element that points to svn, and it should be updated as follows: + + +For both the connection and developerConnection: + scm:git:https://github.com/apache/...proj-name.../...subdir... + +For the url: this should point to the source code at github, e.g. + https://github.com/apache/...proj-name.../tree/master/...sub-proj-name... +For uima-v2, replace master with master-v2 + Modified: uima/site/trunk/uima-website/docs/git-release-notes.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/git-release-notes.html?rev=1869178=1869177=1869178=diff == --- uima/site/trunk/uima-website/docs/git-release-notes.html (original) +++ uima/site/trunk/uima-website/docs/git-release-notes.html Wed Oct 30 14:58:01 2019 @@ -232,14 +232,83 @@ Tags are stored in the .git folder in the subfolder /refs/tags. When Apache Infra sets up a writable git project, they set - https://help.github.com/en/github/administering-a-repository/about-protected-branches;> - github protection. The protection is set on - refs/heads/trunk - refs/heads/master - refs/heads/rel/ - refs/tags/rel/ - - + https://help.github.com/en/github/administering-a-repository/about-protected-branches;> + github protection. The protection is set on + refs/heads/trunk + refs/heads/master + refs/heads/rel/ + refs/tags/rel/ + + +After a release passes, make a new tag for the relea
[uima-uimaj] branch UIMA-6138 updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch UIMA-6138 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git The following commit(s) were added to refs/heads/UIMA-6138 by this push: new f3671c5 [maven-release-plugin] prepare for next development iteration f3671c5 is described below commit f3671c533bf5d53c9cd0102093681fa11381599f Author: Marshall Schor AuthorDate: Tue Oct 29 17:49:47 2019 -0400 [maven-release-plugin] prepare for next development iteration --- PearPackagingMavenPlugin/pom.xml| 4 ++-- aggregate-uimaj-docbooks/pom.xml| 4 ++-- aggregate-uimaj-eclipse-plugins/pom.xml | 4 ++-- aggregate-uimaj/pom.xml | 4 ++-- jVinci/pom.xml | 4 ++-- jcasgen-maven-plugin/pom.xml| 4 ++-- pom.xml | 4 ++-- uima-docbook-overview-and-setup/pom.xml | 4 ++-- uima-docbook-references/pom.xml | 4 ++-- uima-docbook-tools/pom.xml | 4 ++-- uima-docbook-tutorials-and-users-guides/pom.xml | 4 ++-- uima-docbook-v3-users-guide/pom.xml | 4 ++-- uimaj-adapter-soap/pom.xml | 4 ++-- uimaj-adapter-vinci/pom.xml | 4 ++-- uimaj-bootstrap/pom.xml | 4 ++-- uimaj-component-test-util/pom.xml | 4 ++-- uimaj-core/pom.xml | 4 ++-- uimaj-cpe/pom.xml | 4 ++-- uimaj-document-annotation/pom.xml | 4 ++-- uimaj-eclipse-feature-runtime/pom.xml | 4 ++-- uimaj-eclipse-feature-tools/pom.xml | 4 ++-- uimaj-ep-cas-editor-ide/pom.xml | 4 ++-- uimaj-ep-cas-editor/pom.xml | 4 ++-- uimaj-ep-configurator/pom.xml | 4 ++-- uimaj-ep-debug/pom.xml | 4 ++-- uimaj-ep-jcasgen/pom.xml| 4 ++-- uimaj-ep-launcher/pom.xml | 4 ++-- uimaj-ep-pear-packager/pom.xml | 4 ++-- uimaj-ep-runtime/pom.xml| 4 ++-- uimaj-examples/pom.xml | 4 ++-- uimaj-json/pom.xml | 4 ++-- uimaj-parent/pom.xml| 4 ++-- uimaj-test-util/pom.xml | 4 ++-- uimaj-tools/pom.xml | 4 ++-- uimaj-v3migration-jcas/pom.xml | 4 ++-- 35 files changed, 70 insertions(+), 70 deletions(-) diff --git a/PearPackagingMavenPlugin/pom.xml b/PearPackagingMavenPlugin/pom.xml index 2b0c810..fd72046 100644 --- a/PearPackagingMavenPlugin/pom.xml +++ b/PearPackagingMavenPlugin/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.1 +3.1.2-SNAPSHOT ../uimaj-parent/pom.xml @@ -52,7 +52,7 @@ https://github.com/apache/uima-uimaj/tree/master/PearPackagingMavenPlugin -uimaj-3.1.1 +HEAD diff --git a/aggregate-uimaj-docbooks/pom.xml b/aggregate-uimaj-docbooks/pom.xml index ea0f661..bee2619 100644 --- a/aggregate-uimaj-docbooks/pom.xml +++ b/aggregate-uimaj-docbooks/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.1 +3.1.2-SNAPSHOT ../uimaj-parent/pom.xml @@ -50,7 +50,7 @@ https://github.com/apache/uima-uimaj/tree/master/aggregate-uimaj-docbooks -uimaj-3.1.1 +HEAD diff --git a/aggregate-uimaj-eclipse-plugins/pom.xml b/aggregate-uimaj-eclipse-plugins/pom.xml index af86063..917a5fd 100644 --- a/aggregate-uimaj-eclipse-plugins/pom.xml +++ b/aggregate-uimaj-eclipse-plugins/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.1 +3.1.2-SNAPSHOT ../uimaj-parent/pom.xml @@ -52,7 +52,7 @@ https://github.com/apache/uima-uimaj/tree/master/aggregate-uimaj-eclipse-plugins -uimaj-3.1.1 +HEAD diff --git a/aggregate-uimaj/pom.xml b/aggregate-uimaj/pom.xml index b80a4b3..f591db9 100644 --- a/aggregate-uimaj/pom.xml +++ b/aggregate-uimaj/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.1 +3.1.2-SNAPSHOT ../uimaj-parent/pom.xml @@ -51,7 +51,7 @@ https://github.com/apache/uima-uimaj/tree/master/aggregate-uimaj -uimaj-3.1.1 +HEAD diff --git a/jVinci/pom.xml b/jVinci/pom.xml index 5230b5c..37f2f8a 100644 --- a/jVinci/pom.xml +++ b/jVinci/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.1 +3.1.2-SNAPSHOT ../uimaj-parent/pom.xml @@ -54,7 +54,7 @@ https://github.com/apache/uima-uimaj/tree/master/jVinci -uimaj-3.1.1 +HEAD diff --git a/jcasgen-maven-plugin/pom.xml b/jcasgen-maven-plugin/pom.xml index 48cbc85..98ebd8e 100644 --- a/jcasgen-maven-plugin
[uima-uimaj] annotated tag uimaj-3.1.1 updated (ae3b00f -> c9532e7)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to annotated tag uimaj-3.1.1 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. *** WARNING: tag uimaj-3.1.1 was modified! *** from ae3b00f (commit) to c9532e7 (tag) tagging ae3b00fe304b9639061c3b0b5c639cfbb0df3663 (commit) by Marshall Schor on Tue Oct 29 17:49:40 2019 -0400 - Log - [maven-release-plugin] copy for tag uimaj-3.1.1 --- No new revisions were added by this update. Summary of changes:
[uima-uimaj] branch UIMA-6138 updated: [maven-release-plugin] prepare release uimaj-3.1.1
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch UIMA-6138 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git The following commit(s) were added to refs/heads/UIMA-6138 by this push: new ae3b00f [maven-release-plugin] prepare release uimaj-3.1.1 ae3b00f is described below commit ae3b00fe304b9639061c3b0b5c639cfbb0df3663 Author: Marshall Schor AuthorDate: Tue Oct 29 17:49:26 2019 -0400 [maven-release-plugin] prepare release uimaj-3.1.1 --- PearPackagingMavenPlugin/pom.xml| 3 ++- aggregate-uimaj-docbooks/pom.xml| 3 ++- aggregate-uimaj-eclipse-plugins/pom.xml | 3 ++- aggregate-uimaj/pom.xml | 3 ++- jVinci/pom.xml | 3 ++- jcasgen-maven-plugin/pom.xml| 3 ++- pom.xml | 3 ++- uima-docbook-overview-and-setup/pom.xml | 3 ++- uima-docbook-references/pom.xml | 3 ++- uima-docbook-tools/pom.xml | 3 ++- uima-docbook-tutorials-and-users-guides/pom.xml | 3 ++- uima-docbook-v3-users-guide/pom.xml | 3 ++- uimaj-adapter-soap/pom.xml | 3 ++- uimaj-adapter-vinci/pom.xml | 3 ++- uimaj-bootstrap/pom.xml | 3 ++- uimaj-component-test-util/pom.xml | 3 ++- uimaj-core/pom.xml | 3 ++- uimaj-cpe/pom.xml | 3 ++- uimaj-document-annotation/pom.xml | 3 ++- uimaj-eclipse-feature-runtime/pom.xml | 3 ++- uimaj-eclipse-feature-tools/pom.xml | 3 ++- uimaj-ep-cas-editor-ide/pom.xml | 3 ++- uimaj-ep-cas-editor/pom.xml | 3 ++- uimaj-ep-configurator/pom.xml | 3 ++- uimaj-ep-debug/pom.xml | 3 ++- uimaj-ep-jcasgen/pom.xml| 3 ++- uimaj-ep-launcher/pom.xml | 3 ++- uimaj-ep-pear-packager/pom.xml | 3 ++- uimaj-ep-runtime/pom.xml| 3 ++- uimaj-examples/pom.xml | 3 ++- uimaj-json/pom.xml | 3 ++- uimaj-parent/pom.xml| 3 ++- uimaj-test-util/pom.xml | 3 ++- uimaj-tools/pom.xml | 3 ++- uimaj-v3migration-jcas/pom.xml | 3 ++- 35 files changed, 70 insertions(+), 35 deletions(-) diff --git a/PearPackagingMavenPlugin/pom.xml b/PearPackagingMavenPlugin/pom.xml index 0a51e9a..2b0c810 100644 --- a/PearPackagingMavenPlugin/pom.xml +++ b/PearPackagingMavenPlugin/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.1-SNAPSHOT +3.1.1 ../uimaj-parent/pom.xml @@ -52,6 +52,7 @@ https://github.com/apache/uima-uimaj/tree/master/PearPackagingMavenPlugin +uimaj-3.1.1 diff --git a/aggregate-uimaj-docbooks/pom.xml b/aggregate-uimaj-docbooks/pom.xml index bf52ef0..ea0f661 100644 --- a/aggregate-uimaj-docbooks/pom.xml +++ b/aggregate-uimaj-docbooks/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.1-SNAPSHOT +3.1.1 ../uimaj-parent/pom.xml @@ -50,6 +50,7 @@ https://github.com/apache/uima-uimaj/tree/master/aggregate-uimaj-docbooks +uimaj-3.1.1 diff --git a/aggregate-uimaj-eclipse-plugins/pom.xml b/aggregate-uimaj-eclipse-plugins/pom.xml index bfacbc9..af86063 100644 --- a/aggregate-uimaj-eclipse-plugins/pom.xml +++ b/aggregate-uimaj-eclipse-plugins/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.1-SNAPSHOT +3.1.1 ../uimaj-parent/pom.xml @@ -52,6 +52,7 @@ https://github.com/apache/uima-uimaj/tree/master/aggregate-uimaj-eclipse-plugins +uimaj-3.1.1 diff --git a/aggregate-uimaj/pom.xml b/aggregate-uimaj/pom.xml index 6a5e344..b80a4b3 100644 --- a/aggregate-uimaj/pom.xml +++ b/aggregate-uimaj/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.1-SNAPSHOT +3.1.1 ../uimaj-parent/pom.xml @@ -51,6 +51,7 @@ https://github.com/apache/uima-uimaj/tree/master/aggregate-uimaj +uimaj-3.1.1 diff --git a/jVinci/pom.xml b/jVinci/pom.xml index ef1e4db..5230b5c 100644 --- a/jVinci/pom.xml +++ b/jVinci/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.1-SNAPSHOT +3.1.1 ../uimaj-parent/pom.xml @@ -54,6 +54,7 @@ https://github.com/apache/uima-uimaj/tree/master/jVinci +uimaj-3.1.1 diff --git a/jcasgen-maven-plugin/pom.xml b/jcasgen-maven-plugin/pom.xml index abb1d12..48cbc85 100644 --- a/jcasgen-maven-plugin/pom.xml +++ b/jcasgen-maven-plugin/pom.xml @@ -30,7 +30,7 @@ org.apache.uima
[uima-uimaj] branch UIMA-6138 updated: UIMA-6138 update scm elements on all poms to git equivalents
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch UIMA-6138 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git The following commit(s) were added to refs/heads/UIMA-6138 by this push: new 2380a12 UIMA-6138 update scm elements on all poms to git equivalents 2380a12 is described below commit 2380a12c6825f2619c2e03b716b8334b6aa5887f Author: Marshall Schor AuthorDate: Tue Oct 29 17:36:10 2019 -0400 UIMA-6138 update scm elements on all poms to git equivalents --- PearPackagingMavenPlugin/pom.xml| 6 +++--- aggregate-uimaj-docbooks/pom.xml| 6 +++--- aggregate-uimaj-eclipse-plugins/pom.xml | 6 +++--- aggregate-uimaj/pom.xml | 6 +++--- jVinci/pom.xml | 6 +++--- jcasgen-maven-plugin/pom.xml| 6 +++--- uima-docbook-overview-and-setup/pom.xml | 6 +++--- uima-docbook-references/pom.xml | 6 +++--- uima-docbook-tools/pom.xml | 6 +++--- uima-docbook-tutorials-and-users-guides/pom.xml | 6 +++--- uima-docbook-v3-users-guide/pom.xml | 6 +++--- uimaj-adapter-soap/pom.xml | 6 +++--- uimaj-adapter-vinci/pom.xml | 6 +++--- uimaj-bootstrap/pom.xml | 6 +++--- uimaj-component-test-util/pom.xml | 6 +++--- uimaj-core/pom.xml | 6 +++--- uimaj-cpe/pom.xml | 6 +++--- uimaj-document-annotation/pom.xml | 6 +++--- uimaj-eclipse-feature-runtime/pom.xml | 6 +++--- uimaj-eclipse-feature-tools/pom.xml | 6 +++--- uimaj-eclipse-update-site/pom.xml | 6 +++--- uimaj-ep-cas-editor-ide/pom.xml | 6 +++--- uimaj-ep-cas-editor/pom.xml | 6 +++--- uimaj-ep-configurator/pom.xml | 6 +++--- uimaj-ep-debug/pom.xml | 6 +++--- uimaj-ep-jcasgen/pom.xml| 6 +++--- uimaj-ep-launcher/pom.xml | 6 +++--- uimaj-ep-pear-packager/pom.xml | 6 +++--- uimaj-ep-runtime/pom.xml| 6 +++--- uimaj-examples/pom.xml | 6 +++--- uimaj-json/pom.xml | 6 +++--- uimaj-parent/pom.xml| 6 +++--- uimaj-test-util/pom.xml | 6 +++--- uimaj-tools/pom.xml | 6 +++--- uimaj-v3migration-jcas/pom.xml | 6 +++--- 35 files changed, 105 insertions(+), 105 deletions(-) diff --git a/PearPackagingMavenPlugin/pom.xml b/PearPackagingMavenPlugin/pom.xml index 3a3ffb1..0a51e9a 100644 --- a/PearPackagingMavenPlugin/pom.xml +++ b/PearPackagingMavenPlugin/pom.xml @@ -44,13 +44,13 @@ element, and just changing the following two properties --> - scm:svn:https://svn.apache.org/repos/asf/uima/uv3/uimaj-v3/trunk/PearPackagingMavenPlugin + scm:git:https://github.com/apache/uima-uimaj/PearPackagingMavenPlugin - scm:svn:https://svn.apache.org/repos/asf/uima/uv3/uimaj-v3/trunk/PearPackagingMavenPlugin + scm:git:https://github.com/apache/uima-uimaj/PearPackagingMavenPlugin - https://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/PearPackagingMavenPlugin + https://github.com/apache/uima-uimaj/tree/master/PearPackagingMavenPlugin diff --git a/aggregate-uimaj-docbooks/pom.xml b/aggregate-uimaj-docbooks/pom.xml index 640dead..bf52ef0 100644 --- a/aggregate-uimaj-docbooks/pom.xml +++ b/aggregate-uimaj-docbooks/pom.xml @@ -42,13 +42,13 @@ element, and just changing the following two properties --> - scm:svn:https://svn.apache.org/repos/asf/uima/uv3/uimaj-v3/trunk/aggregate-uimaj-docbooks + scm:git:https://github.com/apache/uima-uimaj/aggregate-uimaj-docbooks - scm:svn:https://svn.apache.org/repos/asf/uima/uv3/uimaj-v3/trunk/aggregate-uimaj-docbooks + scm:git:https://github.com/apache/uima-uimaj/aggregate-uimaj-docbooks - https://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/aggregate-uimaj-docbooks + https://github.com/apache/uima-uimaj/tree/master/aggregate-uimaj-docbooks diff --git a/aggregate-uimaj-eclipse-plugins/pom.xml b/aggregate-uimaj-eclipse-plugins/pom.xml index eeb316d..bfacbc9 100644 --- a/aggregate-uimaj-eclipse-plugins/pom.xml +++ b/aggregate-uimaj-eclipse-plugins/pom.xml @@ -44,13 +44,13 @@ element, and just changing the following two properties --> - scm:svn:https://svn.apache.org/repos/asf/uima/uv3/uimaj-v3/trunk/aggregate-uimaj-eclipse-plugins + scm:git:https://github.com/apache/uima-uimaj/aggregate-uimaj-eclipse-plugins - scm:svn:https://svn.apache.org/repos/asf/uima/uv3/uimaj-v3/trunk/aggreg
[uima-uimacpp] branch master updated: create .asf.yaml with description and homepage
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-uimacpp.git The following commit(s) were added to refs/heads/master by this push: new f0ccca2 create .asf.yaml with description and homepage f0ccca2 is described below commit f0ccca2f08cce60a44ca5aba5465cd2a7f632234 Author: mischor AuthorDate: Tue Oct 29 16:40:48 2019 -0400 create .asf.yaml with description and homepage --- .asf.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.asf.yaml b/.asf.yaml new file mode 100644 index 000..465a5a6 --- /dev/null +++ b/.asf.yaml @@ -0,0 +1,3 @@ +github: + description: "C++ support for Apache UIMA" + homepage: https://uima.apache.org/
svn commit: r1869125 - in /uima/site/trunk/uima-website: docs/ docs/images/git/ xdocs/
Author: schor Date: Tue Oct 29 18:50:39 2019 New Revision: 1869125 URL: http://svn.apache.org/viewvc?rev=1869125=rev Log: no jira, add info on working with git Added: uima/site/trunk/uima-website/docs/git-release-notes.html uima/site/trunk/uima-website/docs/git-work-process.html uima/site/trunk/uima-website/docs/images/git/ uima/site/trunk/uima-website/docs/images/git/clone-or-download.png (with props) uima/site/trunk/uima-website/docs/images/git/create-pull-request.png (with props) uima/site/trunk/uima-website/docs/images/git/fork.png (with props) uima/site/trunk/uima-website/docs/images/git/new-pull-request.png (with props) uima/site/trunk/uima-website/docs/images/git/pull-request-tab.png (with props) uima/site/trunk/uima-website/xdocs/git-release-notes.xml uima/site/trunk/uima-website/xdocs/git-work-process.xml Modified: uima/site/trunk/uima-website/docs/git-svn-notes.html uima/site/trunk/uima-website/docs/git.html uima/site/trunk/uima-website/xdocs/git-svn-notes.xml uima/site/trunk/uima-website/xdocs/git.xml Added: uima/site/trunk/uima-website/docs/git-release-notes.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/git-release-notes.html?rev=1869125=auto == --- uima/site/trunk/uima-website/docs/git-release-notes.html (added) +++ uima/site/trunk/uima-website/docs/git-release-notes.html Tue Oct 29 18:50:39 2019 @@ -0,0 +1,270 @@ +https://www.w3.org/TR/html4/loose.dtd;> + + + + + + + + +@import "stylesheets/base.css"; + + + + + +Apache UIMA - Notes on Releases with Git + + + + + + + + + + + + + + + + + + + + + + + + Notes on Releases with Git + + + https://www.apache.org;> + + + + + + + + + + + https://www.google.com/search;> +Search the site + +https://uima.apache.org/; /> + + + + + + + + + + + + + + + + General + + +Home + +Downloads + +Documentation + +News + +Publications + + +https://issues.apache.org/jira/browse/uima; target="_blank" rel="noopener">Issue tracker + +https://cwiki.apache.org/confluence/display/UIMA/; target="_blank" rel="noopener">Wiki + + +https://cwiki.apache.org/confluence/display/UIMA/Powered+by+Apache+UIMA; target="_blank" rel="noopener">Powered By UIMA + + + + Community + + +Get Involved + +Mailing Lists + +Contribution Policies + +FAQ + +Project Guidelines + + + + Scaleout Frameworks + + +UIMA-AS + +UIMA-DUCC + +..Demo Page + +http://uima-ducc-demo.apache.org:42133; target="_blank" rel="noopener">..Demo Live + + + + Components & Tools + + +Annotators + +Tools & Servers +
[uima-uimaj] branch UIMA-6138 updated (a2d5593 -> ed95d23)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch UIMA-6138 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. discard a2d5593 [maven-release-plugin] prepare for next development iteration omit 61e547c [maven-release-plugin] prepare release uimaj-3.1.1 This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/UIMA-6138 (ed95d23) \ O -- O -- O (a2d5593) Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: PearPackagingMavenPlugin/pom.xml| 3 +-- aggregate-uimaj-docbooks/pom.xml| 3 +-- aggregate-uimaj-eclipse-plugins/pom.xml | 3 +-- aggregate-uimaj/pom.xml | 3 +-- jVinci/pom.xml | 3 +-- jcasgen-maven-plugin/pom.xml| 3 +-- pom.xml | 3 +-- uima-docbook-overview-and-setup/pom.xml | 3 +-- uima-docbook-references/pom.xml | 3 +-- uima-docbook-tools/pom.xml | 3 +-- uima-docbook-tutorials-and-users-guides/pom.xml | 3 +-- uima-docbook-v3-users-guide/pom.xml | 3 +-- uimaj-adapter-soap/pom.xml | 3 +-- uimaj-adapter-vinci/pom.xml | 3 +-- uimaj-bootstrap/pom.xml | 3 +-- uimaj-component-test-util/pom.xml | 3 +-- uimaj-core/pom.xml | 3 +-- uimaj-cpe/pom.xml | 3 +-- uimaj-document-annotation/pom.xml | 3 +-- uimaj-eclipse-feature-runtime/pom.xml | 3 +-- uimaj-eclipse-feature-tools/pom.xml | 3 +-- uimaj-ep-cas-editor-ide/pom.xml | 3 +-- uimaj-ep-cas-editor/pom.xml | 3 +-- uimaj-ep-configurator/pom.xml | 3 +-- uimaj-ep-debug/pom.xml | 3 +-- uimaj-ep-jcasgen/pom.xml| 3 +-- uimaj-ep-launcher/pom.xml | 3 +-- uimaj-ep-pear-packager/pom.xml | 3 +-- uimaj-ep-runtime/pom.xml| 3 +-- uimaj-examples/pom.xml | 3 +-- uimaj-json/pom.xml | 3 +-- uimaj-parent/pom.xml| 3 +-- uimaj-test-util/pom.xml | 3 +-- uimaj-tools/pom.xml | 3 +-- uimaj-v3migration-jcas/pom.xml | 3 +-- 35 files changed, 35 insertions(+), 70 deletions(-)
[uima-uimaj] branch UIMA-6138 updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch UIMA-6138 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git The following commit(s) were added to refs/heads/UIMA-6138 by this push: new a2d5593 [maven-release-plugin] prepare for next development iteration a2d5593 is described below commit a2d559380756f13db653b92fd4919f948dfc31b6 Author: Marshall Schor AuthorDate: Mon Oct 28 14:28:14 2019 -0400 [maven-release-plugin] prepare for next development iteration --- PearPackagingMavenPlugin/pom.xml| 4 ++-- aggregate-uimaj-docbooks/pom.xml| 4 ++-- aggregate-uimaj-eclipse-plugins/pom.xml | 4 ++-- aggregate-uimaj/pom.xml | 4 ++-- jVinci/pom.xml | 4 ++-- jcasgen-maven-plugin/pom.xml| 4 ++-- pom.xml | 4 ++-- uima-docbook-overview-and-setup/pom.xml | 4 ++-- uima-docbook-references/pom.xml | 4 ++-- uima-docbook-tools/pom.xml | 4 ++-- uima-docbook-tutorials-and-users-guides/pom.xml | 4 ++-- uima-docbook-v3-users-guide/pom.xml | 4 ++-- uimaj-adapter-soap/pom.xml | 4 ++-- uimaj-adapter-vinci/pom.xml | 4 ++-- uimaj-bootstrap/pom.xml | 4 ++-- uimaj-component-test-util/pom.xml | 4 ++-- uimaj-core/pom.xml | 4 ++-- uimaj-cpe/pom.xml | 4 ++-- uimaj-document-annotation/pom.xml | 4 ++-- uimaj-eclipse-feature-runtime/pom.xml | 4 ++-- uimaj-eclipse-feature-tools/pom.xml | 4 ++-- uimaj-ep-cas-editor-ide/pom.xml | 4 ++-- uimaj-ep-cas-editor/pom.xml | 4 ++-- uimaj-ep-configurator/pom.xml | 4 ++-- uimaj-ep-debug/pom.xml | 4 ++-- uimaj-ep-jcasgen/pom.xml| 4 ++-- uimaj-ep-launcher/pom.xml | 4 ++-- uimaj-ep-pear-packager/pom.xml | 4 ++-- uimaj-ep-runtime/pom.xml| 4 ++-- uimaj-examples/pom.xml | 4 ++-- uimaj-json/pom.xml | 4 ++-- uimaj-parent/pom.xml| 4 ++-- uimaj-test-util/pom.xml | 4 ++-- uimaj-tools/pom.xml | 4 ++-- uimaj-v3migration-jcas/pom.xml | 4 ++-- 35 files changed, 70 insertions(+), 70 deletions(-) diff --git a/PearPackagingMavenPlugin/pom.xml b/PearPackagingMavenPlugin/pom.xml index 587872a..594d750 100644 --- a/PearPackagingMavenPlugin/pom.xml +++ b/PearPackagingMavenPlugin/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.1 +3.1.2-SNAPSHOT ../uimaj-parent/pom.xml @@ -52,7 +52,7 @@ https://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/PearPackagingMavenPlugin -uimaj-3.1.1 +HEAD diff --git a/aggregate-uimaj-docbooks/pom.xml b/aggregate-uimaj-docbooks/pom.xml index 0b36b0f..15f0038 100644 --- a/aggregate-uimaj-docbooks/pom.xml +++ b/aggregate-uimaj-docbooks/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.1 +3.1.2-SNAPSHOT ../uimaj-parent/pom.xml @@ -50,7 +50,7 @@ https://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/aggregate-uimaj-docbooks -uimaj-3.1.1 +HEAD diff --git a/aggregate-uimaj-eclipse-plugins/pom.xml b/aggregate-uimaj-eclipse-plugins/pom.xml index d4c2979..ad115cd 100644 --- a/aggregate-uimaj-eclipse-plugins/pom.xml +++ b/aggregate-uimaj-eclipse-plugins/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.1 +3.1.2-SNAPSHOT ../uimaj-parent/pom.xml @@ -52,7 +52,7 @@ https://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/aggregate-uimaj-eclipse-plugins -uimaj-3.1.1 +HEAD diff --git a/aggregate-uimaj/pom.xml b/aggregate-uimaj/pom.xml index 9094ee0..2262b21 100644 --- a/aggregate-uimaj/pom.xml +++ b/aggregate-uimaj/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.1 +3.1.2-SNAPSHOT ../uimaj-parent/pom.xml @@ -51,7 +51,7 @@ https://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/aggregate-uimaj -uimaj-3.1.1 +HEAD diff --git a/jVinci/pom.xml b/jVinci/pom.xml index 2942f67..568b383 100644 --- a/jVinci/pom.xml +++ b/jVinci/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.1 +3.1.2-SNAPSHOT ../uimaj-parent/pom.xml @@ -54,7 +54,7 @@ https://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/jVinci -uimaj-3.1.1 +HEAD diff --git a/jcasgen-maven-plugin/pom.xml b/jcasgen-maven-plugin/pom.xml index 00d90cf..37b47f2 100644
[uima-uimaj] annotated tag uimaj-3.1.1 updated (61e547c -> d28e86d)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to annotated tag uimaj-3.1.1 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. *** WARNING: tag uimaj-3.1.1 was modified! *** from 61e547c (commit) to d28e86d (tag) tagging 61e547c5975f64895d5f9f71e6405b2589e39fe0 (commit) by Marshall Schor on Mon Oct 28 14:28:08 2019 -0400 - Log - [maven-release-plugin] copy for tag uimaj-3.1.1 --- No new revisions were added by this update. Summary of changes:
[uima-uimaj] branch UIMA-6138 updated: [maven-release-plugin] prepare release uimaj-3.1.1
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch UIMA-6138 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git The following commit(s) were added to refs/heads/UIMA-6138 by this push: new 61e547c [maven-release-plugin] prepare release uimaj-3.1.1 61e547c is described below commit 61e547c5975f64895d5f9f71e6405b2589e39fe0 Author: Marshall Schor AuthorDate: Mon Oct 28 14:27:54 2019 -0400 [maven-release-plugin] prepare release uimaj-3.1.1 --- PearPackagingMavenPlugin/pom.xml| 3 ++- aggregate-uimaj-docbooks/pom.xml| 3 ++- aggregate-uimaj-eclipse-plugins/pom.xml | 3 ++- aggregate-uimaj/pom.xml | 3 ++- jVinci/pom.xml | 3 ++- jcasgen-maven-plugin/pom.xml| 3 ++- pom.xml | 3 ++- uima-docbook-overview-and-setup/pom.xml | 3 ++- uima-docbook-references/pom.xml | 3 ++- uima-docbook-tools/pom.xml | 3 ++- uima-docbook-tutorials-and-users-guides/pom.xml | 3 ++- uima-docbook-v3-users-guide/pom.xml | 3 ++- uimaj-adapter-soap/pom.xml | 3 ++- uimaj-adapter-vinci/pom.xml | 3 ++- uimaj-bootstrap/pom.xml | 3 ++- uimaj-component-test-util/pom.xml | 3 ++- uimaj-core/pom.xml | 3 ++- uimaj-cpe/pom.xml | 3 ++- uimaj-document-annotation/pom.xml | 3 ++- uimaj-eclipse-feature-runtime/pom.xml | 3 ++- uimaj-eclipse-feature-tools/pom.xml | 3 ++- uimaj-ep-cas-editor-ide/pom.xml | 3 ++- uimaj-ep-cas-editor/pom.xml | 3 ++- uimaj-ep-configurator/pom.xml | 3 ++- uimaj-ep-debug/pom.xml | 3 ++- uimaj-ep-jcasgen/pom.xml| 3 ++- uimaj-ep-launcher/pom.xml | 3 ++- uimaj-ep-pear-packager/pom.xml | 3 ++- uimaj-ep-runtime/pom.xml| 3 ++- uimaj-examples/pom.xml | 3 ++- uimaj-json/pom.xml | 3 ++- uimaj-parent/pom.xml| 3 ++- uimaj-test-util/pom.xml | 3 ++- uimaj-tools/pom.xml | 3 ++- uimaj-v3migration-jcas/pom.xml | 3 ++- 35 files changed, 70 insertions(+), 35 deletions(-) diff --git a/PearPackagingMavenPlugin/pom.xml b/PearPackagingMavenPlugin/pom.xml index 3a3ffb1..587872a 100644 --- a/PearPackagingMavenPlugin/pom.xml +++ b/PearPackagingMavenPlugin/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.1-SNAPSHOT +3.1.1 ../uimaj-parent/pom.xml @@ -52,6 +52,7 @@ https://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/PearPackagingMavenPlugin +uimaj-3.1.1 diff --git a/aggregate-uimaj-docbooks/pom.xml b/aggregate-uimaj-docbooks/pom.xml index 640dead..0b36b0f 100644 --- a/aggregate-uimaj-docbooks/pom.xml +++ b/aggregate-uimaj-docbooks/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.1-SNAPSHOT +3.1.1 ../uimaj-parent/pom.xml @@ -50,6 +50,7 @@ https://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/aggregate-uimaj-docbooks +uimaj-3.1.1 diff --git a/aggregate-uimaj-eclipse-plugins/pom.xml b/aggregate-uimaj-eclipse-plugins/pom.xml index eeb316d..d4c2979 100644 --- a/aggregate-uimaj-eclipse-plugins/pom.xml +++ b/aggregate-uimaj-eclipse-plugins/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.1-SNAPSHOT +3.1.1 ../uimaj-parent/pom.xml @@ -52,6 +52,7 @@ https://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/aggregate-uimaj-eclipse-plugins +uimaj-3.1.1 diff --git a/aggregate-uimaj/pom.xml b/aggregate-uimaj/pom.xml index 5636667..9094ee0 100644 --- a/aggregate-uimaj/pom.xml +++ b/aggregate-uimaj/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.1-SNAPSHOT +3.1.1 ../uimaj-parent/pom.xml @@ -51,6 +51,7 @@ https://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/aggregate-uimaj +uimaj-3.1.1 diff --git a/jVinci/pom.xml b/jVinci/pom.xml index f2d25ca..2942f67 100644 --- a/jVinci/pom.xml +++ b/jVinci/pom.xml @@ -23,7 +23,7 @@ org.apache.uima uimaj-parent -3.1.1-SNAPSHOT +3.1.1 ../uimaj-parent/pom.xml @@ -54,6 +54,7 @@ https://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/jVinci +uimaj-3.1.1 diff --git a/jcasgen-maven-plugin/pom.xml b/jcasgen-maven-plugin/pom.xml index 3c76b56..00d90cf 100644 --- a/jcasgen-maven-plugin/pom.xml +++ b/jcasgen-maven-plugin/pom.xml @@ -30,7 +30,7
[uima-uimaj] 01/01: [UIMA-6138] initial work on scm mods and release plugin
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch UIMA-6138 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git commit ed95d23606ca7ff6954df2f6ad03e7581d92f87c Author: Marshall Schor AuthorDate: Mon Oct 28 13:48:30 2019 -0400 [UIMA-6138] initial work on scm mods and release plugin --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index d55d00f..ce49d5e 100644 --- a/pom.xml +++ b/pom.xml @@ -49,13 +49,13 @@ element, and just changing the following two properties --> - scm:svn:https://svn.apache.org/repos/asf/uima/uv3/uimaj-v3/trunk/ + scm:git:https://github.com/apache/uima-uimaj/ - scm:svn:https://svn.apache.org/repos/asf/uima/uv3/uimaj-v3/trunk/ + scm:git:https://github.com/apache/uima-uimaj/ - https://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/ + https://github.com/apache/uima-uimaj/
[uima-uimaj] branch UIMA-6138 created (now ed95d23)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch UIMA-6138 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. at ed95d23 [UIMA-6138] initial work on scm mods and release plugin This branch includes the following new commits: new ed95d23 [UIMA-6138] initial work on scm mods and release plugin The 1 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.
[uima-uimacpp] branch master created (now 6260a0c)
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-uimacpp.git. at 6260a0c [UIMA-2476] Correct comment No new revisions were added by this update.
[uima-uimacpp] branch master created (now 6260a0c)
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-uimacpp.git. at 6260a0c [UIMA-2476] Correct comment No new revisions were added by this update.
[uima-uimaj] branch UIMA-6136 updated (b868d4c -> 0f8b905)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch UIMA-6136 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. from b868d4c [UIMA-6136] fix hashcode and equals for FsIndexComparatorImpl add 0f8b905 [UIMA-6136] add test case No new revisions were added by this update. Summary of changes: .../impl/AnalysisEngine_implTest.java | 25 ++ 1 file changed, 25 insertions(+)
[uima-uimaj] 01/01: [UIMA-6136] fix hashcode and equals for FsIndexComparatorImpl
This is an automated email from the ASF dual-hosted git repository.
schor pushed a commit to branch UIMA-6136
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit b868d4c70c3eaeb5e5c17d1394e2eb9c37f19ce9
Author: Marshall Schor
AuthorDate: Wed Oct 23 16:37:19 2019 -0400
[UIMA-6136] fix hashcode and equals for FsIndexComparatorImpl
---
.../uima/cas/impl/FSIndexComparatorImpl.java | 42 ++
.../uima/cas/impl/LinearTypeOrderBuilderImpl.java | 2 +-
2 files changed, 37 insertions(+), 7 deletions(-)
diff --git
a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexComparatorImpl.java
b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexComparatorImpl.java
index 372299a..ce4af69 100644
---
a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexComparatorImpl.java
+++
b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexComparatorImpl.java
@@ -159,9 +159,29 @@ public class FSIndexComparatorImpl implements
FSIndexComparator {
return false;
}
for (int i = 0; i < max; i++) {
- if (this.keySpecs .get(i) != comp.keySpecs .get(i) ||
- this.directions.get(i) != comp.directions.get(i)) {
-return false;
+ Object keySpec1 = this.keySpecs.get(i);
+ Object keySpec2 = comp.keySpecs.get(i);
+ if (keySpec1 instanceof LinearTypeOrder) {
+// equals compares the type codes in the ordered arrays for ==
+if ( ! (((LinearTypeOrder)keySpec1).equals((LinearTypeOrder)keySpec2))
) {
+ return false;
+}
+ } else {
+FeatureImpl f1 = (FeatureImpl) keySpec1;
+FeatureImpl f2 = (FeatureImpl) keySpec2;
+boolean featimpl_match = f1.equals(f2) // this compares
+//shortName,
+//multiplerefs allowed
+//highest defining type
+//range type name
+// also need to confirm offsets are the same
+&& f1.getOffset() == f2.getOffset()
+&& f1.getAdjustedOffset() == f2.getAdjustedOffset()
+&& this.directions.get(i) == comp.directions.get(i);
+
+if (! featimpl_match) {
+ return false;
+}
}
}
return true;
@@ -174,9 +194,19 @@ public class FSIndexComparatorImpl implements
FSIndexComparator {
result = prime * result + ((this.type == null) ? 31 : type.hashCode());
final int max = this.getNumberOfKeys();
for (int i = 0; i < max; i++) {
- Object o = this.keySpecs.get(i); // lto or feature
- result = prime * result + o.hashCode();
- result = prime * result + this.directions.get(i);
+ Object o = this.keySpecs.get(i); // LinearTypeOrder or feature
+ if (o instanceof LinearTypeOrder) {
+result = prime * result +
((LinearTypeOrderBuilderImpl.TotalTypeOrder)o).hashCode();
+ } else {
+FeatureImpl f = (FeatureImpl)o;
+result = prime * result + f.hashCode(); //only shortName,
+ //
multiplerefs allowed
+ //highest
defining type
+ //range
type name
+result = prime * result + f.getOffset();
+result = prime * result + f.getAdjustedOffset();
+result = prime * result + this.directions.get(i);
+ }
}
return result;
}
diff --git
a/uimaj-core/src/main/java/org/apache/uima/cas/impl/LinearTypeOrderBuilderImpl.java
b/uimaj-core/src/main/java/org/apache/uima/cas/impl/LinearTypeOrderBuilderImpl.java
index add29e4..c32fdcc 100644
---
a/uimaj-core/src/main/java/org/apache/uima/cas/impl/LinearTypeOrderBuilderImpl.java
+++
b/uimaj-core/src/main/java/org/apache/uima/cas/impl/LinearTypeOrderBuilderImpl.java
@@ -50,7 +50,7 @@ public class LinearTypeOrderBuilderImpl implements
LinearTypeOrderBuilder {
*
*
*/
- private static class TotalTypeOrder implements LinearTypeOrder {
+ public static class TotalTypeOrder implements LinearTypeOrder {
// The explicit order. We keep this since we need to return it. It would
// be awkward and inefficient to compute it from lt.
[uima-uimaj] branch UIMA-6136 created (now b868d4c)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch UIMA-6136 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. at b868d4c [UIMA-6136] fix hashcode and equals for FsIndexComparatorImpl This branch includes the following new commits: new b868d4c [UIMA-6136] fix hashcode and equals for FsIndexComparatorImpl The 1 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.
