[Geoserver-devel] Who force pushed to 2.12.x?

I’ve been seeing some errors today that suggest someone force pushed changes to the geoserver/2.12.x branch.
At first I though it was just my local state that was out of order, but I see similar issues on remote build servers. I’m also seeing some missing commits on 2.12.x (Things that were backported from master but are no longer there).

As far as I can tell, this happened sometime around October 19th - 25th. Anyone who commited to the branch in that range may want to double check the commit history, as no commits are showing up there anymore.

And as a reminder to everyone, NEVER force push to ANY release branch (master, 2.12,x, etc) on a repository you do not personally own.

Thanks,

Torben

Upon further investigation, it appears the following commits are now missing from 2.12.x (There may be more, these are just the ones I have been able to track down):

Based on the last commit in that tree that matches the current state of 2.12 (8e75e08) , It seems likely that the commit that was force pushed is 74e01ef. Alessio - any comments?

Torben

···

On Fri, Oct 27, 2017 at 3:48 PM, Torben Barsballe <tbarsballe@anonymised.com> wrote:

I’ve been seeing some errors today that suggest someone force pushed changes to the geoserver/2.12.x branch.
At first I though it was just my local state that was out of order, but I see similar issues on remote build servers. I’m also seeing some missing commits on 2.12.x (Things that were backported from master but are no longer there).

As far as I can tell, this happened sometime around October 19th - 25th. Anyone who commited to the branch in that range may want to double check the commit history, as no commits are showing up there anymore.

And as a reminder to everyone, NEVER force push to ANY release branch (master, 2.12,x, etc) on a repository you do not personally own.

Thanks,

Torben

I am picking through the Github events. The force-push happens on this page:
https://api.github.com/repos/geoserver/geoserver/events?page=3

This push resets the head of 2.12.x to the last common commit 8e75e0856a360798ca2bf2a09989ff799f981720 (this I think is the force push):

   {
     "id": "6763084956",
     "type": "PushEvent",
     "actor": {
       "id": 1278021,
       "login": "afabiani",
       "display_login": "afabiani",
       "gravatar_id": "",
       "url": "https://api.github.com/users/afabiani&quot;,
       "avatar_url": "https://avatars.githubusercontent.com/u/1278021?&quot;
     },
     "repo": {
       "id": 2751199,
       "name": "geoserver/geoserver",
       "url": "https://api.github.com/repos/geoserver/geoserver&quot;
     },
     "payload": {
       "push_id": 2075721342,
       "size": 0,
       "distinct_size": 0,
       "ref": "refs/heads/2.12.x",
       "head": "8e75e0856a360798ca2bf2a09989ff799f981720",
       "before": "601a842e661450c908b5821bc5ae606a19954f3b",
       "commits": [

       ]
     },
     "public": true,
     "created_at": "2017-10-25T10:13:09Z",
     "org": {
       "id": 186522,
       "login": "geoserver",
       "gravatar_id": "",
       "url": "https://api.github.com/orgs/geoserver&quot;,
       "avatar_url": "https://avatars.githubusercontent.com/u/186522?&quot;
     }
   },

On 28/10/17 12:05, Torben Barsballe wrote:

Upon further investigation, it appears the following commits are now
missing from 2.12.x (There may be more, these are just the ones I have been
able to track down):

    - 6544ca5
    <https://github.com/geoserver/geoserver/commit/6544ca542a0a8b19a6bf905777a636b4ecad3e48&gt;
    - 5fbe3a2
    <https://github.com/geoserver/geoserver/commit/5fbe3a21b0d5586996c908181b747e6b2eaf5789&gt;
    - e672ef0
    <https://github.com/geoserver/geoserver/commit/e672ef07d0fb33c957050a887e73be9de9443986&gt;
    - 8a1e06a
    <https://github.com/geoserver/geoserver/commit/8a1e06a418826bca527db0938dfbd204e2c2b470&gt;
    - 08c0d02
    <https://github.com/geoserver/geoserver/commit/08c0d024873a5810ea80dfcfdd4fc7a52f6b40d3&gt;
    - 05352fe
    <https://github.com/geoserver/geoserver/commit/05352fe7cec3b1ac8fcc4b7e144ed4aa78981748&gt;

