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

feat(client/java): upgrade Apache HttpClient to 5 #4007

Merged
merged 1 commit into from
Dec 15, 2023

Conversation

danielkelemen
Copy link
Member

related to #3945

@danielkelemen danielkelemen added the bot:java-dependency-check When assigned to a PR, generates SBOMs for the PR and base branch and compares them. label Dec 15, 2023
Copy link

github-actions bot commented Dec 15, 2023

Java dependency diff

🔄 camunda-root: 7.21.0-SNAPSHOT => 7.21.0-SNAPSHOT  
 └─ 🔄 camunda-parent: 7.21.0-SNAPSHOT => 7.21.0-SNAPSHOT  
     └─ 🔄 camunda-database-settings: 7.21.0-SNAPSHOT => 7.21.0-SNAPSHOT  
         ├─ 🔄 camunda-bpm-spring-boot-starter-root: 7.21.0-SNAPSHOT => 7.21.0-SNAPSHOT  
         │   ├─ 🔄 camunda-external-task-client-spring: 7.21.0-SNAPSHOT => 7.21.0-SNAPSHOT  
         │   │   └─ 🔄 camunda-external-task-client: 7.21.0-SNAPSHOT => 7.21.0-SNAPSHOT  
         │   │       └─ ➕ httpclient5:5.3 ✔  
         │   │           ├─ ➕ httpcore5:5.2.4 ✔  
         │   │           ├─ ➕ httpcore5-h2:5.2.4 ✔  
         │   │           │   └─ ➕ httpcore5:5.2.4 ✔  
         │   │           └─ ➕ slf4j-api:1.7.26 ✔  
         │   │       └─ ➖ httpclient:4.5.13 ✔  
         │   │           ├─ ➖ httpcore:4.4.13 ✔  
         │   │           ├─ ➖ commons-logging:1.1.1 ✔  
         │   │           └─ ➖ commons-codec:1.11 ✔  
         │   └─ 🔄 camunda-bpm-spring-boot-starter-external-task-client: 7.21.0-SNAPSHOT => 7.21.0-SNAPSHOT  
         │       └─ 🔄 camunda-external-task-client-spring: 7.21.0-SNAPSHOT => 7.21.0-SNAPSHOT  
         │           └─ (Repeating subtree omitted)  
         ├─ 🔄 camunda-external-task-client-root: 7.21.0-SNAPSHOT => 7.21.0-SNAPSHOT  
         │   └─ 🔄 camunda-external-task-client: 7.21.0-SNAPSHOT => 7.21.0-SNAPSHOT  
         │       └─ (Repeating subtree omitted)  
         ├─ 🔄 camunda-wildfly: 7.21.0-SNAPSHOT => 7.21.0-SNAPSHOT  
         │   ├─ 🔄 camunda-wildfly-modules: 7.21.0-SNAPSHOT => 7.21.0-SNAPSHOT  
         │   │   ├─ 🔄 camunda-connect-http-client: 1.6.0 => 1.6.0  
         │   │   │   └─ 🔄 httpclient: 4.5.13 ✔ => 4.5.13 ✔  
         │   │   │       └─ 🤷 commons-codec: 1.11 ✔ => 1.15 ✔  
         │   │   └─ 🔄 camunda-connect-soap-http-client: 1.6.0 => 1.6.0  
         │   │       └─ 🔄 camunda-connect-http-client: 1.6.0 => 1.6.0  
         │   │           └─ (Repeating subtree omitted)  
         │   └─ 🔄 camunda-wildfly-assembly: 7.21.0-SNAPSHOT => 7.21.0-SNAPSHOT  
         │       └─ 🔄 camunda-wildfly-modules: 7.21.0-SNAPSHOT => 7.21.0-SNAPSHOT  
         │           └─ (Repeating subtree omitted)  
         └─ 🔄 camunda-wildfly26: 7.21.0-SNAPSHOT => 7.21.0-SNAPSHOT  
             └─ 🔄 camunda-wildfly26-modules: 7.21.0-SNAPSHOT => 7.21.0-SNAPSHOT  
                 ├─ 🔄 camunda-connect-http-client: 1.6.0 => 1.6.0  
                 │   └─ (Repeating subtree omitted)  
                 └─ 🔄 camunda-connect-soap-http-client: 1.6.0 => 1.6.0  
                     └─ (Repeating subtree omitted)  

