Skip to content

Conversation

@LinusDietz
Copy link
Member

The JUnit4 tests are handled by the junit-vintage-engine, so we don't need the old dependency anymore. 🎉

@LinusDietz LinusDietz added dev: build-system status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers testing labels Dec 26, 2017
@tobiasdiez
Copy link
Member

LGTM. Since this is only a minor thing, I'll merge directly.

@tobiasdiez tobiasdiez merged commit 7895ae0 into master Dec 26, 2017
@tobiasdiez tobiasdiez deleted the bye-bye-junit4 branch December 26, 2017 22:23
Siedlerchr added a commit that referenced this pull request Dec 28, 2017
* upstream/master: (121 commits)
  Fix fetcher tests (#3583)
  Convert entry preview panel to JavaFX (#3574)
  Remove dependency for JUnit4 (#3580)
  Update tracis cache config as recommned by the docs (#3575)
  fix typo
  Show development information
  Release v4.1
  Add new authors to mailMap (#3567)
  Fix build
  Really fix changelog
  Fix changelog
  Minor changes
  Disable the autocompletion as default (#3569)
  Add update exception for applicationinsights 2.0.0-BETA (#3571)
  Install4j jres 152 (#3570)
  Fix grammar mistake
  Downgrade applicationinsights. Fixes #3561
  Adapt scripts/prepare-install4j.sh to JRE1.8.0_152 (#3568)
  ExportFormats: Use FileExtension enum (#3565)
  Update guava from 23.5-jre -> 23.6-jre
  ...

# Conflicts:
#	build.gradle
Siedlerchr added a commit that referenced this pull request Dec 29, 2017
* upstream/master: (234 commits)
  Fix checkstyle
  Fix tests
  Fix fetcher tests (#3583)
  Convert entry preview panel to JavaFX (#3574)
  Remove dependency for JUnit4 (#3580)
  Update tracis cache config as recommned by the docs (#3575)
  fix typo
  Show development information
  Release v4.1
  Add new authors to mailMap (#3567)
  Fix build
  Really fix changelog
  Fix changelog
  Minor changes
  Disable the autocompletion as default (#3569)
  Add update exception for applicationinsights 2.0.0-BETA (#3571)
  Install4j jres 152 (#3570)
  Fix grammar mistake
  Downgrade applicationinsights. Fixes #3561
  Adapt scripts/prepare-install4j.sh to JRE1.8.0_152 (#3568)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dev: build-system status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants