You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2013/09/07 12:59:25 UTC

[1/2] git commit: [SCM-718] Please include Java-based SVN client. Add page to describe how this can be done.

Updated Branches:
  refs/heads/master 369e3dd91 -> 79c89a1aa


[SCM-718] Please include Java-based SVN client. Add page to describe how this can be done.


Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/ba3b94da
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/ba3b94da
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/ba3b94da

Branch: refs/heads/master
Commit: ba3b94dab001d749005b70edbec2b7148a9287f9
Parents: 223b883
Author: rfscholte <rf...@apache.org>
Authored: Sat Sep 7 12:57:16 2013 +0200
Committer: rfscholte <rf...@apache.org>
Committed: Sat Sep 7 12:57:16 2013 +0200

----------------------------------------------------------------------
 src/site/apt/guide/define_provider.apt | 76 +++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-scm/blob/ba3b94da/src/site/apt/guide/define_provider.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/guide/define_provider.apt b/src/site/apt/guide/define_provider.apt
new file mode 100644
index 0000000..5806ece
--- /dev/null
+++ b/src/site/apt/guide/define_provider.apt
@@ -0,0 +1,76 @@
+ ------
+ How to define a non Apache Maven hosted implementation
+ ------
+ Maven Team
+ ------
+ 2013-09-07
+ ------
+
+~~ 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
+
+How to define a non Apache Maven hosted implementation?
+
+  Apache Maven supports a lot of implementations, but not all. 
+  However, with the following steps you can make Maven use this implementation for all your projects.
+
+* Prepare Maven
+
+  Make the SCM implementation available for Maven by downloading the required jars and add them to Maven.
+  If there's a <<<jar-with-dependencies>>> or a <<<shaded jar>>>, then that's the only jar required. 
+  Otherwise check the project for all transitive dependencies.  
+  
+  * Maven 3.x : Add jars to <<<%M2_HOME%/lib/ext/>>>
+  
+  * Maven 2.x : Add jars to <<<%M2_HOME%/lib/>>>
+  
+  []
+
+  <<Note:>>Be aware that these jars now end up next to the root classloader of Maven. 
+  If you experience unexpected behavior, verify there's no class collision.
+
+* Configure settings.xml
+
+  Since it is very well possible to have multiple versions of Maven next to each other, 
+  the preferred <<<settings.xml>>> to adjust is the instance with the additional jars.
+  
+  <<<%M2_HOME%/conf/settings.xml>>>
+  
+------------------------------------------
+<settings>
+  ...
+  <profiles>
+    <profile>
+      <id>scm</id>
+      <properties>
+        <maven.scm.provider.svn.implementation>providerhint</maven.scm.provider.svn.implementation>
+      </properties>
+    </profile>    
+  </profiles>
+  
+  <activeProfiles>
+    <!-- activate it always or use -Pscm -->
+    <activeProfile>scm</activeProfile>
+  </activeProfiles>
+  
+</settings>
+------------------------------------------
+
+  From now on when this Maven instance is used, it will always use the specified SCM provider implementation.