Module details

httpclient:4.5.13

Declared licenses:

  • Apache-2.0 ✔

Links:

httpclient5:5.3

Declared licenses:

  • Apache-2.0 ✔

Links:

slf4j-api:1.7.26

Declared licenses:

  • MIT ✔

Links:

httpcore5:5.2.4

Declared licenses:

  • Apache-2.0 ✔

Links:

httpcore5-h2:5.2.4

Declared licenses:

  • Apache-2.0 ✔

Links:

commons-codec:1.11

Declared licenses:

  • Apache-2.0 ✔

Links:

commons-codec:1.15

Declared licenses:

  • Apache-2.0 ✔

Links:

Checklist

Unique changes

Unique additions

Developer comments

Glossary

Limitations

  • The reported transitive dependencies may not always be accurate in a multi-module project.
    The SBOM file format represents a unique dependency (coordinates + type) only once. In a multi-module
    project a dependency can be declared in multiple locations with different exclusions of transitive dependencies
    or different version overrides for transitive dependencies.

Emojies

  • ✔: All licenses are on the Go list
  • ⚠: (At least one) license is on the Caution list
  • ❌: (At least one) license is on the Stop list
  • ❓: (At least one) license cannot be determined or is unknown
  • ‼: Dependency has multiple licenses declared
  • ⬆: New dependency version is higher than previous
  • ⬇: New dependency version is lower than previous
  • 🔄: Dependency version is equal and the dependencies of this component changed (e.g. when comparing snapshots)
  • 🤷: The change of the dependency version can not be determined further (e.g. because the version does not follow semantic versioning)

Copy link
Member

@yanavasileva yanavasileva left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 Looks good. I have one question and one remark.
❌ We need to run the CI for spring-boot as well (one IT but still), as the java client is a dependency of the spring boot client.
🙃 Also I will be curios to see just in case CI results for jdk 17 (default-build or jdk).

Copy link

Dependency Tree Diff

