Moving tomcat-maven-plugin from svn master to git master

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

Moving tomcat-maven-plugin from svn master to git master

markt
Hi all,

I was chatting with a potential contributor to the tomcat-maven-plugin
project in the ASF-OGC-OSGeo code sprint. We wnet looking for the source
and he found an old mirror on github. I noticed that it is still
configured to use the now defunct svn->git mirroring service.

If there are no objections, I plan to move the module to using git as
the master and updating the infrastructure accordingly.

Mark

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: Moving tomcat-maven-plugin from svn master to git master

Konstantin Kolinko
ср, 17 февр. 2021 г. в 19:55, Mark Thomas <[hidden email]>:
>
> Hi all,
>
> I was chatting with a potential contributor to the tomcat-maven-plugin
> project in the ASF-OGC-OSGeo code sprint. We wnet looking for the source

wnet -> went

> and he found an old mirror on github. I noticed that it is still
> configured to use the now defunct svn->git mirroring service.
>
> If there are no objections, I plan to move the module to using git as
> the master and updating the infrastructure accordingly.

+1 to move to Git.

IIRC we did not ask Infra to restore mirroring for this repo since the
September 2019 crash of the service [1], but last commits to this
project were in May 2019 and have already been mirrored.

Comparing the current Subversion repository [2] with the Git mirror
[3], I verified that

1) Both "trunk" and "tc8.x" branches are present in Git, with the
latest commits from Subversion.
2) The files at the top of "trunk" and "tc8.x" branches are the same
between Subversion and Git, except some LF/CRLF line ending
differences.
3) All 4 tags from Subversion are present

Two glitches noted:

1) The git mirror has the following additional branch:
- dependabot/maven/org.apache.httpcomponents-httpclient-4.3.6

2) In trunk branch the following file has mixed line endings
(line 44 apparently has a LF, while the rest are CRLF)
src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/AbstractDeployWarMojo.java


I think that the glitches can be ignored and we can use the existing
mirror as is, without a resync. The git mirror has a number of pull
requests in it (14 open, 18 closed ones). It would be nice to preserve
them.

[1] https://blogs.apache.org/infra/entry/subversion-to-git-service-git

[2] https://svn.apache.org/repos/asf/tomcat/maven-plugin/
[3] https://github.com/apache/tomcat-maven-plugin/

Best regards,
Konstantin Kolinko

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: Moving tomcat-maven-plugin from svn master to git master

Konstantin Kolinko
ср, 17 февр. 2021 г. в 20:57, Konstantin Kolinko <[hidden email]>:

>
> ср, 17 февр. 2021 г. в 19:55, Mark Thomas <[hidden email]>:
> >
> > Hi all,
> >
> > If there are no objections, I plan to move the module to using git as
> > the master and updating the infrastructure accordingly.
>
> +1 to move to Git.
>
> IIRC we did not ask Infra to restore mirroring for this repo since the
> September 2019 crash of the service [1], but last commits to this
> project were in May 2019 and have already been mirrored.
>
> Comparing the current Subversion repository [2] with the Git mirror
> [3], I verified that
>
> 1) Both "trunk" and "tc8.x" branches are present in Git, with the
> latest commits from Subversion.
> 2) The files at the top of "trunk" and "tc8.x" branches are the same
> between Subversion and Git, except some LF/CRLF line ending
> differences.
> 3) All 4 tags from Subversion are present

Comparing the files in tags between Subversion and Git:
- Tags "tomcat-maven-plugin-2.0", "tomcat-maven-plugin-2.1",
"tomcat-maven-plugin-2.2" - OK, no differences except line endings.
- Tag "tomcat-maven-plugin-2.0-beta-1" - OK. Except line endings the
files also differ on lines that contain the "Id" keyword. This is an
expected difference when this feature is used. Sample file:
common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java

> Two glitches noted:
>
> 1) The git mirror has the following additional branch:
> - dependabot/maven/org.apache.httpcomponents-httpclient-4.3.6
>
> 2) In trunk branch the following file has mixed line endings
> (line 44 apparently has a LF, while the rest are CRLF)
> src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/AbstractDeployWarMojo.java
>
>
> I think that the glitches can be ignored and we can use the existing
> mirror as is, without a resync. The git mirror has a number of pull
> requests in it (14 open, 18 closed ones). It would be nice to preserve
> them.
>
> [1] https://blogs.apache.org/infra/entry/subversion-to-git-service-git
>
> [2] https://svn.apache.org/repos/asf/tomcat/maven-plugin/
> [3] https://github.com/apache/tomcat-maven-plugin/

Best regards,
Konstantin Kolinko

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: Moving tomcat-maven-plugin from svn master to git master

markt
On 17/02/2021 18:21, Konstantin Kolinko wrote:

> ср, 17 февр. 2021 г. в 20:57, Konstantin Kolinko <[hidden email]>:
>>
>> ср, 17 февр. 2021 г. в 19:55, Mark Thomas <[hidden email]>:
>>>
>>> Hi all,
>>>
>>> If there are no objections, I plan to move the module to using git as
>>> the master and updating the infrastructure accordingly.
>>
>> +1 to move to Git.
>>
>> IIRC we did not ask Infra to restore mirroring for this repo since the
>> September 2019 crash of the service [1], but last commits to this
>> project were in May 2019 and have already been mirrored.
>>
>> Comparing the current Subversion repository [2] with the Git mirror
>> [3], I verified that
>>
>> 1) Both "trunk" and "tc8.x" branches are present in Git, with the
>> latest commits from Subversion.
>> 2) The files at the top of "trunk" and "tc8.x" branches are the same
>> between Subversion and Git, except some LF/CRLF line ending
>> differences.
>> 3) All 4 tags from Subversion are present
>
> Comparing the files in tags between Subversion and Git:
> - Tags "tomcat-maven-plugin-2.0", "tomcat-maven-plugin-2.1",
> "tomcat-maven-plugin-2.2" - OK, no differences except line endings.
> - Tag "tomcat-maven-plugin-2.0-beta-1" - OK. Except line endings the
> files also differ on lines that contain the "Id" keyword. This is an
> expected difference when this feature is used. Sample file:
> common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
>
>> Two glitches noted:
>>
>> 1) The git mirror has the following additional branch:
>> - dependabot/maven/org.apache.httpcomponents-httpclient-4.3.6
>>
>> 2) In trunk branch the following file has mixed line endings
>> (line 44 apparently has a LF, while the rest are CRLF)
>> src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/AbstractDeployWarMojo.java
>>
>>
>> I think that the glitches can be ignored and we can use the existing
>> mirror as is, without a resync. The git mirror has a number of pull
>> requests in it (14 open, 18 closed ones). It would be nice to preserve
>> them.
>>
>> [1] https://blogs.apache.org/infra/entry/subversion-to-git-service-git
>>
>> [2] https://svn.apache.org/repos/asf/tomcat/maven-plugin/
>> [3] https://github.com/apache/tomcat-maven-plugin/

Thanks for all the checks. I've completed the switch and cleaned up the
various infra bits and pieces that needed cleaning up. It might take up
to 60 mins before we can commit to the repo but I doubt that is an issue.

Mark

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]