Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add space between type and variable #7663

Merged
merged 4 commits into from
May 21, 2024
Merged

Add space between type and variable #7663

merged 4 commits into from
May 21, 2024

Conversation

petersmythe
Copy link
Contributor

@petersmythe petersmythe commented May 19, 2024

Fixes: [storage.DefaultStorageFinder] - Found system environment variableGEOSERVER_DATA_DIR set to

Checklist

For core and extension modules:

  • New unit tests have been added covering the changes.
  • Documentation has been updated (if change is visible to end users).
  • The REST API docs have been updated (when changing configuration objects or the REST controllers).
  • There is an issue in the GeoServer Jira (except for changes that do not affect administrators or end users in any way).
  • Commit message(s) must be in the form [GEOS-XYZWV] Title of the Jira ticket.
  • Bug fixes and small new features are presented as a single commit.
  • Each commit has a single objective (if there are multiple commits, each has a separate JIRA ticket describing its goal).

Fixes: [storage.DefaultStorageFinder] - Found system environment variableGEOSERVER_DATA_DIR set to
Copy link
Contributor

@bradh bradh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@petersmythe petersmythe reopened this May 19, 2024
@petersmythe
Copy link
Contributor Author

Restarting failing tests

turingtestfail and others added 3 commits May 21, 2024 10:03
switched to text

actually xpath is better

community compile issue
Fixes: [storage.DefaultStorageFinder] - Found system environment variableGEOSERVER_DATA_DIR set to
@petersmythe petersmythe added backport 2.24.x Instructs the bot to create a 2.24.x backport PR on merge backport 2.25.x labels May 21, 2024
@petersmythe petersmythe merged commit a8d7a14 into main May 21, 2024
11 checks passed
@petersmythe petersmythe deleted the fix-log-spacing branch May 21, 2024 17:50
@aaime
Copy link
Member

aaime commented May 21, 2024

The backport to 2.24.x failed:

The process '/usr/bin/git' failed with exit code 1
stderr
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git cherry-pick --skip'

stdout
[backport-7663-to-2.24.x ffde91014f] Add space between type and variable Fixes: [storage.DefaultStorageFinder] - Found system environment variableGEOSERVER_DATA_DIR set to
 Author: Peter Smythe <peter@afrigis.co.za>
 Date: Sun May 19 12:43:20 2024 +0200
 1 file changed, 2 insertions(+), 2 deletions(-)
On branch backport-7663-to-2.24.x
You are currently cherry-picking commit 84663e54cf.
  (all conflicts fixed: run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

nothing to commit, working tree clean

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.24.x 2.24.x
# Navigate to the new working tree
cd .worktrees/backport-2.24.x
# Create a new branch
git switch --create backport-7663-to-2.24.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick b316ebfe5a4879705b7a2dd348c1ad44aab9ccff,4eae466f2b6d4428469f4cea42a7843fd2068f31,84663e54cfbb03320080660a109954d22a235bff,78f1df87695cb1ec38f782ea0276a82ec4166c57
# Push it to GitHub
git push --set-upstream origin backport-7663-to-2.24.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.24.x

Then, create a pull request where the base branch is 2.24.x and the compare/head branch is backport-7663-to-2.24.x.

@aaime
Copy link
Member

aaime commented May 21, 2024

The backport to 2.25.x failed:

The process '/usr/bin/git' failed with exit code 1
stderr
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git cherry-pick --skip'

stdout
[backport-7663-to-2.25.x e9c11dea03] Add space between type and variable Fixes: [storage.DefaultStorageFinder] - Found system environment variableGEOSERVER_DATA_DIR set to
 Author: Peter Smythe <peter@afrigis.co.za>
 Date: Sun May 19 12:43:20 2024 +0200
 1 file changed, 2 insertions(+), 2 deletions(-)
On branch backport-7663-to-2.25.x
You are currently cherry-picking commit 84663e54cf.
  (all conflicts fixed: run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

nothing to commit, working tree clean

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.25.x 2.25.x
# Navigate to the new working tree
cd .worktrees/backport-2.25.x
# Create a new branch
git switch --create backport-7663-to-2.25.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick b316ebfe5a4879705b7a2dd348c1ad44aab9ccff,4eae466f2b6d4428469f4cea42a7843fd2068f31,84663e54cfbb03320080660a109954d22a235bff,78f1df87695cb1ec38f782ea0276a82ec4166c57
# Push it to GitHub
git push --set-upstream origin backport-7663-to-2.25.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.25.x

Then, create a pull request where the base branch is 2.25.x and the compare/head branch is backport-7663-to-2.25.x.

@petersmythe
Copy link
Contributor Author

Manually done: #7670 & #7671

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.24.x Instructs the bot to create a 2.24.x backport PR on merge backport 2.25.x failed backport
Projects
None yet
4 participants