[2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/maven-scm

Posted by rf...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/maven-scm


Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/79c89a1a
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/79c89a1a
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/79c89a1a

Branch: refs/heads/master
Commit: 79c89a1aa1150c5c840863f314a88070c2e3952e
Parents: ba3b94d 369e3dd
Author: rfscholte <rf...@apache.org>
Authored: Sat Sep 7 12:58:18 2013 +0200
Committer: rfscholte <rf...@apache.org>
Committed: Sat Sep 7 12:58:18 2013 +0200

----------------------------------------------------------------------
 .gitignore                                      |   1 +
 .../changelog/GitChangeLogCommandTest.java      |  26 +-
 .../maven-scm-provider-jgit/.gitignore          |   3 +
 .../maven-scm-provider-jgit/pom.xml             |  96 +++++
 .../scm/provider/git/jgit/JGitScmProvider.java  | 192 +++++++++
 .../provider/git/jgit/command/JGitUtils.java    | 420 +++++++++++++++++++
 .../git/jgit/command/add/JGitAddCommand.java    |  80 ++++
 .../jgit/command/blame/JGitBlameCommand.java    |  76 ++++
 .../jgit/command/branch/JGitBranchCommand.java  | 140 +++++++
 .../command/changelog/JGitChangeLogCommand.java | 288 +++++++++++++
 .../command/checkin/JGitCheckInCommand.java     | 130 ++++++
 .../command/checkout/JGitCheckOutCommand.java   | 180 ++++++++
 .../git/jgit/command/diff/JGitDiffCommand.java  | 128 ++++++
 .../git/jgit/command/list/JGitListCommand.java  |  77 ++++
 .../remoteinfo/JGitRemoteInfoCommand.java       |  86 ++++
 .../jgit/command/status/JGitStatusCommand.java  |  84 ++++
 .../git/jgit/command/tag/JGitTagCommand.java    | 120 ++++++
 .../src/site/markdown/index.md                  | 122 ++++++
 .../branch/JGitBranchCommandTckTest.java        |  40 ++
 .../changelog/JGitChangeLogCommandTckTest.java  |  39 ++
 .../checkin/JGitCheckInCommandTckTest.java      |  39 ++
 .../checkout/JGitCheckOutCommandTckTest.java    |  40 ++
 .../command/diff/JGitDiffCommandTckTest.java    |  35 ++
 .../JGitRemoteInfoCommandTckTest.java           |  61 +++
 .../status/JGitStatusCommandTckTest.java        |  39 ++
 .../jgit/command/tag/JGitTagCommandTckTest.java |  41 ++
 .../src/test/resources/repository/HEAD          |   1 +
 .../src/test/resources/repository/config        |   4 +
 .../src/test/resources/repository/description   |   1 +
 .../resources/repository/hooks/applypatch-msg   |  15 +
 .../repository/hooks/applypatch-msg.sample      |  15 +
 .../test/resources/repository/hooks/commit-msg  |  21 +
 .../repository/hooks/commit-msg.sample          |  24 ++
 .../test/resources/repository/hooks/post-commit |   8 +
 .../repository/hooks/post-commit.sample         |   8 +
 .../resources/repository/hooks/post-receive     |  16 +
 .../repository/hooks/post-receive.sample        |  15 +
 .../test/resources/repository/hooks/post-update |   8 +
 .../repository/hooks/post-update.sample         |   8 +
 .../resources/repository/hooks/pre-applypatch   |  14 +
 .../repository/hooks/pre-applypatch.sample      |  14 +
 .../test/resources/repository/hooks/pre-commit  |  70 ++++
 .../repository/hooks/pre-commit.sample          |  18 +
 .../test/resources/repository/hooks/pre-rebase  | 150 +++++++
 .../repository/hooks/pre-rebase.sample          | 169 ++++++++
 .../repository/hooks/prepare-commit-msg.sample  |  36 ++
 .../src/test/resources/repository/hooks/update  |  78 ++++
 .../resources/repository/hooks/update.sample    | 107 +++++
 .../src/test/resources/repository/info/exclude  |   6 +
 .../src/test/resources/repository/logs/HEAD     |   3 +
 .../resources/repository/logs/refs/heads/master |   3 +
 .../repository/logs/refs/remotes/origin/master  |   1 +
 .../17/e953589369a48dcb0a0cbad084a76ef852cd11   | Bin 0 -> 37 bytes
 .../1d/308c3b92eb0df9c0dc76436d50edfd0ca41d18   | Bin 0 -> 199 bytes
 .../3b/459fa9451a94fc1acd10e2e29ab73d93eb816d   | Bin 0 -> 75 bytes
 .../3b/d305c57c635aead10cf59f7c1dc51af03edaf7   | Bin 0 -> 116 bytes
 .../3c/f7bb86c15554148bf5b0b12bfd639e54a77e58   | Bin 0 -> 46 bytes
 .../61/4a3fd04313593d67f4154855a06941046326b3   | Bin 0 -> 23 bytes
 .../61/a0d22b023d6e31894d736cca8c1a47b6edd822   | Bin 0 -> 45 bytes
 .../92/09a983605d6e43e5cf841a1ea18a1914bb7407   | Bin 0 -> 54 bytes
 .../92/f139dfec4d1dfb79c3cd2f94e83bf13129668b   |   1 +
 .../94/d3d586e355f318d67e3da6bb16a91be7aad1a7   | Bin 0 -> 28 bytes
 .../9e/131cfc732b0d9f42b9b712a528d0632d9bcca7   | Bin 0 -> 43 bytes
 .../b5/3306f849b69ef0459ddf5cccff06b5fbb08c23   | Bin 0 -> 36 bytes
 .../ba/a229a9193371fad604444f64c4f26f8ff702f3   |   1 +
 .../ba/cd4ee105073117b30e5dcdba5150373b6b53c6   | Bin 0 -> 60 bytes
 .../c3/8b0351660113545db270ba6918cc22a9eb17ce   | Bin 0 -> 46 bytes
 .../c5/1dcd33e7b71897603c203b5e0afc1d75f70051   | Bin 0 -> 147 bytes
 .../dc/4204852765c12f398ef4a5fbcabf23cf17a183   | Bin 0 -> 116 bytes
 .../f7/1429f9ff9214a546b438c611ae942c9cf5a49e   | Bin 0 -> 46 bytes
 .../fd/39fa3de0f63bc5c78eca219e74e0a8531bd3e6   | Bin 0 -> 24 bytes
 .../fe/a16119a5b4ec0562d4f65b4237314250773bf8   | Bin 0 -> 27 bytes
 .../test/resources/repository/refs/heads/master |   1 +
 .../repository/refs/remotes/origin/HEAD         |   1 +
 .../repository/refs/remotes/origin/master       |   1 +
 .../maven-scm-providers-git/pom.xml             |   2 +-
 .../changelog/ChangeLogCommandTckTest.java      |  22 +-
 pom.xml                                         |   9 +-
 78 files changed, 3405 insertions(+), 29 deletions(-)
----------------------------------------------------------------------