Skip to content

Commit

Permalink
Merge branch 'main' into QUARKUS-0dc30d1-Docummenting-xref_anchros-use
Browse files Browse the repository at this point in the history
  • Loading branch information
MichalMaler authored May 16, 2023
2 parents 36605f3 + 3e6b2a5 commit e7b601d
Show file tree
Hide file tree
Showing 870 changed files with 21,767 additions and 4,708 deletions.
1 change: 0 additions & 1 deletion .dockerignore

This file was deleted.

1 change: 0 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ updates:
- dependency-name: org.liquibase:*
- dependency-name: org.liquibase.ext:*
- dependency-name: org.freemarker:freemarker
- dependency-name: io.fabric8:*
- dependency-name: org.apache.httpcomponents:*
- dependency-name: org.apache.james:apache-mime4j
- dependency-name: org.quartz-scheduler:quartz
Expand Down
4 changes: 4 additions & 0 deletions .github/quarkus-github-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,10 @@ triage:
- extensions/security/
- extensions/elytron
- integration-tests/elytron
- id: bearer-token
labels: [area/security, area/oidc]
title: "bearer"
notify: [sberyozkin, pedroigor]
- id: metrics
labels: [area/metrics, area/smallrye]
title: "metrics"
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/ci-actions-incremental.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ env:
DB_USER: hibernate_orm_test
DB_PASSWORD: hibernate_orm_test
DB_NAME: hibernate_orm_test
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
PULL_REQUEST_NUMBER: ${{ github.event.number }}
jobs:
# This is a hack to work around a GitHub API limitation:
# when the PR is coming from another fork, the pull_requests field of the
Expand Down Expand Up @@ -430,7 +432,7 @@ jobs:
MAVEN_OPTS: -Xmx1g
# Skip main in forks
if: "needs.calculate-test-jobs.outputs.run_gradle == 'true' && (github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main'))"
timeout-minutes: 80
timeout-minutes: 120
strategy:
fail-fast: false
matrix:
Expand Down
40 changes: 40 additions & 0 deletions .github/workflows/owasp-check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: "OWASP Dependency Check"

on:
workflow_dispatch:
schedule:
- cron: '0 0 * * 0,3'

jobs:
owasp:
name: OWASP Dependency Check Report
runs-on: ubuntu-latest
if: github.repository == 'quarkusio/quarkus'

strategy:
fail-fast: false

steps:
- name: Checkout repository
uses: actions/checkout@v3
with:
fetch-depth: 1
ref: main
- name: Setup Java JDK
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 11


- name: Build Java
run: ./mvnw -B --settings .github/mvn-settings.xml -Dquickly-ci install

- name: Perform OWASP Dependency Check Report
run: ./mvnw -Dowasp-report

- uses: actions/upload-artifact@v3
with:
name: dependency-check-report
path: target/dependency-check-report.html
retention-days: 5
2 changes: 1 addition & 1 deletion .github/workflows/vale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
uses: errata-ai/vale-action@reviewdog
with:
fail_on_error: false
vale_flags: "--no-exit --config=docs/.vale/vale.ini"
vale_flags: "--no-exit --config=docs/.vale.ini"
filter_mode: diff_context
files: docs/src/main/asciidoc/
env:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ nb-configuration.xml
/lsp/
.envrc
.jekyll-cache
.mvn/.gradle-enterprise
12 changes: 12 additions & 0 deletions .mvn/extensions.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<extensions>
<extension>
<groupId>com.gradle</groupId>
<artifactId>gradle-enterprise-maven-extension</artifactId>
<version>1.17.1</version>
</extension>
<extension>
<groupId>com.gradle</groupId>
<artifactId>common-custom-user-data-maven-extension</artifactId>
<version>1.11.1</version>
</extension>
</extensions>
31 changes: 31 additions & 0 deletions .mvn/gradle-enterprise-custom-user-data.groovy
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@


// Add mvn command line
def mvnCommand = ''
if (System.env.MAVEN_CMD_LINE_ARGS) {
mvnCommand = "mvn ${System.env.MAVEN_CMD_LINE_ARGS}".toString()
buildScan.value('mvn command line', mvnCommand)
}

//Add github action information
if (System.env.GITHUB_ACTIONS) {
buildScan.value('gh-job-name', System.env.GITHUB_JOB)
buildScan.value('gh-event-name', System.env.GITHUB_EVENT_NAME)
buildScan.value('gh-ref-name', System.env.GITHUB_REF_NAME)
buildScan.value('gh-actor', System.env.GITHUB_ACTOR)
buildScan.value('gh-workflow', System.env.GITHUB_WORKFLOW)


def prnumber = System.env.PULL_REQUEST_NUMBER
if (prnumber != null) {
buildScan.value('gh-pr', prnumber)
buildScan.tag('pr-' + prnumber)
}

buildScan.buildScanPublished { publishedBuildScan ->
new File(System.env.GITHUB_STEP_SUMMARY).withWriterAppend { out ->
out.println("\n[Build scan for '${mavenCommand}' in ${jobName}](${publishedBuildScan.buildScanUri})\n")
}
}
}

28 changes: 28 additions & 0 deletions .mvn/gradle-enterprise.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<gradleEnterprise>
<server>
<url>https://ge.quarkus.io</url>
<allowUntrusted>false</allowUntrusted>
</server>
<buildScan>
<!-- adjust conditions ?
mvn gradle-enterprise:provision-access-key
https://docs.gradle.com/enterprise/maven-extension/#publishing_based_on_criteria
-->
<publish>ALWAYS</publish>
<obfuscation>
<!-- Don't share ip addresses-->
<ipAddresses>#{{'0.0.0.0'}}</ipAddresses>
</obfuscation>
<capture>
<goalInputFiles>true</goalInputFiles>
</capture>
<!-- https://docs.gradle.com/enterprise/maven-extension/#manual_access_key_configuration -->
<backgroundBuildScanUpload>#{env['CI'] == null}</backgroundBuildScanUpload>
<publishIfAuthenticated>true</publishIfAuthenticated>
</buildScan>
<buildCache>
<local><enabled>false</enabled></local>
<remote><enabled>false</enabled></remote>
</buildCache>
</gradleEnterprise>

15 changes: 15 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -503,6 +503,21 @@ CI is using a slightly different GIB config than locally:

For more details see the `Get GIB arguments` step in `.github/workflows/ci-actions-incremental.yml`.

##### Gradle Enterprise build cache

Quarkus has a Gradle Enterprise setup at https://ge.quarkus.io that can be used to analyze the build performance of the Quarkus project.

Locally you can use `-Dgradle.cache.local.enabled=true` to enable the local Gradle Enterprise cache. This can speed up the build significantly. It is still considered experimental but can be used for local development.

If you have a need or interest to report build times, you will need to get an API key for the GE instance. It is mainly relevant for those working on optimizing the Quarkus build. Ping on quarkus-dev mailing list or on Zulip if you need one.

When you have the account setup you run `mvn gradle-enterprise:provision-access-key` and login - from then on build time info will be sent to the GE instance.
You can alternatively also generate an API key from the GE UI and then use an environment variable like this:

```
export GRADLE_ENTERPRISE_ACCESS_KEY=ge.quarkus.io=a_secret_key
```

## Release your own version

You might want to release your own patched version of Quarkus to an internal repository.
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
https://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
[![Project Chat](https://img.shields.io/badge/zulip-join_chat-brightgreen.svg?style=for-the-badge&logo=zulip)](https://quarkusio.zulipchat.com/)
[![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-Ready--to--Code-blue?style=for-the-badge&logo=gitpod&logoColor=white)](https://gitpod.io/#https://github.com/quarkusio/quarkus/-/tree/main/)
[![Supported JVM Versions](https://img.shields.io/badge/JVM-11--17--19-brightgreen.svg?style=for-the-badge&logo=openjdk)](https://github.com/quarkusio/quarkus/actions/runs/113853915/)
[![Gradle Enterprise](https://img.shields.io/badge/Revved%20up%20by-Gradle%20Enterprise-06A0CE?style=for-the-badge&logo=gradle)](https://ge.quarkus.io/scans)

# Quarkus - Supersonic Subatomic Java

Expand Down
Loading

0 comments on commit e7b601d

Please sign in to comment.