Build changes to nebula.netflixoss

[rspieldenner]

Current big changes:

• java7 bytecode produced by default
• hystrix-contrib/hystrix-clj bumped to use compile 'org.clojure:clojure:1.6.0' because of this error Could not locate clojure/edn__init.class or clojure/edn.clj on classpath
• hystrix-contrib/hystrix-clj using nebula-clojure which is a wrapper around clojuresque to make it behave better with our other plugins

[cloudbees-pull-request-builder]

Hystrix-pull-requests #211 FAILURE
Looks like there's a problem with this pull request

[cloudbees-pull-request-builder]

Hystrix-pull-requests #212 SUCCESS
This pull request looks good

[cloudbees-pull-request-builder]

Hystrix-pull-requests #213 SUCCESS
This pull request looks good

[rspieldenner]

Moved clojure to org.clojure:clojure:1.5.1
Removed unneeded hystrix-contrib intermediate gradle project.

[mattrjacobs]

Thanks @rspieldenner! Once I get 1.4.0-RC6 out the door, I'll look to get this in RC7.

[mattrjacobs]

@rspieldenner I'd like to merge this now, but am getting a merge conflict on the gradle.properties in the root directory. That's not merging cleanly because I bumped the current version to 1.4.0-RC7-SNAPSHOT yesterday after the RC6 release.

It's not clear to me how to manage the versioning with your changes. Can you advise?

[rspieldenner]

delete the version in gradle.properties

tag the repo at that release v1.4.0-rc.7

while your at it move the nebula.netflixoss version to 2.2.5 (I'll add to
the pull request tomorrow if you haven't done it)

On Thu, Jan 22, 2015 at 1:33 PM, Matt Jacobs notifications@github.com
wrote:

@rspieldenner https://github.com/rspieldenner I'd like to merge this
now, but am getting a merge conflict on the gradle.properties in the root
directory. That's not merging cleanly because I bumped the current version
to 1.4.0-RC7-SNAPSHOT yesterday after the RC6 release.

It's not clear to me how to manage the versioning with your changes. Can
you advise?

—
Reply to this email directly or view it on GitHub
#469 (comment).