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

Sync with the upstream v6.8.0 #77

Merged
merged 248 commits into from
Jan 22, 2024
Merged

Sync with the upstream v6.8.0 #77

merged 248 commits into from
Jan 22, 2024

Conversation

hankwallace
Copy link

@hankwallace hankwallace commented Jan 20, 2024 •
edited
Loading

Overview

  • This updates our fork with v6.8.0 in the upstream repo. The plan is to upgrade further after this is merged.
  • After resolving conflicts, I compared all changes with the changes in the upstream from v6.6.0 to v6.8.0. Link is here
  • Also added our company logo to the web ui banner.

How it was tested

  • Built and ran unit tests
  • Configured docker-compose to use MySQL, started it, and ran all of our integration tests against it.
  • Configured docker-compose to use PostgreSQL, started it, and ran all of our integration tests against it.

Checklist

  • The title contains a short meaningful summary
  • I have added a link to this PR in the Jira issue
  • I have described how this was tested
  • I have included screen shots for changes that affect the user interface
  • I have updated unit tests
  • I have run unit tests locally
  • I have updated documentation (including README)

tadgh and others added 30 commits August 27, 2021 13:34
@tadgh
Bump dep version
395a87e
@tadgh
Remove javamail and replace with simple-java-mail
5038b5b
@tadgh
WIP
6e876c1
@tadgh
Remove print
a8a98c3
@tadgh
Remove bean override
e263646
@tadgh
Bump version
6e2836b
@tadgh
Add broken test
f3ea680
@tadgh
Update for new style of container bean
e41c186
@tadgh
Bump for new version
370d68a
@michaelabuckley
Update to 5.6.0-PRE7_NIH-SNAPSHOT and activate advanced index
ac75421
@michaelabuckley
Disable default flyway processing
3272b8c
@michaelabuckley
Add local_base_urls configuration to feed DaoConfig.setTreatBaseUrlsA…
097db16 
…sLocal()
@jkiddo
Added OpenAPI / Swagger option
ea3f10e
@jkiddo
Upgraded to 5.6.0
16559ea 
Subscription tests fail ...
@jkiddo
Bumped version of Spring Boot in order to fix same issue as jmix-proj…
9645087 
…ects/jmix-security#90
@jkiddo
Merge pull request hapifhir#291 from hapifhir/5.6.0-upgrade
a58ef1c 
5.6.0 upgrade
@jkiddo
Update application.yaml
0203a36 
See hapifhir#292
@chgl
documented use of Values.extraEnv
e39d84e
@chgl
added options for specifying a PodDisruptionBudget
304f779
@chgl
simplified chart release workflow
8ce44c2 
the Ubuntu runner base image already includes Helm 3.7.0
@ZuSe
Support HTTPS
6092200
@ZuSe
Use default application.yaml
ff8302a
@ashaban
registering ValueSetOperationProvider
e077091
@michaelabuckley
Merge branch 'master' into nih-testing
2512616 
* master:
  Update application.yaml
  Bumped version of Spring Boot in order to fix same issue as jmix-projects/jmix-security#90
  Upgraded to 5.6.0 Subscription tests fail ...
  Added OpenAPI / Swagger option
  simplified helm chart
  build ARM-compatible images
  bumped dependencies to latest
  only push build images to DockerHub
  Adds ability to change HAPI FHIR JPA server's port with the environment variable server.port
  Adds ability to control the number of executor threads through environment variables server.tomcat.max-threads and server.tomcat.min-spare-threads.  There is not a breaking change and does not affect the function of the JPA server unless these environment variables are set.
  Adds ability to use delete-expunge operations to the JPA Starter Server.

