Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
spring-cloud-netflix
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
openSource
spring-cloud-netflix
Commits
5c84080d
Commit
5c84080d
authored
Jan 26, 2015
by
Spencer Gibb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade netflix archaius to 0.6.5
fixes gh-179
parent
32a90336
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
pom.xml
pom.xml
+1
-1
HystrixStreamTask.java
...ringframework/netflix/hystrix/amqp/HystrixStreamTask.java
+2
-2
No files found.
pom.xml
View file @
5c84080d
...
...
@@ -21,7 +21,7 @@
</scm>
<properties>
<main.basedir>
${basedir}
</main.basedir>
<archaius.version>
0.6.
3
</archaius.version>
<archaius.version>
0.6.
5
</archaius.version>
<eureka.version>
1.1.147
</eureka.version>
<feign.version>
7.1.0
</feign.version>
<hystrix.version>
1.4.0-RC6
</hystrix.version>
...
...
spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/netflix/hystrix/amqp/HystrixStreamTask.java
View file @
5c84080d
...
...
@@ -22,10 +22,10 @@ import java.util.ArrayList;
import
java.util.Collection
;
import
java.util.concurrent.LinkedBlockingQueue
;
import
com.fasterxml.jackson.core.JsonFactory
;
import
com.fasterxml.jackson.core.JsonGenerator
;
import
lombok.extern.apachecommons.CommonsLog
;
import
org.codehaus.jackson.JsonFactory
;
import
org.codehaus.jackson.JsonGenerator
;
import
org.springframework.beans.BeansException
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.cloud.client.ServiceInstance
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment