Proposal to remove the ISO19115-3 git submodule from 3.10.x branch and add it as part of the branch

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
6 messages Options
Reply | Threaded
Open this post in threaded view
|

Proposal to remove the ISO19115-3 git submodule from 3.10.x branch and add it as part of the branch

Jose Garcia
Hi

Currently we have the ISO19115-3 schema in master as part of the branch and in 3.10.x still it's a submodule.

This makes it difficult to cherry-pick commits from master involving changes to the ISO19115-3 schema. Some of the changes involve only code in that schema, so are quite isolated, but other changes also affect other modules making the backports a bit more complicated.

Are there any concerns about removing the ISO19115-3 submodule from 3.10.x and managing it as part of the branch as in master.

Regards,
Jose García
--
Vriendelijke groeten / Kind regards,

Jose García


Veenderweg 13
6721 WD Bennekom
The Netherlands
T: <a href="tel:+31318416664" style="font-family:Helvetica,Arial,sans-serif" target="_blank">+31 (0)318 416664

Please consider the environment before printing this email.


_______________________________________________
GeoNetwork-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/geonetwork-devel
GeoNetwork OpenSource is maintained at http://sourceforge.net/projects/geonetwork
Reply | Threaded
Open this post in threaded view
|

Re: Proposal to remove the ISO19115-3 git submodule from 3.10.x branch and add it as part of the branch

Francois Prunayre
FIne for me Jose.

Francois

Le lun. 21 sept. 2020 à 11:21, Jose Garcia <[hidden email]> a écrit :
Hi

Currently we have the ISO19115-3 schema in master as part of the branch and in 3.10.x still it's a submodule.

This makes it difficult to cherry-pick commits from master involving changes to the ISO19115-3 schema. Some of the changes involve only code in that schema, so are quite isolated, but other changes also affect other modules making the backports a bit more complicated.

Are there any concerns about removing the ISO19115-3 submodule from 3.10.x and managing it as part of the branch as in master.

Regards,
Jose García
--
Vriendelijke groeten / Kind regards,

Jose García


Veenderweg 13
6721 WD Bennekom
The Netherlands
T: <a href="tel:+31318416664" style="font-family:Helvetica,Arial,sans-serif" target="_blank">+31 (0)318 416664

Please consider the environment before printing this email.
_______________________________________________
GeoNetwork-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/geonetwork-devel
GeoNetwork OpenSource is maintained at http://sourceforge.net/projects/geonetwork


_______________________________________________
GeoNetwork-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/geonetwork-devel
GeoNetwork OpenSource is maintained at http://sourceforge.net/projects/geonetwork
Reply | Threaded
Open this post in threaded view
|

Re: Proposal to remove the ISO19115-3 git submodule from 3.10.x branch and add it as part of the branch

jody.garnett
I think it is a great idea :)

Any chance we could change the schema version to 3.10.x while we do this? It would help allowing things like https://github.com/GeoCat/experiment-hnap to build straight from the maven repository without having to build geonetwork locally.
--
Jody Garnett

On Mon, 21 Sep 2020 at 02:27, Francois Prunayre <[hidden email]> wrote:
FIne for me Jose.

Francois

Le lun. 21 sept. 2020 à 11:21, Jose Garcia <[hidden email]> a écrit :
Hi

Currently we have the ISO19115-3 schema in master as part of the branch and in 3.10.x still it's a submodule.

This makes it difficult to cherry-pick commits from master involving changes to the ISO19115-3 schema. Some of the changes involve only code in that schema, so are quite isolated, but other changes also affect other modules making the backports a bit more complicated.

Are there any concerns about removing the ISO19115-3 submodule from 3.10.x and managing it as part of the branch as in master.

Regards,
Jose García
--
Vriendelijke groeten / Kind regards,

Jose García


Veenderweg 13
6721 WD Bennekom
The Netherlands
T: <a href="tel:+31318416664" style="font-family:Helvetica,Arial,sans-serif" target="_blank">+31 (0)318 416664

Please consider the environment before printing this email.
_______________________________________________
GeoNetwork-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/geonetwork-devel
GeoNetwork OpenSource is maintained at http://sourceforge.net/projects/geonetwork
_______________________________________________
GeoNetwork-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/geonetwork-devel
GeoNetwork OpenSource is maintained at http://sourceforge.net/projects/geonetwork


