Skip to content

Commit

Permalink
Merge branch 'main' into feature/kotlin-1.9.20
Browse files Browse the repository at this point in the history
  • Loading branch information
andreas-eberle authored Nov 14, 2023
2 parents 12d64d2 + c570268 commit 867449d
Show file tree
Hide file tree
Showing 312 changed files with 6,011 additions and 1,680 deletions.
56 changes: 56 additions & 0 deletions .github/develocity-preapproved-developers.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"preapproved-developers": [
"alesj",
"aloubyansky",
"aureamunoz",
"brunobat",
"cescoffier",
"DavideD",
"dmlloyd",
"ebullient",
"emmanuelbernard",
"evanchooly",
"FroMage",
"galderz",
"gastaldi",
"geoand",
"gsmet",
"gwenneg",
"holly-cummins",
"ia3andy",
"iocanel",
"jmartisk",
"johnaohara",
"jponge",
"karesti",
"Karm",
"Ladicek",
"machi1990",
"manovotn",
"manusa",
"maxandersen",
"metacosm",
"MichalMaler",
"michalvavrik",
"michelle-purcell",
"MikeEdgar",
"mkouba",
"n1hility",
"ozangunalp",
"patriot1burke",
"pedroigor",
"phillip-kruger",
"ppalaga",
"radcortez",
"rsvoboda",
"Sanne",
"sberyozkin",
"Sgitario",
"stalep",
"starksm64",
"stuartwdouglas",
"tsegismont",
"yrodiere",
"zakkak"
]
}
6 changes: 3 additions & 3 deletions .github/quarkus-github-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -407,21 +407,21 @@ triage:
- extensions/google-cloud-functions
- integration-tests/google-cloud-functions
- id: mandrel
labels: [area/mandrel]
labels: [area/native-image]
titleBody: "mandrel"
notify: [galderz, zakkak, Karm]
- id: native-image
labels: [area/native-image]
title: "\\bnative\\b"
notify: []
notify: [zakkak]
- id: awt
labels: [area/graphics]
expression: |
matches("sun.font", titleBody)
|| matches("sun.java2d", titleBody)
|| matches("javax.imageio", titleBody)
|| matches("sun.awt", titleBody)
notify: [galderz, zakkak, Karm]
notify: [galderz, Karm]
notifyInPullRequest: true
directories:
- extensions/awt/
Expand Down
66 changes: 63 additions & 3 deletions .github/workflows/ci-actions-incremental.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ env:
# Workaround testsuite locale issue
LANG: en_US.UTF-8
COMMON_MAVEN_ARGS: "-e -B --settings .github/mvn-settings.xml --fail-at-end"
NATIVE_TEST_MAVEN_ARGS: "-Dtest-containers -Dstart-containers -Dquarkus.native.native-image-xmx=5g -Dnative -Dnative.surefire.skip -Dformat.skip -Dno-descriptor-tests clean install -DskipDocs"
NATIVE_TEST_MAVEN_ARGS: "-Dtest-containers -Dstart-containers -Dquarkus.native.native-image-xmx=6g -Dnative -Dnative.surefire.skip -Dformat.skip -Dno-descriptor-tests clean install -DskipDocs"
JVM_TEST_MAVEN_ARGS: "-Dtest-containers -Dstart-containers -Dformat.skip -DskipDocs -Dquarkus.test.hang-detection-timeout=60"
DB_USER: hibernate_orm_test
DB_PASSWORD: hibernate_orm_test
Expand Down Expand Up @@ -199,6 +199,11 @@ jobs:
target/gradle-build-scan-url.txt
LICENSE.txt
retention-days: 2
- name: Save Build Scan
if: always()
uses: gradle/github-actions/maven-build-scan/save@v1-beta
with:
job-name: "Initial JDK 11 Build"

calculate-test-jobs:
name: Calculate Test Jobs
Expand Down Expand Up @@ -388,6 +393,17 @@ jobs:
path: |
**/build.log
retention-days: 2
- name: Save Build Scan
if: always()
uses: gradle/github-actions/maven-build-scan/save@v1-beta
with:
job-name: "JVM Tests - JDK ${{matrix.java.name}}"
- name: Upload quarkus-ide-launcher jar
uses: actions/upload-artifact@v3
with:
name: "quarkus-ide-launcher-999-SNAPSHOT.jar - JDK ${{matrix.java.name}}"
path: |
core/launcher/target/quarkus-ide-launcher-999-SNAPSHOT.jar
maven-tests:
name: Maven Tests - JDK ${{matrix.java.name}}
Expand Down Expand Up @@ -445,7 +461,6 @@ jobs:
distribution: temurin
java-version: ${{ matrix.java.java-version }}
- name: Build

# Important: keep -pl ... in sync with "Calculate run flags"!
# Despite the pre-calculated run_jvm flag, GIB has to be re-run here to figure out the exact submodules to build.
run: ./mvnw $COMMON_MAVEN_ARGS $JVM_TEST_MAVEN_ARGS clean install -pl 'integration-tests/maven' -pl 'integration-tests/devmode' ${{ needs.build-jdk11.outputs.gib_args }}
Expand Down Expand Up @@ -477,6 +492,11 @@ jobs:
target/gradle-build-scan-url.txt
LICENSE.txt
retention-days: 2
- name: Save Build Scan
if: always()
uses: gradle/github-actions/maven-build-scan/save@v1-beta
with:
job-name: "Maven Tests - JDK ${{matrix.java.name}}"

gradle-tests:
name: Gradle Tests - JDK ${{matrix.java.name}}
Expand Down Expand Up @@ -549,6 +569,11 @@ jobs:
target/gradle-build-scan-url.txt
LICENSE.txt
retention-days: 2
- name: Save Build Scan
if: always()
uses: gradle/github-actions/maven-build-scan/save@v1-beta
with:
job-name: "Gradle Tests - JDK ${{matrix.java.name}}"

devtools-tests:
name: Devtools Tests - JDK ${{matrix.java.name}}
Expand Down Expand Up @@ -627,6 +652,11 @@ jobs:
target/gradle-build-scan-url.txt
LICENSE.txt
retention-days: 2
- name: Save Build Scan
if: always()
uses: gradle/github-actions/maven-build-scan/save@v1-beta
with:
job-name: "Devtools Tests - JDK ${{matrix.java.name}}"

kubernetes-tests:
name: Kubernetes Tests - JDK ${{matrix.java.name}}
Expand Down Expand Up @@ -655,6 +685,10 @@ jobs:
os-name: "windows-latest"
}
steps:
- name: Gradle Enterprise environment
run: |
echo "GE_TAGS=jdk-${{matrix.java.name}}" >> "$GITHUB_ENV"
echo "GE_CUSTOM_VALUES=gh-job-name=Kubernetes Tests - JDK ${{matrix.java.name}}" >> "$GITHUB_ENV"
- name: Support longpaths on Windows
if: "startsWith(matrix.java.os-name, 'windows')"
run: git config --global core.longpaths true
Expand Down Expand Up @@ -700,6 +734,11 @@ jobs:
target/build-report.json
LICENSE.txt
retention-days: 2
- name: Save Build Scan
if: always()
uses: gradle/github-actions/maven-build-scan/save@v1-beta
with:
job-name: "Kubernetes Tests - JDK ${{matrix.java.name}}"

quickstarts-tests:
name: Quickstarts Compilation - JDK ${{matrix.java.name}}
Expand Down Expand Up @@ -756,6 +795,12 @@ jobs:
quarkus-quickstarts/target/build-report.json
quarkus-quickstarts/LICENSE
retention-days: 2
- name: Save Build Scan
if: always()
uses: gradle/github-actions/maven-build-scan/save@v1-beta
with:
job-name: "Quickstarts Compilation - JDK ${{matrix.java.name}}"

virtual-thread-native-tests:
name: Native Tests - Virtual Thread - ${{matrix.category}}
runs-on: ${{matrix.os-name}}
Expand Down Expand Up @@ -812,14 +857,19 @@ jobs:
integration-tests/virtual-threads/target/build-report.json
integration-tests/virtual-threads/target/gradle-build-scan-url.txt
retention-days: 2
- name: Save Build Scan
if: always()
uses: gradle/github-actions/maven-build-scan/save@v1-beta
with:
job-name: "Native Tests - Virtual Thread - ${{matrix.category}}"

tcks-test:
name: MicroProfile TCKs Tests
needs: [build-jdk11, calculate-test-jobs]
# Skip main in forks
if: "needs.calculate-test-jobs.outputs.run_tcks == 'true' && (github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main'))"
runs-on: ubuntu-latest
timeout-minutes: 150

steps:
- name: Gradle Enterprise environment
run: |
Expand Down Expand Up @@ -879,6 +929,11 @@ jobs:
target/gradle-build-scan-url.txt
LICENSE.txt
retention-days: 2
- name: Save Build Scan
if: always()
uses: gradle/github-actions/maven-build-scan/save@v1-beta
with:
job-name: "MicroProfile TCKs Tests"

native-tests:
name: Native Tests - ${{matrix.category}}
Expand Down Expand Up @@ -971,6 +1026,11 @@ jobs:
target/gradle-build-scan-url.txt
LICENSE.txt
retention-days: 2
- name: Save Build Scan
if: always()
uses: gradle/github-actions/maven-build-scan/save@v1-beta
with:
job-name: "Native Tests - ${{matrix.category}}"

build-report:
runs-on: ubuntu-latest
Expand Down
43 changes: 43 additions & 0 deletions .github/workflows/develocity-publish-build-scans.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: Develocity - Publish Maven Build Scans

on:
workflow_run:
workflows: [ "Quarkus CI" ]
types: [ completed ]

defaults:
run:
shell: bash

jobs:
publish-build-scans:
if: github.repository == 'quarkusio/quarkus' && github.event.workflow_run.event == 'pull_request'
runs-on: ubuntu-latest
permissions:
pull-requests: write
steps:
- uses: actions/checkout@v4
- name: Extract preapproved developers list
id: extract-preapproved-developers
run: |
echo "preapproved-developpers<<EOF" >> $GITHUB_OUTPUT
cat .github/develocity-preapproved-developers.json >> $GITHUB_OUTPUT
echo >> $GITHUB_OUTPUT
echo "EOF" >> $GITHUB_OUTPUT
- name: Publish Maven Build Scans
uses: gradle/github-actions/maven-build-scan/publish@v1-beta
if: ${{ contains(fromJson(steps.extract-preapproved-developers.outputs.preapproved-developpers).preapproved-developers, github.event.workflow_run.actor.login) }}
with:
develocity-url: 'https://ge.quarkus.io'
develocity-access-key: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
skip-comment: true
- name: Push to summary
if: ${{ contains(fromJson(steps.extract-preapproved-developers.outputs.preapproved-developpers).preapproved-developers, github.event.workflow_run.actor.login) }}
run: |
echo -n "Pull request: " >> ${GITHUB_STEP_SUMMARY}
cat pr-number.out >> ${GITHUB_STEP_SUMMARY}
echo >> ${GITHUB_STEP_SUMMARY}
echo >> ${GITHUB_STEP_SUMMARY}
echo "| Job | Status | Build scan |" >> ${GITHUB_STEP_SUMMARY}
echo "|---|---|---|" >> ${GITHUB_STEP_SUMMARY}
cat publication.out >> ${GITHUB_STEP_SUMMARY}
24 changes: 15 additions & 9 deletions bom/application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<jandex.version>3.1.5</jandex.version>
<javax.annotation-api.version>1.3.2</javax.annotation-api.version>
<javax.inject.version>1</javax.inject.version>
<parsson.version>1.1.4</parsson.version>
<parsson.version>1.1.5</parsson.version>
<resteasy-microprofile.version>2.1.4.Final</resteasy-microprofile.version>
<resteasy-spring-web.version>3.0.2.Final</resteasy-spring-web.version>
<resteasy.version>6.2.6.Final</resteasy.version>
Expand Down Expand Up @@ -51,7 +51,7 @@
<microprofile-lra.version>2.0</microprofile-lra.version>
<microprofile-openapi.version>3.1.1</microprofile-openapi.version>
<smallrye-common.version>2.2.0</smallrye-common.version>
<smallrye-config.version>3.4.1</smallrye-config.version>
<smallrye-config.version>3.4.4</smallrye-config.version>
<smallrye-health.version>4.0.4</smallrye-health.version>
<smallrye-metrics.version>4.0.0</smallrye-metrics.version>
<smallrye-open-api.version>3.7.0</smallrye-open-api.version>
Expand Down Expand Up @@ -92,9 +92,9 @@
<plexus-component-annotations.version>2.1.0</plexus-component-annotations.version>
<graal-sdk.version>23.0.1</graal-sdk.version>
<gizmo.version>1.7.0</gizmo.version>
<jackson-bom.version>2.15.2</jackson-bom.version>
<jackson-bom.version>2.15.3</jackson-bom.version>
<commons-logging-jboss-logging.version>1.0.0.Final</commons-logging-jboss-logging.version>
<commons-lang3.version>3.12.0</commons-lang3.version>
<commons-lang3.version>3.13.0</commons-lang3.version>
<commons-codec.version>1.16.0</commons-codec.version>
<classmate.version>1.5.1</classmate.version>
<!-- When updating, align bytebuddy.version to Hibernate needs as well (just below),
Expand All @@ -116,7 +116,7 @@
<jboss-logging-annotations.version>2.2.1.Final</jboss-logging-annotations.version>
<slf4j.version>2.0.6</slf4j.version>
<slf4j-jboss-logmanager.version>2.0.0.Final</slf4j-jboss-logmanager.version>
<wildfly-common.version>1.5.4.Final-format-001</wildfly-common.version>
<wildfly-common.version>1.7.0.Final</wildfly-common.version>
<wildfly-client-config.version>1.0.1.Final</wildfly-client-config.version>
<wildfly-elytron.version>2.2.2.Final</wildfly-elytron.version>
<jboss-threads.version>3.5.1.Final</jboss-threads.version>
Expand All @@ -129,7 +129,7 @@
<h2.version>2.2.224</h2.version> <!-- When updating, needs to be matched in io.quarkus.hibernate.orm.runtime.config.DialectVersions -->
<postgresql-jdbc.version>42.6.0</postgresql-jdbc.version>
<mariadb-jdbc.version>3.2.0</mariadb-jdbc.version>
<mysql-jdbc.version>8.0.30</mysql-jdbc.version>
<mysql-jdbc.version>8.0.33</mysql-jdbc.version>
<mssql-jdbc.version>12.4.0.jre11</mssql-jdbc.version>
<adal4j.version>1.6.7</adal4j.version>
<oracle-jdbc.version>23.3.0.23.09</oracle-jdbc.version>
Expand All @@ -140,7 +140,7 @@
<hamcrest.version>2.2</hamcrest.version><!-- The version needs to be compatible with both REST Assured and Awaitility -->
<junit.jupiter.version>5.10.0</junit.jupiter.version>
<junit-pioneer.version>1.5.0</junit-pioneer.version>
<infinispan.version>14.0.19.Final</infinispan.version>
<infinispan.version>14.0.20.Final</infinispan.version>
<infinispan.protostream.version>4.6.5.Final</infinispan.protostream.version>
<caffeine.version>3.1.5</caffeine.version>
<netty.version>4.1.100.Final</netty.version>
Expand All @@ -163,7 +163,7 @@
<kotlin.coroutine.version>1.7.3</kotlin.coroutine.version>
<azure.toolkit-lib.version>0.27.0</azure.toolkit-lib.version>
<kotlin-serialization.version>1.6.0</kotlin-serialization.version>
<dekorate.version>4.0.0</dekorate.version> <!-- Please check with Java Operator SDK team before updating -->
<dekorate.version>4.0.3</dekorate.version> <!-- Please check with Java Operator SDK team before updating -->
<maven-invoker.version>3.2.0</maven-invoker.version>
<awaitility.version>4.2.0</awaitility.version>
<jboss-logmanager.version>3.0.2.Final</jboss-logmanager.version>
Expand Down Expand Up @@ -3291,7 +3291,7 @@
<artifactId>importmap</artifactId>
<version>${importmap.version}</version>
</dependency>

<!-- Additional dependencies, keep in alphabetical order -->
<dependency>
<groupId>biz.paluch.logging</groupId>
Expand Down Expand Up @@ -6343,6 +6343,12 @@
<excludeScopes>test</excludeScopes>
<excludeArtifactKeys>
<key>junit:junit</key> <!-- comes from the jackson-bom -->

<!-- jboss-parent:40 still manages jdk-misc, but does not define version.jdk-misc anymore. -->
<!-- We can just remove it because is not needed anyway. -->
<!-- The exclusion can be removed once all imported BOMs depend on jboss-parent:41+ -->
<!-- See also https://github.com/jboss/jboss-parent-pom/issues/236 -->
<key>org.jboss:jdk-misc</key>
</excludeArtifactKeys>
</configuration>
</execution>
Expand Down
2 changes: 1 addition & 1 deletion build-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
<lit-state.version>1.7.0</lit-state.version>
<echarts.version>5.4.3</echarts.version>
<wc-codemirror.version>2.1.0</wc-codemirror.version>
<es-module-shims.version>1.8.0</es-module-shims.version>
<es-module-shims.version>1.8.1</es-module-shims.version>
<path-to-regexp.version>2.4.0</path-to-regexp.version>
</properties>

Expand Down
Loading

0 comments on commit 867449d

Please sign in to comment.