Skip to content

Commit

Permalink
chore(dependencies): fix some accidental transitive dependencies (#561)
Browse files Browse the repository at this point in the history
working on some cleanup in kork and testing it against various projects highlighed some sub-optimal
things in the dependency graph. Fixed those up by explicitly declaring some implementation dependencies
that were otherwise coming in as transitives of transitives of a kork module. Also cleaned up a few
spots where commons-lang 1 was used instead of commons-lang 3.

Also upgrades to latest gradle (5.5.1) to align with the version the spinnaker-gradle-plugin was
built against
  • Loading branch information
cfieber committed Jul 24, 2019
1 parent 52af9a2 commit 58cf917
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 5 deletions.
6 changes: 6 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@ allprojects { project ->
apply plugin: "spinnaker.project"
}

if ([korkVersion, fiatVersion].find { it.endsWith("-SNAPSHOT") }) {
repositories {
mavenLocal()
}
}

if (name != "front50-bom") {
apply plugin: 'java-library'
apply plugin: 'groovy'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import java.util.List;
import java.util.Map;
import java.util.regex.PatternSyntaxException;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
1 change: 1 addition & 0 deletions front50-migrations/front50-migrations.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ dependencies {
implementation project(":front50-core")

implementation "com.netflix.spinnaker.kork:kork-core"
implementation "org.apache.commons:commons-lang3"
implementation "org.springframework.boot:spring-boot-autoconfigure"

testImplementation project(":front50-test")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import java.util.Map;
import java.util.function.Predicate;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
import java.util.stream.Collectors;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.codec.binary.Hex;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
clouddriverVersion=5.3.0
fiatVersion=1.1.0
enablePublishing=false
spinnakerGradleVersion=6.5.0
spinnakerGradleVersion=7.0.1
korkVersion=5.8.7
includeProviders=azure,gcs,oracle,redis,s3,swift,sql
org.gradle.parallel=true
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 58cf917

Please sign in to comment.