Merge with main branch

Signed-off-by: Jorge Bescos Gascon <[email protected]>

.github/workflows/release.yaml

@@ -21,11 +21,11 @@ jobs:
     timeout-minutes: 10
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up JDK ${{ env.JAVA_VERSION }}
-        uses: actions/setup-java@v3.11.0
+        uses: actions/setup-java@v4.1.0
         with:
           distribution: ${{ env.JAVA_DISTRO }}
           java-version: ${{ env.JAVA_VERSION }}
@@ -37,12 +37,12 @@ jobs:
     runs-on: ubuntu-20.04
     environment: release
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           token: ${{ secrets.SERVICE_ACCOUNT_TOKEN }}
           fetch-depth: '0'
       - name: Set up JDK 17
-        uses: actions/setup-java@v3.11.0
+        uses: actions/setup-java@v4.1.0
         with:
           distribution: ${{ env.JAVA_DISTRO }}
           java-version: ${{ env.JAVA_VERSION }}

.github/workflows/snapshotrelease.yaml

@@ -22,11 +22,11 @@ jobs:
     runs-on: ubuntu-20.04
     environment: release
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: '0'
       - name: Set up JDK 17
-        uses: actions/setup-java@v3.11.0
+        uses: actions/setup-java@v4.1.0
         with:
           distribution: ${{ env.JAVA_DISTRO }}
           java-version: ${{ env.JAVA_VERSION }}

.github/workflows/validate.yaml

@@ -29,11 +29,11 @@ jobs:
     timeout-minutes: 10
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up JDK ${{ env.JAVA_VERSION }}
-        uses: actions/setup-java@v3.11.0
+        uses: actions/setup-java@v4.1.0
         with:
           distribution: ${{ env.JAVA_DISTRO }}
           java-version: ${{ env.JAVA_VERSION }}
@@ -44,9 +44,9 @@ jobs:
     timeout-minutes: 10
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK ${{ env.JAVA_VERSION }}
-        uses: actions/setup-java@v3.11.0
+        uses: actions/setup-java@v4.1.0
         with:
           distribution: ${{ env.JAVA_DISTRO }}
           java-version: ${{ env.JAVA_VERSION }}
@@ -57,9 +57,9 @@ jobs:
     timeout-minutes: 45
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK ${{ env.JAVA_VERSION }}
-        uses: actions/setup-java@v3.11.0
+        uses: actions/setup-java@v4.1.0
         with:
           distribution: ${{ env.JAVA_DISTRO }}
           java-version: ${{ env.JAVA_VERSION }}
@@ -73,9 +73,9 @@ jobs:
         os: [ ubuntu-20.04 ]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK ${{ env.JAVA_VERSION }}
-        uses: actions/setup-java@v3.11.0
+        uses: actions/setup-java@v4.1.0
         with:
           distribution: ${{ env.JAVA_DISTRO }}
           java-version: ${{ env.JAVA_VERSION }}
@@ -94,9 +94,9 @@ jobs:
     timeout-minutes: 10
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK ${{ env.JAVA_VERSION }}
-        uses: actions/setup-java@v3.11.0
+        uses: actions/setup-java@v4.1.0
         with:
           distribution: ${{ env.JAVA_DISTRO }}
           java-version: ${{ env.JAVA_VERSION }}
@@ -110,9 +110,9 @@ jobs:
         os: [ ubuntu-20.04 ]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK ${{ env.JAVA_VERSION }}
-        uses: actions/setup-java@v3.11.0
+        uses: actions/setup-java@v4.1.0
         with:
           distribution: ${{ env.JAVA_DISTRO }}
           java-version: ${{ env.JAVA_VERSION }}
@@ -121,23 +121,31 @@ jobs:
         run: etc/scripts/github-tck.sh
   examples:
     timeout-minutes: 30
+    continue-on-error: true
     strategy:
       matrix:
         os: [ ubuntu-20.04, macos-latest ]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK ${{ env.JAVA_VERSION }}
-        uses: actions/setup-java@v3.11.0
+        uses: actions/setup-java@v4.1.0
         with:
           distribution: ${{ env.JAVA_DISTRO }}
           java-version: ${{ env.JAVA_VERSION }}
           cache: maven
       - name: Maven build
         run: |
