Merge branch 'main' into release/UIMA-6449-Ruta-3.2.0-release
* main:
[UIMA-6447] Update dependencies (Ruta 3.2.0)
[UIMA-6447] Update dependencies (Ruta 3.2.0)
[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
% Conflicts:
% ruta-parent/pom.xml
diff --git a/ruta-eclipse-feature/pom.xml b/ruta-eclipse-feature/pom.xml
index 52c7649..92083e5 100644
--- a/ruta-eclipse-feature/pom.xml
+++ b/ruta-eclipse-feature/pom.xml
@@ -36,6 +36,8 @@
<properties>
<postNoticeText>${uniWueNoticeText}</postNoticeText>
+ <!-- https://issues.apache.org/jira/browse/UIMA-6462 -->
+ <maven.deploy.skip>true</maven.deploy.skip>
</properties>
<dependencies>
diff --git a/ruta-ep-engine/src/main/readme_bin/LICENSE b/ruta-ep-engine/src/main/readme_bin/LICENSE
index c69e482..4b60db6 100644
--- a/ruta-ep-engine/src/main/readme_bin/LICENSE
+++ b/ruta-ep-engine/src/main/readme_bin/LICENSE
@@ -458,9 +458,9 @@
====================================================================================================
-SPRING FRAMEWORK 4.3.30.RELEASE SUBCOMPONENTS:
+SPRING FRAMEWORK 5.3.20 SUBCOMPONENTS:
-Spring Framework 4.3.30.RELEASE includes a number of subcomponents
+Spring Framework 5.3.20 includes a number of subcomponents
with separate copyright notices and license terms. The product that
includes this file does not necessarily use all the open source
subcomponents referred to below. Your use of the source
@@ -468,7 +468,7 @@
conditions of the following licenses.
->>> ASM 6.0 (org.ow2.asm:asm:6.0, org.ow2.asm:asm-commons:6.0):
+>>> ASM 9.1 (org.ow2.asm:asm:9.1, org.ow2.asm:asm-commons:9.1):
Copyright (c) 2000-2011 INRIA, France Telecom
All rights reserved.
@@ -503,18 +503,18 @@
Copyright (c) 1999-2009, OW2 Consortium <https://www.ow2.org/>
->>> CGLIB 3.2.6 (cglib:cglib:3.2.6):
+>>> CGLIB 3.3 (cglib:cglib:3.3):
Per the LICENSE file in the CGLIB JAR distribution downloaded from
-https://github.com/cglib/cglib/releases/download/RELEASE_3_2_6/cglib-3.2.6.jar,
-CGLIB 3.2.6 is licensed under the Apache License, version 2.0, the text of
-which is included above.
+https://github.com/cglib/cglib/releases/download/RELEASE_3_3_0/cglib-3.3.0.jar,
+CGLIB 3.3 is licensed under the Apache License, version 2.0, the text of which
+is included above.
->>> Objenesis 2.6 (org.objenesis:objenesis:2.6):
+>>> Objenesis 3.2 (org.objenesis:objenesis:3.2):
Per the LICENSE file in the Objenesis ZIP distribution downloaded from
-http://objenesis.org/download.html, Objenesis 2.6 is licensed under the
+http://objenesis.org/download.html, Objenesis 3.2 is licensed under the
Apache License, version 2.0, the text of which is included above.
Per the NOTICE file in the Objenesis ZIP distribution downloaded from
@@ -522,7 +522,7 @@
Apache License, Version 2.0, in this case for Objenesis:
Objenesis
-Copyright 2006-2017 Joe Walnes, Henri Tremblay, Leonardo Mesquita
+Copyright 2006-2019 Joe Walnes, Henri Tremblay, Leonardo Mesquita
===============================================================================
@@ -544,6 +544,7 @@
the date you acquired this Software product. Alternatively, the Source Files
may accompany the Software.
+
====================================================================================================
This product contains Commons Math libraries (http://commons.apache.org/proper/commons-math/).
@@ -804,112 +805,24 @@
This product contains SLF4J, licensed and distributed under the MIT license:
-Copyright (c) 2004-2017 QOS.ch
- All rights reserved.
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-=======================================================================
-
-SPRING FRAMEWORK 4.3.30.RELEASE SUBCOMPONENTS:
-
-Spring Framework 4.3.30.RELEASE includes a number of subcomponents
-with separate copyright notices and license terms. The product that
-includes this file does not necessarily use all the open source
-subcomponents referred to below. Your use of the source
-code for these subcomponents is subject to the terms and
-conditions of the following licenses.
-
-
->>> ASM 6.0 (org.ow2.asm:asm:6.0, org.ow2.asm:asm-commons:6.0):
-
-Copyright (c) 2000-2011 INRIA, France Telecom
+Copyright (c) 2004-2022 QOS.ch Sarl (Switzerland)
All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holders nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
-
-Copyright (c) 1999-2009, OW2 Consortium <https://www.ow2.org/>
-
-
->>> CGLIB 3.2.6 (cglib:cglib:3.2.6):
-
-Per the LICENSE file in the CGLIB JAR distribution downloaded from
-https://github.com/cglib/cglib/releases/download/RELEASE_3_2_6/cglib-3.2.6.jar,
-CGLIB 3.2.6 is licensed under the Apache License, version 2.0, the text of
-which is included above.
-
-
->>> Objenesis 2.6 (org.objenesis:objenesis:2.6):
-
-Per the LICENSE file in the Objenesis ZIP distribution downloaded from
-http://objenesis.org/download.html, Objenesis 2.6 is licensed under the
-Apache License, version 2.0, the text of which is included above.
-
-Per the NOTICE file in the Objenesis ZIP distribution downloaded from
-http://objenesis.org/download.html and corresponding to section 4d of the
-Apache License, Version 2.0, in this case for Objenesis:
-
-Objenesis
-Copyright 2006-2017 Joe Walnes, Henri Tremblay, Leonardo Mesquita
-
-
-===============================================================================
-
-To the extent any open source components are licensed under the EPL and/or
-other similar licenses that require the source code and/or modifications to
-source code to be made available (as would be noted above), you may obtain a
-copy of the source code corresponding to the binaries for such open source
-components and modifications thereto, if any, (the "Source Files"), by
-downloading the Source Files from https://spring.io/projects, Pivotal's website
-at https://network.pivotal.io/open-source, or by sending a request, with your
-name and address to: Pivotal Software, Inc., 875 Howard Street, 5th floor, San
-Francisco, CA 94103, Attention: General Counsel. All such requests should
-clearly specify: OPEN SOURCE FILES REQUEST, Attention General Counsel. Pivotal
-can mail a copy of the Source Files to you on a CD or equivalent physical
-medium.
-
-This offer to obtain a copy of the Source Files is valid for three years from
-the date you acquired this Software product. Alternatively, the Source Files
-may accompany the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/ruta-ep-engine/src/main/readme_bin/NOTICE b/ruta-ep-engine/src/main/readme_bin/NOTICE
index 8806bb9..c2b5e06 100644
--- a/ruta-ep-engine/src/main/readme_bin/NOTICE
+++ b/ruta-ep-engine/src/main/readme_bin/NOTICE
@@ -23,7 +23,7 @@
################################################################################
This product contains Apache Commons Collections
-Copyright 2001-2015 The Apache Software Foundation
+Copyright 2001-2019 The Apache Software Foundation
################################################################################
@@ -60,8 +60,8 @@
################################################################################
-This product contains Spring Framework 4.3.30.RELEASE
-Copyright (c) 2002-2020 Pivotal, Inc.
+Spring Framework 5.3.20
+Copyright (c) 2002-2022 Pivotal, Inc.
This product is licensed to you under the Apache License, Version 2.0
(the "License"). You may not use this product except in compliance with
@@ -72,21 +72,6 @@
these subcomponents is subject to the terms and conditions of the
subcomponent's license, as noted in the license.txt file.
-----------------------------------------------------------------
-
-AnnotationLiteral.java
-
-Licensed under the Apache License, Version 2.0.
-File was copied from the javax.enterprise cdi-api version 1.0.
-
-JBoss, Home of Professional Open Source
-Copyright 2008, Red Hat Middleware LLC, and individual contributors
-by the @authors tag.
-
-
-The complete text of licenses and disclaimers associated with the the original
-sources enumerated above at the time of code translation are in the LICENSE file.
-
################################################################################
This product contains Apache UIMA uimaFIT - Core
@@ -99,3 +84,12 @@
Technische Universität Darmstadt.
All rights reserved.
+################################################################################
+
+This product contains caffeine by Ben Manes
+
+################################################################################
+
+This product contains SLF4J
+Copyright (c) 2004-2022 QOS.ch Sarl (Switzerland)
+
diff --git a/ruta-parent/pom.xml b/ruta-parent/pom.xml
index b3cc381..cebfabc 100644
--- a/ruta-parent/pom.xml
+++ b/ruta-parent/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>parent-pom</artifactId>
- <version>15-SNAPSHOT</version>
+ <version>15</version>
<relativePath />
</parent>
@@ -72,36 +72,9 @@
<snapshots>
<enabled>false</enabled>
</snapshots>
-
- </repository>
-
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>https://repository.apache.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
</repository>
</repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>apache.snapshots.plugins</id>
- <name>Apache Snapshot Repository - Maven plugins</name>
- <url>https://repository.apache.org/snapshots</url>
- <layout>default</layout>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <checksumPolicy>fail</checksumPolicy>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
-
<properties>
<uniWueNoticeText>Portions of UIMA Ruta were originally developed by
the Universität Würzburg.
@@ -116,8 +89,8 @@
</postNoticeText>
<uimaVersion>3.3.0</uimaVersion>
- <uimafit-version>3.2.0</uimafit-version>
- <spring-version>5.3.19</spring-version>
+ <uimafit-version>3.3.0</uimafit-version>
+ <spring-version>5.3.20</spring-version>
<junit-version>4.13.2</junit-version>
<slf4j-version>1.7.36</slf4j-version>
@@ -127,13 +100,13 @@
<commons-collections4-version>4.4</commons-collections4-version>
<commons-text-version>1.9</commons-text-version>
<commons-lang3-version>3.12.0</commons-lang3-version>
- <commons-io-version>2.8.0</commons-io-version>
+ <commons-io-version>2.11.0</commons-io-version>
<commons-math3-version>3.6.1</commons-math3-version>
<commons-logging-version>1.1.1</commons-logging-version>
<commons-logging-api-version>1.1</commons-logging-api-version>
<caffeine-version>2.9.3</caffeine-version>
- <api_check_oldVersion>3.1.0</api_check_oldVersion>
+ <api_check_oldVersion>3.2.0</api_check_oldVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>1.8</maven.compiler.target>
@@ -273,6 +246,24 @@
</pluginManagement>
<plugins>
<plugin>
+ <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>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
