search

marklogic / marklogic-jena

Adapter for using MarkLogic with the Jena RDF Framework
Other
5 stars 11 forks source link

Sonar recommendations, formatting, java client 3.0.4 #31

Closed grechaw closed 8 years ago

grechaw commented 8 years ago

Do not merge

This is a proposed new branch. It updates versions, and incorporates some formatting updates and recommendations from sonar. I have another PR coming that updates to jena 3 with an alternate commit. This one retains Jena 2.

Once @xquery and @kkanthet approve, I'll create the new branch with this commit (and subsequent recommendations from illustrious colleagues.

grechaw commented 8 years ago

@xquery gave me verbal goahead on these two PRs. Kiran does this match your expectation of how we'll manage branch and dependencies for now?

kkanthet commented 8 years ago

Hi Charles,

Just to confirm, we will rename develop to 1.0-develop , master to 1.0-master —> will contain Jena2 Create 2.0-develop and 2.0-master —> Jena3 Right?

Than You, Kiran

From: Charles Greer Reply-To: marklogic/marklogic-jena Date: Wednesday, January 20, 2016 at 9:52 AM To: marklogic/marklogic-jena Cc: Kiran Kantheti Subject: Re: [marklogic-jena] Sonar recommendations, formatting, java client 3.0.4 (#31)

@xqueryhttps://github.com/xquery gave me verbal goahead on these two PRs. Kiran does this match your expectation of how we'll manage branch and dependencies for now?

— Reply to this email directly or view it on GitHubhttps://github.com/marklogic/marklogic-jena/pull/31#issuecomment-173303099.

grechaw commented 8 years ago

Hi @kkanthet , I'm more interested in

(current commit in ) develop -> 1.0-develop
master to 1.0-master (not until next release - we don't have rationale to change master yet IMO) —> will contain Jena2 yes

Create develop and master —> Jena3 (took out 2.0-, this is just the most recent develop)

kkanthet commented 8 years ago

Thank You Charles, I think that looks good.

From: Charles Greer Reply-To: marklogic/marklogic-jena Date: Wednesday, January 20, 2016 at 10:10 AM To: marklogic/marklogic-jena Cc: Kiran Kantheti Subject: Re: [marklogic-jena] Sonar recommendations, formatting, java client 3.0.4 (#31)

Hi @kkanthethttps://github.com/kkanthet , I'm more interested in

(current commit in ) develop -> 1.0-develop

master to 1.0-master (not until next release - we don't have rationale to change master yet IMO) —> will contain Jena2 yes

Create develop and master —> Jena3 (took out 2.0-, this is just the most recent develop)

— Reply to this email directly or view it on GitHubhttps://github.com/marklogic/marklogic-jena/pull/31#issuecomment-173310593.

grechaw commented 8 years ago

Merged by hand to new branch.