Merge branch 'main' into quarkus-loom

.github/native-tests.json

@@ -81,7 +81,7 @@
         {
             "category": "Security3",
             "timeout": 50,
-            "test-modules": "keycloak-authorization, smallrye-jwt-token-propagation",
+            "test-modules": "keycloak-authorization, smallrye-jwt-token-propagation, security-webauthn",
             "os-name": "ubuntu-latest"
         },
         {

.github/quarkus-github-bot.yml

@@ -225,6 +225,9 @@ triage:
         - integration-tests/spring-
     - labels: [env/windows]
       titleBody: "windows"
+    - labels: [env/m1]
+      titleBody: "\\bm1\\b"
+      notify: [gastaldi]
     - labels: [area/kubernetes]
       titleBody: "kubernetes"
       notify: [geoand, iocanel]

.github/workflows/ci-actions-incremental.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches-ignore:
       - 'dependabot/**'
-      - 'jakarta-rewrite'
     # paths-ignore in ci-fork-mvn-cache.yml should match
     paths-ignore:
       - '.gitignore'
@@ -70,6 +69,21 @@ jobs:
           name: pull-request-number-${{ github.event.number }}
           path: pull-request-number
           retention-days: 1
+  attach-report-issue-number:
+    runs-on: ubuntu-latest
+    name: Attach report issue number
+    if: github.ref_name == 'jakarta-rewrite'
+    steps:
+      - name: Create file
+        shell: bash
+        run: |
+          echo -n 25363 > report-issue-number
+      - name: Upload report issue number
+        uses: actions/upload-artifact@v2
+        with:
+          name: report-issue-number-25363
+          path: report-issue-number
+          retention-days: 1
   ci-sanity-check:
     name: "CI Sanity Check"
     runs-on: ubuntu-latest
@@ -130,6 +144,10 @@ jobs:
           path: ~/.m2/repository
           # refresh cache every month to avoid unlimited growth
           key: q2maven-${{ steps.get-date.outputs.date }}
+      - name: Prepare Jakarta artifacts
+        if: github.ref_name == 'jakarta-rewrite'
+        shell: bash
+        run: ./jakarta/prepare.sh
       - name: Build
         run: |
           ./mvnw -T1C $COMMON_MAVEN_ARGS -DskipTests -DskipITs -Dinvoker.skip -Dno-format -Dtcks clean install
@@ -164,7 +182,19 @@ jobs:
         # mvnw just for creating gib-impacted.log ("validate" should not waste much time if not incremental at all, e.g. on main)
         run: |
           ./mvnw -q -T1C $COMMON_MAVEN_ARGS -Dtcks -Dquickly-ci ${{ steps.get-gib-args.outputs.gib_args }} -Dgib.logImpactedTo=gib-impacted.log validate
-          [ -f gib-impacted.log ] && GIB_IMPACTED=$(cat gib-impacted.log) || GIB_IMPACTED=''
+          if [ -f gib-impacted.log ]
+          then
+            # TODO: for now, we don't run TCKs and for the jakarta-rewrite branch
+            # we filter them here so that it cascades to all the builds
+            if [ "${GITHUB_REF_NAME}" == "jakarta-rewrite" ]
+            then
+              GIB_IMPACTED=$(cat gib-impacted.log | grep -Pv '^(tcks/|integration-tests/grpc-|integration-tests/infinispan-client|integration-tests/kafka-avro|integration-tests/opentelemetry-grpc)')
+            else
+              GIB_IMPACTED=$(cat gib-impacted.log)
+            fi
+          else
+            GIB_IMPACTED=''
+          fi
           echo "GIB_IMPACTED: ${GIB_IMPACTED}"
           echo "::set-output name=impacted_modules::${GIB_IMPACTED//$'\n'/'%0A'}"
       - name: Tar Maven Repo

.github/workflows/jakarta-rewrite.yml

@@ -30,7 +30,7 @@ jobs:
         run: |
           export PATH="$HOME/.jbang/bin:$PATH"
           git checkout -b temp-jakarta-rewrite
-          ./jakarta/transform.sh
+          REWRITE_TESTS_CONTAINERS=true ./jakarta/transform.sh
           git add .
           git commit -m 'Transform sources to Jakarta'
         shell: bash

.gitignore

@@ -31,6 +31,7 @@ ObjectStore
 docker/distroless/bazel-*
 /.apt_generated_tests/
 quarkus.log
+quarkus.log*
 replay_*.logß
 nbactions.xml
 nb-configuration.xml

.gitpod.yml

@@ -0,0 +1,17 @@
+# This configuration file was automatically generated by Gitpod.
+# Please adjust to your needs (see https://www.gitpod.io/docs/config-gitpod-file)
+# and commit this file to your remote git repository to share the goodness with others.
+image:
+  file: .gitpod/Dockerfile
+
+tasks:
+  - init: ./mvnw -Dquickly
+  - name: Quarkus command
+    openMode: split-right
+
+vscode:
+  extensions:
+    - "redhat.java"
+    - "vscjava.vscode-java-dependency"
+    - "vscjava.vscode-java-debug"
+    - "vscjava.vscode-java-pack"

.gitpod/Dockerfile

@@ -0,0 +1,8 @@
+FROM gitpod/workspace-java-11
+
+RUN bash -c ". /home/gitpod/.sdkman/bin/sdkman-init.sh && \
+    sdk install java 11.0.9.j9-adpt && \
+    sdk use java 11.0.9.j9-adpt && \
+    yes | sdk install quarkus && \
+    rm -rf $HOME/.sdkman/archives/* && \
+    rm -rf $HOME/.sdkman/tmp/* "

CONTRIBUTING.md

@@ -24,6 +24,7 @@ But first, read this page (including the small print at the end).
       * [`OutOfMemoryError` while importing](#-outofmemoryerror--while-importing)
       * [`package sun.misc does not exist` while building](#-package-sunmisc-does-not-exist--while-building)
       * [Formatting](#formatting)
+  + [Gitpod](#gitpod)
 * [Build](#build)
   + [Workflow tips](#workflow-tips)
     - [Building all modules of an extension](#building-all-modules-of-an-extension)
@@ -288,6 +289,11 @@ navigate to _Editor_ -> _Code Style_ -> _Java_ -> _Imports_
 and set _Class count to use import with '\*'_ to `999`.
 Do the same with _Names count to use static import with '\*'_.
 
+### Gitpod
+
+You can also use [Gitpod](https://gitpod.io) to contribute without installing anything on your computer. Click [here](https://gitpod.io/#https://github.com/quarkusio/quarkus/-/tree/main/) to start a workspace.
+
+
 ## Build
 
 * Clone the repository: `git clone https://github.com/quarkusio/quarkus.git`
@@ -307,10 +313,29 @@ export MAVEN_OPTS="-Xmx4g"
 This build skipped all the tests, native-image builds, documentation generation etc. and used the Maven goals `clean install` by default.
 For more details about `-Dquickly` have a look at the `quick-build` profile in `quarkus-parent` (root `pom.xml`).
 
-Adding `-DskipTests=false -DskipITs=false` enables the tests.
-It will take much longer to build but will give you more guarantees on your code.
+When contributing to Quarkus, it is recommended to respect the following rules.
+
+**Contributing to an extension**
+
+When you contribute to an extension, after having applied your changes, run:
+
+* `./mvnw -Dquickly` from the root directory to make sure you haven't broken anything obvious
+* `./mvnw -f extensions/<your-extension> clean install` to run a full build of your extension including the tests
+* `./mvnw -f integration-tests/<your-extension-its> clean install` to make sure ITs are still passing
+* `./mvnw -f integration-tests/<your-extension-its> clean install -Dnative` to test the native build (for small changes, it might not be useful, use your own judgement)
+
+**Contributing to a core artifact**
+
+Obviously, when you contribute to a core artifact of Quarkus, a change may impact any part of Quarkus.
+So the rule of thumb would be to run the full test suite locally but this is clearly impractical as it takes a lot of time/resources.
+
+Thus it is recommended to use the following approach:
 
-You can build and test native images in the integration tests supporting it by using `./mvnw install -Dnative`.
+* run `./mvnw -Dquickly` from the root directory to make sure you haven't broken anything obvious
+* run any build that might be useful to test the behavior you changed actually fixes the issue you had (might be an extension build, an integration test build...)
+* push your work to your own fork of Quarkus to trigger CI there
+* you can create a draft pull request to keep track of your work
+* wait until the build is green in your fork (use your own judgement if it's not fully green) before marking your pull request as ready for review (which will trigger Quarkus CI)
 
 ### Workflow tips
 
@@ -433,10 +458,10 @@ The Asciidoc files can be found in the [`src/main/asciidoc` directory](https://g
 
 When contributing a significant documentation change, it is highly recommended to run the build and check the output.
 
-First build the whole Quarkus repository with the documentation build enabled (`-Dquickly` skips the documentation build):
+First build the whole Quarkus repository with the documentation build enabled:
 
 ```
-./mvnw -Dquickly -DskipDocs=false clean install
+./mvnw -DquicklyDocs
 ```
 
 This will generate the configuration properties documentation includes in the root `target/asciidoc/generated/config/` directory and will avoid a lot of warnings when building the documentation module.

MAINTAINERS.adoc

@@ -257,7 +257,7 @@ If you think some information is outdated, either provide a pull request or send
 |https://github.com/FroMage[Stéphane Épardaud], https://github.com/manovotn[Matěj Novotný]
 
 |SmallRye Fault Tolerance
-|https://github.com/Ladicek[Ladislav Thon], https://github.com/jmartisk[Jan Martiska], https://github.com/michalszynkiewicz[Michal Szynkiewicz]
+|https://github.com/Ladicek[Ladislav Thon]
 
 |SmallRye Health
 |https://github.com/antoinesd[Antoine Sabot-Durand], https://github.com/jmartisk[Jan Martiska]
@@ -278,7 +278,7 @@ If you think some information is outdated, either provide a pull request or send
 |https://github.com/jmartisk[Jan Martiska], https://github.com/phillip-kruger[Phillip Kruger]
 
 |SmallRye OpenTracing
-|https://github.com/pavolloffay[Pavol Loffay], https://github.com/Ladicek[Ladislav Thon]
+|https://github.com/radcortez[Roberto Cortez]
 
 |SmallRye Reactive Messaging
 |https://github.com/cescoffier[Clément Escoffier]
@@ -287,10 +287,10 @@ If you think some information is outdated, either provide a pull request or send
 |https://github.com/cescoffier[Clément Escoffier]
 
 |SmallRye Reactive Messaging - Kafka
-|https://github.com/cescoffier[Clément Escoffier]
+|https://github.com/cescoffier[Clément Escoffier], https://github.com/ozangunalp[Ozan Gunalp]
 
 |SmallRye Reactive Messaging - MQTT
-|https://github.com/cescoffier[Clément Escoffier], https://github.com/michalszynkiewicz[Michał Szynkiewicz]
+|https://github.com/cescoffier[Clément Escoffier]
 
 |Spring Boot Properties
 |https://github.com/gytis[Gytis Trikleris]