Commit 0c035c5
refactor(deps): remove dot.guava repackaged dependency (#35315)
## Summary
- Replaces all 240 occurrences of
`com.dotcms.repackage.com.google.common.*` imports with standard
`com.google.common.*` equivalents across the codebase (222 in
`dotCMS/src`, 18 in `dotcms-integration/src`)
- Removes `com.dotcms.lib:dot.guava:11.0.1_2` from `dotCMS/pom.xml` and
`bom/application/pom.xml`
- Fixes two API compatibility breaks surfaced by the Guava 32 upgrade:
- `Objects.toStringHelper()` → `MoreObjects.toStringHelper()` (removed
in Guava 20)
- `Cache.get(key)` → `Cache.getIfPresent(key)` (removed in Guava 22)
Closes #35235 (partial — companion to the OWASP dependency upgrade PR)
## Motivation
`dot.guava` was a dotCMS-repackaged version of Guava 11.0.1 that
provided a `com.dotcms.repackage.com.google.common.*` namespace
alongside the standard `com.google.guava:guava` artifact. Both coexisted
on the classpath. Now that guava has been upgraded to 32.0.1-jre,
`dot.guava` is redundant and its old APIs are a liability.
## Test plan
- [x] `./mvnw install -pl :dotcms-core -DskipTests` — BUILD SUCCESS
- [ ] Verify no `com.dotcms.repackage.com.google` references remain:
`grep -r "com.dotcms.repackage.com.google" dotCMS/src
dotcms-integration/src --include="*.java"` → 0 results
- [ ] Run integration tests for rules engine (most heavily affected
area): `RulesAPIImpl`, `RulesFactoryImpl`, conditionlets
🤖 Generated with [Claude Code](https://claude.com/claude-code)
---------
Co-authored-by: Daniel Silva <[email protected]>
Co-authored-by: Claude Sonnet 4.6 <[email protected]>1 parent a2f24da commit 0c035c5
254 files changed
Lines changed: 385 additions & 394 deletions
File tree
- bom/application
- dotCMS
- src
- enterprise/java/com/dotcms/enterprise
- publishing
- bundlers
- remote/handler
- sitesearch
- staticpublishing
- rules
- main/java/com
- dotcms
- api/system/event
- message
- verifier
- aspects/interceptors
- auth/providers/jwt
- factories
- services
- cms/login
- contenttype
- business
- model
- field
- layout
- type
- content/elasticsearch/business
- filters/interceptor
- dotcms
- notifications/business
- publisher/business
- rendering/velocity
- services
- util
- viewtools
- rest
- annotation
- api
- v1
- authentication
- url
- browsertree
- categories
- container
- contenttype
- content
- event
- fileasset
- folder
- index
- languages
- maintenance
- notification
- page
- personalization
- personas
- portlet
- sites/ruleengine/rules
- actions
- conditions
- site
- system
- i18n
- role
- ruleengine
- actionlets
- conditionlets
- websocket
- user
- workflow
- v2
- contenttype
- languages
- tags
- test
- timemachine/ajax
- translate
- util
- content/json
- pagination
- vanityurl
- business
- filters
- visitor/filter/servlet
- workflow/helper
- dotmarketing
- business
- ajax
- cache/provider/guava
- cache
- common
- reindex
- util
- factories
- fixtask/tasks
- image/focalpoint
- logConsole/model
- portlets
- browser/ajax
- cmsmaintenance/ajax
- contentlet
- action
- ajax
- util
- fileassets/business
- form/business
- hostvariable/bussiness
- htmlpageasset/business/render
- rules
- actionlet
- business
- conditionlet
- model
- parameter
- comparison
- display
- type
- constraint
- util
- structure/action
- workflows
- actionlet
- business
- quartz/job
- tag/business
- util
- starter
- webdav
- liferay
- portal/struts
- portlet
- test/java/com
- dotcms/rest/api/v1/system/i18n
- dotmarketing
- business/cache/provider
- portlets
- contentlet/model
- rules
- actionlet
- conditionlet
- model
- util
- dotcms-integration/src/test/java/com
- dotcms
- contenttype/test
- datagen
- integritycheckers
- visitor/filter/characteristics
- dotmarketing
- portlets
- contentlet/transform
- rules/conditionlet
- workflows/actionlet
- copy
- startup/runonce
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
220 | 220 | | |
221 | 221 | | |
222 | 222 | | |
223 | | - | |
224 | | - | |
225 | | - | |
226 | | - | |
227 | | - | |
228 | 223 | | |
229 | 224 | | |
230 | 225 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
216 | 216 | | |
217 | 217 | | |
218 | 218 | | |
219 | | - | |
220 | | - | |
221 | | - | |
222 | | - | |
223 | 219 | | |
224 | 220 | | |
225 | 221 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
19 | | - | |
| 19 | + | |
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | | - | |
| 18 | + | |
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
35 | 35 | | |
36 | 36 | | |
37 | 37 | | |
38 | | - | |
| 38 | + | |
39 | 39 | | |
40 | 40 | | |
41 | 41 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
| 20 | + | |
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
27 | | - | |
| 27 | + | |
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
33 | | - | |
| 33 | + | |
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
| |||
Lines changed: 3 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | | - | |
15 | | - | |
16 | | - | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
| |||
Lines changed: 4 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | | - | |
13 | | - | |
14 | | - | |
15 | | - | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
| |||
0 commit comments