Workarounding quarkusio/quarkus#36189 not

needed anymore
ppalaga · Sep 28, 2023 · 6e39d65 · 6e39d65
1 parent 0b9c673
commit 6e39d65
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 96 deletions.
diff --git a/docs/modules/ROOT/pages/includes/quarkus-cxf-rt-features-logging.adoc b/docs/modules/ROOT/pages/includes/quarkus-cxf-rt-features-logging.adoc
@@ -1,16 +1,16 @@
 
-:summaryTableId: quarkus-cxf
+:summaryTableId: quarkus-cxf-rt-features-logging
 [.configuration-legend]
 icon:lock[title=Fixed at build time] Configuration property fixed at build time - All other configuration properties are overridable at runtime
 [.configuration-reference.searchable, cols="80,.^10,.^10"]
 |===
 
-h|[[quarkus-cxf_configuration]]link:#quarkus-cxf_configuration[Configuration property]
+h|[[quarkus-cxf-rt-features-logging_configuration]]link:#quarkus-cxf-rt-features-logging_configuration[Configuration property]
 
 h|Type
 h|Default
 
-a| [[quarkus-cxf_quarkus.cxf.client.-clients-.logging.enabled]]`link:#quarkus-cxf_quarkus.cxf.client.-clients-.logging.enabled[quarkus.cxf.client."clients".logging.enabled]`
+a| [[quarkus-cxf-rt-features-logging_quarkus.cxf.client.-clients-.logging.enabled]]`link:#quarkus-cxf-rt-features-logging_quarkus.cxf.client.-clients-.logging.enabled[quarkus.cxf.client."clients".logging.enabled]`
 
 
 [.description]
@@ -27,7 +27,7 @@ endif::add-copy-button-to-env-var[]
 |`false`
 
 
-a| [[quarkus-cxf_quarkus.cxf.client.-clients-.logging.limit]]`link:#quarkus-cxf_quarkus.cxf.client.-clients-.logging.limit[quarkus.cxf.client."clients".logging.limit]`
+a| [[quarkus-cxf-rt-features-logging_quarkus.cxf.client.-clients-.logging.limit]]`link:#quarkus-cxf-rt-features-logging_quarkus.cxf.client.-clients-.logging.limit[quarkus.cxf.client."clients".logging.limit]`
 
 
 [.description]
@@ -44,7 +44,7 @@ endif::add-copy-button-to-env-var[]
 |`49152`
 
 
-a| [[quarkus-cxf_quarkus.cxf.client.-clients-.logging.in-mem-threshold]]`link:#quarkus-cxf_quarkus.cxf.client.-clients-.logging.in-mem-threshold[quarkus.cxf.client."clients".logging.in-mem-threshold]`
+a| [[quarkus-cxf-rt-features-logging_quarkus.cxf.client.-clients-.logging.in-mem-threshold]]`link:#quarkus-cxf-rt-features-logging_quarkus.cxf.client.-clients-.logging.in-mem-threshold[quarkus.cxf.client."clients".logging.in-mem-threshold]`
 
 
 [.description]
@@ -61,7 +61,7 @@ endif::add-copy-button-to-env-var[]
 |`-1`
 
 
-a| [[quarkus-cxf_quarkus.cxf.client.-clients-.logging.pretty]]`link:#quarkus-cxf_quarkus.cxf.client.-clients-.logging.pretty[quarkus.cxf.client."clients".logging.pretty]`
+a| [[quarkus-cxf-rt-features-logging_quarkus.cxf.client.-clients-.logging.pretty]]`link:#quarkus-cxf-rt-features-logging_quarkus.cxf.client.-clients-.logging.pretty[quarkus.cxf.client."clients".logging.pretty]`
 
 
 [.description]
@@ -78,7 +78,7 @@ endif::add-copy-button-to-env-var[]
 |`false`
 
 
-a| [[quarkus-cxf_quarkus.cxf.client.-clients-.logging.log-binary]]`link:#quarkus-cxf_quarkus.cxf.client.-clients-.logging.log-binary[quarkus.cxf.client."clients".logging.log-binary]`
+a| [[quarkus-cxf-rt-features-logging_quarkus.cxf.client.-clients-.logging.log-binary]]`link:#quarkus-cxf-rt-features-logging_quarkus.cxf.client.-clients-.logging.log-binary[quarkus.cxf.client."clients".logging.log-binary]`
 
 
 [.description]
@@ -95,7 +95,7 @@ endif::add-copy-button-to-env-var[]
 |`false`
 
 
-a| [[quarkus-cxf_quarkus.cxf.client.-clients-.logging.log-multipart]]`link:#quarkus-cxf_quarkus.cxf.client.-clients-.logging.log-multipart[quarkus.cxf.client."clients".logging.log-multipart]`
+a| [[quarkus-cxf-rt-features-logging_quarkus.cxf.client.-clients-.logging.log-multipart]]`link:#quarkus-cxf-rt-features-logging_quarkus.cxf.client.-clients-.logging.log-multipart[quarkus.cxf.client."clients".logging.log-multipart]`
 
 
 [.description]
@@ -112,7 +112,7 @@ endif::add-copy-button-to-env-var[]
 |`true`
 
 
-a| [[quarkus-cxf_quarkus.cxf.client.-clients-.logging.verbose]]`link:#quarkus-cxf_quarkus.cxf.client.-clients-.logging.verbose[quarkus.cxf.client."clients".logging.verbose]`
+a| [[quarkus-cxf-rt-features-logging_quarkus.cxf.client.-clients-.logging.verbose]]`link:#quarkus-cxf-rt-features-logging_quarkus.cxf.client.-clients-.logging.verbose[quarkus.cxf.client."clients".logging.verbose]`
 
 
 [.description]
@@ -129,7 +129,7 @@ endif::add-copy-button-to-env-var[]
 |`true`
 
 
-a| [[quarkus-cxf_quarkus.cxf.client.-clients-.logging.in-binary-content-media-types]]`link:#quarkus-cxf_quarkus.cxf.client.-clients-.logging.in-binary-content-media-types[quarkus.cxf.client."clients".logging.in-binary-content-media-types]`
+a| [[quarkus-cxf-rt-features-logging_quarkus.cxf.client.-clients-.logging.in-binary-content-media-types]]`link:#quarkus-cxf-rt-features-logging_quarkus.cxf.client.-clients-.logging.in-binary-content-media-types[quarkus.cxf.client."clients".logging.in-binary-content-media-types]`
 
 
 [.description]
@@ -146,7 +146,7 @@ endif::add-copy-button-to-env-var[]
 |
 
 
-a| [[quarkus-cxf_quarkus.cxf.client.-clients-.logging.out-binary-content-media-types]]`link:#quarkus-cxf_quarkus.cxf.client.-clients-.logging.out-binary-content-media-types[quarkus.cxf.client."clients".logging.out-binary-content-media-types]`
+a| [[quarkus-cxf-rt-features-logging_quarkus.cxf.client.-clients-.logging.out-binary-content-media-types]]`link:#quarkus-cxf-rt-features-logging_quarkus.cxf.client.-clients-.logging.out-binary-content-media-types[quarkus.cxf.client."clients".logging.out-binary-content-media-types]`
 
 
 [.description]
@@ -163,7 +163,7 @@ endif::add-copy-button-to-env-var[]
 |
 
 
-a| [[quarkus-cxf_quarkus.cxf.client.-clients-.logging.binary-content-media-types]]`link:#quarkus-cxf_quarkus.cxf.client.-clients-.logging.binary-content-media-types[quarkus.cxf.client."clients".logging.binary-content-media-types]`
+a| [[quarkus-cxf-rt-features-logging_quarkus.cxf.client.-clients-.logging.binary-content-media-types]]`link:#quarkus-cxf-rt-features-logging_quarkus.cxf.client.-clients-.logging.binary-content-media-types[quarkus.cxf.client."clients".logging.binary-content-media-types]`
 
 
 [.description]
@@ -180,7 +180,7 @@ endif::add-copy-button-to-env-var[]
 |
 
 
-a| [[quarkus-cxf_quarkus.cxf.client.-clients-.logging.sensitive-element-names]]`link:#quarkus-cxf_quarkus.cxf.client.-clients-.logging.sensitive-element-names[quarkus.cxf.client."clients".logging.sensitive-element-names]`
+a| [[quarkus-cxf-rt-features-logging_quarkus.cxf.client.-clients-.logging.sensitive-element-names]]`link:#quarkus-cxf-rt-features-logging_quarkus.cxf.client.-clients-.logging.sensitive-element-names[quarkus.cxf.client."clients".logging.sensitive-element-names]`
 
 
 [.description]
@@ -197,7 +197,7 @@ endif::add-copy-button-to-env-var[]
 |
 
 
-a| [[quarkus-cxf_quarkus.cxf.client.-clients-.logging.sensitive-protocol-header-names]]`link:#quarkus-cxf_quarkus.cxf.client.-clients-.logging.sensitive-protocol-header-names[quarkus.cxf.client."clients".logging.sensitive-protocol-header-names]`
+a| [[quarkus-cxf-rt-features-logging_quarkus.cxf.client.-clients-.logging.sensitive-protocol-header-names]]`link:#quarkus-cxf-rt-features-logging_quarkus.cxf.client.-clients-.logging.sensitive-protocol-header-names[quarkus.cxf.client."clients".logging.sensitive-protocol-header-names]`
 
 
 [.description]
@@ -214,7 +214,7 @@ endif::add-copy-button-to-env-var[]
 |
 
 
-a| [[quarkus-cxf_quarkus.cxf.endpoint.-endpoints-.logging.enabled]]`link:#quarkus-cxf_quarkus.cxf.endpoint.-endpoints-.logging.enabled[quarkus.cxf.endpoint."endpoints".logging.enabled]`
+a| [[quarkus-cxf-rt-features-logging_quarkus.cxf.endpoint.-endpoints-.logging.enabled]]`link:#quarkus-cxf-rt-features-logging_quarkus.cxf.endpoint.-endpoints-.logging.enabled[quarkus.cxf.endpoint."endpoints".logging.enabled]`
 
 
 [.description]
@@ -231,7 +231,7 @@ endif::add-copy-button-to-env-var[]
 |`false`
 
 
-a| [[quarkus-cxf_quarkus.cxf.endpoint.-endpoints-.logging.limit]]`link:#quarkus-cxf_quarkus.cxf.endpoint.-endpoints-.logging.limit[quarkus.cxf.endpoint."endpoints".logging.limit]`
+a| [[quarkus-cxf-rt-features-logging_quarkus.cxf.endpoint.-endpoints-.logging.limit]]`link:#quarkus-cxf-rt-features-logging_quarkus.cxf.endpoint.-endpoints-.logging.limit[quarkus.cxf.endpoint."endpoints".logging.limit]`
 
 
 [.description]
@@ -248,7 +248,7 @@ endif::add-copy-button-to-env-var[]
 |`49152`
 
 
-a| [[quarkus-cxf_quarkus.cxf.endpoint.-endpoints-.logging.in-mem-threshold]]`link:#quarkus-cxf_quarkus.cxf.endpoint.-endpoints-.logging.in-mem-threshold[quarkus.cxf.endpoint."endpoints".logging.in-mem-threshold]`
+a| [[quarkus-cxf-rt-features-logging_quarkus.cxf.endpoint.-endpoints-.logging.in-mem-threshold]]`link:#quarkus-cxf-rt-features-logging_quarkus.cxf.endpoint.-endpoints-.logging.in-mem-threshold[quarkus.cxf.endpoint."endpoints".logging.in-mem-threshold]`
 
 
 [.description]
@@ -265,7 +265,7 @@ endif::add-copy-button-to-env-var[]
 |`-1`
 
 
