Skip to content
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

Fixing hard-coding of admin/admin in project setup #811

Merged
merged 2 commits into from
Mar 21, 2018
Merged

Fixing hard-coding of admin/admin in project setup #811

merged 2 commits into from
Mar 21, 2018

Conversation

grechaw
Copy link

@grechaw grechaw commented Mar 16, 2018

This PR addresses a couple of things in the build.

It fixes an issue with SLF4J bindings by including a bridge jar between slf4j and log4j, upon which mlcp depends.

Secondly it gets rid of a little nefarious hard-coding in test setup that confused the heck out of me for a while. Now the values in gradle.properties are used for mlUsername and mlPassword rather than code slapping them onto some generated ones. I think this is an improvement but would like confirmation.

I found that some setup code relied on the value in gradle.properties regardless of the hard-coded bit in project creation. This approach gets rid of one code path, but not the last.

@grechaw grechaw requested a review from aebadirad March 16, 2018 00:15
@grechaw
Copy link
Author

grechaw commented Mar 16, 2018

This PR also comments out some code that @srinath had committed in order to set up SSL testing. We may want to talk over that before merge.

@marklogic-builder
Copy link

Jenkins Build failure
https://jenkins.marklogic.com/job/Labs/job/DHF_b9_nightly_linux_cluster/210/testReport
1 tests run, 0 skipped, 1 failed.

@aebadirad aebadirad merged commit 565c4ee into Marklogic-retired:develop Mar 21, 2018
@grechaw grechaw deleted the build-fixing branch April 25, 2018 22:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants