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

Adds support for injecting UniversalConnectionPool instances #8378

Merged
merged 7 commits into from
Feb 15, 2024
Merged

Adds support for injecting UniversalConnectionPool instances #8378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4b91222
Adds support for injecting UniversalConnectionPool instances
ljnelson Feb 13, 2024
b9feb2d
Squashable commit; removes spurious dependencies
ljnelson Feb 13, 2024
8557b9a
Squashable commit; removes pre-existing tabs in bom/pom.xml and conve…
ljnelson Feb 13, 2024
3ede5c8
Squashable commit; adding documentation and supporting cruft
ljnelson Feb 13, 2024
8f51b5a
Squashable commit; refining
ljnelson Feb 14, 2024
4bd4731
Squashable commit; refining
ljnelson Feb 14, 2024
5a1b113
Squashable commit; refining; adjusting Hikari extension to fit
ljnelson Feb 14, 2024
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
4 changes: 4 additions & 0 deletions all/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,6 +569,10 @@
<groupId>io.helidon.integrations.db</groupId>
<artifactId>helidon-integrations-db-mysql</artifactId>
</dependency>
<dependency>
<groupId>io.helidon.integrations.cdi</groupId>
<artifactId>helidon-integrations-cdi-configurable</artifactId>
</dependency>
<dependency>
<groupId>io.helidon.integrations.cdi</groupId>
<artifactId>helidon-integrations-cdi-delegates</artifactId>
Expand Down
35 changes: 20 additions & 15 deletions bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,6 +762,11 @@
<artifactId>helidon-integrations-db-mysql</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.integrations.cdi</groupId>
<artifactId>helidon-integrations-cdi-configurable</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.integrations.cdi</groupId>
<artifactId>helidon-integrations-cdi-delegates</artifactId>
Expand Down Expand Up @@ -1062,29 +1067,29 @@
</dependency>
<!-- MicroStream -->
<dependency>
<groupId>io.helidon.integrations.microstream</groupId>
<artifactId>helidon-integrations-microstream</artifactId>
<version>${helidon.version}</version>
<groupId>io.helidon.integrations.microstream</groupId>
<artifactId>helidon-integrations-microstream</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.integrations.microstream</groupId>
<artifactId>helidon-integrations-microstream-cdi</artifactId>
<version>${helidon.version}</version>
<groupId>io.helidon.integrations.microstream</groupId>
<artifactId>helidon-integrations-microstream-cdi</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.integrations.microstream</groupId>
<artifactId>helidon-integrations-microstream-health</artifactId>
<version>${helidon.version}</version>
<groupId>io.helidon.integrations.microstream</groupId>
<artifactId>helidon-integrations-microstream-health</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.integrations.microstream</groupId>
<artifactId>helidon-integrations-microstream-metrics</artifactId>
<version>${helidon.version}</version>
<groupId>io.helidon.integrations.microstream</groupId>
<artifactId>helidon-integrations-microstream-metrics</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.integrations.microstream</groupId>
<artifactId>helidon-integrations-microstream-cache</artifactId>
<version>${helidon.version}</version>
<groupId>io.helidon.integrations.microstream</groupId>
<artifactId>helidon-integrations-microstream-cache</artifactId>
<version>${helidon.version}</version>
</dependency>

<dependency>
Expand Down
3 changes: 2 additions & 1 deletion dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,12 @@
<version.lib.neo4j>5.12.0</version.lib.neo4j>
<version.lib.netty>4.1.100.Final</version.lib.netty>
<version.lib.oci>3.34.0</version.lib.oci>
<version.lib.ojdbc.family>21</version.lib.ojdbc.family>
<!--
UCP versions 21.10.0.0 and up throw NPEs. There is a test to catch them.
Until this bug is fixed do not upgrade past version 21.9.0.0.
-->
<version.lib.ojdbc>21.9.0.0</version.lib.ojdbc>
<version.lib.ojdbc>${version.lib.ojdbc.family}.9.0.0</version.lib.ojdbc>
<version.lib.ojdbc8>${version.lib.ojdbc}</version.lib.ojdbc8>
<!-- Force upgrade okio for CVE-2023-3635. When okhttp 4.12.0 is available we can remove this -->
<version.lib.okio>3.4.0</version.lib.okio>
Expand Down
12 changes: 12 additions & 0 deletions etc/javadoc/ojdbc/element-list
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
oracle.jdbc
oracle.jdbc.aq
oracle.jdbc.babelfish
oracle.jdbc.datasource
oracle.jdbc.datasource.impl
oracle.jdbc.dcn
oracle.jdbc.pool
oracle.jdbc.replay
oracle.jdbc.xa
oracle.jdbc.xa.client
oracle.sql
oracle.sql.json
5 changes: 5 additions & 0 deletions etc/javadoc/ucp/element-list
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
oracle.ucp
oracle.ucp.admin
oracle.ucp.jdbc
oracle.ucp.jdbc.oracle
oracle.ucp.util.logging
48 changes: 48 additions & 0 deletions integrations/cdi/common-cdi/configurable/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2024 Oracle and/or its affiliates.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.helidon.integrations.cdi</groupId>
<artifactId>helidon-integrations-cdi-common-project</artifactId>
<version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>helidon-integrations-cdi-configurable</artifactId>
<name>Helidon CDI Integrations Common Configurable</name>

<dependencies>

<!-- Compile-scoped dependencies. -->
<dependency>
<groupId>org.eclipse.microprofile.config</groupId>
<artifactId>microprofile-config-api</artifactId>
<scope>compile</scope>
</dependency>

<!-- Provided-scoped dependencies. -->
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<scope>provided</scope>
</dependency>

</dependencies>
</project>
Loading
Loading