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

Pulling Forward Changes From v2.87.4 #649

Merged
merged 15 commits into from
Nov 3, 2022
Merged

Pulling Forward Changes From v2.87.4 #649

merged 15 commits into from
Nov 3, 2022

Conversation

naphelps
Copy link
Member

References:

Changes:

  • sbt 1.6.1 -> 1.7.1
  • akka 2.6.14 -> 2.6.16
  • config 1.4.0 -> 1.4.2
  • jakarta.ws.rs-api 2.1.1 -> 3.1.0
  • json4s-native 4.0.5 -> 4.0.6
  • json4s-jackson 4.0.5 -> 4.0.6
  • junit 4.13.1 -> 4.13.2
  • jwt-core 4.3.0 -> 5.0.0
  • postgresql 42.3.4 -> 42.5.0
  • scalacheck 1.15.0-M1 -> 1.17.0
  • slick-pg_json4s 0.20.3 -> 0.20.4
  • swagger-akka-http 2.5.2 -> 2.6.0
  • swagger-core-jakarta 2.1.5 -> 2.1.12
  • swagger-jaxrs2-jakarta 2.1.5 -> 2.1.12
  • swagger-scala-module 1.0.6 -> 2.5.0
  • swagger-ui 4.10.3 -> 4.15.0
  • sbt-scoverage 1.6.1 -> 2.0.6
  • sbt-native-packager 1.8.1 -> 1.9.11
  • javax.ws.rs-api support removed.
  • jakarta.ws.rs-api support added.

naphelps and others added 14 commits April 5, 2022 14:03
@naphelps
"2.87.1
066e0ed 
- This patch back ports some/all changes from the following Exchange versions:
  - `2.90.2`
  - `2.90.3`
  - `2.90.4`
  - `2.91.0`
  - `2.92.0`
  - `2.93.0`
- The changes include the fixes to the following issues:
  - Issue 547: Updated Sbt to version `1.5.6`.
  - Issue 549: Updated Sbt to version `1.5.7`.
  - Issue 549: Updated Sbt to version `1.6.0`.
  - Updated Sbt to version `1.6.1`.
  - Issue 560: Organization Administrators can now read all nodes organization wide from `orgs/{orgid}/search/nodes/service`
  - Locked `akka-http-jackson` to version `1.37.0`.
  - Locked Slick to version `3.3.3`.
  - Locked Slick-PG to version `0.19.3`."

Signed-off-by: Nathan Phelps <naphelps@us.ibm.com>
@naphelps
Merge pull request open-horizon#575 from naphelps/v2.87.1
3c1e586
@bencourliss
Merge pull request open-horizon#579 from open-horizon/v2.87.1
5ece3df 
Merge in changes for v2.87.1 into the v2.87 maintenance branch
@naphelps
- Dependency updates.
4c8c175 
 - akka-http  10.2.4 -> 10.2.7
 - akka-http-jackson 1.37.0 -> 1.39.2
 - akka-http-xml 10.2.4 -> 10.2.7
 - akka-http-testkit 10.2.4 -> 10.2.7
 - akka-stream-testkit 2.6.14 -> 2.6.16
 - akka-testkit 2.6.14 -> 2.6.16
 - json4s-native 3.6.6 -> 4.0.5
 - json4s-jackson 3.6.6 -> 4.0.5
 - postgresql 42.2.19 -> 42.3.4
 - scala 2.13.5 -> 2.13.8
 - slf4j-simple 1.7.30 -> 1.7.36
 - slick-pg 0.19.3 -> 0.20.3
 - slick-pg_json4s 0.19.3 -> 0.20.3
 - swagger-akka-http 2.4.2 -> 2.5.2
 - swagger-ui 3.47.1 -> 4.10.3
New configuration file attributes have been added.
 - akka.http.server.backlog
 - akka.http.server.bind-timeout
 - akka.http.server.idle-timeout
 - akka.http.server.linger-timeout
 - akka.http.server.max-connections
 - akka.http.server.pipelining-limit

