Skip to content

Commit

Permalink
Merge pull request #42469 from gsmet/adjust-extension-template-config…
Browse files Browse the repository at this point in the history 
…-doc

Adjust extension templates for new config doc setup
  • Loading branch information
@gastaldi
gastaldi authored Aug 11, 2024
2 parents 17f09ee + e5ba406 commit 043cfa2
Show file tree
Hide file tree
Showing 8 changed files with 96 additions and 56 deletions.
32 changes: 18 additions & 14 deletions ...sources/codestarts/quarkus-extension/code/extension-base/java/deployment/pom.tpl.qute.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,25 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<annotationProcessorPaths>
<path>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-extension-processor</artifactId>
{#if quarkus.version}
<version>$\{quarkus.version}</version>
{#else}
<version>$\{project.version}</version>
{/if}
</path>
</annotationProcessorPaths>
</configuration>
<executions>
<execution>
<id>default-compile</id>
<configuration>
<annotationProcessorPaths>
<path>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-extension-processor</artifactId>
{#if quarkus.version}
<version>$\{quarkus.version}</version>
{#else}
<version>$\{project.version}</version>
{/if}
</path>
</annotationProcessorPaths>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
Expand Down
32 changes: 18 additions & 14 deletions .../resources/codestarts/quarkus-extension/code/extension-base/java/runtime/pom.tpl.qute.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,21 +50,25 @@
{/if}
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<annotationProcessorPaths>
<path>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-extension-processor</artifactId>
{#if quarkus.version}
<version>$\{quarkus.version}</version>
{#else}
<version>$\{project.version}</version>
{/if}
</path>
</annotationProcessorPaths>
</configuration>
<executions>
<execution>
<id>default-compile</id>
<configuration>
<annotationProcessorPaths>
<path>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-extension-processor</artifactId>
{#if quarkus.version}
<version>$\{quarkus.version}</version>
{#else}
<version>$\{project.version}</version>
{/if}
</path>
</annotationProcessorPaths>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
Expand Down
13 changes: 8 additions & 5 deletions ...c/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/docs/pom.tpl.qute.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,14 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-config-doc-maven-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<targetDirectory>$\{project.basedir}/modules/ROOT/pages/includes/</targetDirectory>
</configuration>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
Expand All @@ -67,11 +75,6 @@
<configuration>
<outputDirectory>$\{project.basedir}/modules/ROOT/pages/includes/</outputDirectory>
<resources>
<resource>
<directory>$\{project.basedir}/../target/asciidoc/generated/config/</directory>
<include>{namespace.id}{extension.id}.adoc</include>
<filtering>false</filtering>
</resource>
<resource>
<directory>$\{project.basedir}/templates/includes</directory>
<include>attributes.adoc</include>
Expand Down
11 changes: 11 additions & 0 deletions ...ts/src/main/resources/codestarts/quarkus-extension/code/quarkiverse/java/pom.tpl.qute.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,17 @@
<developerConnection>scm:git:[email protected]:quarkiverse/quarkus-{extension.id}.git</developerConnection>
<url>https://github.com/quarkiverse/quarkus-{extension.id}</url>
</scm>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-config-doc-maven-plugin</artifactId>
<version>$\{quarkus.version}</version>
</plugin>
</plugins>
</pluginManagement>
</build>
<profiles>
<profile>
<id>it</id>
Expand Down
13 changes: 8 additions & 5 deletions ...ateExtensionMojoIT/testCreateQuarkiverseExtension/quarkus-my-quarkiverse-ext_docs_pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,14 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-config-doc-maven-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<targetDirectory>${project.basedir}/modules/ROOT/pages/includes/</targetDirectory>
</configuration>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
Expand All @@ -65,11 +73,6 @@
<configuration>
<outputDirectory>${project.basedir}/modules/ROOT/pages/includes/</outputDirectory>
<resources>
<resource>
<directory>${project.basedir}/../target/asciidoc/generated/config/</directory>
<include>quarkus-my-quarkiverse-ext.adoc</include>
<filtering>false</filtering>
</resource>
<resource>
<directory>${project.basedir}/templates/includes</directory>
<include>attributes.adoc</include>
Expand Down
5 changes: 5 additions & 0 deletions ..._/CreateExtensionMojoIT/testCreateQuarkiverseExtension/quarkus-my-quarkiverse-ext_pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@
<parameters>true</parameters>
</configuration>
</plugin>
<plugin>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-config-doc-maven-plugin</artifactId>
<version>${quarkus.version}</version>
</plugin>
</plugins>
</pluginManagement>
</build>
Expand Down
23 changes: 14 additions & 9 deletions ...ExtensionMojoIT/testCreateQuarkiverseExtension/quarkus-my-quarkiverse-ext_runtime_pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,20 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<annotationProcessorPaths>
<path>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-extension-processor</artifactId>
<version>${quarkus.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
<executions>
<execution>
<id>default-compile</id>
<configuration>
<annotationProcessorPaths>
<path>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-extension-processor</artifactId>
<version>${quarkus.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
Expand Down
23 changes: 14 additions & 9 deletions ...s__/CreateExtensionMojoIT/testCreateStandaloneExtension/my-org-my-own-ext_runtime_pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,20 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<annotationProcessorPaths>
<path>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-extension-processor</artifactId>
<version>${quarkus.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
<executions>
<execution>
<id>default-compile</id>
<configuration>
<annotationProcessorPaths>
<path>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-extension-processor</artifactId>
<version>${quarkus.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
Expand Down

0 comments on commit 043cfa2

Please sign in to comment.