This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch no-jira/update-autoformatting in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit c4bfac4f460b5022ea607c9a10244e00f7c7c0b8 Merge: 9348052dd fb5dd1993 Author: Richard Eckart de Castilho <[email protected]> AuthorDate: Wed Jun 8 16:58:33 2022 +0200 Merge branch 'main' into no-jira/update-autoformatting * main: (47 commits) [UIMA-6436] Move maintainer documentation from website into maintainer guide [UIMA-6459] Upgrade dependencies [UIMA-6436] Move maintainer documentation from website into maintainer guide [UIMA-6436] Move maintainer documentation from website into maintainer guide [UIMA-6436] Move maintainer documentation from website into maintainer guide [UIMA-6463] Use toolchains to ensure compatibility with Java 1.8 [UIMA-6462] Avoid deploy broken checksum files for p2content.xml and artifacts.xml in feature modules [UIMA-6436] Move maintainer documentation from website into maintainer guide [UIMA-6436] Move maintainer documentation from website into maintainer guide [UIMA-6436] Move maintainer documentation from website into maintainer guide [UIMA-6436] Move maintainer documentation from website into maintainer guide [UIMA-6436] Move maintainer documentation from website into maintainer guide [UIMA-6436] Move maintainer documentation from website into maintainer guide [UIMA-6436] Move maintainer documentation from website into maintainer guide [UIMA-6436] Move maintainer documentation from website into maintainer guide [UIMA-6459] Upgrade dependencies (UIMAJ 3.4.0) [UIMA-6436] Move maintainer documentation from website into maintainer guide [UIMA-6459] Upgrade dependencies (UIMAJ 3.4.0) [UIMA-6459] Upgrade dependencies (UIMAJ 3.4.0) [UIMA-6454] Update dependencies (UIMA Java SDK 3.3.1) ... % Conflicts: % uimaj-parent/pom.xml .asf.yaml | 63 ++- PearPackagingMavenPlugin/pom.xml | 2 +- RELEASE_NOTES.md | 2 +- aggregate-uimaj-docbooks/pom.xml | 3 +- aggregate-uimaj-eclipse-plugins/pom.xml | 10 +- aggregate-uimaj/pom.xml | 2 +- jVinci/pom.xml | 2 +- jcasgen-maven-plugin/pom.xml | 2 +- ...se-feature => marker-file-enabling-auto-staging | 0 ...e-feature => marker-file-enabling-tycho-release | 0 ...date-site => marker-file-identifying-parent-pom | 0 pom.xml | 68 ++- stage-relesase-artifacts.sh | 49 -- .../pom.xml | 17 +- .../src/docs/asciidoc/common_book_info.adoc | 42 ++ .../src/docs/asciidoc/uv3.maven.adoc | 90 ++++ .../src/docs/asciidoc/uv3.one-time-setup.adoc | 77 +++ .../src/docs/asciidoc/uv3.project_structure.adoc | 52 ++ .../src/docs/asciidoc/uv3.release.adoc | 584 +++++++++++++++++++++ .../docs/asciidoc/version_3_maintainers_guide.adoc | 27 +- uima-doc-v3-users-guide/pom.xml | 4 +- .../src/docs/asciidoc/version_3_users_guide.adoc | 2 +- uima-docbook-overview-and-setup/pom.xml | 2 +- uima-docbook-references/pom.xml | 2 +- uima-docbook-tools/pom.xml | 2 +- uima-docbook-tutorials-and-users-guides/pom.xml | 2 +- uimaj-adapter-vinci/pom.xml | 2 +- uimaj-bootstrap/pom.xml | 2 +- uimaj-component-test-util/pom.xml | 2 +- uimaj-core/pom.xml | 2 +- uimaj-cpe/pom.xml | 2 +- uimaj-document-annotation/pom.xml | 2 +- uimaj-eclipse-feature-runtime/.gitignore | 3 - uimaj-eclipse-feature-runtime/feature.properties | 153 ------ uimaj-eclipse-feature-runtime/feature.xml | 163 ++++++ ...eature => marker-file-identifying-tycho-module} | 0 uimaj-eclipse-feature-runtime/pom.xml | 18 +- .../src/main/resources/feature.xml | 51 -- uimaj-eclipse-feature-tools/.gitignore | 3 - uimaj-eclipse-feature-tools/feature.properties | 156 ------ uimaj-eclipse-feature-tools/feature.xml | 232 ++++++++ .../marker-file-identifying-tycho-module | 0 uimaj-eclipse-feature-tools/pom.xml | 55 +- .../src/main/resources/feature.xml | 115 ---- .../pom.xml | 49 +- uimaj-eclipse-update-site/.gitignore | 1 - .../{src/main/resources => }/category.xml | 4 +- .../marker-file-identifying-tycho-module | 0 uimaj-eclipse-update-site/pom.xml | 324 ++---------- uimaj-ep-cas-editor-ide/pom.xml | 2 +- uimaj-ep-cas-editor/pom.xml | 2 +- uimaj-ep-configurator/pom.xml | 2 +- uimaj-ep-debug/pom.xml | 2 +- uimaj-ep-jcasgen/pom.xml | 2 +- uimaj-ep-launcher/pom.xml | 2 +- uimaj-ep-pear-packager/pom.xml | 2 +- uimaj-ep-runtime/pom.xml | 6 +- uimaj-examples/pom.xml | 2 +- uimaj-json/pom.xml | 2 +- uimaj-parent/pom.xml | 75 ++- uimaj-test-util/pom.xml | 2 +- uimaj-tools/pom.xml | 2 +- uimaj-v3migration-jcas/pom.xml | 2 +- 63 files changed, 1577 insertions(+), 973 deletions(-) diff --cc uimaj-parent/pom.xml index a6fd7c3c7,f1962adcf..f1363343b --- a/uimaj-parent/pom.xml +++ b/uimaj-parent/pom.xml @@@ -249,11 -239,23 +248,24 @@@ <plugins> <plugin> - <groupId>com.github.spotbugs</groupId> - <artifactId>spotbugs-maven-plugin</artifactId> - <version>4.7.0.0</version> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-toolchains-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>toolchain</goal> + </goals> + </execution> + </executions> + <configuration> + <toolchains> + <jdk> + <version>${maven.compiler.target}</version> + </jdk> + </toolchains> + </configuration> </plugin> + <plugin> <!-- See: https://issues.apache.org/jira/browse/UIMA-6349 --> <groupId>com.github.siom79.japicmp</groupId> @@@ -403,5 -373,12 +383,20 @@@ </pluginManagement> </build> </profile> ++ ++ <profile> ++ <id>spotbugs</id> ++ <build> ++ <pluginManagement> ++ <plugins> ++ <plugin> ++ <groupId>com.github.spotbugs</groupId> ++ <artifactId>spotbugs-maven-plugin</artifactId> ++ <version>4.7.0.0</version> ++ </plugin> ++ </plugins> ++ </pluginManagement> ++ </build> ++ </profile> </profiles> - - <scm> - <tag>uimaj-3.2.0</tag> - <connection>scm:git:https://github.com/apache/uima-uimaj/</connection> - <developerConnection>scm:git:https://github.com/apache/uima-uimaj/</developerConnection> - <url>https://github.com/apache/uima-uimaj/</url> - </scm> </project>
