From d6ffa68a65af4519ed733b262054f3a3d62e0cd9 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mark.paluch@broadcom.com>
Date: Fri, 9 May 2025 11:28:34 +0200
Subject: [PATCH] Polishing.

Merge Openfeign setup tabs.

See #3859
---
 .../pages/repositories/core-extensions.adoc   | 71 +++++--------------
 .../resources/antora-resources/antora.yml     |  1 +
 2 files changed, 19 insertions(+), 53 deletions(-)

diff --git a/src/main/antora/modules/ROOT/pages/repositories/core-extensions.adoc b/src/main/antora/modules/ROOT/pages/repositories/core-extensions.adoc
index e720f3062..754f08c35 100644
--- a/src/main/antora/modules/ROOT/pages/repositories/core-extensions.adoc
+++ b/src/main/antora/modules/ROOT/pages/repositories/core-extensions.adoc
@@ -38,20 +38,20 @@ Maven::
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
             <configuration>
-            <annotationProcessorPaths>
-                <!-- Explicit opt-in required via annotationProcessors or
+                <annotationProcessorPaths>
+                    <!-- Explicit opt-in required via annotationProcessors or
                         annotationProcessorPaths on Java 22+, see https://bugs.openjdk.org/browse/JDK-8306819 -->
-                <annotationProcessorPath>
-                    <groupId>com.querydsl</groupId>
-                    <artifactId>querydsl-apt</artifactId>
-                    <version>${querydslVersion}</version>
-                    <classifier>jakarta</classifier>
-                </annotationProcessorPath>
-                <annotationProcessorPath>
-                    <groupId>jakarta.persistence</groupId>
-                    <artifactId>jakarta.persistence-api</artifactId>
-                </annotationProcessorPath>
-              </annotationProcessorPaths>
+                    <annotationProcessorPath>
+                        <groupId>com.querydsl</groupId>
+                        <artifactId>querydsl-apt</artifactId>
+                        <version>${querydslVersion}</version>
+                        <classifier>jakarta</classifier>
+                    </annotationProcessorPath>
+                    <annotationProcessorPath>
+                        <groupId>jakarta.persistence</groupId>
+                        <artifactId>jakarta.persistence-api</artifactId>
+                    </annotationProcessorPath>
+                </annotationProcessorPaths>
 
                 <!-- Recommended: Some IDE's might require this configuration to include generated sources for IDE usage -->
                 <generatedTestSourcesDirectory>target/generated-test-sources</generatedTestSourcesDirectory>
@@ -78,13 +78,8 @@ dependencies {
 }
 ----
 ====
-======
 
-Or if you use an OpenFeign fork:
-
-[tabs]
-======
-Maven::
+Maven (OpenFeign)::
 +
 [source,xml,indent=0,subs="verbatim,quotes",role="primary"]
 ----
@@ -116,46 +111,16 @@ Maven::
                         <artifactId>jakarta.persistence-api</artifactId>
                     </annotationProcessorPath>
                 </annotationProcessorPaths>
+                <!-- Recommended: Some IDE's might require this configuration to include generated sources for IDE usage -->
+                <generatedTestSourcesDirectory>target/generated-test-sources</generatedTestSourcesDirectory>
+                <generatedSourcesDirectory>target/generated-sources</generatedSourcesDirectory>
             </configuration>
         </plugin>
-    
-        <!-- Recommended: Some IDE's might require this configuration to include generated sources for IDE usage -->
-        <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>build-helper-maven-plugin</artifactId>
-            <version>3.6.0</version>
-            <executions>
-                <execution>
-                    <id>add-source</id>
-                    <phase>generate-sources</phase>
-                    <goals>
-                        <goal>add-source</goal>
-                    </goals>
-                    <configuration>
-                        <sources>
-                            <source>target/generated-sources</source>
-                        </sources>
-                    </configuration>
-                </execution>
-                <execution>
-                    <id>add-test-source</id>
-                    <phase>generate-test-sources</phase>
-                    <goals>
-                        <goal>add-test-source</goal>
-                    </goals>
-                    <configuration>
-                        <sources>
-                            <source>target/generated-test-sources</source>
-                        </sources>
-                    </configuration>
-                </execution>
-            </executions>
-        </plugin>
     </plugins>
 </build>
 ----
 
-Gradle::
+Gradle (OpenFeign)::
 +
 ====
 [source,groovy,indent=0,subs="verbatim,quotes",role="secondary"]
diff --git a/src/main/antora/resources/antora-resources/antora.yml b/src/main/antora/resources/antora-resources/antora.yml
index ed14d8c6d..eedc4999e 100644
--- a/src/main/antora/resources/antora-resources/antora.yml
+++ b/src/main/antora/resources/antora-resources/antora.yml
@@ -4,6 +4,7 @@ prerelease: ${antora-component.prerelease}
 asciidoc:
   attributes:
     version: ${project.version}
+    copyright-year: ${current.year}
     springversionshort: ${spring.short}
     springversion: ${spring}
     attribute-missing: 'warn'