Skip to content

gn-out-of-core-georchestra#329

Merged
f-necas merged 1 commit intogeorchestra-gn4.4.xfrom
gn-out-of-core-georchestra
Jun 19, 2025
Merged

gn-out-of-core-georchestra#329
f-necas merged 1 commit intogeorchestra-gn4.4.xfrom
gn-out-of-core-georchestra

Conversation

@f-necas
Copy link
Collaborator

@f-necas f-necas commented Jun 11, 2025

Implements georchestra/improvement-proposals#14 for GeoNetwork

geOrchestra/geonetwork checklist

What does this PR do?

  • PR only involves cherry-picked commits from upstream.
  • PR contains custom code which will soon be available in an upstream release and can be overriden => mention core-geonetwork version if possible.
  • PR contains custom geOrchestra code, which need to be verified during future migrations.

Makefile Outdated

docker:
cd web
../mvnw package docker:build -Pdocker -DdockerImageName=georchestra/geonetwork -DdockerImageTags=${BTAG},latest -DskipTests -ntp
Copy link
Member

Choose a reason for hiding this comment

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

docker:build not necessary anymore, as the build step from the docker maven plugin has been attached to the package phase, just activating the docker profile will make it:
https://github.com/georchestra/geonetwork/blob/georchestra-gn4.4.x/web/pom.xml#L1662-L1667

Copy link
Member

Choose a reason for hiding this comment

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

maybe we could do the same with the debian profile, in order to have a harmonized approach accross the build.

@f-necas f-necas force-pushed the gn-out-of-core-georchestra branch from 5c6ca8a to 402c5d8 Compare June 17, 2025 12:14
@f-necas f-necas requested a review from landryb June 18, 2025 14:31
<properties>
<rootProjectDir>${basedir}/..</rootProjectDir>
<georchestra.version>25.0.1-SNAPSHOT</georchestra.version>
<georchestra.version>24.0.11</georchestra.version>
Copy link
Member

@landryb landryb Jun 18, 2025

Choose a reason for hiding this comment

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

a bit concerned about that detail.. that means we cant use new features (in the commons jars etc) that would happen to be in the master branch ? in the past we've had branches per-georchestra-branch for that .. cf https://github.com/georchestra/geonetwork/branches & the georchestra-gn4.2.x-2xxx branches. that would also allow stable vs main/master. But i'm not sure that matters much, just thinking out loud what would happen if there were diverging stuff in the deps.

the PR's first comment could explain more what the general (laudable) goal of the PR is ;)

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

It must just be seen as a dependency. When I'll merge it, I'll will bump it to the latest stable version compatible : 25.0.0. After that we will have a dependabot or renovate who will propose us to bump it :)

Copy link
Member

Choose a reason for hiding this comment

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

sure, and i guess eventually branch this repo if some commits depend on something that isnt in the stable georchestra branch ?

@landryb
Copy link
Member

landryb commented Jun 18, 2025

on a general note i'm of course +1 with the PR ! :)

@f-necas f-necas force-pushed the gn-out-of-core-georchestra branch from 65e8b2d to 41e8ba0 Compare June 19, 2025 08:31
@f-necas f-necas merged commit a6f61ad into georchestra-gn4.4.x Jun 19, 2025
2 checks passed
@f-necas f-necas deleted the gn-out-of-core-georchestra branch June 19, 2025 09:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants