Skip to content

Adapt scripts/prepare-install4j.sh to JRE1.8.0_152#3568

Merged
Siedlerchr merged 1 commit into
masterfrom
install4j-jres-152
Dec 22, 2017
Merged

Adapt scripts/prepare-install4j.sh to JRE1.8.0_152#3568
Siedlerchr merged 1 commit into
masterfrom
install4j-jres-152

Conversation

@LinusDietz

Copy link
Copy Markdown
Member

First step for 4.1

@Siedlerchr Siedlerchr merged commit 2f637cd into master Dec 22, 2017
@Siedlerchr Siedlerchr deleted the install4j-jres-152 branch December 22, 2017 15:29
@LinusDietz LinusDietz restored the install4j-jres-152 branch December 22, 2017 19:06
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

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants