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

Prepare beta SDK for merge into Main one #11

Merged
merged 13 commits into from
Mar 22, 2024
Merged

Conversation

aarsilv
Copy link
Collaborator

@aarsilv aarsilv commented Mar 22, 2024

Eppo Internal: 🎟️ Ticket: FF-1776 - Prepare beta SDK for merge into Main one

To get ready to merge the beta SDK back into the main Java SDK, I needed to merge the latest main with it as well as convert all new code to be compatible with Java 8.

Note a good chunk of the "changes" in this PR are simply the changes applied to the upstream repository being merged in here. The main check here are the automated tests run with this PR, but a quick skim would probably be good.

leoromanovsky and others added 12 commits October 5, 2023 13:12
…ppo-exp#29)

* add graceful mode by default that does not throw exceptions (FF-949)

* test graceful mode on and off

* test all functions

* remove from javadoc
…-exp#28)

Bumps [com.github.tomakehurst:wiremock-jre8](https://github.com/wiremock/wiremock) from 2.33.2 to 2.35.1.
- [Release notes](https://github.com/wiremock/wiremock/releases)
- [Commits](wiremock/wiremock@2.33.2...2.35.1)

---
updated-dependencies:
- dependency-name: com.github.tomakehurst:wiremock-jre8
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* java8 compatibility using apache httpclient

* cleanup

* added timeouts

* add maven-gpg-plugin

* test across java 8, 11, 17

* pom

* remove List.of

* fix test

* eppo value

* fix plugin

* profile

---------

Co-authored-by: Gaurav Arora <gauravarora@Gauravs-MacBook-Pro.local>
…-exp#36)

Bumps org.apache.httpcomponents:httpclient from 4.5.10 to 4.5.13.

---
updated-dependencies:
- dependency-name: org.apache.httpcomponents:httpclient
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…exp#32)

* [EN-17858] FetchConfigurationsTask is more fault tolerant

* revert change to pom.xml, thereby having a single, clean commit that can be merged back to the Eppo main repo
* add support for semver rule evaluation (FF-1569)

* azul builds

* adjust unit tests for semver comparison

* numeric first
<artifactId>eppo-server-sdk-bandit-beta</artifactId>
<version>2.1.3</version>
<artifactId>eppo-server-sdk</artifactId>
<version>2.4.0</version>
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Upstream version is currently 2.3.0

@aarsilv aarsilv marked this pull request as ready for review March 22, 2024 04:29
Copy link

@giorgiomartini0 giorgiomartini0 left a comment

Choose a reason for hiding this comment

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

Quick skim; everything looks good

Base automatically changed from aaron/ff-1648/improve-eppo-value to main March 22, 2024 19:00
@aarsilv aarsilv merged commit fb0f58a into main Mar 22, 2024
3 checks passed
@aarsilv aarsilv deleted the aaron/update-to-upstream branch March 22, 2024 19:14
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.

4 participants