Skip to content

Commit

Permalink
Merge branch 'main' into issue6006
Browse files Browse the repository at this point in the history 
Signed-off-by: Jorge Bescos Gascon <[email protected]>
  • Loading branch information
@jbescos
jbescos committed Jun 27, 2023
2 parents 127d608 + a4883bf commit 0ab0c06
Show file tree
Hide file tree
Showing 1,426 changed files with 43,772 additions and 83,100 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/validate.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on: [pull_request, push]

env:
JAVA_VERSION: '20'
JAVA_DISTRO: 'temurin'
JAVA_DISTRO: 'oracle'
HELIDON_PIPELINES: 'true'
MAVEN_HTTP_ARGS: '-Dmaven.wagon.httpconnectionManager.ttlSeconds=60 -Dmaven.wagon.http.retryHandler.count=3'

Expand All @@ -25,7 +25,7 @@ jobs:
with:
fetch-depth: 0
- name: Set up JDK ${{ env.JAVA_VERSION }}
uses: actions/setup-java@v3.6.0
uses: actions/setup-java@v3.11.0
with:
distribution: ${{ env.JAVA_DISTRO }}
java-version: ${{ env.JAVA_VERSION }}
Expand All @@ -38,7 +38,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Set up JDK ${{ env.JAVA_VERSION }}
uses: actions/setup-java@v3.6.0
uses: actions/setup-java@v3.11.0
with:
distribution: ${{ env.JAVA_DISTRO }}
java-version: ${{ env.JAVA_VERSION }}
Expand All @@ -51,7 +51,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Set up JDK ${{ env.JAVA_VERSION }}
uses: actions/setup-java@v3.6.0
uses: actions/setup-java@v3.11.0
with:
distribution: ${{ env.JAVA_DISTRO }}
java-version: ${{ env.JAVA_VERSION }}
Expand All @@ -64,7 +64,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Set up JDK ${{ env.JAVA_VERSION }}
uses: actions/setup-java@v3.6.0
uses: actions/setup-java@v3.11.0
with:
distribution: ${{ env.JAVA_DISTRO }}
java-version: ${{ env.JAVA_VERSION }}
Expand All @@ -80,7 +80,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Set up JDK ${{ env.JAVA_VERSION }}
uses: actions/setup-java@v3.6.0
uses: actions/setup-java@v3.11.0
with:
distribution: ${{ env.JAVA_DISTRO }}
java-version: ${{ env.JAVA_VERSION }}
Expand All @@ -96,7 +96,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Set up JDK ${{ env.JAVA_VERSION }}
uses: actions/setup-java@v3.6.0
uses: actions/setup-java@v3.11.0
with:
distribution: ${{ env.JAVA_DISTRO }}
java-version: ${{ env.JAVA_VERSION }}
Expand All @@ -116,7 +116,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Set up JDK ${{ env.JAVA_VERSION }}
uses: actions/setup-java@v3.6.0
uses: actions/setup-java@v3.11.0
with:
distribution: ${{ env.JAVA_DISTRO }}
java-version: ${{ env.JAVA_VERSION }}
Expand All @@ -132,7 +132,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Set up JDK ${{ env.JAVA_VERSION }}
uses: actions/setup-java@v3.6.0
uses: actions/setup-java@v3.11.0
with:
distribution: ${{ env.JAVA_DISTRO }}
java-version: ${{ env.JAVA_VERSION }}
Expand All @@ -148,7 +148,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Set up JDK ${{ env.JAVA_VERSION }}
uses: actions/setup-java@v3.6.0
uses: actions/setup-java@v3.11.0
with:
distribution: ${{ env.JAVA_DISTRO }}
java-version: ${{ env.JAVA_VERSION }}
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@ 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.0-M1]

### CHANGES

- grpc module has fewer features (temporary)
- MicroProfile grpc module is removed from Helidon (temporary)

