Skip to content

Commit

Permalink
Update to vertx5-parent
Browse files Browse the repository at this point in the history
  • Loading branch information
@vietj
vietj committed Jun 16, 2024
1 parent 149f091 commit 4498779
Show file tree
Hide file tree
Showing 38 changed files with 21 additions and 3,357 deletions.
157 changes: 21 additions & 136 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,14 @@
~
~ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
~
--><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">
-->
<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-parent</artifactId>
<version>19</version>
<artifactId>vertx5-parent</artifactId>
<version>2</version>
</parent>

<artifactId>vertx-core</artifactId>
Expand Down Expand Up @@ -53,7 +54,6 @@
<vertx.testNativeTransport>false</vertx.testNativeTransport>
<vertx.testDomainSockets>false</vertx.testDomainSockets>
<jar.manifest>${project.basedir}/src/main/resources/META-INF/MANIFEST.MF</jar.manifest>
<maven.compiler.release>11</maven.compiler.release>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -219,6 +219,22 @@
<pluginManagement>
<plugins>

<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
<id>default-compile</id>
<phase>compile</phase>
<configuration>
<annotationProcessors>
<annotationProcessor>io.vertx.codegen.CodeGenProcessor</annotationProcessor>
<annotationProcessor>io.vertx.docgen.JavaDocGenProcessor</annotationProcessor>
</annotationProcessors>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand Down Expand Up @@ -256,66 +272,6 @@
</configuration>
</plugin>

<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<reportOutputDirectory>${project.build.directory}/docs</reportOutputDirectory>
</configuration>
</plugin>

<plugin>
<artifactId>maven-clean-plugin</artifactId>
<executions>
<execution>
<id>default-clean</id>
<configuration>
<filesets>
<fileset>
<directory>${generated.dir}</directory>
</fileset>
</filesets>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<configuration>
<excludes>
<exclude>docoverride/**</exclude>
</excludes>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<id>default-jar</id>
<configuration>
<excludes>
<exclude>/docoverride/**</exclude>
<exclude>/examples/**</exclude>
<exclude>META-INF/native-image/**</exclude>
</excludes>
</configuration>
</execution>
<execution>
<id>native-image-jar</id>
<configuration>
<excludes>
<exclude>/docoverride/**</exclude>
<exclude>/examples/**</exclude>
</excludes>
<classifier>native-image</classifier>
</configuration>
</execution>
</executions>
</plugin>

</plugins>
</pluginManagement>
<plugins>
Expand Down Expand Up @@ -360,59 +316,11 @@
</executions>
</plugin>

<plugin>
<groupId>org.bsc.maven</groupId>
<artifactId>maven-processor-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<systemProperties>
<java.util.logging.SimpleFormatter.format>%4$s: %3$s - %5$s %6$s%n</java.util.logging.SimpleFormatter.format>
</systemProperties>
</configuration>
<executions>
<execution>
<id>generate-sources</id>
<goals>
<goal>process</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<processors>
<processor>io.vertx.codegen.CodeGenProcessor</processor>
<processor>io.vertx.docgen.JavaDocGenProcessor</processor>
</processors>
<optionMap>
<codegen.output>${project.basedir}/src/main</codegen.output>
<codegen.output.data_object_converters>generated</codegen.output.data_object_converters>
<docgen.source>${asciidoc.dir}</docgen.source>
<docgen.output>${project.build.directory}/asciidoc/java</docgen.output>
<maven.groupId>${project.groupId}</maven.groupId>
<maven.artifactId>${project.artifactId}</maven.artifactId>
<maven.version>${project.version}</maven.version>
</optionMap>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>add-source</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>${generated.dir}</source>
<source>${asciidoc.dir}</source>
</sources>
</configuration>
</execution>
<execution>
<id>add-test-source</id>
<phase>generate-test-sources</phase>
Expand Down Expand Up @@ -775,17 +683,10 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>assemble-docs</id>
<phase>package</phase>
<id>package-docs</id>
<goals>
<goal>single</goal>
</goals>
<configuration>
<attach>true</attach>
<descriptors>
<descriptor>src/main/assembly/docs.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
Expand All @@ -810,22 +711,6 @@
</build>

<profiles>
<profile>
<id>coverage</id>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>-Xmx1200M</argLine>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</profile>

<!-- Run tests with native transport -->
<profile>
Expand Down
15 changes: 0 additions & 15 deletions src/main/assembly/docs.xml
View file

This file was deleted.

87 changes: 0 additions & 87 deletions src/main/generated/io/vertx/core/DeploymentOptionsConverter.java
View file

This file was deleted.

0 comments on commit 4498779

Please sign in to comment.