-a| [[quarkus-cxf_quarkus.cxf.endpoint.-endpoints-.logging.pretty]]`link:#quarkus-cxf_quarkus.cxf.endpoint.-endpoints-.logging.pretty[quarkus.cxf.endpoint."endpoints".logging.pretty]`
+a| [[quarkus-cxf-rt-features-logging_quarkus.cxf.endpoint.-endpoints-.logging.pretty]]`link:#quarkus-cxf-rt-features-logging_quarkus.cxf.endpoint.-endpoints-.logging.pretty[quarkus.cxf.endpoint."endpoints".logging.pretty]`
 
 
 [.description]
@@ -282,7 +282,7 @@ endif::add-copy-button-to-env-var[]
 |`false`
 
 
-a| [[quarkus-cxf_quarkus.cxf.endpoint.-endpoints-.logging.log-binary]]`link:#quarkus-cxf_quarkus.cxf.endpoint.-endpoints-.logging.log-binary[quarkus.cxf.endpoint."endpoints".logging.log-binary]`
+a| [[quarkus-cxf-rt-features-logging_quarkus.cxf.endpoint.-endpoints-.logging.log-binary]]`link:#quarkus-cxf-rt-features-logging_quarkus.cxf.endpoint.-endpoints-.logging.log-binary[quarkus.cxf.endpoint."endpoints".logging.log-binary]`
 
 
 [.description]
@@ -299,7 +299,7 @@ endif::add-copy-button-to-env-var[]
 |`false`
 
 
-a| [[quarkus-cxf_quarkus.cxf.endpoint.-endpoints-.logging.log-multipart]]`link:#quarkus-cxf_quarkus.cxf.endpoint.-endpoints-.logging.log-multipart[quarkus.cxf.endpoint."endpoints".logging.log-multipart]`
+a| [[quarkus-cxf-rt-features-logging_quarkus.cxf.endpoint.-endpoints-.logging.log-multipart]]`link:#quarkus-cxf-rt-features-logging_quarkus.cxf.endpoint.-endpoints-.logging.log-multipart[quarkus.cxf.endpoint."endpoints".logging.log-multipart]`
 
 
 [.description]
@@ -316,7 +316,7 @@ endif::add-copy-button-to-env-var[]
 |`true`
 
 
-a| [[quarkus-cxf_quarkus.cxf.endpoint.-endpoints-.logging.verbose]]`link:#quarkus-cxf_quarkus.cxf.endpoint.-endpoints-.logging.verbose[quarkus.cxf.endpoint."endpoints".logging.verbose]`
+a| [[quarkus-cxf-rt-features-logging_quarkus.cxf.endpoint.-endpoints-.logging.verbose]]`link:#quarkus-cxf-rt-features-logging_quarkus.cxf.endpoint.-endpoints-.logging.verbose[quarkus.cxf.endpoint."endpoints".logging.verbose]`
 
 
 [.description]
@@ -333,7 +333,7 @@ endif::add-copy-button-to-env-var[]
 |`true`
 
 
-a| [[quarkus-cxf_quarkus.cxf.endpoint.-endpoints-.logging.in-binary-content-media-types]]`link:#quarkus-cxf_quarkus.cxf.endpoint.-endpoints-.logging.in-binary-content-media-types[quarkus.cxf.endpoint."endpoints".logging.in-binary-content-media-types]`
+a| [[quarkus-cxf-rt-features-logging_quarkus.cxf.endpoint.-endpoints-.logging.in-binary-content-media-types]]`link:#quarkus-cxf-rt-features-logging_quarkus.cxf.endpoint.-endpoints-.logging.in-binary-content-media-types[quarkus.cxf.endpoint."endpoints".logging.in-binary-content-media-types]`
 
 
 [.description]
@@ -350,7 +350,7 @@ endif::add-copy-button-to-env-var[]
 |
 
 
-a| [[quarkus-cxf_quarkus.cxf.endpoint.-endpoints-.logging.out-binary-content-media-types]]`link:#quarkus-cxf_quarkus.cxf.endpoint.-endpoints-.logging.out-binary-content-media-types[quarkus.cxf.endpoint."endpoints".logging.out-binary-content-media-types]`
+a| [[quarkus-cxf-rt-features-logging_quarkus.cxf.endpoint.-endpoints-.logging.out-binary-content-media-types]]`link:#quarkus-cxf-rt-features-logging_quarkus.cxf.endpoint.-endpoints-.logging.out-binary-content-media-types[quarkus.cxf.endpoint."endpoints".logging.out-binary-content-media-types]`
 
 
 [.description]
@@ -367,7 +367,7 @@ endif::add-copy-button-to-env-var[]
 |
 
 
-a| [[quarkus-cxf_quarkus.cxf.endpoint.-endpoints-.logging.binary-content-media-types]]`link:#quarkus-cxf_quarkus.cxf.endpoint.-endpoints-.logging.binary-content-media-types[quarkus.cxf.endpoint."endpoints".logging.binary-content-media-types]`
+a| [[quarkus-cxf-rt-features-logging_quarkus.cxf.endpoint.-endpoints-.logging.binary-content-media-types]]`link:#quarkus-cxf-rt-features-logging_quarkus.cxf.endpoint.-endpoints-.logging.binary-content-media-types[quarkus.cxf.endpoint."endpoints".logging.binary-content-media-types]`
 
 
 [.description]
@@ -384,7 +384,7 @@ endif::add-copy-button-to-env-var[]
 |
 
 
-a| [[quarkus-cxf_quarkus.cxf.endpoint.-endpoints-.logging.sensitive-element-names]]`link:#quarkus-cxf_quarkus.cxf.endpoint.-endpoints-.logging.sensitive-element-names[quarkus.cxf.endpoint."endpoints".logging.sensitive-element-names]`
+a| [[quarkus-cxf-rt-features-logging_quarkus.cxf.endpoint.-endpoints-.logging.sensitive-element-names]]`link:#quarkus-cxf-rt-features-logging_quarkus.cxf.endpoint.-endpoints-.logging.sensitive-element-names[quarkus.cxf.endpoint."endpoints".logging.sensitive-element-names]`
 
 
 [.description]
@@ -401,7 +401,7 @@ endif::add-copy-button-to-env-var[]
 |
 
 
-a| [[quarkus-cxf_quarkus.cxf.endpoint.-endpoints-.logging.sensitive-protocol-header-names]]`link:#quarkus-cxf_quarkus.cxf.endpoint.-endpoints-.logging.sensitive-protocol-header-names[quarkus.cxf.endpoint."endpoints".logging.sensitive-protocol-header-names]`
+a| [[quarkus-cxf-rt-features-logging_quarkus.cxf.endpoint.-endpoints-.logging.sensitive-protocol-header-names]]`link:#quarkus-cxf-rt-features-logging_quarkus.cxf.endpoint.-endpoints-.logging.sensitive-protocol-header-names[quarkus.cxf.endpoint."endpoints".logging.sensitive-protocol-header-names]`
 
 
 [.description]

diff --git a/extensions/features-logging/runtime/pom.xml b/extensions/features-logging/runtime/pom.xml
@@ -75,34 +75,6 @@
                 <groupId>org.codehaus.gmaven</groupId>
                 <artifactId>groovy-maven-plugin</artifactId>
                 <executions>
-                    <execution>
-                        <id>delete-config-options-docs-before-compilation</id>
-                        <goals>
-                            <goal>execute</goal>
-                        </goals>
-                        <phase>process-resources</phase>
-                        <configuration>
-                            <source>
-                                // Workaround for https://github.com/quarkusio/quarkus/issues/36189
-                                import java.nio.file.Path
-                                import java.nio.file.Paths
-                                import java.nio.file.Files
-                                import java.nio.file.StandardCopyOption
-
-                                // backup the root list dir
-                                final Path rootListDir = Paths.get('${maven.multiModuleProjectDirectory}/target/asciidoc/generated/config/extensions-configuration-roots-list/quarkus-cxf.adoc')
-                                final Path rootListBackUpDir = Paths.get(rootListDir.toString() + '.backup')
-                                if (Files.exists(rootListBackUpDir)) {
-                                    rootListBackUpDir.deleteDir()
-                                }
-                                if (Files.exists(rootListDir)) {
-                                    Files.move(rootListDir, rootListBackUpDir)
-                                }
-
-                                Files.deleteIfExists(java.nio.file.Paths.get('${maven.multiModuleProjectDirectory}/target/asciidoc/generated/config/quarkus-cxf.adoc'))
-                            </source>
-                        </configuration>
-                    </execution>
                     <execution>
                         <id>filter-and-move-config-options-docs</id>
                         <goals>
