Re: [PR] Adds common project git hooks directory [directory-scimple]

[via GitHub]

bdemers merged PR #453:
URL: https://github.com/apache/directory-scimple/pull/453


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@directory.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


-
To unsubscribe, e-mail: dev-unsubscr...@directory.apache.org
For additional commands, e-mail: dev-h...@directory.apache.org

[PR] Adds common project git hooks directory [directory-scimple]

[via GitHub]

bdemers opened a new pull request, #453:
URL: https://github.com/apache/directory-scimple/pull/453

   Use is optional, I've had too many CI failures because I forgot license 
headers
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@directory.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


-
To unsubscribe, e-mail: dev-unsubscr...@directory.apache.org
For additional commands, e-mail: dev-h...@directory.apache.org

[RESULT][VOTE] Move Directory site from CMS/svn to Hugo/git

[Roy Lenferink]

Hey all,

Hereby I am closing the vote for moving the Directory website over from the 
current, to be deprecated,
CMS & svn, to using Hugo & git.

The vote has been open for 20 days and the following votes were cast:

+1 (binding) Stefan Seelmann
+1 (binding) Shawn McKinney
+1 (binding) Radovan Semancik
+1 (binding) Emmanuel Lécharny
+1 (non-binding) Roy Lenferink

The vote is therefore successful and we can proceed with the next steps; which 
are:

- A PMC member requesting the 'directory-site' repo. Requesting is self-serve 
and can be done here [1]
- A committer pushing the contents of [2] (both branches) to the new ASF repo.

The Jenkins job is something I can help out with.

Regards,
Roy

[1] https://gitbox.apache.org/setup/newrepo.html
[2] https://github.com/rlenferink/directory-site

-
To unsubscribe, e-mail: dev-unsubscr...@directory.apache.org
For additional commands, e-mail: dev-h...@directory.apache.org

Re: [VOTE] Move Directory site from CMS/svn to Hugo/git

[Emmanuel Lécharny]

My official +1


I realised I vote +1 directly to Roy instead of replying to the ML :-)


Thanks Roy !


On 16/09/2020 21:27, Emmanuel Lécharny wrote:


On 16/09/2020 21:07, Shawn McKinney wrote:

+1

I still have reservations about how the new release process will work 
for publishing using this new CMS, but don’t want to stand in the way.


For example, currently, there’s a step-by-step instructions (provided 
by Emmanuel) that is used on each (fortress) release for publishing 
using the old CMS.  I have no such set of instructions for using the 
new.



Please don’t take this as a critique on the work that’s been done 
getting this ready.  It’s a concern about moving forward. My guess, 
it’ll be better than before, but that still doesn’t erase the 
concerns.  :-)


I have spent quite some time to write down this step-by-step 
procedure. My understanding is that at some point, you have to spend 
time to learn how new things are working. Hopefully, one single person 
can do this work, and many benefit from it.


The question, this time, is : who will do the work ;-)




-
To unsubscribe, e-mail: dev-unsubscr...@directory.apache.org
For additional commands, e-mail: dev-h...@directory.apache.org

Re: [VOTE] Move Directory site from CMS/svn to Hugo/git

[Roy Lenferink]

Hereby i am adding my +1 (non-binding) and closing the vote.

I'll send the results shortly.

Roy

On 2020/09/15 16:55:42, Roy Lenferink  wrote: 
> Hey all,
> 
> As promised hereby a vote for moving away from the (to be deprecated) CMS & 
> svn, to use Hugo 
> and git for hosting the Directory website sources.
> 
> Hugo is a quite popular static site generator and is well-known for its speed 
> of website generation.
> It's quite easy to install Hugo as the only thing necessary is installing it 
> somewhere part of your 
> $PATH.
> 
> I have migrated the Directory website to be usable with Hugo. The sources of 
> this are available
> here [1]. See the 'discuss' threads here [2][3] for more information.
> 
> The gen-docs is something still under discussion as there are multiple ways 
> to solve that issue. I
> noticed Emmanuel created a jira ticket [4] for this.
> 
> Please vote  on moving away from the CMS/svn to use Hugo/git (a new 
> 'directory-site' repository
> to be created hosting the sources):
> 
> [ ] +1 for moving over
> [ ] 0 I don't have a strong opinion on this
> [ ] -1 for not moving over, in this case please explain why
> 
> Regards,
> Roy
> 
> [1] https://github.com/rlenferink/directory-site
> [2] 
> https://lists.apache.org/thread.html/r4bb58d7f93dc547abc6c2829c1dad751a72a14089000550b37bbad6b%40%3Cdev.directory.apache.org%3E
> [3] 
> https://lists.apache.org/thread.html/r307c89043eb346d42018aa8387f70199126d6ff276a7c4ef3bf4e5cb%40%3Cdev.directory.apache.org%3E
> [4] https://issues.apache.org/jira/browse/INFRA-20849
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@directory.apache.org
> For additional commands, e-mail: dev-h...@directory.apache.org
> 
> 

-
To unsubscribe, e-mail: dev-unsubscr...@directory.apache.org
For additional commands, e-mail: dev-h...@directory.apache.org

Re: [VOTE] Move Directory site from CMS/svn to Hugo/git

[Emmanuel Lécharny]

I think I voted +1 too.

On 03/10/2020 19:55, Stefan Seelmann wrote:

Did we come to a conclusion?

I count 3 binding +1 votes from Shawn, Radovan, and myself, but I'd
prefer consensus :)

I have some time in Q4 and can help with the migration too.

Kind Regards,
Stefan


On 9/15/20 6:55 PM, Roy Lenferink wrote:

Hey all,

As promised hereby a vote for moving away from the (to be deprecated) CMS & 
svn, to use Hugo
and git for hosting the Directory website sources.

Hugo is a quite popular static site generator and is well-known for its speed 
of website generation.
It's quite easy to install Hugo as the only thing necessary is installing it 
somewhere part of your
$PATH.

I have migrated the Directory website to be usable with Hugo. The sources of 
this are available
here [1]. See the 'discuss' threads here [2][3] for more information.

The gen-docs is something still under discussion as there are multiple ways to 
solve that issue. I
noticed Emmanuel created a jira ticket [4] for this.

Please vote  on moving away from the CMS/svn to use Hugo/git (a new 
'directory-site' repository
to be created hosting the sources):

[ ] +1 for moving over
[ ] 0 I don't have a strong opinion on this
[ ] -1 for not moving over, in this case please explain why

Regards,
Roy

[1] https://github.com/rlenferink/directory-site
[2] 
https://lists.apache.org/thread.html/r4bb58d7f93dc547abc6c2829c1dad751a72a14089000550b37bbad6b%40%3Cdev.directory.apache.org%3E
[3] 
https://lists.apache.org/thread.html/r307c89043eb346d42018aa8387f70199126d6ff276a7c4ef3bf4e5cb%40%3Cdev.directory.apache.org%3E
[4] https://issues.apache.org/jira/browse/INFRA-20849

-
To unsubscribe, e-mail: dev-unsubscr...@directory.apache.org
For additional commands, e-mail: dev-h...@directory.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@directory.apache.org
For additional commands, e-mail: dev-h...@directory.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@directory.apache.org
For additional commands, e-mail: dev-h...@directory.apache.org

Re: [VOTE] Move Directory site from CMS/svn to Hugo/git

[Stefan Seelmann]

Did we come to a conclusion?

I count 3 binding +1 votes from Shawn, Radovan, and myself, but I'd
prefer consensus :)

I have some time in Q4 and can help with the migration too.

Kind Regards,
Stefan


On 9/15/20 6:55 PM, Roy Lenferink wrote:
> Hey all,
> 
> As promised hereby a vote for moving away from the (to be deprecated) CMS & 
> svn, to use Hugo 
> and git for hosting the Directory website sources.
> 
> Hugo is a quite popular static site generator and is well-known for its speed 
> of website generation.
> It's quite easy to install Hugo as the only thing necessary is installing it 
> somewhere part of your 
> $PATH.
> 
> I have migrated the Directory website to be usable with Hugo. The sources of 
> this are available
> here [1]. See the 'discuss' threads here [2][3] for more information.
> 
> The gen-docs is something still under discussion as there are multiple ways 
> to solve that issue. I
> noticed Emmanuel created a jira ticket [4] for this.
> 
> Please vote  on moving away from the CMS/svn to use Hugo/git (a new 
> 'directory-site' repository
> to be created hosting the sources):
> 
> [ ] +1 for moving over
> [ ] 0 I don't have a strong opinion on this
> [ ] -1 for not moving over, in this case please explain why
> 
> Regards,
> Roy
> 
> [1] https://github.com/rlenferink/directory-site
> [2] 
> https://lists.apache.org/thread.html/r4bb58d7f93dc547abc6c2829c1dad751a72a14089000550b37bbad6b%40%3Cdev.directory.apache.org%3E
> [3] 
> https://lists.apache.org/thread.html/r307c89043eb346d42018aa8387f70199126d6ff276a7c4ef3bf4e5cb%40%3Cdev.directory.apache.org%3E
> [4] https://issues.apache.org/jira/browse/INFRA-20849
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@directory.apache.org
> For additional commands, e-mail: dev-h...@directory.apache.org
> 


-
To unsubscribe, e-mail: dev-unsubscr...@directory.apache.org
For additional commands, e-mail: dev-h...@directory.apache.org

Re: [VOTE] Move Directory site from CMS/svn to Hugo/git

[Emmanuel Lécharny]

On 17/09/2020 22:10, Stefan Seelmann wrote:

On 9/16/20 9:27 PM, Emmanuel Lécharny wrote:

I have spent quite some time to write down this step-by-step procedure.
My understanding is that at some point, you have to spend time to learn
how new things are working. Hopefully, one single person can do this
work, and many benefit from it.

Ideally that "procedure" is written as code and can be executed either
locally or on a CI system :)


Indeed.

Although this is not that simple... There are different use cases:

- one want to update the site content. Hard to write code that does that 
;-) Usually, it's all about checking out the site content - currently in 
svn, now in git -, use your favored test editor, save it, commit it, 
generate the staging site, check the result, eventually go back to step 
'edit' until glad with the result, then push to the production site.


- one want to push a release. This is mostly like the previous use case, 
except that the javadoc might have to be pushed andd referred in ths 
site, same thing for the packages. ATM it's manual - with a hell lot of 
risk to lose content with the current CMS tool -. IT should be a shell 
script within a jenkins task, or a command executed by buildbot, none of 
which are currenly either well documented nor implemented by our project.



Bottom line, there is a couple of days of work to sort out a procedure 
and document it so that any of use can use it without having to spend 
wasted hours poking The Internet for direction :-)



Ultimately, this is noyt *that* complex. We just have little tilme, and 
as normal human beings, we don't like to change, especially when it was 
working...



Thanks !





-
To unsubscribe, e-mail: dev-unsubscr...@directory.apache.org
For additional commands, e-mail: dev-h...@directory.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@directory.apache.org
For additional commands, e-mail: dev-h...@directory.apache.org

Re: [VOTE] Move Directory site from CMS/svn to Hugo/git

[Stefan Seelmann]

On 9/16/20 9:27 PM, Emmanuel Lécharny wrote:
> I have spent quite some time to write down this step-by-step procedure.
> My understanding is that at some point, you have to spend time to learn
> how new things are working. Hopefully, one single person can do this
> work, and many benefit from it.

Ideally that "procedure" is written as code and can be executed either
locally or on a CI system :)


-
To unsubscribe, e-mail: dev-unsubscr...@directory.apache.org
For additional commands, e-mail: dev-h...@directory.apache.org

Re: [VOTE] Move Directory site from CMS/svn to Hugo/git

[Emmanuel Lécharny]

Hi Maryanne !


Here are a few pointers :


https://github.com/apache/celix-site (this is another apache site that 
uses Hugo for their site)


https://infra.apache.org/project-site.html (the general - very 
general... - directions )


https://cwiki.apache.org/confluence/display/INFRA/Migrate+your+project+website+from+the+Apache+CMS 
(you may need some apache creds for this one)



FTR, the Javadoc are being moved to nightlies.apache.org by INFRA (at 
least the latest versions). For new releases, a jenkins task has to be 
added.



Thanks !

On 17/09/2020 16:28, Maryanne Normann wrote:

I have some time to look at this :-)

I'll check in with Shawn to see how/where I can get started.

-Maryanne

Maryanne
Office: (650) 963-7656
Cell: (914) 466-9116

- Original Message -
From: "Emmanuel Lécharny" 
To: dev@directory.apache.org
Sent: Wednesday, September 16, 2020 3:27:20 PM
Subject: Re: [VOTE] Move Directory site from CMS/svn to Hugo/git

On 16/09/2020 21:07, Shawn McKinney wrote:

+1

I still have reservations about how the new release process will work for 
publishing using this new CMS, but don’t want to stand in the way.

For example, currently, there’s a step-by-step instructions (provided by 
Emmanuel) that is used on each (fortress) release for publishing using the old 
CMS.  I have no such set of instructions for using the new.


Please don’t take this as a critique on the work that’s been done getting this 
ready.  It’s a concern about moving forward.  My guess, it’ll be better than 
before, but that still doesn’t erase the concerns.  :-)

I have spent quite some time to write down this step-by-step procedure.
My understanding is that at some point, you have to spend time to learn
how new things are working. Hopefully, one single person can do this
work, and many benefit from it.

The question, this time, is : who will do the work ;-)



-
To unsubscribe, e-mail: dev-unsubscr...@directory.apache.org
For additional commands, e-mail: dev-h...@directory.apache.org


-
To unsubscribe, e-mail: dev-unsubscr...@directory.apache.org
For additional commands, e-mail: dev-h...@directory.apache.org

Re: [VOTE] Move Directory site from CMS/svn to Hugo/git

[Maryanne Normann]

I have some time to look at this :-)

I'll check in with Shawn to see how/where I can get started.

-Maryanne

Maryanne 
Office: (650) 963-7656 
Cell: (914) 466-9116

- Original Message -
From: "Emmanuel Lécharny" 
To: dev@directory.apache.org
Sent: Wednesday, September 16, 2020 3:27:20 PM
Subject: Re: [VOTE] Move Directory site from CMS/svn to Hugo/git

On 16/09/2020 21:07, Shawn McKinney wrote:
> +1
>
> I still have reservations about how the new release process will work for 
> publishing using this new CMS, but don’t want to stand in the way.
>
> For example, currently, there’s a step-by-step instructions (provided by 
> Emmanuel) that is used on each (fortress) release for publishing using the 
> old CMS.  I have no such set of instructions for using the new.
>
>
> Please don’t take this as a critique on the work that’s been done getting 
> this ready.  It’s a concern about moving forward.  My guess, it’ll be better 
> than before, but that still doesn’t erase the concerns.  :-)

I have spent quite some time to write down this step-by-step procedure. 
My understanding is that at some point, you have to spend time to learn 
how new things are working. Hopefully, one single person can do this 
work, and many benefit from it.

The question, this time, is : who will do the work ;-)



-
To unsubscribe, e-mail: dev-unsubscr...@directory.apache.org
For additional commands, e-mail: dev-h...@directory.apache.org

-
To unsubscribe, e-mail: dev-unsubscr...@directory.apache.org
For additional commands, e-mail: dev-h...@directory.apache.org

Re: [VOTE] Move Directory site from CMS/svn to Hugo/git

[Radovan Semancik]

+1

I've misses the original discussion, but I just want to say that 
anything is better than the old CMS.

I've tried to update the documentation once, but it was a real pain.
It really demotivated me and I was not trying to do any further 
documentation updates since.

I'm glad that the project is moving away from that thing.

--
Radovan Semancik
Software Architect
evolveum.com



On 9/15/20 6:55 PM, Roy Lenferink wrote:

Hey all,

As promised hereby a vote for moving away from the (to be deprecated) CMS & 
svn, to use Hugo
and git for hosting the Directory website sources.

Hugo is a quite popular static site generator and is well-known for its speed 
of website generation.
It's quite easy to install Hugo as the only thing necessary is installing it 
somewhere part of your
$PATH.

I have migrated the Directory website to be usable with Hugo. The sources of 
this are available
here [1]. See the 'discuss' threads here [2][3] for more information.

The gen-docs is something still under discussion as there are multiple ways to 
solve that issue. I
noticed Emmanuel created a jira ticket [4] for this.

Please vote  on moving away from the CMS/svn to use Hugo/git (a new 
'directory-site' repository
to be created hosting the sources):

[ ] +1 for moving over
[ ] 0 I don't have a strong opinion on this
[ ] -1 for not moving over, in this case please explain why

Regards,
Roy

[1] https://github.com/rlenferink/directory-site
[2] 
https://lists.apache.org/thread.html/r4bb58d7f93dc547abc6c2829c1dad751a72a14089000550b37bbad6b%40%3Cdev.directory.apache.org%3E
[3] 
https://lists.apache.org/thread.html/r307c89043eb346d42018aa8387f70199126d6ff276a7c4ef3bf4e5cb%40%3Cdev.directory.apache.org%3E
[4] https://issues.apache.org/jira/browse/INFRA-20849

-
To unsubscribe, e-mail: dev-unsubscr...@directory.apache.org
For additional commands, e-mail: dev-h...@directory.apache.org





-
To unsubscribe, e-mail: dev-unsubscr...@directory.apache.org
For additional commands, e-mail: dev-h...@directory.apache.org

Re: [VOTE] Move Directory site from CMS/svn to Hugo/git

[Emmanuel Lécharny]

One more thing : I'm quite sure it's not such a big issue to get used to 
the new system. First, the content structure has not changed a lot, and 
it's still markdown based. Second, we aren't going to change the 
structure heavily in the coming months, so the learning curve should be 
light.



I'm currently dealing with a MINA release, done last week, and I'm 
trying to get it visible (ie updating the site). The big hurdel atm is 
the Javadocs. I have opened a JIRA for that, buut the least I can say is 
that the answers I've got so far are not really making me jump in joy. 
For instance, using curl to push every single javadoc file is just 
insane - and it does not work, I get blocked at some point -. The 
alternatives are not going to fly: using jenkins or buildbot for that is 
*maybe* ok for the new releases, not for the almost hundred of existing 
javadocs we have...


If someone has a pointer on how to recursively push the javadocs 
recursively to 
nightlies.apache.org/directory/[apacheds|api|fortress|mavibot], I'll be 
more than pleased !



I'm specifically thinking about something like :

$ rsync -av [revision]/ elecha...@nightlies.apache.org 
:/directory/[project]/



I don't have a SSH access to nighlies, sadly :/



-
To unsubscribe, e-mail: dev-unsubscr...@directory.apache.org
For additional commands, e-mail: dev-h...@directory.apache.org

Re: [VOTE] Move Directory site from CMS/svn to Hugo/git

[Emmanuel Lécharny]

On 16/09/2020 21:07, Shawn McKinney wrote:

+1

I still have reservations about how the new release process will work for 
publishing using this new CMS, but don’t want to stand in the way.

For example, currently, there’s a step-by-step instructions (provided by 
Emmanuel) that is used on each (fortress) release for publishing using the old 
CMS.  I have no such set of instructions for using the new.


Please don’t take this as a critique on the work that’s been done getting this 
ready.  It’s a concern about moving forward.  My guess, it’ll be better than 
before, but that still doesn’t erase the concerns.  :-)


I have spent quite some time to write down this step-by-step procedure. 
My understanding is that at some point, you have to spend time to learn 
how new things are working. Hopefully, one single person can do this 
work, and many benefit from it.


The question, this time, is : who will do the work ;-)



-
To unsubscribe, e-mail: dev-unsubscr...@directory.apache.org
For additional commands, e-mail: dev-h...@directory.apache.org

Re: [VOTE] Move Directory site from CMS/svn to Hugo/git

[Shawn McKinney]

+1

I still have reservations about how the new release process will work for 
publishing using this new CMS, but don’t want to stand in the way.

For example, currently, there’s a step-by-step instructions (provided by 
Emmanuel) that is used on each (fortress) release for publishing using the old 
CMS.  I have no such set of instructions for using the new.   


Please don’t take this as a critique on the work that’s been done getting this 
ready.  It’s a concern about moving forward.  My guess, it’ll be better than 
before, but that still doesn’t erase the concerns.  :-)

—
Shawn


> On Sep 16, 2020, at 1:12 PM, Stefan Seelmann  wrote:
> 
> +1
> 
> Many thanks Roy for initiating it!
> 
> Kind Regards,
> Stefan
> 
> 
> On 9/15/20 6:55 PM, Roy Lenferink wrote:
>> Hey all,
>> 
>> As promised hereby a vote for moving away from the (to be deprecated) CMS & 
>> svn, to use Hugo 
>> and git for hosting the Directory website sources.
>> 
>> Hugo is a quite popular static site generator and is well-known for its 
>> speed of website generation.
>> It's quite easy to install Hugo as the only thing necessary is installing it 
>> somewhere part of your 
>> $PATH.
>> 
>> I have migrated the Directory website to be usable with Hugo. The sources of 
>> this are available
>> here [1]. See the 'discuss' threads here [2][3] for more information.
>> 
>> The gen-docs is something still under discussion as there are multiple ways 
>> to solve that issue. I
>> noticed Emmanuel created a jira ticket [4] for this.
>> 
>> Please vote  on moving away from the CMS/svn to use Hugo/git (a new 
>> 'directory-site' repository
>> to be created hosting the sources):
>> 
>> [ ] +1 for moving over
>> [ ] 0 I don't have a strong opinion on this
>> [ ] -1 for not moving over, in this case please explain why
>> 
>> Regards,
>> Roy
>> 
>> [1] https://github.com/rlenferink/directory-site
>> [2] 
>> https://lists.apache.org/thread.html/r4bb58d7f93dc547abc6c2829c1dad751a72a14089000550b37bbad6b%40%3Cdev.directory.apache.org%3E
>> [3] 
>> https://lists.apache.org/thread.html/r307c89043eb346d42018aa8387f70199126d6ff276a7c4ef3bf4e5cb%40%3Cdev.directory.apache.org%3E
>> [4] https://issues.apache.org/jira/browse/INFRA-20849
>> 
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@directory.apache.org
>> For additional commands, e-mail: dev-h...@directory.apache.org
>> 
> 
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@directory.apache.org
> For additional commands, e-mail: dev-h...@directory.apache.org
> 


-
To unsubscribe, e-mail: dev-unsubscr...@directory.apache.org
For additional commands, e-mail: dev-h...@directory.apache.org

Re: [VOTE] Move Directory site from CMS/svn to Hugo/git

[Stefan Seelmann]

+1

Many thanks Roy for initiating it!

Kind Regards,
Stefan


On 9/15/20 6:55 PM, Roy Lenferink wrote:
> Hey all,
> 
> As promised hereby a vote for moving away from the (to be deprecated) CMS & 
> svn, to use Hugo 
> and git for hosting the Directory website sources.
> 
> Hugo is a quite popular static site generator and is well-known for its speed 
> of website generation.
> It's quite easy to install Hugo as the only thing necessary is installing it 
> somewhere part of your 
> $PATH.
> 
> I have migrated the Directory website to be usable with Hugo. The sources of 
> this are available
> here [1]. See the 'discuss' threads here [2][3] for more information.
> 
> The gen-docs is something still under discussion as there are multiple ways 
> to solve that issue. I
> noticed Emmanuel created a jira ticket [4] for this.
> 
> Please vote  on moving away from the CMS/svn to use Hugo/git (a new 
> 'directory-site' repository
> to be created hosting the sources):
> 
> [ ] +1 for moving over
> [ ] 0 I don't have a strong opinion on this
> [ ] -1 for not moving over, in this case please explain why
> 
> Regards,
> Roy
> 
> [1] https://github.com/rlenferink/directory-site
> [2] 
> https://lists.apache.org/thread.html/r4bb58d7f93dc547abc6c2829c1dad751a72a14089000550b37bbad6b%40%3Cdev.directory.apache.org%3E
> [3] 
> https://lists.apache.org/thread.html/r307c89043eb346d42018aa8387f70199126d6ff276a7c4ef3bf4e5cb%40%3Cdev.directory.apache.org%3E
> [4] https://issues.apache.org/jira/browse/INFRA-20849
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@directory.apache.org
> For additional commands, e-mail: dev-h...@directory.apache.org
> 


-
To unsubscribe, e-mail: dev-unsubscr...@directory.apache.org
For additional commands, e-mail: dev-h...@directory.apache.org

[VOTE] Move Directory site from CMS/svn to Hugo/git

[Roy Lenferink]

Hey all,

As promised hereby a vote for moving away from the (to be deprecated) CMS & 
svn, to use Hugo 
and git for hosting the Directory website sources.

Hugo is a quite popular static site generator and is well-known for its speed 
of website generation.
It's quite easy to install Hugo as the only thing necessary is installing it 
somewhere part of your 
$PATH.

I have migrated the Directory website to be usable with Hugo. The sources of 
this are available
here [1]. See the 'discuss' threads here [2][3] for more information.

The gen-docs is something still under discussion as there are multiple ways to 
solve that issue. I
noticed Emmanuel created a jira ticket [4] for this.

Please vote  on moving away from the CMS/svn to use Hugo/git (a new 
'directory-site' repository
to be created hosting the sources):

[ ] +1 for moving over
[ ] 0 I don't have a strong opinion on this
[ ] -1 for not moving over, in this case please explain why

Regards,
Roy

[1] https://github.com/rlenferink/directory-site
[2] 
https://lists.apache.org/thread.html/r4bb58d7f93dc547abc6c2829c1dad751a72a14089000550b37bbad6b%40%3Cdev.directory.apache.org%3E
[3] 
https://lists.apache.org/thread.html/r307c89043eb346d42018aa8387f70199126d6ff276a7c4ef3bf4e5cb%40%3Cdev.directory.apache.org%3E
[4] https://issues.apache.org/jira/browse/INFRA-20849

-
To unsubscribe, e-mail: dev-unsubscr...@directory.apache.org
For additional commands, e-mail: dev-h...@directory.apache.org

Re: [DISCUSS] Move Directory site from CMS/SVN to Hugo/Git

[Shawn McKinney]

> On Feb 24, 2020, at 5:23 AM, Emmanuel Lécharny  wrote:
> 
> I'm all in for such a move, but I would wait for MINA to be done, as I have 
> very little time at the moment to conduct such a migration (I'm on MINA and 
> Directory projects, so I'll benefit from what I have learned from MINA 
> migration).

I’m also a +1 assuming the workflow for making updates (to the website) remains 
the same, or is hopefully simpler. 

—
Shawn
-
To unsubscribe, e-mail: dev-unsubscr...@directory.apache.org
For additional commands, e-mail: dev-h...@directory.apache.org

Re: [DISCUSS] Move Directory site from CMS/SVN to Hugo/Git

[Roy Lenferink]

Hey Emmanuel,

That probably is the best idea.

- Roy

On 2020/02/24 11:23:21, Emmanuel Lécharny  wrote: 
> Hi Roy,
> 
> I'm all in for such a move, but I would wait for MINA to be done, as I 
> have very little time at the moment to conduct such a migration (I'm on 
> MINA and Directory projects, so I'll benefit from what I have learned 
> from MINA migration).
> 
> Thanks !
> 


-
To unsubscribe, e-mail: dev-unsubscr...@directory.apache.org
For additional commands, e-mail: dev-h...@directory.apache.org

Re: [DISCUSS] Move Directory site from CMS/SVN to Hugo/Git

[Emmanuel Lécharny]

Hi Roy,

On 21/02/2020 19:31, Roy Lenferink wrote:

Hi Directory community,

I noticed Directory is still serving its site from SVN with help of the Apache 
CMS. At the Apache Celix
project we decided to move away from the CMS and move towards git for serving 
our website [1].
This because the CMS was introduced in 2010 and is currently not accepting any 
new projects. With
the move to Hugo we're sure that we still can update the site when the ASF CMS 
will be
decommissioned.

The master branch contains the actual website sources whereas the generated 
website is served
from the asf-site branch. Hugo is being used as static website generator. 
Content is written in
Markdown.

About a week ago I started migrating the MINA site from SVN to Git [6] and 
today I converted the
directory site as well. An example of Hugo its output is (for demo purposes 
only) available on [2].
These are the existing markdown files with a slightly changed header.

Moving to git can enlarge the visibility of how projects are functioning. Next 
to that, new contributors
can simply create a pull request against the website repository if they find 
anything they want to
improve (an 'Edit on GitHub' / 'Edit this page' button can be added as well, 
like this [3]).

If the community is interested in this move what I propose:
- Someone from the PMC to request a new git repository for the website (e.g. 
directory-site) via [4]
- Me creating the pull request from the repository I am temporarily using for 
the website contents [5]
to the official directory-site repository
- Create a Jenkins job to automatically build the site after changes happen on 
the master branch.
- When the pull request is reviewed and merged ask INFRA to move over from the 
current svnpubsub
to the gitpubsub approach and remove Directory from the Apache CMS.

Next to that Directory is also providing javadocs on its site. My proposal for 
this is to serve them from
a separate branch (e.g. mavibot-docs / apacheds-docs etc.). This way people who 
only want to clone
the site can clone the the master branch using --single-branch and will not be 
bothered with cloning
all the javadocs.

All the URLs are still the same so the SEO score is not influenced in any way.

I'd like to hear some opinions/thoughts on this :)


I'm all in for such a move, but I would wait for MINA to be done, as I 
have very little time at the moment to conduct such a migration (I'm on 
MINA and Directory projects, so I'll benefit from what I have learned 
from MINA migration).


Thanks !



-
To unsubscribe, e-mail: dev-unsubscr...@directory.apache.org
For additional commands, e-mail: dev-h...@directory.apache.org

Re: [DISCUSS] Move Directory site from CMS/SVN to Hugo/Git

[Brian Demers]

We switched the Apache Shiro site from SVN to git a little while back. I cannot 
fine the original blog/doc. But it was something like this 
https://blogs.apache.org/infra/entry/git_based_websites_available

The process basically works like the SVN pub sub, but with a github repo. How 
you populate the repo is up to you (I’d love to move Shiro to Hugo as well, it 
would simplify our site build).


-Brian

> On Feb 21, 2020, at 1:31 PM, Roy Lenferink  wrote:
> 
> Hi Directory community,
> 
> I noticed Directory is still serving its site from SVN with help of the 
> Apache CMS. At the Apache Celix 
> project we decided to move away from the CMS and move towards git for serving 
> our website [1]. 
> This because the CMS was introduced in 2010 and is currently not accepting 
> any new projects. With
> the move to Hugo we're sure that we still can update the site when the ASF 
> CMS will be 
> decommissioned.
> 
> The master branch contains the actual website sources whereas the generated 
> website is served 
> from the asf-site branch. Hugo is being used as static website generator. 
> Content is written in 
> Markdown.
> 
> About a week ago I started migrating the MINA site from SVN to Git [6] and 
> today I converted the 
> directory site as well. An example of Hugo its output is (for demo purposes 
> only) available on [2]. 
> These are the existing markdown files with a slightly changed header.
> 
> Moving to git can enlarge the visibility of how projects are functioning. 
> Next to that, new contributors 
> can simply create a pull request against the website repository if they find 
> anything they want to 
> improve (an 'Edit on GitHub' / 'Edit this page' button can be added as well, 
> like this [3]).
> 
> If the community is interested in this move what I propose:
> - Someone from the PMC to request a new git repository for the website (e.g. 
> directory-site) via [4]
> - Me creating the pull request from the repository I am temporarily using for 
> the website contents [5] 
> to the official directory-site repository
> - Create a Jenkins job to automatically build the site after changes happen 
> on the master branch.
> - When the pull request is reviewed and merged ask INFRA to move over from 
> the current svnpubsub
> to the gitpubsub approach and remove Directory from the Apache CMS.
> 
> Next to that Directory is also providing javadocs on its site. My proposal 
> for this is to serve them from 
> a separate branch (e.g. mavibot-docs / apacheds-docs etc.). This way people 
> who only want to clone 
> the site can clone the the master branch using --single-branch and will not 
> be bothered with cloning 
> all the javadocs.
> 
> All the URLs are still the same so the SEO score is not influenced in any way.
> 
> I'd like to hear some opinions/thoughts on this :)
> 
> Best regards,
> Roy
> 
> [1] https://github.com/apache/celix-site
> [2] http://directory.roylenferink.nl/
> [3] http://celix.apache.org/contributing/releasing.html
> [4] https://gitbox.apache.org/setup/newrepo.html
> [5] https://github.com/rlenferink/directory-site
> [6] 
> https://lists.apache.org/thread.html/r0b59c769a8b49ada59a2d7a87f068ebdd383bdc6474300774d517c64%40%3Cdev.mina.apache.org%3E
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@directory.apache.org
> For additional commands, e-mail: dev-h...@directory.apache.org
> 

[DISCUSS] Move Directory site from CMS/SVN to Hugo/Git

[Roy Lenferink]

Hi Directory community,

I noticed Directory is still serving its site from SVN with help of the Apache 
CMS. At the Apache Celix 
project we decided to move away from the CMS and move towards git for serving 
our website [1]. 
This because the CMS was introduced in 2010 and is currently not accepting any 
new projects. With 
the move to Hugo we're sure that we still can update the site when the ASF CMS 
will be 
decommissioned.

The master branch contains the actual website sources whereas the generated 
website is served 
from the asf-site branch. Hugo is being used as static website generator. 
Content is written in 
Markdown.

About a week ago I started migrating the MINA site from SVN to Git [6] and 
today I converted the 
directory site as well. An example of Hugo its output is (for demo purposes 
only) available on [2]. 
These are the existing markdown files with a slightly changed header.

Moving to git can enlarge the visibility of how projects are functioning. Next 
to that, new contributors 
can simply create a pull request against the website repository if they find 
anything they want to 
improve (an 'Edit on GitHub' / 'Edit this page' button can be added as well, 
like this [3]).

If the community is interested in this move what I propose:
- Someone from the PMC to request a new git repository for the website (e.g. 
directory-site) via [4]
- Me creating the pull request from the repository I am temporarily using for 
the website contents [5] 
to the official directory-site repository
- Create a Jenkins job to automatically build the site after changes happen on 
the master branch.
- When the pull request is reviewed and merged ask INFRA to move over from the 
current svnpubsub
to the gitpubsub approach and remove Directory from the Apache CMS.

Next to that Directory is also providing javadocs on its site. My proposal for 
this is to serve them from 
a separate branch (e.g. mavibot-docs / apacheds-docs etc.). This way people who 
only want to clone 
the site can clone the the master branch using --single-branch and will not be 
bothered with cloning 
all the javadocs.

All the URLs are still the same so the SEO score is not influenced in any way.

I'd like to hear some opinions/thoughts on this :)

Best regards,
Roy

[1] https://github.com/apache/celix-site
[2] http://directory.roylenferink.nl/
[3] http://celix.apache.org/contributing/releasing.html
[4] https://gitbox.apache.org/setup/newrepo.html
[5] https://github.com/rlenferink/directory-site
[6] 
https://lists.apache.org/thread.html/r0b59c769a8b49ada59a2d7a87f068ebdd383bdc6474300774d517c64%40%3Cdev.mina.apache.org%3E

-
To unsubscribe, e-mail: dev-unsubscr...@directory.apache.org
For additional commands, e-mail: dev-h...@directory.apache.org

[NOTICE] Mandatory migration of git repos to gitbox.apache.org - three weeks left!

[Apache Infrastructure Team]

Hello, directory folks.
As stated earlier in 2018, and reiterated two weeks ago, all git
repositories must be migrated from the git-wip-us.apache.org URL to
gitbox.apache.org, as the old service is being decommissioned. Your
project is receiving this email because you still have repositories on
git-wip-us that needs to be migrated.

The following repositories on git-wip-us belong to your project:
 - directory-fortress-core.git
 - directory-fortress-realm.git
 - directory-fortress-commander.git
 - directory-kerby.git
 - directory-fortress-enmasse.git


We are now entering the remaining three weeks of the mandated
(coordinated) move stage of the roadmap, and you are asked to please
coordinate migration with the Apache Infrastructure Team before February
7th. All repositories not migrated on February 7th will be mass migrated
without warning, and we'd appreciate it if we could work together to
avoid a big mess that day :-).

As stated earlier, moving to gitbox means you will get full write access
on GitHub as well, and be able to close/merge pull requests and much
more. The move is mandatory for all Apache projects using git.

To have your repositories moved, please follow these steps:

- Ensure consensus on the move (a link to a lists.apache.org thread will
  suffice for us as evidence).
- Create a JIRA ticket at https://issues.apache.org/jira/browse/INFRA

Your migration should only take a few minutes. If you wish to migrate
at a specific time of day or date, please do let us know in the ticket,
otherwise we will migrate at the earliest convenient time.

There will be redirects in place from git-wip to gitbox, so requests
using the old remote origins should still work (however we encourage
people to update their remotes once migration has completed).

As always, we appreciate your understanding and patience as we move
things around and work to provide better services and features for
the Apache Family.

Should you wish to contact us with feedback or questions, please do so
at: us...@infra.apache.org.


With regards,
Apache Infrastructure

Fwd: [NOTICE] Mandatory migration of git repositories to gitbox.apache.org

[Shawn McKinney]

Hello, 

As directed in the message below, we must migrate out four git repos from the 
existing git-wip-us.apache.org <http://git-wip-us.apache.org/> to 
gitbox.apache.org <http://gitbox.apache.org/>.  

Specifically the repos include:

directory-fortress-core
directory-fortress-realm
directory-fortress-commander
directory-fortress-enmasse

If you have any questions or concerns please let us know.  I will wait until 
the beginning of next week before submitting a ticket to infra, giving consent 
for the move.  Once that move has taken place, I’ll update the docs to reflect 
the new locations for the source code.

Eventually, once the dust has settled, we’ll combine the four into one, but 
would like to delay that merge until later.

Lazy consensus rules apply, meaning silence implies consent.

Thanks,
—Shawn

> Begin forwarded message:
> 
> From: Apache Infrastructure Team 
> Subject: [NOTICE] Mandatory migration of git repositories to gitbox.apache.org
> Date: January 3, 2019 at 7:18:53 AM CST
> To: dev@directory.apache.org
> Reply-To: "Apache Directory Developers List" 
> Reply-To: 
> 
> Hello, directory folks.
> As stated earlier in 2018, all git repositories must be migrated from
> the git-wip-us.apache.org URL to gitbox.apache.org, as the old service
> is being decommissioned. Your project is receiving this email because
> you still have repositories on git-wip-us that needs to be migrated.
> 
> The following repositories on git-wip-us belong to your project:
> - directory-fortress-core.git
> - directory-fortress-realm.git
> - directory-fortress-commander.git
> - directory-kerby.git
> - directory-fortress-enmasse.git
> 
> 
> We are now entering the mandated (coordinated) move stage of the roadmap,
> and you are asked to please coordinate migration with the Apache
> Infrastructure Team before February 7th. All repositories not migrated
> on February 7th will be mass migrated without warning, and we'd appreciate
> it if we could work together to avoid a big mess that day :-).
> 
> Moving to gitbox means you will get full write access on GitHub as well,
> and be able to close/merge pull requests and much more.
> 
> To have your repositories moved, please follow these steps:
> 
> - Ensure consensus on the move (a link to a lists.apache.org thread will
>  suffice for us as evidence).
> - Create a JIRA ticket at https://issues.apache.org/jira/browse/INFRA
> 
> Your migration should only take a few minutes. If you wish to migrate
> at a specific time of day or date, please do let us know in the ticket.
> 
> As always, we appreciate your understanding and patience as we move
> things around and work to provide better services and features for
> the Apache Family.
> 
> Should you wish to contact us with feedback or questions, please do so
> at: us...@infra.apache.org.
> 
> 
> With regards,
> Apache Infrastructure
> 

[NOTICE] Mandatory migration of git repositories to gitbox.apache.org

[Apache Infrastructure Team]

Hello, directory folks.
As stated earlier in 2018, all git repositories must be migrated from
the git-wip-us.apache.org URL to gitbox.apache.org, as the old service
is being decommissioned. Your project is receiving this email because
you still have repositories on git-wip-us that needs to be migrated.

The following repositories on git-wip-us belong to your project:
 - directory-fortress-core.git
 - directory-fortress-realm.git
 - directory-fortress-commander.git
 - directory-kerby.git
 - directory-fortress-enmasse.git


We are now entering the mandated (coordinated) move stage of the roadmap,
and you are asked to please coordinate migration with the Apache
Infrastructure Team before February 7th. All repositories not migrated
on February 7th will be mass migrated without warning, and we'd appreciate
it if we could work together to avoid a big mess that day :-).

Moving to gitbox means you will get full write access on GitHub as well,
and be able to close/merge pull requests and much more.

To have your repositories moved, please follow these steps:

- Ensure consensus on the move (a link to a lists.apache.org thread will
  suffice for us as evidence).
- Create a JIRA ticket at https://issues.apache.org/jira/browse/INFRA

Your migration should only take a few minutes. If you wish to migrate
at a specific time of day or date, please do let us know in the ticket.

As always, we appreciate your understanding and patience as we move
things around and work to provide better services and features for
the Apache Family.

Should you wish to contact us with feedback or questions, please do so
at: us...@infra.apache.org.


With regards,
Apache Infrastructure

Re: [NOTICE] Mandatory relocation of Apache git repositories on git-wip-us.apache.org

[Shawn McKinney]

> On Dec 9, 2018, at 11:08 AM, Stefan Seelmann  wrote:
> 
> On 12/9/18 5:37 PM, Shawn McKinney wrote:
>> 
>> In other words, does this change to combine the four into a single git 
>> project repo force us to also change the structure (and process) of the 
>> maven artifacts being built and released?
> 
> I'd say yes.
> 
> The four old repos including their pom.xml reside then in a subdirectory
> each within the new repo (say core, realm, rest, web), then a new
> parent/aggregator pom.xml is needed in the new repo. The individual poms
> can then be cleaned up, i.e. redundant information (scm,
> issueManagement, developers, common parts of build, etc) can be moved up
> to the new parent pom.
> 
> What is also required is to think about the license/notice files, likely
> they also need to be moved up to the new root.
> 
> All in all not too hard, but for sure it requires some time to tweak the
> build and release.

Agreed.

> 
> On Dec 9, 2018, at 11:08 AM, Stefan Seelmann  wrote:
> 
> There is no need to rush, if it fits better into your schedule next year
> then postpone it.
> 
> And to be clear, I hope it doesn't seem I want to force you to merge the
> 4 repos, if you feel more comfortable please keep them separate :)

For the record, I’m in favor of combining the four so your comments are well 
received.

I’ll give it a few days, to think about.  Thanks for weighing in.

—Shawn


signature.asc
Description: Message signed with OpenPGP

Re: [NOTICE] Mandatory relocation of Apache git repositories on git-wip-us.apache.org

[Stefan Seelmann]

On 12/9/18 5:37 PM, Shawn McKinney wrote:
> 
>> On Dec 8, 2018, at 10:04 AM, Stefan Seelmann  wrote:
>>
>> If time allows I'd suggest to follow the voluntary relocation.
>>
>> For Fortress, if you consider to merge the 4 repos into one, this would
>> be a good time now. Just create a new "directory-fortress" repo at
>> Gitbox [1] and merge the 4 into it, then request to delete the old
>> repos, so no relocation needed.
> 
> Trying to figure out how much work this is, and does it fit into my schedule 
> for the next few weeks...
> 
> We’ll call your recommendation option one.  A new repo gets created, say 
> directory-fortress, that would contain the four packages merged. That all 
> seems pretty straight-forward. What else must be done — would a new pom be 
> needed to drive the build/release of the four packages of the combined repo?
> 
> In other words, does this change to combine the four into a single git 
> project repo force us to also change the structure (and process) of the maven 
> artifacts being built and released?

I'd say yes.

The four old repos including their pom.xml reside then in a subdirectory
each within the new repo (say core, realm, rest, web), then a new
parent/aggregator pom.xml is needed in the new repo. The individual poms
can then be cleaned up, i.e. redundant information (scm,
issueManagement, developers, common parts of build, etc) can be moved up
to the new parent pom.

What is also required is to think about the license/notice files, likely
they also need to be moved up to the new root.

All in all not too hard, but for sure it requires some time to tweak the
build and release.

There is no need to rush, if it fits better into your schedule next year
then postpone it.

And to be clear, I hope it doesn't seem I want to force you to merge the
4 repos, if you feel more comfortable please keep them separate :)

Kind Regards,
Stefan

Re: [NOTICE] Mandatory relocation of Apache git repositories on git-wip-us.apache.org

[Shawn McKinney]

> On Dec 8, 2018, at 10:04 AM, Stefan Seelmann  wrote:
> 
> If time allows I'd suggest to follow the voluntary relocation.
> 
> For Fortress, if you consider to merge the 4 repos into one, this would
> be a good time now. Just create a new "directory-fortress" repo at
> Gitbox [1] and merge the 4 into it, then request to delete the old
> repos, so no relocation needed.

Trying to figure out how much work this is, and does it fit into my schedule 
for the next few weeks...

We’ll call your recommendation option one.  A new repo gets created, say 
directory-fortress, that would contain the four packages merged. That all seems 
pretty straight-forward. What else must be done — would a new pom be needed to 
drive the build/release of the four packages of the combined repo?

In other words, does this change to combine the four into a single git project 
repo force us to also change the structure (and process) of the maven artifacts 
being built and released?

Option two is to voluntarily relocate to gitbox, but not combine (yet).

Option three is to delay migration until Feb's mandatory relo, which buys time 
to do the combine.

Thanks
—Shawn


signature.asc
Description: Message signed with OpenPGP

Re: Fwd: [NOTICE] Mandatory relocation of Apache git repositories on git-wip-us.apache.org

[Stefan Seelmann]

On 12/7/18 11:25 PM, Shawn McKinney wrote:
> Hello,
> 
> Currently there are four fortress repos on git-wip-us affected by this change.
> https://git-wip-us.apache.org/repos/asf/directory-fortress-core.git
> https://git-wip-us.apache.org/repos/asf/directory-fortress-realm.git
> https://git-wip-us.apache.org/repos/asf/directory-fortress-commander.git
> https://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse.git 
> <https://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse.git>
> Do we have others?  Any recommendations here?

Kerby is also affected:
https://git-wip-us.apache.org/repos/asf/directory-kerby.git