_______________________________________________
GeoNetwork-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/geonetwork-devel
GeoNetwork OpenSource is maintained at http://sourceforge.net/projects/geonetwork
Reply | Threaded
Open this post in threaded view
|

Re: Proposal to remove the ISO19115-3 git submodule from 3.10.x branch and add it as part of the branch

Jose Garcia
Hi

Nice, Jody is going to manage this for the 3.10.x branch, removing the submodule and copying the code for iso19115-3 from GeoNetwork master branch as it has been getting updates after the submodule was abandoned.

Regards,
Jose García

On Mon, Sep 21, 2020 at 8:05 PM Jody Garnett <[hidden email]> wrote:
I think it is a great idea :)

Any chance we could change the schema version to 3.10.x while we do this? It would help allowing things like https://github.com/GeoCat/experiment-hnap to build straight from the maven repository without having to build geonetwork locally.
--
Jody Garnett

On Mon, 21 Sep 2020 at 02:27, Francois Prunayre <[hidden email]> wrote:
FIne for me Jose.

Francois

Le lun. 21 sept. 2020 à 11:21, Jose Garcia <[hidden email]> a écrit :
Hi

Currently we have the ISO19115-3 schema in master as part of the branch and in 3.10.x still it's a submodule.

This makes it difficult to cherry-pick commits from master involving changes to the ISO19115-3 schema. Some of the changes involve only code in that schema, so are quite isolated, but other changes also affect other modules making the backports a bit more complicated.

Are there any concerns about removing the ISO19115-3 submodule from 3.10.x and managing it as part of the branch as in master.

Regards,
Jose García
--
Vriendelijke groeten / Kind regards,

Jose García


Veenderweg 13
6721 WD Bennekom
The Netherlands
T: <a href="tel:+31318416664" style="font-family:Helvetica,Arial,sans-serif" target="_blank">+31 (0)318 416664

Please consider the environment before printing this email.
_______________________________________________
GeoNetwork-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/geonetwork-devel
GeoNetwork OpenSource is maintained at http://sourceforge.net/projects/geonetwork
_______________________________________________
GeoNetwork-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/geonetwork-devel
GeoNetwork OpenSource is maintained at http://sourceforge.net/projects/geonetwork


--
Vriendelijke groeten / Kind regards,

Jose García


Veenderweg 13
6721 WD Bennekom
The Netherlands
T: <a href="tel:+31318416664" style="font-family:Helvetica,Arial,sans-serif" target="_blank">+31 (0)318 416664

Please consider the environment before printing this email.


_______________________________________________
GeoNetwork-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/geonetwork-devel
GeoNetwork OpenSource is maintained at http://sourceforge.net/projects/geonetwork
Reply | Threaded
Open this post in threaded view
|

Re: Proposal to remove the ISO19115-3 git submodule from 3.10.x branch and add it as part of the branch

jody.garnett
Here is the PR for 3.10.x:

I also noted some changes to the README.md so there is a PR for master:

--
Jody Garnett


On Tue, 22 Sep 2020 at 08:20, Jose Garcia <[hidden email]> wrote:
Hi

Nice, Jody is going to manage this for the 3.10.x branch, removing the submodule and copying the code for iso19115-3 from GeoNetwork master branch as it has been getting updates after the submodule was abandoned.

Regards,
Jose García

On Mon, Sep 21, 2020 at 8:05 PM Jody Garnett <[hidden email]> wrote:
I think it is a great idea :)

Any chance we could change the schema version to 3.10.x while we do this? It would help allowing things like https://github.com/GeoCat/experiment-hnap to build straight from the maven repository without having to build geonetwork locally.
--
Jody Garnett

On Mon, 21 Sep 2020 at 02:27, Francois Prunayre <[hidden email]> wrote:
FIne for me Jose.

Francois

Le lun. 21 sept. 2020 à 11:21, Jose Garcia <[hidden email]> a écrit :
Hi

Currently we have the ISO19115-3 schema in master as part of the branch and in 3.10.x still it's a submodule.

This makes it difficult to cherry-pick commits from master involving changes to the ISO19115-3 schema. Some of the changes involve only code in that schema, so are quite isolated, but other changes also affect other modules making the backports a bit more complicated.

Are there any concerns about removing the ISO19115-3 submodule from 3.10.x and managing it as part of the branch as in master.

Regards,
Jose García
--
Vriendelijke groeten / Kind regards,

Jose García