-          mvn -B -e "-Dmaven.test.skip=true" $MAVEN_HTTP_ARGS -DskipTests -Ppipeline install 
-          cd examples
-          mvn -B verify
+          mvn -B -e "-Dmaven.test.skip=true" $MAVEN_HTTP_ARGS -DskipTests -Ppipeline install
+      - name: Examples checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: '0'
+          repository: helidon-io/helidon-examples.git
+          ref: dev-3.x
+          path: helidon-examples
+      - name: Examples build
+        run: etc/scripts/build-examples.sh
   archetypes:
     timeout-minutes: 30
     strategy:
@@ -147,7 +155,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Set up JDK ${{ env.JAVA_VERSION }}
-        uses: actions/setup-java@v3.11.0
+        uses: actions/setup-java@v4.1.0
         with:
           distribution: ${{ env.JAVA_DISTRO }}
           java-version: ${{ env.JAVA_VERSION }}
@@ -172,7 +180,7 @@ jobs:
           set-java-home: false
           cache: maven
       - name: Set up JDK ${{ env.JAVA_VERSION }}
-        uses: actions/setup-java@v3.11.0
+        uses: actions/setup-java@v4.1.0
         with:
           distribution: ${{ env.JAVA_DISTRO }}
           java-version: ${{ env.JAVA_VERSION }}

.gitignore

@@ -68,6 +68,9 @@ node/
 # Helidon CLI
 .helidon
 
+# Helidon examples repository
+helidon-examples
+
 # Other
 *~
 user.txt

archetypes/helidon/src/main/archetype/common/files/application.http-signature.yaml

@@ -5,7 +5,7 @@
             - key-id: "service1-hmac"
               principal-name: "Service1 - HMAC signature"
               # See [EncryptionFilter](https://helidon.io/docs/latest/apidocs/io.helidon.config.encryption/io/helidon/config/encryption/EncryptionFilter.html) for details about encrypting passwords in configuration files.
-              hmac.secret: "somePasswordForHmacShouldBeEncrypted"
+              hmac.secret: "changeit"
             - key-id: "service1-rsa"
               principal-name: "Service1 - RSA signature"
               public-key:
@@ -17,6 +17,6 @@
                   # defaults to jdk default
                   # keystore-type: "PKCS12"
                   # password of the keystore
-                  passphrase: "password"
+                  passphrase: "changeit"
                   # alias of the certificate to get public key from
                   cert.alias: "service_cert"

archetypes/helidon/src/main/archetype/mp/custom/database.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2022, 2023 Oracle and/or its affiliates.
+    Copyright (c) 2022, 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -278,7 +278,7 @@ Instructions for H2 can be found here: https://www.h2database.com/html/cheatShee
                                 <model>
                                     <value key="helidon-test">false</value>
                                     <value key="readme-description">Helidon MP application that uses the dbclient API with MySQL database.</value>
-                                    <value key="readme-native-docker">docker run --rm --name mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=root -e MYSQL_DATABASE=pokemon -e MYSQL_USER=user -e MYSQL_PASSWORD=password  mysql:5.7</value>
+                                    <value key="readme-native-docker">docker run --rm --name mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=root -e MYSQL_DATABASE=pokemon -e MYSQL_USER=user -e MYSQL_PASSWORD=changeit  mysql:5.7</value>
                                     <value key="readme-native-url">url: jdbc:mysql:tcp://127.0.0.1:3306/pokemon?useSSL=false</value>
                                     <value key="integration-artifactId">helidon-integrations-db-mysql</value>
                                     <value key="db">MySQL</value>
@@ -287,7 +287,7 @@ Instructions for H2 can be found here: https://www.h2database.com/html/cheatShee
 This example requires a MySQL database, start it using docker:
 
 ```
-docker run --rm --name mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=root -e MYSQL_DATABASE=pokemon -e MYSQL_USER=user -e MYSQL_PASSWORD=password  mysql:5.7
+docker run --rm --name mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=root -e MYSQL_DATABASE=pokemon -e MYSQL_USER=user -e MYSQL_PASSWORD=changeit  mysql:5.7
 ```
 ]]></value>
                                     </list>
@@ -311,7 +311,7 @@ docker run --rm --name mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=root -e MYSQL_D
                                     <value key="jdbcDataSource">com.mysql.cj.jdbc.MysqlDataSource</value>
                                     <value key="databaseUrl">jdbc:mysql://127.0.0.1:3306/pokemon?useSSL=false</value>
                                     <value key="dbUser">user</value>
-                                    <value key="userPassword">password</value>
+                                    <value key="userPassword">changeit</value>
                                 </model>
                             </output>
                         </option>

archetypes/helidon/src/main/archetype/se/custom/database.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2022, 2023 Oracle and/or its affiliates.
+    Copyright (c) 2022, 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -154,7 +154,7 @@ Instructions for H2 can be found here: https://www.h2database.com/html/cheatShee
                             <output>
                                 <model>
                                     <value key="readme-description">Helidon SE application that uses the dbclient API with MySQL database.</value>
-                                    <value key="readme-native-docker">docker run --rm --name mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=root -e MYSQL_DATABASE=pokemon -e MYSQL_USER=user -e MYSQL_PASSWORD=password  mysql:5.7</value>
+                                    <value key="readme-native-docker">docker run --rm --name mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=root -e MYSQL_DATABASE=pokemon -e MYSQL_USER=user -e MYSQL_PASSWORD=changeit  mysql:5.7</value>
                                     <value key="readme-native-url">url: jdbc:mysql:tcp://127.0.0.1:3306/pokemon?useSSL=false</value>
                                     <value key="integration-artifactId">helidon-integrations-db-mysql</value>
                                     <value key="db">MySQL</value>
@@ -163,7 +163,7 @@ Instructions for H2 can be found here: https://www.h2database.com/html/cheatShee
 This example requires a MySQL database, start it using docker:
 
 ```
-docker run --rm --name mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=root -e MYSQL_DATABASE=pokemon -e MYSQL_USER=user -e MYSQL_PASSWORD=password  mysql:5.7
+docker run --rm --name mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=root -e MYSQL_DATABASE=pokemon -e MYSQL_USER=user -e MYSQL_PASSWORD=changeit  mysql:5.7
 ```
 ]]></value>
                                     </list>

archetypes/helidon/src/main/archetype/se/custom/files/application.mysql.yaml

@@ -1,10 +1,10 @@
 db:
   source: jdbc
   connection:
-    # docker run --rm --name mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=root -e MYSQL_DATABASE=pokemon -e MYSQL_USER=user -e MYSQL_PASSWORD=password  mysql:5.7
+    # docker run --rm --name mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=root -e MYSQL_DATABASE=pokemon -e MYSQL_USER=user -e MYSQL_PASSWORD=changeit  mysql:5.7
     url: jdbc:mysql://127.0.0.1:3306/pokemon?useSSL=false
     username: user
-    password: password
+    password: changeit
     poolName: mysql
     initializationFailTimeout: -1
     connectionTimeout: 2000

dependencies/pom.xml

@@ -146,7 +146,7 @@
         <version.lib.opentracing.tracerresolver>0.1.8</version.lib.opentracing.tracerresolver>
         <version.lib.perfmark-api>0.25.0</version.lib.perfmark-api>
         <version.lib.parsson>1.0.5</version.lib.parsson>
-        <version.lib.postgresql>42.4.3</version.lib.postgresql>
+        <version.lib.postgresql>42.4.4</version.lib.postgresql>
         <version.lib.prometheus>0.9.0</version.lib.prometheus>
         <version.lib.slf4j>2.0.9</version.lib.slf4j>
         <version.lib.smallrye-openapi>2.1.16</version.lib.smallrye-openapi>

docs/community.adoc

@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 
-    Copyright (c) 2019, 2022 Oracle and/or its affiliates.
+    Copyright (c) 2019, 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -33,13 +33,13 @@ Have a question?
 
 * Ask them in in Slack at http://slack.helidon.io[#helidon-user]
 * Or on https://stackoverflow.com/questions/tagged/helidon[Stack Overflow] using the `helidon` tag
-* Read the https://github.com/oracle/helidon/wiki/FAQ[Helidon FAQ]
+* Read the https://github.com/helidon-io/helidon/wiki/FAQ[Helidon FAQ]
 
 == Code and Issues
 
-* Helidon source is hosted on https://github.com/oracle/helidon[GitHub].
+* Helidon source is hosted on https://github.com/helidon-io/helidon[GitHub].
 * If you'd like to report a bug, enhancement request, or check if an
-issue is on our list, visit the https://github.com/oracle/helidon/issues[Helidon GitHub issue tracker].
+issue is on our list, visit the https://github.com/helidon-io/helidon/issues[Helidon GitHub issue tracker].
 
 
 == Stay Informed

docs/includes/attributes.adoc

