{"action":"created","comment":{"url":"https://api.github.com/repos/palantir/gradle-baseline/pulls/comments/225558673","pull_request_review_id":165183541,"id":225558673,"node_id":"MDI0OlB1bGxSZXF1ZXN0UmV2aWV3Q29tbWVudDIyNTU1ODY3Mw==","diff_hunk":"@@ -174,21 +175,42 @@ class BaselineVersionsIntegrationTest  extends AbstractPluginTest {\n         result.output.contains(\"  bom:\\n\" +\n                 \"                  org.scala-lang:scala-compiler -> 2.12.5\\n\" +\n                 \"                  org.scala-lang:scala-library -> 2.12.5\")\n-\n     }\n \n     def 'Version props conflict should succeed'() {\n         when:\n-        setupVersionsProps(\"com.google.guava:* = 22.0\\ncom.google.guava:guava = 23.0\")\n-        buildFile << standardBuildFile(projectDir) + \"\"\"\n+        setupVersionsProps(\"\"\"\n+            com.fasterxml.jackson.*:* = 2.9.3\n+            com.fasterxml.jackson.core:jackson-annotations = 2.9.5\n+        \"\"\".stripIndent())\n+        buildFile << standardBuildFile(projectDir)\n+        buildFile << \"\"\"\n         dependencies {\n-            compile 'com.google.guava:guava'","path":"gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineVersionsIntegrationTest.groovy","position":40,"original_position":40,"commit_id":"1c00cd77e9cf55f0547ea4b247241ce8e6a0c4fc","original_commit_id":"1c00cd77e9cf55f0547ea4b247241ce8e6a0c4fc","user":{"login":"dansanduleac","id":222827,"node_id":"MDQ6VXNlcjIyMjgyNw==","avatar_url":"https://avatars1.githubusercontent.com/u/222827?v=4","gravatar_id":"","url":"https://api.github.com/users/dansanduleac","html_url":"https://github.com/dansanduleac","followers_url":"https://api.github.com/users/dansanduleac/followers","following_url":"https://api.github.com/users/dansanduleac/following{/other_user}","gists_url":"https://api.github.com/users/dansanduleac/gists{/gist_id}","starred_url":"https://api.github.com/users/dansanduleac/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dansanduleac/subscriptions","organizations_url":"https://api.github.com/users/dansanduleac/orgs","repos_url":"https://api.github.com/users/dansanduleac/repos","events_url":"https://api.github.com/users/dansanduleac/events{/privacy}","received_events_url":"https://api.github.com/users/dansanduleac/received_events","type":"User","site_admin":false},"body":"original test was failing with the newly corrected logic, because `com.google.guava:*` is not being used by any artifact.","created_at":"2018-10-16T14:15:43Z","updated_at":"2018-10-16T14:15:43Z","html_url":"https://github.com/palantir/gradle-baseline/pull/423#discussion_r225558673","pull_request_url":"https://api.github.com/repos/palantir/gradle-baseline/pulls/423","author_association":"CONTRIBUTOR","_links":{"self":{"href":"https://api.github.com/repos/palantir/gradle-baseline/pulls/comments/225558673"},"html":{"href":"https://github.com/palantir/gradle-baseline/pull/423#discussion_r225558673"},"pull_request":{"href":"https://api.github.com/repos/palantir/gradle-baseline/pulls/423"}}},"pull_request":{"url":"https://api.github.com/repos/palantir/gradle-baseline/pulls/423","id":223213300,"node_id":"MDExOlB1bGxSZXF1ZXN0MjIzMjEzMzAw","html_url":"https://github.com/palantir/gradle-baseline/pull/423","diff_url":"https://github.com/palantir/gradle-baseline/pull/423.diff","patch_url":"https://github.com/palantir/gradle-baseline/pull/423.patch","issue_url":"https://api.github.com/repos/palantir/gradle-baseline/issues/423","number":423,"state":"open","locked":false,"title":"Fix versions.props handling of partially overlapping forces","user":{"login":"dansanduleac","id":222827,"node_id":"MDQ6VXNlcjIyMjgyNw==","avatar_url":"https://avatars1.githubusercontent.com/u/222827?v=4","gravatar_id":"","url":"https://api.github.com/users/dansanduleac","html_url":"https://github.com/dansanduleac","followers_url":"https://api.github.com/users/dansanduleac/followers","following_url":"https://api.github.com/users/dansanduleac/following{/other_user}","gists_url":"https://api.github.com/users/dansanduleac/gists{/gist_id}","starred_url":"https://api.github.com/users/dansanduleac/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dansanduleac/subscriptions","organizations_url":"https://api.github.com/users/dansanduleac/orgs","repos_url":"https://api.github.com/users/dansanduleac/repos","events_url":"https://api.github.com/users/dansanduleac/events{/privacy}","received_events_url":"https://api.github.com/users/dansanduleac/received_events","type":"User","site_admin":false},"body":"Fixes #379 properly\r\n\r\n## Before this PR\r\n\r\nIn `checkBomConflict`, multiple forces from `versions.props` that match the same artifact would pick the longest force as the one that was \"used\".\r\nThis is not always the the one that nebula picks, because nebula just picks the last line that matches the artifact.\r\n\r\nA similar mistake occurs in `checkNoUnusedPin` where _every_ force is individually treated as used if it matches even a single artifact, disregarding other forces in the file that might have overridden it.\r\n\r\n## After this PR\r\n\r\n* `checkBomConflict`: Resolve conflicts by associating an artifact with the last `versions.props` line that matches it.\r\n* `checkNoUnusedPin`: when considering a resolved artifact, only treat the *last* matching force as used.\r\n\r\nThis now matches nebula's behaviour.","created_at":"2018-10-16T11:28:53Z","updated_at":"2018-10-16T14:15:43Z","closed_at":null,"merged_at":null,"merge_commit_sha":"42790b522de8b9b9d4601b0f41bb89d2d48ebaf3","assignee":null,"assignees":[],"requested_reviewers":[{"login":"iamdanfox","id":3473798,"node_id":"MDQ6VXNlcjM0NzM3OTg=","avatar_url":"https://avatars1.githubusercontent.com/u/3473798?v=4","gravatar_id":"","url":"https://api.github.com/users/iamdanfox","html_url":"https://github.com/iamdanfox","followers_url":"https://api.github.com/users/iamdanfox/followers","following_url":"https://api.github.com/users/iamdanfox/following{/other_user}","gists_url":"https://api.github.com/users/iamdanfox/gists{/gist_id}","starred_url":"https://api.github.com/users/iamdanfox/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/iamdanfox/subscriptions","organizations_url":"https://api.github.com/users/iamdanfox/orgs","repos_url":"https://api.github.com/users/iamdanfox/repos","events_url":"https://api.github.com/users/iamdanfox/events{/privacy}","received_events_url":"https://api.github.com/users/iamdanfox/received_events","type":"User","site_admin":false}],"requested_teams":[],"labels":[],"milestone":null,"commits_url":"https://api.github.com/repos/palantir/gradle-baseline/pulls/423/commits","review_comments_url":"https://api.github.com/repos/palantir/gradle-baseline/pulls/423/comments","review_comment_url":"https://api.github.com/repos/palantir/gradle-baseline/pulls/comments{/number}","comments_url":"https://api.github.com/repos/palantir/gradle-baseline/issues/423/comments","statuses_url":"https://api.github.com/repos/palantir/gradle-baseline/statuses/1c00cd77e9cf55f0547ea4b247241ce8e6a0c4fc","head":{"label":"palantir:ds/fix-resolve-conflicts-bom","ref":"ds/fix-resolve-conflicts-bom","sha":"1c00cd77e9cf55f0547ea4b247241ce8e6a0c4fc","user":{"login":"palantir","id":303157,"node_id":"MDEyOk9yZ2FuaXphdGlvbjMwMzE1Nw==","avatar_url":"https://avatars0.githubusercontent.com/u/303157?v=4","gravatar_id":"","url":"https://api.github.com/users/palantir","html_url":"https://github.com/palantir","followers_url":"https://api.github.com/users/palantir/followers","following_url":"https://api.github.com/users/palantir/following{/other_user}","gists_url":"https://api.github.com/users/palantir/gists{/gist_id}","starred_url":"https://api.github.com/users/palantir/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/palantir/subscriptions","organizations_url":"https://api.github.com/users/palantir/orgs","repos_url":"https://api.github.com/users/palantir/repos","events_url":"https://api.github.com/users/palantir/events{/privacy}","received_events_url":"https://api.github.com/users/palantir/received_events","type":"Organization","site_admin":false},"repo":{"id":39910458,"node_id":"MDEwOlJlcG9zaXRvcnkzOTkxMDQ1OA==","name":"gradle-baseline","full_name":"palantir/gradle-baseline","private":false,"owner":{"login":"palantir","id":303157,"node_id":"MDEyOk9yZ2FuaXphdGlvbjMwMzE1Nw==","avatar_url":"https://avatars0.githubusercontent.com/u/303157?v=4","gravatar_id":"","url":"https://api.github.com/users/palantir","html_url":"https://github.com/palantir","followers_url":"https://api.github.com/users/palantir/followers","following_url":"https://api.github.com/users/palantir/following{/other_user}","gists_url":"https://api.github.com/users/palantir/gists{/gist_id}","starred_url":"https://api.github.com/users/palantir/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/palantir/subscriptions","organizations_url":"https://api.github.com/users/palantir/orgs","repos_url":"https://api.github.com/users/palantir/repos","events_url":"https://api.github.com/users/palantir/events{/privacy}","received_events_url":"https://api.github.com/users/palantir/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/palantir/gradle-baseline","description":"A set of Gradle plugins that configure default code quality tools for developers.","fork":false,"url":"https://api.github.com/repos/palantir/gradle-baseline","forks_url":"https://api.github.com/repos/palantir/gradle-baseline/forks","keys_url":"https://api.github.com/repos/palantir/gradle-baseline/keys{/key_id}","collaborators_url":"https://api.github.com/repos/palantir/gradle-baseline/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/palantir/gradle-baseline/teams","hooks_url":"https://api.github.com/repos/palantir/gradle-baseline/hooks","issue_events_url":"https://api.github.com/repos/palantir/gradle-baseline/issues/events{/number}","events_url":"https://api.github.com/repos/palantir/gradle-baseline/events","assignees_url":"https://api.github.com/repos/palantir/gradle-baseline/assignees{/user}","branches_url":"https://api.github.com/repos/palantir/gradle-baseline/branches{/branch}","tags_url":"https://api.github.com/repos/palantir/gradle-baseline/tags","blobs_url":"https://api.github.com/repos/palantir/gradle-baseline/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/palantir/gradle-baseline/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/palantir/gradle-baseline/git/refs{/sha}","trees_url":"https://api.github.com/repos/palantir/gradle-baseline/git/trees{/sha}","statuses_url":"https://api.github.com/repos/palantir/gradle-baseline/statuses/{sha}","languages_url":"https://api.github.com/repos/palantir/gradle-baseline/languages","stargazers_url":"https://api.github.com/repos/palantir/gradle-baseline/stargazers","contributors_url":"https://api.github.com/repos/palantir/gradle-baseline/contributors","subscribers_url":"https://api.github.com/repos/palantir/gradle-baseline/subscribers","subscription_url":"https://api.github.com/repos/palantir/gradle-baseline/subscription","commits_url":"https://api.github.com/repos/palantir/gradle-baseline/commits{/sha}","git_commits_url":"https://api.github.com/repos/palantir/gradle-baseline/git/commits{/sha}","comments_url":"https://api.github.com/repos/palantir/gradle-baseline/comments{/number}","issue_comment_url":"https://api.github.com/repos/palantir/gradle-baseline/issues/comments{/number}","contents_url":"https://api.github.com/repos/palantir/gradle-baseline/contents/{+path}","compare_url":"https://api.github.com/repos/palantir/gradle-baseline/compare/{base}...{head}","merges_url":"https://api.github.com/repos/palantir/gradle-baseline/merges","archive_url":"https://api.github.com/repos/palantir/gradle-baseline/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/palantir/gradle-baseline/downloads","issues_url":"https://api.github.com/repos/palantir/gradle-baseline/issues{/number}","pulls_url":"https://api.github.com/repos/palantir/gradle-baseline/pulls{/number}","milestones_url":"https://api.github.com/repos/palantir/gradle-baseline/milestones{/number}","notifications_url":"https://api.github.com/repos/palantir/gradle-baseline/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/palantir/gradle-baseline/labels{/name}","releases_url":"https://api.github.com/repos/palantir/gradle-baseline/releases{/id}","deployments_url":"https://api.github.com/repos/palantir/gradle-baseline/deployments","created_at":"2015-07-29T18:49:11Z","updated_at":"2018-10-16T14:10:02Z","pushed_at":"2018-10-16T14:12:52Z","git_url":"git://github.com/palantir/gradle-baseline.git","ssh_url":"git@github.com:palantir/gradle-baseline.git","clone_url":"https://github.com/palantir/gradle-baseline.git","svn_url":"https://github.com/palantir/gradle-baseline","homepage":null,"size":1100,"stargazers_count":81,"watchers_count":81,"language":"Java","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":64,"mirror_url":null,"archived":false,"open_issues_count":18,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0","node_id":"MDc6TGljZW5zZTI="},"forks":64,"open_issues":18,"watchers":81,"default_branch":"develop"}},"base":{"label":"palantir:develop","ref":"develop","sha":"caefc2d01faff297fc527b598128861a728b909f","user":{"login":"palantir","id":303157,"node_id":"MDEyOk9yZ2FuaXphdGlvbjMwMzE1Nw==","avatar_url":"https://avatars0.githubusercontent.com/u/303157?v=4","gravatar_id":"","url":"https://api.github.com/users/palantir","html_url":"https://github.com/palantir","followers_url":"https://api.github.com/users/palantir/followers","following_url":"https://api.github.com/users/palantir/following{/other_user}","gists_url":"https://api.github.com/users/palantir/gists{/gist_id}","starred_url":"https://api.github.com/users/palantir/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/palantir/subscriptions","organizations_url":"https://api.github.com/users/palantir/orgs","repos_url":"https://api.github.com/users/palantir/repos","events_url":"https://api.github.com/users/palantir/events{/privacy}","received_events_url":"https://api.github.com/users/palantir/received_events","type":"Organization","site_admin":false},"repo":{"id":39910458,"node_id":"MDEwOlJlcG9zaXRvcnkzOTkxMDQ1OA==","name":"gradle-baseline","full_name":"palantir/gradle-baseline","private":false,"owner":{"login":"palantir","id":303157,"node_id":"MDEyOk9yZ2FuaXphdGlvbjMwMzE1Nw==","avatar_url":"https://avatars0.githubusercontent.com/u/303157?v=4","gravatar_id":"","url":"https://api.github.com/users/palantir","html_url":"https://github.com/palantir","followers_url":"https://api.github.com/users/palantir/followers","following_url":"https://api.github.com/users/palantir/following{/other_user}","gists_url":"https://api.github.com/users/palantir/gists{/gist_id}","starred_url":"https://api.github.com/users/palantir/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/palantir/subscriptions","organizations_url":"https://api.github.com/users/palantir/orgs","repos_url":"https://api.github.com/users/palantir/repos","events_url":"https://api.github.com/users/palantir/events{/privacy}","received_events_url":"https://api.github.com/users/palantir/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/palantir/gradle-baseline","description":"A set of Gradle plugins that configure default code quality tools for developers.","fork":false,"url":"https://api.github.com/repos/palantir/gradle-baseline","forks_url":"https://api.github.com/repos/palantir/gradle-baseline/forks","keys_url":"https://api.github.com/repos/palantir/gradle-baseline/keys{/key_id}","collaborators_url":"https://api.github.com/repos/palantir/gradle-baseline/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/palantir/gradle-baseline/teams","hooks_url":"https://api.github.com/repos/palantir/gradle-baseline/hooks","issue_events_url":"https://api.github.com/repos/palantir/gradle-baseline/issues/events{/number}","events_url":"https://api.github.com/repos/palantir/gradle-baseline/events","assignees_url":"https://api.github.com/repos/palantir/gradle-baseline/assignees{/user}","branches_url":"https://api.github.com/repos/palantir/gradle-baseline/branches{/branch}","tags_url":"https://api.github.com/repos/palantir/gradle-baseline/tags","blobs_url":"https://api.github.com/repos/palantir/gradle-baseline/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/palantir/gradle-baseline/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/palantir/gradle-baseline/git/refs{/sha}","trees_url":"https://api.github.com/repos/palantir/gradle-baseline/git/trees{/sha}","statuses_url":"https://api.github.com/repos/palantir/gradle-baseline/statuses/{sha}","languages_url":"https://api.github.com/repos/palantir/gradle-baseline/languages","stargazers_url":"https://api.github.com/repos/palantir/gradle-baseline/stargazers","contributors_url":"https://api.github.com/repos/palantir/gradle-baseline/contributors","subscribers_url":"https://api.github.com/repos/palantir/gradle-baseline/subscribers","subscription_url":"https://api.github.com/repos/palantir/gradle-baseline/subscription","commits_url":"https://api.github.com/repos/palantir/gradle-baseline/commits{/sha}","git_commits_url":"https://api.github.com/repos/palantir/gradle-baseline/git/commits{/sha}","comments_url":"https://api.github.com/repos/palantir/gradle-baseline/comments{/number}","issue_comment_url":"https://api.github.com/repos/palantir/gradle-baseline/issues/comments{/number}","contents_url":"https://api.github.com/repos/palantir/gradle-baseline/contents/{+path}","compare_url":"https://api.github.com/repos/palantir/gradle-baseline/compare/{base}...{head}","merges_url":"https://api.github.com/repos/palantir/gradle-baseline/merges","archive_url":"https://api.github.com/repos/palantir/gradle-baseline/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/palantir/gradle-baseline/downloads","issues_url":"https://api.github.com/repos/palantir/gradle-baseline/issues{/number}","pulls_url":"https://api.github.com/repos/palantir/gradle-baseline/pulls{/number}","milestones_url":"https://api.github.com/repos/palantir/gradle-baseline/milestones{/number}","notifications_url":"https://api.github.com/repos/palantir/gradle-baseline/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/palantir/gradle-baseline/labels{/name}","releases_url":"https://api.github.com/repos/palantir/gradle-baseline/releases{/id}","deployments_url":"https://api.github.com/repos/palantir/gradle-baseline/deployments","created_at":"2015-07-29T18:49:11Z","updated_at":"2018-10-16T14:10:02Z","pushed_at":"2018-10-16T14:12:52Z","git_url":"git://github.com/palantir/gradle-baseline.git","ssh_url":"git@github.com:palantir/gradle-baseline.git","clone_url":"https://github.com/palantir/gradle-baseline.git","svn_url":"https://github.com/palantir/gradle-baseline","homepage":null,"size":1100,"stargazers_count":81,"watchers_count":81,"language":"Java","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":64,"mirror_url":null,"archived":false,"open_issues_count":18,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0","node_id":"MDc6TGljZW5zZTI="},"forks":64,"open_issues":18,"watchers":81,"default_branch":"develop"}},"_links":{"self":{"href":"https://api.github.com/repos/palantir/gradle-baseline/pulls/423"},"html":{"href":"https://github.com/palantir/gradle-baseline/pull/423"},"issue":{"href":"https://api.github.com/repos/palantir/gradle-baseline/issues/423"},"comments":{"href":"https://api.github.com/repos/palantir/gradle-baseline/issues/423/comments"},"review_comments":{"href":"https://api.github.com/repos/palantir/gradle-baseline/pulls/423/comments"},"review_comment":{"href":"https://api.github.com/repos/palantir/gradle-baseline/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/palantir/gradle-baseline/pulls/423/commits"},"statuses":{"href":"https://api.github.com/repos/palantir/gradle-baseline/statuses/1c00cd77e9cf55f0547ea4b247241ce8e6a0c4fc"}},"author_association":"CONTRIBUTOR"}}
{"actor":{"display_login":"dansanduleac"}}