You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@taverna.apache.org by Stian Soiland-Reyes <st...@apache.org> on 2015/02/17 18:25:27 UTC

Taverna git repositories moved - 48h till removal of old branches

tl;dr:  The Apache git repositories for Taverna has now been realized
and populated. Commit anything not in the old repositories during the
next 48h.


See http://taverna.incubator.apache.org/code/ for details.

(Note that the GitHub links will not start working until tomorrow
morning as the mirroring is done nightly.)


Committers, make sure you use the https links as they are the only
ones with write access. You will probably want to figure out how to
configure your git to stop asking for https password, as it's not
possible to use ssh-keys with git at Apache. The most secure way of
doing this depend on your operating system and git version.

One way you should NOT do it (unless you have an encrypted home
directory) is like this:

stain@biggie-utopic:~$ cat .netrc
machine git-wip-us.apache.org
login stain
password fishsoup
protocol https



If you have already been using the taverna-incubator GitHub
repositories with the new org.apache.taverna groupIds etc, then the
change should be as simple as:

    git remote set-url origin
https://git-wip-us.apache.org/repos/asf/incubator-taverna-language.git


If you have used the taverna GitHub repositories, then many
repositories have been merged and have pom.xml and Java package
modifications, so it is best to start again from a new checkout from
the new git repositories and then move over your changes manually or
through git remote+git merge.


Each old repository should have a pre-incubator-* tag (let me know if
not!) - you might want to rebase any uncommitted/branched work to that
- if you then do then merging from the new checkout, it should usually
take care of the file-renames (except for new files).




For each repository, there is a PGP-signed tag called
apache-import-20150217 that signifies the formal import from the
software grant, for example:

https://git-wip-us.apache.org/repos/asf?p=incubator-taverna-language.git;a=tag;h=refs/tags/apache-import-20150217

This should correspond to a bunch of pre-incubator-* tags in the old
repositories, plus any folder renames and pom.xml changes.


You fill find the old tags in the repositories under old/ - e.g.
old/dataflow-activity-1.5 -- usually these will have a prefix of
whatever the old repository will have been.

Any open branches I found will now just be tagged, e.g.
old/wsdl-generic-3.0-20150106 -- feel free to re-open these as new
branches on the Apache side - I have not done any attempt of rebasing
these to the new master.


I have removed write-access to http://github.com/taverna-incubator/
and will in 48 hours remove those staging repositories as soon as we
have verified builds in Apache's Jenkins from the new Apache git
repositories. (any volunteers?)



I am also asking for a silent consensus (that is - scream out if you
disagree!) to in 48 hours or later to clear the "master" branches of
all relevant repositories under http://github.com/taverna/

I have a bunch of MOVE-branches ready to be pushed that look like this:
https://github.com/taverna/taverna-maven-parent/tree/master

.. that is, all files removed, and a single README with redirect.

(Again, the github link here should start working tomorrow)

If by then, I see any changes beyond the pre-incubator* tags, I will
merge it into the new git repositories. After the point of the README
you should not be committing anything to the old repositories (except
on their "maintenance" branch for 2.x).


-- 
Stian Soiland-Reyes
Apache Taverna (incubating)
http://orcid.org/0000-0001-9842-9718

Re: Taverna git repositories moved - 48h till removal of old branches

Posted by Stian Soiland-Reyes <st...@apache.org>.
My apologies - I seem to have misunderstood the legal requirements and
rushed this a bit.

While the Apache Software Foundation have received the signed Software
Grant from University of Manchester, they have yet to Formally Accept
the Software Grant.

I have therefore temporarily emptied all the repositories at
git.apache.org. I would hope that we get the formal clearance later
this week and then we can push again. You should keep using the old
repositories for now.

Apologies for the confusion.