@@ -111,56 +83,19 @@
                         <phase>process-classes</phase>
                         <configuration>
                             <source>
-                                // Workaround for https://github.com/quarkusio/quarkus/issues/36189
                                 import java.nio.file.Path
                                 import java.nio.file.Paths
                                 import java.nio.file.Files
                                 import java.nio.file.StandardCopyOption
 
-                                final Path inputFile = Paths.get('${maven.multiModuleProjectDirectory}/target/asciidoc/generated/config/quarkus-cxf.adoc')
+                                final Path inputFile = Paths.get('${maven.multiModuleProjectDirectory}/target/asciidoc/generated/config/${project.artifactId}.adoc')
                                 final Path outputFile = Paths.get('${maven.multiModuleProjectDirectory}/docs/modules/ROOT/pages/includes/${project.artifactId}.adoc')
-                                Files.move(inputFile, outputFile, StandardCopyOption.REPLACE_EXISTING)
-
-                                // restore the root list dir
-                                final Path rootListDir = Paths.get('${maven.multiModuleProjectDirectory}/target/asciidoc/generated/config/extensions-configuration-roots-list/quarkus-cxf.adoc')
-                                final Path rootListBackUpDir = Paths.get(rootListDir.toString() + '.backup')
-                                if (Files.exists(rootListDir)) {
-                                    rootListDir.deleteDir()
-                                }
-                                if (Files.exists(rootListBackUpDir)) {
-                                    Files.move(rootListBackUpDir, rootListDir)
-                                }
+                                Files.copy(inputFile, outputFile, StandardCopyOption.REPLACE_EXISTING)
                             </source>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
         </plugins>
     </build>
-    <profiles>
-        <profile>
-            <id>virtualDependencies</id>
-            <activation>
-                <property>
-                    <name>!noVirtualDependencies</name>
-                </property>
-            </activation>
-            <dependencies>
-                <!-- The following dependencies guarantee that this module is built after them. You can update them by running `mvn process-resources -Pformat -N` from the source tree root directory -->
-                <dependency><!-- Workaround for https://github.com/quarkusio/quarkus/issues/36189 -->
-                    <groupId>io.quarkiverse.cxf</groupId>
-                    <artifactId>quarkus-cxf-deployment</artifactId>
-                    <version>${project.version}</version>
-                    <type>pom</type>
-                    <scope>test</scope>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>*</groupId>
-                            <artifactId>*</artifactId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
 </project>
diff --git a/...s-logging/runtime/src/main/java/io/quarkiverse/cxf/features/logging/CxfLoggingConfig.java b/...s-logging/runtime/src/main/java/io/quarkiverse/cxf/features/logging/CxfLoggingConfig.java
@@ -12,10 +12,8 @@
 import io.smallrye.config.WithDefault;
 import io.smallrye.config.WithName;
 
-// The quarkus.cxf prefix is used also in quarkus-cxf and therefore we have to force building of the current module
-// after quarkus-cxf, so that <project-root>/target/asciidoc/generated/config/quarkus-cxf.adoc concurrently
 @ConfigMapping(prefix = "quarkus.cxf")
-@ConfigRoot(phase = ConfigPhase.RUN_TIME)
+@ConfigRoot(phase = ConfigPhase.RUN_TIME, documentationFileName = "quarkus-cxf-rt-features-logging.adoc")
 public interface CxfLoggingConfig {
 
     /**