From 216e34e245f9adfce241e96229acd02379388b0b Mon Sep 17 00:00:00 2001 From: NSAmelchev Date: Mon, 19 Oct 2026 11:52:06 +0300 Subject: [PATCH] IGNITE-29162 Remove excess ignite-core jar from slim distribution and fix NOTICE files --- NOTICE | 7 ------- assembly/NOTICE_IGNITE | 8 -------- assembly/dependencies-apache-ignite-lgpl.xml | 1 + assembly/dependencies-apache-ignite-slim.xml | 1 + modules/core/src/main/java/META-INF/NOTICE | 7 ------- parent/pom.xml | 1 - 6 files changed, 2 insertions(+), 23 deletions(-) diff --git a/NOTICE b/NOTICE index 2589f6776e94b..61c6ac8c2879e 100644 --- a/NOTICE +++ b/NOTICE @@ -3,10 +3,3 @@ Copyright 2023 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). - - -This software includes code from IntelliJ IDEA Community Edition -Copyright (C) JetBrains s.r.o. -https://www.jetbrains.com/idea/ -Licensed under Apache License, Version 2.0. -http://search.maven.org/#artifactdetails%7Corg.jetbrains%7Cannotations%7C13.0%7Cjar diff --git a/assembly/NOTICE_IGNITE b/assembly/NOTICE_IGNITE index b257ca8095da0..61c6ac8c2879e 100644 --- a/assembly/NOTICE_IGNITE +++ b/assembly/NOTICE_IGNITE @@ -3,11 +3,3 @@ Copyright 2023 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). - - -This software includes code from IntelliJ IDEA Community Edition -Copyright (C) JetBrains s.r.o. -https://www.jetbrains.com/idea/ -Licensed under Apache License, Version 2.0. -http://search.maven.org/#artifactdetails%7Corg.jetbrains%7Cannotations%7C13.0%7Cjar - diff --git a/assembly/dependencies-apache-ignite-lgpl.xml b/assembly/dependencies-apache-ignite-lgpl.xml index fc875284fe867..c5c1d71329445 100644 --- a/assembly/dependencies-apache-ignite-lgpl.xml +++ b/assembly/dependencies-apache-ignite-lgpl.xml @@ -105,6 +105,7 @@ *-tests.jar *-javadoc.jar *-sources.jar + original-*.jar diff --git a/assembly/dependencies-apache-ignite-slim.xml b/assembly/dependencies-apache-ignite-slim.xml index c55073702894c..b16e3288626a9 100644 --- a/assembly/dependencies-apache-ignite-slim.xml +++ b/assembly/dependencies-apache-ignite-slim.xml @@ -105,6 +105,7 @@ *-tests.jar *-javadoc.jar *-sources.jar + original-*.jar diff --git a/modules/core/src/main/java/META-INF/NOTICE b/modules/core/src/main/java/META-INF/NOTICE index 2589f6776e94b..61c6ac8c2879e 100644 --- a/modules/core/src/main/java/META-INF/NOTICE +++ b/modules/core/src/main/java/META-INF/NOTICE @@ -3,10 +3,3 @@ Copyright 2023 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). - - -This software includes code from IntelliJ IDEA Community Edition -Copyright (C) JetBrains s.r.o. -https://www.jetbrains.com/idea/ -Licensed under Apache License, Version 2.0. -http://search.maven.org/#artifactdetails%7Corg.jetbrains%7Cannotations%7C13.0%7Cjar diff --git a/parent/pom.xml b/parent/pom.xml index 3ea7dca6691df..88de5e69721ef 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -909,7 +909,6 @@ **/books/*.txt src/main/java/org/apache/ignite/examples/streaming/wordcount/*.txt examples/src/main/java/org/apache/ignite/examples/streaming/wordcount/*.txt - src/main/java/org/jetbrains/annotations/*.java dev-tools/IGNITE-*.patch dev-tools/.gradle/**/* dev-tools/gradle/wrapper/**/*