Skip to content

[GEOS-11582] The pgraster community module depends on imagemosaic-jdbc, no longer part of the codebase#8004

Merged
aaime merged 1 commit intogeoserver:mainfrom
aaime:pgraster_removal
Nov 25, 2024
Merged

[GEOS-11582] The pgraster community module depends on imagemosaic-jdbc, no longer part of the codebase#8004
aaime merged 1 commit intogeoserver:mainfrom
aaime:pgraster_removal

Conversation

@aaime
Copy link
Member

@aaime aaime commented Nov 3, 2024

Despite its name, the community module was just an easy to use facade to imagemosaic-jdbc... which has been removed
back in 2021. So, removing the community module, it has no chance of working.

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).

Copy link
Member

@groldan groldan left a comment

Choose a reason for hiding this comment

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

should also remove the pgraster profile from ./web/app/pom.xml

@aaime aaime merged commit d8842fe into geoserver:main Nov 25, 2024
@aaime aaime deleted the pgraster_removal branch November 25, 2024 12:00
@aaime aaime added backport 2.25.x Instructs the bot to create a 2.25.x backport PR on merge backport 2.26.x Instructs the bot to create a 2.26.x backport PR on merge labels Nov 25, 2024
@geoserver-bot
Copy link
Collaborator

The backport to 2.25.x failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 9766ba5e95... [GEOS-11582] The pgraster community module depends on imagemosaic-jdbc, no longer part of the codebase
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
Auto-merging doc/en/user/source/community/index.rst
Auto-merging doc/en/user/source/installation/docker.rst
CONFLICT (modify/delete): src/community/pgraster/pom.xml deleted in 9766ba5e95 ([GEOS-11582] The pgraster community module depends on imagemosaic-jdbc, no longer part of the codebase) and modified in HEAD.  Version HEAD of src/community/pgraster/pom.xml left in tree.
Auto-merging src/community/pom.xml
CONFLICT (content): Merge conflict in src/community/pom.xml
Auto-merging src/web/app/pom.xml

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-8004-to-2.25.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 9766ba5e95265b3de0ce4351d4f9b5c4f9d60bfa
# Push it to GitHub
git push --set-upstream origin backport-8004-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-8004-to-2.25.x.

@geoserver-bot
Copy link
Collaborator

The backport to 2.26.x failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 9766ba5e95... [GEOS-11582] The pgraster community module depends on imagemosaic-jdbc, no longer part of the codebase
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
CONFLICT (modify/delete): src/community/pgraster/pom.xml deleted in 9766ba5e95 ([GEOS-11582] The pgraster community module depends on imagemosaic-jdbc, no longer part of the codebase) and modified in HEAD.  Version HEAD of src/community/pgraster/pom.xml left in tree.
Auto-merging src/community/pom.xml
CONFLICT (content): Merge conflict in src/community/pom.xml
Auto-merging src/web/app/pom.xml

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.26.x 2.26.x
# Navigate to the new working tree
cd .worktrees/backport-2.26.x
# Create a new branch
git switch --create backport-8004-to-2.26.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 9766ba5e95265b3de0ce4351d4f9b5c4f9d60bfa
# Push it to GitHub
git push --set-upstream origin backport-8004-to-2.26.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.26.x

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 2.25.x Instructs the bot to create a 2.25.x backport PR on merge backport 2.26.x Instructs the bot to create a 2.26.x backport PR on merge failed backport

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants