[uima-async-scaleout] 01/01: Merge pull request #13 from apache/refactoring/UIMA-6472-Update-dependencies
This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git commit bfff96b389708e6519e597a9add49b92f28af7b6 Merge: 5b386a71 233d5557 Author: Richard Eckart de Castilho AuthorDate: Fri Jun 10 23:35:32 2022 +0200 Merge pull request #13 from apache/refactoring/UIMA-6472-Update-dependencies [UIMA-6472] Update dependencies (UIMA AS) uima-as-parent/pom.xml | 95 -- 1 file changed, 14 insertions(+), 81 deletions(-)
[uima-async-scaleout] 01/01: [UIMA-6472] Update dependencies (UIMA AS)
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch refactoring/UIMA-6472-Update-dependencies
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit 233d5557b5713b7c6e66744b8973ac653e4c2c6d
Author: Richard Eckart de Castilho
AuthorDate: Fri Jun 10 20:07:16 2022 +0200
[UIMA-6472] Update dependencies (UIMA AS)
- UIMA Java SDK 2.10.3 -> 2.11.0
- Spring 4.3.30 -> 5.3.20
- XStream 1.4.10 -> 1.4.19
- JUnit 4.8.1 -> 4.13.2
---
uima-as-parent/pom.xml | 95 --
1 file changed, 14 insertions(+), 81 deletions(-)
diff --git a/uima-as-parent/pom.xml b/uima-as-parent/pom.xml
index 8b58f255..0a2f7f64 100644
--- a/uima-as-parent/pom.xml
+++ b/uima-as-parent/pom.xml
@@ -45,15 +45,9 @@
${uimaWebsiteUrl}
-
- scm:git:https://github.com/apache/uima-async-scaleout
-
-
- scm:git:https://github.com/apache/uima-async-scaleout
-
-
- https://github.com/apache/uima-async-scaleout
-
+
scm:git:https://github.com/apache/uima-async-scaleout
+
scm:git:https://github.com/apache/uima-async-scaleout
+https://github.com/apache/uima-async-scaleout
-
-
central
Maven Repository Switchboard
default
https://repo1.maven.org/maven2
-
true
fail
never
-
false
-
@@ -123,6 +98,7 @@
never
+
artifactory.openntf.org
artifactory.openntf.org
@@ -138,18 +114,18 @@
https://download.eclipse.org/releases/2018-12/
-2.10.3
+2.11.0
5.16.2
-4.3.30.RELEASE
+5.3.20
2.25.2
1.1.1
1.0.1
1.0
9.2.25.v20180606
2.4.2
-1.4.10
+1.4.19
1.2.17
3.1.0
1.7.13
@@ -157,7 +133,7 @@
4.5.6
4.4.10
1.11
-4.8.1
+4.13.2
-
org.apache.uima
uimaj-core
@@ -203,55 +178,42 @@
compile
-
org.apache.activemq
activemq-client
${org.apache.activemq.version}
-
org.apache.activemq
activemq-broker
${org.apache.activemq.version}
-
-
-
org.apache.activemq
activemq-jaas
${org.apache.activemq.version}
-
org.apache.activemq
activemq-web
${org.apache.activemq.version}
-
org.apache.activemq
activemq-spring
${org.apache.activemq.version}
-
org.apache.activemq
activemq-console
${org.apache.activemq.version}
-
org.apache.activemq
activemq-http
${org.apache.activemq.version}
-
-
-
-
org.apache.activemq
activemq-camel
@@ -307,85 +269,65 @@
activemq-shiro
${org.apache.activemq.version}
-
-
-
-org.fusesource.hawtbuf
-hawtbuf
-${hawtbuff.version}
-
-
-
-
org.apache.activemq
activemq-kahadb-store
${org.apache.activemq.version}
-
${project.groupId}
activemq-http
${org.apache.activemq.version}
+
+org.fusesource.hawtbuf
+hawtbuf
+${hawtbuff.version}
+
+
org.springframework
spring-core
${org.springframework.version}
-
-
-
org.springframework
spring-aop
${org.springframework.version}
-
org.springframework
spring-beans
${org.springframework.version}
-
org.springframework
spring-context
${org.springframework.version}
-
org.springframework
spring-webt
${org.springframework.version}
-
org.springframework
spring-expression
${org.springframework.version}
-
org.springframework
spring-tx
${org.springframework.version}
-
org.springframework
spring-jms
${org.springframework.version}
-
-
org.apache.geronimo.specs
geronimo-jms_1.1_spec
@@ -396,8 +338,6 @@
geronimo-j2ee-management_1.1_spec
${org.apache.geronimo.j2ee.specs.version}
-
-
org.apache.geronimo.specs
geronimo-servlet_3.0_spec
@@ -422,7 +362,6 @@
com.thoughtworks.xstream
xstream
${xstream.version}
-jar
compile
@@ -439,8 +378,6 @@
${slf4j.version}
-
-
org.slf4j
jcl-over-slf4j
@@ -459,14 +396,12 @@
${log4j.version}
-
xpp3
xpp
[uima-async-scaleout] 01/01: Merge pull request #12 from apache/refactoring/UIMA-6438-Add-asf_yaml-files-to-UIMA-repos
This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git commit 5b386a71dd42803bbf2cde970422eef2e877e142 Merge: e2154adc 097bf0bc Author: Richard Eckart de Castilho AuthorDate: Fri Jun 10 19:52:01 2022 +0200 Merge pull request #12 from apache/refactoring/UIMA-6438-Add-asf_yaml-files-to-UIMA-repos [UIMA-6438] Add asf.yaml files to UIMA repos .asf.yaml | 47 +++ .github/ISSUE_TEMPLATE/bug_report.md | 27 ++ .github/ISSUE_TEMPLATE/config.yml | 8 ++ .github/ISSUE_TEMPLATE/feature_request.md | 16 +++ .github/ISSUE_TEMPLATE/refactoring.md | 10 +++ .github/PULL_REQUEST_TEMPLATE.md | 17 +++ uima-as-parent/pom.xml| 22 +-- 7 files changed, 145 insertions(+), 2 deletions(-)
[uima-async-scaleout] 01/01: [UIMA-6438] Add asf.yaml files to UIMA repos
This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch refactoring/UIMA-6438-Add-asf_yaml-files-to-UIMA-repos in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git commit ead3abe729dfed1e998427dc411106fb70fac7b6 Author: Richard Eckart de Castilho AuthorDate: Fri Jun 10 15:10:47 2022 +0200 [UIMA-6438] Add asf.yaml files to UIMA repos - Added GitHub issue and PR templates - Addeds ASF YAML file --- .asf.yaml | 47 +++ .github/ISSUE_TEMPLATE/bug_report.md | 27 ++ .github/ISSUE_TEMPLATE/config.yml | 8 ++ .github/ISSUE_TEMPLATE/feature_request.md | 16 +++ .github/ISSUE_TEMPLATE/refactoring.md | 10 +++ .github/PULL_REQUEST_TEMPLATE.md | 17 +++ 6 files changed, 125 insertions(+) diff --git a/.asf.yaml b/.asf.yaml new file mode 100644 index ..7df4c4ac --- /dev/null +++ b/.asf.yaml @@ -0,0 +1,47 @@ +# +# 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. +# + +github: + description: "Apache UIMA UIMA Asynchronous Scaleout (UIMA-AS)" + homepage: https://uima.apache.org/ + dependabot_alerts: true + dependabot_updates: false + notifications: +commits: commits@uima.apache.org +issues: d...@uima.apache.org +pullrequests: d...@uima.apache.org +jobs: d...@uima.apache.org +jira_options: link label + labels: + - apache + - uima + - text-analysis + features: +wiki: false +issues: false +projects: false + enabled_merge_buttons: +squash: true +merge: true +rebase: false + del_branch_on_merge: true + protected_branches: +main: + required_status_checks: +strict: true +contexts: + - continuous-integration/jenkins/pr-merge diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index ..d1dd9df9 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,27 @@ +--- +name: Bug report +about: Create a report to help us improve +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '' +3. Scroll down to '' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Please complete the following information:** + - Version: [e.g. 3.2.0] + - OS: [e.g. Windows, Linux, OS X] + +**Additional context** +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index ..8a83dd32 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,8 @@ +blank_issues_enabled: false +contact_links: + - name: Apache UIMA Forum/Mailing list +url: https://lists.apache.org/list.html?u...@uima.apache.org +about: Community support. + - name: Apache UIMA Gitter/Matrix Channel +url: https://gitter.im/apache/uima +about: Public chat channel. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index ..a09db44f --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,16 @@ +--- +name: Feature request +about: Suggest an idea for this project +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. diff --git a/.github/ISSUE_TEMPLATE/refactoring.md b/.github/ISSUE_TEMPLATE/refactoring.md new file mode 100644 index ..10ad4722 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/refactoring.md @@ -0,0 +1,10 @@ +--- +name: Refactoring (for dev
[uima-async-scaleout] 01/01: [UIMA-6463] Use toolchains to ensure compatibility with Java 1.8
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch
refactoring/UIMA-6463-Use-toolchains-to-ensure-compatibility-with-Java-1_8
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit 7108f3ca950f57a027445a5bb355f10add2aab30
Author: Richard Eckart de Castilho
AuthorDate: Fri Jun 10 14:36:38 2022 +0200
[UIMA-6463] Use toolchains to ensure compatibility with Java 1.8
- Enable usage of toolchain
- Fix use of p2 repository
---
uima-as-parent/pom.xml | 43 ++-
1 file changed, 34 insertions(+), 9 deletions(-)
diff --git a/uima-as-parent/pom.xml b/uima-as-parent/pom.xml
index d56eeb69..25695399 100644
--- a/uima-as-parent/pom.xml
+++ b/uima-as-parent/pom.xml
@@ -123,8 +123,13 @@
never
-
+
+ artifactory.openntf.org
+ artifactory.openntf.org
+ https://artifactory.openntf.org/openntf
+
+
uima-as
${project.artifactId}
@@ -507,15 +512,36 @@
+
+
+org.openntf.maven
+p2-layout-resolver
+true
+1.3.0
+
+
+
+org.apache.maven.plugins
+maven-toolchains-plugin
+
+
+
+ toolchain
+
+
+
+
+
+
+ ${maven.compiler.target}
+
+
+
+
+
+
-
- org.openntf.maven
- p2-layout-resolver
- 1.3.0
- true
-
-
maven-compiler-plugin
3.1
@@ -603,7 +629,6 @@
${eclipseP2RepoUrl}
p2
-
[uima-async-scaleout] 01/01: Merge pull request #7 from apache/no-jira-readme-to-markdown
This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git commit 5127d7c627f9a4feeb8eac8fe1543b25ef1344c1 Merge: 29ea862b 5d01a85c Author: Richard Eckart de Castilho AuthorDate: Thu Apr 28 21:06:41 2022 +0200 Merge pull request #7 from apache/no-jira-readme-to-markdown [NO JIRA] Convert readme and release notes to markdown README | 495 - README.md | 469 ++ RELEASE_NOTES.html | 81 - RELEASE_NOTES.md | 75 4 files changed, 544 insertions(+), 576 deletions(-)
[uima-async-scaleout] 01/01: [NO JIRA] Convert readme and release notes to markdown - and move version-specific stuff to release notes and general stuff to the README
This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch no-jira-readme-to-markdown in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git commit 5d01a85ce3f449fa6975a501cb3a09b58c322fe3 Author: Richard Eckart de Castilho AuthorDate: Thu Apr 28 21:05:36 2022 +0200 [NO JIRA] Convert readme and release notes to markdown - and move version-specific stuff to release notes and general stuff to the README --- README | 495 - README.md | 469 ++ RELEASE_NOTES.html | 81 - RELEASE_NOTES.md | 75 4 files changed, 544 insertions(+), 576 deletions(-) diff --git a/README b/README deleted file mode 100644 index d60acb19.. --- a/README +++ /dev/null @@ -1,495 +0,0 @@ - Apache UIMA Asynchronous Scaleout (UIMA-AS) Version 2.10.3 README - - -0. Building from the Source Distribution - - -We use Maven 3.3.+ for building; download this if needed, -and set the environment variable MAVEN_OPTS to -Xmx800m -XX:MaxPerSize-256m. - -Then build from the directory containing this README by issuing the command - mvn clean install. - -This builds everything except the ...source-release.zip file. If you want that, -change the command to - - mvn clean install -Papache-release - -Look for the result in the two artifacts: - target/uima-as-[version]-source-release.zip (if run with -Papache-release) and - target/uima-as-[version]-bin.zip (or ...tar.gz) - -If your maven build fails with strange errors try running maven with an update flag -like this: - - mvn -U clean install - -Note that a build with -U option takes much longer to finish. - -For more details, please see http://uima.apache.org/building-uima.html - -1. What's New in 2.10.3 -== - - Modified client code to assign unique ClientID to broker connection - - Fixed ClassCastException when async aggregate initializes delegate with JMS Service Descriptor - - Fixed broken classpath and logging for UIMA-AS run configurations - -1.1 Contents of Apache UIMA-AS binary distribution --- - -The Apache UIMA-AS binary distribution includes - - Apache UIMA Java SDK version 2.10.2 - - Apache UIMA Asynchronous Scaleout extensions - - Saxon - - Apache ActiveMQ version 5.15.2 - - Spring Framework version 4.3.9 - - XMLBeans - -It includes the base UIMA binary distribution which it depends on. - -UIMA-AS components, in addition to those that come with base UIMA include: - - shell scripts: - -- - - bin/startBroker.sh/bat: starts the ActiveMQ broker, which must be running before - UIMA AS services can be deployed. - bin/deployAsyncService.sh/bat: deploys an AnalysisEngine as a UIMA-AS - service. Takes one or more UIMA-AS Deployment Descriptors as arguments. - bin/runRemoteAsyncAE.sh/bat: Calls a UIMA-AS service. Takes arguments specifying the - location of the service, and an optional CollectionReader descriptor file used to - obtain the CASes to be processed by the service. - - documentation: - -- - - docs/d/uima_async_scaleout.pdf: UIMA-AS documentation, including the specification - for the deployment descriptor file syntax. - - examples: - - - - examples/deploy/as/... (Sample Deployment Descriptors) -Deploy_RoomNumberAnnotator.xml: Deploys Room Number Annotator Primitive AE -Deploy_MeetingDetectorTAE.xml: Deploys Meeting Detector Aggregate AE with all -delegates in the same JVM. -Deploy_MeetingDetectorTAE_Whiteboard.xml: Deploys Meeting Detector Aggregate AE -using the whiteboard Flow Controller. -Deploy_MeetingDetectorTAE_RemoteRoomNumber.xml: Deploys Meeting Detector Aggregate AE -that uses remotely deployed RoomNumberAnnotator. -Deploy_MeetingDetectorTAE_3MeetingAnnotator.xml: Deploys Meeting Detector Aggregate AE -with three instances of the MeetingAnnotator component. -Deploy_MeetingDetectorTAE_Sync_3Instances.xml: Deploys 3 instances of the -Meeting Detector as a Synchronous Aggregate (meaning the delegate AEs do not each -get their own input queue). -Deploy_MeetingAnnotator.xml: Deploys C++ Meeting Annotator. Note: requires -installation of uimacpp SDK into $UIMA_HOME. - -MeetingFinderAggregate.xml: Aggregate descriptor that use the same components as the -CPE examples MeetingFinderCPE* in base UIMA. -Deploy_MeetingFinder.xml: Deploys MeetingFinderAggregate illustrating scalability and -error handling similar to the CPM examples; see Section 4 on migration below. - - descriptors: - - - descriptors/as/... (Other Sample Descriptors for use with UIMA
[uima-async-scaleout] 01/01: Merge pull request #4 from apache/bugfix/UIMA-6387-Update-p2-repo-URLs-from-http-to-https
This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git commit 29ea862ba50612bb751ffb2b3afeeadcdb3c069b Merge: e71b583 4b62c34 Author: Richard Eckart de Castilho AuthorDate: Thu Oct 7 10:46:28 2021 +0200 Merge pull request #4 from apache/bugfix/UIMA-6387-Update-p2-repo-URLs-from-http-to-https [UIMA-6387] Update p2 repo URLs from http to https uima-as-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[uima-async-scaleout] 01/01: [UIMA-6387] Update p2 repo URLs from http to https
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch
bugfix/UIMA-6387-Update-p2-repo-URLs-from-http-to-https
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit 4b62c34de8a7d5ae89b816b12a59dc5f2f2e144e
Author: Richard Eckart de Castilho
AuthorDate: Thu Oct 7 10:18:46 2021 +0200
[UIMA-6387] Update p2 repo URLs from http to https
- Change repo URL to https
---
uima-as-parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/uima-as-parent/pom.xml b/uima-as-parent/pom.xml
index 0703bc1..d56eeb6 100644
--- a/uima-as-parent/pom.xml
+++ b/uima-as-parent/pom.xml
@@ -130,7 +130,7 @@
${project.artifactId}
org.eclipse.p2.201812
-
http://download.eclipse.org/releases/2018-12/
+
https://download.eclipse.org/releases/2018-12/
2.10.3
[uima-async-scaleout] 01/01: Merge pull request #3 from apache/NO-JIRA-Fix-build
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git commit e71b58391aea5ddf44711f0fa0f7593ddc58e1a3 Merge: 8b85acc 32fa17e Author: cwiklik AuthorDate: Mon Jun 28 13:27:20 2021 -0400 Merge pull request #3 from apache/NO-JIRA-Fix-build [NO JIRA] Fix build of Eclipse plugins aggregate-uima-as/pom.xml | 2 +- uima-as-parent/pom.xml| 128 +- uimaj-ep-deployeditor/pom.xml | 309 ++ uimaj-ep-runtime-deployeditor/pom.xml | 10 +- 4 files changed, 97 insertions(+), 352 deletions(-)
[uima-async-scaleout] 01/01: [NO JIRA] Fix build of Eclipse plugins
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch NO-JIRA-Fix-build
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit 32fa17e5e7562cbaf41cc694002b7ca4c04d6b2f
Author: Richard Eckart de Castilho
AuthorDate: Mon Jun 21 20:47:51 2021 +0200
[NO JIRA] Fix build of Eclipse plugins
- Comment EP aggregate back in
- Fix dependencies
- Clean up POMs a bit
---
aggregate-uima-as/pom.xml | 2 +-
uima-as-parent/pom.xml| 128 +-
uimaj-ep-deployeditor/pom.xml | 309 ++
uimaj-ep-runtime-deployeditor/pom.xml | 10 +-
4 files changed, 97 insertions(+), 352 deletions(-)
diff --git a/aggregate-uima-as/pom.xml b/aggregate-uima-as/pom.xml
index 168ed14..cae011b 100644
--- a/aggregate-uima-as/pom.xml
+++ b/aggregate-uima-as/pom.xml
@@ -64,7 +64,7 @@
../uimaj-as-activemq
../uimaj-as-core
../uimaj-as-jms
-
+../aggregate-uima-as-eclipse-plugins
../uima-as-docbooks
diff --git a/uima-as-parent/pom.xml b/uima-as-parent/pom.xml
index 13d3e14..0703bc1 100644
--- a/uima-as-parent/pom.xml
+++ b/uima-as-parent/pom.xml
@@ -1,28 +1,28 @@
-
http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
@@ -69,14 +69,14 @@
https://repo1.maven.org/maven2
-never
-fail
+ never
+ fail
-false
+ false
-
+
@@ -106,14 +106,6 @@
false
-
-
-
-
@@ -137,9 +129,8 @@
uima-as
${project.artifactId}
-
-
+org.eclipse.p2.201812
+
http://download.eclipse.org/releases/2018-12/
2.10.3
@@ -163,11 +154,11 @@
1.11
4.8.1
-
+
UTF-8
1.8
1.8
@@ -175,11 +166,14 @@
Portions of UIMA-AS were originally developed by
- International Business Machines Corporation and are
+ International Business
+ Machines Corporation and are
licensed to the Apache Software Foundation under the
- "Software Grant License Agreement", informally known as the
+ "Software
+ Grant License Agreement", informally known as the
"IBM UIMA-EE License Agreement".
- Copyright (c) 2007, 2008 IBM Corporation
+ Copyright (c)
+ 2007, 2008 IBM Corporation
@@ -486,20 +480,48 @@
${junit.version}
+
+
+${eclipseP2RepoId}
+org.eclipse.jdt.debug
+
+
+
+${eclipseP2RepoId}
+com.ibm.icu
+
+
+
+${eclipseP2RepoId}
+org.eclipse.jdt.debug
+
+
+
-
+ org.openntf.maven
+ p2-layout-resolver
+ 1.3.0
+ true
+
+
+
maven-compiler-plugin
3.1
-
org.eclipse.m2e
@@ -566,4 +588,24 @@
+
+
+ marker-file-identifying-eclipse-plugin
+
+
+ marker-file-identifying-eclipse-plugin
+
+
+
+
+
+ ${eclipseP2RepoId}
+ ${eclipseP2RepoUrl}
+ p2
+
+
+
+
+
+
diff --git a/uimaj-ep-deployeditor/pom.xml b/uimaj-ep-deployeditor/pom.xml
index 4309684..f21efea 100644
--- a/uimaj-ep-deployeditor/pom.xml
+++ b/uimaj-ep-deployeditor/pom.xml
@@ -88,319 +88,31 @@
provided
-
-
-
-
-
- org.eclipse.core
- org.eclipse.core.resources
- [3.2.0,4.0.0]
- provided
-
-
--->
-
-
-
-
-
- org.eclipse.platform
- org.eclipse.ui
- [3.108.1, 4.0.0)
- provided
-
-
- org.eclipse.platform
- org.eclipse.swt
-
-
-
- com.sun.jna
- com.sun.jna
-
-
- com.sun.jna
- com.sun.jna.platform
-
-
-
-
-
- org.eclipse.swt
- org.eclipse.swt.win32.win32.x86
+ ${eclipseP2RepoId}
+ org.eclipse.swt.win32.win32.x86_64
[3.2.0,5.0.0)
provided
-
-
- org.eclipse.platform
- org.eclipse.jface
- [3.16.0, 4.0.0)
- provided
-
-
-
- org.eclipse.jdt
- org.eclipse.jdt.ui
- [3.12.0,4.0.0)
- provided
-
-
- org.eclipse.platform
- org.eclipse.search
-
-
- org.eclipse.platform
- org.eclipse.debug.ui
-
-
- org.eclipse.platform
- org.eclipse.compare
-
-
- org.eclipse.platform
- org.eclipse.team
-
-
- org.eclipse.platform
- org.eclipse.team.ui
-
-
- org.eclipse.platf
[uima-async-scaleout] 01/01: [NO JIRA] Fix build of Eclipse plugins
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch NO-JIRA-Fix-build
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit 99801ecdce6c0c69cdc875e68b7cde532d08701e
Author: Richard Eckart de Castilho
AuthorDate: Mon Jun 21 20:47:51 2021 +0200
[NO JIRA] Fix build of Eclipse plugins
- Comment EP aggregate back in
- Fix dependencies
- Clean up POMs a bit
---
aggregate-uima-as/pom.xml | 2 +-
uima-as-parent/pom.xml| 128 +-
uimaj-ep-deployeditor/pom.xml | 309 ++
uimaj-ep-runtime-deployeditor/pom.xml | 10 +-
4 files changed, 97 insertions(+), 352 deletions(-)
diff --git a/aggregate-uima-as/pom.xml b/aggregate-uima-as/pom.xml
index 168ed14..cae011b 100644
--- a/aggregate-uima-as/pom.xml
+++ b/aggregate-uima-as/pom.xml
@@ -64,7 +64,7 @@
../uimaj-as-activemq
../uimaj-as-core
../uimaj-as-jms
-
+../aggregate-uima-as-eclipse-plugins
../uima-as-docbooks
diff --git a/uima-as-parent/pom.xml b/uima-as-parent/pom.xml
index 13d3e14..0703bc1 100644
--- a/uima-as-parent/pom.xml
+++ b/uima-as-parent/pom.xml
@@ -1,28 +1,28 @@
-
http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
@@ -69,14 +69,14 @@
https://repo1.maven.org/maven2
-never
-fail
+ never
+ fail
-false
+ false
-
+
@@ -106,14 +106,6 @@
false
-
-
-
-
@@ -137,9 +129,8 @@
uima-as
${project.artifactId}
-
-
+org.eclipse.p2.201812
+
http://download.eclipse.org/releases/2018-12/
2.10.3
@@ -163,11 +154,11 @@
1.11
4.8.1
-
+
UTF-8
1.8
1.8
@@ -175,11 +166,14 @@
Portions of UIMA-AS were originally developed by
- International Business Machines Corporation and are
+ International Business
+ Machines Corporation and are
licensed to the Apache Software Foundation under the
- "Software Grant License Agreement", informally known as the
+ "Software
+ Grant License Agreement", informally known as the
"IBM UIMA-EE License Agreement".
- Copyright (c) 2007, 2008 IBM Corporation
+ Copyright (c)
+ 2007, 2008 IBM Corporation
@@ -486,20 +480,48 @@
${junit.version}
+
+
+${eclipseP2RepoId}
+org.eclipse.jdt.debug
+
+
+
+${eclipseP2RepoId}
+com.ibm.icu
+
+
+
+${eclipseP2RepoId}
+org.eclipse.jdt.debug
+
+
+
-
+ org.openntf.maven
+ p2-layout-resolver
+ 1.3.0
+ true
+
+
+
maven-compiler-plugin
3.1
-
org.eclipse.m2e
@@ -566,4 +588,24 @@
+
+
+ marker-file-identifying-eclipse-plugin
+
+
+ marker-file-identifying-eclipse-plugin
+
+
+
+
+
+ ${eclipseP2RepoId}
+ ${eclipseP2RepoUrl}
+ p2
+
+
+
+
+
+
diff --git a/uimaj-ep-deployeditor/pom.xml b/uimaj-ep-deployeditor/pom.xml
index 4309684..f21efea 100644
--- a/uimaj-ep-deployeditor/pom.xml
+++ b/uimaj-ep-deployeditor/pom.xml
@@ -88,319 +88,31 @@
provided
-
-
-
-
-
- org.eclipse.core
- org.eclipse.core.resources
- [3.2.0,4.0.0]
- provided
-
-
--->
-
-
-
-
-
- org.eclipse.platform
- org.eclipse.ui
- [3.108.1, 4.0.0)
- provided
-
-
- org.eclipse.platform
- org.eclipse.swt
-
-
-
- com.sun.jna
- com.sun.jna
-
-
- com.sun.jna
- com.sun.jna.platform
-
-
-
-
-
- org.eclipse.swt
- org.eclipse.swt.win32.win32.x86
+ ${eclipseP2RepoId}
+ org.eclipse.swt.win32.win32.x86_64
[3.2.0,5.0.0)
provided
-
-
- org.eclipse.platform
- org.eclipse.jface
- [3.16.0, 4.0.0)
- provided
-
-
-
- org.eclipse.jdt
- org.eclipse.jdt.ui
- [3.12.0,4.0.0)
- provided
-
-
- org.eclipse.platform
- org.eclipse.search
-
-
- org.eclipse.platform
- org.eclipse.debug.ui
-
-
- org.eclipse.platform
- org.eclipse.compare
-
-
- org.eclipse.platform
- org.eclipse.team
-
-
- org.eclipse.platform
- org.eclipse.team.ui
-
-
- org.eclipse.platf
[uima-async-scaleout] 01/01: Merge pull request #2 from apache/UIMA-6307-Centralize-Jenkins-pipelines
This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git commit 111d78d2512b76693a99bf2da1bca54c1535b773 Merge: e6a1f7b 92e6026 Author: Richard Eckart de Castilho AuthorDate: Fri Feb 5 17:42:58 2021 +0100 Merge pull request #2 from apache/UIMA-6307-Centralize-Jenkins-pipelines [UIMA-6307] Centralize Jenkins pipelines .gitignore|7 + Jenkinsfile | 73 +-- uima-as-parent/pom.xml| 1038 + uimaj-as-core/pom.xml | 369 +++ uimaj-ep-deployeditor/pom.xml | 31 +- 5 files changed, 745 insertions(+), 773 deletions(-)
[uima-async-scaleout] 01/01: [UIMA-6307] Centralize Jenkins pipelines
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch UIMA-6307-Centralize-Jenkins-pipelines
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit 4e6e6a1cde1fb217ab315df0c18324636a73979f
Author: Richard Eckart de Castilho
AuthorDate: Fri Feb 5 13:18:53 2021 +0100
[UIMA-6307] Centralize Jenkins pipelines
- Switch to centralized Jenkins pipeline
---
.gitignore | 5 +
Jenkinsfile | 71 ++---
2 files changed, 7 insertions(+), 69 deletions(-)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..32f817a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+.settings
+.project
+.classpath
+target/
+feature.xml
diff --git a/Jenkinsfile b/Jenkinsfile
index d4d14ee..778d48f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -15,74 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-pipeline {
- agent any
- tools {
-maven 'Maven (latest)'
-jdk 'JDK 1.8 (latest)'
- }
+@Library('uima-build-jenkins-shared-library') _
- options {
-buildDiscarder(logRotator(
- numToKeepStr: '25',
- artifactNumToKeepStr: '5'
-))
-
-// Seems not to be working reliably yet:
https://issues.jenkins-ci.org/browse/JENKINS-48556
-// timestamps()
- }
-
- parameters {
-string(
- name: 'extraMavenArguments',
- defaultValue: "",
- description: "Extra arguments to be passed to maven (for testing)")
- }
-
- stages {
-// Display information about the build environemnt. This can be useful for
debugging
-// build issues.
-stage("Build info") {
- steps {
-echo '=== Environment variables ==='
-sh 'printenv'
- }
-}
-
-// Perform a merge request build. This is a conditional stage executed
with the GitLab
-// sources plugin triggers a build for a merge request. To avoid conflicts
with other
-// builds, this stage should not deploy artifacts to the Maven repository
server and
-// also not install them locally.
-stage("Pull request build") {
- when { branch 'PR-*' }
-
- steps {
-script {
- currentBuild.description = 'Triggered by: ' + BRANCH_NAME +
-': ' + env.CHANGE_BRANCH + ' (' +
env.CHANGE_AUTHOR_DISPLAY_NAME + ')'
-}
-
-withMaven() {
- sh script: 'mvn ' +
-params.extraMavenArguments +
-' -U -Dmaven.test.failure.ignore=true clean verify'
-}
- }
-}
-
-// Perform a SNAPSHOT build of a main branch. This stage is typically
executed after a
-// merge request has been merged. On success, it deploys the generated
artifacts to the
-// Maven repository server.
-stage("SNAPSHOT build") {
- when { branch pattern: "main", comparator: "REGEXP" }
-
- steps {
-withMaven() {
- sh script: 'mvn ' +
-params.extraMavenArguments +
-' -U -Dmaven.test.failure.ignore=true clean deploy'
-}
- }
-}
- }
+defaultPipeline {
}
[uima-async-scaleout] 01/01: [UIMA-6301] Rename "master" branches to "main"
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit e6a1f7bb5533ff15aababf532ad280d70bba75f7
Author: noname
AuthorDate: Thu Dec 3 17:41:46 2020 +0100
[UIMA-6301] Rename "master" branches to "main"
- Updated branch names
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index d722758..d4d14ee 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -74,7 +74,7 @@ pipeline {
// merge request has been merged. On success, it deploys the generated
artifacts to the
// Maven repository server.
stage("SNAPSHOT build") {
- when { branch pattern: "master", comparator: "REGEXP" }
+ when { branch pattern: "main", comparator: "REGEXP" }
steps {
withMaven() {
[uima-async-scaleout] 01/01:
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a commit to branch uima-as-no-broker in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git commit c253e59fd22ec8efcf409317e01e8eff01ea6cb3 Author: cwiklik AuthorDate: Fri Aug 19 13:39:35 2016 +