Based on the last commit in that tree that matches the current state of
2.12 (8e75e08
<https://github.com/geoserver/geoserver/commit/8e75e0856a360798ca2bf2a09989ff799f981720&gt;\)
, It seems likely that the commit that was force pushed is 74e01ef
<https://github.com/geoserver/geoserver/commit/74e01efe27511faea96f680242a79e7fdcbfd311&gt;\.
Alessio - any comments?

Torben

On Fri, Oct 27, 2017 at 3:48 PM, Torben Barsballe <
tbarsballe@anonymised.com> wrote:

I've been seeing some errors today that suggest someone force pushed
changes to the geoserver/2.12.x branch.
At first I though it was just my local state that was out of order, but I
see similar issues on remote build servers. I'm also seeing some missing
commits on 2.12.x (Things that were backported from master but are no
longer there).

As far as I can tell, this happened sometime around October 19th - 25th.
Anyone who commited to the branch in that range may want to double check
the commit history, as no commits are showing up there anymore.

And as a reminder to everyone, NEVER force push to ANY release branch
(master, 2.12,x, etc) on a repository you do not personally own.

Thanks,

Torben

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot

_______________________________________________
Geoserver-devel mailing list
Geoserver-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geoserver-devel

--
Ben Caradoc-Davies <ben@anonymised.com>
Director
Transient Software Limited <http://transient.nz/&gt;
New Zealand

I have the following commits in my local repo (latest first). There are six substantive commits, and the last one is the common one we have in the current 2.12.x:

e9b63ca199d1d6d0b6d983965e4495c9f00bb568 (old_2.12.x) Fix link to uDig manual CQL page

6544ca542a0a8b19a6bf905777a636b4ecad3e48 [GEOS-8349] Monitor REST API won't return xml/json representation for request since 2.12.0

5fbe3a21b0d5586996c908181b747e6b2eaf5789 Updating Script REST API from Restlet to Spring MVC enabling this module to work with GeoServer's REST API.

e672ef07d0fb33c957050a887e73be9de9443986 [GEOS-8333] Reverting part of the previous change, as the SLD 1.1 encoder support is severely lacking at the moment

8a1e06a418826bca527db0938dfbd204e2c2b470 [GEOS-8333] Uploading a SLD 1.1 style over a SLD 1.0 style causes runtime parsing errors

08c0d024873a5810ea80dfcfdd4fc7a52f6b40d3 Merge pull request #2604 from emerkle826/geogig-config-npe-2.12

05352fe7cec3b1ac8fcc4b7e144ed4aa78981748 Fix an NPE when using the plugin in a GeoNode context

8e75e0856a360798ca2bf2a09989ff799f981720 Merge pull request #2601 from jdgarrett/fix_geogig_npe_2.12.x

You can see action in our Jenkins flight data recorder:

This is where my 2.12.x branch got to:
https://build.geoserver.org/view/geoserver/job/geoserver-2.12.x/35/changes

Two commits from Andrea that are I think now lost:
https://build.geoserver.org/view/geoserver/job/geoserver-2.12.x/36/changes

Five commits from Alessio that are I think now lost:
https://build.geoserver.org/view/geoserver/job/geoserver-2.12.x/37/changes
And another from Alessio, also lost, reverting one of the five:
https://build.geoserver.org/view/geoserver/job/geoserver-2.12.x/38/changes

And the first build after the force push:
https://build.geoserver.org/view/geoserver/job/geoserver-2.12.x/39/

So I think we can identify all the missing commits.

Kind regards,

--
Ben Caradoc-Davies <ben@anonymised.com>
Director
Transient Software Limited <http://transient.nz/&gt;
New Zealand

I have submitted a pull request:
https://github.com/geoserver/geoserver/pull/2613

This pull request contains:

- The six substantive commits on my local 2.12.x branch (listed earlier)

- Cherry-picked from master (I *assume* this was a straightforward cherry-pick to backport to 2.12.x): 9dfdf50de9094d778302be467bf11c334485515f [GEOS-8353] Ensure KML validates without being online.

I did *not* include:

Commit 3f472c02b06a7d13851ee9e8523684ca7b752397 by Andrea Aime
[GEOS-8360] xStream security warning

because I think it has already been cherry-picked onto the new 2.12.x as https://github.com/geoserver/geoserver/pull/2613.

This leaves only the changes listed in this Jenkins build:
https://build.geoserver.org/view/geoserver/job/geoserver-2.12.x/37/changes

Alessio, I do not know if you intended to remove these changes. Please re-apply them to 2.12.x if that was your intent.

Kind regards,

--
Ben Caradoc-Davies <ben@anonymised.com>
Director
Transient Software Limited <http://transient.nz/&gt;
New Zealand

Merged.

On 28/10/17 13:55, Ben Caradoc-Davies wrote:

I have submitted a pull request:
https://github.com/geoserver/geoserver/pull/2613

This pull request contains:

- The six substantive commits on my local 2.12.x branch (listed earlier)

- Cherry-picked from master (I *assume* this was a straightforward cherry-pick to backport to 2.12.x): 9dfdf50de9094d778302be467bf11c334485515f [GEOS-8353] Ensure KML validates without being online.

I did *not* include:

Commit 3f472c02b06a7d13851ee9e8523684ca7b752397 by Andrea Aime
[GEOS-8360] xStream security warning

because I think it has already been cherry-picked onto the new 2.12.x as https://github.com/geoserver/geoserver/pull/2613.

This leaves only the changes listed in this Jenkins build:
https://build.geoserver.org/view/geoserver/job/geoserver-2.12.x/37/changes

Alessio, I do not know if you intended to remove these changes. Please re-apply them to 2.12.x if that was your intent.

Kind regards,

--
Ben Caradoc-Davies <ben@anonymised.com>
Director
Transient Software Limited <http://transient.nz/&gt;
New Zealand

I am sure folks are aware but GitHub supports “protected branches” that outright disable force pushes. Extremely useful feature :slight_smile: Looking in github it looks like it was used in the past: master, and branches 2.5.x - 2.8.x are protected but no others are. Probably a useful thing to add to the process when creating a new maintenance branch would be to go into GitHub and add that branch as a protected one. It looks like it is possible to do it via the GitHub api as well, so also possible to add to the release scripts as well.

$0.02

On October 27, 2017 at 7:18:38 PM, Ben Caradoc-Davies (ben@anonymised.com) wrote:

Merged.

On 28/10/17 13:55, Ben Caradoc-Davies wrote:

I have submitted a pull request:
https://github.com/geoserver/geoserver/pull/2613

This pull request contains:

  • The six substantive commits on my local 2.12.x branch (listed earlier)

  • Cherry-picked from master (I assume this was a straightforward
    cherry-pick to backport to 2.12.x):
    9dfdf50de9094d778302be467bf11c334485515f [GEOS-8353] Ensure KML
    validates without being online.

I did not include:

Commit 3f472c02b06a7d13851ee9e8523684ca7b752397 by Andrea Aime
[GEOS-8360] xStream security warning

because I think it has already been cherry-picked onto the new 2.12.x as
https://github.com/geoserver/geoserver/pull/2613.

This leaves only the changes listed in this Jenkins build:
https://build.geoserver.org/view/geoserver/job/geoserver-2.12.x/37/changes

Alessio, I do not know if you intended to remove these changes. Please
re-apply them to 2.12.x if that was your intent.

Kind regards,


Ben Caradoc-Davies <ben@anonymised.com>
Director
Transient Software Limited <http://transient.nz/>
New Zealand


Check out the vibrant tech community on one of the world’s most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot


Geoserver-devel mailing list
Geoserver-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geoserver-devel

Outstanding! I am running amok enabling branch protection for all release branches. Just the basic protection, same as master, and we can turn it off if there are any unwanted side-effects.

While status checks and mandatory reviews may seem appealing, I am sure they would wear quite thin.

Kind regards,
Ben.

On 28/10/17 16:08, Justin Deoliveira wrote:

I am sure folks are aware but GitHub supports “protected branches” that
outright disable force pushes. Extremely useful feature :slight_smile: Looking in
github it looks like it was used in the past: master, and branches 2.5.x -
2.8.x are protected but no others are. Probably a useful thing to add to
the process when creating a new maintenance branch would be to go into
GitHub and add that branch as a protected one. It looks like it is possible
to do it via the GitHub api as well, so also possible to add to the release
scripts as well.

$0.02

On October 27, 2017 at 7:18:38 PM, Ben Caradoc-Davies (ben@anonymised.com)
wrote:

Merged.

On 28/10/17 13:55, Ben Caradoc-Davies wrote:

I have submitted a pull request:
https://github.com/geoserver/geoserver/pull/2613

This pull request contains:

- The six substantive commits on my local 2.12.x branch (listed earlier)

- Cherry-picked from master (I *assume* this was a straightforward
cherry-pick to backport to 2.12.x):
9dfdf50de9094d778302be467bf11c334485515f [GEOS-8353] Ensure KML
validates without being online.

I did *not* include:

Commit 3f472c02b06a7d13851ee9e8523684ca7b752397 by Andrea Aime
[GEOS-8360] xStream security warning

because I think it has already been cherry-picked onto the new 2.12.x as
https://github.com/geoserver/geoserver/pull/2613.

This leaves only the changes listed in this Jenkins build:
https://build.geoserver.org/view/geoserver/job/geoserver-2.12.x/37/changes

Alessio, I do not know if you intended to remove these changes. Please
re-apply them to 2.12.x if that was your intent.

Kind regards,

--
Ben Caradoc-Davies <ben@anonymised.com>
Director
Transient Software Limited <http://transient.nz/&gt;
New Zealand

I have also enabled basic branch protection on all GeoTools release branches (same as master). This prevents force pushes and deletion of these branches.

Yes, this should be part of our RC-release-create-new-stable-branch procedure for GeoTools and GeoServer. Branching is still a manual step so this will be as well. For example:
http://docs.geotools.org/latest/developer/procedures/release.html#if-you-are-cutting-the-first-rc-of-a-series-create-the-stable-branch

Any objections?

Kind regards,
Ben.

On 29/10/17 00:29, Ben Caradoc-Davies wrote:

Outstanding! I am running amok enabling branch protection for all release branches. Just the basic protection, same as master, and we can turn it off if there are any unwanted side-effects.

While status checks and mandatory reviews may seem appealing, I am sure they would wear quite thin.

Kind regards,
Ben.

On 28/10/17 16:08, Justin Deoliveira wrote:

I am sure folks are aware but GitHub supports “protected branches” that
outright disable force pushes. Extremely useful feature :slight_smile: Looking in
github it looks like it was used in the past: master, and branches 2.5.x -
2.8.x are protected but no others are. Probably a useful thing to add to
the process when creating a new maintenance branch would be to go into
GitHub and add that branch as a protected one. It looks like it is possible
to do it via the GitHub api as well, so also possible to add to the release
scripts as well.

$0.02

On October 27, 2017 at 7:18:38 PM, Ben Caradoc-Davies (ben@anonymised.com)
wrote:

Merged.

On 28/10/17 13:55, Ben Caradoc-Davies wrote:

I have submitted a pull request:
https://github.com/geoserver/geoserver/pull/2613

This pull request contains:

- The six substantive commits on my local 2.12.x branch (listed earlier)

- Cherry-picked from master (I *assume* this was a straightforward
cherry-pick to backport to 2.12.x):
9dfdf50de9094d778302be467bf11c334485515f [GEOS-8353] Ensure KML
validates without being online.

I did *not* include:

Commit 3f472c02b06a7d13851ee9e8523684ca7b752397 by Andrea Aime
[GEOS-8360] xStream security warning

because I think it has already been cherry-picked onto the new 2.12.x as
https://github.com/geoserver/geoserver/pull/2613.

This leaves only the changes listed in this Jenkins build:
https://build.geoserver.org/view/geoserver/job/geoserver-2.12.x/37/changes

Alessio, I do not know if you intended to remove these changes. Please
re-apply them to 2.12.x if that was your intent.

Kind regards,

--
Ben Caradoc-Davies <ben@anonymised.com>
Director
Transient Software Limited <http://transient.nz/&gt;
New Zealand

Hi Justin,
I remember that, it happened after another forced push… and thought we protected all branches from
forced pushes?
I guess that this actually needs to be done manually for each newly created branch eh?

Cheers
Andrea

···

On Sat, Oct 28, 2017 at 5:08 AM, Justin Deoliveira <jdeolive@anonymised.com> wrote:

I am sure folks are aware but GitHub supports “protected branches” that outright disable force pushes. Extremely useful feature :slight_smile: Looking in github it looks like it was used in the past: master, and branches 2.5.x - 2.8.x are protected but no others are. Probably a useful thing to add to the process when creating a new maintenance branch would be to go into GitHub and add that branch as a protected one. It looks like it is possible to do it via the GitHub api as well, so also possible to add to the release scripts as well.

$0.02

On October 27, 2017 at 7:18:38 PM, Ben Caradoc-Davies (ben@anonymised.com) wrote:

Merged.

On 28/10/17 13:55, Ben Caradoc-Davies wrote:

I have submitted a pull request:
https://github.com/geoserver/geoserver/pull/2613

This pull request contains:

  • The six substantive commits on my local 2.12.x branch (listed earlier)

  • Cherry-picked from master (I assume this was a straightforward
    cherry-pick to backport to 2.12.x):
    9dfdf50de9094d778302be467bf11c334485515f [GEOS-8353] Ensure KML
    validates without being online.

I did not include:

Commit 3f472c02b06a7d13851ee9e8523684ca7b752397 by Andrea Aime
[GEOS-8360] xStream security warning

because I think it has already been cherry-picked onto the new 2.12.x as
https://github.com/geoserver/geoserver/pull/2613.

This leaves only the changes listed in this Jenkins build:
https://build.geoserver.org/view/geoserver/job/geoserver-2.12.x/37/changes

Alessio, I do not know if you intended to remove these changes. Please
re-apply them to 2.12.x if that was your intent.

Kind regards,


Ben Caradoc-Davies <ben@anonymised.com>
Director
Transient Software Limited <http://transient.nz/>
New Zealand


Check out the vibrant tech community on one of the world’s most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot


Geoserver-devel mailing list
Geoserver-devel@anonymised.comsourceforge.net
https://lists.sourceforge.net/lists/listinfo/geoserver-devel

Regards,

Andrea Aime

==
GeoServer Professional Services from the experts! Visit http://goo.gl/it488V for more information.

Ing. Andrea Aime
@geowolf
Technical Lead

GeoSolutions S.A.S.
Via di Montramito 3/A
55054 Massarosa (LU)
phone: +39 0584 962313
fax: +39 0584 1660272
mob: +39 339 8844549

http://www.geo-solutions.it
http://twitter.com/geosolutions_it

AVVERTENZE AI SENSI DEL D.Lgs. 196/2003

Le informazioni contenute in questo messaggio di posta elettronica e/o nel/i file/s allegato/i sono da considerarsi strettamente riservate. Il loro utilizzo è consentito esclusivamente al destinatario del messaggio, per le finalità indicate nel messaggio stesso. Qualora riceviate questo messaggio senza esserne il destinatario, Vi preghiamo cortesemente di darcene notizia via e-mail e di procedere alla distruzione del messaggio stesso, cancellandolo dal Vostro sistema. Conservare il messaggio stesso, divulgarlo anche in parte, distribuirlo ad altri soggetti, copiarlo, od utilizzarlo per finalità diverse, costituisce comportamento contrario ai principi dettati dal D.Lgs. 196/2003.

The information in this message and/or attachments, is intended solely for the attention and use of the named addressee(s) and may be confidential or proprietary in nature or covered by the provisions of privacy act (Legislative Decree June, 30 2003, no.196 - Italy’s New Data Protection Code).Any use not in accord with its purpose, any disclosure, reproduction, copying, distribution, or either dissemination, either whole or partial, is strictly forbidden except previous formal approval of the named addressee(s). If you are not the intended recipient, please contact immediately the sender by telephone, fax or e-mail and delete the information in this message that has been received in error. The sender does not give any warranty or accept liability as the content, accuracy or completeness of sent messages and accepts no responsibility for changes made after they were sent or for other risks which arise as a result of e-mail transmission, viruses, etc.

On Sat, Oct 28, 2017 at 1:43 PM, Ben Caradoc-Davies <ben@anonymised.com>
wrote:

I have also enabled basic branch protection on all GeoTools release
branches (same as master). This prevents force pushes and deletion of these
branches.

Awesome, thanks for doing that.

Yes, this should be part of our RC-release-create-new-stable-branch
procedure for GeoTools and GeoServer. Branching is still a manual step so
this will be as well. For example:
http://docs.geotools.org/latest/developer/procedures/release
.html#if-you-are-cutting-the-first-rc-of-a-series-create-the-stable-branch

Yep, agreed it should be part of the release process.

Cheers
Andrea

--

Regards,

Andrea Aime

==
GeoServer Professional Services from the experts! Visit http://goo.gl/it488V
for more information.

Ing. Andrea Aime
@geowolf
Technical Lead

GeoSolutions S.A.S.
Via di Montramito 3/A
55054 Massarosa (LU)
phone: +39 0584 962313
fax: +39 0584 1660272
mob: +39 339 8844549

http://www.geo-solutions.it
http://twitter.com/geosolutions_it

AVVERTENZE AI SENSI DEL D.Lgs. 196/2003

Le informazioni contenute in questo messaggio di posta elettronica e/o
nel/i file/s allegato/i sono da considerarsi strettamente riservate. Il
loro utilizzo è consentito esclusivamente al destinatario del messaggio,
per le finalità indicate nel messaggio stesso. Qualora riceviate questo
messaggio senza esserne il destinatario, Vi preghiamo cortesemente di
darcene notizia via e-mail e di procedere alla distruzione del messaggio
stesso, cancellandolo dal Vostro sistema. Conservare il messaggio stesso,
divulgarlo anche in parte, distribuirlo ad altri soggetti, copiarlo, od
utilizzarlo per finalità diverse, costituisce comportamento contrario ai
principi dettati dal D.Lgs. 196/2003.

The information in this message and/or attachments, is intended solely for
the attention and use of the named addressee(s) and may be confidential or
proprietary in nature or covered by the provisions of privacy act
(Legislative Decree June, 30 2003, no.196 - Italy's New Data Protection
Code).Any use not in accord with its purpose, any disclosure, reproduction,
copying, distribution, or either dissemination, either whole or partial, is
strictly forbidden except previous formal approval of the named
addressee(s). If you are not the intended recipient, please contact
immediately the sender by telephone, fax or e-mail and delete the
information in this message that has been received in error. The sender
does not give any warranty or accept liability as the content, accuracy or
completeness of sent messages and accepts no responsibility for changes
made after they were sent or for other risks which arise as a result of
e-mail transmission, viruses, etc.

On 29/10/17 01:50, Andrea Aime wrote:

On Sat, Oct 28, 2017 at 1:43 PM, Ben Caradoc-Davies <ben@anonymised.com>
wrote:

I have also enabled basic branch protection on all GeoTools release
branches (same as master). This prevents force pushes and deletion of these
branches.

Awesome, thanks for doing that.

Yes, this should be part of our RC-release-create-new-stable-branch
procedure for GeoTools and GeoServer. Branching is still a manual step so
this will be as well. For example:
http://docs.geotools.org/latest/developer/procedures/release
.html#if-you-are-cutting-the-first-rc-of-a-series-create-the-stable-branch

Yep, agreed it should be part of the release process.

Done.

Kind regards,

--
Ben Caradoc-Davies <ben@anonymised.com>
Director
Transient Software Limited <http://transient.nz/&gt;
New Zealand

It seems it was my fault. I only remember to have reverted a wrong commit, did not want to do a push force. It was a mistake.

Protecting branches for sure is the best way to avoid similar mistakes in the future. Please let me know if I can do something else.

···

On Sun, Oct 29, 2017 at 12:05 AM, Ben Caradoc-Davies <ben@anonymised.com> wrote:

On 29/10/17 01:50, Andrea Aime wrote:

On Sat, Oct 28, 2017 at 1:43 PM, Ben Caradoc-Davies <ben@anonymised.com>
wrote:

I have also enabled basic branch protection on all GeoTools release
branches (same as master). This prevents force pushes and deletion of these
branches.

Awesome, thanks for doing that.

Yes, this should be part of our RC-release-create-new-stable-branch
procedure for GeoTools and GeoServer. Branching is still a manual step so
this will be as well. For example:
http://docs.geotools.org/latest/developer/procedures/release
.html#if-you-are-cutting-the-first-rc-of-a-series-create-the-stable-branch

Yep, agreed it should be part of the release process.

Done.

Kind regards,


Ben Caradoc-Davies <ben@anonymised.com>
Director
Transient Software Limited <http://transient.nz/>
New Zealand


Check out the vibrant tech community on one of the world’s most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot


GeoTools-Devel mailing list
GeoTools-Devel@anonymised.comge.net
https://lists.sourceforge.net/lists/listinfo/geotools-devel

Regards,

Alessio Fabiani

==
GeoServer Professional Services from the experts! Visit http://goo.gl/it488V for more information.

Ing. Alessio Fabiani

@alfa7691
Founder/Technical Lead

GeoSolutions S.A.S.
Via di Montramito 3/A
55054 Massarosa (LU)
Italy
phone: +39 0584 962313
fax: +39 0584 1660272
mob: +39 331 6233686

http://www.geo-solutions.it
http://twitter.com/geosolutions_it


AVVERTENZE AI SENSI DEL D.Lgs. 196/2003

Le informazioni contenute in questo messaggio di posta elettronica e/o nel/i file/s allegato/i sono da considerarsi strettamente riservate. Il loro utilizzo è consentito esclusivamente al destinatario del messaggio, per le finalità indicate nel messaggio stesso. Qualora riceviate questo messaggio senza esserne il destinatario, Vi preghiamo cortesemente di darcene notizia via e-mail e di procedere alla distruzione del messaggio stesso, cancellandolo dal Vostro sistema. Conservare il messaggio stesso, divulgarlo anche in parte, distribuirlo ad altri soggetti, copiarlo, od utilizzarlo per finalità diverse, costituisce comportamento contrario ai principi dettati dal D.Lgs. 196/2003.

The information in this message and/or attachments, is intended solely for the attention and use of the named addressee(s) and may be confidential or proprietary in nature or covered by the provisions of privacy act (Legislative Decree June, 30 2003, no.196 - Italy’s New Data Protection Code).Any use not in accord with its purpose, any disclosure, reproduction, copying, distribution, or either dissemination, either whole or partial, is strictly forbidden except previous formal approval of the named addressee(s). If you are not the intended recipient, please contact immediately the sender by telephone, fax or e-mail and delete the information in this message that has been received in error. The sender does not give any warranty or accept liability as the content, accuracy or completeness of sent messages and accepts no responsibility for changes made after they were sent or for other risks which arise as a result of e-mail transmission, viruses, etc.

No problem, Alessio. You are not the first (or even the third) to force-push, and we now have the safety catch we need: branch protection.

There are five commits of yours that were on 2.12.x but were removed by your force push and have not yet been restored. I do not have these commits, and I was not sure if you removed any of these intentionally. Conveniently, these five commits are listed in a single Jenkins job:
https://build.geoserver.org/view/geoserver/job/geoserver-2.12.x/37/changes

Please review these missing commits and apply those that you would like to keep to the 2.12.x branch.

Kind regards,
Ben.

On 30/10/17 22:03, Alessio Fabiani wrote:

It seems it was my fault. I only remember to have reverted a wrong commit,
did not want to do a push force. It was a mistake.

Protecting branches for sure is the best way to avoid similar mistakes in
the future. Please let me know if I can do something else.

Regards,

Alessio Fabiani

==
GeoServer Professional Services from the experts! Visit http://goo.gl/it488V
for more information.

Ing. Alessio Fabiani

@alfa7691
Founder/Technical Lead

GeoSolutions S.A.S.
Via di Montramito 3/A
55054 Massarosa (LU)
Italy
phone: +39 0584 962313
fax: +39 0584 1660272
mob: +39 331 6233686

http://www.geo-solutions.it
http://twitter.com/geosolutions_it

-------------------------------------------------------

AVVERTENZE AI SENSI DEL D.Lgs. 196/2003

Le informazioni contenute in questo messaggio di posta elettronica e/o
nel/i file/s allegato/i sono da considerarsi strettamente riservate. Il
loro utilizzo è consentito esclusivamente al destinatario del messaggio,
per le finalità indicate nel messaggio stesso. Qualora riceviate questo
messaggio senza esserne il destinatario, Vi preghiamo cortesemente di
darcene notizia via e-mail e di procedere alla distruzione del messaggio
stesso, cancellandolo dal Vostro sistema. Conservare il messaggio stesso,
divulgarlo anche in parte, distribuirlo ad altri soggetti, copiarlo, od
utilizzarlo per finalità diverse, costituisce comportamento contrario ai
principi dettati dal D.Lgs. 196/2003.

The information in this message and/or attachments, is intended solely for
the attention and use of the named addressee(s) and may be confidential or
proprietary in nature or covered by the provisions of privacy act
(Legislative Decree June, 30 2003, no.196 - Italy's New Data Protection
Code).Any use not in accord with its purpose, any disclosure, reproduction,
copying, distribution, or either dissemination, either whole or partial, is
strictly forbidden except previous formal approval of the named
addressee(s). If you are not the intended recipient, please contact
immediately the sender by telephone, fax or e-mail and delete the
information in this message that has been received in error. The sender
does not give any warranty or accept liability as the content, accuracy or
completeness of sent messages and accepts no responsibility for changes
made after they were sent or for other risks which arise as a result of
e-mail transmission, viruses, etc.

On Sun, Oct 29, 2017 at 12:05 AM, Ben Caradoc-Davies <ben@anonymised.com>
wrote:

On 29/10/17 01:50, Andrea Aime wrote:

On Sat, Oct 28, 2017 at 1:43 PM, Ben Caradoc-Davies <ben@anonymised.com>
wrote:

I have also enabled basic branch protection on all GeoTools release
branches (same as master). This prevents force pushes and deletion of
these
branches.

Awesome, thanks for doing that.

Yes, this should be part of our RC-release-create-new-stable-branch
procedure for GeoTools and GeoServer. Branching is still a manual step so
this will be as well. For example:
http://docs.geotools.org/latest/developer/procedures/release
.html#if-you-are-cutting-the-first-rc-of-a-series-create-the
-stable-branch

Yep, agreed it should be part of the release process.

Done.

Kind regards,

--
Ben Caradoc-Davies <ben@anonymised.com>
Director
Transient Software Limited <http://transient.nz/&gt;
New Zealand

------------------------------------------------------------
------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
GeoTools-Devel mailing list
GeoTools-Devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geotools-devel

--
Ben Caradoc-Davies <ben@anonymised.com>
Director
Transient Software Limited <http://transient.nz/&gt;
New Zealand

We already had protection on 1.11.x and master for GWC but this reminded
me to add 1.12.x

I need to look into whether there's a way to automate this as part of
the GWC release script when it generates a new stable branch.

On 2017-10-28 04:43 AM, Ben Caradoc-Davies wrote:

I have also enabled basic branch protection on all GeoTools release
branches (same as master). This prevents force pushes and deletion of
these branches.

Yes, this should be part of our RC-release-create-new-stable-branch
procedure for GeoTools and GeoServer. Branching is still a manual step
so this will be as well. For example:
http://docs.geotools.org/latest/developer/procedures/release.html#if-you-are-cutting-the-first-rc-of-a-series-create-the-stable-branch

Any objections?

Kind regards,
Ben.

On 29/10/17 00:29, Ben Caradoc-Davies wrote:

Outstanding! I am running amok enabling branch protection for all
release branches. Just the basic protection, same as master, and we
can turn it off if there are any unwanted side-effects.

While status checks and mandatory reviews may seem appealing, I am
sure they would wear quite thin.

Kind regards,
Ben.

On 28/10/17 16:08, Justin Deoliveira wrote:

I am sure folks are aware but GitHub supports “protected branches” that
outright disable force pushes. Extremely useful feature :slight_smile: Looking in
github it looks like it was used in the past: master, and branches
2.5.x -
2.8.x are protected but no others are. Probably a useful thing to
add to
the process when creating a new maintenance branch would be to go into
GitHub and add that branch as a protected one. It looks like it is
possible
to do it via the GitHub api as well, so also possible to add to the
release
scripts as well.

$0.02

On October 27, 2017 at 7:18:38 PM, Ben Caradoc-Davies
(ben@anonymised.com)
wrote:

Merged.

On 28/10/17 13:55, Ben Caradoc-Davies wrote:

I have submitted a pull request:
https://github.com/geoserver/geoserver/pull/2613

This pull request contains:

- The six substantive commits on my local 2.12.x branch (listed
earlier)

- Cherry-picked from master (I *assume* this was a straightforward
cherry-pick to backport to 2.12.x):
9dfdf50de9094d778302be467bf11c334485515f [GEOS-8353] Ensure KML
validates without being online.

I did *not* include:

Commit 3f472c02b06a7d13851ee9e8523684ca7b752397 by Andrea Aime
[GEOS-8360] xStream security warning

because I think it has already been cherry-picked onto the new
2.12.x as
https://github.com/geoserver/geoserver/pull/2613.

This leaves only the changes listed in this Jenkins build:
https://build.geoserver.org/view/geoserver/job/geoserver-2.12.x/37/changes

Alessio, I do not know if you intended to remove these changes. Please
re-apply them to 2.12.x if that was your intent.

Kind regards,

--
Kevin Michael Smith
<smithkm@anonymised.com>