On 17 February 2015 at 17:25, Stian Soiland-Reyes <st...@apache.org> wrote:
> tl;dr:  The Apache git repositories for Taverna has now been realized
> and populated. Commit anything not in the old repositories during the
> next 48h.
>
>
> See http://taverna.incubator.apache.org/code/ for details.
>
> (Note that the GitHub links will not start working until tomorrow
> morning as the mirroring is done nightly.)
>
>
> Committers, make sure you use the https links as they are the only
> ones with write access. You will probably want to figure out how to
> configure your git to stop asking for https password, as it's not
> possible to use ssh-keys with git at Apache. The most secure way of
> doing this depend on your operating system and git version.
>
> One way you should NOT do it (unless you have an encrypted home
> directory) is like this:
>
> stain@biggie-utopic:~$ cat .netrc
> machine git-wip-us.apache.org
> login stain
> password fishsoup
> protocol https
>
>
>
> If you have already been using the taverna-incubator GitHub
> repositories with the new org.apache.taverna groupIds etc, then the
> change should be as simple as:
>
>     git remote set-url origin
> https://git-wip-us.apache.org/repos/asf/incubator-taverna-language.git
>
>
> If you have used the taverna GitHub repositories, then many
> repositories have been merged and have pom.xml and Java package
> modifications, so it is best to start again from a new checkout from
> the new git repositories and then move over your changes manually or
> through git remote+git merge.
>
>
> Each old repository should have a pre-incubator-* tag (let me know if
> not!) - you might want to rebase any uncommitted/branched work to that
> - if you then do then merging from the new checkout, it should usually
> take care of the file-renames (except for new files).
>
>
>
>
> For each repository, there is a PGP-signed tag called
> apache-import-20150217 that signifies the formal import from the
> software grant, for example:
>
> https://git-wip-us.apache.org/repos/asf?p=incubator-taverna-language.git;a=tag;h=refs/tags/apache-import-20150217
>
> This should correspond to a bunch of pre-incubator-* tags in the old
> repositories, plus any folder renames and pom.xml changes.
>
>
> You fill find the old tags in the repositories under old/ - e.g.
> old/dataflow-activity-1.5 -- usually these will have a prefix of
> whatever the old repository will have been.
>
> Any open branches I found will now just be tagged, e.g.
> old/wsdl-generic-3.0-20150106 -- feel free to re-open these as new
> branches on the Apache side - I have not done any attempt of rebasing
> these to the new master.
>
>
> I have removed write-access to http://github.com/taverna-incubator/
> and will in 48 hours remove those staging repositories as soon as we
> have verified builds in Apache's Jenkins from the new Apache git
> repositories. (any volunteers?)
>
>
>
> I am also asking for a silent consensus (that is - scream out if you
> disagree!) to in 48 hours or later to clear the "master" branches of
> all relevant repositories under http://github.com/taverna/
>
> I have a bunch of MOVE-branches ready to be pushed that look like this:
> https://github.com/taverna/taverna-maven-parent/tree/master
>
> .. that is, all files removed, and a single README with redirect.
>
> (Again, the github link here should start working tomorrow)
>
> If by then, I see any changes beyond the pre-incubator* tags, I will
> merge it into the new git repositories. After the point of the README
> you should not be committing anything to the old repositories (except
> on their "maintenance" branch for 2.x).
>
>
> --
> Stian Soiland-Reyes
> Apache Taverna (incubating)
> http://orcid.org/0000-0001-9842-9718



-- 
Stian Soiland-Reyes
Apache Taverna (incubating)
http://orcid.org/0000-0001-9842-9718

Re: Taverna git repositories moved - 48h till removal of old branches

Posted by Stian Soiland-Reyes <st...@apache.org>.
> ## Phasing out of old repositories
>
> I have removed write-access to http://github.com/taverna-incubator/
> and will in 48 hours remove those staging repositories as soon as we
> have verified builds in Apache's Jenkins from the new Apache git
> repositories. (any volunteers?)

Not verifiable yet as they time out while fetching dependencies - but
all are there:

https://builds.apache.org/user/stain/my-views/view/taverna/


> I am also asking for a silent consensus (that is - scream out if you
> disagree!) to in 48 hours or later to clear the "master" branches of
> all relevant repositories under http://github.com/taverna/

This should now be done (let me know if you spot any that isn't!)

Example:

https://github.com/taverna/taverna-scufl2/


> If by then, I see any changes beyond the pre-incubator* tags, I will
> merge it into the new git repositories. After the point of the README
> you should not be committing anything to the old repositories (except
> on their "maintenance" branch for 2.x).

Done - the only changes I found where Alan's pom.xml changes for changing
<dependencies> to OSGi bundles, as these were not up to date with
the re-made pom.xml files on apache/incubator-taverna* and the
new taverna-maven-parent. Thus I ignored these as they would
not be mergeable across.

Example:

https://github.com/taverna/taverna3-command-line/commits/master

-- 
Stian Soiland-Reyes
Apache Taverna (incubating)
http://orcid.org/0000-0001-9842-9718

Re: Taverna git repositories moved - 48h till removal of old branches

Posted by Stian Soiland-Reyes <st...@apache.org>.
Take #2 -  the Software Grant is finally formally on file (apologies
for earlier confusion).


tl;dr:  The Apache git repositories for Taverna has now been
populated, and are ready to use now.  Commit anything outstanding to
the old repositories during the next 48h, or use the new repositories
directly

Silent consensus (that is - scream out if you disagree!): In 48 hours
or later to clear the "master" branches of all relevant repositories
under http://github.com/taverna/


## Checking out

See http://taverna.incubator.apache.org/code/ for details of the new
repositories.


Quick checkout (Linux/Unix):

>    for r in maven-parent language osgi engine common-activities commandline server workbench workbench-common-activities workbench-product plugin-component plugin-bioinformatics ; do git clone https://git-wip-us.apache.org/repos/asf/incubator-taverna-$r.git & done ; wait



## Committer access

Committers - please remember for each repository to do the equivalent
of (using your @apache.org account):

    git config user.email johndoe@apache.org


Committers, make sure you use the https links as they are the only
ones with write access. You will probably want to figure out how to
configure your git to stop asking for https password, as it's not
possible to use ssh-keys with git at Apache. The most secure way of
doing this depend on your operating system and git version.