diff -r /base/clients/java/client/dependencies.txt /pr/clients/java/client/dependencies.txt
13,14d12
<    commons-codec:commons-codec:jar:1.11:compile:/root/.m2/repository/commons-codec/commons-codec/1.11/commons-codec-1.11.jar
<    commons-logging:commons-logging:jar:1.1.1:compile:/root/.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar
18,20c16,18
<    org.apache.httpcomponents:httpclient:jar:4.5.13:compile:/root/.m2/repository/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.jar
<    org.apache.httpcomponents:httpcore:jar:4.4.13:compile:/root/.m2/repository/org/apache/httpcomponents/httpcore/4.4.13/httpcore-4.4.13.jar
<    org.apache.httpcomponents:httpmime:jar:4.5.13:test:/root/.m2/repository/org/apache/httpcomponents/httpmime/4.5.13/httpmime-4.5.13.jar
---
>    org.apache.httpcomponents.client5:httpclient5:jar:5.3:compile:/root/.m2/repository/org/apache/httpcomponents/client5/httpclient5/5.3/httpclient5-5.3.jar
>    org.apache.httpcomponents.core5:httpcore5-h2:jar:5.2.4:compile:/root/.m2/repository/org/apache/httpcomponents/core5/httpcore5-h2/5.2.4/httpcore5-h2-5.2.4.jar
>    org.apache.httpcomponents.core5:httpcore5:jar:5.2.4:compile:/root/.m2/repository/org/apache/httpcomponents/core5/httpcore5/5.2.4/httpcore5-5.2.4.jar
diff -r /base/spring-boot-starter/starter-client/spring/dependencies.txt /pr/spring-boot-starter/starter-client/spring/dependencies.txt
9,10d8
<    commons-codec:commons-codec:jar:1.15:compile:/root/.m2/repository/commons-codec/commons-codec/1.15/commons-codec-1.15.jar
<    commons-logging:commons-logging:jar:1.2:compile:/root/.m2/repository/commons-logging/commons-logging/1.2/commons-logging-1.2.jar
14,15c12,14
<    org.apache.httpcomponents:httpclient:jar:4.5.13:compile:/root/.m2/repository/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.jar
<    org.apache.httpcomponents:httpcore:jar:4.4.16:compile:/root/.m2/repository/org/apache/httpcomponents/httpcore/4.4.16/httpcore-4.4.16.jar
---
>    org.apache.httpcomponents.client5:httpclient5:jar:5.2.1:compile:/root/.m2/repository/org/apache/httpcomponents/client5/httpclient5/5.2.1/httpclient5-5.2.1.jar
>    org.apache.httpcomponents.core5:httpcore5-h2:jar:5.2.3:compile:/root/.m2/repository/org/apache/httpcomponents/core5/httpcore5-h2/5.2.3/httpcore5-h2-5.2.3.jar
>    org.apache.httpcomponents.core5:httpcore5:jar:5.2.3:compile:/root/.m2/repository/org/apache/httpcomponents/core5/httpcore5/5.2.3/httpcore5-5.2.3.jar
diff -r /base/spring-boot-starter/starter-client/spring-boot/dependencies.txt /pr/spring-boot-starter/starter-client/spring-boot/dependencies.txt
11,12d10
<    commons-codec:commons-codec:jar:1.15:compile:/root/.m2/repository/commons-codec/commons-codec/1.15/commons-codec-1.15.jar
<    commons-logging:commons-logging:jar:1.2:compile:/root/.m2/repository/commons-logging/commons-logging/1.2/commons-logging-1.2.jar
21,22c19,21
<    org.apache.httpcomponents:httpclient:jar:4.5.13:compile:/root/.m2/repository/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.jar
<    org.apache.httpcomponents:httpcore:jar:4.4.16:compile:/root/.m2/repository/org/apache/httpcomponents/httpcore/4.4.16/httpcore-4.4.16.jar
---
>    org.apache.httpcomponents.client5:httpclient5:jar:5.2.1:compile:/root/.m2/repository/org/apache/httpcomponents/client5/httpclient5/5.2.1/httpclient5-5.2.1.jar
>    org.apache.httpcomponents.core5:httpcore5-h2:jar:5.2.3:compile:/root/.m2/repository/org/apache/httpcomponents/core5/httpcore5-h2/5.2.3/httpcore5-h2-5.2.3.jar
>    org.apache.httpcomponents.core5:httpcore5:jar:5.2.3:compile:/root/.m2/repository/org/apache/httpcomponents/core5/httpcore5/5.2.3/httpcore5-5.2.3.jar

@danielkelemen danielkelemen added ci:default-build Runs the builds that have no explicit trigger (e.g. different history levels). ci:spring-boot Runs the integration tests for the Spring Boot starter. labels Dec 15, 2023
Copy link
Member

@yanavasileva yanavasileva left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 Good to go when the CI runs.

@danielkelemen danielkelemen merged commit 1d3fa78 into master Dec 15, 2023
12 checks passed
@danielkelemen danielkelemen deleted the 3945-xtac-apache5 branch December 15, 2023 14:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bot:java-dependency-check When assigned to a PR, generates SBOMs for the PR and base branch and compares them. ci:default-build Runs the builds that have no explicit trigger (e.g. different history levels). ci:spring-boot Runs the integration tests for the Spring Boot starter.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants