Skip to content

Initial contribution of the Vert.x Oracle Client #1011

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

Closed
wants to merge 5 commits into from
Closed

Initial contribution of the Vert.x Oracle Client #1011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0134340
Initial contribution of the Vert.x Oracle Client
cescoffier Jul 13, 2021
1854427
Temporary workaround to get the logs
cescoffier Jul 13, 2021
adce35a
Update driver for Vert.x 4.2
cescoffier Jul 14, 2021
baaf0a4
Add missing assembly file in the oracle client
cescoffier Jul 14, 2021
8d229e4
Skip the assembly step until we have something to put inside.
cescoffier Jul 14, 2021
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
9 changes: 6 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,11 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
profile: [PostgreSQL-9,PostgreSQL-10,PostgreSQL-11,MySQL-8.0,MySQL-5.6,MySQL-5.7,MariaDB-10.4,MSSQL-2017-latest,MSSQL-2019-latest,DB2-11.5,SQL-templates]
jdk: [8]
profile: [PostgreSQL-9,PostgreSQL-10,PostgreSQL-11,MySQL-8.0,MySQL-5.6,MySQL-5.7,MariaDB-10.4,MSSQL-2017-latest,MSSQL-2019-latest,DB2-11.5,Oracle-18,SQL-templates]
jdk: [8, 11]
exclude:
- profile: Oracle-18
jdk: 8
fail-fast: false
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -28,7 +31,7 @@ jobs:
with:
java-version: ${{ matrix.jdk }}
- name: Run tests
run: mvn -q clean verify -B -DskipDefault -P ${{ matrix.profile }}
run: mvn clean verify -B -DskipDefault -P ${{ matrix.profile }}
Deploy:
name: Deploy to OSSRH
if: ${{ github.repository_owner == 'eclipse-vertx' && (github.event_name == 'push' || github.event_name == 'schedule') }}
Expand Down
11 changes: 11 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@
<module>vertx-mssql-client</module>
<module>vertx-db2-client</module>
<module>vertx-sql-client-templates</module>
<module>vertx-oracle-client</module>
</modules>
</profile>
<profile>
Expand Down Expand Up @@ -230,6 +231,16 @@
<module>vertx-sql-client-templates</module>
</modules>
</profile>
<profile>
<id>Oracle-18</id>
<properties>
<oracle-container.version>18-slim</oracle-container.version>
</properties>
<modules>
<module>vertx-sql-client</module>
<module>vertx-oracle-client</module>
</modules>
</profile>
</profiles>

</project>
163 changes: 163 additions & 0 deletions vertx-oracle-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,163 @@
<?xml version="1.0"?>
<!--
~ Copyright (C) 2017 Julien Viet
~
~ 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 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>io.vertx</groupId>
<artifactId>vertx-sql-client-parent</artifactId>
<version>4.2.0-SNAPSHOT</version>
</parent>

<artifactId>vertx-oracle-client</artifactId>

<name>Vertx Oracle Client</name>
<url>https://github.com/eclipse-vertx/vertx-sql-client</url>
<description>The Reactive Oracle Client</description>

<properties>
<doc.skip>false</doc.skip>
<docs.dir>${project.basedir}/src/main/docs</docs.dir>
<generated.dir>${project.basedir}/src/main/generated</generated.dir>

<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>

<ojdbc.version>21.1.0.0</ojdbc.version>
</properties>


<dependencies>

<!-- Oracle Driver -->
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc11</artifactId>
<version>${ojdbc.version}</version>
</dependency>

<!-- Vert.x dependencies -->
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-core</artifactId>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-codegen</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-docgen</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-sql-client</artifactId>
</dependency>

<!-- Testing purposes -->
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-sql-client</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>

</dependencies>

<build>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>-Xmx1024M</argLine>
<systemPropertyVariables>
<target.dir>${project.build.directory}</target.dir>
</systemPropertyVariables>
<excludes>
<exclude>io/vertx/pgclient/it/**</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<!-- TODO Implement examples -->
<!-- <plugin>-->
<!-- <groupId>org.bsc.maven</groupId>-->
<!-- <artifactId>maven-processor-plugin</artifactId>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <id>generate-sources</id>-->
<!-- <configuration>-->
<!-- <optionMap>-->
<!-- <docgen.source>${project.basedir}/../vertx-sql-client/src/main/asciidoc/*.adoc,${asciidoc.dir}/*.adoc</docgen.source>-->
<!-- </optionMap>-->
<!-- </configuration>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- </plugin>-->

<!-- TODO - Write documentation -->
<!-- <plugin>-->
<!-- <artifactId>maven-assembly-plugin</artifactId>-->
<!-- <executions>-->
<!-- &lt;!&ndash; Override sources to use custom descriptor to have all adoc files &ndash;&gt;-->
<!-- <execution>-->
<!-- <id>package-sources</id>-->
<!-- <configuration>-->
<!-- <descriptors>-->
<!-- <descriptor>${project.basedir}/../assembly/sources.xml</descriptor>-->
<!-- </descriptors>-->
<!-- <descriptorRefs>-->
<!-- <descriptorRef>none</descriptorRef>-->
<!-- </descriptorRefs>-->
<!-- <ignoreMissingDescriptor>true</ignoreMissingDescriptor>-->
<!-- </configuration>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- </plugin>-->

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<release>11</release>
<source>11</source>
<target>11</target>
</configuration>
</plugin>
</plugins>
</build>

<profiles>

</profiles>

</project>
22 changes: 22 additions & 0 deletions vertx-oracle-client/src/assembly/benchmark.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
<id>benchmark</id>
<formats>
<format>jar</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>${project.build.testOutputDirectory}</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
</fileSets>
<dependencySets>
<dependencySet>
<outputDirectory>/</outputDirectory>
<unpack>true</unpack>
<scope>test</scope>
</dependencySet>
</dependencySets>
</assembly>
Loading