Commit 63459c5
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 modules1 parent 54dd703 commit 63459c5
File tree
4 files changed
+29
-19
lines changed- build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins
- geode-assembly/src
- integrationTest/resources
- main/dist
- geode-server-all/src/integrationTest/resources
4 files changed
+29
-19
lines changedLines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
122 | 122 | | |
123 | 123 | | |
124 | 124 | | |
125 | | - | |
| 125 | + | |
126 | 126 | | |
127 | 127 | | |
128 | 128 | | |
| |||
Lines changed: 0 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
963 | 963 | | |
964 | 964 | | |
965 | 965 | | |
966 | | - | |
967 | 966 | | |
968 | 967 | | |
969 | 968 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
217 | 217 | | |
218 | 218 | | |
219 | 219 | | |
| 220 | + | |
220 | 221 | | |
221 | 222 | | |
222 | 223 | | |
223 | 224 | | |
224 | | - | |
| 225 | + | |
225 | 226 | | |
| 227 | + | |
226 | 228 | | |
227 | 229 | | |
228 | 230 | | |
| |||
259 | 261 | | |
260 | 262 | | |
261 | 263 | | |
262 | | - | |
263 | | - | |
264 | | - | |
265 | | - | |
266 | | - | |
267 | | - | |
268 | | - | |
269 | | - | |
270 | | - | |
271 | | - | |
272 | 264 | | |
273 | 265 | | |
274 | 266 | | |
| |||
1022 | 1014 | | |
1023 | 1015 | | |
1024 | 1016 | | |
1025 | | - | |
1026 | | - | |
1027 | | - | |
1028 | | - | |
| 1017 | + | |
| 1018 | + | |
| 1019 | + | |
| 1020 | + | |
| 1021 | + | |
1029 | 1022 | | |
1030 | 1023 | | |
1031 | 1024 | | |
| |||
1059 | 1052 | | |
1060 | 1053 | | |
1061 | 1054 | | |
| 1055 | + | |
| 1056 | + | |
| 1057 | + | |
| 1058 | + | |
| 1059 | + | |
| 1060 | + | |
| 1061 | + | |
| 1062 | + | |
| 1063 | + | |
| 1064 | + | |
| 1065 | + | |
| 1066 | + | |
| 1067 | + | |
| 1068 | + | |
| 1069 | + | |
| 1070 | + | |
| 1071 | + | |
| 1072 | + | |
1062 | 1073 | | |
1063 | 1074 | | |
1064 | 1075 | | |
| |||
1097 | 1108 | | |
1098 | 1109 | | |
1099 | 1110 | | |
1100 | | - | |
| 1111 | + | |
1101 | 1112 | | |
1102 | 1113 | | |
1103 | 1114 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
62 | 62 | | |
63 | 63 | | |
64 | 64 | | |
65 | | - | |
| 65 | + | |
66 | 66 | | |
67 | 67 | | |
68 | 68 | | |
| |||
0 commit comments