Skip to content

Commit e7a7299

Browse files
committed
Merge branch 'master' into B1
# Conflicts: # build.gradle
2 parents 06acf25 + fad4c93 commit e7a7299

File tree

6 files changed

+757
-208
lines changed

6 files changed

+757
-208
lines changed

.travis.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
language: java
2+
before_install:
3+
- chmod +x gradlew
4+
before_cache:
5+
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
6+
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
7+
cache:
8+
directories:
9+
- $HOME/.gradle/caches/
10+
- $HOME/.gradle/wrapper/
11+
after_success:
12+
- ./gradlew jacocoTestReport coveralls

README.md

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
[![Release](https://jitpack.io/v/scm4j/scm4j-vcs-svn.svg)](https://jitpack.io/#scm4j/scm4j-vcs-svn)
1+
[![Release](https://jitpack.io/v/scm4j/scm4j-vcs-svn.svg)](https://jitpack.io/#scm4j/scm4j-vcs-svn)
2+
[![Build Status](https://travis-ci.org/scm4j/scm4j-vcs-svn.svg?branch=master)](https://travis-ci.org/scm4j/scm4j-vcs-svn)
3+
[![Coverage Status](https://coveralls.io/repos/github/scm4j/scm4j-vcs-svn/badge.svg?branch=master)](https://coveralls.io/github/scm4j/scm4j-vcs-svn?branch=master)
24

35
# Overview
46
scm4j-vcs-svn is lightweight library for execute basic SVN VCS operations (merge, branch create etc). It uses [scm4j-vcs-api](https://github.com/scm4j/scm4j-vcs-api) exposing IVCS implementation for SVN repositories and [SVNKit](https://svnkit.com/) as framework to work with SVN repositories.
@@ -38,22 +40,14 @@ Features:
3840
}
3941
```
4042
Or download release jars from https://github.com/scm4j/scm4j-vcs-svn/releases
41-
- 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)
42-
```java
43+
- Code snippet
44+
```java
4345
public static final String WORKSPACE_DIR = System.getProperty("java.io.tmpdir") + "svn-workspaces";
44-
...
4546
IVCSWorkspace workspace = new VCSWorkspace(WORKSPACE_DIR);
46-
...
47-
```
48-
- 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
49-
```java
5047
String repoUrl = "https://github.com/MyUser/MyRepo";
5148
IVCSRepositoryWorkspace repoWorkspace = workspace.getVCSRepositoryWorkspace(repoUrl);
52-
```
53-
- Create `SVNVCS` instance providing Repository Workspace, username and password for Repository
54-
```java
55-
IVCS vcs = new SVNVCS(repoWorkspace, username, pass);
56-
```
49+
IVCS vcs = new SVNVCS(repoWorkspace, "username", "pass");
50+
```
5751
- Use methods of `IVCS` interface. See [scm4j-vcs-api](https://github.com/scm4j/scm4j-vcs-api) for details
5852
- Use `vcs.setProxy()` and `vcs.setCredentials()` if necessary
5953

build.gradle

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,44 @@
1+
plugins {
2+
id 'jacoco'
3+
id 'com.github.kt3k.coveralls' version '2.8.1'
4+
}
5+
16
apply plugin: 'java'
27
apply plugin: 'maven'
38
apply plugin: 'eclipse'
9+
apply plugin: 'idea'
410

511
sourceCompatibility = JavaVersion.VERSION_1_7
612
targetCompatibility = JavaVersion.VERSION_1_7
713

814
group = 'org.scm4j'
9-
version = '2.0'
15+
version = '3.0'
16+
17+
jacocoTestReport {
18+
reports {
19+
xml.enabled = true // coveralls plugin depends on xml format report
20+
html.enabled = true
21+
}
22+
}
1023

1124
repositories {
25+
maven { url "https://jitpack.io" }
1226
mavenCentral()
13-
maven {
14-
url "https://jitpack.io"
15-
}
1627
}
1728

1829
defaultTasks 'build';
1930

2031
dependencies {
2132
compile 'com.github.scm4j:scm4j-vcs-api:2.0'
2233
compile 'org.tmatesoft.svnkit:svnkit:1.8.14'
34+
compile 'org.apache.commons:commons-lang3:3.5'
2335

2436
testCompile 'junit:junit:4.12'
2537
testCompile 'com.github.scm4j:scm4j-vcs-test:2.0'
2638
testCompile 'org.mockito:mockito-core:2.0.62-beta'
2739
}
2840

41+
2942
task sourcesJar(type: Jar, dependsOn: classes) {
3043
classifier = 'sources'
3144
from sourceSets.main.allSource

0 commit comments

Comments
 (0)