See full list  here (search for Directory):
https://git-wip-us.apache.org/repos/asf

If time allows I'd suggest to follow the voluntary relocation.

For Fortress, if you consider to merge the 4 repos into one, this would
be a good time now. Just create a new "directory-fortress" repo at
Gitbox [1] and merge the 4 into it, then request to delete the old
repos, so no relocation needed.

Kind Regards,
Stefan

[1] https://gitbox.apache.org/

Fwd: [NOTICE] Mandatory relocation of Apache git repositories on git-wip-us.apache.org

[Shawn McKinney]

Hello,

Currently there are four fortress repos on git-wip-us affected by this change.
https://git-wip-us.apache.org/repos/asf/directory-fortress-core.git
https://git-wip-us.apache.org/repos/asf/directory-fortress-realm.git
https://git-wip-us.apache.org/repos/asf/directory-fortress-commander.git
https://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse.git 
<https://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse.git>
Do we have others?  Any recommendations here?
Shawn

> Begin forwarded message:
> 
> From: Daniel Gruno 
> Subject: [NOTICE] Mandatory relocation of Apache git repositories on 
> git-wip-us.apache.org
> Date: December 7, 2018 at 10:52:36 AM CST
> To: "us...@infra.apache.org" 
> Reply-To: d...@community.apache.org
> Reply-To: "us...@infra.apache.org" 
> 
> [IF YOUR PROJECT DOES NOT HAVE GIT REPOSITORIES ON GIT-WIP-US PLEASE
> DISREGARD THIS EMAIL; IT WAS MASS-MAILED TO ALL APACHE PROJECTS]
> 
> Hello Apache projects,
> 
> I am writing to you because you may have git repositories on the
> git-wip-us server, which is slated to be decommissioned in the coming
> months. All repositories will be moved to the new gitbox service which
> includes direct write access on github as well as the standard ASF
> commit access via gitbox.apache.org.
> 
> ## Why this move? ##
> The move comes as a result of retiring the git-wip service, as the
> hardware it runs on is longing for retirement. In lieu of this, we
> have decided to consolidate the two services (git-wip and gitbox), to
> ease the management of our repository systems and future-proof the
> underlying hardware. The move is fully automated, and ideally, nothing
> will change in your workflow other than added features and access to
> GitHub.
> 
> ## Timeframe for relocation ##
> Initially, we are asking that projects voluntarily request to move
> their repositories to gitbox, hence this email. The voluntary
> timeframe is between now and January 9th 2019, during which projects
> are free to either move over to gitbox or stay put on git-wip. After
> this phase, we will be requiring the remaining projects to move within
> one month, after which we will move the remaining projects over.
> 
> To have your project moved in this initial phase, you will need:
> 
> - Consensus in the project (documented via the mailing list)
> - File a JIRA ticket with INFRA to voluntarily move your project repos
>  over to gitbox (as stated, this is highly automated and will take
>  between a minute and an hour, depending on the size and number of
>  your repositories)
> 
> To sum up the preliminary timeline;
> 
> - December 9th 2018 -> January 9th 2019: Voluntary (coordinated)
>  relocation
> - January 9th -> February 6th: Mandated (coordinated) relocation
> - February 7th: All remaining repositories are mass migrated.
> 
> This timeline may change to accommodate various scenarios.
> 
> ## Using GitHub with ASF repositories ##
> When your project has moved, you are free to use either the ASF
> repository system (gitbox.apache.org) OR GitHub for your development
> and code pushes. To be able to use GitHub, please follow the primer
> at: https://reference.apache.org/committer/github
> 
> 
> We appreciate your understanding of this issue, and hope that your
> project can coordinate voluntarily moving your repositories in a
> timely manner.
> 
> All settings, such as commit mail targets, issue linking, PR
> notification schemes etc will automatically be migrated to gitbox as
> well.
> 
> With regards, Daniel on behalf of ASF Infra.
> 
> PS:For inquiries, please reply to us...@infra.apache.org, not your project's 
> dev list :-).
> 
> 
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@community.apache.org
> For additional commands, e-mail: dev-h...@community.apache.org
> 



signature.asc
Description: Message signed with OpenPGP

[NOTICE] Mandatory relocation of Apache git repositories on git-wip-us.apache.org

[Daniel Gruno]

[IF YOUR PROJECT DOES NOT HAVE GIT REPOSITORIES ON GIT-WIP-US PLEASE
 DISREGARD THIS EMAIL; IT WAS MASS-MAILED TO ALL APACHE PROJECTS]

Hello Apache projects,

I am writing to you because you may have git repositories on the
git-wip-us server, which is slated to be decommissioned in the coming
months. All repositories will be moved to the new gitbox service which
includes direct write access on github as well as the standard ASF
commit access via gitbox.apache.org.

## Why this move? ##
The move comes as a result of retiring the git-wip service, as the
hardware it runs on is longing for retirement. In lieu of this, we
have decided to consolidate the two services (git-wip and gitbox), to
ease the management of our repository systems and future-proof the
underlying hardware. The move is fully automated, and ideally, nothing
will change in your workflow other than added features and access to
GitHub.

## Timeframe for relocation ##
Initially, we are asking that projects voluntarily request to move
their repositories to gitbox, hence this email. The voluntary
timeframe is between now and January 9th 2019, during which projects
are free to either move over to gitbox or stay put on git-wip. After
this phase, we will be requiring the remaining projects to move within
one month, after which we will move the remaining projects over.

To have your project moved in this initial phase, you will need:

- Consensus in the project (documented via the mailing list)
- File a JIRA ticket with INFRA to voluntarily move your project repos
  over to gitbox (as stated, this is highly automated and will take
  between a minute and an hour, depending on the size and number of
  your repositories)

To sum up the preliminary timeline;

- December 9th 2018 -> January 9th 2019: Voluntary (coordinated)
  relocation
- January 9th -> February 6th: Mandated (coordinated) relocation
- February 7th: All remaining repositories are mass migrated.

This timeline may change to accommodate various scenarios.

## Using GitHub with ASF repositories ##
When your project has moved, you are free to use either the ASF
repository system (gitbox.apache.org) OR GitHub for your development
and code pushes. To be able to use GitHub, please follow the primer
at: https://reference.apache.org/committer/github


We appreciate your understanding of this issue, and hope that your
project can coordinate voluntarily moving your repositories in a
timely manner.

All settings, such as commit mail targets, issue linking, PR
notification schemes etc will automatically be migrated to gitbox as
well.

With regards, Daniel on behalf of ASF Infra.

PS:For inquiries, please reply to us...@infra.apache.org, not your 
project's dev list :-).

[jira] [Created] (FC-257) Combine the four git repos into one

[Shawn McKinney (JIRA)]

Shawn McKinney created FC-257:
-

 Summary: Combine the four git repos into one
 Key: FC-257
 URL: https://issues.apache.org/jira/browse/FC-257
 Project: FORTRESS
  Issue Type: Improvement
Affects Versions: 2.0.2
Reporter: Shawn McKinney
Assignee: Shawn McKinney
 Fix For: 3.0.1-RC1


Combine the four repos, core, web, realm and rest into one. 

 

Still need to maintain separate poms and artifacts only now all stored within a 
single get repository.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

Re: directory-kerby git commit: Add HTTPS certification deployment tool.

[Colm O hEigeartaigh]

Hi,

Shouldn't this commit go on trunk instead? What is the current difference
between the has_project and trunk branches?

Colm.

On Thu, May 3, 2018 at 3:10 AM,  wrote:

