Skip to content
This repository has been archived by the owner on Nov 14, 2024. It is now read-only.

Commit

Permalink
Remove usages of dependencyRecommendations (#5340)
Browse files Browse the repository at this point in the history
* Remove usages of dependencyRecommendations

* Add trial publish
  • Loading branch information
CRogers authored Mar 25, 2021
1 parent 0c30583 commit 5e5152c
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 13 deletions.
18 changes: 18 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,19 @@ jobs:
root: .
paths: [ . ]

trial-publish:
docker:
- image: circleci/openjdk:8u212-jdk-stretch-node
resource_class: xlarge
environment:
GRADLE_OPTS: -Dorg.gradle.console=plain -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false
_JAVA_OPTIONS: "-Xmx4g -XX:+HeapDumpOnOutOfMemoryError -verbose:gc -XX:+PrintGC -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:-TraceClassUnloading -Xloggc:build-%t-%p.gc.log"
CIRCLE_TEST_REPORTS: /tmp/test-reports
CIRCLE_ARTIFACTS: /tmp/artifacts
steps:
- attach_workspace: { at: . }
- run: ./gradlew --profile --stacktrace --continue publishToMavenLocal

deploy:
docker:
- image: circleci/openjdk:8u212-jdk-stretch-node
Expand Down Expand Up @@ -128,6 +141,11 @@ workflows:
filters:
tags:
only: /.*/
- trial-publish:
requires: [build]
filters:
branches:
ignore: [develop]
- deploy:
requires: [build, test]
filters:
Expand Down
7 changes: 0 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,6 @@ allprojects {
}

configurations.all {

resolutionStrategy.eachDependency { details ->
if (details.requested.group == 'com.palantir.docker.compose' && details.requested.name == 'docker-compose-rule') {
details.useTarget group: 'com.palantir.docker.compose', name: 'docker-compose-rule-junit4', version: dependencyRecommendations.getRecommendedVersion('com.palantir.docker.compose', 'docker-compose-rule-junit4')
}
}

resolutionStrategy.eachDependency { details ->
if (details.requested.group == 'io.dropwizard.metrics' && details.requested.name != 'metrics-jmx') {
details.useVersion '3.2.6'
Expand Down
6 changes: 3 additions & 3 deletions gradle/publish-jars.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ private void replaceShadedDependencies(MavenPublication mavenPublication) {
addNodesForShadowDependenciesNotInCompileConfiguration(
newDependencyRoot,
shadowDependencies,
dependencyRecommendations)
project)

asNode().getByName('dependencies')[0].replaceNode(newDependencyRoot)
}
Expand Down Expand Up @@ -75,14 +75,14 @@ private static String getOnlyValue(List<Node> nodeList) {
private static void addNodesForShadowDependenciesNotInCompileConfiguration(
Node dependencyRoot,
Set<Tuple> remainingDeps,
recommender) {
project) {
remainingDeps.forEach { dependencyTuple ->
Node newDependency = dependencyRoot.appendNode('dependency')
newDependency.appendNode('groupId', dependencyTuple[0])
newDependency.appendNode('artifactId', dependencyTuple[1])
newDependency.appendNode('scope', 'runtime')

def version = recommender.getRecommendedVersion(dependency.getGroup(), dependency.getName())
def version = getVersion("${dependency.getGroup()}:${dependency.getName()}")
newDependency.appendNode('version', version)
}
}
3 changes: 0 additions & 3 deletions gradle/qos.gradle

This file was deleted.

0 comments on commit 5e5152c

Please sign in to comment.