Commit f3aaddd
committed
Merge develop into feature/GEODE-10490
- Resolved Gradle wrapper conflicts: kept Gradle 7.6.6 with networkTimeout=10000
- Accepted develop's expected-pom.xml files for Jakarta EE 10 compatibility
- Removed tomcat9 expected-pom.xml (module deleted in develop)
- Accepted develop's AbstractSessionsTest.java with findAvailableTcpPort()
- Accepted develop's UncheckedUtilsTest.java comment
- Accepted develop's geode-assembly/build.gradle null-safety check
This merge brings Jakarta EE 10 migration changes from develop into the feature branch.File tree
783 files changed
+22943
-11258
lines changed- .github
- workflows
- boms/geode-all-bom/src/test/resources
- build-tools
- geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins
- scripts/src/main/groovy
- ci
- docker
- images/alpine-tools
- dev-tools/docker/base
- docker
- extensions
- geode-modules-assembly
- release/session/bin
- geode-modules-session-internal
- src/main/java/org/apache/geode/modules/session/internal
- common
- filter
- geode-modules-session
- src
- integrationTest/java/org/apache/geode/modules/session/internal/filter
- main/java/org/apache/geode/modules/session/filter
- geode-modules-test
- src/main/java/org/apache/geode/modules/session
- catalina
- geode-modules-tomcat10
- src
- integrationTest/java/org/apache/geode/modules/session/catalina
- main/java/org/apache/geode/modules/session/catalina
- test
- java/org/apache/geode/modules/session/catalina
- resources
- geode-modules-tomcat7
- src
- integrationTest
- java/org/apache/geode/modules/session
- catalina
- resources/tomcat
- conf
- logs
- temp
- main/java/org/apache/geode/modules/session/catalina
- test/java/org/apache/geode/modules/session/catalina
- geode-modules-tomcat8
- src
- distributedTest
- java/org/apache/geode/modules/session
- resources/tomcat
- conf
- logs
- temp
- integrationTest/java/org/apache/geode/modules/session/catalina
- main/java/org/apache/geode/modules/session/catalina
- test/java/org/apache/geode/modules/session/catalina
- geode-modules-tomcat9/src
- main/java/org/apache/geode/modules/session/catalina
- test
- java/org/apache/geode/modules/session/catalina
- resources
- geode-modules
- src
- distributedTest/java/org/apache/geode/modules/util
- integrationTest/java/org/apache/geode/modules/session/catalina
- callback
- internal
- main/java/org/apache
- catalina/ha/session
- geode/modules
- session/catalina
- callback
- util
- test
- java/org/apache/geode/modules/session/catalina
- callback
- resources
- session-testing-war
- src/main/java/org/apache/geode/modules/session
- functions
- geode-assembly
- geode-assembly-test
- src/main/java/org/apache/geode
- session/tests
- test/junit/rules
- src
- acceptanceTest
- java/org/apache/geode
- cache
- persistence
- wan
- client/sni
- management/internal
- cli/commands
- rest
- resources
- gradle-test-projects/management
- org/apache/geode
- cache/wan
- client/sni
- scripts
- distributedTest/java/org/apache/geode
- management/internal/rest
- rest/internal/web/controllers
- session/tests
- integrationTest
- java/org/apache/geode
- management/internal/cli
- commands
- converters
- rest/internal/web
- controllers
- tools/pulse
- resources
- test/java/org/apache/geode/management/internal/cli/commands
- upgradeTest/java/org/apache/geode/rest/internal/web/controllers
- geode-book
- geode-common/src/test/resources
- geode-concurrency-test/src/test/resources
- geode-connectors
- src
- acceptanceTest/java/org/apache/geode/connectors/jdbc
- distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli
- main/java/org/apache/geode/connectors/jdbc
- internal
- cli
- configuration
- management/internal/cli/converters
- test
- java/org/apache/geode/connectors/jdbc
- internal/cli
- resources
- geode-core
- src
- distributedTest/java/org/apache/geode
- cache30
- internal
- cache
- execute
- extension/mock
- tx
- jta
- dunit
- integrationTest
- java/org/apache/geode
- cache/query
- internal/index
- transaction
- distributed
- internal/membership/api
- internal
- datasource
- jta
- functional
- process
- management/internal/beans
- resources/org/apache/geode/codeAnalysis
- jca/java/org/apache/geode/internal/ra
- spi
- main
- antlr/org/apache/geode/cache/query/internal/parse
- java/org/apache/geode
- admin/jmx/internal
- cache
- configuration
- internal
- query
- internal
- management/configuration
- distributed
- internal
- examples
- internal
- cache
- tx
- xmlcache
- config
- datasource
- jndi
- jta
- process
- management/internal
- i18n
- unsafe
- util
- ra
- resources/org/apache/geode/internal
- test
- java/org/apache/geode
- internal
- cache
- tier/sockets/command
- config
- jndi
- jta/functional
- process
- ra/spi
- logging/internal
- management/internal/api
- pdx/internal
- resources
- geode-cq/src
- distributedTest/java/org/apache/geode/security
- test/resources
- geode-docs/tools_modules/gfsh/command-pages
- geode-dunit
- src
- main/java/org/apache/geode
- management/internal/cli
- test
- dunit
- internal
- rules
- junit/rules
- test/resources
- geode-gfsh
- src
- acceptanceTest/java/org/apache/geode/gfsh
- distributedTest/java/org/apache/geode/management/internal/cli/commands
- integrationTest/java/org/apache/geode/management/internal/cli
- commands
- help
- shell
- main
- java/org/apache/geode/management
- cli
- internal
- cli
- commands
- lifecycle
- completion
- converters
- domain
- help
- remote
- security
- shell
- jline
- unsafe
- util
- web/shell
- resources
- META-INF/services
- org/apache/geode/gfsh/internal/management
- test
- java/org/apache/geode/management/internal/cli
- commands
- completion
- converters
- help
- security
- shell
- unsafe
- util
- resources
- META-INF/services
- geode-http-service
- src
- main/java/org/apache/geode/internal/cache/http/service
- test/resources
- geode-jmh/src/test/resources
- geode-junit
- src
- integrationTest/resources/org/apache/geode/codeAnalysis
- main/java/org/apache/geode
- internal/jta
- management/internal/cli/commands
- test/junit/rules
- test/resources
- geode-log4j/src
- main
- java/org/apache/geode/logging/log4j/internal/impl
- resources
- test/resources
- geode-logging/src/test/resources
- geode-lucene
- geode-lucene-test/src/main/java/org/apache/geode/cache/lucene/test
- src
- distributedTest/java/org/apache/geode/cache/lucene
- internal/cli
- integrationTest
- java/org/apache/geode/cache/lucene
- internal
- cli
- directory
- repository
- xml
- resources/org/apache/geode
- cache/lucene/internal/xml
- codeAnalysis
- main/java/org/apache/geode/cache/lucene
- internal
- cli/commands
- directory
- filesystem
- repository
- serializer
- management/configuration
- performanceTest/java/org/apache/geode/cache/lucene/internal/repository
- test
- java/org/apache/geode/cache/lucene
- internal
- directory
- distributed
- repository/serializer
- resources
- geode-management
- src
- main
- java/org/apache/geode/management
- api
- configuration
- resources/org/apache/geode/management/internal
- test
- java/org/apache/geode/management/client
- resources
- geode-membership/src
- integrationTest/resources/org/apache/geode/codeAnalysis
- test/resources
- geode-memcached/src/test/resources
- geode-old-client-support/src/test/resources
- geode-pulse
- src
- integrationTest/java/org/apache/geode/tools/pulse
- controllers
- internal/context
- main
- java/org/apache/geode/tools/pulse/internal
- controllers
- data
- security
- service
- webapp
- WEB-INF
- scripts/pulsescript
- test/java/org/apache/geode/tools/pulse/internal
- uiTest/java/org/apache/geode/tools/pulse/tests/junit
- geode-rebalancer/src/test/resources
- geode-serialization/src/test/resources
- geode-server-all/src
- integrationTest/resources
- test/resources
- geode-tcp-server/src/test/resources
- geode-wan
- src
- distributedTest/java/org/apache/geode/internal/cache/wan/wancommand
- integrationTest/java/org/apache/geode/cache/wan/internal/cli/commands
- main/java/org/apache/geode/cache/wan/internal/cli/commands
- test
- java/org/apache/geode/cache/wan/internal/cli/commands
- resources
- geode-web-api
- src
- integrationTest/java/org/apache/geode/rest/internal/web/controllers
- main
- java/org/apache/geode/rest/internal/web
- controllers
- support
- security
- swagger/config
- webapp/WEB-INF
- geode-web-management
- src
- integrationTest/java/org/apache/geode/management/internal/rest
- main
- java/org/apache/geode/management/internal
- configuration
- rest
- controllers
- security
- swagger
- webapp/WEB-INF
- test/java/org/apache/geode/management/internal/rest/security
- geode-web
- src
- main
- java/org/apache/geode/management/internal/web/controllers/support
- webapp/WEB-INF
- test/java/org/apache/geode/management/internal/web/controllers/support
- gradle/wrapper
- proposals/GEODE-10481
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
783 files changed
+22943
-11258
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
49 | | - | |
| 49 | + | |
50 | 50 | | |
51 | 51 | | |
52 | 52 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
4 | | - | |
5 | | - | |
| 3 | + | |
| 4 | + | |
6 | 5 | | |
7 | | - | |
| 6 | + | |
8 | 7 | | |
9 | | - | |
10 | 8 | | |
11 | | - | |
12 | 9 | | |
13 | | - | |
14 | 10 | | |
15 | | - | |
16 | 11 | | |
17 | | - | |
18 | 12 | | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | | - | |
| 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