One way you should NOT do it (unless you have an encrypted home
directory) is like this:

stain@biggie-utopic:~$ cat .netrc
machine git-wip-us.apache.org
login johndoe
password fishsoup


## Existing github.com/taverna-incubator/ checkouts


If you have already been using the /taverna-incubator GitHub
repositories with the new org.apache.taverna groupIds etc, then the
changes should be as simple as this example:

     git remote set-url origin
https://git-wip-us.apache.org/repos/asf/incubator-taverna-language.git

To avoid confusing splits here, I have removed write-access to the
taverna-incubator projects.


## Existing github.com/taverna// checkouts

If you have used the /taverna GitHub repositories, then many
repositories have been merged and have pom.xml and Java package
modifications, so it is best to start again from a new checkout from
the new git repositories and then move over your changes manually or
through git remote+git merge. (see below)


## Tags and branches

Each old repository should have a pre-incubator-* tag (let me know if
not!) - you might want to rebase any uncommitted/branched work to that
first.
If you then later try to merge in your repository/branch from the new
incubator-taverna- checkout, git should usually take care of the
file-renames (except for new files).


For each repository, there is a PGP-signed tag called
apache-import-20150223 that signifies the formal import from the
software grant, for example:

 https://git-wip-us.apache.org/repos/asf?p=incubator-taverna-language.git;a=tag;h=refs/tags/apache-import-20150223

This should correspond to a bunch of pre-incubator-* tags in the old
repositories, plus any folder renames and pom.xml changes.


You fill find the old tags in the repositories under old/ - e.g.
old/dataflow-activity-1.5 -- usually these will have a prefix of
whatever the old repository will have been.

Any open branches I found will now just be tagged, e.g.
old/wsdl-generic-3.0-20150106 -- feel free to re-open these as new
branches on the Apache side - Note however I have not attempted any rebasing
these to the new master so they would typically have an incomplete
folder structure.


## Phasing out of old repositories

I have removed write-access to http://github.com/taverna-incubator/
and will in 48 hours remove those staging repositories as soon as we
have verified builds in Apache's Jenkins from the new Apache git
repositories. (any volunteers?)


I am also asking for a silent consensus (that is - scream out if you
disagree!) to in 48 hours or later to clear the "master" branches of
all relevant repositories under http://github.com/taverna/

I have a bunch of MOVE-branches ready to be pushed that look like this:
https://github.com/taverna/taverna-maven-parent/tree/master

.. that is, all files removed, and a single README with redirect.


If by then, I see any changes beyond the pre-incubator* tags, I will
merge it into the new git repositories. After the point of the README
you should not be committing anything to the old repositories (except
on their "maintenance" branch for 2.x).


## Signed import tags


Signed tags for each import (for the records):

https://git-wip-us.apache.org/repos/asf?p=incubator-taverna-maven-parent.git;a=tag;h=bd8a161046bf6853314e1c77f5b4dccc6648085a
https://git-wip-us.apache.org/repos/asf?p=incubator-taverna-language.git;a=tag;h=3f43e2023ddc1b4cff0e98f446afd7e7928487a7
https://git-wip-us.apache.org/repos/asf?p=incubator-taverna-osgi.git;a=tag;h=b69e1c3949cd787c74802c11213ac90a86debca1
https://git-wip-us.apache.org/repos/asf?p=incubator-taverna-engine.git;a=tag;h=b62bbae35c665227df7754e86d0a366d5046c27c
https://git-wip-us.apache.org/repos/asf?p=incubator-taverna-common-activities.git;a=tag;h=b15a93cfdd625fe5c3a5e828dfb28c3eed5eb6c6
https://git-wip-us.apache.org/repos/asf?p=incubator-taverna-commandline.git;a=tag;h=c4e6e9d264a01701cfa5337790ccd4dc92621a8e
https://git-wip-us.apache.org/repos/asf?p=incubator-taverna-server.git;a=tag;h=7f718bcb3d5eb64d64fb33b8a1995432aba3e083
https://git-wip-us.apache.org/repos/asf?p=incubator-taverna-workbench.git;a=tag;h=a332d765b5f3778b9545ca70d68c06d2031db8f6
https://git-wip-us.apache.org/repos/asf?p=incubator-taverna-workbench-common-activities.git;a=tag;h=cfdebfc91c3d7a587ffadf3b9f46332901ac8050
https://git-wip-us.apache.org/repos/asf?p=incubator-taverna-workbench-product.git;a=tag;h=9321725dd455740efe142e5b7b39df9f4bed01b7
https://git-wip-us.apache.org/repos/asf?p=incubator-taverna-plugin-component.git;a=tag;h=6ddba656c17f4271405062f616e9084b446f918b
https://git-wip-us.apache.org/repos/asf?p=incubator-taverna-plugin-bioinformatics.git;a=tag;h=2111f135363bc7dad8858f258186486755150f2c



Now.. code! :-))


-- 
Stian Soiland-Reyes
Apache Taverna (incubating)
http://orcid.org/0000-0001-9842-9718