[neohub] NeoHub Binding

[andrewfg]

The pull request https://github.com/openhab/openhab2-addons/pull/5688 was incorrectly closed; so this is a new one to continue cleanly from that old one.

[TravisBuddy]

Travis tests were successful

Hey @andrewfg,
we found no major flaws with your code. Still you might want to look at this logfile, as we usually suggest some optional improvements.

[kaikreuzer]

I am afraid, this PR still isn't clean - please check https://github.com/openhab/openhab2-addons/pull/5952/files and see the changes that should not be there right at the top.

[kaikreuzer]

Looks like this commit is the culprit.

[andrewfg]

Sorry for this. I had added my name to the CODEOWNERS file and the binding to the bom/openhab-addons/pom.xml file. However other people had edited those files since my original fork was made which caused conflicts. I have now removed these two files entirely from the neohub branch of my repo. So perhaps you can kindly add the relevant entries into the master version of those files when you do the merge?

CODEOWNERS
/bundles/org.openhab.binding.neohub/ @andrewfg

bom/openhab-addons/pom.xml

    <dependency>
      <groupId>org.openhab.addons.bundles</groupId>
      <artifactId>org.openhab.binding.neohub</artifactId>
      <version>${project.version}</version>
    </dependency>

[kaikreuzer]

Git isn't your friend, indeed ;-)
Now you have removed those two files, but they clearly must be kept and your additions should be added to them.
I think the problem was that you didn't base your branch on the latest version of the master branch and thus there were already changes on master that were not included in your branch. Do you maybe want to have another try...?

[kaikreuzer]

other people had edited those files since my original fork was made which caused conflicts.

The magic process to do in such a case is a "rebase on master" - that will allow you to merge the changes locally before committing them.

[andrewfg]

the magic process to do in such a case is a "rebase on master"

Argh!! Can someone please help me with the EXACT git commands? My fork andrewfg:master branch was forked from the openhab2-addons:master branch about 2 months ago. And in my fork andrewfg I deleted and recreated today a branch called andrewfg:neohub. My pull request is to merge andrewfg:neohub with openhab2-addons:master. And specifically to merge my binding specific additions to CODEOWNERS and bom/openhab-addons/pom.xml into openhab2-addons/master without any adds or deletes that other people may have made to those two files in the meantime.

[andrewfg]

Hi @kaikreuzer, I think it is now clean, so I would appreciate it if you can move it onwards before your master diverges from my fork yet again. :)

[kaikreuzer]

Ok, let's merge then 🎉

[andrewfg]

Many thanks Kai :)

[bjoernbrings]

There seems to be some kind of problem around this binding with the sandbox build:

Failed to create archive: Could not find artifact org.openhab.addons.bundles:org.openhab.binding.neohub:jar:2.5.0 in sandbox-all

Is it because of a missing entry in bundles/pom.xml?

[Hilbrand]

@bjoernbrings I think that could be the problem. If created a pr to add it #5974

[bjoernbrings]

Thanks for the quick reaction.
Could/should have done this myself, but was not sure whether it was really the root cause. Will monitor it with the next build.