Skip to content

Commit d52681a

Browse files
vietjvietj
committed
Update to the vertx5-parent pom.
1 parent aaf7273 commit d52681a

File tree

9 files changed

+70
-361
lines changed

9 files changed

+70
-361
lines changed

‎assembly/sources.xml‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎pom.xml‎

Lines changed: 45 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
<parent>
2222
<groupId>io.vertx</groupId>
23-
<artifactId>vertx-ext-parent</artifactId>
24-
<version>38</version>
23+
<artifactId>vertx5-parent</artifactId>
24+
<version>3</version>
2525
</parent>
2626

2727
<artifactId>vertx-sql-client-parent</artifactId>
@@ -48,18 +48,14 @@
4848

4949
<properties>
5050
<stack.version>5.0.0-SNAPSHOT</stack.version>
51-
<doc.skip>true</doc.skip>
5251
<jmh.version>1.19</jmh.version>
53-
<docs.dir>${project.basedir}/src/main/docs</docs.dir>
54-
<generated.dir>${project.basedir}/src/main/generated</generated.dir>
5552
<connection.uri/>
5653
<tls.connection.uri/>
5754
<unix.socket.directory/>
5855
<unix.socket.port/>
5956
<jar.manifest>${project.basedir}/src/main/resources/META-INF/MANIFEST.MF</jar.manifest>
60-
<!-- We skip sources jar generation as we do it with the assembly plugin to have greater control over the content -->
61-
<source.skip>true</source.skip>
6257
<testcontainers.version>1.17.6</testcontainers.version>
58+
<docgen.source>${project.basedir}/../vertx-sql-client/src/main/asciidoc/*.adoc,${asciidoc.dir}/*.adoc</docgen.source>
6359
</properties>
6460

6561
<dependencyManagement>
@@ -114,6 +110,48 @@
114110
</dependency>
115111
</dependencies>
116112

113+
<build>
114+
<pluginManagement>
115+
<plugins>
116+
<plugin>
117+
<artifactId>maven-compiler-plugin</artifactId>
118+
<executions>
119+
<execution>
120+
<id>default-compile</id>
121+
<configuration>
122+
<annotationProcessors>
123+
<annotationProcessor>io.vertx.codegen.CodeGenProcessor</annotationProcessor>
124+
<annotationProcessor>io.vertx.docgen.JavaDocGenProcessor</annotationProcessor>
125+
</annotationProcessors>
126+
<compilerArgs>
127+
<!-- Configure the docgen processor -->
128+
<compilerArg>-Adocgen.source=${docgen.source}</compilerArg>
129+
<compilerArg>-Adocgen.output=${project.build.directory}/asciidoc/java</compilerArg>
130+
<compilerArg>-Amaven.groupId=${project.groupId}</compilerArg>
131+
<compilerArg>-Amaven.artifactId=${project.artifactId}</compilerArg>
132+
<compilerArg>-Amaven.version=${project.version}</compilerArg>
133+
</compilerArgs>
134+
</configuration>
135+
</execution>
136+
</executions>
137+
</plugin>
138+
</plugins>
139+
</pluginManagement>
140+
<plugins>
141+
<plugin>
142+
<artifactId>maven-assembly-plugin</artifactId>
143+
<executions>
144+
<execution>
145+
<id>package-docs</id>
146+
<goals>
147+
<goal>single</goal>
148+
</goals>
149+
</execution>
150+
</executions>
151+
</plugin>
152+
</plugins>
153+
</build>
154+
117155
<profiles>
118156
<profile>
119157
<id>default</id>

‎vertx-db2-client/pom.xml‎

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,6 @@
3131
<url>https://github.com/eclipse-vertx/vertx-sql-client</url>
3232
<description>The Reactive DB2 client</description>
3333

34-
<properties>
35-
<doc.skip>false</doc.skip>
36-
<docs.dir>${project.basedir}/src/main/docs</docs.dir>
37-
</properties>
38-
39-
4034
<dependencies>
4135

4236
<!-- Vert.x dependencies -->
@@ -110,6 +104,7 @@
110104
</plugins>
111105
</pluginManagement>
112106
<plugins>
107+
<!--
113108
<plugin>
114109
<groupId>org.bsc.maven</groupId>
115110
<artifactId>maven-processor-plugin</artifactId>
@@ -124,24 +119,7 @@
124119
</execution>
125120
</executions>
126121
</plugin>
127-
<plugin>
128-
<artifactId>maven-assembly-plugin</artifactId>
129-
<executions>
130-
<!-- Override sources to use custom descriptor to have all adoc files -->
131-
<execution>
132-
<id>package-sources</id>
133-
<configuration>
134-
<descriptors>
135-
<descriptor>${project.basedir}/../assembly/sources.xml</descriptor>
136-
</descriptors>
137-
<descriptorRefs>
138-
<descriptorRef>none</descriptorRef>
139-
</descriptorRefs>
140-
<ignoreMissingDescriptor>true</ignoreMissingDescriptor>
141-
</configuration>
142-
</execution>
143-
</executions>
144-
</plugin>
122+
-->
145123
</plugins>
146124
</build>
147125

‎vertx-mssql-client/pom.xml‎

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@
1616
<url>https://github.com/eclipse-vertx/vertx-sql-client</url>
1717
<description>The Reactive MSSQL Client</description>
1818

19-
<properties>
20-
<doc.skip>false</doc.skip>
21-
<docs.dir>${project.basedir}/src/main/docs</docs.dir>
22-
<generated.dir>${project.basedir}/src/main/generated</generated.dir>
23-
</properties>
24-
2519
<dependencies>
2620

2721
<!-- Vert.x dependencies -->
@@ -61,46 +55,4 @@
6155

6256
</dependencies>
6357

64-
<build>
65-
<plugins>
66-
<plugin>
67-
<groupId>org.bsc.maven</groupId>
68-
<artifactId>maven-processor-plugin</artifactId>
69-
<executions>
70-
<execution>
71-
<id>generate-sources</id>
72-
<configuration>
73-
<optionMap>
74-
<docgen.source>${project.basedir}/../vertx-sql-client/src/main/asciidoc/*.adoc,${asciidoc.dir}/*.adoc</docgen.source>
75-
</optionMap>
76-
</configuration>
77-
</execution>
78-
</executions>
79-
</plugin>
80-
<plugin>
81-
<artifactId>maven-assembly-plugin</artifactId>
82-
<executions>
83-
<!-- Override sources to use custom descriptor to have all adoc files -->
84-
<execution>
85-
<id>package-sources</id>
86-
<configuration>
87-
<descriptors>
88-
<descriptor>${project.basedir}/../assembly/sources.xml</descriptor>
89-
</descriptors>
90-
<descriptorRefs>
91-
<descriptorRef>none</descriptorRef>
92-
</descriptorRefs>
93-
<ignoreMissingDescriptor>true</ignoreMissingDescriptor>
94-
</configuration>
95-
</execution>
96-
</executions>
97-
</plugin>
98-
</plugins>
99-
</build>
100-
101-
<profiles>
102-
103-
</profiles>
104-
105-
10658
</project>

‎vertx-mysql-client/pom.xml‎

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,6 @@
3131
<url>https://github.com/eclipse-vertx/vertx-sql-client</url>
3232
<description>The Reactive MySQL Client</description>
3333

34-
<properties>
35-
<doc.skip>false</doc.skip>
36-
<docs.dir>${project.basedir}/src/main/docs</docs.dir>
37-
<generated.dir>${project.basedir}/src/main/generated</generated.dir>
38-
</properties>
39-
40-
4134
<dependencies>
4235

4336
<!-- Vert.x dependencies -->
@@ -94,40 +87,6 @@
9487
</plugin>
9588
</plugins>
9689
</pluginManagement>
97-
<plugins>
98-
<plugin>
99-
<groupId>org.bsc.maven</groupId>
100-
<artifactId>maven-processor-plugin</artifactId>
101-
<executions>
102-
<execution>
103-
<id>generate-sources</id>
104-
<configuration>
105-
<optionMap>
106-
<docgen.source>${project.basedir}/../vertx-sql-client/src/main/asciidoc/*.adoc,${asciidoc.dir}/*.adoc</docgen.source>
107-
</optionMap>
108-
</configuration>
109-
</execution>
110-
</executions>
111-
</plugin>
112-
<plugin>
113-
<artifactId>maven-assembly-plugin</artifactId>
114-
<executions>
115-
<!-- Override sources to use custom descriptor to have all adoc files -->
116-
<execution>
117-
<id>package-sources</id>
118-
<configuration>
119-
<descriptors>
120-
<descriptor>${project.basedir}/../assembly/sources.xml</descriptor>
121-
</descriptors>
122-
<descriptorRefs>
123-
<descriptorRef>none</descriptorRef>
124-
</descriptorRefs>
125-
<ignoreMissingDescriptor>true</ignoreMissingDescriptor>
126-
</configuration>
127-
</execution>
128-
</executions>
129-
</plugin>
130-
</plugins>
13190
</build>
13291

13392
<profiles>

0 commit comments

Comments
 (0)