Skip to content

Move database version profiles to individual client POMs #1641

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

Merged
tsegismont merged 1 commit into from
Mar 30, 2026
Merged

Move database version profiles to individual client POMs #1641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 18 additions & 1 deletion .github/workflows/ci-4.x.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,62 +5,79 @@ on:
jobs:
CI:
strategy:
fail-fast: false
matrix:
include:
- os: ubuntu-latest
jdk: 8
profile: 'PostgreSQL-9'
module: 'vertx-pg-client'
- os: ubuntu-latest
jdk: 8
profile: 'PostgreSQL-10'
module: 'vertx-pg-client'
- os: ubuntu-latest
jdk: 8
profile: 'PostgreSQL-11'
module: 'vertx-pg-client'
- os: ubuntu-latest
jdk: 8
profile: 'MySQL-8.0'
module: 'vertx-mysql-client'
- os: ubuntu-latest
jdk: 8
profile: 'MySQL-5.6'
module: 'vertx-mysql-client'
- os: ubuntu-latest
jdk: 8
profile: 'MySQL-5.7'
module: 'vertx-mysql-client'
- os: ubuntu-latest
jdk: 8
profile: 'MariaDB-10.4'
module: 'vertx-mysql-client'
- os: ubuntu-latest
jdk: 8
profile: 'MSSQL-2017-latest'
module: 'vertx-mssql-client'
- os: ubuntu-latest
jdk: 8
profile: 'MSSQL-2019-latest'
module: 'vertx-mssql-client'
- os: ubuntu-latest
jdk: 8
profile: 'DB2-11.5'
module: 'vertx-db2-client'
- os: ubuntu-latest
jdk: 8
profile: 'SQL-templates'
module: 'vertx-sql-client-templates'
- os: ubuntu-latest
jdk: 25
profile: 'PostgreSQL-11'
module: 'vertx-pg-client'
- os: ubuntu-latest
jdk: 25
profile: 'MySQL-5.7'
module: 'vertx-mysql-client'
- os: ubuntu-latest
jdk: 25
profile: 'MariaDB-10.4'
module: 'vertx-mysql-client'
- os: ubuntu-latest
jdk: 25
profile: 'MSSQL-2019-latest'
module: 'vertx-mssql-client'
- os: ubuntu-latest
jdk: 25
profile: 'Oracle-23'
module: 'vertx-oracle-client'
uses: ./.github/workflows/ci.yml
with:
branch: 4.x
jdk: ${{ matrix.jdk }}
os: ${{ matrix.os }}
profile: ${{ matrix.profile }}
module: ${{ matrix.module }}
deploy: ${{ matrix.jdk == '8' && matrix.os == 'ubuntu-latest' }}
secrets: inherit
Deploy:
Expand Down
19 changes: 18 additions & 1 deletion .github/workflows/ci-matrix-5.x.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,62 +8,79 @@ on:
jobs:
CI:
strategy:
fail-fast: false
matrix:
include:
- os: ubuntu-latest
jdk: 11
profile: 'PostgreSQL-9'
module: 'vertx-pg-client'
- os: ubuntu-latest
jdk: 11
profile: 'PostgreSQL-10'
module: 'vertx-pg-client'
- os: ubuntu-latest
jdk: 11
profile: 'PostgreSQL-11'
module: 'vertx-pg-client'
- os: ubuntu-latest
jdk: 11
profile: 'MySQL-8.0'
module: 'vertx-mysql-client'
- os: ubuntu-latest
jdk: 11
profile: 'MySQL-5.6'
module: 'vertx-mysql-client'
- os: ubuntu-latest
jdk: 11
profile: 'MySQL-5.7'
module: 'vertx-mysql-client'
- os: ubuntu-latest
jdk: 11
profile: 'MariaDB-10.4'
module: 'vertx-mysql-client'
- os: ubuntu-latest
jdk: 11
profile: 'MSSQL-2017-latest'
module: 'vertx-mssql-client'
- os: ubuntu-latest
jdk: 11
profile: 'MSSQL-2019-latest'
module: 'vertx-mssql-client'
- os: ubuntu-latest
jdk: 11
profile: 'DB2-11.5'
module: 'vertx-db2-client'
- os: ubuntu-latest
jdk: 11
profile: 'SQL-templates'
module: 'vertx-sql-client-templates'
- os: ubuntu-latest
jdk: 25
profile: 'PostgreSQL-11'
module: 'vertx-pg-client'
- os: ubuntu-latest
jdk: 25
profile: 'MySQL-5.7'
module: 'vertx-mysql-client'
- os: ubuntu-latest
jdk: 25
profile: 'MariaDB-10.4'
module: 'vertx-mysql-client'
- os: ubuntu-latest
jdk: 25
profile: 'MSSQL-2019-latest'
module: 'vertx-mssql-client'
- os: ubuntu-latest
jdk: 25
profile: 'Oracle-23'
module: 'vertx-oracle-client'
uses: ./.github/workflows/ci.yml
with:
branch: ${{ inputs.branch }}
jdk: ${{ matrix.jdk }}
os: ${{ matrix.os }}
profile: ${{ matrix.profile }}
module: ${{ matrix.module }}
deploy: ${{ matrix.jdk == '8' && matrix.os == 'ubuntu-latest' }}
secrets: inherit
Deploy:
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ on:
type: string
profile:
type: string
module:
required: true
type: string
deploy:
type: boolean
jobs:
Expand All @@ -30,4 +33,6 @@ jobs:
java-version: ${{ inputs.jdk }}
distribution: temurin
- name: Run tests
run: mvn -s .github/maven-ci-settings.xml -q clean verify -B -DskipDefault -P ${{ inputs.profile }}
run: |
PROFILE_ARG="${{ inputs.profile && format('-P {0}', inputs.profile) || '' }}"
mvn -s .github/maven-ci-settings.xml -q clean verify -B $PROFILE_ARG -pl :${{ inputs.module }} -am
151 changes: 10 additions & 141 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,145 +173,14 @@
</plugins>
</build>

