Skip to content

fixup on master to be consistent with 5.5.0 #1311

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ehennum opened this issue Jul 26, 2021 · 2 comments
Closed

fixup on master to be consistent with 5.5.0 #1311

ehennum opened this issue Jul 26, 2021 · 2 comments

Comments

@ehennum
Copy link
Contributor

ehennum commented Jul 26, 2021

A few signatures in this interface and implementation are out of synch between In the master branch and the 5.5.0 branch:

 marklogic-client-api/src/main/java/com/marklogic/client/expression/CtsExpr.java
 marklogic-client-api/src/main/java/com/marklogic/client/impl/CtsExprImpl.java

Possibly the merge of develop to master rebased the master version of these files on top of the develop version.

We had to make a hotfix to the same files under issue #1263 for release 5.3.1; maybe that was the cause.

We'll need to watch to make sure that this commit doesn't cause a similar reversion in a future release.

@ehennum ehennum self-assigned this Jul 26, 2021
ehennum pushed a commit that referenced this issue Jul 26, 2021
@ehennum ehennum assigned georgeajit and unassigned ehennum Jul 26, 2021
@ehennum
Copy link
Contributor Author

ehennum commented Jul 26, 2021

Master should compile now. Copying @llinggit for awareness.

@georgeajit georgeajit added closed and removed fix labels Aug 12, 2021
@georgeajit
Copy link

Issues is fixed. Tested on the master branch with IDE.

@georgeajit georgeajit added this to the java-client-api-NEXT milestone Aug 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

2 participants