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

Drop geronimo connector as not used / Sort ejb with other EE apis as required and not for reason stated #629

Merged
merged 3 commits into from
Nov 4, 2023
Merged

Drop geronimo connector as not used / Sort ejb with other EE apis as required and not for reason stated #629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8afafce
[ci] formatting
hazendaz Nov 4, 2023
26f7392
[pom] Remove geronimo connector as not used
hazendaz Nov 4, 2023
c29312d
[pom] Sort ejb and remove comment that doesn't apply
hazendaz Nov 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 6 additions & 18 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,12 @@
<version>${guice.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.ejb</groupId>
<artifactId>jakarta.ejb-api</artifactId>
<version>${ejb-api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
Expand All @@ -144,17 +150,6 @@
<scope>provided</scope>
</dependency>

<!--
| https://github.com/brettwooldridge/HikariCP
| Java 8 thru 11 maven artifact:
-->
<dependency>
<groupId>jakarta.ejb</groupId>
<artifactId>jakarta.ejb-api</artifactId>
<version>${ejb-api.version}</version>
<scope>provided</scope>
</dependency>

<!--
| Optional dependencies
-->
Expand Down Expand Up @@ -324,13 +319,6 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-connector</artifactId>
<version>4.0.0</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/mybatis/guice/AddressConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2009-2022 the original author or authors.
* Copyright 2009-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down