Merged branch 'jetty-12.0.x' into 'jetty-12.1.x'.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

documentation/jetty/modules/code/examples/pom.xml

@@ -9,12 +9,12 @@
     <relativePath>../../../../pom.xml</relativePath>
   </parent>
   <artifactId>code-examples</artifactId>
-  <packaging>pom</packaging>
   <name>Documentation :: Code Examples</name>
 
   <properties>
     <jacoco.skip>true</jacoco.skip>
     <javadoc.skip>true</javadoc.skip>
+    <maven.deploy.skip>true</maven.deploy.skip>
   </properties>
 
   <dependencies>
@@ -117,19 +117,6 @@
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>compile-code-examples</id>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-            <phase>compile</phase>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
@@ -194,9 +181,9 @@
           <plugin>
             <artifactId>maven-compiler-plugin</artifactId>
             <configuration>
-              <source>${java.specification.version}</source>
-              <target>${java.specification.version}</target>
-              <release>${java.specification.version}</release>
+              <source>21</source>
+              <target>21</target>
+              <release>21</release>
             </configuration>
           </plugin>
         </plugins>

documentation/jetty/pom.xml

@@ -9,7 +9,11 @@
   </parent>
   <artifactId>jetty</artifactId>
   <packaging>pom</packaging>
-  <name>Documentation :: Content Root</name>
+  <name>Documentation :: Asciidoc</name>
+
+  <modules>
+    <module>modules/code/examples</module>
+  </modules>
 
   <properties>
     <!-- build cache must be disabled for antora goal to work and for run.jetty.classpath value to be computed properly -->
@@ -149,16 +153,5 @@
         <jetty.home.output.directory>${env.ANTORA_CACHE_DIR}/jetty</jetty.home.output.directory>
       </properties>
     </profile>
-    <profile>
-      <id>examples</id>
-      <activation>
-        <property>
-          <name>!collector</name>
-        </property>
-      </activation>
-      <modules>
-        <module>modules/code/examples</module>
-      </modules>
-    </profile>
   </profiles>
 </project>