Skip to content

Commit a5eb9a8

Browse files
mirromutthmirromutth
committed
Correct workflows and pom files
1 parent 436ddad commit a5eb9a8

File tree

5 files changed

+389
-359
lines changed

5 files changed

+389
-359
lines changed

‎.github/workflows/cd-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949

5050
- name: Run release prepare command
5151
run: |
52-
./mvnw -B -ntp --file pom.xml release:prepare -DpreparationGoals=clean -DskipTests=true
52+
./mvnw -B -ntp -pl r2dbc-mysql release:prepare -DpreparationGoals=clean -DskipTests=true
5353
./mvnw -B -ntp clean
5454
5555
- name: Ensure Prepared

‎.github/workflows/ci-graalvm-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@ jobs:
5050
echo "JAVA_HOME=$JAVA_HOME"
5151
echo "./mvnw -Pgraalvm package"
5252
./mvnw -Pgraalvm package
53-
./test-native-image/target/test-native-image -Dtest.mysql.password=r2dbc-password!@
53+
./test-native-image/target/test-native-image -Dtest.mysql.password=r2dbc-password!@

‎pom.xml‎

Lines changed: 0 additions & 345 deletions
Original file line numberDiff line numberDiff line change
@@ -17,358 +17,13 @@
1717
<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">
1818

1919
<modelVersion>4.0.0</modelVersion>
20-
2120
<groupId>io.asyncer</groupId>
2221
<artifactId>r2dbc-mysql-parent</artifactId>
2322
<version>1.1.2-SNAPSHOT</version>
2423
<packaging>pom</packaging>
2524

26-
<name>Reactive Relational Database Connectivity - MySQL</name>
27-
<url>https://github.com/asyncer-io/r2dbc-mysql</url>
2825
<modules>
2926
<module>r2dbc-mysql</module>
3027
<module>test-native-image</module>
3128
</modules>
32-
<description>R2DBC MySQL Implementation</description>
33-
34-
<licenses>
35-
<license>
36-
<name>The Apache License, Version 2.0</name>
37-
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
38-
</license>
39-
</licenses>
40-
41-
<organization>
42-
<name>asyncer.io</name>
43-
<url>https://github.com/asyncer-io/r2dbc-mysql</url>
44-
</organization>
45-
46-
<developers>
47-
<developer>
48-
<id>jchrys</id>
49-
<name>jchrys</name>
50-
<email>jchrys@me.com</email>
51-
<roles>
52-
<role>Project Lead</role>
53-
</roles>
54-
</developer>
55-
</developers>
56-
57-
<inceptionYear>2018</inceptionYear>
58-
<scm>
59-
<connection>scm:git:git://github.com/asyncer-io/r2dbc-mysql.git</connection>
60-
<developerConnection>scm:git:ssh://git@github.com/asyncer-io/r2dbc-mysql.git</developerConnection>
61-
<url>https://github.com/asyncer-io/r2dbc-mysql</url>
62-
<tag>HEAD</tag>
63-
</scm>
64-
65-
<properties>
66-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
67-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
68-
<java.version>1.8</java.version>
69-
<maven.surefire.skip>false</maven.surefire.skip>
70-
<skipNativeImage>true</skipNativeImage>
71-
72-
<r2dbc-spi.version>1.0.0.RELEASE</r2dbc-spi.version>
73-
<reactor.version>2022.0.9</reactor.version>
74-
<assertj.version>3.24.2</assertj.version>
75-
<jmh.version>1.37</jmh.version>
76-
<junit.version>5.10.1</junit.version>
77-
<logback.version>1.4.14</logback.version>
78-
<mockito.version>4.11.0</mockito.version>
79-
<mysql.version>8.2.0</mysql.version>
80-
<testcontainers.version>1.19.3</testcontainers.version>
81-
<hikari-cp.version>4.0.3</hikari-cp.version>
82-
<spring-framework.version>5.3.31</spring-framework.version>
83-
<jackson.version>2.16.0</jackson.version>
84-
<mbr.version>0.3.0.RELEASE</mbr.version>
85-
<jsr305.version>3.0.2</jsr305.version>
86-
<zstd-jni.version>1.5.5-11</zstd-jni.version>
87-
<java-annotations.version>24.1.0</java-annotations.version>
88-
<bouncy-castle.version>1.77</bouncy-castle.version>
89-
<graalvm.version>21.2.0</graalvm.version>
90-
</properties>
91-
92-
<dependencyManagement>
93-
<dependencies>
94-
<dependency>
95-
<groupId>io.projectreactor</groupId>
96-
<artifactId>reactor-bom</artifactId>
97-
<version>${reactor.version}</version>
98-
<type>pom</type>
99-
<scope>import</scope>
100-
</dependency>
101-
<dependency>
102-
<groupId>org.junit</groupId>
103-
<artifactId>junit-bom</artifactId>
104-
<version>${junit.version}</version>
105-
<type>pom</type>
106-
<scope>import</scope>
107-
</dependency>
108-
<dependency>
109-
<groupId>org.testcontainers</groupId>
110-
<artifactId>testcontainers-bom</artifactId>
111-
<version>${testcontainers.version}</version>
112-
<type>pom</type>
113-
<scope>import</scope>
114-
</dependency>
115-
<dependency>
116-
<groupId>com.fasterxml.jackson</groupId>
117-
<artifactId>jackson-bom</artifactId>
118-
<version>${jackson.version}</version>
119-
<type>pom</type>
120-
<scope>import</scope>
121-
</dependency>
122-
<dependency>
123-
<groupId>org.jetbrains</groupId>
124-
<artifactId>annotations</artifactId>
125-
<version>${java-annotations.version}</version>
126-
<scope>provided</scope>
127-
</dependency>
128-
<dependency>
129-
<groupId>org.bouncycastle</groupId>
130-
<artifactId>bcpkix-jdk18on</artifactId>
131-
<version>${bouncy-castle.version}</version>
132-
<scope>test</scope>
133-
</dependency>
134-
</dependencies>
135-
</dependencyManagement>
136-
137-
<build>
138-
<plugins>
139-
<plugin>
140-
<groupId>org.apache.maven.plugins</groupId>
141-
<artifactId>maven-compiler-plugin</artifactId>
142-
<version>3.11.0</version>
143-
<configuration>
144-
<compilerArgs>
145-
<arg>-Xlint:all</arg>
146-
<arg>-Xlint:-options</arg>
147-
<arg>-Xlint:-processing</arg>
148-
<arg>-Xlint:-serial</arg>
149-
</compilerArgs>
150-
<showWarnings>true</showWarnings>
151-
<source>${java.version}</source>
152-
<target>${java.version}</target>
153-
</configuration>
154-
</plugin>
155-
<plugin>
156-
<groupId>org.apache.maven.plugins</groupId>
157-
<artifactId>maven-jar-plugin</artifactId>
158-
<version>3.3.0</version>
159-
<configuration>
160-
<archive>
161-
<manifest>
162-
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
163-
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
164-
</manifest>
165-
</archive>
166-
</configuration>
167-
</plugin>
168-
<plugin>
169-
<groupId>org.apache.maven.plugins</groupId>
170-
<artifactId>maven-javadoc-plugin</artifactId>
171-
<version>3.6.3</version>
172-
<configuration>
173-
<excludePackageNames>
174-
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
175-
</excludePackageNames>
176-
<links>
177-
<link>https://r2dbc.io/spec/${r2dbc-spi.version}/api/</link>
178-
<link>https://projectreactor.io/docs/core/release/api/</link>
179-
<link>https://www.reactive-streams.org/reactive-streams-1.0.3-javadoc/</link>
180-
</links>
181-
<locale>en_US</locale>
182-
</configuration>
183-
<executions>
184-
<execution>
185-
<id>attach-javadocs</id>
186-
<goals>
187-
<goal>jar</goal>
188-
</goals>
189-
</execution>
190-
</executions>
191-
</plugin>
192-
<plugin>
193-
<groupId>org.apache.maven.plugins</groupId>
194-
<artifactId>maven-source-plugin</artifactId>
195-
<version>3.3.0</version>
196-
<executions>
197-
<execution>
198-
<id>attach-javadocs</id>
199-
<goals>
200-
<goal>jar</goal>
201-
</goals>
202-
</execution>
203-
</executions>
204-
</plugin>
205-
<plugin>
206-
<groupId>org.apache.maven.plugins</groupId>
207-
<artifactId>maven-surefire-plugin</artifactId>
208-
<version>3.2.3</version>
209-
<configuration>
210-
<runOrder>random</runOrder>
211-
<includes>
212-
<include>**/*Test.java</include>
213-
</includes>
214-
<excludes>
215-
<exclude>**/*TestKit.java</exclude>
216-
<exclude>**/*IntegrationTest.java</exclude>
217-
</excludes>
218-
<skip>${maven.surefire.skip}</skip>
219-
</configuration>
220-
</plugin>
221-
<plugin>
222-
<groupId>org.apache.maven.plugins</groupId>
223-
<artifactId>maven-failsafe-plugin</artifactId>
224-
<version>3.2.3</version>
225-
<executions>
226-
<execution>
227-
<goals>
228-
<goal>integration-test</goal>
229-
<goal>verify</goal>
230-
</goals>
231-
</execution>
232-
</executions>
233-
<configuration>
234-
<runOrder>random</runOrder>
235-
<includes>
236-
<include>**/*TestKit.java</include>
237-
<include>**/*IntegrationTest.java</include>
238-
</includes>
239-
</configuration>
240-
</plugin>
241-
</plugins>
242-
<resources>
243-
<resource>
244-
<directory>${project.basedir}</directory>
245-
<includes>
246-
<include>LICENSE</include>
247-
</includes>
248-
<targetPath>META-INF</targetPath>
249-
</resource>
250-
<resource>
251-
<directory>${project.basedir}/src/main/resources</directory>
252-
</resource>
253-
</resources>
254-
</build>
255-
256-
<profiles>
257-
<profile>
258-
<id>graalvm</id>
259-
<activation>
260-
<file>
261-
<exists>${java.home}/bin/gu</exists>
262-
</file>
263-
</activation>
264-
<properties>
265-
<skipNativeImage>false</skipNativeImage>
266-
</properties>
267-
</profile>
268-
<profile>
269-
<id>jmh</id>
270-
<dependencies>
271-
<dependency>
272-
<groupId>com.github.mp911de.microbenchmark-runner</groupId>
273-
<artifactId>microbenchmark-runner-junit5</artifactId>
274-
<version>${mbr.version}</version>
275-
<scope>test</scope>
276-
</dependency>
277-
<dependency>
278-
<groupId>org.openjdk.jmh</groupId>
279-
<artifactId>jmh-core</artifactId>
280-
<version>${jmh.version}</version>
281-
<scope>test</scope>
282-
</dependency>
283-
<dependency>
284-
<groupId>org.openjdk.jmh</groupId>
285-
<artifactId>jmh-generator-annprocess</artifactId>
286-
<version>${jmh.version}</version>
287-
<scope>test</scope>
288-
</dependency>
289-
</dependencies>
290-
<build>
291-
<plugins>
292-
<plugin>
293-
<groupId>org.codehaus.mojo</groupId>
294-
<artifactId>build-helper-maven-plugin</artifactId>
295-
<version>3.5.0</version>
296-
<executions>
297-
<execution>
298-
<id>add-source</id>
299-
<phase>generate-sources</phase>
300-
<goals>
301-
<goal>add-test-source</goal>
302-
</goals>
303-
<configuration>
304-
<sources>
305-
<source>src/jmh/java</source>
306-
</sources>
307-
</configuration>
308-
</execution>
309-
</executions>
310-
</plugin>
311-
<plugin>
312-
<groupId>org.apache.maven.plugins</groupId>
313-
<artifactId>maven-surefire-plugin</artifactId>
314-
<configuration>
315-
<skip>true</skip>
316-
</configuration>
317-
</plugin>
318-
<plugin>
319-
<groupId>org.apache.maven.plugins</groupId>
320-
<artifactId>maven-failsafe-plugin</artifactId>
321-
<configuration>
322-
<skip>true</skip>
323-
</configuration>
324-
</plugin>
325-
<plugin>
326-
<groupId>org.codehaus.mojo</groupId>
327-
<artifactId>exec-maven-plugin</artifactId>
328-
<version>3.1.1</version>
329-
<executions>
330-
<execution>
331-
<id>run-benchmarks</id>
332-
<phase>pre-integration-test</phase>
333-
<goals>
334-
<goal>exec</goal>
335-
</goals>
336-
<configuration>
337-
<classpathScope>test</classpathScope>
338-
<executable>java</executable>
339-
<arguments>
340-
<argument>-classpath</argument>
341-
<classpath />
342-
<argument>org.openjdk.jmh.Main</argument>
343-
<argument>.*</argument>
344-
</arguments>
345-
</configuration>
346-
</execution>
347-
</executions>
348-
</plugin>
349-
</plugins>
350-
</build>
351-
</profile>
352-
</profiles>
353-
354-
<repositories>
355-
<repository>
356-
<id>jitpack.io</id>
357-
<url>https://jitpack.io</url>
358-
</repository>
359-
</repositories>
360-
361-
<distributionManagement>
362-
<repository>
363-
<releases>
364-
<enabled>false</enabled>
365-
</releases>
366-
<snapshots>
367-
<enabled>true</enabled>
368-
</snapshots>
369-
<id>ossrh-snapshots</id>
370-
<name>Sonatype Nexus Snapshots</name>
371-
<url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
372-
</repository>
373-
</distributionManagement>
37429
</project>

0 commit comments

Comments
 (0)