Signed-off-by: Nathan Phelps <naphelps@us.ibm.com>
@naphelps
Merge pull request open-horizon#584 from naphelps/dependency-updates
9d141da 
v2.87.2 - Dependency Updates
Fixing dependency issues affecting builds
efceefc 
Signed-off-by: Ben Courliss <bencourliss@ibm.com>
@bencourliss
Merge pull request open-horizon#642 from bencourliss/v2.87
45895dc 
Fix dependency issues
@naphelps
Issue-647: Dependency Updates and Line Comment Removal in config.json
3f04bd1 
Changes:
- sbt                    1.6.1 -> 1.7.1
- akka                   2.6.14 -> 2.6.16
- config                 1.4.0 -> 1.4.2
- jakarta.ws.rs-api      2.1.1 -> 3.1.0
- json4s-native          4.0.5 -> 4.0.6
- json4s-jackson         4.0.5 -> 4.0.6
- junit                  4.13.1 -> 4.13.2
- jwt-core               4.3.0 -> 5.0.0
- postgresql             42.3.4 -> 42.5.0
- scalacheck             1.15.0-M1 -> 1.17.0
- slick-pg_json4s        0.20.3 -> 0.20.4
- swagger-akka-http      2.5.2 -> 2.6.0
- swagger-core-jakarta   2.1.5 -> 2.1.12
- swagger-jaxrs2-jakarta 2.1.5 -> 2.1.12
- swagger-scala-module   1.0.6 -> 2.5.0
- swagger-ui             4.10.3 -> 4.15.0
- sbt-scoverage          1.6.1 -> 2.0.6
- sbt-native-packager    1.8.1 -> 1.9.11
- javax.ws.rs-api support removed.
- jakarta.ws.rs-api support added.
- RHEL UBI 9-minimal support added.
- Java 17 support added.

Signed-off-by: Nathan Phelps <naphelps@us.ibm.com>
@naphelps
Updating GitHub action workflow to Java 17 and for automated testing …
6a24818 
…on branch v2.87.

Signed-off-by: Nathan Phelps <naphelps@us.ibm.com>
@naphelps
Updated Dockerfile for changes from sbt-native-packager, and updated …
2c46268 
…actions plugins to latest versions.

Signed-off-by: Nathan Phelps <naphelps@us.ibm.com>
@naphelps
Fixed directory errors in Dockerfile due to packager update
ec7d8b6 
Signed-off-by: Nathan Phelps <naphelps@us.ibm.com>
@naphelps
Merge pull request open-horizon#648 from naphelps/issue-647
015b80d 
Issue-647: Dependency Updates and Line Comment Removal in config.json
@naphelps
Pulling forward changes from v2.87.4
9c01c9d 
Changes:
- sbt                    1.6.1 -> 1.7.1
- akka                   2.6.14 -> 2.6.16
- config                 1.4.0 -> 1.4.2
- jakarta.ws.rs-api      2.1.1 -> 3.1.0
- json4s-native          4.0.5 -> 4.0.6
- json4s-jackson         4.0.5 -> 4.0.6
- junit                  4.13.1 -> 4.13.2
- jwt-core               4.3.0 -> 5.0.0
- postgresql             42.3.4 -> 42.5.0
- scalacheck             1.15.0-M1 -> 1.17.0
- slick-pg_json4s        0.20.3 -> 0.20.4
- swagger-akka-http      2.5.2 -> 2.6.0
- swagger-core-jakarta   2.1.5 -> 2.1.12
- swagger-jaxrs2-jakarta 2.1.5 -> 2.1.12
- swagger-scala-module   1.0.6 -> 2.5.0
- swagger-ui             4.10.3 -> 4.15.0
- sbt-scoverage          1.6.1 -> 2.0.6
- sbt-native-packager    1.8.1 -> 1.9.11
- javax.ws.rs-api support removed.
- jakarta.ws.rs-api support added.

Signed-off-by: Nathan Phelps <naphelps@us.ibm.com>
@naphelps
Updating openapi-3-user documentation version
042d56d 
Signed-off-by: Nathan Phelps <naphelps@us.ibm.com>
@naphelps
Updating branch
39b3594 
Signed-off-by: Nathan Phelps <naphelps@us.ibm.com>
@naphelps naphelps merged commit f7f010c into open-horizon:master Nov 3, 2022
@naphelps naphelps deleted the update-upstream branch November 3, 2022 15:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bmpotter bmpotter Awaiting requested review from bmpotter

@lorenzoking lorenzoking Awaiting requested review from lorenzoking

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

Successfully merging this pull request may close these issues.
2 participants
@naphelps @bencourliss