I merged the initial PR now that the proposal is approved and the RC is out.
- https://github.com/geoserver/geoserver/pull/6137 And tried the github resolves the conflict thing ... and now have regrests: 1. There was one conflict on one documentation page due to a new section on paramertized security 2. Resolving the conflict indicated it would be a commitment to main ... which I took to mean the PR would be merged... 3. The commit history locally shows two merge commits and everything seems okay... 4. However ... the commit history in github shows: - https://github.com/geoserver/geoserver/commit/2565aaaca34e652770e4d6077d20881f34762db8 clean merge commit updating the docs as expected - https://github.com/geoserver/geoserver/commit/261f221d455f71055faa1209411415a47cfd5b6a merge main into main? Showing no files changed locally; but many files changed in the github UI ... I am not sure what to make of it; and do not wish to revert; or force push; without a better understanding of what is going on. -- Jody -- Jody Garnett On Mon, 19 Sept 2022 at 14:29, Jody Garnett <jody.garn...@gmail.com> wrote: > Thanks Jukka, updated the page. > -- > Jody Garnett > > > On Mon, 19 Sept 2022 at 10:21, Rahkonen Jukka < > jukka.rahko...@maanmittauslaitos.fi> wrote: > >> Hi, >> >> >> >> I sent also my +1 that was meant to mean for 2.23 only on August 31. >> >> >> >> -Jukka- >> >> >> >> *Lähettäjä:* Jody Garnett <jody.garn...@gmail.com> >> *Lähetetty:* maanantai 19. syyskuuta 2022 19.06 >> *Vastaanottaja:* GeoServer <geoserver-devel@lists.sourceforge.net> >> *Aihe:* Re: [Geoserver-devel] GSIP-215 Drop Java 8 >> >> >> >> I think this proposal is now ready to be accepted? (Note it was updated >> to indicate 2.23.0 timeframe) >> >> >> >> Project Steering Committee: >> >> * Alessio Fabiani: >> * Andrea Aime: +1 (2.23.0 only) >> * Ian Turton: +1 (2.22.0 or 2.23.0) >> * Jody Garnett: +1 (2.22.0 or 2.23.0) >> * Jukka Rahkonen: >> * Kevin Smith: +1 >> * Simone Giannecchini: >> * Torben Barsballe: +1 >> * Nuno Oliveira: +1 >> >> Community support: >> >> * Fernando Mino: +1 >> >> >> -- >> >> Jody Garnett >> >> >> >> >> >> On Tue, 30 Aug 2022 at 11:14, Jody Garnett <jody.garn...@gmail.com> >> wrote: >> >> Please see https://github.com/geoserver/geoserver/wiki/GSIP-215 >> <https://eur06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fgeoserver%2Fgeoserver%2Fwiki%2FGSIP-215&data=05%7C01%7Cjukka.rahkonen%40maanmittauslaitos.fi%7C7510e1b877cf48e6919a08da9a590afe%7Cc4f8a63255804a1c92371d5a571b71fa%7C0%7C0%7C637992004474975321%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=QbEZTem54CnNZm59GpvWPLz7G6nKWeR8FJ19Rlg0BNY%3D&reserved=0> >> for details, general idea is to drop Java 8 support so we can update >> dependencies and plan Jakarta migration. >> >> >> >> Thanks to foss4g code sprint and Euan Mitchell for initial pull request >> for docs: >> >> - https://github.com/geoserver/geoserver/pull/6137 >> <https://eur06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fgeoserver%2Fgeoserver%2Fpull%2F6137&data=05%7C01%7Cjukka.rahkonen%40maanmittauslaitos.fi%7C7510e1b877cf48e6919a08da9a590afe%7Cc4f8a63255804a1c92371d5a571b71fa%7C0%7C0%7C637992004474975321%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=ZLh7BsgCQcwHjgdDujzxp%2BSl3ZHAZNqDjwo%2BAAROXWI%3D&reserved=0> >> >> >> >> >> If this proposal is ready for the 2.22.0 release it would simplify the >> process of setting up build jobs for the new release cycle. Vote early, >> vote often... >> >> -- >> >> Jody Garnett >> >>
_______________________________________________ Geoserver-devel mailing list Geoserver-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/geoserver-devel
