Repository navigation
build: sync dev and fix lint (PR 3 of jakarta migration #861) - #935
Open
ismisepaul wants to merge 3 commits into
Open
ismisepaul wants to merge 3 commits into
ismisepaul wants to merge 3 commits into
Conversation
The OpenRewrite rename left jakarta.* imports ordered where javax.* used to sit, which fails google-java-format's import ordering in the lint-java job. Import order only; no code changes. Refs #861 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…t/jakarta-03-pom-fix
There was a problem hiding this comment.
🔵 Needs a closer look
The critical mobile-tree removal and moderate Russian locale-validation issue remain unresolved.
No open issues 🎉
What changed in this PR
Synchronizes the Jakarta migration integration branch with dev and fixes Java import ordering for lint compliance. The reviewed changes also add Russian localization and remove Android training-project files.
Changes:
- Reorders imports in application code, unit tests, and integration tests without changing Java logic.
- Adds Russian language selection and mobile-module translations.
- Removes Android build configurations, resources, challenge assets, and test scaffolding.
Two unresolved issues block approval:
- Critical: The mobile-tree removal prevents rebuilding the training apps from this repository. Restore it or separate its retirement into an explicitly scoped change with a replacement source location.
- Moderate: Locale validation rejects the new
ruselection and falls back toen_GB, preventing the Russian mobile strings from appearing. Accept supported two-letter language codes.
| File | Description |
|---|---|
src/test/java/testUtils/TestProperties.java |
Reorders imports. |
src/test/java/listeners/DatabaseLifecycleListenerTest.java |
Reorders imports. |
src/main/webapp/translation-select.jsp |
Adds Russian selection; locale-validation issue remains. |
src/main/resources/i18n/moduleGenerics/mobileGenericStrings_ru.properties |
Adds Russian mobile-module strings. |
src/main/java/utils/Validate.java |
Reorders imports; validation still rejects ru. |
src/main/java/servlets/SSOMetadata.java |
Reorders imports. |
src/main/java/servlets/SSOLogin.java |
Reorders imports. |
src/main/java/servlets/SLS.java |
Reorders imports. |
src/main/java/servlets/SetupFilter.java |
Reorders imports. |
src/main/java/servlets/Register.java |
Reorders imports. |
src/main/java/servlets/module/SolutionSubmit.java |
Reorders imports. |
src/main/java/servlets/module/lesson/RedirectLessonTarget.java |
Reorders imports. |
src/main/java/servlets/module/lesson/Redirect.java |
Reorders imports. |
src/main/java/servlets/module/lesson/PoorValidationLesson.java |
Reorders imports. |
src/main/java/servlets/module/lesson/DirectObjectLesson.java |
Reorders imports. |
src/main/java/servlets/module/lesson/CsrfLessonTarget.java |
Reorders imports. |
src/main/java/servlets/module/GetModule.java |
Reorders imports. |
src/main/java/servlets/module/GetCheat.java |
Reorders imports. |
src/main/java/servlets/module/FeedbackSubmit.java |
Reorders imports. |
src/main/java/servlets/module/challenge/UrlAccess2.java |
Reorders imports. |
src/main/java/servlets/module/challenge/UrlAccess1.java |
Reorders imports. |
src/main/java/servlets/module/challenge/PoorValidation2.java |
Reorders imports. |
src/main/java/servlets/module/challenge/PoorValidation1.java |
Reorders imports. |
src/main/java/servlets/module/challenge/BrokenCrypto3.java |
Reorders imports. |
src/main/java/servlets/MobileLogin.java |
Reorders imports. |
src/main/java/servlets/Logout.java |
Reorders imports. |
src/main/java/servlets/Login.java |
Reorders imports. |
src/main/java/servlets/GetJsonScore.java |
Reorders imports. |
src/main/java/servlets/ChangeUsername.java |
Reorders imports. |
src/main/java/servlets/ChangePassword.java |
Reorders imports. |
src/main/java/servlets/api/Scoreboard.java |
Reorders imports. |
src/main/java/servlets/api/Levels.java |
Reorders imports. |
src/main/java/servlets/api/Cheats.java |
Reorders imports. |
src/main/java/servlets/admin/userManagement/UpgradePlayer.java |
Reorders imports. |
src/main/java/servlets/admin/userManagement/UnSuspendUser.java |
Reorders imports. |
src/main/java/servlets/admin/userManagement/SuspendUser.java |
Reorders imports. |
src/main/java/servlets/admin/userManagement/SetDefaultClass.java |
Reorders imports. |
src/main/java/servlets/admin/userManagement/GiveTakePoints.java |
Reorders imports. |
src/main/java/servlets/admin/userManagement/DowngradeAdmin.java |
Reorders imports. |
src/main/java/servlets/admin/userManagement/DeletePlayers.java |
Reorders imports. |
src/main/java/servlets/admin/userManagement/CreateClass.java |
Reorders imports. |
src/main/java/servlets/admin/userManagement/ChangeUserPassword.java |
Reorders imports. |
src/main/java/servlets/admin/userManagement/AssignPlayers.java |
Reorders imports. |
src/main/java/servlets/admin/moduleManagement/SetModuleStatus.java |
Reorders imports. |
src/main/java/servlets/admin/moduleManagement/RemoveModuleLock.java |
Reorders imports. |
src/main/java/servlets/admin/moduleManagement/OpenWebModules.java |
Reorders imports. |
src/main/java/servlets/admin/moduleManagement/OpenOrCloseByCategory.java |
Reorders imports. |
src/main/java/servlets/admin/moduleManagement/OpenMobileModules.java |
Reorders imports. |
src/main/java/servlets/admin/moduleManagement/OpenAllModules.java |
Reorders imports. |
src/main/java/servlets/admin/moduleManagement/GetProgress.java |
Reorders imports. |
src/main/java/servlets/admin/moduleManagement/GetJsonProgress.java |
Reorders imports. |
src/main/java/servlets/admin/moduleManagement/GetFeedback.java |
Reorders imports. |
src/main/java/servlets/admin/moduleManagement/EnableModuleBlock.java |
Reorders imports. |
src/main/java/servlets/admin/moduleManagement/CloseAllModules.java |
Reorders imports. |
src/main/java/servlets/admin/config/ToggleRegistration.java |
Reorders imports. |
src/main/java/servlets/admin/config/SetTournamentMode.java |
Reorders imports. |
src/main/java/servlets/admin/config/SetOpenFloorMode.java |
Reorders imports. |
src/main/java/servlets/admin/config/SetCtfMode.java |
Reorders imports. |
src/main/java/servlets/admin/config/SetCountdown.java |
Reorders imports. |
src/main/java/servlets/admin/config/EnableScoreboard.java |
Reorders imports. |
src/main/java/servlets/admin/config/EnableFeedback.java |
Reorders imports. |
src/main/java/servlets/admin/config/EnableCheats.java |
Reorders imports. |
src/main/java/servlets/admin/config/DisableScoreboard.java |
Reorders imports. |
src/main/java/servlets/admin/config/DisableFeedback.java |
Reorders imports. |
src/main/java/servlets/admin/config/DisableCheats.java |
Reorders imports. |
src/main/java/servlets/admin/config/ChangeCoreDatabase.java |
Reorders imports. |
src/it/java/servlets/SetupIT.java |
Reorders imports. |
src/it/java/servlets/module/lesson/SessionManagementLessonIT.java |
Reorders imports. |
src/it/java/servlets/module/lesson/CsrfLessonIT.java |
Reorders imports. |
src/it/java/servlets/module/GetModuleIT.java |
Reorders imports. |
src/it/java/servlets/module/challenge/NoSqlInjection1IT.java |
Reorders imports. |
src/it/java/servlets/module/challenge/BrokenCryptoHomeMadeIT.java |
Reorders imports. |
src/it/java/servlets/LogoutIT.java |
Reorders imports. |
src/it/java/servlets/LoginIT.java |
Reorders imports. |
src/it/java/servlets/api/LevelsIT.java |
Reorders imports. |
src/it/java/servlets/admin/userManagement/DeletePlayersIT.java |
Reorders imports. |
src/it/java/servlets/admin/moduleManagement/OpenOrCloseByCategoryIT.java |
Reorders imports. |
src/it/java/servlets/admin/moduleManagement/OpenAllModulesIT.java |
Reorders imports. |
src/it/java/servlets/admin/moduleManagement/GetJsonProgressIT.java |
Reorders imports. |
src/it/java/servlets/admin/moduleManagement/GetFeedbackIT.java |
Reorders imports. |
src/it/java/servlets/admin/moduleManagement/EnableModuleBlockIT.java |
Reorders imports. |
src/it/java/servlets/admin/moduleManagement/CloseAllModulesTestIT.java |
Reorders imports. |
src/it/java/servlets/admin/config/ToggleRegistrationIT.java |
Reorders imports. |
src/it/java/servlets/admin/config/SetTournamentModeIT.java |
Reorders imports. |
src/it/java/servlets/admin/config/SetOpenFloorModeIT.java |
Reorders imports. |
src/it/java/servlets/admin/config/SetCtfModeIT.java |
Reorders imports. |
src/it/java/servlets/admin/config/EnableFeedbackIT.java |
Reorders imports. |
src/it/java/servlets/admin/config/EnableCheatsIT.java |
Reorders imports. |
src/it/java/servlets/admin/config/DisableScoreboardIT.java |
Reorders imports. |
src/it/java/servlets/admin/config/DisableFeedbackIT.java |
Reorders imports. |
src/it/java/servlets/admin/config/DisableCheatsIT.java |
Reorders imports. |
mobile/WeakServerSideControls/settings.gradle |
Removes module inclusion. |
mobile/WeakServerSideControls/gradle/wrapper/gradle-wrapper.properties |
Removes Gradle wrapper configuration. |
mobile/WeakServerSideControls/build.gradle |
Removes Android build configuration. |
mobile/WeakServerSideControls/app/src/main/res/values/styles.xml |
Removes theme resources. |
mobile/WeakServerSideControls/app/src/main/res/values/strings.xml |
Removes string resources. |
mobile/WeakServerSideControls/app/src/main/res/values/dimens.xml |
Removes default dimensions. |
mobile/WeakServerSideControls/app/src/main/res/values-w820dp/dimens.xml |
Removes wide-screen dimensions. |
mobile/WeakServerSideControls/app/src/main/res/menu/menu_main.xml |
Removes menu resources. |
mobile/WeakServerSideControls/app/src/androidTest/java/com/mobshep/weakserversidecontrols/ApplicationTest.java |
Removes instrumentation-test scaffold. |
mobile/WeakServerSideControls/app/.gitignore |
Removes app ignore rules. |
mobile/WeakServerSideControls/.gitignore |
Removes project ignore rules. |
mobile/UntrustedInput/settings.gradle |
Removes module inclusion. |
mobile/UntrustedInput/gradle/wrapper/gradle-wrapper.properties |
Removes Gradle wrapper configuration. |
mobile/UntrustedInput/build.gradle |
Removes Android build configuration. |
mobile/UntrustedInput/app/src/test/java/com/mobshep/untrustedinput/ExampleUnitTest.java |
Removes sample unit test. |
mobile/UntrustedInput/app/src/main/res/values/dimens.xml |
Removes default dimensions. |
mobile/UntrustedInput/app/src/main/res/values/colors.xml |
Removes color resources. |
mobile/UntrustedInput/app/src/main/res/values-w820dp/dimens.xml |
Removes wide-screen dimensions. |
mobile/UntrustedInput/app/src/main/res/values-v21/styles.xml |
Removes API-specific theme resources. |
mobile/UntrustedInput/app/src/main/res/menu/menu_main.xml |
Removes menu resources. |
mobile/UntrustedInput/app/src/androidTest/java/com/mobshep/untrustedinput/ApplicationTest.java |
Removes instrumentation-test scaffold. |
mobile/UntrustedInput/app/.gitignore |
Removes app ignore rules. |
mobile/UntrustedInput/.gitignore |
Removes project ignore rules. |
mobile/UDataLeakage2/settings.gradle |
Removes module inclusion. |
mobile/UDataLeakage2/gradle/wrapper/gradle-wrapper.properties |
Removes Gradle wrapper configuration. |
mobile/UDataLeakage2/build.gradle |
Removes Android build configuration. |
mobile/UDataLeakage2/app/src/main/res/values/dimens.xml |
Removes default dimensions. |
mobile/UDataLeakage2/app/src/main/res/values-w820dp/dimens.xml |
Removes wide-screen dimensions. |
mobile/UDataLeakage2/app/src/main/res/layout/splash.xml |
Removes splash layout. |
mobile/UDataLeakage2/app/src/androidTest/java/com/mobshep/udataleakage2/ApplicationTest.java |
Removes instrumentation-test scaffold. |
mobile/UDataLeakage2/app/.gitignore |
Removes app ignore rules. |
mobile/UDataLeakage2/.gitignore |
Removes project ignore rules. |
mobile/UDataLeakage1/settings.gradle |
Removes module inclusion. |
mobile/UDataLeakage1/gradle/wrapper/gradle-wrapper.properties |
Removes Gradle wrapper configuration. |
mobile/UDataLeakage1/build.gradle |
Removes Android build configuration. |
mobile/UDataLeakage1/app/src/main/res/values/dimens.xml |
Removes default dimensions. |
mobile/UDataLeakage1/app/src/main/res/values-w820dp/dimens.xml |
Removes wide-screen dimensions. |
mobile/UDataLeakage1/app/src/main/res/drawable-xxhdpi/unchecked.xml |
Removes checkbox drawable. |
mobile/UDataLeakage1/app/src/main/res/drawable-xxhdpi/checked.xml |
Removes checkbox drawable. |
mobile/UDataLeakage1/app/src/main/res/drawable-xxhdpi/checkbox.xml |
Removes checkbox selector. |
mobile/UDataLeakage1/app/.gitignore |
Removes app ignore rules. |
mobile/UDataLeakage1/.gitignore |
Removes project ignore rules. |
mobile/UDataLeakage/settings.gradle |
Removes module inclusion. |
mobile/UDataLeakage/gradle/wrapper/gradle-wrapper.properties |
Removes Gradle wrapper configuration. |
mobile/UDataLeakage/build.gradle |
Removes Android build configuration. |
mobile/UDataLeakage/app/src/main/res/values/strings.xml |
Removes string resources. |
mobile/UDataLeakage/app/src/main/res/values/dimens.xml |
Removes default dimensions. |
mobile/UDataLeakage/app/src/main/res/values-w820dp/dimens.xml |
Removes wide-screen dimensions. |
mobile/UDataLeakage/app/src/main/res/menu/unintended__data__leakage.xml |
Removes menu resources. |
mobile/UDataLeakage/app/src/main/res/layout/splash.xml |
Removes splash layout. |
mobile/UDataLeakage/app/src/main/assets/Tue Jul 08 172618 EDT 2014 |
Removes challenge asset. |
mobile/UDataLeakage/app/.gitignore |
Removes app ignore rules. |
mobile/UDataLeakage/.gitignore |
Removes project ignore rules. |
mobile/ShepherdResolver/settings.gradle |
Removes module inclusion. |
mobile/ShepherdResolver/gradle/wrapper/gradle-wrapper.properties |
Removes Gradle wrapper configuration. |
mobile/ShepherdResolver/build.gradle |
Removes Android build configuration. |
mobile/ShepherdResolver/app/src/main/res/values/styles.xml |
Removes theme resources. |
mobile/ShepherdResolver/app/src/main/res/values/strings.xml |
Removes string resources. |
mobile/ShepherdResolver/app/src/main/res/values/dimens.xml |
Removes default dimensions. |
mobile/ShepherdResolver/app/src/main/res/values-w820dp/dimens.xml |
Removes wide-screen dimensions. |
mobile/ShepherdResolver/app/src/main/res/menu/menu_main.xml |
Removes menu resources. |
mobile/ShepherdResolver/app/src/androidTest/java/com/mobshep/shepherdresolver/ApplicationTest.java |
Removes instrumentation-test scaffold. |
mobile/ShepherdResolver/app/.gitignore |
Removes app ignore rules. |
mobile/ShepherdResolver/.gitignore |
Removes project ignore rules. |
mobile/ShepherdLogin/settings.gradle |
Removes module inclusion. |
mobile/ShepherdLogin/gradle/wrapper/gradle-wrapper.properties |
Removes Gradle wrapper configuration. |
mobile/ShepherdLogin/build.gradle |
Removes Android build configuration. |
mobile/ShepherdLogin/app/src/main/res/values/styles.xml |
Removes theme resources. |
mobile/ShepherdLogin/app/src/main/res/values/dimens.xml |
Removes default dimensions. |
mobile/ShepherdLogin/app/src/main/res/values-w820dp/dimens.xml |
Removes wide-screen dimensions. |
mobile/ShepherdLogin/app/src/androidTest/java/com/mobshep/shepherdlogin/ApplicationTest.java |
Removes instrumentation-test scaffold. |
mobile/ShepherdLogin/app/.gitignore |
Removes app ignore rules. |
mobile/ShepherdLogin/.gitignore |
Removes project ignore rules. |
mobile/SessionManagement/settings.gradle |
Removes module inclusion. |
mobile/SessionManagement/gradle/wrapper/gradle-wrapper.properties |
Removes Gradle wrapper configuration. |
mobile/SessionManagement/build.gradle |
Removes Android build configuration. |
mobile/SessionManagement/app/src/main/res/values/styles.xml |
Removes theme resources. |
mobile/SessionManagement/app/src/main/res/values/dimens.xml |
Removes default dimensions. |
mobile/SessionManagement/app/src/main/res/values-w820dp/dimens.xml |
Removes wide-screen dimensions. |
mobile/SessionManagement/app/src/androidTest/java/com/mobshep/sessionmanagement/ApplicationTest.java |
Removes instrumentation-test scaffold. |
mobile/SessionManagement/app/.gitignore |
Removes app ignore rules. |
mobile/SessionManagement/.gitignore |
Removes project ignore rules. |
mobile/ReverseEngineer3/settings.gradle |
Removes module inclusion. |
mobile/ReverseEngineer3/gradle/wrapper/gradle-wrapper.properties |
Removes Gradle wrapper configuration. |
mobile/ReverseEngineer3/build.gradle |
Removes Android build configuration. |
mobile/ReverseEngineer3/app/src/main/res/values/strings.xml |
Removes string resources. |
mobile/ReverseEngineer3/app/src/main/res/values/dimens.xml |
Removes default dimensions. |
mobile/ReverseEngineer3/app/src/main/res/values-v14/styles.xml |
Removes API-specific theme resources. |
mobile/ReverseEngineer3/app/src/main/res/values-v11/styles.xml |
Removes API-specific theme resources. |
mobile/ReverseEngineer3/app/src/main/res/values-sw720dp-land/dimens.xml |
Removes tablet-landscape dimensions. |
mobile/ReverseEngineer3/app/src/main/res/values-sw600dp/dimens.xml |
Removes tablet resource scaffold. |
mobile/ReverseEngineer3/app/src/main/res/menu/firstkey.xml |
Removes menu resources. |
mobile/ReverseEngineer3/app/src/main/res/layout/splash.xml |
Removes splash layout. |
mobile/ReverseEngineer3/app/src/androidTest/java/com/mobshep/reverseengineer3/ApplicationTest.java |
Removes instrumentation-test scaffold. |
mobile/ReverseEngineer3/app/.gitignore |
Removes app ignore rules. |
mobile/ReverseEngineer3/.gitignore |
Removes project ignore rules. |
mobile/ReverseEngineer2/settings.gradle |
Removes module inclusion. |
mobile/ReverseEngineer2/gradle/wrapper/gradle-wrapper.properties |
Removes Gradle wrapper configuration. |
mobile/ReverseEngineer2/build.gradle |
Removes Android build configuration. |
mobile/ReverseEngineer2/app/src/main/res/values/strings.xml |
Removes string resources. |
mobile/ReverseEngineer2/app/src/main/res/values/dimens.xml |
Removes default dimensions. |
mobile/ReverseEngineer2/app/src/main/res/values-v14/styles.xml |
Removes API-specific theme resources. |
mobile/ReverseEngineer2/app/src/main/res/values-v11/styles.xml |
Removes API-specific theme resources. |
mobile/ReverseEngineer2/app/src/main/res/values-sw720dp-land/dimens.xml |
Removes tablet-landscape dimensions. |
mobile/ReverseEngineer2/app/src/main/res/values-sw600dp/dimens.xml |
Removes tablet resource scaffold. |
mobile/ReverseEngineer2/app/src/main/res/layout/splash.xml |
Removes splash layout. |
mobile/ReverseEngineer2/app/src/androidTest/java/com/mobshep/reverseengineer2/ApplicationTest.java |
Removes instrumentation-test scaffold. |
mobile/ReverseEngineer2/app/res/values/strings.xml |
Removes legacy string resources. |
mobile/ReverseEngineer2/app/res/values/dimens.xml |
Removes legacy dimensions. |
mobile/ReverseEngineer2/app/res/values-v14/styles.xml |
Removes legacy API-specific theme. |
mobile/ReverseEngineer2/app/res/values-v11/styles.xml |
Removes legacy API-specific theme. |
mobile/ReverseEngineer2/app/res/values-sw720dp-land/dimens.xml |
Removes legacy tablet dimensions. |
mobile/ReverseEngineer2/app/res/values-sw600dp/dimens.xml |
Removes legacy tablet scaffold. |
mobile/ReverseEngineer2/app/res/layout/splash.xml |
Removes legacy splash layout. |
mobile/ReverseEngineer2/app/.gitignore |
Removes app ignore rules. |
mobile/ReverseEngineer2/.gitignore |
Removes project ignore rules. |
mobile/ReverseEngineer1/settings.gradle |
Removes module inclusion. |
mobile/ReverseEngineer1/gradle/wrapper/gradle-wrapper.properties |
Removes Gradle wrapper configuration. |
mobile/ReverseEngineer1/build.gradle |
Removes Android build configuration. |
mobile/ReverseEngineer1/app/src/main/res/values/styles.xml |
Removes theme resources. |
mobile/ReverseEngineer1/app/src/main/res/values/strings.xml |
Removes string resources. |
mobile/ReverseEngineer1/app/src/main/res/values/dimens.xml |
Removes default dimensions. |
mobile/ReverseEngineer1/app/src/main/res/values-w820dp/dimens.xml |
Removes wide-screen dimensions. |
mobile/ReverseEngineer1/app/src/main/res/menu/menu_main.xml |
Removes menu resources. |
mobile/ReverseEngineer1/app/src/androidTest/java/com/mobshep/reverseengineer1/ApplicationTest.java |
Removes instrumentation-test scaffold. |
mobile/ReverseEngineer1/app/build.gradle |
Removes app build configuration. |
mobile/ReverseEngineer1/app/.gitignore |
Removes app ignore rules. |
mobile/ReverseEngineer1/.gitignore |
Removes project ignore rules. |
mobile/ReverseEngineer/settings.gradle |
Removes module inclusion. |
mobile/ReverseEngineer/gradle/wrapper/gradle-wrapper.properties |
Removes Gradle wrapper configuration. |
mobile/ReverseEngineer/build.gradle |
Removes Android build configuration. |
mobile/ReverseEngineer/app/src/main/res/values/dimens.xml |
Removes default dimensions. |
mobile/ReverseEngineer/app/src/main/res/values-w820dp/dimens.xml |
Removes wide-screen dimensions. |
mobile/ReverseEngineer/app/src/main/res/menu/menu_main.xml |
Removes menu resources. |
mobile/ReverseEngineer/app/src/main/res/layout/splash.xml |
Removes splash layout. |
mobile/ReverseEngineer/app/src/androidTest/java/com/mobshep/reverseengineer/ApplicationTest.java |
Removes instrumentation-test scaffold. |
mobile/ReverseEngineer/app/.gitignore |
Removes app ignore rules. |
mobile/ReverseEngineer/.gitignore |
Removes project ignore rules. |
mobile/PoorAuthentication2/settings.gradle |
Removes module inclusion. |
mobile/PoorAuthentication2/gradle/wrapper/gradle-wrapper.properties |
Removes Gradle wrapper configuration. |
mobile/PoorAuthentication2/build.gradle |
Removes Android build configuration. |
mobile/PoorAuthentication2/app/src/main/res/values/styles.xml |
Removes theme resources. |
mobile/PoorAuthentication2/app/src/main/res/values/dimens.xml |
Removes default dimensions. |
mobile/PoorAuthentication2/app/src/main/res/values-w820dp/dimens.xml |
Removes wide-screen dimensions. |
mobile/PoorAuthentication2/app/src/main/res/menu/menu_main.xml |
Removes menu resources. |
mobile/PoorAuthentication2/app/src/androidTest/java/com/mobshep/poorauthentication2/ApplicationTest.java |
Removes instrumentation-test scaffold. |
mobile/PoorAuthentication2/app/.gitignore |
Removes app ignore rules. |
mobile/PoorAuthentication2/.gitignore |
Removes project ignore rules. |
mobile/PoorAuthentication1/settings.gradle |
Removes module inclusion. |
mobile/PoorAuthentication1/gradle/wrapper/gradle-wrapper.properties |
Removes Gradle wrapper configuration. |
mobile/PoorAuthentication1/build.gradle |
Removes Android build configuration. |
mobile/PoorAuthentication1/app/src/main/res/values/strings.xml |
Removes string resources. |
mobile/PoorAuthentication1/app/src/main/res/values/dimens.xml |
Removes default dimensions. |
mobile/PoorAuthentication1/app/src/main/res/values-w820dp/dimens.xml |
Removes wide-screen dimensions. |
mobile/PoorAuthentication1/app/src/main/res/menu/menu_main.xml |
Removes menu resources. |
mobile/PoorAuthentication1/app/src/main/assets/usedAuthCodes.txt |
Removes challenge asset. |
mobile/PoorAuthentication1/app/src/androidTest/java/com/mobshep/poorauthentication1/ApplicationTest.java |
Removes instrumentation-test scaffold. |
mobile/PoorAuthentication1/app/.gitignore |
Removes app ignore rules. |
mobile/PoorAuthentication1/.gitignore |
Removes project ignore rules. |
mobile/PoorAuthentication/settings.gradle |
Removes module inclusion. |
mobile/PoorAuthentication/gradle/wrapper/gradle-wrapper.properties |
Removes Gradle wrapper configuration. |
mobile/PoorAuthentication/build.gradle |
Removes Android build configuration. |
mobile/PoorAuthentication/app/src/main/res/values/strings.xml |
Removes string resources. |
mobile/PoorAuthentication/app/src/main/res/values/dimens.xml |
Removes default dimensions. |
mobile/PoorAuthentication/app/src/main/res/values-w820dp/dimens.xml |
Removes wide-screen dimensions. |
mobile/PoorAuthentication/app/src/main/res/menu/unintended__data__leakage.xml |
Removes menu resources. |
mobile/PoorAuthentication/app/src/main/res/layout/splash.xml |
Removes splash layout. |
mobile/PoorAuthentication/app/src/main/res/layout/main.xml |
Removes main layout. |
mobile/PoorAuthentication/app/New Text Document.txt |
Listed without a textual diff. |
mobile/PoorAuthentication/app/New Text Document (3).txt |
Listed without a textual diff. |
mobile/PoorAuthentication/app/New Text Document (2).txt |
Listed without a textual diff. |
mobile/PoorAuthentication/app/.gitignore |
Removes app ignore rules. |
mobile/PoorAuthentication/.gitignore |
Removes project ignore rules. |
mobile/MobShepTemplate/settings.gradle |
Removes module inclusion. |
mobile/MobShepTemplate/gradle/wrapper/gradle-wrapper.properties |
Removes Gradle wrapper configuration. |
mobile/MobShepTemplate/build.gradle |
Removes template build configuration. |
mobile/MobShepTemplate/app/src/main/res/values/styles.xml |
Removes theme resources. |
mobile/MobShepTemplate/app/src/main/res/values/dimens.xml |
Removes default dimensions. |
mobile/MobShepTemplate/app/src/main/res/values-v14/styles.xml |
Removes API-specific theme resources. |
mobile/MobShepTemplate/app/src/main/res/values-v11/styles.xml |
Removes API-specific theme resources. |
mobile/MobShepTemplate/app/src/main/res/values-sw720dp-land/dimens.xml |
Removes tablet-landscape dimensions. |
mobile/MobShepTemplate/app/src/main/res/values-sw600dp/dimens.xml |
Removes tablet resource scaffold. |
mobile/MobShepTemplate/app/src/main/res/layout/splash.xml |
Removes splash layout. |
mobile/MobShepTemplate/app/src/androidTest/java/com/mobshep/template/ApplicationTest.java |
Removes instrumentation-test scaffold. |
mobile/MobShepTemplate/app/.gitignore |
Removes app ignore rules. |
mobile/MobShepTemplate/.gitignore |
Removes project ignore rules. |
mobile/MobileShepherd/settings.gradle |
Removes module inclusion. |
mobile/MobileShepherd/gradle/wrapper/gradle-wrapper.properties |
Removes Gradle wrapper configuration. |
mobile/MobileShepherd/build.gradle |
Removes Android build configuration; critical removal issue. |
mobile/MobileShepherd/app/src/test/java/com/mobshep/mobileshepherd/ExampleUnitTest.java |
Removes sample unit test. |
mobile/MobileShepherd/app/src/main/res/xml/unchecked.xml |
Removes checkbox shape. |
mobile/MobileShepherd/app/src/main/res/xml/edittext2.xml |
Removes input styling resource. |
mobile/MobileShepherd/app/src/main/res/xml/checked.xml |
Removes checkbox shape. |
mobile/MobileShepherd/app/src/main/res/xml/checkbox.xml |
Removes checkbox selector. |
mobile/MobileShepherd/app/src/main/res/xml/box2.xml |
Removes box styling resource. |
mobile/MobileShepherd/app/src/main/res/values/dimens.xml |
Removes default dimensions. |
mobile/MobileShepherd/app/src/main/res/values/colors.xml |
Removes color resources. |
mobile/MobileShepherd/app/src/main/res/values-w820dp/dimens.xml |
Removes wide-screen dimensions. |
mobile/MobileShepherd/app/src/main/res/layout/toolbar_main.xml |
Removes toolbar layout. |
mobile/MobileShepherd/app/src/main/res/layout/splash.xml |
Removes splash layout. |
mobile/MobileShepherd/app/src/main/res/layout/main.xml |
Removes main layout. |
mobile/MobileShepherd/app/src/main/res/drawable/side_nav_bar.xml |
Removes navigation background. |
mobile/MobileShepherd/app/src/main/res/drawable-v21/ic_menu_send.xml |
Removes menu icon. |
mobile/MobileShepherd/app/src/main/assets/Tue Jul 08 172618 EDT 2014 |
Removes challenge asset. |
mobile/MobileShepherd/app/src/main/assets/key3 |
Removes challenge asset. |
mobile/MobileShepherd/app/src/main/assets/key2 |
Removes challenge asset. |
mobile/MobileShepherd/app/src/main/assets/key1 |
Removes challenge asset. |
mobile/MobileShepherd/app/src/main/assets/key.txt |
Removes challenge asset. |
mobile/MobileShepherd/app/src/main/assets/desKey |
Removes challenge asset. |
mobile/MobileShepherd/app/src/androidTest/java/com/mobshep/mobileshepherd/ApplicationTest.java |
Removes instrumentation-test scaffold. |
mobile/MobileShepherd/app/.gitignore |
Removes app ignore rules. |
mobile/MobileShepherd/.gitignore |
Removes project ignore rules. |
mobile/InsufficientTLS2/res/values/dimens.xml |
Removes default dimensions. |
mobile/InsufficientTLS2/res/values-v14/styles.xml |
Removes API-specific theme resources. |
mobile/InsufficientTLS2/res/values-v11/styles.xml |
Removes API-specific theme resources. |
mobile/InsufficientTLS2/res/values-sw720dp-land/dimens.xml |
Removes tablet-landscape dimensions. |
mobile/InsufficientTLS2/res/values-sw600dp/dimens.xml |
Removes tablet resource scaffold. |
mobile/InsufficientTLS2/res/layout/splash.xml |
Removes splash layout. |
mobile/InsufficientTLS2/project.properties |
Removes Android project configuration. |
mobile/InsufficientTLS2/lint.xml |
Removes lint configuration. |
mobile/InsufficientTLS2/gradle/wrapper/gradle-wrapper.properties |
Removes Gradle wrapper configuration. |
mobile/InsufficientTLS2/.settings/org.eclipse.jdt.core.prefs |
Removes Eclipse compiler settings. |
mobile/InsufficientTLS2/.gitignore |
Removes project ignore rules. |
mobile/InsufficientTLS/settings.gradle |
Removes module inclusion. |
mobile/InsufficientTLS/gradle/wrapper/gradle-wrapper.properties |
Removes Gradle wrapper configuration. |
mobile/InsufficientTLS/build.gradle |
Removes Android build configuration. |
mobile/InsufficientTLS/app/src/test/java/com/mobshep/insufficienttls/ExampleUnitTest.java |
Removes sample unit test. |
mobile/InsufficientTLS/app/src/main/res/values/styles.xml |
Removes theme resources. |
mobile/InsufficientTLS/app/src/main/res/values/dimens.xml |
Removes default dimensions. |
mobile/InsufficientTLS/app/src/main/res/values/colors.xml |
Removes color resources. |
mobile/InsufficientTLS/app/src/main/res/values-w820dp/dimens.xml |
Removes wide-screen dimensions. |
mobile/InsufficientTLS/app/src/main/res/menu/menu_main.xml |
Removes menu resources. |
mobile/InsufficientTLS/app/src/androidTest/java/com/mobshep/insufficienttls/ApplicationTest.java |
Removes instrumentation-test scaffold. |
mobile/InsufficientTLS/app/.gitignore |
Removes app ignore rules. |
mobile/InsufficientTLS/.gitignore |
Removes project ignore rules. |
mobile/InsecureData3/settings.gradle |
Removes module inclusion. |
mobile/InsecureData3/gradle/wrapper/gradle-wrapper.properties |
Removes Gradle wrapper configuration. |
mobile/InsecureData3/build.gradle |
Removes Android build configuration. |
mobile/InsecureData3/app/src/main/res/xml/unchecked.xml |
Removes checkbox shape. |
mobile/InsecureData3/app/src/main/res/xml/checked.xml |
Removes checkbox shape. |
mobile/InsecureData3/app/src/main/res/xml/checkbox.xml |
Removes checkbox selector. |
mobile/InsecureData3/app/src/main/res/values/styles.xml |
Removes theme resources. |
mobile/InsecureData3/app/src/main/res/values/strings.xml |
Removes string resources. |
mobile/InsecureData3/app/src/main/res/values/dimens.xml |
Removes default dimensions. |
mobile/InsecureData3/app/src/main/res/values-w820dp/dimens.xml |
Removes wide-screen dimensions. |
mobile/InsecureData3/app/src/main/res/menu/menu_main.xml |
Removes menu resources. |
mobile/InsecureData3/app/src/androidTest/java/com/mobshep/insecuredata3/ApplicationTest.java |
Removes instrumentation-test scaffold. |
mobile/InsecureData3/app/.gitignore |
Removes app ignore rules. |
mobile/InsecureData3/.gitignore |
Removes project ignore rules. |
mobile/InsecureData2/settings.gradle |
Removes module inclusion. |
mobile/InsecureData2/gradle/wrapper/gradle-wrapper.properties |
Removes Gradle wrapper configuration. |
mobile/InsecureData2/build.gradle |
Removes Android build configuration. |
mobile/InsecureData2/app/src/main/res/values/dimens.xml |
Removes default dimensions. |
mobile/InsecureData2/app/src/main/res/values-w820dp/dimens.xml |
Removes wide-screen dimensions. |
mobile/InsecureData2/app/src/main/res/menu/menu_insecure_data3.xml |
Removes menu resources. |
mobile/InsecureData2/app/src/main/res/layout/splash.xml |
Removes splash layout. |
mobile/InsecureData2/app/src/androidTest/java/com/mobshep/insecuredata2/ApplicationTest.java |
Removes instrumentation-test scaffold. |
mobile/InsecureData2/app/.gitignore |
Removes app ignore rules. |
mobile/InsecureData2/.gitignore |
Removes project ignore rules. |
mobile/InsecureData1/settings.gradle |
Removes module inclusion. |
mobile/InsecureData1/gradle/wrapper/gradle-wrapper.properties |
Removes Gradle wrapper configuration. |
mobile/InsecureData1/build.gradle |
Removes Android build configuration. |
mobile/InsecureData1/app/src/main/res/values/strings.xml |
Removes string resources. |
mobile/InsecureData1/app/src/main/res/layout/splash.xml |
Removes splash layout. |
mobile/InsecureData1/app/src/androidTest/java/com/mobshep/insecuredata1/ApplicationTest.java |
Removes instrumentation-test scaffold. |
mobile/InsecureData1/app/.gitignore |
Removes app ignore rules. |
mobile/InsecureData1/.gitignore |
Removes project ignore rules. |
mobile/InsecureData/settings.gradle |
Removes module inclusion. |
mobile/InsecureData/gradle/wrapper/gradle-wrapper.properties |
Removes Gradle wrapper configuration. |
mobile/InsecureData/build.gradle |
Removes Android build configuration. |
mobile/InsecureData/app/src/main/res/layout/splash.xml |
Removes splash layout. |
mobile/InsecureData/app/src/androidTest/java/com/mobshep/insecuredata/ApplicationTest.java |
Removes instrumentation-test scaffold. |
mobile/InsecureData/app/.gitignore |
Removes app ignore rules. |
mobile/InsecureData/.gitignore |
Removes project ignore rules. |
mobile/CSInjection2/settings.gradle |
Removes module inclusion. |
mobile/CSInjection2/gradle/wrapper/gradle-wrapper.properties |
Removes Gradle wrapper configuration. |
mobile/CSInjection2/build.gradle |
Removes Android build configuration. |
mobile/CSInjection2/app/src/main/res/values/dimens.xml |
Removes default dimensions. |
mobile/CSInjection2/app/src/main/res/values-w820dp/dimens.xml |
Removes wide-screen dimensions. |
mobile/CSInjection2/app/src/main/res/menu/menu_csinjection3.xml |
Removes menu resources. |
mobile/CSInjection2/app/src/androidTest/java/com/mobshep/csinjection2/ApplicationTest.java |
Removes instrumentation-test scaffold. |
mobile/CSInjection2/app/.gitignore |
Removes app ignore rules. |
mobile/CSInjection2/.gitignore |
Removes project ignore rules. |
mobile/CSInjection1/settings.gradle |
Removes module inclusion. |
mobile/CSInjection1/gradle/wrapper/gradle-wrapper.properties |
Removes Gradle wrapper configuration. |
mobile/CSInjection1/build.gradle |
Removes Android build configuration. |
mobile/CSInjection1/app/src/main/res/values/dimens.xml |
Removes default dimensions. |
mobile/CSInjection1/app/src/main/res/values-sw720dp-land/dimens.xml |
Removes tablet-landscape dimensions. |
mobile/CSInjection1/app/src/main/res/values-sw600dp/dimens.xml |
Removes tablet resource scaffold. |
mobile/CSInjection1/app/src/main/res/layout/splash.xml |
Removes splash layout. |
mobile/CSInjection1/app/src/androidTest/java/com/mobshep/csinjection1/ApplicationTest.java |
Removes instrumentation-test scaffold. |
mobile/CSInjection1/app/.gitignore |
Removes app ignore rules. |
mobile/CSInjection1/.gitignore |
Removes project ignore rules. |
mobile/CSInjection/settings.gradle |
Removes module inclusion. |
mobile/CSInjection/gradle/wrapper/gradle-wrapper.properties |
Removes Gradle wrapper configuration. |
mobile/CSInjection/build.gradle |
Removes Android build configuration. |
mobile/CSInjection/app/src/main/res/values/dimens.xml |
Removes default dimensions. |
mobile/CSInjection/app/src/main/res/values-sw720dp-land/dimens.xml |
Removes tablet-landscape dimensions. |
mobile/CSInjection/app/src/main/res/values-sw600dp/dimens.xml |
Removes tablet resource scaffold. |
mobile/CSInjection/app/src/main/res/menu/menu_main.xml |
Removes menu resources. |
mobile/CSInjection/app/src/main/res/layout/splash.xml |
Removes splash layout. |
mobile/CSInjection/app/.gitignore |
Removes app ignore rules. |
mobile/CSInjection/.gitignore |
Removes project ignore rules. |
mobile/CProviderLeakage1/settings.gradle |
Removes module inclusion. |
mobile/CProviderLeakage1/gradle/wrapper/gradle-wrapper.properties |
Removes Gradle wrapper configuration. |
mobile/CProviderLeakage1/build.gradle |
Removes Android build configuration. |
mobile/CProviderLeakage1/app/src/main/res/values/styles.xml |
Removes theme resources. |
mobile/CProviderLeakage1/app/src/main/res/values/strings.xml |
Removes string resources. |
mobile/CProviderLeakage1/app/src/main/res/values/dimens.xml |
Removes default dimensions. |
mobile/CProviderLeakage1/app/src/main/res/values-w820dp/dimens.xml |
Removes wide-screen dimensions. |
mobile/CProviderLeakage1/app/src/main/res/menu/menu_main.xml |
Removes menu resources. |
mobile/CProviderLeakage1/app/.gitignore |
Removes app ignore rules. |
mobile/CProviderLeakage1/.gitignore |
Removes project ignore rules. |
mobile/CProviderLeakage/settings.gradle |
Removes module inclusion. |
mobile/CProviderLeakage/gradle/wrapper/gradle-wrapper.properties |
Removes Gradle wrapper configuration. |
mobile/CProviderLeakage/build.gradle |
Removes Android build configuration. |
mobile/CProviderLeakage/app/src/main/res/values/styles.xml |
Removes theme resources. |
mobile/CProviderLeakage/app/src/main/res/values/strings.xml |
Removes string resources. |
mobile/CProviderLeakage/app/src/main/res/values/dimens.xml |
Removes default dimensions. |
mobile/CProviderLeakage/app/src/main/res/values-w820dp/dimens.xml |
Removes wide-screen dimensions. |
mobile/CProviderLeakage/app/src/main/res/menu/menu_main.xml |
Removes menu resources. |
mobile/CProviderLeakage/app/src/androidTest/java/com/somewhere/hidden/ApplicationTest.java |
Removes instrumentation-test scaffold. |
mobile/CProviderLeakage/app/.gitignore |
Removes app ignore rules. |
mobile/CProviderLeakage/.gitignore |
Removes project ignore rules. |
mobile/BrokenCrypto3/settings.gradle |
Removes module inclusion. |
mobile/BrokenCrypto3/gradle/wrapper/gradle-wrapper.properties |
Removes Gradle wrapper configuration. |
mobile/BrokenCrypto3/build.gradle |
Removes Android build configuration. |
mobile/BrokenCrypto3/app/src/main/res/values/styles.xml |
Removes theme resources. |
mobile/BrokenCrypto3/app/src/main/res/values/strings.xml |
Removes string resources. |
mobile/BrokenCrypto3/app/src/main/res/values/dimens.xml |
Removes default dimensions. |
mobile/BrokenCrypto3/app/src/main/res/values-w820dp/dimens.xml |
Removes wide-screen dimensions. |
mobile/BrokenCrypto3/app/src/main/assets/key.txt |
Removes challenge asset. |
mobile/BrokenCrypto3/app/src/androidTest/java/com/mobshep/brokencrypto3/ApplicationTest.java |
Removes instrumentation-test scaffold. |
mobile/BrokenCrypto3/app/.gitignore |
Removes app ignore rules. |
mobile/BrokenCrypto3/.gitignore |
Removes project ignore rules. |
mobile/BrokenCrypto2/settings.gradle |
Removes module inclusion. |
mobile/BrokenCrypto2/gradle/wrapper/gradle-wrapper.properties |
Removes Gradle wrapper configuration. |
mobile/BrokenCrypto2/build.gradle |
Removes Android build configuration. |
mobile/BrokenCrypto2/app/src/main/res/values/dimens.xml |
Removes default dimensions. |
mobile/BrokenCrypto2/app/src/main/res/values-w820dp/dimens.xml |
Removes wide-screen dimensions. |
mobile/BrokenCrypto2/app/src/main/res/menu/menu_main.xml |
Removes menu resources. |
mobile/BrokenCrypto2/app/src/main/res/layout/splash.xml |
Removes splash layout. |
mobile/BrokenCrypto2/app/src/main/assets/key3 |
Removes challenge asset. |
mobile/BrokenCrypto2/app/src/main/assets/key2 |
Removes challenge asset. |
mobile/BrokenCrypto2/app/src/main/assets/key1 |
Removes challenge asset. |
mobile/BrokenCrypto2/app/src/androidTest/java/com/mobshep/brokencrypto2/ApplicationTest.java |
Removes instrumentation-test scaffold. |
mobile/BrokenCrypto2/app/.gitignore |
Removes app ignore rules. |
mobile/BrokenCrypto2/.gitignore |
Removes project ignore rules. |
mobile/BrokenCrypto1/settings.gradle |
Removes module inclusion. |
mobile/BrokenCrypto1/gradle/wrapper/gradle-wrapper.properties |
Removes Gradle wrapper configuration. |
mobile/BrokenCrypto1/build.gradle |
Removes Android build configuration. |
mobile/BrokenCrypto1/app/src/main/res/values/dimens.xml |
Removes default dimensions. |
mobile/BrokenCrypto1/app/src/main/res/values-w820dp/dimens.xml |
Removes wide-screen dimensions. |
mobile/BrokenCrypto1/app/src/main/res/menu/menu_main.xml |
Removes menu resources. |
mobile/BrokenCrypto1/app/src/main/res/layout/splash.xml |
Removes splash layout. |
mobile/BrokenCrypto1/app/src/main/assets/desKey |
Removes challenge asset. |
mobile/BrokenCrypto1/app/src/androidTest/java/com/mobshep/brokencrypto2/ApplicationTest.java |
Removes instrumentation-test scaffold. |
mobile/BrokenCrypto1/app/.gitignore |
Removes app ignore rules. |
mobile/BrokenCrypto1/.gitignore |
Removes project ignore rules. |
mobile/BrokenCrypto/settings.gradle |
Removes module inclusion. |
mobile/BrokenCrypto/gradle/wrapper/gradle-wrapper.properties |
Removes Gradle wrapper configuration. |
mobile/BrokenCrypto/build.gradle |
Removes Android build configuration. |
mobile/BrokenCrypto/app/src/main/res/values/dimens.xml |
Removes default dimensions. |
mobile/BrokenCrypto/app/src/main/res/values-v14/styles.xml |
Removes API-specific theme resources. |
mobile/BrokenCrypto/app/src/main/res/values-v11/styles.xml |
Removes API-specific theme resources. |
mobile/BrokenCrypto/app/src/main/res/values-sw720dp-land/dimens.xml |
Removes tablet-landscape dimensions. |
mobile/BrokenCrypto/app/src/main/res/values-sw600dp/dimens.xml |
Removes tablet resource scaffold. |
mobile/BrokenCrypto/app/src/main/res/layout/splash.xml |
Removes splash layout. |
mobile/BrokenCrypto/app/src/androidTest/java/com/mobshep/brokencrypto/ApplicationTest.java |
Removes instrumentation-test scaffold. |
mobile/BrokenCrypto/app/.gitignore |
Removes app ignore rules. |
mobile/BrokenCrypto/.gitignore |
Removes project ignore rules. |
Review effort: Balanced
ismisepaul
added this pull request to stack #943
October 22, 2026 21:01
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
PR 3 of the Jakarta migration stack (#861)
Stacked on
feat/jakarta-migration(integration branch, #881).What's in it
Re-sorts imports in 169 files with
mvn spotless:apply. The OpenRewrite rename (PR 2) leftjakarta.*imports wherejavax.*used to sort, which failslint-java. Import order only — zero non-import lines change.The
devsync that originally rode along here (and fixed the integration branch's brokenpom.xml: a duplicatemaven-resources-plugindeclaration and Spotless pinned back to 2.44.5) has since been merged directly intofeat/jakarta-migration, so it's no longer part of this diff.Expected CI state
lint-javashould pass.build/unit-tests/integration-testswill still fail at compile:ACS,Logout,SLSandSSOLoginpass jakarta requests tojava-saml2.9.0, which only acceptsjavax.servlettypes. That is fixed by PR 5 (SAML on pac4j) further up this stack.Stack
feat/jakarta-03-pom-fixfeat/jakarta-migrationfeat/jakarta-04-ee11-retargetfeat/jakarta-05-saml-pac4jfeat/jakarta-06-webxml-dockerfeat/jakarta-07-jsp-taglibsfeat/jakarta-08-docsPlease merge with a merge commit (not squash/rebase):
feat/*branches can't be force-pushed, so upper branches are kept current by merging rather than rebasing.Refs #861
🤖 Generated with Claude Code