[3.26] 3.26.4 backports 1

bom/application/pom.xml

@@ -46,13 +46,13 @@
         <microprofile-jwt.version>2.1</microprofile-jwt.version>
         <microprofile-lra.version>2.0.1</microprofile-lra.version>
         <microprofile-openapi.version>4.0.2</microprofile-openapi.version>
-        <smallrye-common.version>2.13.8</smallrye-common.version>
+        <smallrye-common.version>2.13.9</smallrye-common.version>
         <smallrye-config.version>3.13.4</smallrye-config.version>
         <smallrye-health.version>4.2.0</smallrye-health.version>
         <smallrye-metrics.version>4.0.0</smallrye-metrics.version>
         <smallrye-open-api.version>4.0.12</smallrye-open-api.version>
         <smallrye-graphql.version>2.14.1</smallrye-graphql.version>
-        <smallrye-fault-tolerance.version>6.9.2</smallrye-fault-tolerance.version>
+        <smallrye-fault-tolerance.version>6.9.3</smallrye-fault-tolerance.version>
         <smallrye-jwt.version>4.6.2</smallrye-jwt.version>
         <smallrye-context-propagation.version>2.2.1</smallrye-context-propagation.version>
         <smallrye-reactive-streams-operators.version>1.0.13</smallrye-reactive-streams-operators.version>
@@ -121,7 +121,7 @@
         <h2.version>2.3.230</h2.version> <!-- When updating, needs to be matched in io.quarkus.hibernate.orm.runtime.config.DialectVersions
                                               and the dependency jts-core needs to be updated in extensions/jdbc/jdbc-h2/runtime/pom.xml -->
         <postgresql-jdbc.version>42.7.7</postgresql-jdbc.version>
-        <mariadb-jdbc.version>3.5.5</mariadb-jdbc.version>
+        <mariadb-jdbc.version>3.5.6</mariadb-jdbc.version>
         <mysql-jdbc.version>8.3.0</mysql-jdbc.version>
         <mssql-jdbc.version>13.2.0.jre11</mssql-jdbc.version>
         <adal4j.version>1.6.7</adal4j.version>
@@ -190,7 +190,7 @@
         <google-cloud-functions.version>1.1.4</google-cloud-functions.version>
         <commons-compress.version>1.28.0</commons-compress.version> <!-- Please check with Java Operator SDK / Fabric8 team before updating -->
         <commons-text.version>1.14.0</commons-text.version>
-        <gson.version>2.13.1</gson.version>
+        <gson.version>2.13.2</gson.version>
         <log4j2-jboss-logmanager.version>2.0.1.Final</log4j2-jboss-logmanager.version>
         <log4j2-api.version>2.25.1</log4j2-api.version>
         <log4j-jboss-logmanager.version>1.3.1.Final</log4j-jboss-logmanager.version>
