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.

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

Add okhttp dep to r5 and indicate which deps need to be included #3332

Merged
merged 1 commit into from
Jan 25, 2022

Conversation

tadgh
Copy link
Collaborator

@tadgh tadgh commented Jan 25, 2022

  • Currently building javadocs in R5 is failing, causing a failed deploy to sonatype:
[ERROR] /__w/1/s/hapi-fhir-structures-r5/target/distro-javadoc-sources/org.hl7.fhir.r5-5.6.27-sources/org/hl7/fhir/r5/utils/client/network/FhirLoggingInterceptor.java:4: error: package okio does not exist
[ERROR] import okio.Buffer;
[ERROR]            ^
  • Failure can be replicated by cleaning your ~/.m2 and running mvn clean install -P DIST in the hapi-fhir-structures-r5 directory
  • This MR makes the R5 pom.xml match the structure of R4 and DSTU3, which import the lib as an addditional dep during javadoc generation.

@tadgh tadgh enabled auto-merge (squash) January 25, 2022 18:02
@codecov
Copy link

codecov bot commented Jan 25, 2022

Codecov Report

Merging #3332 (48f47cc) into master (31bb1d9) will increase coverage by 0.00%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##             master    #3332   +/-   ##
=========================================
  Coverage     82.80%   82.81%           
- Complexity    20460    20463    +3     
=========================================
  Files          1367     1367           
  Lines         73521    73521           
  Branches      11053    11053           
=========================================
+ Hits          60882    60886    +4     
+ Misses         8390     8388    -2     
+ Partials       4249     4247    -2     
Impacted Files Coverage Δ
.../uhn/fhir/jpa/term/TermDeferredStorageSvcImpl.java 89.20% <0.00%> (-0.94%) ⬇️
...or/TransactionConcurrencySemaphoreInterceptor.java 85.29% <0.00%> (+1.47%) ⬆️
...r/UserRequestRetryVersionConflictsInterceptor.java 87.50% <0.00%> (+4.16%) ⬆️
...scription/match/deliver/email/EmailSenderImpl.java 100.00% <0.00%> (+25.00%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 31bb1d9...48f47cc. Read the comment docs.

@tadgh tadgh merged commit cd29d36 into master Jan 25, 2022
@tadgh tadgh deleted the fix-broken-javadoc-generation branch January 25, 2022 18:39
michaelabuckley added a commit that referenced this pull request Jan 31, 2022
* master:
  Add error codes to all exceptions (#3278)
  3156 multiple tag race condition (#3297)
  Fix globbing pattern for log files
  Update instance_validator.md (#3328)
  add needed dependendencies for mysql and mssql (#3343)
  Add okhttp dep
  3335 allow alternative character encoding length in searchparam (#3336)
  Fix mdm config for single application context environment.  (#3338)
  Validate include statements for JPA (#3331)
  Add okhttp dep to r5 and indicate which deps need to be included (#3332)
  Bump RestEasy to 5.0.2 (#3329)

# Conflicts:
#	hapi-fhir-base/src/main/java/ca/uhn/fhir/i18n/Msg.java
#	hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java
#	hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/lastn/ElasticsearchSvcImpl.java
#	hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirResourceDaoDstu2SearchNoFtTest.java
#	hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/module/matcher/InMemorySubscriptionMatcherR4Test.java
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.

None yet

2 participants