Skip to content

Commit f3aaddd

Browse files
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.
2 parents 50c3836 + 80cf202 commit f3aaddd

File tree

783 files changed

+22943
-11258
lines changed

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

.asf.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ github:
4646
required_pull_request_reviews:
4747
dismiss_stale_reviews: false
4848
require_code_owner_reviews: false
49-
required_approving_review_count: 0
49+
required_approving_review_count: 1
5050

5151
required_signatures: false
5252

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,12 @@
11
<!-- Thank you for submitting a contribution to Apache Geode. -->
22

3-
<!-- In order to streamline the review of the contribution we ask you
4-
to ensure the following steps have been taken:
5-
-->
3+
<!-- In order to streamline review of your contribution we ask that you
4+
ensure you've taken the following steps. -->
65

7-
### For all changes:
6+
### For all changes, please confirm:
87
- [ ] Is there a JIRA ticket associated with this PR? Is it referenced in the commit message?
9-
108
- [ ] Has your PR been rebased against the latest commit within the target branch (typically `develop`)?
11-
129
- [ ] Is your initial contribution a single, squashed commit?
13-
1410
- [ ] Does `gradlew build` run cleanly?
15-
1611
- [ ] Have you written or updated unit tests to verify your changes?
17-
1812
- [ ] If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under [ASF 2.0](http://www.apache.org/legal/resolved.html#category-a)?
19-
20-
<!-- Note:
21-
Please ensure that once the PR is submitted, check Concourse for build issues and
22-
submit an update to your PR as soon as possible. If you need help, please send an
23-
24-
-->

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
- name: Setup Java JDK
6363
uses: actions/[email protected]
6464
with:
65-
java-version: 8
65+
java-version: 17
6666
distribution: temurin
6767
cache: gradle
6868

0 commit comments

Comments
 (0)