You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by Hervé BOUTEMY <he...@free.fr> on 2013/11/23 07:23:09 UTC
Re: [1/2] Remove unintentional CRs
uh!
with svn, we have svn-eol-style.txt [1] to deal automatically with such
newline issues
with git, nothing is written yet [2], but I suppose we need such an equivalent
config since .apt files are not well known
Any git guru to the rescue, please?
Regards,
Hervé
[1] http://maven.apache.org/developers/conventions/svn.html
[2] http://maven.apache.org/developers/conventions/git.html
Le vendredi 22 novembre 2013 20:54:33 michaelo@apache.org a écrit :
> Updated Branches:
> refs/heads/master 7436d740d -> 22d21c4e2
>
>
> http://git-wip-us.apache.org/repos/asf/maven-scm/blob/22d21c4e/src/site/apt/
> synergy.apt
> ---------------------------------------------------------------------- diff
> --git a/src/site/apt/synergy.apt b/src/site/apt/synergy.apt
> index 7594875..3e7c37c 100644
> --- a/src/site/apt/synergy.apt
> +++ b/src/site/apt/synergy.apt
> @@ -1,189 +1,189 @@
> - ------
> - SCM Implementation: CM/Synergy
> - ------
> - Julien Henry (Capgemini) & La Poste
> - ------
> - 2006-10-23
> - ------
> -
> -~~ Licensed to the Apache Software Foundation (ASF) under one
> -~~ or more contributor license agreements. See the NOTICE file
> -~~ distributed with this work for additional information
> -~~ regarding copyright ownership. The ASF licenses this file
> -~~ to you under the Apache License, Version 2.0 (the
> -~~ "License"); you may not use this file except in compliance
> -~~ with the License. You may obtain a copy of the License at
> -~~
> -~~ http://www.apache.org/licenses/LICENSE-2.0
> -~~
> -~~ Unless required by applicable law or agreed to in writing,
> -~~ software distributed under the License is distributed on an
> -~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> -~~ KIND, either express or implied. See the License for the
> -~~ specific language governing permissions and limitations
> -~~ under the License.
> -
> -~~ NOTE: For help with the syntax of this file, see:
> -~~ http://maven.apache.org/doxia/references/apt-format.html
> -
> -SCM Implementation: CM/Synergy
> -
> -* General Info
> -
> - Link: {{http://www.telelogic.com/Products/synergy/synergycm/index.cfm}}
> -
> - License: Commercial
> -
> -* SCM URL
> -
> - For all URLs below, we use a colon (:) as separator. If you use a colon
> for one of the variables (e.g. a windows path), then use a pipe (|) as
> separator. -
> --------
> -scm:synergy<delimiter>project_name<delimiter>database_delimiter<delimiter>p
> roject_version<delimiter>release<delimiter>purpose<delimiter>instance
> --------
> -
> - <project_name>: This is the name of the project from which the checkout
> is done. -
> - <project_version>: This is the version of the project from which the
> checkout is done (usually a prep project). -
> - <release>: This is the release.
> -
> - <purpose>: This is the purpose.
> -
> - <instance>: This is the (optional) instance of the project from which the
> checkout is done (usually a prep project). Default is 1. -
> -* Examples
> -
> --------
> -scm:synergy:MyProject:~:int_1.0:MyProject/2.0:Devel:1
> -scm|synergy|MyProject|-|int_1.0|MyProject/2.0|Devel:db1#1
> --------
> -
> -* Extra Information
> -** General
> -
> - ccm start command shall use -rc in addition to below options for remote
> linux clients. -
> -** Checkout
> -
> - Checkout purpose is to get sources from a working Work Area to a given
> folder. First, - it checks if a work area already exists with the given
> version. If yes, it only synchronizes and reconfigures - the existing
> one, and then copies file to the expecting folder. If no Work Area exists,
> then a checkout is done. -
> - To specify the version of the checkout working project, use <tag>
> parameter. -
> - When a 'checkout' happens, the following scm commands are generated
> -
> --------
> -ccm start -m -q -nogui -n <username> -pw <password>
> -ccm query -u -f %objectname "owner='<username>' and status='working' and
> type='project' and has_predecessor('<project_spec>')" //Check for existing
> checkout -ccm synchronize -p <working_project_spec>
> -ccm reconfigure -p <working_project_spec>
> -ccm checkout -subprojects -rel [-t <tag>] -purpose <purpose> -release
> <release> -p <project_spec> // If no existing working project exists -ccm
> stop
> --------
> -
> -** Update
> -
> - Reconfigure project with default reconfigure template, and copy file
> from work area to expected folder. -
> --------
> -ccm start -m -q -nogui -n <username> -pw <password>
> -ccm query -u -f %objectname "owner='<username>' and status='working' and
> type='project' and has_predecessor('<project_spec>')" //Check for existing
> checkout -ccm reconfigure -r -p <working_project_spec>
> -ccm stop
> --------
> -
> -** Add
> -
> - Create a default task, add new file(s) to the repository and checkin
> the task. - <message> You can change the synopsis of the task by setting
> this parameter -
> --------
> -ccm start -m -q -nogui -n <username> -pw <password>
> -ccm task -create -def -release <release> -synopsis <message>
> -ccm create -c <message> <filename>
> -ccm task -checkin <task_spec> -comment <message>
> -ccm stop
> --------
> -
> -** Remove
> -
> - Remove a file from repository.
> -
> --------
> -ccm start -m -q -nogui -n <username> -pw <password>
> -ccm delete <filename>
> -ccm stop
> --------
> -
> -** Changelog
> -
> - Get modified files history. In order to parse output of Synergy command,
> we need to know different parameters: -
> - * maven.scm.synergy.ccmDateFormat (default value is EEE MMM dd HH:mm:ss
> yyyy) -
> - * maven.scm.synergy.language (default value is en)
> -
> - * maven.scm.synergy.country (default value is US)
> -
> - []
> -
> --------
> -ccm start -m -q -nogui -n <username> -pw <password>
> -ccm query -u is_task_in_folder_of(is_folder_in_rp_of('<project_spec>')) and
> completion_date>time(<startDate>) and completion_date<time(<endDate>) -ccm
> task -show objects <task>
> -ccm stop
> --------
> -
> -** Checkin
> -
> - Checkin the default task.
> -
> --------
> -ccm start -m -q -nogui -n <username> -pw <password>
> -ccm task -checkin default -c <message>
> -ccm stop
> --------
> -
> -** Edit
> -
> - Create a default task and checkout file(s).
> -
> --------
> -ccm start -m -q -nogui -n <username> -pw <password>
> -ccm task -create -def -release <release> -synopsis <message>
> -ccm co <filename>
> -ccm stop
> --------
> -
> -** Unedit
> -
> - Cancel edition. Replace file with previous version.
> -
> --------
> -ccm start -m -q -nogui -n <username> -pw <password>
> -ccm delete -replace <filename>
> -ccm stop
> --------
> -
> -** Status
> -
> - Get state of files.
> -
> --------
> -ccm start -m -q -nogui -n <username> -pw <password>
> -ccm dir -m
> -ccm stop
> --------
> -
> -** Tag
> -
> - Create a baseline on the prep project.
> - You may need to change the purpose in the pom to create the baseline
> (only prep purpose are allowed). -
> --------
> -ccm start -m -q -nogui -n <username> -pw <password>
> -ccm baseline -create <tag> -p <project_spec> -r <release> -purpose
> <purpose> -ccm stop
> --------
> + ------
> + SCM Implementation: CM/Synergy
> + ------
> + Julien Henry (Capgemini) & La Poste
> + ------
> + 2006-10-23
> + ------
> +
> +~~ Licensed to the Apache Software Foundation (ASF) under one
> +~~ or more contributor license agreements. See the NOTICE file
> +~~ distributed with this work for additional information
> +~~ regarding copyright ownership. The ASF licenses this file
> +~~ to you under the Apache License, Version 2.0 (the
> +~~ "License"); you may not use this file except in compliance
> +~~ with the License. You may obtain a copy of the License at
> +~~
> +~~ http://www.apache.org/licenses/LICENSE-2.0
> +~~
> +~~ Unless required by applicable law or agreed to in writing,
> +~~ software distributed under the License is distributed on an
> +~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> +~~ KIND, either express or implied. See the License for the
> +~~ specific language governing permissions and limitations
> +~~ under the License.
> +
> +~~ NOTE: For help with the syntax of this file, see:
> +~~ http://maven.apache.org/doxia/references/apt-format.html
> +
> +SCM Implementation: CM/Synergy
> +
> +* General Info
> +
> + Link: {{http://www.telelogic.com/Products/synergy/synergycm/index.cfm}}
> +
> + License: Commercial
> +
> +* SCM URL
> +
> + For all URLs below, we use a colon (:) as separator. If you use a colon
> for one of the variables (e.g. a windows path), then use a pipe (|) as
> separator. +
> +-------
> +scm:synergy<delimiter>project_name<delimiter>database_delimiter<delimiter>p
> roject_version<delimiter>release<delimiter>purpose<delimiter>instance
> +-------
> +
> + <project_name>: This is the name of the project from which the checkout
> is done. +
> + <project_version>: This is the version of the project from which the
> checkout is done (usually a prep project). +
> + <release>: This is the release.
> +
> + <purpose>: This is the purpose.
> +
> + <instance>: This is the (optional) instance of the project from which the
> checkout is done (usually a prep project). Default is 1. +
> +* Examples
> +
> +-------
> +scm:synergy:MyProject:~:int_1.0:MyProject/2.0:Devel:1
> +scm|synergy|MyProject|-|int_1.0|MyProject/2.0|Devel:db1#1
> +-------
> +
> +* Extra Information
> +** General
> +
> + ccm start command shall use -rc in addition to below options for remote
> linux clients. +
> +** Checkout
> +
> + Checkout purpose is to get sources from a working Work Area to a given
> folder. First, + it checks if a work area already exists with the given
> version. If yes, it only synchronizes and reconfigures + the existing
> one, and then copies file to the expecting folder. If no Work Area exists,
> then a checkout is done. +
> + To specify the version of the checkout working project, use <tag>
> parameter. +
> + When a 'checkout' happens, the following scm commands are generated
> +
> +-------
> +ccm start -m -q -nogui -n <username> -pw <password>
> +ccm query -u -f %objectname "owner='<username>' and status='working' and
> type='project' and has_predecessor('<project_spec>')" //Check for existing
> checkout +ccm synchronize -p <working_project_spec>
> +ccm reconfigure -p <working_project_spec>
> +ccm checkout -subprojects -rel [-t <tag>] -purpose <purpose> -release
> <release> -p <project_spec> // If no existing working project exists +ccm
> stop
> +-------
> +
> +** Update
> +
> + Reconfigure project with default reconfigure template, and copy file
> from work area to expected folder. +
> +-------
> +ccm start -m -q -nogui -n <username> -pw <password>
> +ccm query -u -f %objectname "owner='<username>' and status='working' and
> type='project' and has_predecessor('<project_spec>')" //Check for existing
> checkout +ccm reconfigure -r -p <working_project_spec>
> +ccm stop
> +-------
> +
> +** Add
> +
> + Create a default task, add new file(s) to the repository and checkin
> the task. + <message> You can change the synopsis of the task by setting
> this parameter +
> +-------
> +ccm start -m -q -nogui -n <username> -pw <password>
> +ccm task -create -def -release <release> -synopsis <message>
> +ccm create -c <message> <filename>
> +ccm task -checkin <task_spec> -comment <message>
> +ccm stop
> +-------
> +
> +** Remove
> +
> + Remove a file from repository.
> +
> +-------
> +ccm start -m -q -nogui -n <username> -pw <password>
> +ccm delete <filename>
> +ccm stop
> +-------
> +
> +** Changelog
> +
> + Get modified files history. In order to parse output of Synergy command,
> we need to know different parameters: +
> + * maven.scm.synergy.ccmDateFormat (default value is EEE MMM dd HH:mm:ss
> yyyy) +
> + * maven.scm.synergy.language (default value is en)
> +
> + * maven.scm.synergy.country (default value is US)
> +
> + []
> +
> +-------
> +ccm start -m -q -nogui -n <username> -pw <password>
> +ccm query -u is_task_in_folder_of(is_folder_in_rp_of('<project_spec>')) and
> completion_date>time(<startDate>) and completion_date<time(<endDate>) +ccm
> task -show objects <task>
> +ccm stop
> +-------
> +
> +** Checkin
> +
> + Checkin the default task.
> +
> +-------
> +ccm start -m -q -nogui -n <username> -pw <password>
> +ccm task -checkin default -c <message>
> +ccm stop
> +-------
> +
> +** Edit
> +
> + Create a default task and checkout file(s).
> +
> +-------
> +ccm start -m -q -nogui -n <username> -pw <password>
> +ccm task -create -def -release <release> -synopsis <message>
> +ccm co <filename>
> +ccm stop
> +-------
> +
> +** Unedit
> +
> + Cancel edition. Replace file with previous version.
> +
> +-------
> +ccm start -m -q -nogui -n <username> -pw <password>
> +ccm delete -replace <filename>
> +ccm stop
> +-------
> +
> +** Status
> +
> + Get state of files.
> +
> +-------
> +ccm start -m -q -nogui -n <username> -pw <password>
> +ccm dir -m
> +ccm stop
> +-------
> +
> +** Tag
> +
> + Create a baseline on the prep project.
> + You may need to change the purpose in the pom to create the baseline
> (only prep purpose are allowed). +
> +-------
> +ccm start -m -q -nogui -n <username> -pw <password>
> +ccm baseline -create <tag> -p <project_spec> -r <release> -purpose
> <purpose> +ccm stop
> +-------
>
> http://git-wip-us.apache.org/repos/asf/maven-scm/blob/22d21c4e/src/site/apt/
> tfs.apt
> ---------------------------------------------------------------------- diff
> --git a/src/site/apt/tfs.apt b/src/site/apt/tfs.apt
> index 4eeb75f..075bdeb 100644
> --- a/src/site/apt/tfs.apt
> +++ b/src/site/apt/tfs.apt
> @@ -1,50 +1,50 @@
> - ------
> - SCM Implementation: TFS - Team Foundation Server
> - ------
> - Mark Struberg
> - ------
> - 2009-08-24
> - ------
> -
> -~~ Licensed to the Apache Software Foundation (ASF) under one
> -~~ or more contributor license agreements. See the NOTICE file
> -~~ distributed with this work for additional information
> -~~ regarding copyright ownership. The ASF licenses this file
> -~~ to you under the Apache License, Version 2.0 (the
> -~~ "License"); you may not use this file except in compliance
> -~~ with the License. You may obtain a copy of the License at
> -~~
> -~~ http://www.apache.org/licenses/LICENSE-2.0
> -~~
> -~~ Unless required by applicable law or agreed to in writing,
> -~~ software distributed under the License is distributed on an
> -~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> -~~ KIND, either express or implied. See the License for the
> -~~ specific language governing permissions and limitations
> -~~ under the License.
> -
> -~~ NOTE: For help with the syntax of this file, see:
> -~~ http://maven.apache.org/doxia/references/apt-format.html
> -
> -SCM Implementation: TFS - Team Foundation Server
> -
> -* General Info
> -
> - Link:
> {{http://www.microsoft.com/germany/visualstudio/products/team-system/}} -
> - License: Commercial
> -
> -* SCM URL
> -
> - For all URLs below, we use a colon (:) as separator. If you use a colon
> for one of the variables (e.g. a windows path), then use a pipe (|) as
> separator. -
> --------
> -scm:tfs:[[domain\\]username[;password]@]http[s]://server_name[:port]:worksp
> ace:$/TeamProject/Path/To/Project --------
> -
> -* Examples
> -
> --------
> -scm:tfs:https://tfs10.codeplex.com:/maventest/ExampleProject
> --------
> -
> + ------
> + SCM Implementation: TFS - Team Foundation Server
> + ------
> + Mark Struberg
> + ------
> + 2009-08-24
> + ------
> +
> +~~ Licensed to the Apache Software Foundation (ASF) under one
> +~~ or more contributor license agreements. See the NOTICE file
> +~~ distributed with this work for additional information
> +~~ regarding copyright ownership. The ASF licenses this file
> +~~ to you under the Apache License, Version 2.0 (the
> +~~ "License"); you may not use this file except in compliance
> +~~ with the License. You may obtain a copy of the License at
> +~~
> +~~ http://www.apache.org/licenses/LICENSE-2.0
> +~~
> +~~ Unless required by applicable law or agreed to in writing,
> +~~ software distributed under the License is distributed on an
> +~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> +~~ KIND, either express or implied. See the License for the
> +~~ specific language governing permissions and limitations
> +~~ under the License.
> +
> +~~ NOTE: For help with the syntax of this file, see:
> +~~ http://maven.apache.org/doxia/references/apt-format.html
> +
> +SCM Implementation: TFS - Team Foundation Server
> +
> +* General Info
> +
> + Link:
> {{http://www.microsoft.com/germany/visualstudio/products/team-system/}} +
> + License: Commercial
> +
> +* SCM URL
> +
> + For all URLs below, we use a colon (:) as separator. If you use a colon
> for one of the variables (e.g. a windows path), then use a pipe (|) as
> separator. +
> +-------
> +scm:tfs:[[domain\\]username[;password]@]http[s]://server_name[:port]:worksp
> ace:$/TeamProject/Path/To/Project +-------
> +
> +* Examples
> +
> +-------
> +scm:tfs:https://tfs10.codeplex.com:/maventest/ExampleProject
> +-------
> +
>
> http://git-wip-us.apache.org/repos/asf/maven-scm/blob/22d21c4e/src/site/apt/
> vss.apt
> ---------------------------------------------------------------------- diff
> --git a/src/site/apt/vss.apt b/src/site/apt/vss.apt
> index 934808c..cbabbe1 100644
> --- a/src/site/apt/vss.apt
> +++ b/src/site/apt/vss.apt
> @@ -1,79 +1,79 @@
> - ------
> - SCM Implementation: Visual Source Safe
> - ------
> - Wim Deblauwe
> - ------
> - 2008-09-02
> - ------
> -
> -~~ Licensed to the Apache Software Foundation (ASF) under one
> -~~ or more contributor license agreements. See the NOTICE file
> -~~ distributed with this work for additional information
> -~~ regarding copyright ownership. The ASF licenses this file
> -~~ to you under the Apache License, Version 2.0 (the
> -~~ "License"); you may not use this file except in compliance
> -~~ with the License. You may obtain a copy of the License at
> -~~
> -~~ http://www.apache.org/licenses/LICENSE-2.0
> -~~
> -~~ Unless required by applicable law or agreed to in writing,
> -~~ software distributed under the License is distributed on an
> -~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> -~~ KIND, either express or implied. See the License for the
> -~~ specific language governing permissions and limitations
> -~~ under the License.
> -
> -~~ NOTE: For help with the syntax of this file, see:
> -~~ http://maven.apache.org/doxia/references/apt-format.html
> -
> -SCM Implementation: Visual Source Safe
> -
> -* General Info
> -
> - Link: {{http://msdn.microsoft.com/ssafe/}}
> -
> - License: Commercial
> -
> -* SCM URL
> -
> - Because a colon is used for one of the variables (a windows path), a
> pipe (|) is used as the delimiter. -
> - The general format for a VSS SCM URL is
> -
> --------
> -scm:vss|path_to_repository|/module_name
> --------
> -
> - The third variable is the path to the Visual Source Safe repository
> (where <<<srcsafe.ini>>> resides). -
> - Note that a forward slash is necessary before the module name in the
> final variable. -
> -* Examples
> -
> --------
> -scm:vss|C:\Program Files\Microsoft Visual Studio\VSS|/SomeProject
> --------
> -
> -* Provider Configuration
> -
> - The provider configuration is defined in
> <<<${user.home}/.scm/vss-settings.xml>>> -
> -** VSS Installation directory
> -
> - The provider needs to know the installation path of the <<<ss.exe>>> in
> order to fulfill VSS commands. The installation path can be set in two ways
> - either in the <<<vss-settings.xml>>> file: -
> --------
> -<vss-settings>
> - <Settings>
> - <vssDirectory>ss_exe_directory</vssDirectory>
> - <Settings>
> -</vss-settings>
> --------
> -
> - or on the command line:
> -
> --------
> -mvn -DvssDirectory=ss_exe_directory scm:update
> --------
> -
> - In either case, <<<ss_exe_directory>>> should be set to the full path to
> the directory where <<<ss.exe>>> resides (e.g. <<<C:\Program
> Files\Microsoft Visual Studio\VSS\bin>>>). + ------
> + SCM Implementation: Visual Source Safe
> + ------
> + Wim Deblauwe
> + ------
> + 2008-09-02
> + ------
> +
> +~~ Licensed to the Apache Software Foundation (ASF) under one
> +~~ or more contributor license agreements. See the NOTICE file
> +~~ distributed with this work for additional information
> +~~ regarding copyright ownership. The ASF licenses this file
> +~~ to you under the Apache License, Version 2.0 (the
> +~~ "License"); you may not use this file except in compliance
> +~~ with the License. You may obtain a copy of the License at
> +~~
> +~~ http://www.apache.org/licenses/LICENSE-2.0
> +~~
> +~~ Unless required by applicable law or agreed to in writing,
> +~~ software distributed under the License is distributed on an
> +~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> +~~ KIND, either express or implied. See the License for the
> +~~ specific language governing permissions and limitations
> +~~ under the License.
> +
> +~~ NOTE: For help with the syntax of this file, see:
> +~~ http://maven.apache.org/doxia/references/apt-format.html
> +
> +SCM Implementation: Visual Source Safe
> +
> +* General Info
> +
> + Link: {{http://msdn.microsoft.com/ssafe/}}
> +
> + License: Commercial
> +
> +* SCM URL
> +
> + Because a colon is used for one of the variables (a windows path), a
> pipe (|) is used as the delimiter. +
> + The general format for a VSS SCM URL is
> +
> +-------
> +scm:vss|path_to_repository|/module_name
> +-------
> +
> + The third variable is the path to the Visual Source Safe repository
> (where <<<srcsafe.ini>>> resides). +
> + Note that a forward slash is necessary before the module name in the
> final variable. +
> +* Examples
> +
> +-------
> +scm:vss|C:\Program Files\Microsoft Visual Studio\VSS|/SomeProject
> +-------
> +
> +* Provider Configuration
> +
> + The provider configuration is defined in
> <<<${user.home}/.scm/vss-settings.xml>>> +
> +** VSS Installation directory
> +
> + The provider needs to know the installation path of the <<<ss.exe>>> in
> order to fulfill VSS commands. The installation path can be set in two ways
> - either in the <<<vss-settings.xml>>> file: +
> +-------
> +<vss-settings>
> + <Settings>
> + <vssDirectory>ss_exe_directory</vssDirectory>
> + <Settings>
> +</vss-settings>
> +-------
> +
> + or on the command line:
> +
> +-------
> +mvn -DvssDirectory=ss_exe_directory scm:update
> +-------
> +
> + In either case, <<<ss_exe_directory>>> should be set to the full path to
> the directory where <<<ss.exe>>> resides (e.g. <<<C:\Program
> Files\Microsoft Visual Studio\VSS\bin>>>).
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: [1/2] Remove unintentional CRs
Posted by Kristian Rosenvold <kr...@gmail.com>.
Your local settings dont matter now that I added .gitattributes
K
Re: [1/2] Remove unintentional CRs
Posted by Michael-O <19...@gmx.net>.
Am 2013-11-23 07:23, schrieb Hervé BOUTEMY:
> uh!
>
> with svn, we have svn-eol-style.txt [1] to deal automatically with such
> newline issues
>
> with git, nothing is written yet [2], but I suppose we need such an equivalent
> config since .apt files are not well known
>
That one was quite annoying. Took me quite some time to figure out the
correct settings for Git (cmd and egit). I do not even know whether I
got them right now. Subversion made that way easier.
Stackoverflow was a good help here.
I have now this in place:
$ git config --global --get-regexp core.*
core.autocrlf true
core.eol native
core.safecrlf true
Has anyone a better cross-OS setting?
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: [1/2] Remove unintentional CRs
Posted by Stephen Connolly <st...@gmail.com>.
On Saturday, 23 November 2013, Michael-O <19...@gmx.net> wrote:
> Am 2013-11-23 20:18, schrieb Stephen Connolly:
>
>> On Saturday, 23 November 2013, Michael-O <19...@gmx.net> wrote:
>>
>> Am 2013-11-23 19:02, schrieb Hervé BOUTEMY:
>>>
>>> I updated https://cwiki.apache.org/confluence/display/MAVEN/Git+
>>>> Migrationwith
>>>> .gitattributes instructions, and made a global cleanup
>>>> Seems like plugin-tools is ready for migration, or even did it without
>>>> having
>>>> the page updated
>>>>
>>>> Now, I did not have any feedback about SCM report problems with git,
>>>> solutions
>>>> actually found (including link to github mirror): I added a section in
>>>> the
>>>> page. Feedback appreciated
>>>>
>>>>
>>>> Then what do we really win with this git migration? Did it give us more
>>>> contributions?
>>>> I know what I lost (easy commit reference, SCM report, a lot of time
>>>> dealing
>>>> with unexpected state of my local clone, merge commit because bad rebase
>>>> habits, ...)
>>>> And nobody seems working on enhancements: Apache Jenkins has actually
>>>> issues
>>>> with git updates
>>>>
>>>> I hope someone really wins something with this git migration, because I
>>>> really
>>>> don't see benefits for myself
>>>>
>>>>
>>> In terms of contributions zero. If someone not keen enough to dig into
>>> code and prepare a patch or are simply too lazy.
>>>
>>> Now -- you need to fork, clone, push, create a pull request. Even more
>>> work.
>>>
>>> I don't see any benefit.
>>>
>>
>>
>> I often find the only time I get to work on maven is when I'm off-line.
>> Svn
>> stopped me doing more work on doxia because I wanted to commit per issue,
>> not one big mess as I would have been trampling over myself.
>>
>> But on the other hand I think the real issue is what our issue has been
>> for
>> a long time... We are stuck with crappy modelVersion 4.0.0 until we get
>> past that we cannot significantly evolve and grow in the direction people
>> want to help us grow
>>
>> How often do we have people chime in on the M/L with some suggestion or
>> wanting to try and fix something and we have to point out that we are
>> still
>> stuck with the modelVersion 4.0.0 problem? I think it is about ever 2-3
>> weeks... That's 20 potential committers we've list this year
>>
>> Git vs SVN is not the issue... The real issue is our major techical issue:
>> schema migration (and how to not screw over all the pom parsers who we
>> don't write but everyone else uses)... We've been dodging this issue for
>> at
>> least 3-4 years now... I think once 3.2 is out the door we need to
>> finally tackle it head or give up and ask the board for the attic.
>>
>> -Stephen (speaking person opinions, *not* as PMC chair)
>>
>
> True words.
>
> Model 5.0.0 would require Maven 4.0 and cleanup of env vars like M2_HOME,
> .m2 m2.conf and so forth.
Maven 4.0 => yes
The others => maybe not... Remains to be seen
>
> Otherwise you cannot break out of the current limitations without breaking
> people's stuff.
We need to be careful whatever we do... ModelVersion 4.0.0 has been with us
far longer than I suspect anyone expected... ModelVersion 5.0.0 needs to be
good enough that we don't *expect* needing to change it any time soon,
because it *might* be around for a long time... On the other hand if we
find a good escape hatch to let us evolve then we can keep enhancing the
model over time.
The real issue is that we now have polyglot parsers... Some parsers written
in ruby, JavaScript, etc. so we no longer control the parsers and we cannot
even assume they are JVM based... That means we need a solid spec and
stability or they will not follow... Also we might be advised to drop XML
(or maybe not... XSLT might be an answer for evolution)
In any case we should reboot the modelVersion 5.0.0 debate. This project
needs the debate and a resolution just as we need air to breath.
>
>
> Michael
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
>
--
Sent from my phone
Re: [1/2] Remove unintentional CRs
Posted by Michael-O <19...@gmx.net>.
Am 2013-11-23 20:18, schrieb Stephen Connolly:
> On Saturday, 23 November 2013, Michael-O <19...@gmx.net> wrote:
>
>> Am 2013-11-23 19:02, schrieb Hervé BOUTEMY:
>>
>>> I updated https://cwiki.apache.org/confluence/display/MAVEN/Git+Migrationwith
>>> .gitattributes instructions, and made a global cleanup
>>> Seems like plugin-tools is ready for migration, or even did it without
>>> having
>>> the page updated
>>>
>>> Now, I did not have any feedback about SCM report problems with git,
>>> solutions
>>> actually found (including link to github mirror): I added a section in the
>>> page. Feedback appreciated
>>>
>>>
>>> Then what do we really win with this git migration? Did it give us more
>>> contributions?
>>> I know what I lost (easy commit reference, SCM report, a lot of time
>>> dealing
>>> with unexpected state of my local clone, merge commit because bad rebase
>>> habits, ...)
>>> And nobody seems working on enhancements: Apache Jenkins has actually
>>> issues
>>> with git updates
>>>
>>> I hope someone really wins something with this git migration, because I
>>> really
>>> don't see benefits for myself
>>>
>>
>> In terms of contributions zero. If someone not keen enough to dig into
>> code and prepare a patch or are simply too lazy.
>>
>> Now -- you need to fork, clone, push, create a pull request. Even more
>> work.
>>
>> I don't see any benefit.
>
>
> I often find the only time I get to work on maven is when I'm off-line. Svn
> stopped me doing more work on doxia because I wanted to commit per issue,
> not one big mess as I would have been trampling over myself.
>
> But on the other hand I think the real issue is what our issue has been for
> a long time... We are stuck with crappy modelVersion 4.0.0 until we get
> past that we cannot significantly evolve and grow in the direction people
> want to help us grow
>
> How often do we have people chime in on the M/L with some suggestion or
> wanting to try and fix something and we have to point out that we are still
> stuck with the modelVersion 4.0.0 problem? I think it is about ever 2-3
> weeks... That's 20 potential committers we've list this year
>
> Git vs SVN is not the issue... The real issue is our major techical issue:
> schema migration (and how to not screw over all the pom parsers who we
> don't write but everyone else uses)... We've been dodging this issue for at
> least 3-4 years now... I think once 3.2 is out the door we need to
> finally tackle it head or give up and ask the board for the attic.
>
> -Stephen (speaking person opinions, *not* as PMC chair)
True words.
Model 5.0.0 would require Maven 4.0 and cleanup of env vars like
M2_HOME, .m2 m2.conf and so forth.
Otherwise you cannot break out of the current limitations without
breaking people's stuff.
Michael
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: [1/2] Remove unintentional CRs
Posted by Stephen Connolly <st...@gmail.com>.
On Saturday, 23 November 2013, Michael-O <19...@gmx.net> wrote:
> Am 2013-11-23 19:02, schrieb Hervé BOUTEMY:
>
>> I updated https://cwiki.apache.org/confluence/display/MAVEN/Git+Migrationwith
>> .gitattributes instructions, and made a global cleanup
>> Seems like plugin-tools is ready for migration, or even did it without
>> having
>> the page updated
>>
>> Now, I did not have any feedback about SCM report problems with git,
>> solutions
>> actually found (including link to github mirror): I added a section in the
>> page. Feedback appreciated
>>
>>
>> Then what do we really win with this git migration? Did it give us more
>> contributions?
>> I know what I lost (easy commit reference, SCM report, a lot of time
>> dealing
>> with unexpected state of my local clone, merge commit because bad rebase
>> habits, ...)
>> And nobody seems working on enhancements: Apache Jenkins has actually
>> issues
>> with git updates
>>
>> I hope someone really wins something with this git migration, because I
>> really
>> don't see benefits for myself
>>
>
> In terms of contributions zero. If someone not keen enough to dig into
> code and prepare a patch or are simply too lazy.
>
> Now -- you need to fork, clone, push, create a pull request. Even more
> work.
>
> I don't see any benefit.
I often find the only time I get to work on maven is when I'm off-line. Svn
stopped me doing more work on doxia because I wanted to commit per issue,
not one big mess as I would have been trampling over myself.
But on the other hand I think the real issue is what our issue has been for
a long time... We are stuck with crappy modelVersion 4.0.0 until we get
past that we cannot significantly evolve and grow in the direction people
want to help us grow
How often do we have people chime in on the M/L with some suggestion or
wanting to try and fix something and we have to point out that we are still
stuck with the modelVersion 4.0.0 problem? I think it is about ever 2-3
weeks... That's 20 potential committers we've list this year
Git vs SVN is not the issue... The real issue is our major techical issue:
schema migration (and how to not screw over all the pom parsers who we
don't write but everyone else uses)... We've been dodging this issue for at
least 3-4 years now... I think once 3.2 is out the door we need to
finally tackle it head or give up and ask the board for the attic.
-Stephen (speaking person opinions, *not* as PMC chair)
> Michael
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
>
--
Sent from my phone
Re: [1/2] Remove unintentional CRs
Posted by Michael-O <19...@gmx.net>.
Am 2013-11-23 19:02, schrieb Hervé BOUTEMY:
> I updated https://cwiki.apache.org/confluence/display/MAVEN/Git+Migration with
> .gitattributes instructions, and made a global cleanup
> Seems like plugin-tools is ready for migration, or even did it without having
> the page updated
>
> Now, I did not have any feedback about SCM report problems with git, solutions
> actually found (including link to github mirror): I added a section in the
> page. Feedback appreciated
>
>
> Then what do we really win with this git migration? Did it give us more
> contributions?
> I know what I lost (easy commit reference, SCM report, a lot of time dealing
> with unexpected state of my local clone, merge commit because bad rebase
> habits, ...)
> And nobody seems working on enhancements: Apache Jenkins has actually issues
> with git updates
>
> I hope someone really wins something with this git migration, because I really
> don't see benefits for myself
In terms of contributions zero. If someone not keen enough to dig into
code and prepare a patch or are simply too lazy.
Now -- you need to fork, clone, push, create a pull request. Even more work.
I don't see any benefit.
Michael
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: [1/2] Remove unintentional CRs
Posted by Hervé BOUTEMY <he...@free.fr>.
I updated https://cwiki.apache.org/confluence/display/MAVEN/Git+Migration with
.gitattributes instructions, and made a global cleanup
Seems like plugin-tools is ready for migration, or even did it without having
the page updated
Now, I did not have any feedback about SCM report problems with git, solutions
actually found (including link to github mirror): I added a section in the
page. Feedback appreciated
Then what do we really win with this git migration? Did it give us more
contributions?
I know what I lost (easy commit reference, SCM report, a lot of time dealing
with unexpected state of my local clone, merge commit because bad rebase
habits, ...)
And nobody seems working on enhancements: Apache Jenkins has actually issues
with git updates
I hope someone really wins something with this git migration, because I really
don't see benefits for myself
Regards,
Hervé
Le samedi 23 novembre 2013 10:51:18 Kristian Rosenvold a écrit :
> I just added a .gitattributes file to the repo, which fixes the problem
> permanently.
>
>
> All our git repos now have that file. Come to think of it, maybe we should
> do another round of migrations ?
>
>
> Kristian
>
> 23. nov. 2013 07:23 skrev "Hervé BOUTEMY" <he...@free.fr> følgende:
> > uh!
> >
> > with svn, we have svn-eol-style.txt [1] to deal automatically with such
> > newline issues
> >
> > with git, nothing is written yet [2], but I suppose we need such an
> > equivalent
> > config since .apt files are not well known
> >
> > Any git guru to the rescue, please?
> >
> > Regards,
> >
> > Hervé
> >
> > [1] http://maven.apache.org/developers/conventions/svn.html
> >
> > [2] http://maven.apache.org/developers/conventions/git.html
> >
> > Le vendredi 22 novembre 2013 20:54:33 michaelo@apache.org a écrit :
> > > Updated Branches:
> > > refs/heads/master 7436d740d -> 22d21c4e2
> >
> > http://git-wip-us.apache.org/repos/asf/maven-scm/blob/22d21c4e/src/site/ap
> > t/>
> > > synergy.apt
> > > ----------------------------------------------------------------------
> >
> > diff
> >
> > > --git a/src/site/apt/synergy.apt b/src/site/apt/synergy.apt
> > > index 7594875..3e7c37c 100644
> > > --- a/src/site/apt/synergy.apt
> > > +++ b/src/site/apt/synergy.apt
> > > @@ -1,189 +1,189 @@
> > > - ------
> > > - SCM Implementation: CM/Synergy
> > > - ------
> > > - Julien Henry (Capgemini) & La Poste
> > > - ------
> > > - 2006-10-23
> > > - ------
> > > -
> > > -~~ Licensed to the Apache Software Foundation (ASF) under one
> > > -~~ or more contributor license agreements. See the NOTICE file
> > > -~~ distributed with this work for additional information
> > > -~~ regarding copyright ownership. The ASF licenses this file
> > > -~~ to you under the Apache License, Version 2.0 (the
> > > -~~ "License"); you may not use this file except in compliance
> > > -~~ with the License. You may obtain a copy of the License at
> > > -~~
> > > -~~ http://www.apache.org/licenses/LICENSE-2.0
> > > -~~
> > > -~~ Unless required by applicable law or agreed to in writing,
> > > -~~ software distributed under the License is distributed on an
> > > -~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> > > -~~ KIND, either express or implied. See the License for the
> > > -~~ specific language governing permissions and limitations
> > > -~~ under the License.
> > > -
> > > -~~ NOTE: For help with the syntax of this file, see:
> > > -~~ http://maven.apache.org/doxia/references/apt-format.html
> > > -
> > > -SCM Implementation: CM/Synergy
> > > -
> > > -* General Info
> > > -
> > > - Link: {{
> >
> > http://www.telelogic.com/Products/synergy/synergycm/index.cfm}}
> >
> > > -
> > > - License: Commercial
> > > -
> > > -* SCM URL
> > > -
> > > - For all URLs below, we use a colon (:) as separator. If you use a
> >
> > colon
> >
> > > for one of the variables (e.g. a windows path), then use a pipe (|) as
> > > separator. -
> > > --------
> >
> > -scm:synergy<delimiter>project_name<delimiter>database_delimiter<delimiter
> > >p>
> > > roject_version<delimiter>release<delimiter>purpose<delimiter>instance
> > > --------
> > > -
> > > - <project_name>: This is the name of the project from which the
> >
> > checkout
> >
> > > is done. -
> > > - <project_version>: This is the version of the project from which
> > > the
> > > checkout is done (usually a prep project). -
> > > - <release>: This is the release.
> > > -
> > > - <purpose>: This is the purpose.
> > > -
> > > - <instance>: This is the (optional) instance of the project from
> >
> > which the
> >
> > > checkout is done (usually a prep project). Default is 1. -
> > > -* Examples
> > > -
> > > --------
> > > -scm:synergy:MyProject:~:int_1.0:MyProject/2.0:Devel:1
> > > -scm|synergy|MyProject|-|int_1.0|MyProject/2.0|Devel:db1#1
> > > --------
> > > -
> > > -* Extra Information
> > > -** General
> > > -
> > > - ccm start command shall use -rc in addition to below options for
> >
> > remote
> >
> > > linux clients. -
> > > -** Checkout
> > > -
> > > - Checkout purpose is to get sources from a working Work Area to a
> >
> > given
> >
> > > folder. First, - it checks if a work area already exists with the
> >
> > given
> >
> > > version. If yes, it only synchronizes and reconfigures - the existing
> > > one, and then copies file to the expecting folder. If no Work Area
> >
> > exists,
> >
> > > then a checkout is done. -
> > > - To specify the version of the checkout working project, use <tag>
> > > parameter. -
> > > - When a 'checkout' happens, the following scm commands are generated
> > > -
> > > --------
> > > -ccm start -m -q -nogui -n <username> -pw <password>
> > > -ccm query -u -f %objectname "owner='<username>' and status='working'
> > > and
> > > type='project' and has_predecessor('<project_spec>')" //Check for
> >
> > existing
> >
> > > checkout -ccm synchronize -p <working_project_spec>
> > > -ccm reconfigure -p <working_project_spec>
> > > -ccm checkout -subprojects -rel [-t <tag>] -purpose <purpose> -release
> > > <release> -p <project_spec> // If no existing working project exists
> > > -ccm
> > > stop
> > > --------
> > > -
> > > -** Update
> > > -
> > > - Reconfigure project with default reconfigure template, and copy
> > > file
> > > from work area to expected folder. -
> > > --------
> > > -ccm start -m -q -nogui -n <username> -pw <password>
> > > -ccm query -u -f %objectname "owner='<username>' and status='working'
> > > and
> > > type='project' and has_predecessor('<project_spec>')" //Check for
> >
> > existing
> >
> > > checkout -ccm reconfigure -r -p <working_project_spec>
> > > -ccm stop
> > > --------
> > > -
> > > -** Add
> > > -
> > > - Create a default task, add new file(s) to the repository and
> > > checkin
> > > the task. - <message> You can change the synopsis of the task by
> >
> > setting
> >
> > > this parameter -
> > > --------
> > > -ccm start -m -q -nogui -n <username> -pw <password>
> > > -ccm task -create -def -release <release> -synopsis <message>
> > > -ccm create -c <message> <filename>
> > > -ccm task -checkin <task_spec> -comment <message>
> > > -ccm stop
> > > --------
> > > -
> > > -** Remove
> > > -
> > > - Remove a file from repository.
> > > -
> > > --------
> > > -ccm start -m -q -nogui -n <username> -pw <password>
> > > -ccm delete <filename>
> > > -ccm stop
> > > --------
> > > -
> > > -** Changelog
> > > -
> > > - Get modified files history. In order to parse output of Synergy
> >
> > command,
> >
> > > we need to know different parameters: -
> > > - * maven.scm.synergy.ccmDateFormat (default value is EEE MMM dd
> > > HH:mm:ss
> > > yyyy) -
> > > - * maven.scm.synergy.language (default value is en)
> > > -
> > > - * maven.scm.synergy.country (default value is US)
> > > -
> > > - []
> > > -
> > > --------
> > > -ccm start -m -q -nogui -n <username> -pw <password>
> > > -ccm query -u is_task_in_folder_of(is_folder_in_rp_of('<project_spec>'))
> >
> > and
> >
> > > completion_date>time(<startDate>) and completion_date<time(<endDate>)
> >
> > -ccm
> >
> > > task -show objects <task>
> > > -ccm stop
> > > --------
> > > -
> > > -** Checkin
> > > -
> > > - Checkin the default task.
> > > -
> > > --------
> > > -ccm start -m -q -nogui -n <username> -pw <password>
> > > -ccm task -checkin default -c <message>
> > > -ccm stop
> > > --------
> > > -
> > > -** Edit
> > > -
> > > - Create a default task and checkout file(s).
> > > -
> > > --------
> > > -ccm start -m -q -nogui -n <username> -pw <password>
> > > -ccm task -create -def -release <release> -synopsis <message>
> > > -ccm co <filename>
> > > -ccm stop
> > > --------
> > > -
> > > -** Unedit
> > > -
> > > - Cancel edition. Replace file with previous version.
> > > -
> > > --------
> > > -ccm start -m -q -nogui -n <username> -pw <password>
> > > -ccm delete -replace <filename>
> > > -ccm stop
> > > --------
> > > -
> > > -** Status
> > > -
> > > - Get state of files.
> > > -
> > > --------
> > > -ccm start -m -q -nogui -n <username> -pw <password>
> > > -ccm dir -m
> > > -ccm stop
> > > --------
> > > -
> > > -** Tag
> > > -
> > > - Create a baseline on the prep project.
> > > - You may need to change the purpose in the pom to create the
> > > baseline
> > > (only prep purpose are allowed). -
> > > --------
> > > -ccm start -m -q -nogui -n <username> -pw <password>
> > > -ccm baseline -create <tag> -p <project_spec> -r <release> -purpose
> > > <purpose> -ccm stop
> > > --------
> > > + ------
> > > + SCM Implementation: CM/Synergy
> > > + ------
> > > + Julien Henry (Capgemini) & La Poste
> > > + ------
> > > + 2006-10-23
> > > + ------
> > > +
> > > +~~ Licensed to the Apache Software Foundation (ASF) under one
> > > +~~ or more contributor license agreements. See the NOTICE file
> > > +~~ distributed with this work for additional information
> > > +~~ regarding copyright ownership. The ASF licenses this file
> > > +~~ to you under the Apache License, Version 2.0 (the
> > > +~~ "License"); you may not use this file except in compliance
> > > +~~ with the License. You may obtain a copy of the License at
> > > +~~
> > > +~~ http://www.apache.org/licenses/LICENSE-2.0
> > > +~~
> > > +~~ Unless required by applicable law or agreed to in writing,
> > > +~~ software distributed under the License is distributed on an
> > > +~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> > > +~~ KIND, either express or implied. See the License for the
> > > +~~ specific language governing permissions and limitations
> > > +~~ under the License.
> > > +
> > > +~~ NOTE: For help with the syntax of this file, see:
> > > +~~ http://maven.apache.org/doxia/references/apt-format.html
> > > +
> > > +SCM Implementation: CM/Synergy
> > > +
> > > +* General Info
> > > +
> > > + Link: {{
> >
> > http://www.telelogic.com/Products/synergy/synergycm/index.cfm}}
> >
> > > +
> > > + License: Commercial
> > > +
> > > +* SCM URL
> > > +
> > > + For all URLs below, we use a colon (:) as separator. If you use a
> >
> > colon
> >
> > > for one of the variables (e.g. a windows path), then use a pipe (|) as
> > > separator. +
> > > +-------
> >
> > +scm:synergy<delimiter>project_name<delimiter>database_delimiter<delimiter
> > >p>
> > > roject_version<delimiter>release<delimiter>purpose<delimiter>instance
> > > +-------
> > > +
> > > + <project_name>: This is the name of the project from which the
> >
> > checkout
> >
> > > is done. +
> > > + <project_version>: This is the version of the project from which
> > > the
> > > checkout is done (usually a prep project). +
> > > + <release>: This is the release.
> > > +
> > > + <purpose>: This is the purpose.
> > > +
> > > + <instance>: This is the (optional) instance of the project from
> >
> > which the
> >
> > > checkout is done (usually a prep project). Default is 1. +
> > > +* Examples
> > > +
> > > +-------
> > > +scm:synergy:MyProject:~:int_1.0:MyProject/2.0:Devel:1
> > > +scm|synergy|MyProject|-|int_1.0|MyProject/2.0|Devel:db1#1
> > > +-------
> > > +
> > > +* Extra Information
> > > +** General
> > > +
> > > + ccm start command shall use -rc in addition to below options for
> >
> > remote
> >
> > > linux clients. +
> > > +** Checkout
> > > +
> > > + Checkout purpose is to get sources from a working Work Area to a
> >
> > given
> >
> > > folder. First, + it checks if a work area already exists with the
> >
> > given
> >
> > > version. If yes, it only synchronizes and reconfigures + the existing
> > > one, and then copies file to the expecting folder. If no Work Area
> >
> > exists,
> >
> > > then a checkout is done. +
> > > + To specify the version of the checkout working project, use <tag>
> > > parameter. +
> > > + When a 'checkout' happens, the following scm commands are generated
> > > +
> > > +-------
> > > +ccm start -m -q -nogui -n <username> -pw <password>
> > > +ccm query -u -f %objectname "owner='<username>' and status='working'
> > > and
> > > type='project' and has_predecessor('<project_spec>')" //Check for
> >
> > existing
> >
> > > checkout +ccm synchronize -p <working_project_spec>
> > > +ccm reconfigure -p <working_project_spec>
> > > +ccm checkout -subprojects -rel [-t <tag>] -purpose <purpose> -release
> > > <release> -p <project_spec> // If no existing working project exists
> > > +ccm
> > > stop
> > > +-------
> > > +
> > > +** Update
> > > +
> > > + Reconfigure project with default reconfigure template, and copy
> > > file
> > > from work area to expected folder. +
> > > +-------
> > > +ccm start -m -q -nogui -n <username> -pw <password>
> > > +ccm query -u -f %objectname "owner='<username>' and status='working'
> > > and
> > > type='project' and has_predecessor('<project_spec>')" //Check for
> >
> > existing
> >
> > > checkout +ccm reconfigure -r -p <working_project_spec>
> > > +ccm stop
> > > +-------
> > > +
> > > +** Add
> > > +
> > > + Create a default task, add new file(s) to the repository and
> > > checkin
> > > the task. + <message> You can change the synopsis of the task by
> >
> > setting
> >
> > > this parameter +
> > > +-------
> > > +ccm start -m -q -nogui -n <username> -pw <password>
> > > +ccm task -create -def -release <release> -synopsis <message>
> > > +ccm create -c <message> <filename>
> > > +ccm task -checkin <task_spec> -comment <message>
> > > +ccm stop
> > > +-------
> > > +
> > > +** Remove
> > > +
> > > + Remove a file from repository.
> > > +
> > > +-------
> > > +ccm start -m -q -nogui -n <username> -pw <password>
> > > +ccm delete <filename>
> > > +ccm stop
> > > +-------
> > > +
> > > +** Changelog
> > > +
> > > + Get modified files history. In order to parse output of Synergy
> >
> > command,
> >
> > > we need to know different parameters: +
> > > + * maven.scm.synergy.ccmDateFormat (default value is EEE MMM dd
> > > HH:mm:ss
> > > yyyy) +
> > > + * maven.scm.synergy.language (default value is en)
> > > +
> > > + * maven.scm.synergy.country (default value is US)
> > > +
> > > + []
> > > +
> > > +-------
> > > +ccm start -m -q -nogui -n <username> -pw <password>
> > > +ccm query -u is_task_in_folder_of(is_folder_in_rp_of('<project_spec>'))
> >
> > and
> >
> > > completion_date>time(<startDate>) and completion_date<time(<endDate>)
> >
> > +ccm
> >
> > > task -show objects <task>
> > > +ccm stop
> > > +-------
> > > +
> > > +** Checkin
> > > +
> > > + Checkin the default task.
> > > +
> > > +-------
> > > +ccm start -m -q -nogui -n <username> -pw <password>
> > > +ccm task -checkin default -c <message>
> > > +ccm stop
> > > +-------
> > > +
> > > +** Edit
> > > +
> > > + Create a default task and checkout file(s).
> > > +
> > > +-------
> > > +ccm start -m -q -nogui -n <username> -pw <password>
> > > +ccm task -create -def -release <release> -synopsis <message>
> > > +ccm co <filename>
> > > +ccm stop
> > > +-------
> > > +
> > > +** Unedit
> > > +
> > > + Cancel edition. Replace file with previous version.
> > > +
> > > +-------
> > > +ccm start -m -q -nogui -n <username> -pw <password>
> > > +ccm delete -replace <filename>
> > > +ccm stop
> > > +-------
> > > +
> > > +** Status
> > > +
> > > + Get state of files.
> > > +
> > > +-------
> > > +ccm start -m -q -nogui -n <username> -pw <password>
> > > +ccm dir -m
> > > +ccm stop
> > > +-------
> > > +
> > > +** Tag
> > > +
> > > + Create a baseline on the prep project.
> > > + You may need to change the purpose in the pom to create the
> > > baseline
> > > (only prep purpose are allowed). +
> > > +-------
> > > +ccm start -m -q -nogui -n <username> -pw <password>
> > > +ccm baseline -create <tag> -p <project_spec> -r <release> -purpose
> > > <purpose> +ccm stop
> > > +-------
> >
> > http://git-wip-us.apache.org/repos/asf/maven-scm/blob/22d21c4e/src/site/ap
> > t/>
> > > tfs.apt
> > > ----------------------------------------------------------------------
> >
> > diff
> >
> > > --git a/src/site/apt/tfs.apt b/src/site/apt/tfs.apt
> > > index 4eeb75f..075bdeb 100644
> > > --- a/src/site/apt/tfs.apt
> > > +++ b/src/site/apt/tfs.apt
> > > @@ -1,50 +1,50 @@
> > > - ------
> > > - SCM Implementation: TFS - Team Foundation Server
> > > - ------
> > > - Mark Struberg
> > > - ------
> > > - 2009-08-24
> > > - ------
> > > -
> > > -~~ Licensed to the Apache Software Foundation (ASF) under one
> > > -~~ or more contributor license agreements. See the NOTICE file
> > > -~~ distributed with this work for additional information
> > > -~~ regarding copyright ownership. The ASF licenses this file
> > > -~~ to you under the Apache License, Version 2.0 (the
> > > -~~ "License"); you may not use this file except in compliance
> > > -~~ with the License. You may obtain a copy of the License at
> > > -~~
> > > -~~ http://www.apache.org/licenses/LICENSE-2.0
> > > -~~
> > > -~~ Unless required by applicable law or agreed to in writing,
> > > -~~ software distributed under the License is distributed on an
> > > -~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> > > -~~ KIND, either express or implied. See the License for the
> > > -~~ specific language governing permissions and limitations
> > > -~~ under the License.
> > > -
> > > -~~ NOTE: For help with the syntax of this file, see:
> > > -~~ http://maven.apache.org/doxia/references/apt-format.html
> > > -
> > > -SCM Implementation: TFS - Team Foundation Server
> > > -
> > > -* General Info
> > > -
> > > - Link:
> > > {{http://www.microsoft.com/germany/visualstudio/products/team-system/}}
> >
> > -
> >
> > > - License: Commercial
> > > -
> > > -* SCM URL
> > > -
> > > - For all URLs below, we use a colon (:) as separator. If you use a
> >
> > colon
> >
> > > for one of the variables (e.g. a windows path), then use a pipe (|) as
> > > separator. -
> > > --------
> >
> > -scm:tfs:[[domain\\]username[;password]@]http[s]://server_name[:port]:work
> > sp>
> > > ace:$/TeamProject/Path/To/Project --------
> > > -
> > > -* Examples
> > > -
> > > --------
> > > -scm:tfs:https://tfs10.codeplex.com:/maventest/ExampleProject
> > > --------
> > > -
> > > + ------
> > > + SCM Implementation: TFS - Team Foundation Server
> > > + ------
> > > + Mark Struberg
> > > + ------
> > > + 2009-08-24
> > > + ------
> > > +
> > > +~~ Licensed to the Apache Software Foundation (ASF) under one
> > > +~~ or more contributor license agreements. See the NOTICE file
> > > +~~ distributed with this work for additional information
> > > +~~ regarding copyright ownership. The ASF licenses this file
> > > +~~ to you under the Apache License, Version 2.0 (the
> > > +~~ "License"); you may not use this file except in compliance
> > > +~~ with the License. You may obtain a copy of the License at
> > > +~~
> > > +~~ http://www.apache.org/licenses/LICENSE-2.0
> > > +~~
> > > +~~ Unless required by applicable law or agreed to in writing,
> > > +~~ software distributed under the License is distributed on an
> > > +~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> > > +~~ KIND, either express or implied. See the License for the
> > > +~~ specific language governing permissions and limitations
> > > +~~ under the License.
> > > +
> > > +~~ NOTE: For help with the syntax of this file, see:
> > > +~~ http://maven.apache.org/doxia/references/apt-format.html
> > > +
> > > +SCM Implementation: TFS - Team Foundation Server
> > > +
> > > +* General Info
> > > +
> > > + Link:
> > > {{http://www.microsoft.com/germany/visualstudio/products/team-system/}}
> >
> > +
> >
> > > + License: Commercial
> > > +
> > > +* SCM URL
> > > +
> > > + For all URLs below, we use a colon (:) as separator. If you use a
> >
> > colon
> >
> > > for one of the variables (e.g. a windows path), then use a pipe (|) as
> > > separator. +
> > > +-------
> >
> > +scm:tfs:[[domain\\]username[;password]@]http[s]://server_name[:port]:work
> > sp>
> > > ace:$/TeamProject/Path/To/Project +-------
> > > +
> > > +* Examples
> > > +
> > > +-------
> > > +scm:tfs:https://tfs10.codeplex.com:/maventest/ExampleProject
> > > +-------
> > > +
> >
> > http://git-wip-us.apache.org/repos/asf/maven-scm/blob/22d21c4e/src/site/ap
> > t/>
> > > vss.apt
> > > ----------------------------------------------------------------------
> >
> > diff
> >
> > > --git a/src/site/apt/vss.apt b/src/site/apt/vss.apt
> > > index 934808c..cbabbe1 100644
> > > --- a/src/site/apt/vss.apt
> > > +++ b/src/site/apt/vss.apt
> > > @@ -1,79 +1,79 @@
> > > - ------
> > > - SCM Implementation: Visual Source Safe
> > > - ------
> > > - Wim Deblauwe
> > > - ------
> > > - 2008-09-02
> > > - ------
> > > -
> > > -~~ Licensed to the Apache Software Foundation (ASF) under one
> > > -~~ or more contributor license agreements. See the NOTICE file
> > > -~~ distributed with this work for additional information
> > > -~~ regarding copyright ownership. The ASF licenses this file
> > > -~~ to you under the Apache License, Version 2.0 (the
> > > -~~ "License"); you may not use this file except in compliance
> > > -~~ with the License. You may obtain a copy of the License at
> > > -~~
> > > -~~ http://www.apache.org/licenses/LICENSE-2.0
> > > -~~
> > > -~~ Unless required by applicable law or agreed to in writing,
> > > -~~ software distributed under the License is distributed on an
> > > -~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> > > -~~ KIND, either express or implied. See the License for the
> > > -~~ specific language governing permissions and limitations
> > > -~~ under the License.
> > > -
> > > -~~ NOTE: For help with the syntax of this file, see:
> > > -~~ http://maven.apache.org/doxia/references/apt-format.html
> > > -
> > > -SCM Implementation: Visual Source Safe
> > > -
> > > -* General Info
> > > -
> > > - Link: {{http://msdn.microsoft.com/ssafe/}}
> > > -
> > > - License: Commercial
> > > -
> > > -* SCM URL
> > > -
> > > - Because a colon is used for one of the variables (a windows path),
> > > a
> > > pipe (|) is used as the delimiter. -
> > > - The general format for a VSS SCM URL is
> > > -
> > > --------
> > > -scm:vss|path_to_repository|/module_name
> > > --------
> > > -
> > > - The third variable is the path to the Visual Source Safe repository
> > > (where <<<srcsafe.ini>>> resides). -
> > > - Note that a forward slash is necessary before the module name in
> > > the
> > > final variable. -
> > > -* Examples
> > > -
> > > --------
> > > -scm:vss|C:\Program Files\Microsoft Visual Studio\VSS|/SomeProject
> > > --------
> > > -
> > > -* Provider Configuration
> > > -
> > > - The provider configuration is defined in
> > > <<<${user.home}/.scm/vss-settings.xml>>> -
> > > -** VSS Installation directory
> > > -
> > > - The provider needs to know the installation path of the <<<ss.exe>>>
> >
> > in
> >
> > > order to fulfill VSS commands. The installation path can be set in two
> >
> > ways
> >
> > > - either in the <<<vss-settings.xml>>> file: -
> > > --------
> > > -<vss-settings>
> > > - <Settings>
> > > - <vssDirectory>ss_exe_directory</vssDirectory>
> > > - <Settings>
> > > -</vss-settings>
> > > --------
> > > -
> > > - or on the command line:
> > > -
> > > --------
> > > -mvn -DvssDirectory=ss_exe_directory scm:update
> > > --------
> > > -
> > > - In either case, <<<ss_exe_directory>>> should be set to the full path
> >
> > to
> >
> > > the directory where <<<ss.exe>>> resides (e.g. <<<C:\Program
> > > Files\Microsoft Visual Studio\VSS\bin>>>). + ------
> > > + SCM Implementation: Visual Source Safe
> > > + ------
> > > + Wim Deblauwe
> > > + ------
> > > + 2008-09-02
> > > + ------
> > > +
> > > +~~ Licensed to the Apache Software Foundation (ASF) under one
> > > +~~ or more contributor license agreements. See the NOTICE file
> > > +~~ distributed with this work for additional information
> > > +~~ regarding copyright ownership. The ASF licenses this file
> > > +~~ to you under the Apache License, Version 2.0 (the
> > > +~~ "License"); you may not use this file except in compliance
> > > +~~ with the License. You may obtain a copy of the License at
> > > +~~
> > > +~~ http://www.apache.org/licenses/LICENSE-2.0
> > > +~~
> > > +~~ Unless required by applicable law or agreed to in writing,
> > > +~~ software distributed under the License is distributed on an
> > > +~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> > > +~~ KIND, either express or implied. See the License for the
> > > +~~ specific language governing permissions and limitations
> > > +~~ under the License.
> > > +
> > > +~~ NOTE: For help with the syntax of this file, see:
> > > +~~ http://maven.apache.org/doxia/references/apt-format.html
> > > +
> > > +SCM Implementation: Visual Source Safe
> > > +
> > > +* General Info
> > > +
> > > + Link: {{http://msdn.microsoft.com/ssafe/}}
> > > +
> > > + License: Commercial
> > > +
> > > +* SCM URL
> > > +
> > > + Because a colon is used for one of the variables (a windows path),
> > > a
> > > pipe (|) is used as the delimiter. +
> > > + The general format for a VSS SCM URL is
> > > +
> > > +-------
> > > +scm:vss|path_to_repository|/module_name
> > > +-------
> > > +
> > > + The third variable is the path to the Visual Source Safe repository
> > > (where <<<srcsafe.ini>>> resides). +
> > > + Note that a forward slash is necessary before the module name in
> > > the
> > > final variable. +
> > > +* Examples
> > > +
> > > +-------
> > > +scm:vss|C:\Program Files\Microsoft Visual Studio\VSS|/SomeProject
> > > +-------
> > > +
> > > +* Provider Configuration
> > > +
> > > + The provider configuration is defined in
> > > <<<${user.home}/.scm/vss-settings.xml>>> +
> > > +** VSS Installation directory
> > > +
> > > + The provider needs to know the installation path of the <<<ss.exe>>>
> >
> > in
> >
> > > order to fulfill VSS commands. The installation path can be set in two
> >
> > ways
> >
> > > - either in the <<<vss-settings.xml>>> file: +
> > > +-------
> > > +<vss-settings>
> > > + <Settings>
> > > + <vssDirectory>ss_exe_directory</vssDirectory>
> > > + <Settings>
> > > +</vss-settings>
> > > +-------
> > > +
> > > + or on the command line:
> > > +
> > > +-------
> > > +mvn -DvssDirectory=ss_exe_directory scm:update
> > > +-------
> > > +
> > > + In either case, <<<ss_exe_directory>>> should be set to the full path
> >
> > to
> >
> > > the directory where <<<ss.exe>>> resides (e.g. <<<C:\Program
> > > Files\Microsoft Visual Studio\VSS\bin>>>).
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> > For additional commands, e-mail: dev-help@maven.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: [1/2] Remove unintentional CRs
Posted by Kristian Rosenvold <kr...@zenior.no>.
I just added a .gitattributes file to the repo, which fixes the problem
permanently.
All our git repos now have that file. Come to think of it, maybe we should
do another round of migrations ?
Kristian
23. nov. 2013 07:23 skrev "Hervé BOUTEMY" <he...@free.fr> følgende:
> uh!
>
> with svn, we have svn-eol-style.txt [1] to deal automatically with such
> newline issues
>
> with git, nothing is written yet [2], but I suppose we need such an
> equivalent
> config since .apt files are not well known
>
> Any git guru to the rescue, please?
>
> Regards,
>
> Hervé
>
> [1] http://maven.apache.org/developers/conventions/svn.html
>
> [2] http://maven.apache.org/developers/conventions/git.html
>
> Le vendredi 22 novembre 2013 20:54:33 michaelo@apache.org a écrit :
> > Updated Branches:
> > refs/heads/master 7436d740d -> 22d21c4e2
> >
> >
> >
> http://git-wip-us.apache.org/repos/asf/maven-scm/blob/22d21c4e/src/site/apt/
> > synergy.apt
> > ----------------------------------------------------------------------
> diff
> > --git a/src/site/apt/synergy.apt b/src/site/apt/synergy.apt
> > index 7594875..3e7c37c 100644
> > --- a/src/site/apt/synergy.apt
> > +++ b/src/site/apt/synergy.apt
> > @@ -1,189 +1,189 @@
> > - ------
> > - SCM Implementation: CM/Synergy
> > - ------
> > - Julien Henry (Capgemini) & La Poste
> > - ------
> > - 2006-10-23
> > - ------
> > -
> > -~~ Licensed to the Apache Software Foundation (ASF) under one
> > -~~ or more contributor license agreements. See the NOTICE file
> > -~~ distributed with this work for additional information
> > -~~ regarding copyright ownership. The ASF licenses this file
> > -~~ to you under the Apache License, Version 2.0 (the
> > -~~ "License"); you may not use this file except in compliance
> > -~~ with the License. You may obtain a copy of the License at
> > -~~
> > -~~ http://www.apache.org/licenses/LICENSE-2.0
> > -~~
> > -~~ Unless required by applicable law or agreed to in writing,
> > -~~ software distributed under the License is distributed on an
> > -~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> > -~~ KIND, either express or implied. See the License for the
> > -~~ specific language governing permissions and limitations
> > -~~ under the License.
> > -
> > -~~ NOTE: For help with the syntax of this file, see:
> > -~~ http://maven.apache.org/doxia/references/apt-format.html
> > -
> > -SCM Implementation: CM/Synergy
> > -
> > -* General Info
> > -
> > - Link: {{
> http://www.telelogic.com/Products/synergy/synergycm/index.cfm}}
> > -
> > - License: Commercial
> > -
> > -* SCM URL
> > -
> > - For all URLs below, we use a colon (:) as separator. If you use a
> colon
> > for one of the variables (e.g. a windows path), then use a pipe (|) as
> > separator. -
> > --------
> >
> -scm:synergy<delimiter>project_name<delimiter>database_delimiter<delimiter>p
> > roject_version<delimiter>release<delimiter>purpose<delimiter>instance
> > --------
> > -
> > - <project_name>: This is the name of the project from which the
> checkout
> > is done. -
> > - <project_version>: This is the version of the project from which the
> > checkout is done (usually a prep project). -
> > - <release>: This is the release.
> > -
> > - <purpose>: This is the purpose.
> > -
> > - <instance>: This is the (optional) instance of the project from
> which the
> > checkout is done (usually a prep project). Default is 1. -
> > -* Examples
> > -
> > --------
> > -scm:synergy:MyProject:~:int_1.0:MyProject/2.0:Devel:1
> > -scm|synergy|MyProject|-|int_1.0|MyProject/2.0|Devel:db1#1
> > --------
> > -
> > -* Extra Information
> > -** General
> > -
> > - ccm start command shall use -rc in addition to below options for
> remote
> > linux clients. -
> > -** Checkout
> > -
> > - Checkout purpose is to get sources from a working Work Area to a
> given
> > folder. First, - it checks if a work area already exists with the
> given
> > version. If yes, it only synchronizes and reconfigures - the existing
> > one, and then copies file to the expecting folder. If no Work Area
> exists,
> > then a checkout is done. -
> > - To specify the version of the checkout working project, use <tag>
> > parameter. -
> > - When a 'checkout' happens, the following scm commands are generated
> > -
> > --------
> > -ccm start -m -q -nogui -n <username> -pw <password>
> > -ccm query -u -f %objectname "owner='<username>' and status='working' and
> > type='project' and has_predecessor('<project_spec>')" //Check for
> existing
> > checkout -ccm synchronize -p <working_project_spec>
> > -ccm reconfigure -p <working_project_spec>
> > -ccm checkout -subprojects -rel [-t <tag>] -purpose <purpose> -release
> > <release> -p <project_spec> // If no existing working project exists -ccm
> > stop
> > --------
> > -
> > -** Update
> > -
> > - Reconfigure project with default reconfigure template, and copy file
> > from work area to expected folder. -
> > --------
> > -ccm start -m -q -nogui -n <username> -pw <password>
> > -ccm query -u -f %objectname "owner='<username>' and status='working' and
> > type='project' and has_predecessor('<project_spec>')" //Check for
> existing
> > checkout -ccm reconfigure -r -p <working_project_spec>
> > -ccm stop
> > --------
> > -
> > -** Add
> > -
> > - Create a default task, add new file(s) to the repository and checkin
> > the task. - <message> You can change the synopsis of the task by
> setting
> > this parameter -
> > --------
> > -ccm start -m -q -nogui -n <username> -pw <password>
> > -ccm task -create -def -release <release> -synopsis <message>
> > -ccm create -c <message> <filename>
> > -ccm task -checkin <task_spec> -comment <message>
> > -ccm stop
> > --------
> > -
> > -** Remove
> > -
> > - Remove a file from repository.
> > -
> > --------
> > -ccm start -m -q -nogui -n <username> -pw <password>
> > -ccm delete <filename>
> > -ccm stop
> > --------
> > -
> > -** Changelog
> > -
> > - Get modified files history. In order to parse output of Synergy
> command,
> > we need to know different parameters: -
> > - * maven.scm.synergy.ccmDateFormat (default value is EEE MMM dd HH:mm:ss
> > yyyy) -
> > - * maven.scm.synergy.language (default value is en)
> > -
> > - * maven.scm.synergy.country (default value is US)
> > -
> > - []
> > -
> > --------
> > -ccm start -m -q -nogui -n <username> -pw <password>
> > -ccm query -u is_task_in_folder_of(is_folder_in_rp_of('<project_spec>'))
> and
> > completion_date>time(<startDate>) and completion_date<time(<endDate>)
> -ccm
> > task -show objects <task>
> > -ccm stop
> > --------
> > -
> > -** Checkin
> > -
> > - Checkin the default task.
> > -
> > --------
> > -ccm start -m -q -nogui -n <username> -pw <password>
> > -ccm task -checkin default -c <message>
> > -ccm stop
> > --------
> > -
> > -** Edit
> > -
> > - Create a default task and checkout file(s).
> > -
> > --------
> > -ccm start -m -q -nogui -n <username> -pw <password>
> > -ccm task -create -def -release <release> -synopsis <message>
> > -ccm co <filename>
> > -ccm stop
> > --------
> > -
> > -** Unedit
> > -
> > - Cancel edition. Replace file with previous version.
> > -
> > --------
> > -ccm start -m -q -nogui -n <username> -pw <password>
> > -ccm delete -replace <filename>
> > -ccm stop
> > --------
> > -
> > -** Status
> > -
> > - Get state of files.
> > -
> > --------
> > -ccm start -m -q -nogui -n <username> -pw <password>
> > -ccm dir -m
> > -ccm stop
> > --------
> > -
> > -** Tag
> > -
> > - Create a baseline on the prep project.
> > - You may need to change the purpose in the pom to create the baseline
> > (only prep purpose are allowed). -
> > --------
> > -ccm start -m -q -nogui -n <username> -pw <password>
> > -ccm baseline -create <tag> -p <project_spec> -r <release> -purpose
> > <purpose> -ccm stop
> > --------
> > + ------
> > + SCM Implementation: CM/Synergy
> > + ------
> > + Julien Henry (Capgemini) & La Poste
> > + ------
> > + 2006-10-23
> > + ------
> > +
> > +~~ Licensed to the Apache Software Foundation (ASF) under one
> > +~~ or more contributor license agreements. See the NOTICE file
> > +~~ distributed with this work for additional information
> > +~~ regarding copyright ownership. The ASF licenses this file
> > +~~ to you under the Apache License, Version 2.0 (the
> > +~~ "License"); you may not use this file except in compliance
> > +~~ with the License. You may obtain a copy of the License at
> > +~~
> > +~~ http://www.apache.org/licenses/LICENSE-2.0
> > +~~
> > +~~ Unless required by applicable law or agreed to in writing,
> > +~~ software distributed under the License is distributed on an
> > +~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> > +~~ KIND, either express or implied. See the License for the
> > +~~ specific language governing permissions and limitations
> > +~~ under the License.
> > +
> > +~~ NOTE: For help with the syntax of this file, see:
> > +~~ http://maven.apache.org/doxia/references/apt-format.html
> > +
> > +SCM Implementation: CM/Synergy
> > +
> > +* General Info
> > +
> > + Link: {{
> http://www.telelogic.com/Products/synergy/synergycm/index.cfm}}
> > +
> > + License: Commercial
> > +
> > +* SCM URL
> > +
> > + For all URLs below, we use a colon (:) as separator. If you use a
> colon
> > for one of the variables (e.g. a windows path), then use a pipe (|) as
> > separator. +
> > +-------
> >
> +scm:synergy<delimiter>project_name<delimiter>database_delimiter<delimiter>p
> > roject_version<delimiter>release<delimiter>purpose<delimiter>instance
> > +-------
> > +
> > + <project_name>: This is the name of the project from which the
> checkout
> > is done. +
> > + <project_version>: This is the version of the project from which the
> > checkout is done (usually a prep project). +
> > + <release>: This is the release.
> > +
> > + <purpose>: This is the purpose.
> > +
> > + <instance>: This is the (optional) instance of the project from
> which the
> > checkout is done (usually a prep project). Default is 1. +
> > +* Examples
> > +
> > +-------
> > +scm:synergy:MyProject:~:int_1.0:MyProject/2.0:Devel:1
> > +scm|synergy|MyProject|-|int_1.0|MyProject/2.0|Devel:db1#1
> > +-------
> > +
> > +* Extra Information
> > +** General
> > +
> > + ccm start command shall use -rc in addition to below options for
> remote
> > linux clients. +
> > +** Checkout
> > +
> > + Checkout purpose is to get sources from a working Work Area to a
> given
> > folder. First, + it checks if a work area already exists with the
> given
> > version. If yes, it only synchronizes and reconfigures + the existing
> > one, and then copies file to the expecting folder. If no Work Area
> exists,
> > then a checkout is done. +
> > + To specify the version of the checkout working project, use <tag>
> > parameter. +
> > + When a 'checkout' happens, the following scm commands are generated
> > +
> > +-------
> > +ccm start -m -q -nogui -n <username> -pw <password>
> > +ccm query -u -f %objectname "owner='<username>' and status='working' and
> > type='project' and has_predecessor('<project_spec>')" //Check for
> existing
> > checkout +ccm synchronize -p <working_project_spec>
> > +ccm reconfigure -p <working_project_spec>
> > +ccm checkout -subprojects -rel [-t <tag>] -purpose <purpose> -release
> > <release> -p <project_spec> // If no existing working project exists +ccm
> > stop
> > +-------
> > +
> > +** Update
> > +
> > + Reconfigure project with default reconfigure template, and copy file
> > from work area to expected folder. +
> > +-------
> > +ccm start -m -q -nogui -n <username> -pw <password>
> > +ccm query -u -f %objectname "owner='<username>' and status='working' and
> > type='project' and has_predecessor('<project_spec>')" //Check for
> existing
> > checkout +ccm reconfigure -r -p <working_project_spec>
> > +ccm stop
> > +-------
> > +
> > +** Add
> > +
> > + Create a default task, add new file(s) to the repository and checkin
> > the task. + <message> You can change the synopsis of the task by
> setting
> > this parameter +
> > +-------
> > +ccm start -m -q -nogui -n <username> -pw <password>
> > +ccm task -create -def -release <release> -synopsis <message>
> > +ccm create -c <message> <filename>
> > +ccm task -checkin <task_spec> -comment <message>
> > +ccm stop
> > +-------
> > +
> > +** Remove
> > +
> > + Remove a file from repository.
> > +
> > +-------
> > +ccm start -m -q -nogui -n <username> -pw <password>
> > +ccm delete <filename>
> > +ccm stop
> > +-------
> > +
> > +** Changelog
> > +
> > + Get modified files history. In order to parse output of Synergy
> command,
> > we need to know different parameters: +
> > + * maven.scm.synergy.ccmDateFormat (default value is EEE MMM dd HH:mm:ss
> > yyyy) +
> > + * maven.scm.synergy.language (default value is en)
> > +
> > + * maven.scm.synergy.country (default value is US)
> > +
> > + []
> > +
> > +-------
> > +ccm start -m -q -nogui -n <username> -pw <password>
> > +ccm query -u is_task_in_folder_of(is_folder_in_rp_of('<project_spec>'))
> and
> > completion_date>time(<startDate>) and completion_date<time(<endDate>)
> +ccm
> > task -show objects <task>
> > +ccm stop
> > +-------
> > +
> > +** Checkin
> > +
> > + Checkin the default task.
> > +
> > +-------
> > +ccm start -m -q -nogui -n <username> -pw <password>
> > +ccm task -checkin default -c <message>
> > +ccm stop
> > +-------
> > +
> > +** Edit
> > +
> > + Create a default task and checkout file(s).
> > +
> > +-------
> > +ccm start -m -q -nogui -n <username> -pw <password>
> > +ccm task -create -def -release <release> -synopsis <message>
> > +ccm co <filename>
> > +ccm stop
> > +-------
> > +
> > +** Unedit
> > +
> > + Cancel edition. Replace file with previous version.
> > +
> > +-------
> > +ccm start -m -q -nogui -n <username> -pw <password>
> > +ccm delete -replace <filename>
> > +ccm stop
> > +-------
> > +
> > +** Status
> > +
> > + Get state of files.
> > +
> > +-------
> > +ccm start -m -q -nogui -n <username> -pw <password>
> > +ccm dir -m
> > +ccm stop
> > +-------
> > +
> > +** Tag
> > +
> > + Create a baseline on the prep project.
> > + You may need to change the purpose in the pom to create the baseline
> > (only prep purpose are allowed). +
> > +-------
> > +ccm start -m -q -nogui -n <username> -pw <password>
> > +ccm baseline -create <tag> -p <project_spec> -r <release> -purpose
> > <purpose> +ccm stop
> > +-------
> >
> >
> http://git-wip-us.apache.org/repos/asf/maven-scm/blob/22d21c4e/src/site/apt/
> > tfs.apt
> > ----------------------------------------------------------------------
> diff
> > --git a/src/site/apt/tfs.apt b/src/site/apt/tfs.apt
> > index 4eeb75f..075bdeb 100644
> > --- a/src/site/apt/tfs.apt
> > +++ b/src/site/apt/tfs.apt
> > @@ -1,50 +1,50 @@
> > - ------
> > - SCM Implementation: TFS - Team Foundation Server
> > - ------
> > - Mark Struberg
> > - ------
> > - 2009-08-24
> > - ------
> > -
> > -~~ Licensed to the Apache Software Foundation (ASF) under one
> > -~~ or more contributor license agreements. See the NOTICE file
> > -~~ distributed with this work for additional information
> > -~~ regarding copyright ownership. The ASF licenses this file
> > -~~ to you under the Apache License, Version 2.0 (the
> > -~~ "License"); you may not use this file except in compliance
> > -~~ with the License. You may obtain a copy of the License at
> > -~~
> > -~~ http://www.apache.org/licenses/LICENSE-2.0
> > -~~
> > -~~ Unless required by applicable law or agreed to in writing,
> > -~~ software distributed under the License is distributed on an
> > -~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> > -~~ KIND, either express or implied. See the License for the
> > -~~ specific language governing permissions and limitations
> > -~~ under the License.
> > -
> > -~~ NOTE: For help with the syntax of this file, see:
> > -~~ http://maven.apache.org/doxia/references/apt-format.html
> > -
> > -SCM Implementation: TFS - Team Foundation Server
> > -
> > -* General Info
> > -
> > - Link:
> > {{http://www.microsoft.com/germany/visualstudio/products/team-system/}}
> -
> > - License: Commercial
> > -
> > -* SCM URL
> > -
> > - For all URLs below, we use a colon (:) as separator. If you use a
> colon
> > for one of the variables (e.g. a windows path), then use a pipe (|) as
> > separator. -
> > --------
> >
> -scm:tfs:[[domain\\]username[;password]@]http[s]://server_name[:port]:worksp
> > ace:$/TeamProject/Path/To/Project --------
> > -
> > -* Examples
> > -
> > --------
> > -scm:tfs:https://tfs10.codeplex.com:/maventest/ExampleProject
> > --------
> > -
> > + ------
> > + SCM Implementation: TFS - Team Foundation Server
> > + ------
> > + Mark Struberg
> > + ------
> > + 2009-08-24
> > + ------
> > +
> > +~~ Licensed to the Apache Software Foundation (ASF) under one
> > +~~ or more contributor license agreements. See the NOTICE file
> > +~~ distributed with this work for additional information
> > +~~ regarding copyright ownership. The ASF licenses this file
> > +~~ to you under the Apache License, Version 2.0 (the
> > +~~ "License"); you may not use this file except in compliance
> > +~~ with the License. You may obtain a copy of the License at
> > +~~
> > +~~ http://www.apache.org/licenses/LICENSE-2.0
> > +~~
> > +~~ Unless required by applicable law or agreed to in writing,
> > +~~ software distributed under the License is distributed on an
> > +~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> > +~~ KIND, either express or implied. See the License for the
> > +~~ specific language governing permissions and limitations
> > +~~ under the License.
> > +
> > +~~ NOTE: For help with the syntax of this file, see:
> > +~~ http://maven.apache.org/doxia/references/apt-format.html
> > +
> > +SCM Implementation: TFS - Team Foundation Server
> > +
> > +* General Info
> > +
> > + Link:
> > {{http://www.microsoft.com/germany/visualstudio/products/team-system/}}
> +
> > + License: Commercial
> > +
> > +* SCM URL
> > +
> > + For all URLs below, we use a colon (:) as separator. If you use a
> colon
> > for one of the variables (e.g. a windows path), then use a pipe (|) as
> > separator. +
> > +-------
> >
> +scm:tfs:[[domain\\]username[;password]@]http[s]://server_name[:port]:worksp
> > ace:$/TeamProject/Path/To/Project +-------
> > +
> > +* Examples
> > +
> > +-------
> > +scm:tfs:https://tfs10.codeplex.com:/maventest/ExampleProject
> > +-------
> > +
> >
> >
> http://git-wip-us.apache.org/repos/asf/maven-scm/blob/22d21c4e/src/site/apt/
> > vss.apt
> > ----------------------------------------------------------------------
> diff
> > --git a/src/site/apt/vss.apt b/src/site/apt/vss.apt
> > index 934808c..cbabbe1 100644
> > --- a/src/site/apt/vss.apt
> > +++ b/src/site/apt/vss.apt
> > @@ -1,79 +1,79 @@
> > - ------
> > - SCM Implementation: Visual Source Safe
> > - ------
> > - Wim Deblauwe
> > - ------
> > - 2008-09-02
> > - ------
> > -
> > -~~ Licensed to the Apache Software Foundation (ASF) under one
> > -~~ or more contributor license agreements. See the NOTICE file
> > -~~ distributed with this work for additional information
> > -~~ regarding copyright ownership. The ASF licenses this file
> > -~~ to you under the Apache License, Version 2.0 (the
> > -~~ "License"); you may not use this file except in compliance
> > -~~ with the License. You may obtain a copy of the License at
> > -~~
> > -~~ http://www.apache.org/licenses/LICENSE-2.0
> > -~~
> > -~~ Unless required by applicable law or agreed to in writing,
> > -~~ software distributed under the License is distributed on an
> > -~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> > -~~ KIND, either express or implied. See the License for the
> > -~~ specific language governing permissions and limitations
> > -~~ under the License.
> > -
> > -~~ NOTE: For help with the syntax of this file, see:
> > -~~ http://maven.apache.org/doxia/references/apt-format.html
> > -
> > -SCM Implementation: Visual Source Safe
> > -
> > -* General Info
> > -
> > - Link: {{http://msdn.microsoft.com/ssafe/}}
> > -
> > - License: Commercial
> > -
> > -* SCM URL
> > -
> > - Because a colon is used for one of the variables (a windows path), a
> > pipe (|) is used as the delimiter. -
> > - The general format for a VSS SCM URL is
> > -
> > --------
> > -scm:vss|path_to_repository|/module_name
> > --------
> > -
> > - The third variable is the path to the Visual Source Safe repository
> > (where <<<srcsafe.ini>>> resides). -
> > - Note that a forward slash is necessary before the module name in the
> > final variable. -
> > -* Examples
> > -
> > --------
> > -scm:vss|C:\Program Files\Microsoft Visual Studio\VSS|/SomeProject
> > --------
> > -
> > -* Provider Configuration
> > -
> > - The provider configuration is defined in
> > <<<${user.home}/.scm/vss-settings.xml>>> -
> > -** VSS Installation directory
> > -
> > - The provider needs to know the installation path of the <<<ss.exe>>>
> in
> > order to fulfill VSS commands. The installation path can be set in two
> ways
> > - either in the <<<vss-settings.xml>>> file: -
> > --------
> > -<vss-settings>
> > - <Settings>
> > - <vssDirectory>ss_exe_directory</vssDirectory>
> > - <Settings>
> > -</vss-settings>
> > --------
> > -
> > - or on the command line:
> > -
> > --------
> > -mvn -DvssDirectory=ss_exe_directory scm:update
> > --------
> > -
> > - In either case, <<<ss_exe_directory>>> should be set to the full path
> to
> > the directory where <<<ss.exe>>> resides (e.g. <<<C:\Program
> > Files\Microsoft Visual Studio\VSS\bin>>>). + ------
> > + SCM Implementation: Visual Source Safe
> > + ------
> > + Wim Deblauwe
> > + ------
> > + 2008-09-02
> > + ------
> > +
> > +~~ Licensed to the Apache Software Foundation (ASF) under one
> > +~~ or more contributor license agreements. See the NOTICE file
> > +~~ distributed with this work for additional information
> > +~~ regarding copyright ownership. The ASF licenses this file
> > +~~ to you under the Apache License, Version 2.0 (the
> > +~~ "License"); you may not use this file except in compliance
> > +~~ with the License. You may obtain a copy of the License at
> > +~~
> > +~~ http://www.apache.org/licenses/LICENSE-2.0
> > +~~
> > +~~ Unless required by applicable law or agreed to in writing,
> > +~~ software distributed under the License is distributed on an
> > +~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> > +~~ KIND, either express or implied. See the License for the
> > +~~ specific language governing permissions and limitations
> > +~~ under the License.
> > +
> > +~~ NOTE: For help with the syntax of this file, see:
> > +~~ http://maven.apache.org/doxia/references/apt-format.html
> > +
> > +SCM Implementation: Visual Source Safe
> > +
> > +* General Info
> > +
> > + Link: {{http://msdn.microsoft.com/ssafe/}}
> > +
> > + License: Commercial
> > +
> > +* SCM URL
> > +
> > + Because a colon is used for one of the variables (a windows path), a
> > pipe (|) is used as the delimiter. +
> > + The general format for a VSS SCM URL is
> > +
> > +-------
> > +scm:vss|path_to_repository|/module_name
> > +-------
> > +
> > + The third variable is the path to the Visual Source Safe repository
> > (where <<<srcsafe.ini>>> resides). +
> > + Note that a forward slash is necessary before the module name in the
> > final variable. +
> > +* Examples
> > +
> > +-------
> > +scm:vss|C:\Program Files\Microsoft Visual Studio\VSS|/SomeProject
> > +-------
> > +
> > +* Provider Configuration
> > +
> > + The provider configuration is defined in
> > <<<${user.home}/.scm/vss-settings.xml>>> +
> > +** VSS Installation directory
> > +
> > + The provider needs to know the installation path of the <<<ss.exe>>>
> in
> > order to fulfill VSS commands. The installation path can be set in two
> ways
> > - either in the <<<vss-settings.xml>>> file: +
> > +-------
> > +<vss-settings>
> > + <Settings>
> > + <vssDirectory>ss_exe_directory</vssDirectory>
> > + <Settings>
> > +</vss-settings>
> > +-------
> > +
> > + or on the command line:
> > +
> > +-------
> > +mvn -DvssDirectory=ss_exe_directory scm:update
> > +-------
> > +
> > + In either case, <<<ss_exe_directory>>> should be set to the full path
> to
> > the directory where <<<ss.exe>>> resides (e.g. <<<C:\Program
> > Files\Microsoft Visual Studio\VSS\bin>>>).
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
>