> Repository: directory-kerby
> Updated Branches:
>   refs/heads/has-project aab4c7409 -> b5b9595f1
>
>
> Add HTTPS certification deployment tool.
>
>
> Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
> Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/
> commit/b5b9595f
> Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/b5b9595f
> Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/b5b9595f
>
> Branch: refs/heads/has-project
> Commit: b5b9595f19b4509168b9dbc08cfe6247d925e7e1
> Parents: aab4c74
> Author: zenglinx 
> Authored: Thu May 3 10:10:29 2018 +0800
> Committer: zenglinx 
> Committed: Thu May 3 10:10:29 2018 +0800
>
> --
>  has/doc/deploy-https.md |  28 +-
>  has/doc/has-start.md|   4 +-
>  .../src/main/resources/ssl-client.conf.template |   1 +
>  .../server/hadmin/local/HadminLocalTool.java|   8 +-
>  .../cmd/AddPrincipalsAndDeployKeytabsCmd.java   |  15 +-
>  .../hadmin/local/cmd/DeployHTTPSCertsCmd.java   | 310 +++
>  6 files changed, 355 insertions(+), 11 deletions(-)
> --
>
>
> http://git-wip-us.apache.org/repos/asf/directory-kerby/
> blob/b5b9595f/has/doc/deploy-https.md
> --
> diff --git a/has/doc/deploy-https.md b/has/doc/deploy-https.md
> index 4ae328c..05568fc 100644
> --- a/has/doc/deploy-https.md
> +++ b/has/doc/deploy-https.md
> @@ -38,7 +38,33 @@ When you finish, the {trustAll} file will have the
> certificates from all nodes.
>  keytool -list -v -keystore {trustAll}
>  ```
>
> -## 7. Edit the Configuration files
> +## 7. Use Hadmin tool to create new certificate files when adding
> machines of cluster
> +When adding machines of cluster, we also provide shell tool to create
> keystore files and update the truststore file.
> +With this tool, user just need one operation, and the certificate and
> configuration files will be generated and deployed.
> +
> +```
> +cd HAS/has-dist
> +echo node1,node2,node3 > hosts.txt
> +
> +// Start local hadmin tool
> +sh bin/hadmin-local.sh  -k 
> +
> +// deploy_certs [Hosts-File] [truststore_file] [truststore_password]
> [Where-to-Deploy] [SSH-Port] [UserName] [Password]
> +// truststore_file: The absolute path of the above trustAll file
> +// truststore_password: Password of the truststore file
> +// Where-to-Deploy: The place to store the keystore, truststore,
> ssl-client.conf
> +// SSH-Port: The port of SSH
> +// UserName: The host user name
> +// Password: The host password
> +// All the hosts with the same user and password
> +HadminLocalTool.local: deploy_https hosts.txt /etc/has/truststore.jks
> 123456 /etc/has 22 username password
> +HadminLocalTool.local: exit
> +```
> +
> +> Note that the same keypassword and password of keystore is given in the
> generated ssl-client.conf.
> +
> +
> +## 8. Edit the Configuration files
>  > Deploy {keystore} and {trustAll} files and config
> //ssl-server.conf for HAS server
>  ```
>  ssl.server.keystore.location = {path to keystore}
>
> http://git-wip-us.apache.org/repos/asf/directory-kerby/
> blob/b5b9595f/has/doc/has-start.md
> --
> diff --git a/has/doc/has-start.md b/has/doc/has-start.md
> index 5d92ae7..46b1d95 100644
> --- a/has/doc/has-start.md
> +++ b/has/doc/has-start.md
> @@ -201,12 +201,12 @@ echo { \
>  // Start local hadmin tool
>  sh bin/hadmin-local.sh  -k 
>
> -// deploy_keytabs [HostRoles-File] [Where-to-Deploy] [UserName] [Password]
> +// deploy_keytabs [HostRoles-File] [Where-to-Deploy] [SSH-Port]
> [UserName] [Password]
>  // Where-to-Deploy: The place to store the keytabs
>  // UserName: The host user name
>  // Password: The host password
>  // All the hosts with the same user and password
> -HadminLocalTool.local: deploy_keytabs hosts.txt /etc/has/ username
> password
> +HadminLocalTool.local: deploy_keytabs hosts.txt 22 /etc/has/ username
> password
>  HadminLocalTool.local: exit
>  ```
>  Note: The admin.keytab file is created by the kdcinit. In local hadmin
> tool, you can type "?" for help.
>
> http://git-wip-us.apache.org/repos/asf/directory-kerby/
> blob/b5b9595f/has/has-client/src/main/resources/ssl-client.conf.template
> --

Re: Merge "value" branches to trunk/master and move to git

[Emmanuel Lécharny]

Le 22/12/2017 à 10:07, Stefan Seelmann a écrit :
> On 12/21/2017 10:06 PM, Emmanuel Lécharny wrote:
>> lokking at the latest commits, I see :
>>
>>
>> [directory-ldap-api] 01/01: Merge branch 'master' into shared-value
>>
>> and
>>
>> from 19af188  Merge branch 'master' into apacheds-value
>>
>>
>> Should I understand you merged the trunk with the value branch for both
>> the API and ApacheDS ? or is the Master also contain the value branch
>> updates ?
> 
> I did the following:
> 
> 1. git checkout shared-value
> 2. git merge -s ours master
> 3. git checkout master
> 4. git merge shared-value
> 
> In (2) I merged the master (trunk) into the value branch using the
> "ours" merge strategy which means the value branch head wins, see [1]
> for details. Then in (4) the result was merged back to master,
> unfortunately I did a fast-forward merge so no explicit commit
> value->master is visible.
> 
> But yes, the master branches contain all changes of the value branches.

Ok, thanks. That means we can now consider the value branch a dead branch.

Happy christmas !!


-- 
Emmanuel Lecharny

Symas.com
directory.apache.org

Re: Merge "value" branches to trunk/master and move to git

[Stefan Seelmann]

On 12/21/2017 10:06 PM, Emmanuel Lécharny wrote:
> lokking at the latest commits, I see :
> 
> 
> [directory-ldap-api] 01/01: Merge branch 'master' into shared-value
> 
> and
> 
> from 19af188  Merge branch 'master' into apacheds-value
> 
> 
> Should I understand you merged the trunk with the value branch for both
> the API and ApacheDS ? or is the Master also contain the value branch
> updates ?

I did the following:

1. git checkout shared-value
2. git merge -s ours master
3. git checkout master
4. git merge shared-value

In (2) I merged the master (trunk) into the value branch using the
"ours" merge strategy which means the value branch head wins, see [1]
for details. Then in (4) the result was merged back to master,
unfortunately I did a fast-forward merge so no explicit commit
value->master is visible.

But yes, the master branches contain all changes of the value branches.

Kind Regards,
Stefan

[1] https://git-scm.com/docs/git-merge#git-merge-ours

Re: Merge "value" branches to trunk/master and move to git

[Emmanuel Lécharny]

Le 13/12/2017 à 00:59, Stefan Seelmann a écrit :
> On 12/12/2017 11:44 PM, Emmanuel Lécharny wrote:
>> Le 12/12/2017 à 20:33, Stefan Seelmann a écrit :
> ApacheDS builds too. Now I have some OSGi related issues in Studio build
> that I try to fix...

 Great !!

 I hope it's not going to painful to fix... Last time I worked on it, it
 took me a full day :/
>>>
>>> Studio build is also successful. I'm going to merge the value branches
>>> to master for ldap-api, server, and studio.
>>
>> +1 !
>>
>> That will solve numerous issues in the server (and in studio)
> 
> Done.
> 
> ldap-api and server build fine on Jenkins. Studio still has some test
> errors on Jenkins (but worked on my machine), I'll investigate in the
> next days.

Hi Stefan

lokking at the latest commits, I see :


[directory-ldap-api] 01/01: Merge branch 'master' into shared-value

and

from 19af188  Merge branch 'master' into apacheds-value


Should I understand you merged the trunk with the value branch for both
the API and ApacheDS ? or is the Master also contain the value branch
updates ?




Thanks !


-- 
Emmanuel Lecharny

Symas.com
directory.apache.org

Re: Merge "value" branches to trunk/master and move to git

[Stefan Seelmann]

On 12/12/2017 11:44 PM, Emmanuel Lécharny wrote:
> Le 12/12/2017 à 20:33, Stefan Seelmann a écrit :
 ApacheDS builds too. Now I have some OSGi related issues in Studio build
 that I try to fix...
>>>
>>> Great !!
>>>
>>> I hope it's not going to painful to fix... Last time I worked on it, it
>>> took me a full day :/
>>
>> Studio build is also successful. I'm going to merge the value branches
>> to master for ldap-api, server, and studio.
> 
> +1 !
> 
> That will solve numerous issues in the server (and in studio)

Done.

ldap-api and server build fine on Jenkins. Studio still has some test
errors on Jenkins (but worked on my machine), I'll investigate in the
next days.

Kind Regards,
Stefan

Re: Merge "value" branches to trunk/master and move to git

[Emmanuel Lécharny]

Le 12/12/2017 à 20:33, Stefan Seelmann a écrit :
>>> ApacheDS builds too. Now I have some OSGi related issues in Studio build
>>> that I try to fix...
>>
>> Great !!
>>
>> I hope it's not going to painful to fix... Last time I worked on it, it
>> took me a full day :/
> 
> Studio build is also successful. I'm going to merge the value branches
> to master for ldap-api, server, and studio.

+1 !


That will solve numerous issues in the server (and in studio)

-- 
Emmanuel Lecharny

Symas.com
directory.apache.org

Re: Merge "value" branches to trunk/master and move to git

[Stefan Seelmann]

>> ApacheDS builds too. Now I have some OSGi related issues in Studio build
>> that I try to fix...
> 
> Great !!
> 
> I hope it's not going to painful to fix... Last time I worked on it, it
> took me a full day :/

Studio build is also successful. I'm going to merge the value branches
to master for ldap-api, server, and studio.

Kind Regards,
Stefan

Re: Merge "value" branches to trunk/master and move to git

[Emmanuel Lécharny]

Le 06/12/2017 à 22:40, Stefan Seelmann a écrit :
> On 12/01/2017 01:40 AM, Emmanuel Lécharny wrote:
>>
>>
>> Le 30/11/2017 à 22:32, Stefan Seelmann a écrit :
>>> On 10/01/2017 09:19 PM, Stefan Seelmann wrote:
>>>> Hi,
>>>>
>>>> For API, server, and studio we have the "value" branches. Should we
>>>> merge them back to trunk/master?
>>>>
>>>> Second question is if we should move to git/gitbox with all the
>>>> remaining projects (server, studio, mavibot, project)
>>>
>>> Now that git migration is done back to the first question :)
>>>
>>> Can we merge the "value" branches to master?
>>>
>>> The branch exists in
>>> * Mavibot
>>> * LDAP API
>>> * Server
>>> * Studio
>>>
>>> The Mavibot branch doesn't compile. However I think we don't need to
>>> merge it right now because the Server branch still uses 1.0.0.M8 so
>>> doesn't depend on the branch.
>>>
>>> The other 3 branches compile but there are some test failures (~40 in
>>> API, ~80 in Server, 3 in Studio excluing UI tests). Otherwise it looks
>>> good, I can start Studio and run an ApacheDS can connect to it :)
>>>
>>> I'd suggest we first try to fix the tests in the branch first. I'll try
>>> to help, probably not much in the next days but next week then.
>>>
>>> Kind Regards,
>>> Stefan
>>>
>>
>> FTR, with my last fixes, teh LDAP API value branch now builds
> 
> ApacheDS builds too. Now I have some OSGi related issues in Studio build
> that I try to fix...

Great !!

I hope it's not going to painful to fix... Last time I worked on it, it
took me a full day :/

-- 
Emmanuel Lecharny

Symas.com
directory.apache.org

Re: Merge "value" branches to trunk/master and move to git

[Stefan Seelmann]

On 12/01/2017 01:40 AM, Emmanuel Lécharny wrote:
> 
> 
> Le 30/11/2017 à 22:32, Stefan Seelmann a écrit :
>> On 10/01/2017 09:19 PM, Stefan Seelmann wrote:
>>> Hi,
>>>
>>> For API, server, and studio we have the "value" branches. Should we
>>> merge them back to trunk/master?
>>>
>>> Second question is if we should move to git/gitbox with all the
>>> remaining projects (server, studio, mavibot, project)
>>
>> Now that git migration is done back to the first question :)
>>
>> Can we merge the "value" branches to master?
>>
>> The branch exists in
>> * Mavibot
>> * LDAP API
>> * Server
>> * Studio
>>
>> The Mavibot branch doesn't compile. However I think we don't need to
>> merge it right now because the Server branch still uses 1.0.0.M8 so
>> doesn't depend on the branch.
>>
>> The other 3 branches compile but there are some test failures (~40 in
>> API, ~80 in Server, 3 in Studio excluing UI tests). Otherwise it looks
>> good, I can start Studio and run an ApacheDS can connect to it :)
>>
>> I'd suggest we first try to fix the tests in the branch first. I'll try
>> to help, probably not much in the next days but next week then.
>>
>> Kind Regards,
>> Stefan
>>
> 
> FTR, with my last fixes, teh LDAP API value branch now builds

ApacheDS builds too. Now I have some OSGi related issues in Studio build
that I try to fix...

Re: Merge "value" branches to trunk/master and move to git

[Emmanuel Lécharny]

Le 30/11/2017 à 22:32, Stefan Seelmann a écrit :
> On 10/01/2017 09:19 PM, Stefan Seelmann wrote:
>> Hi,
>>
>> For API, server, and studio we have the "value" branches. Should we
>> merge them back to trunk/master?
>>
>> Second question is if we should move to git/gitbox with all the
>> remaining projects (server, studio, mavibot, project)
> 
> Now that git migration is done back to the first question :)
> 
> Can we merge the "value" branches to master?
> 
> The branch exists in
> * Mavibot
> * LDAP API
> * Server
> * Studio
> 
> The Mavibot branch doesn't compile. However I think we don't need to
> merge it right now because the Server branch still uses 1.0.0.M8 so
> doesn't depend on the branch.
> 
> The other 3 branches compile but there are some test failures (~40 in
> API, ~80 in Server, 3 in Studio excluing UI tests). Otherwise it looks
> good, I can start Studio and run an ApacheDS can connect to it :)
> 
> I'd suggest we first try to fix the tests in the branch first. I'll try
> to help, probably not much in the next days but next week then.
> 
> Kind Regards,
> Stefan
> 

FTR, with my last fixes, teh LDAP API value branch now builds


-- 
Emmanuel Lecharny

Symas.com
directory.apache.org

Re: Merge "value" branches to trunk/master and move to git

[Emmanuel Lécharny]

Le 30/11/2017 à 22:32, Stefan Seelmann a écrit :
> On 10/01/2017 09:19 PM, Stefan Seelmann wrote:
>> Hi,
>>
>> For API, server, and studio we have the "value" branches. Should we
>> merge them back to trunk/master?
>>
>> Second question is if we should move to git/gitbox with all the
>> remaining projects (server, studio, mavibot, project)
> Now that git migration is done back to the first question :)
>
> Can we merge the "value" branches to master?

I think that is the plan.
>
> The branch exists in
> * Mavibot
> * LDAP API
> * Server
> * Studio
>
> The Mavibot branch doesn't compile. However I think we don't need to
> merge it right now because the Server branch still uses 1.0.0.M8 so
> doesn't depend on the branch.
Right. I still have some fixes to apply in Mavibot to make it compile,
at least in trunk.
>
> The other 3 branches compile but there are some test failures (~40 in
> API, ~80 in Server, 3 in Studio excluing UI tests). Otherwise it looks
> good, I can start Studio and run an ApacheDS can connect to it :)

I have 2 errors in API, due to some late changes I have done - and I
just have fixed some of the other failures in ldap-model -. I haven't
yet checked apacheds, but I belive the failures are all due to teh
change I made in teh API, related to the isHR flag in Value (this is
related to an issue reported in Studio 3 weeks ago). This should not be
too complex to fix.
>
> I'd suggest we first try to fix the tests in the branch first. I'll try
> to help, probably not much in the next days but next week then.
I'll take the necessary time to get this fixed. This was building 1
month ago, I broke it. We both have little time to dedicate to that,
don't waste your time fixing my mistakes :-)


Once we get both API and ApacheDS building, yes, we can merge them in
trunk. Note that the API has changed, so it should probably be a 2.0 at
this point.

Thanks !

-- 
Emmanuel Lecharny

Symas.com
directory.apache.org

Re: Merge "value" branches to trunk/master and move to git

[Stefan Seelmann]

On 10/01/2017 09:19 PM, Stefan Seelmann wrote:
> Hi,
> 
> For API, server, and studio we have the "value" branches. Should we
> merge them back to trunk/master?
> 
> Second question is if we should move to git/gitbox with all the
> remaining projects (server, studio, mavibot, project)

Now that git migration is done back to the first question :)

Can we merge the "value" branches to master?

The branch exists in
* Mavibot
* LDAP API
* Server
* Studio

The Mavibot branch doesn't compile. However I think we don't need to
merge it right now because the Server branch still uses 1.0.0.M8 so
doesn't depend on the branch.

The other 3 branches compile but there are some test failures (~40 in
API, ~80 in Server, 3 in Studio excluing UI tests). Otherwise it looks
good, I can start Studio and run an ApacheDS can connect to it :)

I'd suggest we first try to fix the tests in the branch first. I'll try
to help, probably not much in the next days but next week then.

Kind Regards,
Stefan

Re: Git migration - Mavibot

[Stefan Seelmann]

On 11/26/2017 06:30 PM, Stefan Seelmann wrote:
> On 11/26/2017 07:51 AM, Emmanuel Lécharny wrote:
>>
>>
>> Le 25/11/2017 à 20:51, Stefan Seelmann a écrit :
>>> Somehow I missed Mavibot.
>>>
>>> I'll create the Gitbox repo. As there is no mirror yet I'll start a
>>> git-svn convert which takes several hours before I can push to Gitbox.
>>>
>>> Let me know if there is anything not yet committed.
>>
>> I still have some changes pending, but it's not really a problem, I can
>> apply them later on the git repo.
> 
> Done: https://gitbox.apache.org/repos/asf/directory-mavibot.git

FYI: request to make SVN directories read-only and to fix default
branches on GitHub:
https://issues.apache.org/jira/browse/INFRA-15446

Re: Git migration - Mavibot

[Emmanuel Lécharny]

Le 26/11/2017 à 18:30, Stefan Seelmann a écrit :
> On 11/26/2017 07:51 AM, Emmanuel Lécharny wrote:
>>
>> Le 25/11/2017 à 20:51, Stefan Seelmann a écrit :
>>> Somehow I missed Mavibot.
>>>
>>> I'll create the Gitbox repo. As there is no mirror yet I'll start a
>>> git-svn convert which takes several hours before I can push to Gitbox.
>>>
>>> Let me know if there is anything not yet committed.
>> I still have some changes pending, but it's not really a problem, I can
>> apply them later on the git repo.
> Done: https://gitbox.apache.org/repos/asf/directory-mavibot.git

great, thanks !

-- 
Emmanuel Lecharny

Symas.com
directory.apache.org

Re: Git migration - Mavibot

[Stefan Seelmann]

On 11/26/2017 07:51 AM, Emmanuel Lécharny wrote:
> 
> 
> Le 25/11/2017 à 20:51, Stefan Seelmann a écrit :
>> Somehow I missed Mavibot.
>>
>> I'll create the Gitbox repo. As there is no mirror yet I'll start a
>> git-svn convert which takes several hours before I can push to Gitbox.
>>
>> Let me know if there is anything not yet committed.
> 
> I still have some changes pending, but it's not really a problem, I can
> apply them later on the git repo.

Done: https://gitbox.apache.org/repos/asf/directory-mavibot.git

Re: Git migration - Mavibot

[Emmanuel Lécharny]

Le 25/11/2017 à 20:51, Stefan Seelmann a écrit :
> Somehow I missed Mavibot.
>
> I'll create the Gitbox repo. As there is no mirror yet I'll start a
> git-svn convert which takes several hours before I can push to Gitbox.
>
> Let me know if there is anything not yet committed.

I still have some changes pending, but it's not really a problem, I can
apply them later on the git repo.

-- 
Emmanuel Lecharny

Symas.com
directory.apache.org

Re: Git migration - Mavibot

[Stefan Seelmann]

Somehow I missed Mavibot.

I'll create the Gitbox repo. As there is no mirror yet I'll start a
git-svn convert which takes several hours before I can push to Gitbox.

Let me know if there is anything not yet committed.

Kind Regards,
Stefan

Re: Git migration - server and studio

[Stefan Seelmann]

On 11/23/2017 07:44 AM, Stefan Seelmann wrote:
> On 11/09/2017 11:08 PM, Emmanuel Lécharny wrote:
>>
>>
>> Le 09/11/2017 à 22:45, Stefan Seelmann a écrit :
>>> On 11/05/2017 03:06 PM, Stefan Seelmann wrote:
>>>> Server and Studio are the next repos.
>>>>
>>>> I created https://issues.apache.org/jira/browse/INFRA-15446 to delete
>>>> existing mirrors. Afterwards I'll create the Git repos in GitBox and
>>>> push the content of the existing Git mirror, including all branches and
>>>> tags.
> 
> It's done, infra (Gav) already created the gitbox repo and created
> master branch, the "value" branches are also there. I'll continue with
> cleanup at the weekend.
> 
> https://gitbox.apache.org/repos/asf/directory-server.git
> https://gitbox.apache.org/repos/asf/directory-studio.git

I updated the Jenkins jobs.

Update of pom.xml and release procedure I'd do after the value branches
are merged back to master.

Re: Git migration - server and studio

[Stefan Seelmann]

On 11/09/2017 11:08 PM, Emmanuel Lécharny wrote:
> 
> 
> Le 09/11/2017 à 22:45, Stefan Seelmann a écrit :
>> On 11/05/2017 03:06 PM, Stefan Seelmann wrote:
>>> Server and Studio are the next repos.
>>>
>>> I created https://issues.apache.org/jira/browse/INFRA-15446 to delete
>>> existing mirrors. Afterwards I'll create the Git repos in GitBox and
>>> push the content of the existing Git mirror, including all branches and
>>> tags.

It's done, infra (Gav) already created the gitbox repo and created
master branch, the "value" branches are also there. I'll continue with
cleanup at the weekend.

https://gitbox.apache.org/repos/asf/directory-server.git
https://gitbox.apache.org/repos/asf/directory-studio.git

Re: Git migration - server and studio

[Emmanuel Lécharny]

Le 09/11/2017 à 22:45, Stefan Seelmann a écrit :
> On 11/05/2017 03:06 PM, Stefan Seelmann wrote:
>> Server and Studio are the next repos.
>>
>> I created https://issues.apache.org/jira/browse/INFRA-15446 to delete
>> existing mirrors. Afterwards I'll create the Git repos in GitBox and
>> push the content of the existing Git mirror, including all branches and
>> tags.
>>
>> Please don't commit to Server and Studio meanwhile.
> The issue is not yet solved, sorry for that, feel free to commit anyway,
> don't want to block you.

I'm not blocked. I'm working on Mavibot atm, so all is ok.

Thanks for the feedback !

-- 
Emmanuel Lecharny

Symas.com
directory.apache.org

Re: Git migration - server and studio

[Stefan Seelmann]

On 11/05/2017 03:06 PM, Stefan Seelmann wrote:
> Server and Studio are the next repos.
> 
> I created https://issues.apache.org/jira/browse/INFRA-15446 to delete
> existing mirrors. Afterwards I'll create the Git repos in GitBox and
> push the content of the existing Git mirror, including all branches and
> tags.
> 
> Please don't commit to Server and Studio meanwhile.

The issue is not yet solved, sorry for that, feel free to commit anyway,
don't want to block you.

Kind Regards,
Stefan

Re: Git migration - server and studio

[Stefan Seelmann]

Server and Studio are the next repos.

I created https://issues.apache.org/jira/browse/INFRA-15446 to delete
existing mirrors. Afterwards I'll create the Git repos in GitBox and
push the content of the existing Git mirror, including all branches and
tags.

Please don't commit to Server and Studio meanwhile.

Kind Regards,
Stefan

Re: SVN and git mirror cleanup

[Stefan Seelmann]

On 10/28/2017 12:39 PM, Stefan Seelmann wrote:
> On 10/22/2017 09:06 PM, Stefan Seelmann wrote:
>> Hi all,
>>
>> we have some svn git mirrors that IMHO don't make sense anymore:
>>
>> directory-clients
>> * Last real change was back in 2010
>> * Replaced by ldap-api and kerby projects
>> * I'd also move it in SVN to "deceased" [1]
>>
>> directory-daemon
>> * Was moved to "deceased" [1] in 2010
>>
>> directory-installers
>> * Was moved to "deceased" [1] in 2010
>>
>> directory-shared
>> * Replaced by directory-ldap-api
>>
>> directory-skins
>> * Will be moved to new buildtools git repo
>>
>> directory-studio-plugin
>> * Was moved to "deceased" [1] in 2015, we now use Tycho
>>
>> See
>> * https://git.apache.org/ and ctrl-f for "directory-" and
>> * https://github.com/apache?utf8=%E2%9C%93&q=directory-
>>
>> I'll create an infra ticket to remove them within the next days if there
>> is no objection.
> 
> https://issues.apache.org/jira/browse/INFRA-15397

Resolved.

Re: Git migration - buildtools

[Stefan Seelmann]

On 10/28/2017 04:06 PM, Stefan Seelmann wrote:
> On 10/22/2017 08:42 PM, Stefan Seelmann wrote:
>> I'll continue with buildtools...
> 
> I'm still on it, here is an update:
> 
> I have to do a "git svn clone" for all four projects:
> a) skins
> b) checkstyle-configuration
> c) junit-addons
> d) docker
> 
> because for (a) the git mirror is outdated because the project was moved
> in SVN and for (b-d) no git mirror exists.
> 
> Then I merge them all into the new buildtools git repo and move into
> sub-folders. I only merge the trunk/master, there are no branches
> anyway, but we also loose the tags which should not be big problem for
> those side projects.
> 
> Finally it's required to create an aggregator pom.xml in buildtools and
> in future we are going to release (a-c) together. The Maven release
> plugin doesn't (currently) support to release from sub-folders within a
> git repo. I don't think that's a problem, we don't release them anyway
> very often.

Done.

Additionally:
* Created a release, see separate vote thread
* Changed Jenkins builds, created dir-buildtools-deploy, removed the
previous
* Updated readme, added release process

Kind Regards,
Stefan

Re: Merge "value" branches to trunk/master and move to git

[Emmanuel Lécharny]

Le 28/10/2017 à 15:38, Stefan Seelmann a écrit :
> On 10/04/2017 09:33 AM, Emmanuel Lécharny wrote:
>> Side note : give me up to the end of this week so that I can commit some
>> pending changes I have for various projects, before reqesting the migration
> Hi Emmanuel,
>
> did you commit all changes to ApacheDS and Studio value branches? I'd
> like to start git migration of those soon.

Actually, I'm trying to migrate to ehcache 3.4.0 (as this is what
Mavibot is using) and it's not exactly a piece of cake. I expect to be
done this week end though.

I'll keep you informed.

-- 
Emmanuel Lecharny

Symas.com
directory.apache.org

Re: Git migration - buildtools

[Emmanuel Lécharny]

Le 28/10/2017 à 16:06, Stefan Seelmann a écrit :
> On 10/22/2017 08:42 PM, Stefan Seelmann wrote:
>> I'll continue with buildtools...
> I'm still on it, here is an update:
>
> I have to do a "git svn clone" for all four projects:
> a) skins
> b) checkstyle-configuration
> c) junit-addons
> d) docker
>
> because for (a) the git mirror is outdated because the project was moved
> in SVN and for (b-d) no git mirror exists.
>
> Then I merge them all into the new buildtools git repo and move into
> sub-folders. I only merge the trunk/master, there are no branches
> anyway, but we also loose the tags which should not be big problem for
> those side projects.

The tags are still in the svn repo. Enough to point on them in the web
site, just in case. But you are right, it's not really a problem.
>
> Finally it's required to create an aggregator pom.xml in buildtools and
> in future we are going to release (a-c) together. The Maven release
> plugin doesn't (currently) support to release from sub-folders within a
> git repo. I don't think that's a problem, we don't release them anyway
> very often.
True.


Thanks for dealing with that, Stefan !

-- 
Emmanuel Lecharny

Symas.com
directory.apache.org

Re: Git migration - buildtools

[Stefan Seelmann]

On 10/22/2017 08:42 PM, Stefan Seelmann wrote:
> I'll continue with buildtools...

I'm still on it, here is an update:

I have to do a "git svn clone" for all four projects:
a) skins
b) checkstyle-configuration
c) junit-addons
d) docker

because for (a) the git mirror is outdated because the project was moved
in SVN and for (b-d) no git mirror exists.

Then I merge them all into the new buildtools git repo and move into
sub-folders. I only merge the trunk/master, there are no branches
anyway, but we also loose the tags which should not be big problem for
those side projects.

Finally it's required to create an aggregator pom.xml in buildtools and
in future we are going to release (a-c) together. The Maven release
plugin doesn't (currently) support to release from sub-folders within a
git repo. I don't think that's a problem, we don't release them anyway
very often.

Kind Regards,
Stefan

Re: Merge "value" branches to trunk/master and move to git

[Emmanuel Lécharny]

Le 28/10/2017 à 15:38, Stefan Seelmann a écrit :
> On 10/04/2017 09:33 AM, Emmanuel Lécharny wrote:
>> Side note : give me up to the end of this week so that I can commit some
>> pending changes I have for various projects, before reqesting the migration
> Hi Emmanuel,
>
> did you commit all changes to ApacheDS and Studio value branches? I'd
> like to start git migration of those soon.

I still have some pending changes in ApacheDS value branch, Studio value
branch is ok.

I'll check in what is mising on apacheDS this afternoon

-- 
Emmanuel Lecharny

Symas.com
directory.apache.org

Re: Merge "value" branches to trunk/master and move to git

[Stefan Seelmann]

On 10/04/2017 09:33 AM, Emmanuel Lécharny wrote:
> Side note : give me up to the end of this week so that I can commit some
> pending changes I have for various projects, before reqesting the migration

Hi Emmanuel,

did you commit all changes to ApacheDS and Studio value branches? I'd
like to start git migration of those soon.

Kind Regards,
Stefan

Re: SVN and git mirror cleanup

[Stefan Seelmann]

On 10/22/2017 09:06 PM, Stefan Seelmann wrote:
> Hi all,
> 
> we have some svn git mirrors that IMHO don't make sense anymore:
> 
> directory-clients
> * Last real change was back in 2010
> * Replaced by ldap-api and kerby projects
> * I'd also move it in SVN to "deceased" [1]
> 
> directory-daemon
> * Was moved to "deceased" [1] in 2010
> 
> directory-installers
> * Was moved to "deceased" [1] in 2010
> 
> directory-shared
> * Replaced by directory-ldap-api
> 
> directory-skins
> * Will be moved to new buildtools git repo
> 
> directory-studio-plugin
> * Was moved to "deceased" [1] in 2015, we now use Tycho
> 
> See
> * https://git.apache.org/ and ctrl-f for "directory-" and
> * https://github.com/apache?utf8=%E2%9C%93&q=directory-
> 
> I'll create an infra ticket to remove them within the next days if there
> is no objection.

https://issues.apache.org/jira/browse/INFRA-15397

Re: SVN and git mirror cleanup

[Emmanuel Lécharny]

FYI :


I was trying to update the 'sources' page on the web site. Here is the
current status for all the svn/git/github repos :


github :

directory-buildtools            currently empty, will gather skins,
checkstyle-configuration, docker     nd junit-addons
directory-clients               partially deceased (kerberos-client will
be killed, as Kerby already does the job)
directory-daemon                deceased
directory-fortress-commander    ok
directory-fortress-core     ok
directory-fortress-enmasse      ok
directory-fortress-realm        ok
directory-installers            deceased
directory-kerby                 ok
directory-ldap-api          ok
directory-project           ok
directory-server                ok (was apacheds)
directory-shared                deceased
directory-studio                ok
directory-samples               deceased
directory-skins             to be removed
directory-studio-plugins        deceased

Need to be created :

directory-escimo                or do we wait for sparrow ?
directory-mavibot               
directory-site                   


Gitbox :


directory-buildtools            ok
directory-ldap-api              ok
directory-project               ok

We need to migrate the git-wip-us projects to gitbox, and to create the
following project :

directory-server           (was apacheds)
directory-mavibot
directory-site
directory-studio

git-wip-us :


directory-fortress-core     to be migrated to gitbox
directory-fortress-commander    to be migrated to gitbox
directory-fortress-enmasse  to be migrated to gitbox
directory-fortress-realm        to be migrated to gitbox
directory-kerby             to be migrated to gitbox


git-apache.org (read only repository) :
---
directory-client                will be deleted
directory-daemon                will be deleted
directory-fortress-commander    will be deleted
directory-fortress-core     will be deleted
directory-fortress-enmasse  will be deleted
directory-fortress-realm        will be deleted
directory-installers            will be deleted
directory-kerby             will be deleted
directory-samples               will be deleted
directory-server                will be deleted
directory-shared                will be deleted
directory-skins             will be deleted
directory-studio-plugins        will be deleted
directory-studio                will be deleted


SVN trunks :


apacheds                                to bemigrated to gitbox, renamed
directory-server
buildtools/checkstyle-configuration to bemigrated to gitbox
buildtools/docker                       to bemigrated to gitbox, no
trunk/tags/branches
buildtools/junit-addons             to bemigrated to gitbox
buildtools/skins                        to bemigrated to gitbox
clients                             ldap client is deceased,
kerberos client should die
documentation/apacheds-manuals          deceased
documentation/ldap-api-manuals      deceased
documentation/samples               deceased
escimo                                  wait for Sparrow ?
jdbm                                    soon deceased, no need to migrate it
mavibot                             to bemigrated to gitbox
project                             moved to gitbox
shared                                  moved to gitbox LDAP-API
site                                    to bemigrated to gitbox
studio                              to bemigrated to gitbox






-- 
Emmanuel Lecharny

Symas.com
directory.apache.org

Re: SVN and git mirror cleanup

[Colm O hEigeartaigh]

+1.


On Mon, Oct 23, 2017 at 8:40 AM, Shawn McKinney 
wrote:

> +1
>
> Shawn
>
> > On Oct 22, 2017, at 8:10 PM, Zheng, Kai  wrote:
> >
> > LGTM. Thanks Emmanuel!
> >
> > Regards,
> > Kai
> >
> > -Original Message-
> > From: Emmanuel Lécharny [mailto:elecha...@gmail.com]
> > Sent: Monday, October 23, 2017 8:22 AM
> > To: dev@directory.apache.org
> > Subject: Re: SVN and git mirror cleanup
> >
> > No objection from me.
> >
> >
> > Thanks for dealing with this, Stefan !
> >
> >
> > Le 22/10/2017 à 21:06, Stefan Seelmann a écrit :
> >> Hi all,
> >>
> >> we have some svn git mirrors that IMHO don't make sense anymore:
> >>
> >> directory-clients
> >> * Last real change was back in 2010
> >> * Replaced by ldap-api and kerby projects
> >> * I'd also move it in SVN to "deceased" [1]
> >>
> >> directory-daemon
> >> * Was moved to "deceased" [1] in 2010
> >>
> >> directory-installers
> >> * Was moved to "deceased" [1] in 2010
> >>
> >> directory-shared
> >> * Replaced by directory-ldap-api
> >>
> >> directory-skins
> >> * Will be moved to new buildtools git repo
> >>
> >> directory-studio-plugin
> >> * Was moved to "deceased" [1] in 2015, we now use Tycho
> >>
> >> See
> >> * https://git.apache.org/ and ctrl-f for "directory-" and
> >> * https://github.com/apache?utf8=%E2%9C%93&q=directory-
> >>
> >> I'll create an infra ticket to remove them within the next days if
> >> there is no objection.
> >>
> >> Kind Regards,
> >> Stefan
> >>
> >> [1] https://svn.apache.org/repos/asf/directory/deceased/
> >
> > --
> > Emmanuel Lecharny
> >
> > Symas.com
> > directory.apache.org
> >
>
>


-- 
Colm O hEigeartaigh

Talend Community Coder
http://coders.talend.com

Re: SVN and git mirror cleanup

[Shawn McKinney]

+1

Shawn

> On Oct 22, 2017, at 8:10 PM, Zheng, Kai  wrote:
> 
> LGTM. Thanks Emmanuel!
> 
> Regards,
> Kai
> 
> -Original Message-
> From: Emmanuel Lécharny [mailto:elecha...@gmail.com] 
> Sent: Monday, October 23, 2017 8:22 AM
> To: dev@directory.apache.org
> Subject: Re: SVN and git mirror cleanup
> 
> No objection from me.
> 
> 
> Thanks for dealing with this, Stefan !
> 
> 
> Le 22/10/2017 à 21:06, Stefan Seelmann a écrit :
>> Hi all,
>> 
>> we have some svn git mirrors that IMHO don't make sense anymore:
>> 
>> directory-clients
>> * Last real change was back in 2010
>> * Replaced by ldap-api and kerby projects
>> * I'd also move it in SVN to "deceased" [1]
>> 
>> directory-daemon
>> * Was moved to "deceased" [1] in 2010
>> 
>> directory-installers
>> * Was moved to "deceased" [1] in 2010
>> 
>> directory-shared
>> * Replaced by directory-ldap-api
>> 
>> directory-skins
>> * Will be moved to new buildtools git repo
>> 
>> directory-studio-plugin
>> * Was moved to "deceased" [1] in 2015, we now use Tycho
>> 
>> See
>> * https://git.apache.org/ and ctrl-f for "directory-" and
>> * https://github.com/apache?utf8=%E2%9C%93&q=directory-
>> 
>> I'll create an infra ticket to remove them within the next days if 
>> there is no objection.
>> 
>> Kind Regards,
>> Stefan
>> 
>> [1] https://svn.apache.org/repos/asf/directory/deceased/
> 
> --
> Emmanuel Lecharny
> 
> Symas.com
> directory.apache.org
> 

RE: SVN and git mirror cleanup

[Zheng, Kai]

LGTM. Thanks Emmanuel!

Regards,
Kai

-Original Message-
From: Emmanuel Lécharny [mailto:elecha...@gmail.com] 
Sent: Monday, October 23, 2017 8:22 AM
To: dev@directory.apache.org
Subject: Re: SVN and git mirror cleanup

No objection from me.


Thanks for dealing with this, Stefan !


Le 22/10/2017 à 21:06, Stefan Seelmann a écrit :
> Hi all,
>
> we have some svn git mirrors that IMHO don't make sense anymore:
>
> directory-clients
> * Last real change was back in 2010
> * Replaced by ldap-api and kerby projects
> * I'd also move it in SVN to "deceased" [1]
>
> directory-daemon
> * Was moved to "deceased" [1] in 2010
>
> directory-installers
> * Was moved to "deceased" [1] in 2010
>
> directory-shared
> * Replaced by directory-ldap-api
>
> directory-skins
> * Will be moved to new buildtools git repo
>
> directory-studio-plugin
> * Was moved to "deceased" [1] in 2015, we now use Tycho
>
> See
> * https://git.apache.org/ and ctrl-f for "directory-" and
> * https://github.com/apache?utf8=%E2%9C%93&q=directory-
>
> I'll create an infra ticket to remove them within the next days if 
> there is no objection.
>
> Kind Regards,
> Stefan
>
> [1] https://svn.apache.org/repos/asf/directory/deceased/

--
Emmanuel Lecharny

Symas.com
directory.apache.org

Re: SVN and git mirror cleanup

[Emmanuel Lécharny]

No objection from me.


Thanks for dealing with this, Stefan !


Le 22/10/2017 à 21:06, Stefan Seelmann a écrit :
> Hi all,
>
> we have some svn git mirrors that IMHO don't make sense anymore:
>
> directory-clients
> * Last real change was back in 2010
> * Replaced by ldap-api and kerby projects
> * I'd also move it in SVN to "deceased" [1]
>
> directory-daemon
> * Was moved to "deceased" [1] in 2010
>
> directory-installers
> * Was moved to "deceased" [1] in 2010
>
> directory-shared
> * Replaced by directory-ldap-api
>
> directory-skins
> * Will be moved to new buildtools git repo
>
> directory-studio-plugin
> * Was moved to "deceased" [1] in 2015, we now use Tycho
>
> See
> * https://git.apache.org/ and ctrl-f for "directory-" and
> * https://github.com/apache?utf8=%E2%9C%93&q=directory-
>
> I'll create an infra ticket to remove them within the next days if there
> is no objection.
>
> Kind Regards,
> Stefan
>
> [1] https://svn.apache.org/repos/asf/directory/deceased/

-- 
Emmanuel Lecharny

Symas.com
directory.apache.org

SVN and git mirror cleanup

[Stefan Seelmann]

Hi all,

we have some svn git mirrors that IMHO don't make sense anymore:

directory-clients
* Last real change was back in 2010
* Replaced by ldap-api and kerby projects
* I'd also move it in SVN to "deceased" [1]

directory-daemon
* Was moved to "deceased" [1] in 2010

directory-installers
* Was moved to "deceased" [1] in 2010

directory-shared
* Replaced by directory-ldap-api

directory-skins
* Will be moved to new buildtools git repo

directory-studio-plugin
* Was moved to "deceased" [1] in 2015, we now use Tycho

See
* https://git.apache.org/ and ctrl-f for "directory-" and
* https://github.com/apache?utf8=%E2%9C%93&q=directory-

I'll create an infra ticket to remove them within the next days if there
is no objection.

Kind Regards,
Stefan

[1] https://svn.apache.org/repos/asf/directory/deceased/

Re: Git migration - buildtools

[Stefan Seelmann]

I'll continue with buildtools...

Re: Git migration

[Lucas Theisen]

Awesome work, thanks for doing this

On Oct 18, 2017 5:15 PM, "Emmanuel Lécharny"  wrote:

> Many thanks, Stefan !
>
>
> Le 18/10/2017 à 22:42, Stefan Seelmann a écrit :
> > On 10/08/2017 09:44 PM, Stefan Seelmann wrote:
> >> Hi,
> >>
> >> I'll start with Git migration of the "project" project (our parent pom):
> >> * Create repo in gitbox
> >> * Inject existing SVN mirror: git://git.apache.org/
> directory-project.git
> >> * Update SCM URLs pom.xml
> >> * Create a new release
> > Finally everything worked.
> >
> > The new gitbox repo:
> > https://gitbox.apache.org/repos/asf?p=directory-project.git
> >
> > Clone URL:
> > https://gitbox.apache.org/repos/asf/directory-project.git
> >
> > Or on GitHub:
> > https://github.com/apache/directory-project
> >
> > Release also worked fine (see notice mail).
> >
> > I'll update the readme, so it looks nicer on GitHub, and put release
> > information there.
>
> --
> Emmanuel Lecharny
>
> Symas.com
> directory.apache.org
>
>

Re: Git migration

[Emmanuel Lécharny]

Many thanks, Stefan !


Le 18/10/2017 à 22:42, Stefan Seelmann a écrit :
> On 10/08/2017 09:44 PM, Stefan Seelmann wrote:
>> Hi,
>>
>> I'll start with Git migration of the "project" project (our parent pom):
>> * Create repo in gitbox
>> * Inject existing SVN mirror: git://git.apache.org/directory-project.git
>> * Update SCM URLs pom.xml
>> * Create a new release
> Finally everything worked.
>
> The new gitbox repo:
> https://gitbox.apache.org/repos/asf?p=directory-project.git
>
> Clone URL:
> https://gitbox.apache.org/repos/asf/directory-project.git
>
> Or on GitHub:
> https://github.com/apache/directory-project
>
> Release also worked fine (see notice mail).
>
> I'll update the readme, so it looks nicer on GitHub, and put release
> information there.

-- 
Emmanuel Lecharny

Symas.com
directory.apache.org

Re: Git migration

[Stefan Seelmann]

On 10/08/2017 09:44 PM, Stefan Seelmann wrote:
> Hi,
> 
> I'll start with Git migration of the "project" project (our parent pom):
> * Create repo in gitbox
> * Inject existing SVN mirror: git://git.apache.org/directory-project.git
> * Update SCM URLs pom.xml
> * Create a new release

Finally everything worked.

The new gitbox repo:
https://gitbox.apache.org/repos/asf?p=directory-project.git

Clone URL:
https://gitbox.apache.org/repos/asf/directory-project.git

Or on GitHub:
https://github.com/apache/directory-project

Release also worked fine (see notice mail).

I'll update the readme, so it looks nicer on GitHub, and put release
information there.

Re: Git migration

[Stefan Seelmann]

On 10/10/2017 08:38 PM, Stefan Seelmann wrote:
> On 10/08/2017 09:44 PM, Stefan Seelmann wrote:
>> Hi,
>>
>> I'll start with Git migration of the "project" project (our parent pom):
>> * Create repo in gitbox
> 
> Actually I already failed at the first step :)
> 
> When I want to create the Git repo named "directory-project" I get error
> message
> 
> Could not create repository - it may already exist.
> 
> I assume that's because the a repo with that name already exists on
> git.apache.org and github. I'll ask Infra how to proceed (if they can
> first delete/rename the existing or if we need to choose a different name)

FYI: https://issues.apache.org/jira/browse/INFRA-15254

Re: Git migration

[Stefan Seelmann]

On 10/08/2017 09:44 PM, Stefan Seelmann wrote:
> Hi,
> 
> I'll start with Git migration of the "project" project (our parent pom):
> * Create repo in gitbox

Actually I already failed at the first step :)

When I want to create the Git repo named "directory-project" I get error
message

Could not create repository - it may already exist.

I assume that's because the a repo with that name already exists on
git.apache.org and github. I'll ask Infra how to proceed (if they can
first delete/rename the existing or if we need to choose a different name)

Kind Regards,
Stefan

Re: Git migration

[Emmanuel Lécharny]

Thanks, Stefan !


Le 08/10/2017 à 21:44, Stefan Seelmann a écrit :
> Hi,
>
> I'll start with Git migration of the "project" project (our parent pom):
> * Create repo in gitbox
> * Inject existing SVN mirror: git://git.apache.org/directory-project.git
> * Update SCM URLs pom.xml
> * Create a new release
>
> King Regards,
> Stefan

-- 
Emmanuel Lecharny

Symas.com
directory.apache.org

Git migration

[Stefan Seelmann]

Hi,

I'll start with Git migration of the "project" project (our parent pom):
* Create repo in gitbox
* Inject existing SVN mirror: git://git.apache.org/directory-project.git
* Update SCM URLs pom.xml
* Create a new release

King Regards,
Stefan

Re: Merge "value" branches to trunk/master and move to git

[Stefan Seelmann]

On 10/04/2017 09:33 AM, Emmanuel Lécharny wrote:
>> So separate git repos for
>> - project
>> - apacheds
>> - studio
>> - jdbm
>> - mavibot
>> makes sense.
> 
> +1. I would let aside jdbm, as we are very unlikely to modify it as soon
> as Mavibot will be ready.

Ok. I won't start a separate vote I think there is consensus :)

>> But does it make sense to create a separate repos for all the helper
>> projects (checkstyle-configuration, junit-additions, skins, docker)? Or
>> should we move them into a common repo. Currently they anyway live
>> within a common "buildtools" folder [1]
> 
> +1 for buildtools.

Ok.

>> We drop the apacheds-manuals and ldap-api-manuals because those manuals
>> are now maintained in the CMS, right?
> 
> correct.
>>
>> What about kerberos-client? There is no change since 2008 and Kerby took
>> over, right?. I'd rather move it to our "deceased" folder.
> 
> Leave it where it is (ie, svn).

> Side note : give me up to the end of this week so that I can commit some
> pending changes I have for various projects, before reqesting the migration

Sure take your time, I won't start before the weekend.

Re: Merge "value" branches to trunk/master and move to git

[Emmanuel Lécharny]

Le 03/10/2017 à 22:12, Stefan Seelmann a écrit :
> On 10/03/2017 09:57 PM, Stefan Seelmann wrote:
>> On 10/02/2017 10:50 AM, Emmanuel Lécharny wrote:
>>>
>>> Le 02/10/2017 à 09:19, Stefan Seelmann a écrit :
>>>> On 10/02/2017 05:34 AM, Emmanuel Lécharny wrote:
>>>>>> For studio and apacheds as they are still in SVN we can do that. But I
>>>>>> hope the git mirrors like such a move because we want to use them then
>>>>>> for git migration.
>>>>> Good question... We can also try a merge instead.
>>>> The other option is to move to git first.
>>> Indeed.
>>>
>>> Studio has been released, it's a good timing to have it migrated to git.
>>> The remaining parts are :
>>> - project (no brainer)
>>> - apacheds ( I still have a few commits to apply, but that would be fast)
>>> - kerberos-client (no brainer)
>>> - checkstyle-configuration (no brainer)
>>> - junit-addons (no brainer)
>>> - apacheds-manuals (unused)
>>> - ldap-api-manuals (unused)
>>> - jdbm (no brainer)
>>> - mavibot ( have some pending modifications for this one)
>>> - skins (no brainer)
>>> - docker (no brainer)
>> Ok, let's do it.
> Hm, thinking a bit longer...
>
> So separate git repos for
> - project
> - apacheds
> - studio
> - jdbm
> - mavibot
> makes sense.

+1. I would let aside jdbm, as we are very unlikely to modify it as soon
as Mavibot will be ready.
>
> But does it make sense to create a separate repos for all the helper
> projects (checkstyle-configuration, junit-additions, skins, docker)? Or
> should we move them into a common repo. Currently they anyway live
> within a common "buildtools" folder [1]

+1 for buildtools.

>
> We drop the apacheds-manuals and ldap-api-manuals because those manuals
> are now maintained in the CMS, right?

correct.
>
> What about kerberos-client? There is no change since 2008 and Kerby took
> over, right?. I'd rather move it to our "deceased" folder.

Leave it where it is (ie, svn).

Thanks Stefan !



Side note : give me up to the end of this week so that I can commit some
pending changes I have for various projects, before reqesting the migration

-- 
Emmanuel Lecharny

Symas.com
directory.apache.org

Re: Merge "value" branches to trunk/master and move to git

[Emmanuel Lécharny]

Le 03/10/2017 à 21:57, Stefan Seelmann a écrit :
> On 10/02/2017 10:50 AM, Emmanuel Lécharny wrote:
>>
>> Le 02/10/2017 à 09:19, Stefan Seelmann a écrit :
>>> On 10/02/2017 05:34 AM, Emmanuel Lécharny wrote:
>>>>> For studio and apacheds as they are still in SVN we can do that. But I
>>>>> hope the git mirrors like such a move because we want to use them then
>>>>> for git migration.
>>>> Good question... We can also try a merge instead.
>>> The other option is to move to git first.
>> Indeed.
>>
>> Studio has been released, it's a good timing to have it migrated to git.
>> The remaining parts are :
>> - project (no brainer)
>> - apacheds ( I still have a few commits to apply, but that would be fast)
>> - kerberos-client (no brainer)
>> - checkstyle-configuration (no brainer)
>> - junit-addons (no brainer)
>> - apacheds-manuals (unused)
>> - ldap-api-manuals (unused)
>> - jdbm (no brainer)
>> - mavibot ( have some pending modifications for this one)
>> - skins (no brainer)
>> - docker (no brainer)
> Ok, let's do it.
>
> I'll start a formal vote for the git migration.
>
> I think now that gitbox is enabled for us we can just create new repos
> there, right?

I think so. Ldap API is already on gitbox. Now that we can select
'directory' PMC, we can create the needed repo ourselves using
https://gitbox.apache.org/setup/newrepo.html.

-- 
Emmanuel Lecharny

Symas.com
directory.apache.org

Re: Merge "value" branches to trunk/master and move to git

[Stefan Seelmann]

On 10/03/2017 09:57 PM, Stefan Seelmann wrote:
> On 10/02/2017 10:50 AM, Emmanuel Lécharny wrote:
>>
>>
>> Le 02/10/2017 à 09:19, Stefan Seelmann a écrit :
>>> On 10/02/2017 05:34 AM, Emmanuel Lécharny wrote:
>>>>> For studio and apacheds as they are still in SVN we can do that. But I
>>>>> hope the git mirrors like such a move because we want to use them then
>>>>> for git migration.
>>>> Good question... We can also try a merge instead.
>>> The other option is to move to git first.
>>
>> Indeed.
>>
>> Studio has been released, it's a good timing to have it migrated to git.
>> The remaining parts are :
>> - project (no brainer)
>> - apacheds ( I still have a few commits to apply, but that would be fast)
>> - kerberos-client (no brainer)
>> - checkstyle-configuration (no brainer)
>> - junit-addons (no brainer)
>> - apacheds-manuals (unused)
>> - ldap-api-manuals (unused)
>> - jdbm (no brainer)
>> - mavibot ( have some pending modifications for this one)
>> - skins (no brainer)
>> - docker (no brainer)
> 
> Ok, let's do it.

Hm, thinking a bit longer...

So separate git repos for
- project
- apacheds
- studio
- jdbm
- mavibot
makes sense.

But does it make sense to create a separate repos for all the helper
projects (checkstyle-configuration, junit-additions, skins, docker)? Or
should we move them into a common repo. Currently they anyway live
within a common "buildtools" folder [1]

We drop the apacheds-manuals and ldap-api-manuals because those manuals
are now maintained in the CMS, right?

What about kerberos-client? There is no change since 2008 and Kerby took
over, right?. I'd rather move it to our "deceased" folder.

Kind Regards,
Stefan

[1] https://svn.apache.org/repos/asf/directory/buildtools/

Re: Merge "value" branches to trunk/master and move to git

[Stefan Seelmann]

On 10/02/2017 10:50 AM, Emmanuel Lécharny wrote:
> 
> 
> Le 02/10/2017 à 09:19, Stefan Seelmann a écrit :
>> On 10/02/2017 05:34 AM, Emmanuel Lécharny wrote:
>>>> For studio and apacheds as they are still in SVN we can do that. But I
>>>> hope the git mirrors like such a move because we want to use them then
>>>> for git migration.
>>> Good question... We can also try a merge instead.
>> The other option is to move to git first.
> 
> Indeed.
> 
> Studio has been released, it's a good timing to have it migrated to git.
> The remaining parts are :
> - project (no brainer)
> - apacheds ( I still have a few commits to apply, but that would be fast)
> - kerberos-client (no brainer)
> - checkstyle-configuration (no brainer)
> - junit-addons (no brainer)
> - apacheds-manuals (unused)
> - ldap-api-manuals (unused)
> - jdbm (no brainer)
> - mavibot ( have some pending modifications for this one)
> - skins (no brainer)
> - docker (no brainer)

Ok, let's do it.

I'll start a formal vote for the git migration.

I think now that gitbox is enabled for us we can just create new repos
there, right?

Kind Regards,
Stefan

Re: Merge "value" branches to trunk/master and move to git

[Emmanuel Lécharny]

Le 02/10/2017 à 09:19, Stefan Seelmann a écrit :
> On 10/02/2017 05:34 AM, Emmanuel Lécharny wrote:
>>> For studio and apacheds as they are still in SVN we can do that. But I
>>> hope the git mirrors like such a move because we want to use them then
>>> for git migration.
>> Good question... We can also try a merge instead.
> The other option is to move to git first.

Indeed.

Studio has been released, it's a good timing to have it migrated to git.
The remaining parts are :
- project (no brainer)
- apacheds ( I still have a few commits to apply, but that would be fast)
- kerberos-client (no brainer)
- checkstyle-configuration (no brainer)
- junit-addons (no brainer)
- apacheds-manuals (unused)
- ldap-api-manuals (unused)
- jdbm (no brainer)
- mavibot ( have some pending modifications for this one)
- skins (no brainer)
- docker (no brainer)


-- 
Emmanuel Lecharny

Symas.com
directory.apache.org

Re: Merge "value" branches to trunk/master and move to git

[Stefan Seelmann]

On 10/02/2017 05:34 AM, Emmanuel Lécharny wrote:
>> For studio and apacheds as they are still in SVN we can do that. But I
>> hope the git mirrors like such a move because we want to use them then
>> for git migration.
> 
> Good question... We can also try a merge instead.

The other option is to move to git first.

Re: Merge "value" branches to trunk/master and move to git

[Emmanuel Lécharny]

Le 02/10/2017 à 00:43, Stefan Seelmann a écrit :
> On 10/01/2017 11:46 PM, Emmanuel Lécharny wrote:
>> Le 01/10/2017 à 21:19, Stefan Seelmann a écrit :
>>> For API, server, and studio we have the "value" branches. Should we
>>> merge them back to trunk/master?
>> Actually, the simpler move would be to make the value branches the new
>> trunk. I took care of forward-porting any change made in
>> API/apacheds/studio into the equivalent Value branch.
> For API, as we already use git, that means force push the shared-value
> branch to origin/master I guess? I think the cleaner way is to use "git
> merge -s ours" [1]. I tested and it seems to work.
Great !
>
> For studio and apacheds as they are still in SVN we can do that. But I
> hope the git mirrors like such a move because we want to use them then
> for git migration.

Good question... We can also try a merge instead.


-- 
Emmanuel Lecharny

Symas.com
directory.apache.org

Re: Merge "value" branches to trunk/master and move to git

[Shawn McKinney]

> On Oct 1, 2017, at 2:19 PM, Stefan Seelmann  wrote:
> 
> Second question is if we should move to git/gitbox with all the
> remaining projects (server, studio, mavibot, project)

+1

Re: Merge "value" branches to trunk/master and move to git

[Stefan Seelmann]

On 10/01/2017 11:46 PM, Emmanuel Lécharny wrote:
> Le 01/10/2017 à 21:19, Stefan Seelmann a écrit :
>> For API, server, and studio we have the "value" branches. Should we
>> merge them back to trunk/master?
> 
> Actually, the simpler move would be to make the value branches the new
> trunk. I took care of forward-porting any change made in
> API/apacheds/studio into the equivalent Value branch.

For API, as we already use git, that means force push the shared-value
branch to origin/master I guess? I think the cleaner way is to use "git
merge -s ours" [1]. I tested and it seems to work.

For studio and apacheds as they are still in SVN we can do that. But I
hope the git mirrors like such a move because we want to use them then
for git migration.

>> Second question is if we should move to git/gitbox with all the
>> remaining projects (server, studio, mavibot, project)
> 
> That would make sense to me.


[1]
https://stackoverflow.com/questions/16171813/how-can-i-overwrite-not-merge-one-remote-branch-into-another-branch

Re: Merge "value" branches to trunk/master and move to git

[Emmanuel Lécharny]

Also note that the Value branch fixes some really critical issues in teh
way we treat Values - so the name -, and some painful bugs we have in
Studio (typically when we have special chars like # in values).


It's also a bit faster...


Le 01/10/2017 à 21:19, Stefan Seelmann a écrit :
> Hi,
>
> For API, server, and studio we have the "value" branches. Should we
> merge them back to trunk/master?
>
> Second question is if we should move to git/gitbox with all the
> remaining projects (server, studio, mavibot, project)
>
> Kind Regards,
> Stefan

-- 
Emmanuel Lecharny

Symas.com
directory.apache.org

Re: Merge "value" branches to trunk/master and move to git

[Emmanuel Lécharny]

Le 01/10/2017 à 21:19, Stefan Seelmann a écrit :
> Hi,
>
> For API, server, and studio we have the "value" branches. Should we
> merge them back to trunk/master?

Actually, the simpler move would be to make the value branches the new
trunk. I took care of forward-porting any change made in
API/apacheds/studio into the equivalent Value branch.

>
> Second question is if we should move to git/gitbox with all the
> remaining projects (server, studio, mavibot, project)

That would make sense to me.


-- 

Emmanuel Lecharny

Symas.com
directory.apache.org

Merge "value" branches to trunk/master and move to git

[Stefan Seelmann]

Hi,

For API, server, and studio we have the "value" branches. Should we
merge them back to trunk/master?

Second question is if we should move to git/gitbox with all the
remaining projects (server, studio, mavibot, project)

Kind Regards,
Stefan

Re: Apache LDAP API 2.0 git migration

[Emmanuel Lécharny]

Le 28/08/2017 à 20:04, Stefan Seelmann a écrit :
>
> Does that mean that SVN tree /directory/shared is now read-only? Or are
> both SVN an git now writeable? I assume they are not synchronized, right?

Ticket created : https://issues.apache.org/jira/browse/INFRA-14977

-- 
Emmanuel Lecharny

Symas.com
directory.apache.org

Re: Apache LDAP API 2.0 git migration

[Emmanuel Lécharny]

Le 28/08/2017 à 20:04, Stefan Seelmann a écrit :
> On 08/13/2017 09:33 AM, Emmanuel Lécharny wrote:
>> Hi !
>>
>>
>> so here a list of items that need to be taken care of in order to have
>> teh migratio successful :
>>
>>
>> - ask INFRA to migrate the current SVN repo, with all the history,
>> including branches). That should take a couple of days.
>>
>> - fix the release process to use git instead of SVN ( a bit of work here
>> ..., but we already have it working for fortress, so that's not that
>> complex)
>>
>> - update the web site to tell teh world (well, our world ;-) that we are
>> now using git for the API
>>
>> - add a page where we provide the minimal list of commands to use for
>> those who are not comfortable with git.
> It seems it's done, at least I see some commits to git :)

Indeed !
>
> Does that mean that SVN tree /directory/shared is now read-only? Or are
> both SVN an git now writeable? I assume they are not synchronized, right?

Svn is not yet read-only. I still need to ask Infra for that, will do soon.

-- 
Emmanuel Lecharny

Symas.com
directory.apache.org

Re: Apache LDAP API 2.0 git migration

[Stefan Seelmann]

On 08/13/2017 09:33 AM, Emmanuel Lécharny wrote:
> Hi !
> 
> 
> so here a list of items that need to be taken care of in order to have
> teh migratio successful :
> 
> 
> - ask INFRA to migrate the current SVN repo, with all the history,
> including branches). That should take a couple of days.
> 
> - fix the release process to use git instead of SVN ( a bit of work here
> ..., but we already have it working for fortress, so that's not that
> complex)
> 
> - update the web site to tell teh world (well, our world ;-) that we are
> now using git for the API
> 
> - add a page where we provide the minimal list of commands to use for
> those who are not comfortable with git.

It seems it's done, at least I see some commits to git :)

Does that mean that SVN tree /directory/shared is now read-only? Or are
both SVN an git now writeable? I assume they are not synchronized, right?

Kind Regards,
Stefan

Apache LDAP API git migration

[Emmanuel Lécharny]

Hi guys,


I have opened a JIRA for this task :

https://issues.apache.org/jira/browse/INFRA-14864

FYI.

-- 
Emmanuel Lecharny

Symas.com
directory.apache.org

Re: Apache LDAP API 2.0 git migration

[Emmanuel Lécharny]

Forgot to mention https://gitbox.apache.org/


-- 
Emmanuel Lecharny

Symas.com
directory.apache.org

Re: Apache LDAP API 2.0 git migration

[Emmanuel Lécharny]

Forget a few things :


- Jenkins task will hahe to be updated

- probably the same thing for JIRA

- we might also want to check what's going on with github (we already
have the projetc there : https://github.com/apache/directory-shared, but
we have to see if The ASF has some better way to deal with gitHub).



-- 
Emmanuel Lecharny

Symas.com
directory.apache.org

Apache LDAP API 2.0 git migration

[Emmanuel Lécharny]

Hi !


so here a list of items that need to be taken care of in order to have
teh migratio successful :


- ask INFRA to migrate the current SVN repo, with all the history,
including branches). That should take a couple of days.

- fix the release process to use git instead of SVN ( a bit of work here
..., but we already have it working for fortress, so that's not that
complex)

- update the web site to tell teh world (well, our world ;-) that we are
now using git for the API

- add a page where we provide the minimal list of commands to use for
those who are not comfortable with git.


All in all, I think that could be manageable in a matter of two weeks !


Thanks !


-- 
Emmanuel Lecharny

Symas.com
directory.apache.org

Result, was: [Vote] Switch to git for Apache LDAP API 2.0

[Emmanuel Lécharny]

Hi guys,

I'm closing this vote, with 11 +1 :


Brian

Colm,

Jiajia

Kai,

Lucas

Radovan

Shawn (McKinney)

Shawn (Smith)

Stefan

Steve

and me


I'll contact Infra for starting the migration, probably this week-end.
I'll try to write down a document first explainng all the tests and put
a page on our site with some explaination about how touse git on the
LDAP API.


All in all, it should not impact us too much, as I suggest to keep the
1.0 branch on SVN for the moment.


I'll keep you informed.


Thanks !


-- 
Emmanuel Lecharny

Symas.com
directory.apache.org

Re: [Vote] Switch to git for Apache LDAP API 2.0

[Shawn McKinney]

> On Aug 8, 2017, at 7:23 AM, Shawn McKinney  wrote:
> 
> If you are working with uncommitted changes but nonetheless need to synch 
> with server’s latest changes, simply push your uncommitted changes, pull the 
> latest, and then pop your latest changes back off the stack.

er one more correction…

If working with uncommitted changes, …

git stash  (not push!)
git pull
git pop

Shawn

Re: [Vote] Switch to git for Apache LDAP API 2.0

[Shawn McKinney]

> On Aug 8, 2017, at 7:09 AM, Shawn McKinney  wrote:
> 
>> 
>> Yes please! Once I am familiar and the Directory project has been migrated, 
>> I could use it to start the wiki page we should have (analogous to the 
>> current SVN page).
>> 
>> I think I might be tempted to try converting one of my own simple SVN 
>> projects to GIT. I suppose it is time for me to stop being scared of the 
>> dark! (Still, I'm glad it will be the advocates, rather than me, who will be 
>> responsible for migrating this complex collection of sub-projects).
> 
> I’ve found 95% of working on an apache directory project is using these 
> commands:
> 
> git clone proj-name

actually more precise is

git clone proj-url

connectivity with a git remote server can be either using SSH or HTTPS.  Either 
work just fine, SSH usually has integration with your SSH key which saves the 
trouble of reentering creds each push or pull.

If you are working with uncommitted changes but nonetheless need to synch with 
server’s latest changes, simply push your uncommitted changes, pull the latest, 
and then pop your latest changes back off the stack.

IDE integration with GIT is quite good at making rudimentary operations like 
merging almost an afterthought for the developer.  The IDE will also cache 
credentials saving the trouble of entering on every change if using HTTPS 
connectivity.

Finally, there are plenty of good tools to use that provide the ability to look 
at the change history (which should be preserved after the migration from SVN). 
 Your IDE can do this or I like gitk.

OK, now I’m really done, and time to git back to work.  :-)

Shawn

Re: [Vote] Switch to git for Apache LDAP API 2.0

[Shawn McKinney]

> On Aug 7, 2017, at 5:42 PM, Brian Burch  wrote:
> 
>> Yes, it can get confusing if you are working with active branches 
>> distributed over a large team, but otherwise quite simple to use, and there 
>> are plenty of good tutorials around that show the basic usage patterns.
>> I keep a cheat sheet with the half dozen commands I use to manage code 
>> bases.  I’ll forward it to you if you’re interested.
> 
> Yes please! Once I am familiar and the Directory project has been migrated, I 
> could use it to start the wiki page we should have (analogous to the current 
> SVN page).
> 
> I think I might be tempted to try converting one of my own simple SVN 
> projects to GIT. I suppose it is time for me to stop being scared of the 
> dark! (Still, I'm glad it will be the advocates, rather than me, who will be 
> responsible for migrating this complex collection of sub-projects).

I’ve found 95% of working on an apache directory project is using these 
commands:

git clone proj-name

e.g. 

git clone https://github.com/apache/directory-fortress-core.git

will check out latest or

git clone --branch 2.0.0 
https://git-wip-us.apache.org/repos/asf/directory-fortress-core.git

will checkout everything from the last release, 2.0.0

The git clone command copies an existing Git repository. This is sort of like 
SVN checkout, except the “working copy” is a full-fledged Git repository—it has 
its own history, manages its own files, and is a completely isolated 
environment from the original repository.
git clone | Atlassian Git Tutorial
https://www.atlassian.com/git/tutorials/setting-up-a-repository/git-clone

Three more very common commands are:

git pull  <— give me everything up to the last pushed commit on branch 
I’m pointing   
git commit<- commit my latest changes
git push  <- push my latest commits into the global repository

Performing releases of course will do more operations like creating tags but 
those ops are wrapped inside of our apache directory standard maven release 
process, automating most of it.

Of course some projects require branching because their codebases get busy, and 
many features are being worked on simultaneously.  Typically not the the case 
in our project.

Regardless, you will eventually find yourself needing to understand how 
branching and merging works, and here is my cheat sheet for those ops.  Hope it 
helps….

--- working with branches ---
git fetch      <- fetches new branches
git branch -a      <- shows existing branches
git branch name<- create new branch of 'name'
git checkout name  <- to start working on this branch

--- temporarily saving and retrieving uncommmitted changes ---
git stash  <- to stash uncommmitted changes, so you can pull latest 
changes, change to another branch, etc
git pop    <- to retrieve previously saved uncommitted changes

--- rename a branch locally and remotely
git branch -m old_name new_name
git push origin :old_name
git push --set-upstream origin new_name

--- merge the brnach back to master ---
git checkout master
git merge name <- will fast-forward changes if no changes to the master 
since the branch
git push   <- to synch with global repo

--- delete the branch (after merge)
git branch -d name <- doesn't remove remotely
git push origin :name

Shawn