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 <[email protected]>
  • Loading branch information
jbescos committed Nov 4, 2024
2 parents 5584c6a + 89a3a4f commit 8649cee
Show file tree
Hide file tree
Showing 440 changed files with 32,600 additions and 1,843 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ jobs:
strategy:
matrix:
os: [ ubuntu-20.04, macos-14 ]
module: [ mp-1, mp-2, mp-3, se-1 ]
module: [ mp-1, mp-2, mp-3, se-1, inject ]
include:
- { os: ubuntu-20.04, platform: linux }
- { os: macos-14, platform: macos }
Expand Down
18 changes: 10 additions & 8 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ We welcome your contributions! There are multiple ways to contribute.

Join us at [#helidon-users](http://slack.helidon.io) and participate in discussions.

## Issues
## Opening Issues

If you hit a bug or have an enhancement request then file a [GitHub issue](https://github.com/oracle/helidon/issues).
When filing a bug remember that the better written the bug is, the more likely it is
Expand All @@ -19,20 +19,22 @@ to be fixed. Please include:
4. Version of Docker or Kubernetes or other software if it's relevant to your issue
5. Steps to reproduce

## Code
## Contributing Code

We welcome code contributions, but we need the contributor to sign the
[Oracle Contributor Agreement (OCA)](https://oca.opensource.oracle.com)
first.

The process:
## Pull Request Process

0. Sign the [OCA](https://oca.opensource.oracle.com)
1. Fork the repo
2. Fix an issue or create an issue and fix it
3. Create a Pull Request that fixes the issue. Follow [DEV-GUIDELINES](DEV-GUIDELINES.md) for a list of rules and best practices followed by project Helidon.
4. Watch your PR for pipeline results. If there are failures then fix them.
5. We will review your PR and merge as appropriate.
1. Ensure there is an issue created to track and discuss the fix or enhancement you intend to submit.
2. Fork this repository.
3. Create a branch in your fork to implement the changes. We recommend using the issue number as part of your branch name, e.g. 1234-fixes. Follow [DEV-GUIDELINES](DEV-GUIDELINES.md) for a list of rules and best practices followed by project Helidon.
4. Ensure that any documentation is updated with the changes that are required by your change.
5. Ensure that any samples are updated if the base image has been changed.
6. Submit the pull request. Do not leave the pull request blank. Explain exactly what your changes are meant to do and provide simple steps on how to validate. your changes. Ensure that you reference the issue you created as well.
7. We will assign the pull request to 2-3 people for review before it is merged

## Code of Conduct

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ but a couple are handy to use on your desktop to verify your changes.
* Ask questions on Stack Overflow using the [helidon tag](https://stackoverflow.com/tags/helidon)
* Join us on Slack: [#helidon-users](http://slack.helidon.io)

## Get Involved
## Contributing

* Learn how to [contribute](CONTRIBUTING.md)
* See [issues](https://github.com/oracle/helidon/issues) for issues you can help with
Expand Down
12 changes: 12 additions & 0 deletions all/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1128,6 +1128,18 @@
<groupId>io.helidon.service</groupId>
<artifactId>helidon-service-codegen</artifactId>
</dependency>
<dependency>
<groupId>io.helidon.service.inject</groupId>
<artifactId>helidon-service-inject-codegen</artifactId>
</dependency>
<dependency>
<groupId>io.helidon.service.inject</groupId>
<artifactId>helidon-service-inject-api</artifactId>
</dependency>
<dependency>
<groupId>io.helidon.service.inject</groupId>
<artifactId>helidon-service-inject</artifactId>
</dependency>
<dependency>
<groupId>io.helidon.metadata</groupId>
<artifactId>helidon-metadata-hson</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ java.util.logging.SimpleFormatter.format=%1$tY.%1$tm.%1$td %1$tH:%1$tM:%1$tS %4$
# Quiet Weld
org.jboss.level=WARNING

# Quiet Jersey wadl support
org.glassfish.jersey.server.wadl.level=SEVERE

# Component specific log levels
#io.helidon.config.level=INFO
#io.helidon.security.level=INFO
Expand Down
15 changes: 15 additions & 0 deletions bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1491,6 +1491,21 @@
<artifactId>helidon-service-codegen</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.service.inject</groupId>
<artifactId>helidon-service-inject-codegen</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.service.inject</groupId>
<artifactId>helidon-service-inject-api</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.service.inject</groupId>
<artifactId>helidon-service-inject</artifactId>
<version>${helidon.version}</version>
</dependency>

<!-- Metadata -->
<dependency>
Expand Down
Loading

0 comments on commit 8649cee

Please sign in to comment.