## [4.0.0-ALPHA3]

This is the third Alpha build of Helidon 4.0.0 and is intended as a preview release only. Do not use this release in production. It is suitable only for experimentation. APIs are subject to change. Documentation is incomplete. And some functionality is experimental and not fully tested.
Expand Down
1 change: 1 addition & 0 deletions ...pes/helidon/src/main/archetype/nima/common/files/src/main/java/__pkg__/Main.java.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ public final class Main {
WebServer server = WebServer.builder()
.routing(Main::routing)
.build()
.start();
System.out.println("WEB server is up! http://localhost:" + server.port() + "/greet");
Expand Down
97 changes: 21 additions & 76 deletions bom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,56 +137,11 @@
<version>${helidon.version}</version>
</dependency>
<!-- gRPC -->
<dependency>
<groupId>io.helidon.grpc</groupId>
<artifactId>helidon-grpc-client</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.grpc</groupId>
<artifactId>io.grpc</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.grpc</groupId>
<artifactId>helidon-grpc-core</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.grpc</groupId>
<artifactId>helidon-grpc-server</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.grpc</groupId>
<artifactId>helidon-grpc-metrics</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.microprofile.grpc</groupId>
<artifactId>helidon-microprofile-grpc-core</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.microprofile.grpc</groupId>
<artifactId>helidon-microprofile-grpc-server</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.microprofile.grpc</groupId>
<artifactId>helidon-microprofile-grpc-metrics</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.microprofile.grpc</groupId>
<artifactId>helidon-microprofile-grpc-client</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.microprofile</groupId>
<artifactId>helidon-microprofile-cors</artifactId>
<version>${helidon.version}</version>
</dependency>
<!-- graphQL -->
<dependency>
<groupId>io.helidon.graphql</groupId>
Expand Down Expand Up @@ -387,11 +342,6 @@
<artifactId>helidon-security-integration-common</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.security.integration</groupId>
<artifactId>helidon-security-integration-grpc</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.security.integration</groupId>
<artifactId>helidon-security-integration-jersey</artifactId>
Expand Down Expand Up @@ -681,6 +631,16 @@
<artifactId>helidon-common-types</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.common.processor</groupId>
<artifactId>helidon-common-processor</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.common.processor</groupId>
<artifactId>helidon-common-processor-helidon-copyright</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.common.testing</groupId>
<artifactId>helidon-common-testing-junit5</artifactId>
Expand Down Expand Up @@ -1092,6 +1052,11 @@
<artifactId>helidon-cors</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.microprofile</groupId>
<artifactId>helidon-microprofile-cors</artifactId>
<version>${helidon.version}</version>
</dependency>
<!-- Messaging -->
<dependency>
<groupId>io.helidon.messaging</groupId>
Expand Down Expand Up @@ -1395,6 +1360,11 @@
<artifactId>helidon-nima-fault-tolerance</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.nima.fault-tolerance</groupId>
<artifactId>helidon-nima-fault-tolerance-processor</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.nima.openapi</groupId>
<artifactId>helidon-nima-openapi</artifactId>
Expand All @@ -1404,39 +1374,14 @@
<!-- Builder -->
<dependency>
<groupId>io.helidon.builder</groupId>
<artifactId>helidon-builder</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.builder</groupId>
<artifactId>helidon-builder-processor-spi</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.builder</groupId>
<artifactId>helidon-builder-processor-tools</artifactId>
<artifactId>helidon-builder-api</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.builder</groupId>
<artifactId>helidon-builder-processor</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.builder</groupId>
<artifactId>helidon-builder-config</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.builder</groupId>
<artifactId>helidon-builder-config-processor</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.builder</groupId>
<artifactId>helidon-builder-testing</artifactId>
<version>${helidon.version}</version>
</dependency>

<!-- Pico Core -->
<dependency>
Expand Down
Loading

0 comments on commit 0ab0c06

Please sign in to comment.