Skip to content
This repository was archived by the owner on Jan 23, 2024. It is now read-only.

[6.x] fix: change to use adoptOpenJDK to fix the build (#944)#945

Merged
kuisathaverat merged 1 commit intoelastic:6.xfrom
kuisathaverat:backport/6.x/pr-944
Oct 19, 2020
Merged

[6.x] fix: change to use adoptOpenJDK to fix the build (#944)#945
kuisathaverat merged 1 commit intoelastic:6.xfrom
kuisathaverat:backport/6.x/pr-944

Conversation

@kuisathaverat
Copy link
Copy Markdown
Contributor

Backports the following commits to 6.x:

* fix: change to use adoptOpenJDK to fix the build

* Update docker/java/spring/Dockerfile

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
# Conflicts:
#	docker/java/spring/Dockerfile
@kuisathaverat kuisathaverat self-assigned this Oct 19, 2020
@kuisathaverat kuisathaverat merged commit 3c7328e into elastic:6.x Oct 19, 2020
v1v added a commit to v1v/apm-integration-testing that referenced this pull request Dec 16, 2020
* upstream/6.x: (22 commits)
  fix: skip chrome and firefox downloads on the RUM agent Docker image (elastic#965) (elastic#977)
  fix: change to use adoptOpenJDK to fix the build (elastic#944) (elastic#945)
  [6.x] fix: increase the resilience against network issues (elastic#927) (elastic#929)
  fix: use Node.js LTS version for ITs (elastic#921) (elastic#924)
  fix: RUM Docker image build (elastic#915)
  fix: update JDK and apply some maven options (elastic#904) (elastic#911)
  fix: use fixed version of setuptools (elastic#907) (elastic#909)
  fix: missing dependencies for rum test (elastic#899) (elastic#903)
  fix: update Go version to the latest LTS version (elastic#891)
  fix: add libxss dependency to the opbean-rum (elastic#880) (elastic#882)
  fix: remove chrome drive is not used (elastic#876)
  fix: update dependencies to run integration tests (elastic#872) (elastic#874)
  feat: bump pytest version (elastic#866) (elastic#868)
  test: add 6.x version to the test (elastic#651)
  (rum): run build on all RUM packages (elastic#622)
  feat: disable shallow cloning when using downstream pipelines (elastic#583) (elastic#585)
  [6.x] feat: pre-commit config (elastic#547) (elastic#549)
  fix: update build status badge
  ci: remove jenkinsfile
  feat: delete legacy integration testing jobs (elastic#542)
  ...
v1v added a commit to v1v/apm-integration-testing that referenced this pull request Jan 8, 2021
* upstream/6.x: (23 commits)
  Bump 6.8 release (elastic#1007)
  fix: skip chrome and firefox downloads on the RUM agent Docker image (elastic#965) (elastic#977)
  fix: change to use adoptOpenJDK to fix the build (elastic#944) (elastic#945)
  [6.x] fix: increase the resilience against network issues (elastic#927) (elastic#929)
  fix: use Node.js LTS version for ITs (elastic#921) (elastic#924)
  fix: RUM Docker image build (elastic#915)
  fix: update JDK and apply some maven options (elastic#904) (elastic#911)
  fix: use fixed version of setuptools (elastic#907) (elastic#909)
  fix: missing dependencies for rum test (elastic#899) (elastic#903)
  fix: update Go version to the latest LTS version (elastic#891)
  fix: add libxss dependency to the opbean-rum (elastic#880) (elastic#882)
  fix: remove chrome drive is not used (elastic#876)
  fix: update dependencies to run integration tests (elastic#872) (elastic#874)
  feat: bump pytest version (elastic#866) (elastic#868)
  test: add 6.x version to the test (elastic#651)
  (rum): run build on all RUM packages (elastic#622)
  feat: disable shallow cloning when using downstream pipelines (elastic#583) (elastic#585)
  [6.x] feat: pre-commit config (elastic#547) (elastic#549)
  fix: update build status badge
  ci: remove jenkinsfile
  ...
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant