Skip to content

Commit 995c190

Browse files
gsmetgsmet
authored
Merge pull request #50089 from gsmet/3.26.4-backports-1
[3.26] 3.26.4 backports 1
2 parents 16a4ea0 + 9a8c565 commit 995c190

File tree

76 files changed

+2291
-355
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+2291
-355
lines changed

‎bom/application/pom.xml‎

Lines changed: 12 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@
4646
<microprofile-jwt.version>2.1</microprofile-jwt.version>
4747
<microprofile-lra.version>2.0.1</microprofile-lra.version>
4848
<microprofile-openapi.version>4.0.2</microprofile-openapi.version>
49-
<smallrye-common.version>2.13.8</smallrye-common.version>
49+
<smallrye-common.version>2.13.9</smallrye-common.version>
5050
<smallrye-config.version>3.13.4</smallrye-config.version>
5151
<smallrye-health.version>4.2.0</smallrye-health.version>
5252
<smallrye-metrics.version>4.0.0</smallrye-metrics.version>
5353
<smallrye-open-api.version>4.0.12</smallrye-open-api.version>
5454
<smallrye-graphql.version>2.14.1</smallrye-graphql.version>
55-
<smallrye-fault-tolerance.version>6.9.2</smallrye-fault-tolerance.version>
55+
<smallrye-fault-tolerance.version>6.9.3</smallrye-fault-tolerance.version>
5656
<smallrye-jwt.version>4.6.2</smallrye-jwt.version>
5757
<smallrye-context-propagation.version>2.2.1</smallrye-context-propagation.version>
5858
<smallrye-reactive-streams-operators.version>1.0.13</smallrye-reactive-streams-operators.version>
@@ -121,7 +121,7 @@
121121
<h2.version>2.3.230</h2.version> <!-- When updating, needs to be matched in io.quarkus.hibernate.orm.runtime.config.DialectVersions
122122
and the dependency jts-core needs to be updated in extensions/jdbc/jdbc-h2/runtime/pom.xml -->
123123
<postgresql-jdbc.version>42.7.7</postgresql-jdbc.version>
124-
<mariadb-jdbc.version>3.5.5</mariadb-jdbc.version>
124+
<mariadb-jdbc.version>3.5.6</mariadb-jdbc.version>
125125
<mysql-jdbc.version>8.3.0</mysql-jdbc.version>
126126
<mssql-jdbc.version>13.2.0.jre11</mssql-jdbc.version>
127127
<adal4j.version>1.6.7</adal4j.version>
@@ -190,7 +190,7 @@
190190
<google-cloud-functions.version>1.1.4</google-cloud-functions.version>
191191
<commons-compress.version>1.28.0</commons-compress.version> <!-- Please check with Java Operator SDK / Fabric8 team before updating -->
192192
<commons-text.version>1.14.0</commons-text.version>
193-
<gson.version>2.13.1</gson.version>
193+
<gson.version>2.13.2</gson.version>
194194
<log4j2-jboss-logmanager.version>2.0.1.Final</log4j2-jboss-logmanager.version>
195195
<log4j2-api.version>2.25.1</log4j2-api.version>
196196
<log4j-jboss-logmanager.version>1.3.1.Final</log4j-jboss-logmanager.version>
@@ -3728,6 +3728,11 @@
37283728
<artifactId>bcpg-jdk18on</artifactId>
37293729
<version>${bouncycastle.version}</version>
37303730
</dependency>
3731+
<dependency>
3732+
<groupId>org.bouncycastle</groupId>
3733+
<artifactId>bcmail-jdk18on</artifactId>
3734+
<version>${bouncycastle.version}</version>
3735+
</dependency>
37313736
<dependency>
37323737
<groupId>org.bouncycastle</groupId>
37333738
<artifactId>bc-fips</artifactId>
@@ -4398,58 +4403,10 @@
43984403
</dependency>
43994404
<dependency>
44004405
<groupId>io.smallrye</groupId>
4401-
<artifactId>smallrye-fault-tolerance</artifactId>
4402-
<version>${smallrye-fault-tolerance.version}</version>
4403-
</dependency>
4404-
<dependency>
4405-
<groupId>io.smallrye</groupId>
4406-
<artifactId>smallrye-fault-tolerance-api</artifactId>
4407-
<version>${smallrye-fault-tolerance.version}</version>
4408-
</dependency>
4409-
<dependency>
4410-
<groupId>io.smallrye</groupId>
4411-
<artifactId>smallrye-fault-tolerance-apiimpl</artifactId>
4412-
<version>${smallrye-fault-tolerance.version}</version>
4413-
</dependency>
4414-
<dependency>
4415-
<groupId>io.smallrye</groupId>
4416-
<artifactId>smallrye-fault-tolerance-autoconfig-core</artifactId>
4417-
<version>${smallrye-fault-tolerance.version}</version>
4418-
</dependency>
4419-
<dependency>
4420-
<groupId>io.smallrye</groupId>
4421-
<artifactId>smallrye-fault-tolerance-core</artifactId>
4422-
<version>${smallrye-fault-tolerance.version}</version>
4423-
</dependency>
4424-
<dependency>
4425-
<groupId>io.smallrye</groupId>
4426-
<artifactId>smallrye-fault-tolerance-context-propagation</artifactId>
4427-
<version>${smallrye-fault-tolerance.version}</version>
4428-
</dependency>
4429-
<dependency>
4430-
<groupId>io.smallrye</groupId>
4431-
<artifactId>smallrye-fault-tolerance-kotlin</artifactId>
4432-
<version>${smallrye-fault-tolerance.version}</version>
4433-
</dependency>
4434-
<dependency>
4435-
<groupId>io.smallrye</groupId>
4436-
<artifactId>smallrye-fault-tolerance-mutiny</artifactId>
4437-
<version>${smallrye-fault-tolerance.version}</version>
4438-
</dependency>
4439-
<dependency>
4440-
<groupId>io.smallrye</groupId>
4441-
<artifactId>smallrye-fault-tolerance-standalone</artifactId>
4442-
<version>${smallrye-fault-tolerance.version}</version>
4443-
</dependency>
4444-
<dependency>
4445-
<groupId>io.smallrye</groupId>
4446-
<artifactId>smallrye-fault-tolerance-tracing-propagation</artifactId>
4447-
<version>${smallrye-fault-tolerance.version}</version>
4448-
</dependency>
4449-
<dependency>
4450-
<groupId>io.smallrye</groupId>
4451-
<artifactId>smallrye-fault-tolerance-vertx</artifactId>
4406+
<artifactId>smallrye-fault-tolerance-bom</artifactId>
44524407
<version>${smallrye-fault-tolerance.version}</version>
4408+
<type>pom</type>
4409+
<scope>import</scope>
44534410
</dependency>
44544411
<dependency>
44554412
<groupId>io.smallrye</groupId>

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

