Skip to content

Commit c9160c0

Browse files
committed
Merge branch 'master' of https://github.com/scm4j/scm4j-commons
2 parents fbfb0f9 + d7cd061 commit c9160c0

File tree

4 files changed

+25
-11
lines changed

4 files changed

+25
-11
lines changed

build.gradle

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
plugins {
2+
id 'java'
3+
id 'maven'
4+
id 'eclipse'
5+
id 'idea'
26
id 'jacoco'
37
id 'com.github.kt3k.coveralls' version '2.8.1'
48
}
59

6-
apply plugin: 'java'
7-
apply plugin: 'maven'
8-
apply plugin: 'eclipse'
9-
apply plugin: 'idea'
10-
1110
sourceCompatibility = JavaVersion.VERSION_1_7
1211
targetCompatibility = JavaVersion.VERSION_1_7
1312

@@ -16,14 +15,30 @@ version = new File('version').text
1615

1716
dependencies {
1817
testCompile 'junit:junit:4.12'
19-
testCompile 'org.mockito:mockito-all:1.9.5'
18+
testCompile 'org.mockito:mockito-core:2.0.62-beta'
2019
testCompile 'nl.jqno.equalsverifier:equalsverifier:2.3'
2120

2221
compile 'com.google.guava:guava:20.0'
2322
compile 'org.apache.commons:commons-lang3:3.5'
2423
compile 'org.fusesource.jansi:jansi:1.16'
2524
}
2625

26+
configurations.all {
27+
resolutionStrategy {
28+
cacheDynamicVersionsFor 0, 'seconds'
29+
cacheChangingModulesFor 0, 'seconds'
30+
}
31+
}
32+
33+
jar {
34+
manifest.attributes (
35+
'Specification-Title': project.name,
36+
'Specification-Version': version,
37+
'Implementation-Title': project.name,
38+
'Implementation-Version': "$version (${new Date().format('yyyy-MM-dd')})",
39+
)
40+
}
41+
2742
task sourcesJar(type: Jar, dependsOn: classes) {
2843
classifier = 'sources'
2944
from sourceSets.main.allSource

gradle/wrapper/gradle-wrapper.jar

500 Bytes
Binary file not shown.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Thu Jun 08 17:18:01 GMT+03:00 2017
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
43
zipStoreBase=GRADLE_USER_HOME
54
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-bin.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip

gradlew

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
3333
# Use the maximum available, or set MAX_FD != -1 to use that value.
3434
MAX_FD="maximum"
3535

36-
warn ( ) {
36+
warn () {
3737
echo "$*"
3838
}
3939

40-
die ( ) {
40+
die () {
4141
echo
4242
echo "$*"
4343
echo
@@ -155,7 +155,7 @@ if $cygwin ; then
155155
fi
156156

157157
# Escape application args
158-
save ( ) {
158+
save () {
159159
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160160
echo " "
161161
}

0 commit comments

Comments
 (0)