Skip to content

Commit 0154f86

Browse files
jguerragavinbunney
authored andcommitted
Bump to discovery 2 (#1919)
1 parent 985ee52 commit 0154f86

File tree

10 files changed

+888
-1601
lines changed

10 files changed

+888
-1601
lines changed

build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ subprojects {
135135
testLogging {
136136
showStandardStreams = true
137137
}
138+
maxParallelForks = Runtime.runtime.availableProcessors();
138139
}
139140
}
140141

dependencies.lock

-116
Original file line numberDiff line numberDiff line change
@@ -136,122 +136,6 @@
136136
]
137137
}
138138
},
139-
"palantirJavaFormat": {
140-
"com.fasterxml.jackson.core:jackson-annotations": {
141-
"locked": "2.17.2",
142-
"transitive": [
143-
"com.fasterxml.jackson.core:jackson-databind",
144-
"com.fasterxml.jackson:jackson-bom",
145-
"com.palantir.javaformat:palantir-java-format-spi"
146-
]
147-
},
148-
"com.fasterxml.jackson.core:jackson-core": {
149-
"locked": "2.17.2",
150-
"transitive": [
151-
"com.fasterxml.jackson.core:jackson-databind",
152-
"com.fasterxml.jackson.datatype:jackson-datatype-guava",
153-
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8",
154-
"com.fasterxml.jackson.module:jackson-module-parameter-names",
155-
"com.fasterxml.jackson:jackson-bom",
156-
"com.palantir.javaformat:palantir-java-format"
157-
]
158-
},
159-
"com.fasterxml.jackson.core:jackson-databind": {
160-
"locked": "2.17.2",
161-
"transitive": [
162-
"com.fasterxml.jackson.datatype:jackson-datatype-guava",
163-
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8",
164-
"com.fasterxml.jackson.module:jackson-module-parameter-names",
165-
"com.fasterxml.jackson:jackson-bom",
166-
"com.palantir.javaformat:palantir-java-format"
167-
]
168-
},
169-
"com.fasterxml.jackson.datatype:jackson-datatype-guava": {
170-
"locked": "2.17.2",
171-
"transitive": [
172-
"com.fasterxml.jackson:jackson-bom",
173-
"com.palantir.javaformat:palantir-java-format-spi"
174-
]
175-
},
176-
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8": {
177-
"locked": "2.17.2",
178-
"transitive": [
179-
"com.fasterxml.jackson:jackson-bom",
180-
"com.palantir.javaformat:palantir-java-format"
181-
]
182-
},
183-
"com.fasterxml.jackson.module:jackson-module-parameter-names": {
184-
"locked": "2.17.2",
185-
"transitive": [
186-
"com.fasterxml.jackson:jackson-bom",
187-
"com.palantir.javaformat:palantir-java-format"
188-
]
189-
},
190-
"com.fasterxml.jackson:jackson-bom": {
191-
"locked": "2.17.2",
192-
"transitive": [
193-
"com.fasterxml.jackson.core:jackson-annotations",
194-
"com.fasterxml.jackson.core:jackson-core",
195-
"com.fasterxml.jackson.core:jackson-databind",
196-
"com.fasterxml.jackson.datatype:jackson-datatype-guava",
197-
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8",
198-
"com.fasterxml.jackson.module:jackson-module-parameter-names"
199-
]
200-
},
201-
"com.google.code.findbugs:jsr305": {
202-
"locked": "3.0.2",
203-
"transitive": [
204-
"com.google.guava:guava"
205-
]
206-
},
207-
"com.google.errorprone:error_prone_annotations": {
208-
"locked": "2.23.0",
209-
"transitive": [
210-
"com.google.guava:guava"
211-
]
212-
},
213-
"com.google.guava:failureaccess": {
214-
"locked": "1.0.2",
215-
"transitive": [
216-
"com.google.guava:guava"
217-
]
218-
},
219-
"com.google.guava:guava": {
220-
"locked": "33.0.0-jre",
221-
"transitive": [
222-
"com.fasterxml.jackson.datatype:jackson-datatype-guava",
223-
"com.palantir.javaformat:palantir-java-format",
224-
"com.palantir.javaformat:palantir-java-format-spi"
225-
]
226-
},
227-
"com.google.guava:listenablefuture": {
228-
"locked": "9999.0-empty-to-avoid-conflict-with-guava",
229-
"transitive": [
230-
"com.google.guava:guava"
231-
]
232-
},
233-
"com.palantir.javaformat:palantir-java-format": {
234-
"locked": "2.49.0"
235-
},
236-
"com.palantir.javaformat:palantir-java-format-spi": {
237-
"locked": "2.49.0",
238-
"transitive": [
239-
"com.palantir.javaformat:palantir-java-format"
240-
]
241-
},
242-
"org.checkerframework:checker-qual": {
243-
"locked": "3.41.0",
244-
"transitive": [
245-
"com.google.guava:guava"
246-
]
247-
},
248-
"org.functionaljava:functionaljava": {
249-
"locked": "4.8",
250-
"transitive": [
251-
"com.palantir.javaformat:palantir-java-format"
252-
]
253-
}
254-
},
255139
"rewrite": {
256140
"ch.qos.logback:logback-classic": {
257141
"locked": "1.2.13",

zuul-core/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ dependencies {
2626
api "com.netflix.ribbon:ribbon-core:${versions_ribbon}"
2727
api "com.netflix.ribbon:ribbon-archaius:${versions_ribbon}"
2828

29-
api "com.netflix.eureka:eureka-client:1.10.18"
29+
api "com.netflix.eureka:eureka-client:2.0.4"
3030
api "io.reactivex:rxjava:1.3.8"
3131
api platform("io.netty:netty-bom:${versions_netty}")
3232

0 commit comments

Comments
 (0)