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

Bump Atlas on Tritium 0.8.4 to fix dependency conflicts #2662

Merged
merged 11 commits into from
Nov 14, 2017
Merged

Bump Atlas on Tritium 0.8.4 to fix dependency conflicts #2662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1e2a62c
Bump Atlas on Tritium 0.8.4 to fix dependency conflicts
Nov 9, 2017
3a7c28a
Add changes into missing file
Nov 9, 2017
0391576
Doc changes
Nov 9, 2017
e4dd4e7
Exclude Tracing and HdrHistogram from Tritium dependencies
schlosna Nov 9, 2017
36dd970
update locks
schlosna Nov 10, 2017
f970c30
Add excluded dependencies explicitly
Nov 10, 2017
395ff0b
Merge branch 'develop' into datval/bump-tritium-0.8.4
Nov 10, 2017
d40045a
Fix merge conflict in relase notes
Nov 10, 2017
bbf58a0
Uncomment dependencies
Nov 13, 2017
2f6b7d1
Merge branch 'develop' into datval/bump-tritium-0.8.4
Nov 13, 2017
42a214a
Regenerate locks
Nov 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 18 additions & 22 deletions atlasdb-cassandra/versions.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,7 @@
"com.google.code.findbugs:jsr305": {
"locked": "1.3.9",
"transitive": [
"com.palantir.atlasdb:atlasdb-commons",
"org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir"
"com.palantir.atlasdb:atlasdb-commons"
]
},
"com.google.guava:guava": {
Expand Down Expand Up @@ -245,8 +244,7 @@
"com.palantir.remoting3:tracing": {
"locked": "3.5.1",
"transitive": [
"com.palantir.atlasdb:atlasdb-client",
"com.palantir.tritium:tritium-tracing"
"com.palantir.atlasdb:atlasdb-client"
]
},
"com.palantir.safe-logging:safe-logging": {
Expand All @@ -265,7 +263,7 @@
]
},
"com.palantir.tritium:tritium-api": {
"locked": "0.8.3",
"locked": "0.8.4",
"transitive": [
"com.palantir.tritium:tritium-core",
"com.palantir.tritium:tritium-lib",
Expand All @@ -275,7 +273,7 @@
]
},
"com.palantir.tritium:tritium-core": {
"locked": "0.8.3",
"locked": "0.8.4",
"transitive": [
"com.palantir.tritium:tritium-lib",
"com.palantir.tritium:tritium-metrics",
Expand All @@ -284,31 +282,31 @@
]
},
"com.palantir.tritium:tritium-lib": {
"locked": "0.8.3",
"locked": "0.8.4",
"transitive": [
"com.palantir.atlasdb:atlasdb-client"
]
},
"com.palantir.tritium:tritium-metrics": {
"locked": "0.8.3",
"locked": "0.8.4",
"transitive": [
"com.palantir.tritium:tritium-lib"
]
},
"com.palantir.tritium:tritium-proxy": {
"locked": "0.8.3",
"locked": "0.8.4",
"transitive": [
"com.palantir.tritium:tritium-lib"
]
},
"com.palantir.tritium:tritium-slf4j": {
"locked": "0.8.3",
"locked": "0.8.4",
"transitive": [
"com.palantir.tritium:tritium-lib"
]
},
"com.palantir.tritium:tritium-tracing": {
"locked": "0.8.3",
"locked": "0.8.4",
"transitive": [
"com.palantir.tritium:tritium-lib"
]
Expand Down Expand Up @@ -591,8 +589,7 @@
"com.google.code.findbugs:jsr305": {
"locked": "1.3.9",
"transitive": [
"com.palantir.atlasdb:atlasdb-commons",
"org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir"
"com.palantir.atlasdb:atlasdb-commons"
]
},
"com.google.guava:guava": {
Expand Down Expand Up @@ -726,8 +723,7 @@
"com.palantir.remoting3:tracing": {
"locked": "3.5.1",
"transitive": [
"com.palantir.atlasdb:atlasdb-client",
"com.palantir.tritium:tritium-tracing"
"com.palantir.atlasdb:atlasdb-client"
]
},
"com.palantir.safe-logging:safe-logging": {
Expand All @@ -746,7 +742,7 @@
]
},
"com.palantir.tritium:tritium-api": {
"locked": "0.8.3",
"locked": "0.8.4",
"transitive": [
"com.palantir.tritium:tritium-core",
"com.palantir.tritium:tritium-lib",
Expand All @@ -756,7 +752,7 @@
]
},
"com.palantir.tritium:tritium-core": {
"locked": "0.8.3",
"locked": "0.8.4",
"transitive": [
"com.palantir.tritium:tritium-lib",
"com.palantir.tritium:tritium-metrics",
Expand All @@ -765,31 +761,31 @@
]
},
"com.palantir.tritium:tritium-lib": {
"locked": "0.8.3",
"locked": "0.8.4",
"transitive": [
"com.palantir.atlasdb:atlasdb-client"
]
},
"com.palantir.tritium:tritium-metrics": {
"locked": "0.8.3",
"locked": "0.8.4",
"transitive": [
"com.palantir.tritium:tritium-lib"
]
},
"com.palantir.tritium:tritium-proxy": {
"locked": "0.8.3",
"locked": "0.8.4",
"transitive": [
"com.palantir.tritium:tritium-lib"
]
},
"com.palantir.tritium:tritium-slf4j": {
"locked": "0.8.3",
"locked": "0.8.4",
"transitive": [
"com.palantir.tritium:tritium-lib"
]
},
"com.palantir.tritium:tritium-tracing": {
"locked": "0.8.3",
"locked": "0.8.4",
"transitive": [
"com.palantir.tritium:tritium-lib"
]
Expand Down
24 changes: 11 additions & 13 deletions atlasdb-cli-distribution/versions.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,7 @@
"com.palantir.remoting-api:errors",
"com.palantir.remoting2:error-handling",
"com.palantir.remoting3:refresh-utils",
"io.dropwizard:dropwizard-util",
"org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir"
"io.dropwizard:dropwizard-util"
]
},
"com.google.guava:guava": {
Expand Down Expand Up @@ -636,11 +635,11 @@
"transitive": [
"com.palantir.atlasdb:atlasdb-cassandra",
"com.palantir.atlasdb:atlasdb-client",
"com.palantir.atlasdb:atlasdb-config",
"com.palantir.atlasdb:atlasdb-impl-shared",
"com.palantir.atlasdb:leader-election-impl",
"com.palantir.atlasdb:lock-impl",
"com.palantir.remoting3:jersey-servers",
"com.palantir.tritium:tritium-tracing"
"com.palantir.remoting3:jersey-servers"
]
},
"com.palantir.safe-logging:safe-logging": {
Expand Down Expand Up @@ -673,7 +672,7 @@
]
},
"com.palantir.tritium:tritium-api": {
"locked": "0.8.3",
"locked": "0.8.4",
"transitive": [
"com.palantir.tritium:tritium-core",
"com.palantir.tritium:tritium-lib",
Expand All @@ -683,7 +682,7 @@
]
},
"com.palantir.tritium:tritium-core": {
"locked": "0.8.3",
"locked": "0.8.4",
"transitive": [
"com.palantir.tritium:tritium-lib",
"com.palantir.tritium:tritium-metrics",
Expand All @@ -692,32 +691,32 @@
]
},
"com.palantir.tritium:tritium-lib": {
"locked": "0.8.3",
"locked": "0.8.4",
"transitive": [
"com.palantir.atlasdb:atlasdb-client",
"com.palantir.atlasdb:atlasdb-config"
]
},
"com.palantir.tritium:tritium-metrics": {
"locked": "0.8.3",
"locked": "0.8.4",
"transitive": [
"com.palantir.tritium:tritium-lib"
]
},
"com.palantir.tritium:tritium-proxy": {
"locked": "0.8.3",
"locked": "0.8.4",
"transitive": [
"com.palantir.tritium:tritium-lib"
]
},
"com.palantir.tritium:tritium-slf4j": {
"locked": "0.8.3",
"locked": "0.8.4",
"transitive": [
"com.palantir.tritium:tritium-lib"
]
},
"com.palantir.tritium:tritium-tracing": {
"locked": "0.8.3",
"locked": "0.8.4",
"transitive": [
"com.palantir.tritium:tritium-lib"
]
Expand Down Expand Up @@ -931,8 +930,7 @@
"locked": "2.1.10",
"transitive": [
"com.palantir.atlasdb:atlasdb-client",
"com.palantir.tritium:tritium-metrics",
"org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir"
"com.palantir.atlasdb:atlasdb-config"
]
},
"org.jboss.marshalling:jboss-marshalling": {
Expand Down
Loading