@@ -3728,6 +3728,11 @@
                 <artifactId>bcpg-jdk18on</artifactId>
                 <version>${bouncycastle.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcmail-jdk18on</artifactId>
+                <version>${bouncycastle.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.bouncycastle</groupId>
                 <artifactId>bc-fips</artifactId>
@@ -4398,58 +4403,10 @@
             </dependency>
             <dependency>
                 <groupId>io.smallrye</groupId>
-                <artifactId>smallrye-fault-tolerance</artifactId>
-                <version>${smallrye-fault-tolerance.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.smallrye</groupId>
-                <artifactId>smallrye-fault-tolerance-api</artifactId>
-                <version>${smallrye-fault-tolerance.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.smallrye</groupId>
-                <artifactId>smallrye-fault-tolerance-apiimpl</artifactId>
-                <version>${smallrye-fault-tolerance.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.smallrye</groupId>
-                <artifactId>smallrye-fault-tolerance-autoconfig-core</artifactId>
-                <version>${smallrye-fault-tolerance.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.smallrye</groupId>
-                <artifactId>smallrye-fault-tolerance-core</artifactId>
-                <version>${smallrye-fault-tolerance.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.smallrye</groupId>
-                <artifactId>smallrye-fault-tolerance-context-propagation</artifactId>
-                <version>${smallrye-fault-tolerance.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.smallrye</groupId>
-                <artifactId>smallrye-fault-tolerance-kotlin</artifactId>
-                <version>${smallrye-fault-tolerance.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.smallrye</groupId>
-                <artifactId>smallrye-fault-tolerance-mutiny</artifactId>
-                <version>${smallrye-fault-tolerance.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.smallrye</groupId>
-                <artifactId>smallrye-fault-tolerance-standalone</artifactId>
-                <version>${smallrye-fault-tolerance.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.smallrye</groupId>
-                <artifactId>smallrye-fault-tolerance-tracing-propagation</artifactId>
-                <version>${smallrye-fault-tolerance.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.smallrye</groupId>
-                <artifactId>smallrye-fault-tolerance-vertx</artifactId>
+                <artifactId>smallrye-fault-tolerance-bom</artifactId>
                 <version>${smallrye-fault-tolerance.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>io.smallrye</groupId>

devtools/project-core-extension-codestarts/pom.xml

@@ -17,6 +17,25 @@
         <gradle-wrapper.path>${project.basedir}/../gradle</gradle-wrapper.path>
         <gradle.executable>gradlew</gradle.executable>
     </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.logmanager</groupId>
+            <artifactId>log4j-jboss-logmanager</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
     <build>
         <resources>
             <resource>
@@ -30,47 +49,21 @@
         <pluginManagement>
             <plugins>
                 <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-jar-plugin</artifactId>
+                    <artifactId>maven-resources-plugin</artifactId>
                     <configuration>
-                        <excludes>
-                            <exclude>gradle-wrapper/.gradle/**</exclude>
-                        </excludes>
+                        <propertiesEncoding>UTF-8</propertiesEncoding>
                     </configuration>
                 </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-gradle-wrapper</id>
-                        <phase>prepare-package</phase>
-                        <configuration>
-                            <executable>${gradle-wrapper.path}/${gradle.executable}</executable>
-                            <environmentVariables>
-                                <!-- Force a higher value than the default 64m, used by
-                                 gradlew script, to make sure the no-daemon option is honoured
-                                -->
-                                <JAVA_OPTS>-Xmx512m</JAVA_OPTS>
-                            </environmentVariables>
-                            <arguments>
-                                <argument>init</argument>
-                                <argument>--type</argument>
-                                <argument>basic</argument>
-                                <argument>--no-daemon</argument>
-                                <argument>--overwrite</argument>
-                            </arguments>
-                            <workingDirectory>target/classes/gradle-wrapper</workingDirectory>
-                            <addOutputToClasspath>true</addOutputToClasspath>
-                        </configuration>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                    </execution>
-                </executions>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemPropertyVariables>
+                        <gradle-wrapper.version>${gradle-wrapper.version}</gradle-wrapper.version>
+                    </systemPropertyVariables>
+                </configuration>
             </plugin>
         </plugins>
     </build>
@@ -87,5 +80,136 @@
                 <gradle.executable>gradlew.bat</gradle.executable>
             </properties>
         </profile>
+        <profile>
+            <id>install-gradle-wrapper</id>
+            <activation>
+                <property>
+                    <name>installGradleWrapper</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>init-gradle-project</id>
+                                <phase>generate-sources</phase>
+                                <configuration>
+                                    <executable>${gradle-wrapper.path}/${gradle.executable}</executable>
+                                    <environmentVariables>
+                                        <!-- Force a higher value than the default 64m, used by
+                                         gradlew script, to make sure the no-daemon option is honoured
+                                        -->
+                                        <JAVA_OPTS>-Xmx512m</JAVA_OPTS>
+                                    </environmentVariables>
+                                    <arguments>
+                                        <argument>init</argument>
+                                        <argument>--type</argument>
+                                        <argument>basic</argument>
+                                        <argument>--no-daemon</argument>
+                                        <argument>--overwrite</argument>
+                                    </arguments>
+                                    <workingDirectory>${project.build.directory}/gradle-wrapper</workingDirectory>
+                                    <addOutputToClasspath>true</addOutputToClasspath>
+                                </configuration>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>install-gradle-wrapper</id>
+                                <phase>generate-sources</phase>
+                                <configuration>
+                                    <executable>${gradle-wrapper.path}/${gradle.executable}</executable>
+                                    <environmentVariables>
+                                        <!-- Force a higher value than the default 64m, used by
+                                         gradlew script, to make sure the no-daemon option is honoured
+                                        -->
+                                        <JAVA_OPTS>-Xmx512m</JAVA_OPTS>
+                                    </environmentVariables>
+                                    <arguments>
+                                        <argument>wrapper</argument>
+                                        <argument>--gradle-version</argument>
+                                        <argument>${gradle-wrapper.version}</argument>
+                                        <argument>--no-daemon</argument>
+                                    </arguments>
+                                    <workingDirectory>${project.build.directory}/gradle-wrapper</workingDirectory>
+                                    <addOutputToClasspath>true</addOutputToClasspath>
+                                </configuration>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-resources-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>copy-gradle-wrapper</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>copy-resources</goal>
+                                </goals>
+                                <configuration>
+                                    <outputDirectory>${project.build.outputDirectory}/codestarts/quarkus/tooling/gradle-wrapper/base/</outputDirectory>
+                                    <resources>
+                                        <resource>
+                                            <directory>${project.build.directory}/gradle-wrapper/</directory>
+                                            <includes>
+                                                <include>gradle/wrapper/**</include>
+                                                <include>gradlew</include>
+                                                <include>gradlew.bat</include>
+                                            </includes>
+                                            <filtering>false</filtering>
+                                        </resource>
+                                    </resources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>copy-gradle-wrapper</id>
+            <activation>
+                <property>
+                    <name>!installGradleWrapper</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-resources-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>copy-gradle-wrapper</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>copy-resources</goal>
+                                </goals>
+                                <configuration>
+                                    <outputDirectory>${project.build.outputDirectory}/codestarts/quarkus/tooling/gradle-wrapper/base/</outputDirectory>
+                                    <resources>
+                                        <resource>
+                                            <directory>${gradle-wrapper.path}</directory>
+                                            <includes>
+                                                <include>gradle/wrapper/**</include>
+                                                <include>gradlew</include>
+                                                <include>gradlew.bat</include>
+                                            </includes>
+                                            <filtering>false</filtering>
+                                        </resource>
+                                    </resources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 </project>

devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus-extension/tooling/git/base/..gitignore

@@ -0,0 +1,64 @@
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see https://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+# Eclipse
+.project
+.classpath
+.settings/
+bin/
+
+# IntelliJ
+.idea
+*.ipr
+*.iml
+*.iws
+
+# NetBeans
+nb-configuration.xml
+
+# Visual Studio Code
+.vscode
+.factorypath
+
+# OSX
+.DS_Store
+
+# Vim
+*.swp
+*.swo
+
+# patch
+*.orig
+*.rej
+
+# Gradle
+.gradle/
+build/
+
+# Maven
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+release.properties

devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus-extension/tooling/git/base/README.tpl.qute.md

@@ -0,0 +1,3 @@
+# {extension.full-name}
+
+This is a Quarkus Extension for ...