Veenderweg 13
6721 WD Bennekom
The Netherlands
T: <a href="tel:+31318416664" style="font-family:Helvetica,Arial,sans-serif" target="_blank">+31 (0)318 416664

Please consider the environment before printing this email.
_______________________________________________
GeoNetwork-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/geonetwork-devel
GeoNetwork OpenSource is maintained at http://sourceforge.net/projects/geonetwork
_______________________________________________
GeoNetwork-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/geonetwork-devel
GeoNetwork OpenSource is maintained at http://sourceforge.net/projects/geonetwork


--
Vriendelijke groeten / Kind regards,

Jose García


Veenderweg 13
6721 WD Bennekom
The Netherlands
T: <a href="tel:+31318416664" style="font-family:Helvetica,Arial,sans-serif" target="_blank">+31 (0)318 416664

Please consider the environment before printing this email.


_______________________________________________
GeoNetwork-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/geonetwork-devel
GeoNetwork OpenSource is maintained at http://sourceforge.net/projects/geonetwork
Reply | Threaded
Open this post in threaded view
|

Re: Proposal to remove the ISO19115-3 git submodule from 3.10.x branch and add it as part of the branch

jody.garnett
Reminder with this change I am reposting these instructions:

If you update with git pull you will get the following error:

From github.com:geonetwork/core-geonetwork
 * branch                  master     -> FETCH_HEAD
 = [up to date]            master     -> upstream/master
error: The following untracked working tree files would be overwritten by merge:
schemas/iso19115-3.2018/ISO19115-3-2014-to-ISO19115-3-2018.xsl
schemas/iso19115-3.2018/ISO19139-to-ISO19115-3-2018.xsl

Here is how to update:

cd schemas
rm -r iso19115-3.2018
git pull
git checkout .
--
Jody Garnett


On Tue, 22 Sep 2020 at 10:54, Jody Garnett <[hidden email]> wrote:
Here is the PR for 3.10.x:

I also noted some changes to the README.md so there is a PR for master:

--
Jody Garnett


On Tue, 22 Sep 2020 at 08:20, Jose Garcia <[hidden email]> wrote:
Hi

Nice, Jody is going to manage this for the 3.10.x branch, removing the submodule and copying the code for iso19115-3 from GeoNetwork master branch as it has been getting updates after the submodule was abandoned.

Regards,
Jose García

On Mon, Sep 21, 2020 at 8:05 PM Jody Garnett <[hidden email]> wrote:
I think it is a great idea :)

Any chance we could change the schema version to 3.10.x while we do this? It would help allowing things like https://github.com/GeoCat/experiment-hnap to build straight from the maven repository without having to build geonetwork locally.
--
Jody Garnett

On Mon, 21 Sep 2020 at 02:27, Francois Prunayre <[hidden email]> wrote:
FIne for me Jose.

Francois

Le lun. 21 sept. 2020 à 11:21, Jose Garcia <[hidden email]> a écrit :
Hi

Currently we have the ISO19115-3 schema in master as part of the branch and in 3.10.x still it's a submodule.

This makes it difficult to cherry-pick commits from master involving changes to the ISO19115-3 schema. Some of the changes involve only code in that schema, so are quite isolated, but other changes also affect other modules making the backports a bit more complicated.

Are there any concerns about removing the ISO19115-3 submodule from 3.10.x and managing it as part of the branch as in master.

Regards,
Jose García
--
Vriendelijke groeten / Kind regards,

Jose García


Veenderweg 13
6721 WD Bennekom
The Netherlands
T: <a href="tel:+31318416664" style="font-family:Helvetica,Arial,sans-serif" target="_blank">+31 (0)318 416664

Please consider the environment before printing this email.
_______________________________________________
GeoNetwork-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/geonetwork-devel
GeoNetwork OpenSource is maintained at http://sourceforge.net/projects/geonetwork
_______________________________________________
GeoNetwork-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/geonetwork-devel
GeoNetwork OpenSource is maintained at http://sourceforge.net/projects/geonetwork


--
Vriendelijke groeten / Kind regards,

Jose García


Veenderweg 13
6721 WD Bennekom
The Netherlands
T: <a href="tel:+31318416664" style="font-family:Helvetica,Arial,sans-serif" target="_blank">+31 (0)318 416664

Please consider the environment before printing this email.


_______________________________________________
GeoNetwork-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/geonetwork-devel
GeoNetwork OpenSource is maintained at http://sourceforge.net/projects/geonetwork