From 0e04530db959fb1c0c04bbf40f3c4c4e52122beb Mon Sep 17 00:00:00 2001 From: Richard Eckart de Castilho Date: Mon, 18 Nov 2024 10:12:23 +0100 Subject: [PATCH] Issue #393: Include uimaFIT artifacts in binary distribution - Include uimaFIT and dependencies in the binary distribution - Update NOTICE and LICENSE files that are included in the binary distribution to include those of the new JARs in the binary distribution --- pom.xml | 56 +++++++++++++++-- src/main/assembly/bin-without-jackson.xml | 44 ++++++++++++++ src/main/assembly/bin.xml | 44 ++++++++++++++ .../bin_distr_license_notices/LICENSE.txt | 60 +++++++++++++++++-- .../NOTICE-without-jackson.md | 23 +++++++ src/main/bin_distr_license_notices/NOTICE.md | 23 +++++++ uimaj-parent/pom.xml | 17 +++++- 7 files changed, 255 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index f333148ee..2dae7e622 100644 --- a/pom.xml +++ b/pom.xml @@ -79,16 +79,38 @@ uimaj-cpe ${project.version} + + org.apache.uima + uimaj-document-annotation + ${project.version} + org.apache.uima uimaj-examples ${project.version} + + org.apache.uima + uimaj-json + ${project.version} + org.apache.uima uimaj-tools ${project.version} + + + org.apache.uima + uimafit-core + ${project.version} + + + org.apache.uima + uimafit-cpe + ${project.version} + + org.apache.uima uimaj-ep-cas-editor @@ -129,11 +151,6 @@ uimaj-ep-launcher ${project.version} - - org.apache.uima - uimaj-json - ${project.version} - @@ -180,6 +197,35 @@ org.apache.logging.log4j log4j-api + + + commons-io + commons-io + + + org.springframework + spring-aop + + + org.springframework + spring-beans + + + org.springframework + spring-context + + + org.springframework + spring-core + + + org.springframework + spring-expression + + + org.springframework + spring-jcl + diff --git a/src/main/assembly/bin-without-jackson.xml b/src/main/assembly/bin-without-jackson.xml index 027b27488..d6febce05 100644 --- a/src/main/assembly/bin-without-jackson.xml +++ b/src/main/assembly/bin-without-jackson.xml @@ -148,6 +148,30 @@ under the License. 644 755 + + + org.apache.uima:uimafit-core + + false + runtime + uimafit-core.jar + lib + false + 644 + 755 + + + + org.apache.uima:uimafit-cpe + + false + runtime + uimafit-cpe.jar + lib + false + 644 + 755 + @@ -179,6 +203,14 @@ under the License. org.slf4j:slf4j-api org.slf4j:slf4j-jdk14 + commons-io:commons-io + org.apache.commons:commons-lang3 + org.springframework:spring-aop + org.springframework:spring-beans + org.springframework:spring-context + org.springframework:spring-core + org.springframework:spring-expression + org.springframework:spring-jcl/5.3.39/spring-jcl-5.3.39.jar false runtime @@ -305,6 +337,18 @@ under the License. 644 755 + + uimafit-core/api-change-report + uimafit-core/api-change-report + 644 + 755 + + + uimafit-cpe/api-change-report + uimafit-cpe/api-change-report + 644 + 755 + diff --git a/src/main/assembly/bin.xml b/src/main/assembly/bin.xml index 081e56132..a33f6dc35 100644 --- a/src/main/assembly/bin.xml +++ b/src/main/assembly/bin.xml @@ -148,6 +148,30 @@ under the License. 644 755 + + + org.apache.uima:uimafit-core + + false + runtime + uimafit-core.jar + lib + false + 644 + 755 + + + + org.apache.uima:uimafit-cpe + + false + runtime + uimafit-cpe.jar + lib + false + 644 + 755 + @@ -180,6 +204,14 @@ under the License. org.slf4j:slf4j-api org.slf4j:slf4j-jdk14 + commons-io:commons-io + org.apache.commons:commons-lang3 + org.springframework:spring-aop + org.springframework:spring-beans + org.springframework:spring-context + org.springframework:spring-core + org.springframework:spring-expression + org.springframework:spring-jcl false runtime @@ -306,6 +338,18 @@ under the License. 644 755 + + uimafit-core/api-change-report + uimafit-core/api-change-report + 644 + 755 + + + uimafit-cpe/api-change-report + uimafit-cpe/api-change-report + 644 + 755 + diff --git a/src/main/bin_distr_license_notices/LICENSE.txt b/src/main/bin_distr_license_notices/LICENSE.txt index 3c0d0e3e8..306f29a91 100644 --- a/src/main/bin_distr_license_notices/LICENSE.txt +++ b/src/main/bin_distr_license_notices/LICENSE.txt @@ -200,11 +200,14 @@ 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. -==================================================================================================== -This product contains icons from the SVG Icons project http://svgicons.sourceforge.net/. The icons are licensed under the BSD -license, but the actual license text is not provided by the SVG Icons project. Here's the generic -BSD license template. +=============================================================================== + +This product contains icons from the SVG Icons project +http://svgicons.sourceforge.net/. + +The icons are licensed under the BSD license, but the actual license text is +not provided by the SVG Icons project. Here's the generic BSD license template. BSD License @@ -236,7 +239,7 @@ 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. -==================================================================================================== +=============================================================================== This product contains SLF4J, licensed and distributed under the MIT license: @@ -261,4 +264,49 @@ Copyright (c) 2004-2017 QOS.ch 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. - \ No newline at end of file + + + +Copyright (c) 1999-2009, OW2 Consortium + + +>>> 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_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 3.2 (org.objenesis:objenesis:3.2): + +Per the LICENSE file in the Objenesis ZIP distribution downloaded from +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 +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-2019 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. \ No newline at end of file diff --git a/src/main/bin_distr_license_notices/NOTICE-without-jackson.md b/src/main/bin_distr_license_notices/NOTICE-without-jackson.md index 0600d5480..71b634093 100644 --- a/src/main/bin_distr_license_notices/NOTICE-without-jackson.md +++ b/src/main/bin_distr_license_notices/NOTICE-without-jackson.md @@ -13,3 +13,26 @@ licensed to the Apache Software Foundation under the Copyright (c) 2003, 2006 IBM Corporation. ResolverUtil.java Copyright 2005-2006 Tim Fennell + +# Apache Commons IO + +Apache Commons IO +Copyright 2002-2024 The Apache Software Foundation + +# Apache Commons Lang + +Apache Commons Lang +Copyright 2001-2024 The Apache Software Foundation + +# Spring Framework + +Copyright (c) 2002-2024 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 +the License. + +This product may include a number of subcomponents with separate +copyright notices and license terms. Your use of the source code for +these subcomponents is subject to the terms and conditions of the +subcomponent's license, as noted in the license.txt file. diff --git a/src/main/bin_distr_license_notices/NOTICE.md b/src/main/bin_distr_license_notices/NOTICE.md index 74eaceb9b..4ebc6a888 100644 --- a/src/main/bin_distr_license_notices/NOTICE.md +++ b/src/main/bin_distr_license_notices/NOTICE.md @@ -14,6 +14,16 @@ Copyright (c) 2003, 2006 IBM Corporation. ResolverUtil.java Copyright 2005-2006 Tim Fennell +# Apache Commons IO + +Apache Commons IO +Copyright 2002-2024 The Apache Software Foundation + +# Apache Commons Lang + +Apache Commons Lang +Copyright 2001-2024 The Apache Software Foundation + # Jackson JSON processor NOTICE from the Jackson Jar 2.15.2 Jackson is a high-performance, Free/Open Source JSON processing library. @@ -46,3 +56,16 @@ Copyright © 2023 Werner Randelshofer, Switzerland. MIT License. See FastDoubleParser-NOTICE for details of other source code included in FastDoubleParser and the licenses and copyrights that apply to that code. + +# Spring Framework + +Copyright (c) 2002-2024 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 +the License. + +This product may include a number of subcomponents with separate +copyright notices and license terms. Your use of the source code for +these subcomponents is subject to the terms and conditions of the +subcomponent's license, as noted in the license.txt file. diff --git a/uimaj-parent/pom.xml b/uimaj-parent/pom.xml index 858054731..0c4992308 100644 --- a/uimaj-parent/pom.xml +++ b/uimaj-parent/pom.xml @@ -318,7 +318,7 @@ org.springframework - spring-core + spring-aop ${spring-version} @@ -326,11 +326,26 @@ spring-beans ${spring-version} + + org.springframework + spring-core + ${spring-version} + org.springframework spring-context ${spring-version} + + org.springframework + spring-expression + ${spring-version} + + + org.springframework + spring-jcl + ${spring-version} + org.springframework spring-test