Skip to content

Commit

Permalink
Merge with main
Browse files Browse the repository at this point in the history
Signed-off-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
  • Loading branch information
jbescos committed Aug 7, 2024
2 parents 1ae8648 + a07579b commit 8247e52
Show file tree
Hide file tree
Showing 2,174 changed files with 32,860 additions and 112,635 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/assign-issue-to-project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ jobs:
steps:
- name: Check out repository code
uses: actions/checkout@v4
- run: etc/scripts/actions/assign-issue-to-project.sh $GITHUB_REPOSITORY ${{ github.event.issue.number }} Backlog Triage
- run: etc/scripts/assign-issue-to-project.sh $GITHUB_REPOSITORY ${{ github.event.issue.number }} Backlog Triage
2 changes: 1 addition & 1 deletion .github/workflows/create-backport-issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ jobs:
steps:
- name: Check out repository code
uses: actions/checkout@v4
- run: etc/scripts/actions/create-backport-issues.sh $GITHUB_REPOSITORY ${{ github.event.inputs.issue }} ${{ github.event.inputs.version }} ${{ github.event.inputs.target-2 }} ${{ github.event.inputs.target-3 }} ${{ github.event.inputs.target-4 }}
- run: etc/scripts/create-backport-issues.sh $GITHUB_REPOSITORY ${{ github.event.inputs.issue }} ${{ github.event.inputs.version }} ${{ github.event.inputs.target-2 }} ${{ github.event.inputs.target-3 }} ${{ github.event.inputs.target-4 }}
198 changes: 176 additions & 22 deletions .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,18 @@ name: "Validate"

on:
pull_request:
push:
branches-ignore: [ 'main', 'helidon-*.x', 'release-*' ]
tags-ignore: [ '**' ]
workflow_call:

env:
JAVA_VERSION: '21'
JAVA_DISTRO: 'oracle'
HELIDON_PIPELINES: 'true'
MAVEN_HTTP_ARGS: '-Dmaven.wagon.httpconnectionManager.ttlSeconds=60 -Dmaven.wagon.http.retryHandler.count=3'
MAVEN_ARGS: |
-B -fae -e
-Dmaven.wagon.httpconnectionManager.ttlSeconds=60
-Dmaven.wagon.http.retryHandler.count=3
concurrency:
group: Validate-${{ github.ref }}
Expand Down Expand Up @@ -47,6 +52,13 @@ jobs:
cache: maven
- name: Checkstyle
run: etc/scripts/checkstyle.sh
shellcheck:
timeout-minutes: 5
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v4
- name: ShellCheck
run: etc/scripts/shellcheck.sh
spotbugs:
timeout-minutes: 45
runs-on: ubuntu-20.04
Expand All @@ -59,7 +71,12 @@ jobs:
java-version: ${{ env.JAVA_VERSION }}
cache: maven
- name: Spotbugs
run: etc/scripts/spotbugs.sh
run: |
mvn ${MAVEN_ARGS} -e \
-DskipTests \
-Dmaven.test.skip=true \
-Pspotbugs \
install
docs:
timeout-minutes: 30
runs-on: ubuntu-20.04
Expand All @@ -72,7 +89,14 @@ jobs:
java-version: ${{ env.JAVA_VERSION }}
cache: maven
- name: Docs
run: etc/scripts/docs.sh
run: |
mvn ${MAVEN_ARGS} \
-DskipTests \
install
mvn ${MAVEN_ARGS} \
-f docs/pom.xml \
-Pjavadoc \
install
build:
timeout-minutes: 60
strategy:
Expand All @@ -88,7 +112,11 @@ jobs:
java-version: ${{ env.JAVA_VERSION }}
cache: maven
- name: Maven build
run: etc/scripts/github-build.sh
run: |
mvn ${MAVEN_ARGS} \
-Dmaven.test.failure.ignore=false \
-Pjavadoc,sources,tests \
install
examples:
timeout-minutes: 40
strategy:
Expand All @@ -105,25 +133,30 @@ jobs:
cache: maven
- uses: graalvm/setup-graalvm@v1
with:
java-version: 21
java-version: ${{ env.JAVA_VERSION }}
distribution: graalvm-community
github-token: ${{ secrets.GITHUB_TOKEN }}
native-image-job-reports: true
cache: maven
- name: Maven build
run: |
mvn -B -e "-Dmaven.test.skip=true" $MAVEN_HTTP_ARGS -DskipTests -Ppipeline install
cd examples
mvn -B verify
# prime build
mvn ${MAVEN_ARGS} -T8 \
-DskipTests \
install
- name: Examples build
run: etc/scripts/build-examples.sh
- name: Test quickstarts native image
run: etc/scripts/test-quickstarts.sh
mp-tck:
timeout-minutes: 60
name: "MicroProfile TCKs"
strategy:
matrix:
os: [ ubuntu-20.04 ]
include:
- { os: ubuntu-20.04, platform: linux }
runs-on: ${{ matrix.os }}
name: tests/tck-${{ matrix.platform }}
steps:
- uses: actions/checkout@v4
- name: Set up JDK ${{ env.JAVA_VERSION }}
Expand All @@ -133,7 +166,15 @@ jobs:
java-version: ${{ env.JAVA_VERSION }}
cache: maven
- name: Maven build
run: etc/scripts/mp-tck.sh
run: |
# prime build
mvn ${MAVEN_ARGS} -T8 \
-DskipTests \
install
mvn ${MAVEN_ARGS} \
-f microprofile/tests/tck/pom.xml \
-Ptck-ft \
verify
archetypes:
timeout-minutes: 45
strategy:
Expand All @@ -149,27 +190,140 @@ jobs:
java-version: ${{ env.JAVA_VERSION }}
cache: maven
- name: Test archetypes
run: etc/scripts/test-archetypes.sh
run: |
# prime build
mvn ${MAVEN_ARGS} -T8 \
-DskipTests \
install
mvn ${MAVEN_ARGS} -e \
-f archetypes/pom.xml \
install
packaging:
timeout-minutes: 60
timeout-minutes: 30
strategy:
matrix:
os: [ ubuntu-20.04, macos-14]
os: [ ubuntu-20.04, macos-14 ]
packaging: [ jar, jlink ]
include:
- { os: ubuntu-20.04, platform: linux }
- { os: macos-14, platform: macos }
runs-on: ${{ matrix.os }}
name: tests/packaging-${{ matrix.packaging }}-${{ matrix.platform }}
steps:
- uses: actions/checkout@v4
with:
ref: ${{ inputs.ref }}
- name: Set up JDK ${{ env.JAVA_VERSION }}
uses: actions/setup-java@v4.1.0
with:
distribution: ${{ env.JAVA_DISTRO }}
java-version: ${{ env.JAVA_VERSION }}
cache: maven
- name: Free Space
shell: bash
run: |
# See https://github.com/actions/runner-images/issues/2840
sudo rm -rf /usr/share/dotnet
sudo rm -rf /usr/local/share/powershell
- name: Build Helidon
run: |
# prime build
mvn ${MAVEN_ARGS} -T4 \
-DskipTests \
-Ptests \
install
- name: Run Test
run: |
mvn ${MAVEN_ARGS} \
-f tests/integration/packaging/pom.xml \
-P${{ matrix.packaging }}-image \
verify
native-image:
timeout-minutes: 30
strategy:
matrix:
os: [ ubuntu-20.04, macos-14 ]
module: [ mp-1, mp-2, mp-3, se-1 ]
include:
- { os: ubuntu-20.04, platform: linux }
- { os: macos-14, platform: macos }
runs-on: ${{ matrix.os }}
name: tests/native-image-${{ matrix.module }}-${{ matrix.platform }}
steps:
- uses: actions/checkout@v4
with:
ref: ${{ inputs.ref }}
- uses: graalvm/setup-graalvm@v1
with:
java-version: 21
java-version: ${{ env.JAVA_VERSION }}
distribution: graalvm-community
github-token: ${{ secrets.GITHUB_TOKEN }}
native-image-job-reports: true
cache: maven
- name: Free Space
shell: bash
run: |
# See https://github.com/actions/runner-images/issues/2840
sudo rm -rf /usr/share/dotnet
sudo rm -rf /usr/local/share/powershell
- name: Build Helidon
run: etc/scripts/github-compile.sh
- name: JAR packaging
run: etc/scripts/test-packaging-jar.sh
- name: JLink packaging
run: etc/scripts/test-packaging-jlink.sh
- name: Native-Image packaging
run: etc/scripts/test-packaging-native.sh
run: |
# prime build
mvn ${MAVEN_ARGS} -T4 \
-DskipTests \
-Ptests \
install
- name: Run Test
run: |
mvn ${MAVEN_ARGS} -e \
-f tests/integration/packaging/pom.xml \
-pl ${{ matrix.module }} \
-Pnative-image \
-am \
verify
dbclient:
timeout-minutes: 60
strategy:
matrix:
os: [ ubuntu-20.04 ]
group: [ oracle, others ]
include:
- { group: others, modules: '!oracle' }
- { os: ubuntu-20.04, platform: linux }
runs-on: ${{ matrix.os }}
name: tests/dbclient-${{ matrix.group }}-${{ matrix.platform }}
steps:
- uses: actions/checkout@v4
- name: Set up JDK ${{ env.JAVA_VERSION }}
uses: actions/setup-java@v4.1.0
with:
distribution: ${{ env.JAVA_DISTRO }}
java-version: ${{ env.JAVA_VERSION }}
cache: maven
- name: Free Space
shell: bash
run: |
# See https://github.com/actions/runner-images/issues/2840
sudo rm -rf /usr/share/dotnet
sudo rm -rf /usr/local/share/powershell
- name: Build Helidon
run: |
# prime build
mvn ${MAVEN_ARGS} -T4 \
-DskipTests \
-Ptests \
install
- name: Run Tests
run: |
mvn ${MAVEN_ARGS} \
-f tests/integration/dbclient/pom.xml \
-pl ${{ matrix.modules || matrix.group }} \
-am \
verify
gate:
runs-on: ubuntu-20.04
needs: [ copyright, checkstyle, shellcheck, build, docs, spotbugs, packaging, native-image, dbclient, archetypes, mp-tck ]
steps:
- shell: bash
run: |
echo OK
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ node/
# Helidon CLI
.helidon

# Helidon examples repository
helidon-examples

# Other
*~
user.txt
Expand Down
46 changes: 46 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,50 @@ For Helidon 2.x releases please see [Helidon 2.x CHANGELOG.md](https://github.co

For Helidon 1.x releases please see [Helidon 1.x CHANGELOG.md](https://github.com/oracle/helidon/blob/helidon-1.x/CHANGELOG.md)


## [4.0.11]

This release contains important bugfixes and is recommended for all users of Helidon 4.

Java 21 is required to use Helidon 4

### CHANGES

- Common: Update UriEncoding.decode to expose a decodeQuery method [9009](https://github.com/helidon-io/helidon/pull/9009)
- JTA: Removes usage of ConcurrentHashMap in LocalXAResource.java [8988](https://github.com/helidon-io/helidon/pull/8988)
- Metrics: Add RW locking to better manage concurrency [8999](https://github.com/helidon-io/helidon/pull/8999)
- Metrics: Properly handle disabled metrics in MP [8976](https://github.com/helidon-io/helidon/pull/8976)
- Observability: Convert `ConcurrentHashMap` which does service loading to `HashMap` with reentrant lock [8991](https://github.com/helidon-io/helidon/pull/8991)
- Tracing: After retrieval check baggage entry for null before dereferencing it [8975](https://github.com/helidon-io/helidon/pull/8975)
- WebClient: Attempt to read an unconsumed response entity to allow connection caching [8996](https://github.com/helidon-io/helidon/pull/8996)
- WebClient: Moves client protocol ID caching from HttpClientRequest to WebClient [8987](https://github.com/helidon-io/helidon/pull/8987)
- WebServer: Fix problem where throwing an Error would close connection but send keep-alive [9016](https://github.com/helidon-io/helidon/pull/9016)
- WebServer: Skips content encoding of empty entities. [9008](https://github.com/helidon-io/helidon/pull/9008)
- WebServer: Update max-prologue-length from 2048 to 4096 to align with 3.x [9010](https://github.com/helidon-io/helidon/pull/9010)
- Dependencies: Update eclipselink to 4.0.4 [9017](https://github.com/helidon-io/helidon/pull/9017)
- Dependencies: Upgrade oci-sdk to 3.43.2 [8961](https://github.com/helidon-io/helidon/pull/8961)
- Examples: Archetype: Remove unused config property from generated code [8990](https://github.com/helidon-io/helidon/pull/8990)
- Examples: Archetype: fix database app-type typo (#8963) [8989](https://github.com/helidon-io/helidon/pull/8989)
- Testing: Skip test if InstancePrincipal UT if Imds is available [8992](https://github.com/helidon-io/helidon/pull/8992)

## [4.0.10]

This release contains important bugfixes and enhancements and is recommended for all users of Helidon 4.

Java 21 is required to use Helidon 4.0.10.

### CHANGES

- Fault Tolerance: implement a new method caching strategy in fault tolerance. [8842](https://github.com/helidon-io/helidon/pull/8842)
- Tracing: Reorder checking of delegate vs. wrapper in OTel tracer unwrap ( [8859](https://github.com/helidon-io/helidon/pull/8859)
- Tracing: tracer information propagation across threads using Helidon context [8847](https://github.com/helidon-io/helidon/pull/8847)
- WebServer: HTTP2-Settings needs to be encoded/decoded to Base64 with url dialect [8853](https://github.com/helidon-io/helidon/pull/8853)
- WebServer: Fix handling of invalid end of line in HTTP header parsing. Added tests [8843](https://github.com/helidon-io/helidon/pull/8843)
- WebServer: Retrieve the correct requested URI info path value, indpt of the routing path used to locate the handler [8844](https://github.com/helidon-io/helidon/pull/8844)
- WebServer: register routing in weighted order of Server and HTTP Features [8840](https://github.com/helidon-io/helidon/pull/8840)
- Native Image: Updates to support latest dev release of GraalVM native image [8838](https://github.com/helidon-io/helidon/pull/8838)
- Security: JWT improvements [8865](https://github.com/helidon-io/helidon/pull/8865)

## [4.0.9]

This release contains important bugfixes and ehancements and is recommended for all users of Helidon 4.
Expand Down Expand Up @@ -1217,6 +1261,8 @@ Helidon 4.0.0 is a major release that includes significant new features and fixe
- MicroProfile: MP path based static content should use index.html (4.x) [4737](https://github.com/oracle/helidon/pull/4737)
- Build: 4.0 version and poms [4655](https://github.com/oracle/helidon/pull/4655)

[4.0.11]: https://github.com/oracle/helidon/compare/4.0.10...4.0.11
[4.0.10]: https://github.com/oracle/helidon/compare/4.0.9...4.0.10
[4.0.9]: https://github.com/oracle/helidon/compare/4.0.8...4.0.9
[4.0.8]: https://github.com/oracle/helidon/compare/4.0.7...4.0.8
[4.0.7]: https://github.com/oracle/helidon/compare/4.0.6...4.0.7
Expand Down
Loading

0 comments on commit 8247e52

Please sign in to comment.