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

Issue #5713 Remove dependency on derby #5728

Merged
merged 2 commits into from Nov 30, 2020

Conversation

janbartel
Copy link
Contributor

closes #5713

jetty-plus does not need the dependency on derby so I removed it. That left the test/test-loginservice with a dependency on derby, so I've changed that to use the same docker-style test that the tests/test-sessions/test-jdbc-sessions use, so at least we have a single set of common dependencies (uses maria db for the database). Also cleaned up the test code.

Signed-off-by: Jan Bartel <janb@webtide.com>
@janbartel janbartel added this to In progress in Jetty 9.4.35 via automation Nov 25, 2020
@janbartel janbartel linked an issue Nov 25, 2020 that may be closed by this pull request
@@ -68,7 +68,7 @@
<settingsPath>src/it/settings.xml</settingsPath>
<surefire.rerunFailingTestsCount>0</surefire.rerunFailingTestsCount>
<testcontainers.version>1.15.0</testcontainers.version>
<derby.version>10.14.2.0</derby.version>
<maria.version>2.7.0</maria.version>
Copy link
Contributor

Choose a reason for hiding this comment

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

So we switched from derby to maria?
Still the same dependency count?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No, we have 1 less dependency, I removed Derby. We already had mariadb.

Copy link
Member

Choose a reason for hiding this comment

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

@janbartel not sure we have any dependency on mariadb (except docker test for jdbc session test) and this can be removed

Copy link
Contributor

Choose a reason for hiding this comment

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

The maria DB used in org.eclipse.jetty.tests:test-jdbc-sessions in jetty-9.4.x is referencing (already) ...

[INFO] +- org.testcontainers:mariadb:jar:1.15.0:test
[INFO] +- org.mariadb.jdbc:mariadb-java-client:jar:2.7.0:test

That's a tiny set of deps.

We should probably use these new properties in test-jdbc-sessions too.

Copy link
Member

Choose a reason for hiding this comment

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

yup I agree on using the property or removing it.

Copy link
Member

Choose a reason for hiding this comment

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

done

@janbartel janbartel removed this from In progress in Jetty 9.4.35 Nov 25, 2020
@janbartel janbartel added this to In progress in Jetty 9.4.36 via automation Nov 25, 2020
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
@janbartel janbartel merged commit 5ad1305 into jetty-9.4.x Nov 30, 2020
Jetty 9.4.36 automation moved this from In progress to Done Nov 30, 2020
@janbartel janbartel deleted the jetty-9.4.x-5713-remove-derby branch November 30, 2020 13:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

Get rid of test dependencies on derby
3 participants