Skip to content

Commit d97b03f

Browse files
author
jbaruch
committed
Merge branch 'jbaruch-master'
2 parents a1af14b + f4d59eb commit d97b03f

File tree

17 files changed

+57
-37
lines changed

17 files changed

+57
-37
lines changed

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,6 @@ Artifactory REST Client Java API bindings
77

88
[![Download From Bintray](https://www.bintray.com/docs/images/bintray_badge_color.png)](https://bintray.com/jfrog/artifactory-tools/artifactory-client-java?source=watch)
99

10-
![Codeship status](https://www.codeship.io/projects/c516fe40-d115-0130-7f00-3663a95d3c82/status)
10+
[![Codeship status](https://www.codeship.io/projects/c516fe40-d115-0130-7f00-3663a95d3c82/status)](https://www.codeship.io/projects/5051)
11+
12+
[ ![Download](https://api.bintray.com/packages/jfrog/artifactory-tools/artifactory-client-java/images/download.png) ](https://bintray.com/jfrog/artifactory-tools/artifactory-client-java/_latestVersion)

api/src/main/java/org/jfrog/artifactory/client/ArtifactorySystem.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
/**
66
* System Level Configuration.
7-
* <p/>
7+
*
88
* (Class can not be named System because of conflict with java.lang.System.)
99
*
1010
* @author quidryan

api/src/main/java/org/jfrog/artifactory/client/model/Repository.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,6 @@ public interface Repository {
2424
boolean isEnableNuGetSupport();
2525

2626
boolean isEnableGemsSupport();
27+
28+
boolean isEnableNpmSupport();
2729
}

build.gradle

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,13 @@ subprojects {
116116
appendNode('url', 'https://github.com/JFrogDev/artifactory-client-java')
117117
}
118118
}
119+
asNode().dependencies.'*'.findAll() {
120+
it.scope.text() == 'runtime' && project.configurations.compile.allDependencies.find { dep ->
121+
dep.name == it.artifactId.text()
122+
}
123+
}.each() {
124+
it.scope*.value = 'compile'
125+
}
119126
}
120127
}
121128
}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
currentVersion=0.12-SNAPSHOT
1+
currentVersion=0.14-SNAPSHOT

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-all.zip
6+
#distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-rc-1-all.zip
7+
distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-all.zip

services/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dependencies {
1919
}
2020

2121
def addGroovy(name) {
22-
[group: 'org.codehaus.groovy', name: name, version: '2.1.0', classifier: 'indy']
22+
[group: 'org.codehaus.groovy', name: name, version: '2.3.2']
2323
}
2424

2525
def addJackson(name) {

services/src/main/groovy/org/jfrog/artifactory/client/model/builder/impl/LocalRepositoryBuilderImpl.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class LocalRepositoryBuilderImpl extends NonVirtualRepositoryBuilderBase<LocalRe
4141
}
4242

4343
LocalRepository build() {
44-
return new LocalRepositoryImpl(description, excludesPattern, includesPattern, key, notes, blackedOut, handleReleases, handleSnapshots, maxUniqueSnapshots, propertySets, snapshotVersionBehavior, suppressPomConsistencyChecks, checksumPolicyType, repoLayoutRef, enableNuGetSupport, archiveBrowsingEnabled, calculateYumMetadata, yumRootDepth, enableGemsSupport)
44+
return new LocalRepositoryImpl(description, excludesPattern, includesPattern, key, notes, blackedOut, handleReleases, handleSnapshots, maxUniqueSnapshots, propertySets, snapshotVersionBehavior, suppressPomConsistencyChecks, checksumPolicyType, repoLayoutRef, enableNuGetSupport, archiveBrowsingEnabled, calculateYumMetadata, yumRootDepth, enableGemsSupport, enableNpmSupport)
4545
}
4646

4747
}

services/src/main/groovy/org/jfrog/artifactory/client/model/builder/impl/RemoteRepositoryBuilderImpl.groovy

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ class RemoteRepositoryBuilderImpl extends NonVirtualRepositoryBuilderBase<Remote
165165
new RemoteRepositoryImpl(description, excludesPattern, includesPattern, key, notes, blackedOut, handleReleases, handleSnapshots, maxUniqueSnapshots, propertySets,
166166
snapshotVersionBehavior, suppressPomConsistencyChecks, failedRetrievalCachePeriodSecs, fetchJarsEagerly, fetchSourcesEagerly, hardFail, localAddress, missedRetrievalCachePeriodSecs,
167167
offline, password, proxy, remoteRepoChecksumPolicyType, retrievalCachePeriodSecs, shareConfiguration, socketTimeoutMillis, storeArtifactsLocally, synchronizeProperties,
168-
unusedArtifactsCleanupEnabled, unusedArtifactsCleanupPeriodHours, url, username, repoLayoutRef, enableNuGetSupport, assumedOfflinePeriodSecs, archiveBrowsingEnabled, listRemoteFolderItems, rejectInvalidJars, p2Support, enableGemsSupport)
168+
unusedArtifactsCleanupEnabled, unusedArtifactsCleanupPeriodHours, url, username, repoLayoutRef, enableNuGetSupport, assumedOfflinePeriodSecs, archiveBrowsingEnabled,
169+
listRemoteFolderItems, rejectInvalidJars, p2Support, enableGemsSupport, enableNpmSupport)
169170
}
170171
}

services/src/main/groovy/org/jfrog/artifactory/client/model/builder/impl/RepositoryBuilderBase.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ abstract class RepositoryBuilderBase<B extends RepositoryBuilder, R extends Repo
1717
protected String repoLayoutRef
1818
protected boolean enableNuGetSupport = false
1919
protected boolean enableGemsSupport = false
20+
protected boolean enableNpmSupport = false
2021

2122
@Override
2223
B description(String description) {

0 commit comments

Comments
 (0)