Skip to content

Commit 63459c5

Browse files
authored
[GEODE-10511] blocks-2.0.0 : Update LICENSE File with Correct Dependency Information (#7961)
* Correct license classification for Jakarta EE dependencies - Moved jakarta.servlet v6.0.0 and jakarta.transaction v2.0.1 from CDDL to EPL 2.0 section - These components use EPL 2.0 with GPL-2.0 + Classpath Exception, not CDDL 1.1 * GEODE-10511: Update istack-commons-runtime version from 4.0.1 to 4.1.1 - Aligns declared version with actual resolved version - Eliminates version conflict resolution between 4.0.1 and 4.1.1 - Makes DependencyConstraints.groovy consistent with LICENSE file - jaxb-core/jaxb-runtime 4.0.2 transitively requires 4.1.1 * GEODE-10511: Update test expectations for istack-commons-runtime 4.1.1 - Update geode-server-all dependency_classpath.txt - Update geode-assembly assembly_content.txt to remove 4.0.1 reference - Fixes integration test failures in both modules
1 parent 54dd703 commit 63459c5

File tree

4 files changed

+29
-19
lines changed

4 files changed

+29
-19
lines changed

build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ class DependencyConstraints {
122122
// Pinning transitive dependency from spring-security-oauth2 to clean up our licenses.
123123
api(group: 'com.nimbusds', name: 'oauth2-oidc-sdk', version: '8.9')
124124
api(group: 'jakarta.activation', name: 'jakarta.activation-api', version: get('jakarta.activation.version'))
125-
api(group: 'com.sun.istack', name: 'istack-commons-runtime', version: '4.0.1')
125+
api(group: 'com.sun.istack', name: 'istack-commons-runtime', version: '4.1.1')
126126
api(group: 'jakarta.mail', name: 'jakarta.mail-api', version: get('jakarta.mail.version'))
127127
api(group: 'jakarta.xml.bind', name: 'jakarta.xml.bind-api', version: get('jakarta.xml.bind.version'))
128128
api(group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '4.0.2')

geode-assembly/src/integrationTest/resources/assembly_content.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -963,7 +963,6 @@ lib/hibernate-validator-8.0.1.Final.jar
963963
lib/httpclient5-5.4.4.jar
964964
lib/httpcore5-5.3.4.jar
965965
lib/httpcore5-h2-5.3.4.jar
966-
lib/istack-commons-runtime-4.0.1.jar
967966
lib/istack-commons-runtime-4.1.1.jar
968967
lib/jackson-annotations-2.17.0.jar
969968
lib/jackson-core-2.17.0.jar

geode-assembly/src/main/dist/LICENSE

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -217,12 +217,14 @@ The BSD 3-Clause License (http://opensource.org/licenses/BSD-3-Clause)
217217

218218
Apache Geode bundles the following files under the BSD 3-Clause License:
219219

220+
- angus-activation v2.0.0 (https://github.com/eclipse-ee4j/angus-activation)
220221
- ANSIBuffer (http://jline.sourceforge.net/apidocs/jline/ANSIBuffer.html),
221222
Copyright (c) 2002-2007 Marc Prud'hommeaux.
222223
- Antlr v2.7.7 (http://www.antlr.org), Copyright (c) 2012 Terrence Parr
223224
and Sam Harwell
224-
- ASM v9.1 (https://asm.ow2.io) Copyright (c) 2000-2011 INRIA, France
225+
- ASM v9.8 (https://asm.ow2.io) Copyright (c) 2000-2011 INRIA, France
225226
Telecom
227+
- jakarta.activation v2.1.3 (https://github.com/jakartaee/jaf-api)
226228
- JLine v2.12 (http://jline.sourceforge.net), Copyright (c) 2002-2006,
227229
Marc Prud'hommeaux <mwp1@cornell.edu>
228230
- jQuery Sparklines v2.0 (http://omnipotent.net/jquery.sparkline/),
@@ -259,16 +261,6 @@ POSSIBILITY OF SUCH DAMAGE.
259261
The CDDL Version 1.1 (https://javaee.github.io/glassfish/LICENSE)
260262
---------------------------------------------------------------------------
261263

262-
Apache Geode bundles the following files under the Common Development and
263-
Distribution License:
264-
265-
- javax.activation v1.2.0
266-
(https://www.oracle.com/technetwork/java/javase/jaf-135115.html)
267-
- javax.mail v1.6.2 (http://www.oracle.com/)
268-
- javax.resource v 1.7.1 (https://glassfish.java.net/)
269-
- javax.servlet v3.1.0 (https://glassfish.java.net/)
270-
- javax.transaction v1.3 (https://glassfish.java.net/)
271-
- jaxb v2.3.2 (https://javaee.github.io/jaxb-v2/)
272264

273265
1. Definitions.
274266

@@ -1022,10 +1014,11 @@ The EDL 1.0 License (http://www.eclipse.org/org/documents/edl-v10.php)
10221014

10231015
Apache Geode bundles the following file under the EDL 1.0 License:
10241016

1025-
- istack-commons-runtime v4.0.1
1026-
- jakarta.activation v1.2.1
1027-
- jakarta.validation v2.0.2
1028-
- jakarta.xml.bind v2.3.2
1017+
- istack-commons-runtime v4.1.1
1018+
- jakarta.xml.bind v4.0.2
1019+
- jaxb-core v4.0.2
1020+
- jaxb-runtime v4.0.2
1021+
- txw2 v4.0.2
10291022

10301023
Eclipse Distribution License - v 1.0
10311024

@@ -1059,6 +1052,24 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
10591052
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
10601053
POSSIBILITY OF SUCH DAMAGE.
10611054

1055+
---------------------------------------------------------------------------
1056+
The EPL 2.0 License (https://www.eclipse.org/legal/epl-2.0/)
1057+
---------------------------------------------------------------------------
1058+
1059+
Apache Geode bundles the following files under the Eclipse Public License 2.0
1060+
with the Secondary License of GPL-2.0 with Classpath Exception:
1061+
1062+
- jakarta.annotation v2.1.1 (https://github.com/jakartaee/common-annotations-api)
1063+
- jakarta.el v5.0.0 (https://github.com/jakartaee/expression-language)
1064+
- jakarta.interceptor v2.1.0 (https://github.com/jakartaee/interceptors)
1065+
- jakarta.mail v2.1.2 (https://github.com/jakartaee/mail-api)
1066+
- jakarta.resource v2.1.0 (https://github.com/jakartaee/connectors)
1067+
- jakarta.servlet v6.0.0 (https://github.com/jakartaee/servlet)
1068+
- jakarta.transaction v2.0.1 (https://github.com/jakartaee/transactions)
1069+
1070+
For the full EPL 2.0 license text, see:
1071+
https://www.eclipse.org/legal/epl-2.0/
1072+
10621073
---------------------------------------------------------------------------
10631074
The MIT License (http://opensource.org/licenses/mit-license.html)
10641075
---------------------------------------------------------------------------
@@ -1097,7 +1108,7 @@ Apache Geode bundles the following files under the MIT License:
10971108
- Normalize.css v2.1.0 (https://necolas.github.io/normalize.css/),
10981109
Copyright (c) Nicolas Gallagher and Jonathan Neal
10991110
- Sizzle.js (http://sizzlejs.com/), Copyright (c) 2011, The Dojo Foundation
1100-
- SLF4J API v1.7.36 (http://www.slf4j.org), Copyright (c) 2004-2025 QOS.ch
1111+
- SLF4J API v2.0.17 (http://www.slf4j.org), Copyright (c) 2004-2025 QOS.ch
11011112
- Split.js (https://github.com/nathancahill/Split.js), Copyright (c)
11021113
2015 Nathan Cahill
11031114
- TableDnD v0.5 (https://github.com/isocra/TableDnD), Copyright (c) 2012

geode-server-all/src/integrationTest/resources/dependency_classpath.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ classgraph-4.8.147.jar
6262
spring-aop-6.1.14.jar
6363
angus-activation-2.0.0.jar
6464
jakarta.activation-api-2.1.3.jar
65-
istack-commons-runtime-4.0.1.jar
65+
istack-commons-runtime-4.1.1.jar
6666
spring-web-6.1.14.jar
6767
spring-shell-table-3.3.3.jar
6868
spring-boot-starter-validation-3.3.5.jar

0 commit comments

Comments
 (0)