moved to https://github.com/ProjectKaiser/scm4j-vcs-git

Author: host6

README.md

@@ -1,7 +1,7 @@
-[![Release](https://jitpack.io/v/ProjectKaiser/pk-vcs-git.svg)](https://jitpack.io/#ProjectKaiser/pk-vcs-git)	
+[![Release](https://jitpack.io/v/ProjectKaiser/scm4j-vcs-git.svg)](https://jitpack.io/#ProjectKaiser/scm4j-vcs-git)	
 
 # Overview
-Pk-vcs-git is lightweight library for execute basic Git VCS operations (merge, branch create etc). It uses [pk-vcs-api](https://github.com/ProjectKaiser/pk-vcs-api) exposing IVCS implementation for Git repositories and [JGit](https://eclipse.org/jgit/) as framework to work with Git repositories.
+scm4j-vcs-git is lightweight library for execute basic Git VCS operations (merge, branch create etc). It uses [scm4j-vcs-api](https://github.com/ProjectKaiser/scm4j-vcs-api) exposing IVCS implementation for Git repositories and [JGit](https://eclipse.org/jgit/) as framework to work with Git repositories.
 Features:
 - Branch create and remove
 - Branch merge with result return (success or list of conflicted files)
@@ -13,19 +13,19 @@ Features:
 
 # Terms
 - Workspace Home
-  - Home folder of all folders used by vcs-related operations. See [pk-vcs-api](https://github.com/ProjectKaiser/pk-vcs-api) for details
+  - Home local folder of all folders used by vcs-related operations. See [scm4j-vcs-api](https://github.com/ProjectKaiser/scm4j-vcs-api) for details
 - Repository Workspace
-  - Folder for LWC folders related to Repository of one type. See [pk-vcs-api](https://github.com/ProjectKaiser/pk-vcs-api) for details
+  - Local folder for LWC folders related to Repository of one type. See [scm4j-vcs-api](https://github.com/ProjectKaiser/scm4j-vcs-api) for details
 - Locked Working Copy, LWC
-  - Folder where vcs-related operations are executed. Provides thread- and process-safe repository of working folders. See [pk-vcs-api](https://github.com/ProjectKaiser/pk-vcs-api) for details
+  - Local folder where vcs-related operations are executed. Provides thread- and process-safe repository of working folders. See [scm4j-vcs-api](https://github.com/ProjectKaiser/scm4j-vcs-api) for details
 - Test Repository
   - Git repository which is used to execute functional tests
   - File-based repository is used
-  - Generates new before and deletes after each test
+  - Generates new one before and deletes after each test
   - Named randomly (uuid is used) 
 
-# Using pk-vcs-git
-- Add github-hosted pk-vcs-git and pk-vcs-api projects as maven dependencies using [jitpack.io](https://jitpack.io/). As an example, add following to gradle.build file:
+# Using scm4j-vcs-git
+- Add github-hosted scm4j-vcs-git and scm4j-vcs-api projects as maven dependencies using [jitpack.io](https://jitpack.io/). As an example, add following to gradle.build file:
 	```gradle
 	allprojects {
 		repositories {
@@ -35,11 +35,10 @@ Features:
 
 	dependencies {
 	 	// versioning: master-SNAPSHOT (lastest build, unstable), + (lastest release, stable) or certain version (e.g. 1.1)
-		compile 'com.github.ProjectKaiser:pk-vcs-git:+'
-		compile 'com.github.ProjectKaiser:pk-vcs-api:+'
+		compile 'com.github.ProjectKaiser:scm4j-vcs-git:+'
 	}
 	```
-	Or download release jars from https://github.com/ProjectKaiser/pk-vcs-git/releases, https://github.com/ProjectKaiser/pk-vcs-api/releases  
+	Or download release jars from https://github.com/ProjectKaiser/scm4j-vcs-git/releases
 - Create Workspace Home instance providing path to any folder as Workspace Home folder path. This folder will contain repositories folders (if different vcs or repositories are used)
 ```java
 	public static final String WORKSPACE_DIR = System.getProperty("java.io.tmpdir") + "git-workspaces";
@@ -49,27 +48,26 @@ Features:
 ```
 - Obtain Repository Workspace from Workspace Home providing a certain Repository's url. The obtained Repository Workspace will represent a folder within Workspace Home dir which will contain all Working Copies relating to the provided VCS Repository  
 ```java
-	String repoUrl = "https://github.com/ProjectKaiser/pk-vcs-api";
+	String repoUrl = "https://github.com/ProjectKaiser/scm4j-vcs-api";
 	IVCSRepositoryWorkspace repoWorkspace = workspace.getVCSRepositoryWorkspace(repoUrl);
 ```
 - Create `GitVCS` instance providing Repository Workspace
 ```java
 	IVCS vcs = new GitVCS(repoWorkspace);
 ```
-- Use methods of `IVCS` interface. See [pk-vcs-api](https://github.com/ProjectKaiser/pk-vcs-api) for details
+- Use methods of `IVCS` interface. See [scm4j-vcs-api](https://github.com/ProjectKaiser/scm4j-vcs-api) for details
 - Use `vcs.setProxy()` and `vcs.setCredentials()` if necessary
 
 # Implementation details
 - [JGit](https://eclipse.org/jgit/) is used as framework to work with Git repositories
-- [Github](https://github.com/) is used as hosting of a Test Repository
-- LWC is obtained for each vcs operation.
+- Each vcs operation is executed within a LWC
 - `getLocalGit(IVCSLockedWorkingCopy wc)` method is used to create a Git implementation to execute vcs operations within `wc` Working Copy
-  - If provided LWC is empty then current Test Repository is cloned into this LWC, otherwise just Git object is created
+  - If provided LWC is empty then current Test Repository is cloned into this LWC, otherwise existing repository is just switched to required branch
 - If `IVCS.setProxy()` is called then provided proxy is used for each url which contains `repoUrl`
 
 # Functional testing
 - New local file-based Test Repository is created before each test and deletes automatically after each test
-- To execute tests just run GitVCSTest class as JUnit test. Tests from VCSAbstractTest class will be executed. See [pk-vcs-test](https://github.com/ProjectKaiser/pk-vcs-test) for details
+- To execute tests just run GitVCSTest class as JUnit test. Tests from VCSAbstractTest class will be executed. See [scm4j-vcs-test](https://github.com/ProjectKaiser/scm4j-vcs-test) for details
 - Run `gradle test` to execute tests
 
 # Limitations

build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'maven'
 sourceCompatibility = JavaVersion.VERSION_1_7
 targetCompatibility = JavaVersion.VERSION_1_7
 
-group = 'com.projectkaiser.scm'
+group = 'org.scm4j'
 version = '2.0-SNAPSHOT'
 
 repositories {
@@ -15,12 +15,12 @@ repositories {
 }
 
 dependencies {                                                            
-	compile 'com.github.ProjectKaiser:pk-vcs-api:master-SNAPSHOT'
+	compile 'com.github.ProjectKaiser:scm4j-vcs-api:master-SNAPSHOT'
 	compile 'org.eclipse.jgit:org.eclipse.jgit:4.3.0.201604071810-r'
 
 	testCompile 'org.mockito:mockito-core:2.0.62-beta'
 	testCompile 'junit:junit:4.12'
-	testCompile 'com.github.ProjectKaiser:pk-vcs-test:master-SNAPSHOT'
+	testCompile 'com.github.ProjectKaiser:scm4j-vcs-test:master-SNAPSHOT'
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {

settings.gradle

@@ -1 +1 @@
-rootProject.name = 'pk-vcs-git'
+rootProject.name = 'scm4j-vcs-git'

src/main/java/com/projectkaiser/scm/vcs/GitVCS.java renamed to src/main/java/org/scm4j/vcs/GitVCS.java

@@ -1,4 +1,4 @@
-package com.projectkaiser.scm.vcs;
+package org.scm4j.vcs;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -46,16 +46,16 @@
 import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
 import org.eclipse.jgit.treewalk.CanonicalTreeParser;
 
-import com.projectkaiser.scm.vcs.api.IVCS;
-import com.projectkaiser.scm.vcs.api.VCSChangeType;
-import com.projectkaiser.scm.vcs.api.VCSCommit;
-import com.projectkaiser.scm.vcs.api.VCSDiffEntry;
-import com.projectkaiser.scm.vcs.api.VCSMergeResult;
-import com.projectkaiser.scm.vcs.api.exceptions.EVCSBranchExists;
-import com.projectkaiser.scm.vcs.api.exceptions.EVCSException;
-import com.projectkaiser.scm.vcs.api.exceptions.EVCSFileNotFound;
-import com.projectkaiser.scm.vcs.api.workingcopy.IVCSLockedWorkingCopy;
-import com.projectkaiser.scm.vcs.api.workingcopy.IVCSRepositoryWorkspace;
+import org.scm4j.vcs.api.IVCS;
+import org.scm4j.vcs.api.VCSChangeType;
+import org.scm4j.vcs.api.VCSCommit;
+import org.scm4j.vcs.api.VCSDiffEntry;
+import org.scm4j.vcs.api.VCSMergeResult;
+import org.scm4j.vcs.api.exceptions.EVCSBranchExists;
+import org.scm4j.vcs.api.exceptions.EVCSException;
+import org.scm4j.vcs.api.exceptions.EVCSFileNotFound;
+import org.scm4j.vcs.api.workingcopy.IVCSLockedWorkingCopy;
+import org.scm4j.vcs.api.workingcopy.IVCSRepositoryWorkspace;
 
 public class GitVCS implements IVCS {
 

src/test/java/com/projectkaiser/scm/vcs/GitVCSTest.java renamed to src/test/java/org/scm4j/vcs/GitVCSTest.java

@@ -1,4 +1,4 @@
-package com.projectkaiser.scm.vcs;
+package org.scm4j.vcs;
 
 
 import java.io.File;
@@ -9,10 +9,11 @@
 import org.eclipse.jgit.lib.Repository;
 import org.junit.After;
 import org.mockito.Mockito;
+import org.scm4j.vcs.GitVCS;
+import org.scm4j.vcs.api.abstracttest.VCSAbstractTest;
 
-import com.projectkaiser.scm.vcs.api.IVCS;
-import com.projectkaiser.scm.vcs.api.abstracttest.VCSAbstractTest;
-import com.projectkaiser.scm.vcs.api.workingcopy.IVCSRepositoryWorkspace;
+import org.scm4j.vcs.api.IVCS;
+import org.scm4j.vcs.api.workingcopy.IVCSRepositoryWorkspace;
 
 public class GitVCSTest extends VCSAbstractTest {