# Conflicts:
#	pom.xml
#	src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java
#	src/main/java/ca/uhn/fhir/jpa/starter/Application.java
#	src/main/java/ca/uhn/fhir/jpa/starter/EnvironmentHelper.java
#	src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java
#	src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigDstu2.java
#	src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigDstu3.java
#	src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigR4.java
#	src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigR5.java
@michaelabuckley
Upgrade to 5.7.0-PRE4-SNAPSHOT for testing
8c6a1a7
@michaelabuckley
Share elasticsearch configuration
bfa6ed1
@jkiddo
Merge pull request hapifhir#295 from ashaban/master
18cf0fd 
registering ValueSetOperationProvider
@jkiddo
Merge pull request hapifhir#294 from ZuSe/https-support-for-es
7ece4c3 
Https support for es
@jkiddo
Merge pull request hapifhir#293 from chgl/updated-helm-chart
c89b0d4 
updated helm chart to use image v5.6.0
@jkiddo
Fixed compile issues
8568132
chgl and others added 20 commits July 21, 2023 16:26
@chgl
Updated helm chart with additional config settings (hapifhir#566)
8ef5083
@dotasek
Bump to hapi 6.8.0-SNAPSHOT
e9f29af
@dotasek
Switch to new ca.uhn.fhir.batch2.jobs.export to fix StarterJpaConfig
aafd4fa
@dotasek
Merge remote-tracking branch 'origin/master' into do-20230731-bump-to…
bf7698b 
…-hapi-6-8-0
@dotasek
WIP try to expand default max_result_window
3c395e9
@tadgh
Fix up test
f7853f5
@dotasek
Clean up code
bdf593f
@dotasek
Fix one more failing IT config
1907536
@dotasek
Leave comment in case of updates
7265b11
@dotasek
Bump to HAPI 6.8.0
69ff8c4
@dotasek
Fix breakages due to hapifhir/hapi-fhir#5180
b88ffda
@dotasek
Merge pull request hapifhir#572 from hapifhir/do-20230731-bump-to-hap…
8b0623d 
…i-6-8-0

Bump to HAPI 6.8.0
@patrick-werner
Merge pull request hapifhir#556 from trifork/feature/tester-configurable
0252fa4 
Feature/tester configurable
@patrick-werner
Merge pull request hapifhir#546 from trifork/feat/static-hosting-addi…
d6e9aba 
…tions

Feat/static hosting additions
@jkiddo
Feature/using package installer spec (hapifhir#577)
37a9317 
* Adjusting to HAPI core classes

* Added example as default

* Commented the example IG out again
@HussamNujaim
Fixing some typos in README.md
63c4825
@HussamNujaim
Merge pull request #1 from HussamNujaim/typos-readme
0255d37 
Fixing some typos in README.md
@KevinDougan
Merge pull request hapifhir#582 from HussamNujaim/master
bfa85ce 
Fixing some typos in README.md
@hankwallace
Sync with the upstream v6.8.0
395bcb6
@hankwallace
Adds our banner to the web UI
f7e2fb9
@semicolin
Copy link

@hankwallace why did those checks fail for "Lint and Test Charts"?

@semicolin
Copy link

If this is updating our fork from 6.6.0 -> 6.8.0, why does it include upstream commits from 3 years ago (5.6.0)?

@hankwallace
Copy link
Author

@hankwallace why did those checks fail for "Lint and Test Charts"?

I hadn't noticed those until you pointed them out. Those are all related to kubernetes deployment test. They appear to be related to blob verification. There is even a pull request submitted against the component repo to add an option to disable this functionality.

helm/chart-testing-action#131

Since we don't deploy with kubernetes, I'd like to move forward without having to resolve these.

@hankwallace
Copy link
Author

If this is updating our fork from 6.6.0 -> 6.8.0, why does it include upstream commits from 3 years ago (5.6.0)?

Thats a good question. I assume that the method I used to merge commits was different that the one that @shubhamparikh927 had used in the past.

@hankwallace hankwallace merged commit b699884 into master Jan 22, 2024
6 of 9 checks passed
@hankwallace hankwallace deleted the sync-6.8.0 branch January 25, 2024 23:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shubhamparikh927 shubhamparikh927 shubhamparikh927 approved these changes

@semicolin semicolin Awaiting requested review from semicolin

@ddjain ddjain Awaiting requested review from ddjain

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.