<profiles>
<profile>
<id>default</id>
<activation>
<property>
<name>skipDefault</name>
<value>!true</value>
</property>
</activation>
<modules>
<module>vertx-sql-client</module>
<module>vertx-pg-client</module>
<module>vertx-mysql-client</module>
<module>vertx-mssql-client</module>
<module>vertx-db2-client</module>
<module>vertx-sql-client-templates</module>
<module>vertx-oracle-client</module>
</modules>
</profile>
<profile>
<id>PostgreSQL-9</id>
<properties>
<embedded.postgres.version>9.6</embedded.postgres.version>
</properties>
<modules>
<module>vertx-sql-client</module>
<module>vertx-pg-client</module>
</modules>
</profile>
<profile>
<id>PostgreSQL-10</id>
<properties>
<embedded.postgres.version>10.6</embedded.postgres.version>
</properties>
<modules>
<module>vertx-sql-client</module>
<module>vertx-pg-client</module>
</modules>
</profile>
<profile>
<id>PostgreSQL-11</id>
<properties>
<embedded.postgres.version>11.5</embedded.postgres.version>
</properties>
<modules>
<module>vertx-sql-client</module>
<module>vertx-pg-client</module>
</modules>
</profile>
<profile>
<id>MySQL-8.0</id>
<properties>
<testing.mysql.database.server>mysql</testing.mysql.database.server>
<testing.mysql.database.version>8.0</testing.mysql.database.version>
</properties>
<modules>
<module>vertx-sql-client</module>
<module>vertx-mysql-client</module>
</modules>
</profile>
<profile>
<id>MySQL-5.6</id>
<properties>
<testing.mysql.database.server>mysql</testing.mysql.database.server>
<testing.mysql.database.version>5.6</testing.mysql.database.version>
</properties>
<modules>
<module>vertx-sql-client</module>
<module>vertx-mysql-client</module>
</modules>
</profile>
<profile>
<id>MySQL-5.7</id>
<properties>
<testing.mysql.database.server>mysql</testing.mysql.database.server>
<testing.mysql.database.version>5.7</testing.mysql.database.version>
</properties>
<modules>
<module>vertx-sql-client</module>
<module>vertx-mysql-client</module>
</modules>
</profile>
<profile>
<id>MariaDB-10.4</id>
<properties>
<testing.mysql.database.server>mariadb</testing.mysql.database.server>
<testing.mysql.database.version>10.4</testing.mysql.database.version>
</properties>
<modules>
<module>vertx-sql-client</module>
<module>vertx-mysql-client</module>
</modules>
</profile>
<profile>
<id>MSSQL-2017-latest</id>
<properties>
<mssql-container.version>2017-latest</mssql-container.version>
</properties>
<modules>
<module>vertx-sql-client</module>
<module>vertx-mssql-client</module>
</modules>
</profile>
<profile>
<id>MSSQL-2019-latest</id>
<properties>
<mssql-container.version>2019-latest</mssql-container.version>
</properties>
<modules>
<module>vertx-sql-client</module>
<module>vertx-mssql-client</module>
</modules>
</profile>
<profile>
<id>DB2-11.5</id>
<modules>
<module>vertx-sql-client</module>
<module>vertx-db2-client</module>
</modules>
</profile>
<profile>
<id>SQL-templates</id>
<modules>
<module>vertx-sql-client</module>
<module>vertx-pg-client</module>
<module>vertx-mysql-client</module>
<module>vertx-sql-client-templates</module>
</modules>
</profile>
<profile>
<id>Oracle-23</id>
<properties>
<oracle-container.version>23.3-slim-faststart</oracle-container.version>
</properties>
<modules>
<module>vertx-sql-client</module>
<module>vertx-oracle-client</module>
</modules>
</profile>
</profiles>
<modules>
<module>vertx-sql-client</module>
<module>vertx-pg-client</module>
<module>vertx-mysql-client</module>
<module>vertx-mssql-client</module>
<module>vertx-db2-client</module>
<module>vertx-sql-client-templates</module>
<module>vertx-oracle-client</module>
</modules>

</project>
</project>
32 changes: 14 additions & 18 deletions vertx-db2-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,25 +77,21 @@
</dependencies>

<build>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>-Xmx1024M</argLine>
<failIfNoTests>true</failIfNoTests>
<trimStackTrace>false</trimStackTrace>
<systemPropertyVariables>
<target.dir>${project.build.directory}</target.dir>
<!-- Copy of java.security that allows TLS 1.1 as the DB2 container will only accept this version
(https://bugs.openjdk.java.net/browse/JDK-8258598) -->
<java.security.properties>${project.basedir}/src/test/java.security</java.security.properties>
</systemPropertyVariables>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>-Xmx1024M</argLine>
<failIfNoTests>true</failIfNoTests>
<trimStackTrace>false</trimStackTrace>
<systemPropertyVariables>
<target.dir>${project.build.directory}</target.dir>
<!-- Copy of java.security that allows TLS 1.1 as the DB2 container will only accept this version
(https://bugs.openjdk.java.net/browse/JDK-8258598) -->
<java.security.properties>${project.basedir}/src/test/java.security</java.security.properties>
</systemPropertyVariables>
</configuration>
</plugin>
<!--
<plugin>
<groupId>org.bsc.maven</groupId>
Expand Down
Loading
Loading