-
Notifications
You must be signed in to change notification settings - Fork 695
[GEODE-10511] blocks-2.0.0 : Update LICENSE File with Correct Dependency Information #7961
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -217,12 +217,14 @@ The BSD 3-Clause License (http://opensource.org/licenses/BSD-3-Clause) | |
|
|
||
| Apache Geode bundles the following files under the BSD 3-Clause License: | ||
|
|
||
| - angus-activation v2.0.0 (https://github.com/eclipse-ee4j/angus-activation) | ||
| - ANSIBuffer (http://jline.sourceforge.net/apidocs/jline/ANSIBuffer.html), | ||
| Copyright (c) 2002-2007 Marc Prud'hommeaux. | ||
| - Antlr v2.7.7 (http://www.antlr.org), Copyright (c) 2012 Terrence Parr | ||
| and Sam Harwell | ||
| - ASM v9.1 (https://asm.ow2.io) Copyright (c) 2000-2011 INRIA, France | ||
| - ASM v9.8 (https://asm.ow2.io) Copyright (c) 2000-2011 INRIA, France | ||
| Telecom | ||
| - jakarta.activation v2.1.3 (https://github.com/jakartaee/jaf-api) | ||
| - JLine v2.12 (http://jline.sourceforge.net), Copyright (c) 2002-2006, | ||
| Marc Prud'hommeaux <[email protected]> | ||
| - jQuery Sparklines v2.0 (http://omnipotent.net/jquery.sparkline/), | ||
|
|
@@ -259,16 +261,6 @@ POSSIBILITY OF SUCH DAMAGE. | |
| The CDDL Version 1.1 (https://javaee.github.io/glassfish/LICENSE) | ||
| --------------------------------------------------------------------------- | ||
|
|
||
| Apache Geode bundles the following files under the Common Development and | ||
| Distribution License: | ||
|
|
||
| - javax.activation v1.2.0 | ||
| (https://www.oracle.com/technetwork/java/javase/jaf-135115.html) | ||
| - javax.mail v1.6.2 (http://www.oracle.com/) | ||
| - javax.resource v 1.7.1 (https://glassfish.java.net/) | ||
| - javax.servlet v3.1.0 (https://glassfish.java.net/) | ||
| - javax.transaction v1.3 (https://glassfish.java.net/) | ||
| - jaxb v2.3.2 (https://javaee.github.io/jaxb-v2/) | ||
|
|
||
| 1. Definitions. | ||
|
|
||
|
|
@@ -1022,10 +1014,11 @@ The EDL 1.0 License (http://www.eclipse.org/org/documents/edl-v10.php) | |
|
|
||
| Apache Geode bundles the following file under the EDL 1.0 License: | ||
|
|
||
| - istack-commons-runtime v4.0.1 | ||
| - jakarta.activation v1.2.1 | ||
| - jakarta.validation v2.0.2 | ||
| - jakarta.xml.bind v2.3.2 | ||
| - istack-commons-runtime v4.1.1 | ||
| - jakarta.xml.bind v4.0.2 | ||
| - jaxb-core v4.0.2 | ||
| - jaxb-runtime v4.0.2 | ||
| - txw2 v4.0.2 | ||
|
|
||
| Eclipse Distribution License - v 1.0 | ||
|
|
||
|
|
@@ -1059,6 +1052,24 @@ 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. | ||
|
|
||
| --------------------------------------------------------------------------- | ||
| The EPL 2.0 License (https://www.eclipse.org/legal/epl-2.0/) | ||
| --------------------------------------------------------------------------- | ||
|
|
||
| Apache Geode bundles the following files under the Eclipse Public License 2.0 | ||
| with the Secondary License of GPL-2.0 with Classpath Exception: | ||
|
|
||
| - jakarta.annotation v2.1.1 (https://github.com/jakartaee/common-annotations-api) | ||
| - jakarta.el v5.0.0 (https://github.com/jakartaee/expression-language) | ||
| - jakarta.interceptor v2.1.0 (https://github.com/jakartaee/interceptors) | ||
| - jakarta.mail v2.1.2 (https://github.com/jakartaee/mail-api) | ||
| - jakarta.resource v2.1.0 (https://github.com/jakartaee/connectors) | ||
| - jakarta.servlet v6.0.0 (https://github.com/jakartaee/servlet) | ||
| - jakarta.transaction v2.0.1 (https://github.com/jakartaee/transactions) | ||
|
|
||
| For the full EPL 2.0 license text, see: | ||
| https://www.eclipse.org/legal/epl-2.0/ | ||
|
|
||
| --------------------------------------------------------------------------- | ||
| The MIT License (http://opensource.org/licenses/mit-license.html) | ||
| --------------------------------------------------------------------------- | ||
|
|
@@ -1097,7 +1108,7 @@ Apache Geode bundles the following files under the MIT License: | |
| - Normalize.css v2.1.0 (https://necolas.github.io/normalize.css/), | ||
| Copyright (c) Nicolas Gallagher and Jonathan Neal | ||
| - Sizzle.js (http://sizzlejs.com/), Copyright (c) 2011, The Dojo Foundation | ||
| - SLF4J API v1.7.36 (http://www.slf4j.org), Copyright (c) 2004-2025 QOS.ch | ||
| - SLF4J API v2.0.17 (http://www.slf4j.org), Copyright (c) 2004-2025 QOS.ch | ||
| - Split.js (https://github.com/nathancahill/Split.js), Copyright (c) | ||
| 2015 Nathan Cahill | ||
| - TableDnD v0.5 (https://github.com/isocra/TableDnD), Copyright (c) 2012 | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we verify the version for
istack-commons-runtimeversion discrepancy between LICENSE (v4.1.1) and DependencyConstraints.groovy (v4.0.1)See https://github.com/apache/geode/blob/develop/build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy#L125
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch, @sboorlagadda ! I've verified the discrepancy and updated DependencyConstraints.groovy to v4.1.1. The LICENSE file was correct - Gradle was already resolving to 4.1.1 due to the transitive dependency from jaxb-core/jaxb-runtime 4.0.2. This change eliminates the version conflict and aligns the declared version with what's actually resolved. Thank you so much for your help.