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

Correct workflows and pom files #247

Merged
merged 2 commits into from
Feb 27, 2024
Merged

Correct workflows and pom files #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f453eb9
Correct workflows and pom files
mirromutth Feb 26, 2024
c02cdf8
Resolve native image warnings
mirromutth Feb 27, 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
2 changes: 1 addition & 1 deletion .github/workflows/cd-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:

- name: Run release prepare command
run: |
./mvnw -B -ntp --file pom.xml release:prepare -DpreparationGoals=clean -DskipTests=true
./mvnw -B -ntp -pl r2dbc-mysql release:prepare -DpreparationGoals=clean -DskipTests=true
./mvnw -B -ntp clean

- name: Ensure Prepared
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci-graalvm-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,6 @@ jobs:
- name: Build and run native image
run: |
echo "JAVA_HOME=$JAVA_HOME"
echo "./mvnw -Pgraalvm package"
./mvnw -Pgraalvm package
./test-native-image/target/test-native-image -Dtest.mysql.password=r2dbc-password!@
echo "./mvnw -Pgraalvm package -Dmaven.javadoc.skip=true"
./mvnw -Pgraalvm package -Dmaven.javadoc.skip=true
./test-native-image/target/test-native-image -Dtest.mysql.password=r2dbc-password!@
345 changes: 0 additions & 345 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,358 +17,13 @@
<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>

<groupId>io.asyncer</groupId>
<artifactId>r2dbc-mysql-parent</artifactId>
<version>1.1.2-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Reactive Relational Database Connectivity - MySQL</name>
<url>https://github.com/asyncer-io/r2dbc-mysql</url>
<modules>
<module>r2dbc-mysql</module>
<module>test-native-image</module>
</modules>
<description>R2DBC MySQL Implementation</description>

<licenses>
<license>
<name>The Apache License, Version 2.0</name>
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>

<organization>
<name>asyncer.io</name>
<url>https://github.com/asyncer-io/r2dbc-mysql</url>
</organization>

<developers>
<developer>
<id>jchrys</id>
<name>jchrys</name>
<email>[email protected]</email>
<roles>
<role>Project Lead</role>
</roles>
</developer>
</developers>

<inceptionYear>2018</inceptionYear>
<scm>
<connection>scm:git:git://github.com/asyncer-io/r2dbc-mysql.git</connection>
<developerConnection>scm:git:ssh://[email protected]/asyncer-io/r2dbc-mysql.git</developerConnection>
<url>https://github.com/asyncer-io/r2dbc-mysql</url>
<tag>HEAD</tag>
</scm>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<maven.surefire.skip>false</maven.surefire.skip>
<skipNativeImage>true</skipNativeImage>

<r2dbc-spi.version>1.0.0.RELEASE</r2dbc-spi.version>
<reactor.version>2022.0.9</reactor.version>
<assertj.version>3.24.2</assertj.version>
<jmh.version>1.37</jmh.version>
<junit.version>5.10.1</junit.version>
<logback.version>1.4.14</logback.version>
<mockito.version>4.11.0</mockito.version>
<mysql.version>8.2.0</mysql.version>
<testcontainers.version>1.19.3</testcontainers.version>
<hikari-cp.version>4.0.3</hikari-cp.version>
<spring-framework.version>5.3.31</spring-framework.version>
<jackson.version>2.16.0</jackson.version>
<mbr.version>0.3.0.RELEASE</mbr.version>
<jsr305.version>3.0.2</jsr305.version>
<zstd-jni.version>1.5.5-11</zstd-jni.version>
<java-annotations.version>24.1.0</java-annotations.version>
<bouncy-castle.version>1.77</bouncy-castle.version>
<graalvm.version>21.2.0</graalvm.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-bom</artifactId>
<version>${reactor.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>${junit.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers-bom</artifactId>
<version>${testcontainers.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>${jackson.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>${java-annotations.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk18on</artifactId>
<version>${bouncy-castle.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<compilerArgs>
<arg>-Xlint:all</arg>
<arg>-Xlint:-options</arg>
<arg>-Xlint:-processing</arg>
<arg>-Xlint:-serial</arg>
</compilerArgs>
<showWarnings>true</showWarnings>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version>
<configuration>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
</manifest>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.6.3</version>
<configuration>
<excludePackageNames>
io.asyncer.r2dbc.mysql.authentication,io.asyncer.r2dbc.mysql.client,io.asyncer.r2dbc.mysql.util,io.asyncer.r2dbc.mysql.codec.lob,io.asyncer.r2dbc.mysql.message
</excludePackageNames>
<links>
<link>https://r2dbc.io/spec/${r2dbc-spi.version}/api/</link>
<link>https://projectreactor.io/docs/core/release/api/</link>
<link>https://www.reactive-streams.org/reactive-streams-1.0.3-javadoc/</link>
</links>
<locale>en_US</locale>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.3.0</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.3</version>
<configuration>
<runOrder>random</runOrder>
<includes>
<include>**/*Test.java</include>
</includes>
<excludes>
<exclude>**/*TestKit.java</exclude>
<exclude>**/*IntegrationTest.java</exclude>
</excludes>
<skip>${maven.surefire.skip}</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.2.3</version>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
<configuration>
<runOrder>random</runOrder>
<includes>
<include>**/*TestKit.java</include>
<include>**/*IntegrationTest.java</include>
</includes>
</configuration>
</plugin>
</plugins>
<resources>
<resource>
<directory>${project.basedir}</directory>
<includes>
<include>LICENSE</include>
</includes>
<targetPath>META-INF</targetPath>
</resource>
<resource>
<directory>${project.basedir}/src/main/resources</directory>
</resource>
</resources>
</build>

<profiles>
<profile>
<id>graalvm</id>
<activation>
<file>
<exists>${java.home}/bin/gu</exists>
</file>
</activation>
<properties>
<skipNativeImage>false</skipNativeImage>
</properties>
</profile>
<profile>
<id>jmh</id>
<dependencies>
<dependency>
<groupId>com.github.mp911de.microbenchmark-runner</groupId>
<artifactId>microbenchmark-runner-junit5</artifactId>
<version>${mbr.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-core</artifactId>
<version>${jmh.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-generator-annprocess</artifactId>
<version>${jmh.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.5.0</version>
<executions>
<execution>
<id>add-source</id>
<phase>generate-sources</phase>
<goals>
<goal>add-test-source</goal>
</goals>
<configuration>
<sources>
<source>src/jmh/java</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.1.1</version>
<executions>
<execution>
<id>run-benchmarks</id>
<phase>pre-integration-test</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<classpathScope>test</classpathScope>
<executable>java</executable>
<arguments>
<argument>-classpath</argument>
<classpath />
<argument>org.openjdk.jmh.Main</argument>
<argument>.*</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<repositories>
<repository>
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
</repositories>

<distributionManagement>
<repository>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
<id>ossrh-snapshots</id>
<name>Sonatype Nexus Snapshots</name>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
</repository>
</distributionManagement>
</project>
Loading
Loading