This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch UIMA-6236-Migrating-Apache-UIMA-Ruta-from-SVN-to-git in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
commit a89df52caee921d78d820eaf455ba554ee527879 Merge: 6ce41c5 22085e1 Author: Richard Eckart de Castilho <r...@apache.org> AuthorDate: Sun May 17 13:26:57 2020 +0200 [UIMA-6236] Migrating Apache UIMA Ruta from SVN to git/GitHub - Preparing branch for merging into master Merge branch 'master' into UIMA-6236-Migrating-Apache-UIMA-Ruta-from-SVN-to-git * master: (70 commits) [UIMA-6233] Failing unit tests depending on test execution order [UIMA-6231] Reducing memory pressure generated by UIMA Ruta [NO JIRA] Copying v3 code to a branch under the v2 spot so it gets included in the GitHub mirror. [maven-release-plugin] prepare for next development iteration [maven-release-plugin] prepare release ruta-3.0.1 UIMA-6194: merge v2 changes no jira - manual rollback [maven-release-plugin] prepare for next development iteration [maven-release-plugin] prepare release ruta-3.0.1 merged v2: UIMA-6195, UIMA-6194, UIMA-6193, UIMA-6192, UIMA-6191, UIMA-6183, UIMA-6171 no jira - update updatesite version no jira - preparations fro next release - updated versions - updated jira version - updated release notes UIMA-6183: fix NPE and visibility problems of literal string matches in v3, behavior adapted in order to avoid unexpected matching within tokens no jira - fix readme/release-notes according rc review [maven-release-plugin] prepare for next development iteration [maven-release-plugin] prepare release ruta-3.0.0 no jira - improve release-notes no jira - improve release-notes no jira fix jira version, improve readme/release-notes no jira - manual rollback ... # Conflicts: # example-projects/ruta-maven-example/pom.xml # pom.xml # ruta-basic-type/pom.xml # ruta-core-ext/pom.xml # ruta-core/pom.xml # ruta-docbook/pom.xml # ruta-docbook/src/docbook/tools.ruta.howtos.xml # ruta-eclipse-feature/pom.xml # ruta-eclipse-update-site/pom.xml # ruta-ep-addons/pom.xml # ruta-ep-caseditor/pom.xml # ruta-ep-core-ext/pom.xml # ruta-ep-engine/pom.xml # ruta-ep-ide-ui/pom.xml # ruta-ep-ide/pom.xml # ruta-ep-parent/pom.xml # ruta-ep-textruler/pom.xml # ruta-maven-archetype/pom.xml # ruta-maven-plugin/pom.xml # ruta-parent/pom.xml # ruta-typesystem/pom.xml README | 5 +- RELEASE_NOTES.html | 25 ++- .../ruta-ep-example-extensions/.gitignore | 1 + .../ruta-ep-example-extensions/pom.xml | 2 +- example-projects/ruta-maven-example/pom.xml | 2 +- pom.xml | 10 +- ruta-basic-type/pom.xml | 2 +- .../java/org/apache/uima/ruta/type/RutaBasic.java | 85 ++++++-- .../org/apache/uima/ruta/type/RutaBasic_Type.java | 107 ---------- ruta-core-ext/pom.xml | 2 +- ruta-core/pom.xml | 3 +- .../java/org/apache/uima/ruta/FilterManager.java | 6 +- .../java/org/apache/uima/ruta/RutaEnvironment.java | 1 - .../main/java/org/apache/uima/ruta/RutaStream.java | 75 ++++--- .../apache/uima/ruta/condition/NearCondition.java | 2 +- .../uima/ruta/resource/MultiTreeWordList.java | 2 +- .../apache/uima/ruta/resource/TreeWordList.java | 2 +- .../uima/ruta/rule/AnnotationListFSIterator.java | 94 +++++++++ .../uima/ruta/rule/RutaAnnotationTypeMatcher.java | 232 ++++++++------------- .../apache/uima/ruta/rule/WildCardRuleElement.java | 29 ++- .../org/apache/uima/ruta/engine/DummySeeder.java | 74 +++---- .../uima/ruta/engine/HandleDataPathTest.java | 54 ++--- .../uima/ruta/engine/MultipleSeedersTest.java | 100 ++++----- .../ruta/engine/ResourcesFromDataPathTest.java | 54 ++--- .../apache/uima/ruta/engine/RutaEngineTest.java | 13 -- .../uima/ruta/engine/UimaClassLoaderTest.java | 102 +++++---- .../annotation/AnnotationLabelExpressionTest.java | 13 -- .../apache/uima/ruta/resource/CSVTableTest.java | 150 ++++++------- .../org/apache/uima/ruta/rule/WildCard2Test.java | 14 ++ ruta-docbook/pom.xml | 3 +- ruta-docbook/src/docbook/tools.ruta.howtos.xml | 8 +- ruta-eclipse-feature/pom.xml | 2 +- ruta-eclipse-update-site/category.xml | 2 +- ruta-eclipse-update-site/pom.xml | 12 +- ruta-ep-addons/META-INF/MANIFEST.MF | 109 +++------- ruta-ep-addons/pom.xml | 2 +- .../apache/uima/ruta/explain/tree/ExplainTree.java | 6 +- .../ruta/explain/tree/RuleElementMatchNode.java | 7 +- ruta-ep-caseditor/.gitignore | 1 + ruta-ep-caseditor/META-INF/MANIFEST.MF | 34 +-- ruta-ep-caseditor/pom.xml | 2 +- ruta-ep-core-ext/META-INF/MANIFEST.MF | 10 +- ruta-ep-core-ext/pom.xml | 2 +- ruta-ep-engine/.gitignore | 1 + ruta-ep-engine/pom.xml | 2 +- ruta-ep-ide-ui/.gitignore | 1 + ruta-ep-ide-ui/pom.xml | 2 +- ruta-ep-ide/.gitignore | 1 + ruta-ep-ide/pom.xml | 2 +- ruta-ep-parent/pom.xml | 2 +- ruta-ep-textruler/.gitignore | 1 + ruta-ep-textruler/pom.xml | 2 +- ruta-maven-archetype/pom.xml | 2 +- .../src/main/resources/archetype-resources/pom.xml | 2 +- ruta-maven-plugin/pom.xml | 6 +- ruta-parent/pom.xml | 6 +- ruta-typesystem/pom.xml | 2 +- 57 files changed, 737 insertions(+), 756 deletions(-) diff --cc example-projects/ruta-ep-example-extensions/.gitignore index 0000000,0000000..7e3a306 new file mode 100644 --- /dev/null +++ b/example-projects/ruta-ep-example-extensions/.gitignore @@@ -1,0 -1,0 +1,1 @@@ ++META-INF/ diff --cc example-projects/ruta-maven-example/pom.xml index 7df423a,dcac2d7..6514e1c --- a/example-projects/ruta-maven-example/pom.xml +++ b/example-projects/ruta-maven-example/pom.xml @@@ -1,36 -1,26 +1,36 @@@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor - license agreements. See the NOTICE file distributed with this work for additional - information regarding copyright ownership. The ASF licenses this file to - you under the Apache License, Version 2.0 (the "License"); you may not use - this file except in compliance with the License. You may obtain a copy of - the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required - by applicable law or agreed to in writing, software distributed under the - License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS - OF ANY KIND, either express or implied. See the License for the specific - language governing permissions and limitations under the License. --> -<project xmlns="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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <artifactId>ruta-maven-example</artifactId> - <parent> - <groupId>org.apache.uima</groupId> - <artifactId>ruta-parent</artifactId> - <version>3.0.2-SNAPSHOT</version> - <relativePath>../../ruta-parent/pom.xml</relativePath> - </parent> - <url>${uimaWebsiteUrl}</url> - <name>Apache UIMA Ruta: ${project.artifactId}</name> - <properties> +<!-- + 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. +--> +<project xmlns="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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <artifactId>ruta-maven-example</artifactId> + <parent> + <groupId>org.apache.uima</groupId> + <artifactId>ruta-parent</artifactId> - <version>2.8.2-SNAPSHOT</version> ++ <version>3.0.2-SNAPSHOT</version> + <relativePath>../../ruta-parent/pom.xml</relativePath> + </parent> + <url>${uimaWebsiteUrl}</url> + <name>Apache UIMA Ruta: ${project.artifactId}</name> + <properties> <postNoticeText /> <uimaScmProject>${project.artifactId}</uimaScmProject> </properties> diff --cc ruta-basic-type/pom.xml index 45ad6c6,b686833..ca57fe1 --- a/ruta-basic-type/pom.xml +++ b/ruta-basic-type/pom.xml @@@ -25,10 -16,11 +25,10 @@@ <parent> <groupId>org.apache.uima</groupId> <artifactId>ruta-parent</artifactId> - <version>2.8.2-SNAPSHOT</version> + <version>3.0.2-SNAPSHOT</version> <relativePath>../ruta-parent/pom.xml</relativePath> </parent> - - + <properties> <uimaScmProject>${project.artifactId}</uimaScmProject> </properties> diff --cc ruta-core-ext/pom.xml index b665411,f20ce4f..200eabb --- a/ruta-core-ext/pom.xml +++ b/ruta-core-ext/pom.xml @@@ -1,63 -1,45 +1,63 @@@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor - license agreements. See the NOTICE file distributed with this work for additional - information regarding copyright ownership. The ASF licenses this file to - you under the Apache License, Version 2.0 (the "License"); you may not use - this file except in compliance with the License. You may obtain a copy of - the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required - by applicable law or agreed to in writing, software distributed under the - License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS - OF ANY KIND, either express or implied. See the License for the specific - language governing permissions and limitations under the License. --> +<!-- + 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 -<project xmlns="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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <artifactId>ruta-core-ext</artifactId> + http://www.apache.org/licenses/LICENSE-2.0 - <name>Apache UIMA Ruta: ${project.artifactId}</name> - <url>${uimaWebsiteUrl}</url> - <description>Additional extensions of the UIMA Ruta language</description> + 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. +--> +<project xmlns="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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <artifactId>ruta-core-ext</artifactId> - <parent> - <groupId>org.apache.uima</groupId> - <artifactId>ruta-parent</artifactId> - <version>3.0.2-SNAPSHOT</version> - <relativePath>../ruta-parent/pom.xml</relativePath> - </parent> - <properties> - <uimaScmProject>${project.artifactId}</uimaScmProject> - <postNoticeText /> - </properties> - <dependencies> - <dependency> - <groupId>org.apache.uima</groupId> - <artifactId>ruta-core</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> + <name>Apache UIMA Ruta: ${project.artifactId}</name> + <url>${uimaWebsiteUrl}</url> + <description>Additional extensions of the UIMA Ruta language</description> + + <parent> + <groupId>org.apache.uima</groupId> + <artifactId>ruta-parent</artifactId> - <version>2.8.2-SNAPSHOT</version> ++ <version>3.0.2-SNAPSHOT</version> + <relativePath>../ruta-parent/pom.xml</relativePath> + </parent> + + <properties> + <uimaScmProject>${project.artifactId}</uimaScmProject> + <postNoticeText /> + </properties> + + <scm> + <connection>scm:git:git://github.com/apache/uima-ruta</connection> + <developerConnection>scm:git:g...@github.com:apache/uima-ruta.git</developerConnection> + <url>https://github.com/apache/uima-ruta</url> + <tag>HEAD</tag> + </scm> + + <dependencies> + <dependency> + <groupId>org.apache.uima</groupId> + <artifactId>ruta-core</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-jdk14</artifactId> diff --cc ruta-core/pom.xml index a9aa09d,07f6178..e07c235 --- a/ruta-core/pom.xml +++ b/ruta-core/pom.xml @@@ -1,34 -1,26 +1,35 @@@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor - license agreements. See the NOTICE file distributed with this work for additional - information regarding copyright ownership. The ASF licenses this file to - you under the Apache License, Version 2.0 (the "License"); you may not use - this file except in compliance with the License. You may obtain a copy of - the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required - by applicable law or agreed to in writing, software distributed under the - License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS - OF ANY KIND, either express or implied. See the License for the specific - language governing permissions and limitations under the License. --> +<!-- + 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 -<project xmlns="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/xsd/maven-4.0.0.xsd"> + 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. +--> +<project xmlns="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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <artifactId>ruta-core</artifactId> - <version>3.0.2-SNAPSHOT</version> ++ <parent> <groupId>org.apache.uima</groupId> <artifactId>ruta-parent</artifactId> - <version>2.8.2-SNAPSHOT</version> + <version>3.0.2-SNAPSHOT</version> <relativePath>../ruta-parent/pom.xml</relativePath> </parent> - + <properties> <uimaScmProject>${project.artifactId}</uimaScmProject> <postNoticeText>${uniWueNoticeText}</postNoticeText> diff --cc ruta-docbook/pom.xml index e8efb90,0533bbd..7167bb7 --- a/ruta-docbook/pom.xml +++ b/ruta-docbook/pom.xml @@@ -31,17 -29,14 +31,18 @@@ </parent> <name>Apache UIMA Ruta Documentation</name> <url>${uimaWebsiteUrl}</url> - <scm> - <url>http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-docbook</url> - <connection>scm:svn:http://svn.apache.org/repos/asf/uima/uv3/ruta-v3/trunk/ruta-docbook</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/uima/uv3/ruta-v3/trunk/ruta-docbook</developerConnection> - </scm> ++ <properties> - <uimaScmProject>${project.artifactId}</uimaScmProject> - <bookNameRoot>tools.ruta.book</bookNameRoot> - <maven.deploy.skip>true</maven.deploy.skip> + <uimaScmProject>${project.artifactId}</uimaScmProject> + <bookNameRoot>tools.ruta.book</bookNameRoot> + <maven.deploy.skip>true</maven.deploy.skip> </properties> + + <scm> + <connection>scm:git:git://github.com/apache/uima-ruta</connection> + <developerConnection>scm:git:g...@github.com:apache/uima-ruta.git</developerConnection> + <url>https://github.com/apache/uima-ruta</url> + <tag>HEAD</tag> + </scm> + </project> diff --cc ruta-eclipse-feature/pom.xml index 3ad9038,aa93a48..2bca59a --- a/ruta-eclipse-feature/pom.xml +++ b/ruta-eclipse-feature/pom.xml @@@ -25,12 -23,12 +25,12 @@@ <parent> <groupId>org.apache.uima</groupId> <artifactId>ruta-parent</artifactId> - <version>2.8.2-SNAPSHOT</version> + <version>3.0.2-SNAPSHOT</version> <relativePath>../ruta-parent/pom.xml</relativePath> </parent> - + <artifactId>ruta-eclipse-feature</artifactId> - + <name>Apache UIMA Ruta Eclipse: ${project.artifactId}</name> <description>UIMA Eclipse Plugin Feature that contains the UIMA Ruta engine and IDE</description> diff --cc ruta-ep-addons/META-INF/MANIFEST.MF index 4bc6888,0000000..dcf78c5 mode 100644,000000..100644 --- a/ruta-ep-addons/META-INF/MANIFEST.MF +++ b/ruta-ep-addons/META-INF/MANIFEST.MF @@@ -1,110 -1,0 +1,59 @@@ +Manifest-Version: 1.0 - Bnd-LastModified: 1589540103189 - Build-Date: 200515_1054 ++Bnd-LastModified: 1589714612590 ++Build-Date: 200517_1121 +Build-Jdk: 13.0.1 +Built-By: rec +Bundle-ActivationPolicy: lazy +Bundle-Activator: org.apache.uima.ruta.addons.RutaAddonsPlugin +Bundle-Description: Provides addons for the UIMA Ruta Workbench in Eclip + se +Bundle-DocURL: https://www.apache.org/ +Bundle-License: https://www.apache.org/licenses/LICENSE-2.0.txt +Bundle-ManifestVersion: 2 +Bundle-Name: Apache UIMA Ruta Eclipse: ruta-ep-addons +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-SymbolicName: org.apache.uima.ruta.addons;singleton:=true +Bundle-Vendor: The Apache Software Foundation - Bundle-Version: 2.8.2.SNAPSHOT ++Bundle-Version: 3.0.2.SNAPSHOT +Created-By: Apache Maven Bundle Plugin - Export-Package: org.apache.uima.ruta;version="2.8.2",org.apache.uima.rut - a.action;version="2.8.2",org.apache.uima.ruta.addons;version="2.8.2",or - g.apache.uima.ruta.block;version="2.8.2",org.apache.uima.ruta.caseditor - ;version="2.8.2",org.apache.uima.ruta.caseditor.view.browser;version="2 - .8.2",org.apache.uima.ruta.caseditor.view.html;version="2.8.2",org.apac - he.uima.ruta.caseditor.view.preferences;version="2.8.2",org.apache.uima - .ruta.caseditor.view.selection;version="2.8.2",org.apache.uima.ruta.cas - editor.view.tree;version="2.8.2",org.apache.uima.ruta.cde;version="2.8. - 2",org.apache.uima.ruta.cde.ui;version="2.8.2",org.apache.uima.ruta.cde - .utils;version="2.8.2",org.apache.uima.ruta.check;version="2.8.2",org.a - pache.uima.ruta.condition;version="2.8.2",org.apache.uima.ruta.constrai - nt;version="2.8.2",org.apache.uima.ruta.descriptor;version="2.8.2",org. - apache.uima.ruta.engine;version="2.8.2",org.apache.uima.ruta.explain;ve - rsion="2.8.2",org.apache.uima.ruta.explain.apply;version="2.8.2",org.ap - ache.uima.ruta.explain.createdBy;version="2.8.2",org.apache.uima.ruta.e - xplain.element;version="2.8.2",org.apache.uima.ruta.explain.failed;vers - ion="2.8.2",org.apache.uima.ruta.explain.inlined;version="2.8.2",org.ap - ache.uima.ruta.explain.matched;version="2.8.2",org.apache.uima.ruta.exp - lain.rulelist;version="2.8.2",org.apache.uima.ruta.explain.selection;ve - rsion="2.8.2",org.apache.uima.ruta.explain.tree;version="2.8.2",org.apa - che.uima.ruta.expression;version="2.8.2",org.apache.uima.ruta.expressio - n.annotation;version="2.8.2",org.apache.uima.ruta.expression.bool;versi - on="2.8.2",org.apache.uima.ruta.expression.feature;version="2.8.2",org. - apache.uima.ruta.expression.list;version="2.8.2",org.apache.uima.ruta.e - xpression.number;version="2.8.2",org.apache.uima.ruta.expression.resour - ce;version="2.8.2",org.apache.uima.ruta.expression.string;version="2.8. - 2",org.apache.uima.ruta.expression.type;version="2.8.2",org.apache.uima - .ruta.extensions;version="2.8.2",org.apache.uima.ruta.ide;version="2.8. - 2",org.apache.uima.ruta.ide.core;version="2.8.2",org.apache.uima.ruta.i - de.core.builder;version="2.8.2",org.apache.uima.ruta.ide.core.codeassis - t;version="2.8.2",org.apache.uima.ruta.ide.core.extensions;version="2.8 - .2",org.apache.uima.ruta.ide.core.packages;version="2.8.2",org.apache.u - ima.ruta.ide.core.parser;version="2.8.2",org.apache.uima.ruta.ide.core. - search;version="2.8.2",org.apache.uima.ruta.ide.debug;version="2.8.2",o - rg.apache.uima.ruta.ide.debug.ui;version="2.8.2",org.apache.uima.ruta.i - de.debug.ui.handlers;version="2.8.2",org.apache.uima.ruta.ide.debug.ui. - interpreters;version="2.8.2",org.apache.uima.ruta.ide.debug.ui.launchCo - nfiguration;version="2.8.2",org.apache.uima.ruta.ide.debug.ui.launcher; - version="2.8.2",org.apache.uima.ruta.ide.debug.ui.preferences;version=" - 2.8.2",org.apache.uima.ruta.ide.debugger;version="2.8.2",org.apache.uim - a.ruta.ide.debugger.preferences;version="2.8.2",org.apache.uima.ruta.id - e.formatter;version="2.8.2",org.apache.uima.ruta.ide.formatter.preferen - ces;version="2.8.2",org.apache.uima.ruta.ide.launching;version="2.8.2", - org.apache.uima.ruta.ide.parser.ast;version="2.8.2",org.apache.uima.rut - a.ide.ui;version="2.8.2",org.apache.uima.ruta.ide.ui.actions;version="2 - .8.2",org.apache.uima.ruta.ide.ui.console;version="2.8.2",org.apache.ui - ma.ruta.ide.ui.documentation;version="2.8.2",org.apache.uima.ruta.ide.u - i.editor;version="2.8.2",org.apache.uima.ruta.ide.ui.handlers;version=" - 2.8.2",org.apache.uima.ruta.ide.ui.hierarchy;version="2.8.2",org.apache - .uima.ruta.ide.ui.infoviews;version="2.8.2",org.apache.uima.ruta.ide.ui - .preferences;version="2.8.2",org.apache.uima.ruta.ide.ui.search;version - ="2.8.2",org.apache.uima.ruta.ide.ui.templates;version="2.8.2",org.apac - he.uima.ruta.ide.ui.text;version="2.8.2",org.apache.uima.ruta.ide.ui.te - xt.completion;version="2.8.2",org.apache.uima.ruta.ide.ui.text.folding; - version="2.8.2",org.apache.uima.ruta.ide.ui.wizards;version="2.8.2",org - .apache.uima.ruta.ide.validator;version="2.8.2",org.apache.uima.ruta.pa - rser;version="2.8.2",org.apache.uima.ruta.query.ui;version="2.8.2",org. - apache.uima.ruta.resource;version="2.8.2",org.apache.uima.ruta.rule;ver - sion="2.8.2",org.apache.uima.ruta.rule.quantifier;version="2.8.2",org.a - pache.uima.ruta.searchStrategy;version="2.8.2",org.apache.uima.ruta.see - d;version="2.8.2",org.apache.uima.ruta.statistics;version="2.8.2",org.a - pache.uima.ruta.testing.evaluator;version="2.8.2",org.apache.uima.ruta. - testing.preferences;version="2.8.2",org.apache.uima.ruta.testing.search - Strategy;version="2.8.2",org.apache.uima.ruta.testing.ui.handlers;versi - on="2.8.2",org.apache.uima.ruta.testing.ui.views;version="2.8.2",org.ap - ache.uima.ruta.testing.ui.views.evalDataTable;version="2.8.2",org.apach - e.uima.ruta.testing.ui.views.fn;version="2.8.2",org.apache.uima.ruta.te - sting.ui.views.fp;version="2.8.2",org.apache.uima.ruta.testing.ui.views - .tp;version="2.8.2",org.apache.uima.ruta.testing.ui.views.tree;version= - "2.8.2",org.apache.uima.ruta.testing.ui.views.util;version="2.8.2",org. - apache.uima.ruta.type;version="2.8.2",org.apache.uima.ruta.type.html;ve - rsion="2.8.2",org.apache.uima.ruta.utils;version="2.8.2",org.apache.uim - a.ruta.utils.apply;version="2.8.2",org.apache.uima.ruta.utils.twl;versi - on="2.8.2",org.apache.uima.ruta.utils.ui;version="2.8.2",org.apache.uim - a.ruta.utils.update;version="2.8.2",org.apache.uima.ruta.verbalize;vers - ion="2.8.2",org.apache.uima.ruta.visitor;version="2.8.2" ++Export-Package: org.apache.uima.ruta.addons;version="3.0.2",org.apache.u ++ ima.ruta.cde;version="3.0.2",org.apache.uima.ruta.cde.ui;version="3.0.2 ++ ",org.apache.uima.ruta.cde.utils;version="3.0.2",org.apache.uima.ruta.c ++ heck;version="3.0.2",org.apache.uima.ruta.explain;version="3.0.2",org.a ++ pache.uima.ruta.explain.apply;version="3.0.2",org.apache.uima.ruta.expl ++ ain.createdBy;version="3.0.2",org.apache.uima.ruta.explain.element;vers ++ ion="3.0.2",org.apache.uima.ruta.explain.failed;version="3.0.2",org.apa ++ che.uima.ruta.explain.inlined;version="3.0.2",org.apache.uima.ruta.expl ++ ain.matched;version="3.0.2",org.apache.uima.ruta.explain.rulelist;versi ++ on="3.0.2",org.apache.uima.ruta.explain.selection;version="3.0.2",org.a ++ pache.uima.ruta.explain.tree;version="3.0.2",org.apache.uima.ruta.query ++ .ui;version="3.0.2",org.apache.uima.ruta.searchStrategy;version="3.0.2" ++ ,org.apache.uima.ruta.statistics;version="3.0.2",org.apache.uima.ruta.t ++ esting.evaluator;version="3.0.2",org.apache.uima.ruta.testing.preferenc ++ es;version="3.0.2",org.apache.uima.ruta.testing.searchStrategy;version= ++ "3.0.2",org.apache.uima.ruta.testing.ui.handlers;version="3.0.2",org.ap ++ ache.uima.ruta.testing.ui.views;version="3.0.2",org.apache.uima.ruta.te ++ sting.ui.views.evalDataTable;version="3.0.2",org.apache.uima.ruta.testi ++ ng.ui.views.fn;version="3.0.2",org.apache.uima.ruta.testing.ui.views.fp ++ ;version="3.0.2",org.apache.uima.ruta.testing.ui.views.tp;version="3.0. ++ 2",org.apache.uima.ruta.testing.ui.views.tree;version="3.0.2",org.apach ++ e.uima.ruta.testing.ui.views.util;version="3.0.2",org.apache.uima.ruta. ++ utils.apply;version="3.0.2",org.apache.uima.ruta.utils.twl;version="3.0 ++ .2",org.apache.uima.ruta.utils.ui;version="3.0.2",org.apache.uima.ruta. ++ utils.update;version="3.0.2" +Implementation-License: https://www.apache.org/licenses/LICENSE-2.0.txt +Implementation-Title: Apache UIMA Ruta Eclipse: ruta-ep-addons +Implementation-Url: https://uima.apache.org +Implementation-Vendor: The Apache Software Foundation +Implementation-Vendor-Id: org.apache.uima - Implementation-Version: 2.8.2-SNAPSHOT ++Implementation-Version: 3.0.2-SNAPSHOT +Project-Title: Apache UIMA +Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.apache.uima. + runtime,org.apache.uima.ruta.engine,org.eclipse.core.resources,org.apac + he.uima.ruta.ide,org.apache.uima.ruta.ide.ui,org.eclipse.ui.ide,org.ecl + ipse.dltk.core,org.eclipse.jface.text,org.eclipse.dltk.ui,org.eclipse.u + i.editors,org.eclipse.dltk.launching,org.eclipse.debug.ui,org.apache.ui + ma.caseditor,org.apache.uima.ruta.caseditor,org.apache.uima.caseditor.i + de +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))" +Tool: Bnd-3.0.0.201509101326 diff --cc ruta-ep-caseditor/.gitignore index 0000000,0000000..7e3a306 new file mode 100644 --- /dev/null +++ b/ruta-ep-caseditor/.gitignore @@@ -1,0 -1,0 +1,1 @@@ ++META-INF/ diff --cc ruta-ep-caseditor/META-INF/MANIFEST.MF index b663a4c,0000000..beab731 mode 100644,000000..100644 --- a/ruta-ep-caseditor/META-INF/MANIFEST.MF +++ b/ruta-ep-caseditor/META-INF/MANIFEST.MF @@@ -1,40 -1,0 +1,48 @@@ +Manifest-Version: 1.0 - Bnd-LastModified: 1589540105622 - Build-Date: 200515_1055 ++Bnd-LastModified: 1589714608739 ++Build-Date: 200517_1121 +Build-Jdk: 13.0.1 +Built-By: rec +Bundle-ActivationPolicy: lazy +Bundle-Activator: org.apache.uima.ruta.caseditor.RutaCasEditorPlugin +Bundle-Description: Provides additional views for the CAS Editor +Bundle-DocURL: https://www.apache.org/ +Bundle-License: https://www.apache.org/licenses/LICENSE-2.0.txt +Bundle-ManifestVersion: 2 +Bundle-Name: Apache UIMA Ruta Eclipse: ruta-ep-caseditor +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-SymbolicName: org.apache.uima.ruta.caseditor;singleton:=true +Bundle-Vendor: The Apache Software Foundation - Bundle-Version: 2.8.2.SNAPSHOT ++Bundle-Version: 3.0.2.SNAPSHOT +Created-By: Apache Maven Bundle Plugin - Export-Package: org.apache.uima.ruta.caseditor;version="2.8.2",org.apach - e.uima.ruta.caseditor.view.browser;version="2.8.2",org.apache.uima.ruta - .caseditor.view.html;version="2.8.2",org.apache.uima.ruta.caseditor.vie - w.preferences;version="2.8.2",org.apache.uima.ruta.caseditor.view.selec - tion;version="2.8.2",org.apache.uima.ruta.caseditor.view.tree;version=" - 2.8.2" ++Export-Package: org.apache.uima.ruta.caseditor;version="3.0.2",org.apach ++ e.uima.ruta.caseditor.view.browser;version="3.0.2",org.apache.uima.ruta ++ .caseditor.view.html;version="3.0.2",org.apache.uima.ruta.caseditor.vie ++ w.preferences;version="3.0.2",org.apache.uima.ruta.caseditor.view.selec ++ tion;version="3.0.2",org.apache.uima.ruta.caseditor.view.tree;version=" ++ 3.0.2" +Implementation-License: https://www.apache.org/licenses/LICENSE-2.0.txt +Implementation-Title: Apache UIMA Ruta Eclipse: ruta-ep-caseditor +Implementation-Url: https://uima.apache.org +Implementation-Vendor: The Apache Software Foundation +Implementation-Vendor-Id: org.apache.uima - Implementation-Version: 2.8.2-SNAPSHOT - Import-Package: org.apache.uima.cas,org.apache.uima.cas.text,org.apache. - uima.ruta.caseditor.view.tree,org.eclipse.core.runtime.preferences;vers - ion="[3.3,4)" ++Implementation-Version: 3.0.2-SNAPSHOT ++Import-Package: org.apache.commons.lang3;version="[3.1,4)",org.apache.ui ++ ma.cas,org.apache.uima.cas.impl,org.apache.uima.cas.text,org.apache.uim ++ a.resource,org.apache.uima.resource.metadata,org.apache.uima.resource.m ++ etadata.impl,org.apache.uima.ruta.caseditor,org.apache.uima.ruta.casedi ++ tor.view.tree,org.apache.uima.util,org.eclipse.core.resources,org.eclip ++ se.core.runtime.preferences;version="[3.3,4)",org.eclipse.jface.action, ++ org.eclipse.jface.dialogs,org.eclipse.jface.preference,org.eclipse.jfac ++ e.resource,org.eclipse.jface.util,org.eclipse.jface.viewers,org.eclipse ++ .swt.browser,org.eclipse.swt.dnd,org.eclipse.swt.events,org.eclipse.swt ++ .graphics,org.eclipse.swt.layout,org.eclipse.swt.widgets,org.eclipse.ui ++ .plugin,org.xml.sax +Project-Title: Apache UIMA +Require-Bundle: org.eclipse.jface.text,org.eclipse.text,org.eclipse.ui.e + ditors,org.eclipse.ui.workbench.texteditor,org.eclipse.ui,org.eclipse.u + i.ide,org.eclipse.ui.workbench,org.eclipse.core.runtime,org.eclipse.cor + e.resources,org.apache.uima.caseditor,org.apache.uima.caseditor.ide,org + .junit4;bundle-version="4.5.0";resolution:=optional +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))" +Tool: Bnd-3.0.0.201509101326 diff --cc ruta-ep-core-ext/META-INF/MANIFEST.MF index 99c1105,0000000..6b3cda1 mode 100644,000000..100644 --- a/ruta-ep-core-ext/META-INF/MANIFEST.MF +++ b/ruta-ep-core-ext/META-INF/MANIFEST.MF @@@ -1,34 -1,0 +1,34 @@@ +Manifest-Version: 1.0 - Bnd-LastModified: 1589540107438 - Build-Date: 200515_1055 ++Bnd-LastModified: 1589714616829 ++Build-Date: 200517_1121 +Build-Jdk: 13.0.1 +Built-By: rec +Bundle-ActivationPolicy: lazy +Bundle-Description: Eclipse plugin for providing the implementions of th + e additional language extensions in the UIMA Ruta Workbench +Bundle-DocURL: https://www.apache.org/ +Bundle-License: https://www.apache.org/licenses/LICENSE-2.0.txt +Bundle-ManifestVersion: 2 +Bundle-Name: Apache UIMA Ruta Eclipse: ruta-ep-core-ext +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-SymbolicName: org.apache.uima.ruta.core.ext;singleton:=true +Bundle-Vendor: The Apache Software Foundation - Bundle-Version: 2.8.2.SNAPSHOT ++Bundle-Version: 3.0.2.SNAPSHOT +Created-By: Apache Maven Bundle Plugin +Eclipse-BuddyPolicy: registered +Eclipse-ExtensibleAPI: true +Eclipse-RegisterBuddy: org.apache.uima.runtime,org.apache.uima.ruta.engi + ne - Export-Package: org.apache.uima.ruta;version="2.8.2" ++Export-Package: org.apache.uima.ruta;version="3.0.2" +Implementation-License: https://www.apache.org/licenses/LICENSE-2.0.txt +Implementation-Title: Apache UIMA Ruta Eclipse: ruta-ep-core-ext +Implementation-Url: https://uima.apache.org +Implementation-Vendor: The Apache Software Foundation +Implementation-Vendor-Id: org.apache.uima - Implementation-Version: 2.8.2-SNAPSHOT ++Implementation-Version: 3.0.2-SNAPSHOT +Project-Title: Apache UIMA +Require-Bundle: org.apache.uima.runtime,org.apache.uima.ruta.engine,org. + apache.uima.ruta.ide,org.apache.uima.ruta.ide.ui,org.eclipse.dltk.core; + bundle-version="3.0.0" +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))" +Tool: Bnd-3.0.0.201509101326 diff --cc ruta-ep-engine/.gitignore index 0000000,0000000..7e3a306 new file mode 100644 --- /dev/null +++ b/ruta-ep-engine/.gitignore @@@ -1,0 -1,0 +1,1 @@@ ++META-INF/ diff --cc ruta-ep-engine/pom.xml index ea81c4f,d7717b2..b7484f0 --- a/ruta-ep-engine/pom.xml +++ b/ruta-ep-engine/pom.xml @@@ -25,15 -16,9 +25,15 @@@ <parent> <groupId>org.apache.uima</groupId> <artifactId>ruta-parent</artifactId> - <version>2.8.2-SNAPSHOT</version> + <version>3.0.2-SNAPSHOT</version> <relativePath>../ruta-parent/pom.xml</relativePath> </parent> + + <name>Apache UIMA Ruta Eclipse: ${project.artifactId}</name> + <url>${uimaWebsiteUrl}</url> + <description>Provides the UIMA Ruta engine to other Eclipse + plugins for their use</description> + <properties> <postNoticeText>${uniWueNoticeText} diff --cc ruta-ep-ide-ui/.gitignore index 0000000,0000000..7e3a306 new file mode 100644 --- /dev/null +++ b/ruta-ep-ide-ui/.gitignore @@@ -1,0 -1,0 +1,1 @@@ ++META-INF/ diff --cc ruta-ep-ide-ui/pom.xml index 4775b98,72591c0..9d815f3 --- a/ruta-ep-ide-ui/pom.xml +++ b/ruta-ep-ide-ui/pom.xml @@@ -25,10 -24,12 +25,10 @@@ <parent> <groupId>org.apache.uima</groupId> <artifactId>ruta-ep-parent</artifactId> - <version>2.8.2-SNAPSHOT</version> + <version>3.0.2-SNAPSHOT</version> <relativePath>../ruta-ep-parent/pom.xml</relativePath> </parent> - <properties> - <uimaScmProject>${project.artifactId}</uimaScmProject> - </properties> + <name>Apache UIMA Ruta Eclipse: ${project.artifactId}</name> <url>${uimaWebsiteUrl}</url> <description>Provides the UIMA Ruta development environment for Eclipse</description> diff --cc ruta-ep-ide/.gitignore index 0000000,0000000..7e3a306 new file mode 100644 --- /dev/null +++ b/ruta-ep-ide/.gitignore @@@ -1,0 -1,0 +1,1 @@@ ++META-INF/ diff --cc ruta-ep-ide/pom.xml index b2de160,a7df7a1..4057c37 --- a/ruta-ep-ide/pom.xml +++ b/ruta-ep-ide/pom.xml @@@ -1,38 -1,32 +1,38 @@@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at + 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 + 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. + 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. --> - -<project xmlns="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/xsd/maven-4.0.0.xsd"> +<project xmlns="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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <artifactId>ruta-ep-ide</artifactId> - <parent> + <parent> <groupId>org.apache.uima</groupId> <artifactId>ruta-ep-parent</artifactId> - <version>2.8.2-SNAPSHOT</version> + <version>3.0.2-SNAPSHOT</version> <relativePath>../ruta-ep-parent/pom.xml</relativePath> </parent> + + <name>Apache UIMA Ruta Eclipse: ${project.artifactId}</name> + <url>${uimaWebsiteUrl}</url> + <description>Provides the UIMA Ruta development environment for Eclipse</description> + <properties> <uimaScmProject>${project.artifactId}</uimaScmProject> <postNoticeText>${uniWueNoticeText}</postNoticeText> diff --cc ruta-ep-textruler/.gitignore index 0000000,0000000..7e3a306 new file mode 100644 --- /dev/null +++ b/ruta-ep-textruler/.gitignore @@@ -1,0 -1,0 +1,1 @@@ ++META-INF/ diff --cc ruta-ep-textruler/pom.xml index 84b3836,dea4ca9..e675b10 --- a/ruta-ep-textruler/pom.xml +++ b/ruta-ep-textruler/pom.xml @@@ -25,10 -23,12 +25,10 @@@ <parent> <groupId>org.apache.uima</groupId> <artifactId>ruta-ep-parent</artifactId> - <version>2.8.2-SNAPSHOT</version> + <version>3.0.2-SNAPSHOT</version> <relativePath>../ruta-ep-parent/pom.xml</relativePath> </parent> - <properties> - <uimaScmProject>${project.artifactId}</uimaScmProject> - </properties> + <name>Apache UIMA Ruta Eclipse: ${project.artifactId}</name> <url>${uimaWebsiteUrl}</url> <description>UIMA Ruta TextRuler plugin for rule learning</description> diff --cc ruta-maven-plugin/pom.xml index 544c151,10adfae..2c23714 --- a/ruta-maven-plugin/pom.xml +++ b/ruta-maven-plugin/pom.xml @@@ -1,43 -1,39 +1,43 @@@ +<?xml version="1.0" encoding="UTF-8"?> <!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at + 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 + 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. + 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. --> -<project xmlns="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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <!-- This artifact name follows the conventions described http://books.sonatype.com/mvnref-book/reference/writing-plugins-sect-custom-plugin.html - where patterns like xxx-maven-plugin and maven-xxx-plugin can be invoked just using xxx if the right settings are in place --> - <artifactId>ruta-maven-plugin</artifactId> - <packaging>maven-plugin</packaging> - <name>Apache UIMA Maven: ${project.artifactId}</name> - <description>A Maven Plugin for generating descriptors from UIMA Ruta script files.</description> - <prerequisites> - <maven>3.0</maven> - </prerequisites> - <parent> - <groupId>org.apache.uima</groupId> - <artifactId>ruta-parent</artifactId> - <version>3.0.2-SNAPSHOT</version> - <relativePath>../ruta-parent/pom.xml</relativePath> - </parent> - <properties> +<project xmlns="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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <!-- This artifact name follows the conventions described http://books.sonatype.com/mvnref-book/reference/writing-plugins-sect-custom-plugin.html - where patterns like xxx-maven-plugin and maven-xxx-plugin can be invoked just using xxx if the right ++ where patterns like xxx-maven-plugin and maven-xxx-plugin can be invoked just using xxx if the right + settings are in place --> + <artifactId>ruta-maven-plugin</artifactId> + <packaging>maven-plugin</packaging> + <name>Apache UIMA Maven: ${project.artifactId}</name> + <description>A Maven Plugin for generating descriptors from UIMA Ruta script files.</description> + <prerequisites> + <maven>3.0</maven> + </prerequisites> + <parent> + <groupId>org.apache.uima</groupId> + <artifactId>ruta-parent</artifactId> - <version>2.8.2-SNAPSHOT</version> ++ <version>3.0.2-SNAPSHOT</version> + <relativePath>../ruta-parent/pom.xml</relativePath> + </parent> + <properties> <postNoticeText /> </properties> <url>${uimaWebsiteUrl}</url> @@@ -142,8 -136,7 +142,8 @@@ </execution> </executions> </plugin> - <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence - <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> ++ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence + on the Maven build itself. --> <plugin> <groupId>org.eclipse.m2e</groupId> <artifactId>lifecycle-mapping</artifactId> diff --cc ruta-parent/pom.xml index 4d9200e,3ed2b61..6a4f6b7 --- a/ruta-parent/pom.xml +++ b/ruta-parent/pom.xml @@@ -119,26 -116,26 +119,26 @@@ </snapshots> </pluginRepository> </pluginRepositories> - - <properties> - <uniWueNoticeText>Portions of UIMA Ruta were originally developed by -the Universität Würzburg. -Copyright (c) 2006, 2011 Universität Würzburg.</uniWueNoticeText> + + <properties> + <uniWueNoticeText>Portions of UIMA Ruta were originally developed by + the Universität Würzburg. + Copyright (c) 2006, 2011 Universität Würzburg.</uniWueNoticeText> <postNoticeText>${uniWueNoticeText} -This product contains icons developed by Mark James -(http://www.famfamfam.com/lab/icons/silk/), licensed under the -Creative Commons Attribution 3.0 License. + This product contains icons developed by Mark James + (http://www.famfamfam.com/lab/icons/silk/), licensed under the + Creative Commons Attribution 3.0 License. </postNoticeText> - <uimaVersion>2.10.4</uimaVersion> - <uimafit-version>2.4.0</uimafit-version> + <uimaVersion>3.1.1</uimaVersion> + <uimafit-version>3.0.0</uimafit-version> <spring-version>4.3.22.RELEASE</spring-version> - <!-- - BACKWARD_COMPATIBLE_IMPLEMENTER - patch version (=.=.+) - BACKWARD_COMPATIBLE_USER - minor version (=.+.0) - NON_BACKWARD_COMPATIBLE - major version (+.0.0) - --> - + <!-- + BACKWARD_COMPATIBLE_IMPLEMENTER - patch version (=.=.+) + BACKWARD_COMPATIBLE_USER - minor version (=.+.0) + NON_BACKWARD_COMPATIBLE - major version (+.0.0) + --> + <compat.level>NON_BACKWARD_COMPATIBLE</compat.level> <compat.previous.version>2.6.0</compat.previous.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> diff --cc ruta-typesystem/pom.xml index db5920a,bdb3c72..10bb713 --- a/ruta-typesystem/pom.xml +++ b/ruta-typesystem/pom.xml @@@ -25,10 -16,15 +25,10 @@@ <parent> <groupId>org.apache.uima</groupId> <artifactId>ruta-parent</artifactId> - <version>2.8.2-SNAPSHOT</version> + <version>3.0.2-SNAPSHOT</version> <relativePath>../ruta-parent/pom.xml</relativePath> </parent> - - - <properties> - <uimaScmProject>${project.artifactId}</uimaScmProject> - </properties> - + <url>${uimaWebsiteUrl}</url> <description>The type systems provided by ruta-core.</description> <name>Apache UIMA Ruta: ${project.artifactId}</name>