@@ -24,14 +24,16 @@ ifndef::attributes-included[]
 :imagesdir: {rootdir}/images
 
 :helidon-version: 3.2.7-SNAPSHOT
-:helidon-version-is-release: true
+:helidon-version-is-release: false
 
 ifeval::["{helidon-version-is-release}" != "true"]
-:helidon-github-tree-url: https://github.com/oracle/helidon/tree/master
+:helidon-github-tree-url: https://github.com/helidon-io/helidon/tree/helidon-3.x
+:helidon-github-examples-url: https://github.com/helidon-io/helidon-examples/tree/helidon-3.x/examples
 endif::[]
 
 ifeval::["{helidon-version-is-release}" == "true"]
-:helidon-github-tree-url: https://github.com/oracle/helidon/tree/{helidon-version}
+:helidon-github-tree-url: https://github.com/helidon-io/helidon/tree/{helidon-version}
+:helidon-github-examples-url: https://github.com/helidon-io/helidon-examples/tree/{helidon-version}/examples
 endif::[]
 
 // versions
@@ -85,7 +87,7 @@ endif::[]
 :jdk-doc-url: https://docs.oracle.com/en/java/javase/17
 :jdk-javadoc-url: {jdk-doc-url}/docs/api
 
-:helidon-maven-plugin-doc-url: https://github.com/oracle/helidon-build-tools/blob/{version-plugin-helidon}/maven-plugins/helidon-maven-plugin/README.md
+:helidon-maven-plugin-doc-url: https://github.com/helidon-io/helidon-build-tools/blob/{version-plugin-helidon}/maven-plugins/helidon-maven-plugin/README.md
 
 // MicroProfile versioned URLs
 

docs/includes/guides/maven-build.adoc

@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 
-    Copyright (c) 2020, 2022 Oracle and/or its affiliates.
+    Copyright (c) 2020, 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@ use a Helidon application POM as their parent. This parent POM provides the foll
    Helidon application.
 
 If you want to use your own parent POM, then take a look at the
-link:{helidon-github-tree-url}/examples/quickstarts/helidon-standalone-quickstart-{flavor-lc}[standalone quickstart example].
+link:{helidon-github-examples-url}/quickstarts/helidon-standalone-quickstart-{flavor-lc}[standalone quickstart example].
 This example has a stand-alone POM that you can pattern your own application POM after.
 
 For more details on Helidon application POMs see the
@@ -98,7 +98,7 @@ Helidon provides a Maven plugin that, among other things, provides the following
 1. native-image: Build a xref:{guidesdir}/graalnative.adoc[GraalVM native image].
 2. jlink-image:  Build a xref:{guidesdir}/jlink-image.adoc[custom runtime Java image].
 
-For full documentation of the plugin please see the https://github.com/oracle/helidon-build-tools/tree/master/maven-plugins/helidon-maven-plugin[Helidon Maven Plugin README].
+For full documentation of the plugin please see the https://github.com/helidon-io/helidon-build-tools/tree/master/maven-plugins/helidon-maven-plugin[Helidon Maven Plugin README].
 
 If you use the Helidon application parent POM you will have this plugin configured
 for you. If you need to customize the `helidon-maven-plugin` you can do so in a few ways:

docs/mp/integrations/neo4j.adoc

@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 
-    Copyright (c) 2022, 2023 Oracle and/or its affiliates.
+    Copyright (c) 2022, 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -221,7 +221,8 @@ curl -H 'Accept: application/json' -X GET http://localhost:8080/metrics
 
 ----
 
-Full example code is available in link:https://github.com/oracle/helidon/tree/master/examples/integrations/neo4j/neo4j-mp[Helidon GitHub Repository].
+Full example code is available in
+link:{helidon-github-examples-url}/integrations/neo4j/neo4j-mp[Helidon GitHub Repository].
 
 
 == Additional Information

docs/mp/lra.adoc

@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 
-    Copyright (c) 2021, 2023 Oracle and/or its affiliates.
+    Copyright (c) 2021, 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -412,7 +412,7 @@ CAUTION: Experimental tool, usage in production is not advised.
 [source,bash]
 .Build and run Helidon LRA coordinator
 ----
-docker build -t helidon/lra-coordinator https://github.com/oracle/helidon.git#:lra/coordinator/server
+docker build -t helidon/lra-coordinator https://github.com/helidon-io/helidon.git#:lra/coordinator/server
 docker run -dp 8070:8070 --name lra-coordinator --network="host" helidon/lra-coordinator
 ----