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.

Sign up for GitHub

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

Jump to bottom

Update dependencies #4251

Merged
merged 4 commits into from
Aug 8, 2018
Merged

Update dependencies #4251

merged 4 commits into from
Aug 8, 2018

Conversation

Siedlerchr
Copy link
Member

@Siedlerchr Siedlerchr commented Aug 7, 2018 •
edited
Loading

Application insights should now be compatible with java 9
@florian-beetz

  • Change in CHANGELOG.md described
  • Tests created for changes
  • Manually tested changed features in running JabRef
  • Screenshots added in PR description (for bigger UI changes)
  • Ensured that the git commit message is a good one
  • Check documentation status (Issue created for outdated help page at help.jabref.org?)

@Siedlerchr
Update dependencies
1ff19e3 
Application insights should now be compatible with java 9
@Siedlerchr
fix mocktito dep
cc8db73 
fix guave CharMatcher.WHITESPACE is no longer a public static field but a method
@Siedlerchr
experiment with new jaxb
eb47c89
@Siedlerchr
revert to original xjc until moduöe confusion of jaxb is understandable
247a411
@tobiasdiez tobiasdiez merged commit 5216aca into master Aug 8, 2018
@tobiasdiez tobiasdiez deleted the updateDepsA branch August 8, 2018 06:40
Siedlerchr added a commit that referenced this pull request Aug 8, 2018
@Siedlerchr
Merge remote-tracking branch 'upstream/master' into fixattachfilerela…
f4d151d 
…tive

* upstream/master:
  Update dependencies (#4251)
  Fix author list parser (#4169) (#4248)
  Solved #3823 File annotation (#4246)
  Fix importer vulnerability (#4240)
Siedlerchr added a commit that referenced this pull request Aug 13, 2018
@Siedlerchr
Merge remote-tracking branch 'upstream/master' into fixdragandrop
737b1c3 
* upstream/master: (33 commits)
  Fix display of checkboxes
  Fix
  Remove Spin comments
  Fix#3861_build_addneeded/deleteobsoleteproperties2
  Fix#3861_build_addneeded/deleteobsoleteproperties
  Fix#3861_build
  Fix attach file does not relativize file path (#4252)
  Fix for issue koppor 254 (Auto cleanup url) (#4255)
  Fix#ReplaceString_ChangeConflict
  Fix#3861ReplaceString_solveConflict
  Fix#3861RS_conflicttest
  Fix#3861RS_conflicttest
  Remove changelog entries
  Fix#3861ReplaceString_checkStyle
  Fix#3861ReplaceString_Improvements
  Fix#3861ReplaceString_ContributeLog
  fix log4j slf4j dependency
  Update dependencies (#4251)
  Fix author list parser (#4169) (#4248)
  ReplaceStringMVVMPattern
  ...

# Conflicts:
#	src/main/java/org/jabref/gui/BasePanel.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Siedlerchr @tobiasdiez