(uima-uimaj) 01/01: Issue #325: Update dependencies
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch refactoring/325-Update-dependencies
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit 25c221bb4c70d041abe78e21bf487b4a1933aa75
Author: Richard Eckart de Castilho
AuthorDate: Wed Nov 1 08:55:33 2023 +0100
Issue #325: Update dependencies
- Tycho -> 4.0.3
- Build Eclipse plugins against Eclipse 2022-09
---
uimaj-documentation/src/docs/asciidoc/oas/eclipse_setup.adoc | 12 ++--
uimaj-ep-jcasgen/pom.xml | 4 ++--
uimaj-parent/pom.xml | 6 --
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/uimaj-documentation/src/docs/asciidoc/oas/eclipse_setup.adoc
b/uimaj-documentation/src/docs/asciidoc/oas/eclipse_setup.adoc
index c14d30217..9fcf63569 100644
--- a/uimaj-documentation/src/docs/asciidoc/oas/eclipse_setup.adoc
+++ b/uimaj-documentation/src/docs/asciidoc/oas/eclipse_setup.adoc
@@ -32,7 +32,7 @@ This chapter provides instructions for
* installing the UIMA SDK's Eclipse plugins into your Eclipse environment, and
* importing the example UIMA code into an Eclipse project.
-The UIMA Eclipse plugins are designed to be used with Eclipse version 4.29
(2023-09) or later.
+The UIMA Eclipse plugins are designed to be used with Eclipse version 4.25
(2022-09) or later.
[NOTE]
@@ -45,9 +45,9 @@ You will need to run Eclipse using a Java 17 or later, in
order to use the UIMA
[[ugr.ovv.eclipse_setup.install_eclipse]]
=== Install Eclipse
-* Go to _eclipse;link: and follow the instructions there to download
Eclipse.
+* Go to https://www.eclipse.org/downloads/ and follow the instructions there
to download Eclipse.
* We recommend using the latest release level. Navigate to the Eclipse Release
version you want and download the archive for your platform.
-* Unzip the archive to install Eclipse somewhere, e.g., c:\
+* Unzip the archive to install Eclipse somewhere, e.g., `c:\`
* Eclipse has a bit of a learning curve. If you plan to make significant use
of Eclipse, check out the tutorial under the help menu. It is well worth the
effort. There are also books you can get that describe Eclipse and its use.
The first time Eclipse starts up it will take a bit longer as it completes its
installation.
@@ -63,7 +63,7 @@ See below for an alternative, manual approach.
[NOTE]
If your computer is on an internet connection which uses a proxy server, you
can configure Eclipse to know about that.
-Put your proxy settings into Eclipse using the Eclipse preferences by
accessing the menus: Window →Preferences... →Install/Update, and Enable HTTP
proxy connection under the Proxy Settings with the information about your
proxy.
+Put your proxy settings into Eclipse using the Eclipse preferences by
accessing the menus: Window → Preferences... → Install/Update, and Enable HTTP
proxy connection under the Proxy Settings with the information about your
proxy.
To use the Eclipse Install New Software mechanism, start Eclipse, and then
pick the menu ``Help → Install new software...``.
@@ -117,7 +117,7 @@ Here's how to create a special project in Eclipse to hold
the examples.
* In Eclipse, if the Java perspective is not already open, switch to it by
going to Window →Open Perspective →Java.
* Set up a class path variable named UIMA_HOME, whose value is the directory
where you installed the UIMA SDK. This is done as follows:
+
-** Go to Window →Preferences →Java →Build Path →Classpath Variables.
+** Go to Window → Preferences → Java → Build Path → Classpath Variables.
** Click "`New`"
** Enter UIMA_HOME (all capitals, exactly as written) in the "`Name`" field.
** Enter your installation directory (e.g. ``C:/Program Files/apache-uima``)
in the "`Path`" field
@@ -145,7 +145,7 @@ To add the source code to the jars, you need to:
* Download and unpack the UIMA source distribution.
* Download and install the UIMA binary distribution (the UIMA_HOME environment
variable needs to be set to point to where you installed the UIMA binary
distribution).
-* "cd" to the root directory of the source distribution
+* `cd` to the root directory of the source distribution
* Execute the `src\main\readme_src\addSourceToJars` script in the root
directory of the source distribution.
This adds the source code to the jar files, and it will then be automatically
available from Eclipse.
diff --git a/uimaj-ep-jcasgen/pom.xml b/uimaj-ep-jcasgen/pom.xml
index 9c1676f3e..6e26122cd 100644
--- a/uimaj-ep-jcasgen/pom.xml
+++ b/uimaj-ep-jcasgen/pom.xml
@@ -75,13 +75,13 @@
${eclipseP2RepoId}
org.eclipse.emf.codegen
- [2.23.0, 3.0.0)
+ [2.22.0, 3.0.0)
provided
${eclipseP2RepoId}
org.eclipse.equinox.app
- [1.6.300, 2.0.0)
+ [1.6.200, 2.0.0)
provided
diff --git a/uimaj-parent/pom.xml
[uima-uimaj] 01/01: Issue #325: Update dependencies
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch refactoring/325-Update-dependencies
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit bbedbe78dfee11ab5a1e287c8d316037606f12d2
Author: Richard Eckart de Castilho
AuthorDate: Mon Oct 16 15:05:32 2023 +0200
Issue #325: Update dependencies
- Fix package imports in Eclipse plugins
---
uimaj-ep-cas-editor-ide/pom.xml | 13 +
uimaj-ep-cas-editor/pom.xml | 14 ++
uimaj-ep-configurator/pom.xml | 11 +++
uimaj-ep-debug/pom.xml | 9 +
uimaj-ep-jcasgen/pom.xml| 12 +---
uimaj-ep-launcher/pom.xml | 11 +++
uimaj-ep-pear-packager/pom.xml | 12
7 files changed, 79 insertions(+), 3 deletions(-)
diff --git a/uimaj-ep-cas-editor-ide/pom.xml b/uimaj-ep-cas-editor-ide/pom.xml
index dc4b9c903..17855ab36 100644
--- a/uimaj-ep-cas-editor-ide/pom.xml
+++ b/uimaj-ep-cas-editor-ide/pom.xml
@@ -158,6 +158,19 @@
org.apache.uima.caseditor.ide.CasEditorIdePlugin
lazy
${execution.environment}
+
+
+ org.eclipse.ui;ui.workbench=!,
+ org.eclipse.ui.dialogs;ui.workbench=!,
+ org.eclipse.ui.model;ui.workbench=!,
+ org.eclipse.ui.part;ui.workbench=!,
+ org.eclipse.core.runtime;common=!,
+ *
+
diff --git a/uimaj-ep-cas-editor/pom.xml b/uimaj-ep-cas-editor/pom.xml
index f28ca7c20..67a09b478 100644
--- a/uimaj-ep-cas-editor/pom.xml
+++ b/uimaj-ep-cas-editor/pom.xml
@@ -201,6 +201,20 @@
${execution.environment}
lazy
${execution.environment}
+
+
+ org.eclipse.ui;ui.workbench=!,
+ org.eclipse.ui.actions;ui.workbench=!,
+ org.eclipse.ui.dialogs;ui.workbench=!,
+ org.eclipse.ui.part;ui.workbench=!,
+ org.eclipse.ui.texteditor;texteditor=!,
+ org.eclipse.core.runtime;common=!,
+ *
+
diff --git a/uimaj-ep-configurator/pom.xml b/uimaj-ep-configurator/pom.xml
index b44ff543f..46d95dcf3 100644
--- a/uimaj-ep-configurator/pom.xml
+++ b/uimaj-ep-configurator/pom.xml
@@ -186,6 +186,17 @@
org.eclipse.ui.ide
+
+
+ org.eclipse.ui.texteditor;texteditor=!,
+ org.eclipse.ui.part;ui.workbench=!,
+ org.eclipse.core.runtime;common=!,
+ *
+
diff --git a/uimaj-ep-debug/pom.xml b/uimaj-ep-debug/pom.xml
index 1fc50fcb2..945cd705f 100644
--- a/uimaj-ep-debug/pom.xml
+++ b/uimaj-ep-debug/pom.xml
@@ -79,6 +79,15 @@ UIMA data structures to the Eclipse Debug
displays
org.apache.uima.ep_debug.DebugPlugin
true
${execution.environment}
+
+
+ org.eclipse.core.runtime;common=!,
+ *
+
diff --git a/uimaj-ep-jcasgen/pom.xml b/uimaj-ep-jcasgen/pom.xml
index 663cea590..9c1676f3e 100644
--- a/uimaj-ep-jcasgen/pom.xml
+++ b/uimaj-ep-jcasgen/pom.xml
@@ -98,9 +98,15 @@
org.apache.uima.jcas.jcasgenp.JgPlugin
true
${execution.environment}
-
- org.eclipse.core.runtime
-
+
+
+ org.eclipse.core.runtime;common=!,
+ *
+
diff --git a/uimaj-ep-launcher/pom.xml b/uimaj-ep-launcher/pom.xml
index b62f3bc17..cd4fafff7 100644
--- a/uimaj-ep-launcher/pom.xml
+++ b/uimaj-ep-launcher/pom.xml
@@ -131,6 +131,17 @@
org.apache.uima.ep_launcher
+
+
+ org.eclipse.ui.dialogs;ui.workbench=!,
+ org.eclipse.ui.model;ui.workbench=!,
+ org.eclipse.core.runtime;common=!,
+ *
+
diff --git a/uimaj-ep-pear-packager/pom.xml b/uimaj-ep-pear-packager/pom.xml
index 0bd52dda4..7df10cad5 100644
--- a/uimaj-ep-pear-packager/pom.xml
+++ b/uimaj-ep-pear-packager/pom.xml
@@ -103,6 +103,18 @@
org.apache.uima.pear.PearPlugin
true
${execution.environment}
+
+
+ org.eclipse.ui.dialogs;ui.workbench=!,
+ org.eclipse.ui.model;ui.workbench=!,
+ org.eclipse.ui;ui.workbench=!,
+ org.eclipse.core.runtime;common=!,
+ *
+
[uima-uimaj] 01/01: Issue #325: Update dependencies
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch refactoring/325-Update-dependencies
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit 233ccce42187e3ebed9a9f182232fa7ef6b71536
Author: Richard Eckart de Castilho
AuthorDate: Thu Oct 12 11:27:26 2023 +0200
Issue #325: Update dependencies
- UIMA Parent POM 17-SNAPSHOT -> 17
- Comment out SNAPSHOT repo
---
uimaj-parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/uimaj-parent/pom.xml b/uimaj-parent/pom.xml
index d3fd6aa49..133022142 100644
--- a/uimaj-parent/pom.xml
+++ b/uimaj-parent/pom.xml
@@ -31,7 +31,7 @@
org.apache.uima
parent-pom
-17-SNAPSHOT
+17
@@ -85,7 +85,6 @@
- The Eclipse Plugin modules use version ranges for their dependencies.
These could resolve to
- SNAPSHOT versions if we have a SNAPSHOT repo declaration here. Thus,
this repo should only
- be enabled when really needed.
- -->
apache.snapshots
Apache Snapshot Repository
@@ -97,6 +96,7 @@
true
+ -->
${eclipseP2RepoId}
[uima-uimaj] 01/01: Issue #325: Update dependencies
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch refactoring/325-Update-dependencies
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit 129a9c22c90696ec2014ffab8a2ace29e0ddd36a
Author: Richard Eckart de Castilho
AuthorDate: Wed Oct 4 16:55:43 2023 +0200
Issue #325: Update dependencies
- Fix compiler warnings
- Switch to github-release-notes profile
- Disable changelog generation during Jenkins builds
---
Jenkinsfile | 2 +-
...le-enabling-changes-report => marker-file-enabling-release-notes | 0
.../main/java/org/apache/uima/cas/impl/AnnotationTreeNodeImpl.java | 2 +-
.../src/main/java/org/apache/uima/impl/UIMAFramework_impl.java | 5 +++--
uimaj-parent/pom.xml| 6 ++
5 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 86153e903..1578be720 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -19,5 +19,5 @@
defaultPipeline {
// extraMavenArguments = '-Pjacoco,spotbugs,pmd -Ddisable-rc-auto-staging'
- extraMavenArguments = '-Ddisable-rc-auto-staging'
+ extraMavenArguments = '-Ddisable-rc-auto-staging
-Ddisable-generate-release-notes'
}
diff --git a/marker-file-enabling-changes-report
b/marker-file-enabling-release-notes
similarity index 100%
rename from marker-file-enabling-changes-report
rename to marker-file-enabling-release-notes
diff --git
a/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationTreeNodeImpl.java
b/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationTreeNodeImpl.java
index 1cdf376e9..e2f0e879e 100644
---
a/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationTreeNodeImpl.java
+++
b/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationTreeNodeImpl.java
@@ -54,7 +54,7 @@ public class AnnotationTreeNodeImpl
implements Annotatio
try {
return dtrs.get(i);
} catch (IndexOutOfBoundsException e) {
- throw new CASRuntimeException(CASRuntimeException.CHILD_INDEX_OOB, null);
+ throw new CASRuntimeException(CASRuntimeException.CHILD_INDEX_OOB);
}
}
diff --git
a/uimaj-core/src/main/java/org/apache/uima/impl/UIMAFramework_impl.java
b/uimaj-core/src/main/java/org/apache/uima/impl/UIMAFramework_impl.java
index 2058a41ae..49652b819 100644
--- a/uimaj-core/src/main/java/org/apache/uima/impl/UIMAFramework_impl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/impl/UIMAFramework_impl.java
@@ -344,7 +344,7 @@ public class UIMAFramework_impl extends UIMAFramework {
// get static method getInstance()
Method instanceMethod = mLoggerClass.getMethod("getInstance",
Constants.EMPTY_CLASS_ARRAY);
// invoke getInstance() method and retrieve default logger object
- return (Logger) instanceMethod.invoke(null, Constants.EMPTY_CLASS_ARRAY);
+ return (Logger) instanceMethod.invoke(null, (Object[])
Constants.EMPTY_CLASS_ARRAY);
} catch (NoSuchMethodException e) {
throw new UIMARuntimeException(e);
} catch (InvocationTargetException e) {
@@ -569,7 +569,8 @@ public class UIMAFramework_impl extends UIMAFramework {
Method instanceMethod = mLoggerClass.getMethod("getInstance",
Constants.EMPTY_CLASS_ARRAY);
// invoke getInstance() method and retrieve default logger object
- mDefaultLogger = (Logger) instanceMethod.invoke(null,
Constants.EMPTY_CLASS_ARRAY);
+ mDefaultLogger = (Logger) instanceMethod.invoke(null,
+ (Object[]) Constants.EMPTY_CLASS_ARRAY);
} catch (Exception e) {
throw new SAXException(e);
}
diff --git a/uimaj-parent/pom.xml b/uimaj-parent/pom.xml
index 81bf28064..98948bc9f 100644
--- a/uimaj-parent/pom.xml
+++ b/uimaj-parent/pom.xml
@@ -166,6 +166,12 @@
3.4.1
src/main/assembly/src.xml
+
+
+uima-uimaj
+main
+3.4.1
+
[uima-uimaj] 01/01: Issue #325: Update dependencies
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch refactoring/325-Update-dependencies
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit 25aaa66c8b66d55b6694c770ee6729103fab
Author: Richard Eckart de Castilho
AuthorDate: Fri Aug 11 13:12:23 2023 +0200
Issue #325: Update dependencies
- Disable deployment of documentation module to Maven repository
- Add ID to rc-auto-staging execution
- Disable quality checking profiles to speed up build
---
Jenkinsfile | 4 ++--
pom.xml | 1 +
uimaj-documentation/pom.xml | 4
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 60cd449fe..26c603f77 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,6 +18,6 @@
@Library('uima-build-jenkins-shared-library') _
defaultPipeline {
- // extraMavenArguments = '-Pjacoco,spotbugs,pmd,run-rat-report
-Ddisable-rc-auto-staging'
- extraMavenArguments = '-Prun-rat-report -Ddisable-rc-auto-staging'
+ // extraMavenArguments = '-Pjacoco,spotbugs,pmd -Ddisable-rc-auto-staging'
+ extraMavenArguments = -Ddisable-rc-auto-staging'
}
diff --git a/pom.xml b/pom.xml
index d9096dbcb..42602410b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -390,6 +390,7 @@
false
+release-rc-auto-staging
install
run
diff --git a/uimaj-documentation/pom.xml b/uimaj-documentation/pom.xml
index 9d638abb3..d6d38943c 100644
--- a/uimaj-documentation/pom.xml
+++ b/uimaj-documentation/pom.xml
@@ -32,6 +32,10 @@
Apache UIMA Java SDK Documentation
https://uima.apache.org
+
+true
+
+
[uima-uimaj] 01/01: Issue #325: Update dependencies
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch refactoring/325-Update-dependencies
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit 811f14339ac2bd72a68ca9fa2476e864e35fb878
Author: Richard Eckart de Castilho
AuthorDate: Mon Aug 7 18:08:15 2023 +0200
Issue #325: Update dependencies
- Set the required execution environment in the OSGI headers to JavaSE-17
---
jVinci/pom.xml | 2 +-
uimaj-adapter-vinci/pom.xml | 2 +-
uimaj-core/pom.xml | 2 +-
uimaj-cpe/pom.xml | 2 +-
uimaj-ep-cas-editor-ide/pom.xml | 1 +
uimaj-ep-cas-editor/pom.xml | 22 --
uimaj-ep-configurator/pom.xml | 1 +
uimaj-ep-debug/pom.xml | 1 +
uimaj-ep-jcasgen/pom.xml| 1 +
uimaj-ep-launcher/pom.xml | 1 +
uimaj-ep-pear-packager/pom.xml | 1 +
uimaj-ep-runtime/pom.xml| 2 +-
uimaj-parent/pom.xml| 1 +
uimaj-tools/pom.xml | 2 +-
14 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/jVinci/pom.xml b/jVinci/pom.xml
index c0002bd1a..77edfeb2a 100644
--- a/jVinci/pom.xml
+++ b/jVinci/pom.xml
@@ -47,7 +47,7 @@
maven-bundle-plugin
-
JavaSE-1.8
+
${execution.environment}
<_dsannotations>*
<_metatypeannotations>*
diff --git a/uimaj-adapter-vinci/pom.xml b/uimaj-adapter-vinci/pom.xml
index 07affc91d..478d00de8 100644
--- a/uimaj-adapter-vinci/pom.xml
+++ b/uimaj-adapter-vinci/pom.xml
@@ -77,7 +77,7 @@
maven-bundle-plugin
-
JavaSE-1.8
+
${execution.environment}
<_dsannotations>*
<_metatypeannotations>*
diff --git a/uimaj-core/pom.xml b/uimaj-core/pom.xml
index b03592da9..9a3d262bd 100644
--- a/uimaj-core/pom.xml
+++ b/uimaj-core/pom.xml
@@ -272,7 +272,7 @@
maven-bundle-plugin
-
JavaSE-1.8
+
${execution.environment}
<_dsannotations>*
<_metatypeannotations>*
diff --git a/uimaj-cpe/pom.xml b/uimaj-cpe/pom.xml
index 84acdd3a8..bee21cc1b 100644
--- a/uimaj-cpe/pom.xml
+++ b/uimaj-cpe/pom.xml
@@ -99,7 +99,7 @@
maven-bundle-plugin
-
JavaSE-1.8
+
${execution.environment}
<_dsannotations>*
<_metatypeannotations>*
org.apache.uima.j-core
diff --git a/uimaj-ep-cas-editor-ide/pom.xml b/uimaj-ep-cas-editor-ide/pom.xml
index ae8d49ab4..f92b488ab 100644
--- a/uimaj-ep-cas-editor-ide/pom.xml
+++ b/uimaj-ep-cas-editor-ide/pom.xml
@@ -196,6 +196,7 @@
org.apache.uima.caseditor.editor.styleview,
*
+
${execution.environment}
diff --git a/uimaj-ep-cas-editor/pom.xml b/uimaj-ep-cas-editor/pom.xml
index c2da7ed43..116721a30 100644
--- a/uimaj-ep-cas-editor/pom.xml
+++ b/uimaj-ep-cas-editor/pom.xml
@@ -34,16 +34,6 @@
${uimaWebsiteUrl}
-
- org.junit.jupiter
- junit-jupiter-api
- test
-
-
- org.assertj
- assertj-core
- test
-
org.apache.uima.runtime;singleton:=true
-
JavaSE-1.8
+
${execution.environment}
true
registered
diff --git a/uimaj-parent/pom.xml b/uimaj-parent/pom.xml
index 67e26fb7c..b40c13668 100644
--- a/uimaj-parent/pom.xml
+++ b/uimaj-parent/pom.xml
@@ -158,6 +158,7 @@
17
17
17
+JavaSE-17
org.eclipse.p2.201812
diff --git a/uimaj-tools/pom.xml b/uimaj-tools/pom.xml
index 2316c25b1..87c4b553d 100644
--- a/uimaj-tools/pom.xml
+++ b/uimaj-tools/pom.xml
@@ -98,7 +98,7 @@
maven-bundle-plugin
-
JavaSE-1.8
+
${execution.environment}
<_dsannotations>*
[uima-uimaj] 01/01: Issue #325: Update dependencies
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch refactoring/325-Update-dependencies
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit 5db3c81bb8a9ffef29230368fff9d7a76cf6ef0d
Author: Richard Eckart de Castilho
AuthorDate: Thu Aug 3 11:55:59 2023 +0200
Issue #325: Update dependencies
- junit4 -> 4.13.2 (needed for Maven plugin test harness...)
- maven-plugin-testing-harness 2.0 -> 3.3.0
- maven-plugin-tools-javadoc 2.9 -> 3.5.2
- maven-compat -> 3.2.5
---
jcasgen-maven-plugin/pom.xml | 37 ++---
.../uima/tools/jcasgen/maven/JCasGenMojoTest.java | 13 --
uimaj-parent/pom.xml | 47 --
3 files changed, 76 insertions(+), 21 deletions(-)
diff --git a/jcasgen-maven-plugin/pom.xml b/jcasgen-maven-plugin/pom.xml
index 8d8f6e69b..40f639908 100644
--- a/jcasgen-maven-plugin/pom.xml
+++ b/jcasgen-maven-plugin/pom.xml
@@ -16,7 +16,9 @@
specific language governing permissions and limitations
under the License.
-->
-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://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;>
4.0.0
org.apache.uima
@@ -24,17 +26,20 @@
3.5.0-SNAPSHOT
../uimaj-parent/pom.xml
-
-
+
+
jcasgen-maven-plugin
maven-plugin
Apache UIMA Maven: ${project.artifactId}
- A Maven Plugin for using JCasGen to generate Java classes from
XML type system descriptions
+ A Maven Plugin for using JCasGen to generate Java classes from
+XML type system descriptions
-3.0
+${maven.version}
@@ -84,23 +89,26 @@
org.sonatype.plexus
plexus-build-api
- 0.0.7
- org.junit.jupiter
- junit-jupiter-engine
+ junit
+ junit
test
- org.junit.vintage
- junit-vintage-engine
+ org.assertj
+ assertj-core
+ test
+
+
+ org.apache.maven
+ maven-compat
test
org.apache.maven.plugin-testing
maven-plugin-testing-harness
- 2.0
test
@@ -120,7 +128,7 @@
org.apache.maven.plugin-tools
maven-plugin-tools-javadoc
-2.9
+3.5.2
@@ -145,7 +153,8 @@
package
integration-test
-
classpath,multimodule,simple,!m2e
diff --git
a/jcasgen-maven-plugin/src/test/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojoTest.java
b/jcasgen-maven-plugin/src/test/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojoTest.java
index 7dce50176..8f99a76e0 100644
---
a/jcasgen-maven-plugin/src/test/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojoTest.java
+++
b/jcasgen-maven-plugin/src/test/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojoTest.java
@@ -18,6 +18,8 @@
*/
package org.apache.uima.tools.jcasgen.maven;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.io.File;
import java.util.ArrayList;
import java.util.List;
@@ -28,9 +30,10 @@ import org.apache.maven.plugin.testing.AbstractMojoTestCase;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuilder;
import org.apache.maven.project.ProjectBuildingRequest;
+import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
import org.codehaus.plexus.util.DirectoryScanner;
import org.codehaus.plexus.util.FileUtils;
-import org.junit.Assert;
+import org.eclipse.aether.RepositorySystemSession;
import org.junit.Test;
public class JCasGenMojoTest extends AbstractMojoTestCase {
@@ -83,8 +86,10 @@ public class JCasGenMojoTest extends AbstractMojoTestCase {
assertTrue(pomFile.exists());
// create the MavenProject from the pom.xml file
+RepositorySystemSession session = MavenRepositorySystemUtils.newSession();
MavenExecutionRequest executionRequest = new
DefaultMavenExecutionRequest();
ProjectBuildingRequest buildingRequest =
executionRequest.getProjectBuildingRequest();
+buildingRequest.setRepositorySession(session);
ProjectBuilder projectBuilder = this.lookup(ProjectBuilder.class);
MavenProject project = projectBuilder.build(pomFile,
buildingRequest).getProject();
assertNotNull(project);
@@ -123,7 +128,7 @@ public class JCasGenMojoTest extends AbstractMojoTestCase {
// no _type files in v3
// File typeFile = new File(jCasGenDirectory + "/" + type.replace('.',
'/') + "_Type.java");
- Assert.assertTrue(files.contains(wrapperFile));
+
[uima-uimaj] 01/01: Issue #325: Update dependencies
This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch refactoring/325-Update-dependencies in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git commit 0de7cbac4ef7046c9d2d43f18193e656ba8ef442 Author: Richard Eckart de Castilho AuthorDate: Mon Jul 10 12:59:06 2023 +0200 Issue #325: Update dependencies * UIMA Parent POM 16 -> 17-SNAPSHOT (for Tycho 3.0.5) --- jcasgen-maven-plugin/src/it/classpath/pom.xml | 17 - jcasgen-maven-plugin/src/it/m2e/pom.xml | 11 ++- .../src/it/multimodule/crossref1/pom.xml| 17 - .../src/it/multimodule/crossref2/pom.xml| 17 - jcasgen-maven-plugin/src/it/simple/pom.xml | 17 - uimaj-parent/pom.xml| 2 +- 6 files changed, 19 insertions(+), 62 deletions(-) diff --git a/jcasgen-maven-plugin/src/it/classpath/pom.xml b/jcasgen-maven-plugin/src/it/classpath/pom.xml index a76f9304c..5511cdb19 100644 --- a/jcasgen-maven-plugin/src/it/classpath/pom.xml +++ b/jcasgen-maven-plugin/src/it/classpath/pom.xml @@ -23,20 +23,11 @@ test classpath 1.0.0-SNAPSHOT + +1.8 +1.8 + - - - - - maven-compiler-plugin - 3.1 - -1.7 -1.7 - - - - org.apache.uima diff --git a/jcasgen-maven-plugin/src/it/m2e/pom.xml b/jcasgen-maven-plugin/src/it/m2e/pom.xml index 7157517fe..000d403e5 100644 --- a/jcasgen-maven-plugin/src/it/m2e/pom.xml +++ b/jcasgen-maven-plugin/src/it/m2e/pom.xml @@ -44,20 +44,13 @@ 0.15.0 @project.version@ @localRepositoryUrl@ +1.8 +1.8 - - maven-compiler-plugin - 3.1 - -1.7 -1.7 - - - org.eclipse.tycho tycho-surefire-plugin diff --git a/jcasgen-maven-plugin/src/it/multimodule/crossref1/pom.xml b/jcasgen-maven-plugin/src/it/multimodule/crossref1/pom.xml index 016706cfb..92942c832 100644 --- a/jcasgen-maven-plugin/src/it/multimodule/crossref1/pom.xml +++ b/jcasgen-maven-plugin/src/it/multimodule/crossref1/pom.xml @@ -23,20 +23,11 @@ test crossref1 1.0.0-SNAPSHOT + +1.8 +1.8 + - - - - - maven-compiler-plugin - 3.1 - -1.7 -1.7 - - - - org.apache.uima diff --git a/jcasgen-maven-plugin/src/it/multimodule/crossref2/pom.xml b/jcasgen-maven-plugin/src/it/multimodule/crossref2/pom.xml index 1d22424e0..a48827ffd 100644 --- a/jcasgen-maven-plugin/src/it/multimodule/crossref2/pom.xml +++ b/jcasgen-maven-plugin/src/it/multimodule/crossref2/pom.xml @@ -23,20 +23,11 @@ test crossref2 1.0.0-SNAPSHOT + +1.8 +1.8 + - - - - - maven-compiler-plugin - 3.1 - -1.7 -1.7 - - - - org.apache.uima diff --git a/jcasgen-maven-plugin/src/it/simple/pom.xml b/jcasgen-maven-plugin/src/it/simple/pom.xml index aeb24551b..6395e393f 100644 --- a/jcasgen-maven-plugin/src/it/simple/pom.xml +++ b/jcasgen-maven-plugin/src/it/simple/pom.xml @@ -23,20 +23,11 @@ test simple 1.0.0-SNAPSHOT + +1.8 +1.8 + - - - - - maven-compiler-plugin - 3.1 - -1.7 -1.7 - - - - org.apache.uima diff --git a/uimaj-parent/pom.xml b/uimaj-parent/pom.xml index a84534a2e..cc0a07d78 100644 --- a/uimaj-parent/pom.xml +++ b/uimaj-parent/pom.xml @@ -32,7 +32,7 @@ org.apache.uima parent-pom -16 +17-SNAPSHOT uimaj-parent