Lines changed: 158 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,25 @@
1717
<gradle-wrapper.path>${project.basedir}/../gradle</gradle-wrapper.path>
1818
<gradle.executable>gradlew</gradle.executable>
1919
</properties>
20+
21+
<dependencies>
22+
<dependency>
23+
<groupId>org.jboss.logmanager</groupId>
24+
<artifactId>log4j-jboss-logmanager</artifactId>
25+
<scope>test</scope>
26+
</dependency>
27+
<dependency>
28+
<groupId>org.junit.jupiter</groupId>
29+
<artifactId>junit-jupiter</artifactId>
30+
<scope>test</scope>
31+
</dependency>
32+
<dependency>
33+
<groupId>org.assertj</groupId>
34+
<artifactId>assertj-core</artifactId>
35+
<scope>test</scope>
36+
</dependency>
37+
</dependencies>
38+
2039
<build>
2140
<resources>
2241
<resource>
@@ -30,47 +49,21 @@
3049
<pluginManagement>
3150
<plugins>
3251
<plugin>
33-
<groupId>org.apache.maven.plugins</groupId>
34-
<artifactId>maven-jar-plugin</artifactId>
52+
<artifactId>maven-resources-plugin</artifactId>
3553
<configuration>
36-
<excludes>
37-
<exclude>gradle-wrapper/.gradle/**</exclude>
38-
</excludes>
54+
<propertiesEncoding>UTF-8</propertiesEncoding>
3955
</configuration>
4056
</plugin>
4157
</plugins>
4258
</pluginManagement>
4359
<plugins>
4460
<plugin>
45-
<groupId>org.codehaus.mojo</groupId>
46-
<artifactId>exec-maven-plugin</artifactId>
47-
<executions>
48-
<execution>
49-
<id>generate-gradle-wrapper</id>
50-
<phase>prepare-package</phase>
51-
<configuration>
52-
<executable>${gradle-wrapper.path}/${gradle.executable}</executable>
53-
<environmentVariables>
54-
<!-- Force a higher value than the default 64m, used by
55-
gradlew script, to make sure the no-daemon option is honoured
56-
-->
57-
<JAVA_OPTS>-Xmx512m</JAVA_OPTS>
58-
</environmentVariables>
59-
<arguments>
60-
<argument>init</argument>
61-
<argument>--type</argument>
62-
<argument>basic</argument>
63-
<argument>--no-daemon</argument>
64-
<argument>--overwrite</argument>
65-
</arguments>
66-
<workingDirectory>target/classes/gradle-wrapper</workingDirectory>
67-
<addOutputToClasspath>true</addOutputToClasspath>
68-
</configuration>
69-
<goals>
70-
<goal>exec</goal>
71-
</goals>
72-
</execution>
73-
</executions>
61+
<artifactId>maven-surefire-plugin</artifactId>
62+
<configuration>
63+
<systemPropertyVariables>
64+
<gradle-wrapper.version>${gradle-wrapper.version}</gradle-wrapper.version>
65+
</systemPropertyVariables>
66+
</configuration>
7467
</plugin>
7568
</plugins>
7669
</build>
@@ -87,5 +80,136 @@
8780
<gradle.executable>gradlew.bat</gradle.executable>
8881
</properties>
8982
</profile>
83+
<profile>
84+
<id>install-gradle-wrapper</id>
85+
<activation>
86+
<property>
87+
<name>installGradleWrapper</name>
88+
</property>
89+
</activation>
90+
<build>
91+
<plugins>
92+
<plugin>
93+
<groupId>org.codehaus.mojo</groupId>
94+
<artifactId>exec-maven-plugin</artifactId>
95+
<executions>
96+
<execution>
97+
<id>init-gradle-project</id>
98+
<phase>generate-sources</phase>
99+
<configuration>
100+
<executable>${gradle-wrapper.path}/${gradle.executable}</executable>
101+
<environmentVariables>
102+
<!-- Force a higher value than the default 64m, used by
103+
gradlew script, to make sure the no-daemon option is honoured
104+
-->
105+
<JAVA_OPTS>-Xmx512m</JAVA_OPTS>
106+
</environmentVariables>
107+
<arguments>
108+
<argument>init</argument>
109+
<argument>--type</argument>
110+
<argument>basic</argument>
111+
<argument>--no-daemon</argument>
112+
<argument>--overwrite</argument>
113+
</arguments>
114+
<workingDirectory>${project.build.directory}/gradle-wrapper</workingDirectory>
115+
<addOutputToClasspath>true</addOutputToClasspath>
116+
</configuration>
117+
<goals>
118+
<goal>exec</goal>
119+
</goals>
120+
</execution>
121+
<execution>
122+
<id>install-gradle-wrapper</id>
123+
<phase>generate-sources</phase>
124+
<configuration>
125+
<executable>${gradle-wrapper.path}/${gradle.executable}</executable>
126+
<environmentVariables>
127+
<!-- Force a higher value than the default 64m, used by
128+
gradlew script, to make sure the no-daemon option is honoured
129+
-->
130+
<JAVA_OPTS>-Xmx512m</JAVA_OPTS>
131+
</environmentVariables>
132+
<arguments>
133+
<argument>wrapper</argument>
134+
<argument>--gradle-version</argument>
135+
<argument>${gradle-wrapper.version}</argument>
136+
<argument>--no-daemon</argument>
137+
</arguments>
138+
<workingDirectory>${project.build.directory}/gradle-wrapper</workingDirectory>
139+
<addOutputToClasspath>true</addOutputToClasspath>
140+
</configuration>
141+
<goals>
142+
<goal>exec</goal>
143+
</goals>
144+
</execution>
145+
</executions>
146+
</plugin>
147+
<plugin>
148+
<artifactId>maven-resources-plugin</artifactId>
149+
<executions>
150+
<execution>
151+
<id>copy-gradle-wrapper</id>
152+
<phase>generate-sources</phase>
153+
<goals>
154+
<goal>copy-resources</goal>
155+
</goals>
156+
<configuration>
157+
<outputDirectory>${project.build.outputDirectory}/codestarts/quarkus/tooling/gradle-wrapper/base/</outputDirectory>
158+
<resources>
159+
<resource>
160+
<directory>${project.build.directory}/gradle-wrapper/</directory>
161+
<includes>
162+
<include>gradle/wrapper/**</include>
163+
<include>gradlew</include>
164+
<include>gradlew.bat</include>
165+
</includes>
166+
<filtering>false</filtering>
167+
</resource>
168+
</resources>
169+
</configuration>
170+
</execution>
171+
</executions>
172+
</plugin>
173+
</plugins>
174+
</build>
175+
</profile>
176+
<profile>
177+
<id>copy-gradle-wrapper</id>
178+
<activation>
179+
<property>
180+
<name>!installGradleWrapper</name>
181+
</property>
182+
</activation>
183+
<build>
184+
<plugins>
185+
<plugin>
186+
<artifactId>maven-resources-plugin</artifactId>
187+
<executions>
188+
<execution>
189+
<id>copy-gradle-wrapper</id>
190+
<phase>generate-sources</phase>
191+
<goals>
192+
<goal>copy-resources</goal>
193+
</goals>
194+
<configuration>
195+
<outputDirectory>${project.build.outputDirectory}/codestarts/quarkus/tooling/gradle-wrapper/base/</outputDirectory>
196+
<resources>
197+
<resource>
198+
<directory>${gradle-wrapper.path}</directory>
199+
<includes>
200+
<include>gradle/wrapper/**</include>
201+
<include>gradlew</include>
202+
<include>gradlew.bat</include>
203+
</includes>
204+
<filtering>false</filtering>
205+
</resource>
206+
</resources>
207+
</configuration>
208+
</execution>
209+
</executions>
210+
</plugin>
211+
</plugins>
212+
</build>
213+
</profile>
90214
</profiles>
91215
</project>

‎independent-projects/tools/base-codestarts/src/main/filtered/codestarts/quarkus/tooling/gradle-wrapper/codestart.yml‎ renamed to ‎devtools/project-core-extension-codestarts/src/main/filtered/codestarts/quarkus/tooling/gradle-wrapper/codestart.yml‎

File renamed without changes.

‎independent-projects/tools/base-codestarts/src/main/filtered/codestarts/quarkus/tooling/maven-wrapper/codestart.yml‎ renamed to ‎devtools/project-core-extension-codestarts/src/main/filtered/codestarts/quarkus/tooling/maven-wrapper/codestart.yml‎

File renamed without changes.

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

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
# Compiled class file
2+
*.class
3+
4+
# Log file
5+
*.log
6+
7+
# BlueJ files
8+
*.ctxt
9+
10+
# Mobile Tools for Java (J2ME)
11+
.mtj.tmp/
12+
13+
# Package Files #
14+
*.jar
15+
*.war
16+
*.nar
17+
*.ear
18+
*.zip
19+
*.tar.gz
20+
*.rar
21+
22+
# virtual machine crash logs, see https://www.java.com/en/download/help/error_hotspot.xml
23+
hs_err_pid*
24+
25+
# Eclipse
26+
.project
27+
.classpath
28+
.settings/
29+
bin/
30+
31+
# IntelliJ
32+
.idea
33+
*.ipr
34+
*.iml
35+
*.iws
36+
37+
# NetBeans
38+
nb-configuration.xml
39+
40+
# Visual Studio Code
41+
.vscode
42+
.factorypath
43+
44+
# OSX
45+
.DS_Store
46+
47+
# Vim
48+
*.swp
49+
*.swo
50+
51+
# patch
52+
*.orig
53+
*.rej
54+
55+
# Gradle
56+
.gradle/
57+
build/
58+
59+
# Maven
60+
target/
61+
pom.xml.tag
62+
pom.xml.releaseBackup
63+
pom.xml.versionsBackup
64+
release.properties

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# {extension.full-name}
2+
3+
This is a Quarkus Extension for ...

0 commit comments

Comments
 (0)