Re: [rdf4j-dev] 3.1.0 release this Thursday

[Jeen Broekstra <jeen.broekstra@xxxxxxxxx>]

Actually, I just did a diff on develop and master, and it's empty - so it's not just the pom versions that were merged - everything for the 3.1 release is already on master. This is even after you did your revert Bart. So it definitely wasn't you that caused this.

I'll do some fixes later today, along the following lines:

 - master branch will become the branch for 3.1.0-SNAPSHOT, that is the pre 3.1 release branch.

 - I'll update the develop branch to 3.2.0-SNAPSHOT

I'll also undo your revert, Bart.

Please, until we have this resolved, be extremely hesitant about merging in any Pull Requests. Don't merge anything until I've given approval please.

Sorry for the mess,

Jeen

On Sat, Feb 1, 2020 at 9:06 AM Jeen Broekstra <jeen.broekstra@xxxxxxxxx> wrote:

It looks as if there's a pom version problem on the master branch, that predates your accidental merge. From what I can tell I did something wrong when resolving conflicts for the indentation fixes in the pom files.

I'll try and get the master branch fixed today. Please don't do any updates for this - if we both start tinkering at the same  time we'll just make a worse mess :)

Jeen

On Sat, Feb 1, 2020 at 7:29 AM Jeen Broekstra <jeen.broekstra@xxxxxxxxx> wrote:

Don't worry about it. In fact don't revert either. We're close enough to release that it doesn't matter really.

Cheers,

Jeen

On Fri, 31 Jan 2020, 20:23 Bart Hanssens (BOSA), <bart.hanssens@xxxxxxxxxxxx> wrote:

Hi,

 

I’ve just noticed I’ve already accidentally merged develop into master two days ago when fixing an issue ☹

(note to self: sit on hands and think before clicking github webeditor buttons)

 

I’ll revert the merge commit today and bring master back to the status of a few days ago

No harm was done to the develop branch

 

Apologies for the inconvenience / log polluting…

 

Best regards

 

Bart

 

From: rdf4j-dev-bounces@xxxxxxxxxxx <rdf4j-dev-bounces@xxxxxxxxxxx> On Behalf Of Jeen Broekstra
Sent: donderdag 30 januari 2020 22:46
To: rdf4j developer discussions <rdf4j-dev@xxxxxxxxxxx>
Subject: [rdf4j-dev] 3.1.0 release this Thursday

 

Hi all,

 

Just a heads up that we will be releasing 3.1.0 this Thursday (February 6). Get your PRs in before that time, and please don't break the build. I'll probably merge develop into master on Tuesday, at which point we also feature-freeze for the release. We'll do finishing touches (last-minute urgent fixes) directly on the master branch.

 

Cheers,

 

Jeen

_______________________________________________
rdf4j-dev mailing list
rdf4j-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://www.eclipse.org/mailman/listinfo/rdf4j-dev